Merge pull request cosmos#563 from CosmWasm/558-bump-proto

Bump proto

CHANGELOG.md

@@ -7,6 +7,13 @@
 
 [Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.17.0...HEAD)
 
+**Api Breaking:**
+
+- Renamed InitMsg and MigrateMsg fields to Msg. This applies to protobuf Msg
+  and Proposals, as well as REST and CLI [\#563](https://github.com/CosmWasm/wasmd/pull/563)
+- Move Proto version from `v1beta1` to `v1` for all cosmwasm.wasm.* types
+  [\#563](https://github.com/CosmWasm/wasmd/pull/563)
+
 ## [v0.17.0](https://github.com/CosmWasm/wasmd/tree/v0.17.0) (2021-05-26)
 
 [Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.17.0...v0.16.0)

Makefile

@@ -177,10 +177,10 @@ proto-swagger-gen:
 	@./scripts/protoc-swagger-gen.sh
 
 proto-lint:
-	@$(DOCKER_BUF) check lint --error-format=json
+	@$(DOCKER_BUF) lint --error-format=json
 
 proto-check-breaking:
-	@$(DOCKER_BUF) check breaking --against-input $(HTTPS_GIT)#branch=master
+	@$(DOCKER_BUF) breaking --against-input $(HTTPS_GIT)#branch=master
 
 .PHONY: all install install-debug \
 	go-mod-cache draw-deps clean build format \

proto/cosmwasm/wasm/v1beta1/genesis.proto → proto/cosmwasm/wasm/v1/genesis.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
-package cosmwasm.wasm.v1beta1;
+package cosmwasm.wasm.v1;
 
 import "gogoproto/gogo.proto";
-import "cosmwasm/wasm/v1beta1/types.proto";
-import "cosmwasm/wasm/v1beta1/tx.proto";
+import "cosmwasm/wasm/v1/types.proto";
+import "cosmwasm/wasm/v1/tx.proto";
 
 option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
 

proto/cosmwasm/wasm/v1beta1/ibc.proto → proto/cosmwasm/wasm/v1/ibc.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package cosmwasm.wasm.v1beta1;
+package cosmwasm.wasm.v1;
 
 import "gogoproto/gogo.proto";
 

proto/cosmwasm/wasm/v1beta1/proposal.proto → proto/cosmwasm/wasm/v1/proposal.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
-package cosmwasm.wasm.v1beta1;
+package cosmwasm.wasm.v1;
 
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
-import "cosmwasm/wasm/v1beta1/types.proto";
+import "cosmwasm/wasm/v1/types.proto";
 
 option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
 option (gogoproto.goproto_stringer_all) = false;
@@ -44,8 +44,8 @@ message InstantiateContractProposal {
   uint64 code_id = 5 [ (gogoproto.customname) = "CodeID" ];
   // Label is optional metadata to be stored with a constract instance.
   string label = 6;
-  // InitMsg json encoded message to be passed to the contract on instantiation
-  bytes init_msg = 7;
+  // Msg json encoded message to be passed to the contract on instantiation
+  bytes msg = 7;
   // Funds coins that are transferred to the contract on instantiation
   repeated cosmos.base.v1beta1.Coin funds = 8 [
     (gogoproto.nullable) = false,
@@ -65,8 +65,8 @@ message MigrateContractProposal {
   string contract = 4;
   // CodeID references the new WASM code
   uint64 code_id = 5 [ (gogoproto.customname) = "CodeID" ];
-  // MigrateMsg json encoded message to be passed to the contract on migration
-  bytes migrate_msg = 6;
+  // Msg json encoded message to be passed to the contract on migration
+  bytes msg = 6;
 }
 
 // UpdateAdminProposal gov proposal content type to set an admin for a contract.

proto/cosmwasm/wasm/v1beta1/query.proto → proto/cosmwasm/wasm/v1/query.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
-package cosmwasm.wasm.v1beta1;
+package cosmwasm.wasm.v1;
 
 import "gogoproto/gogo.proto";
-import "cosmwasm/wasm/v1beta1/types.proto";
+import "cosmwasm/wasm/v1/types.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
@@ -15,42 +15,42 @@ service Query {
   // ContractInfo gets the contract meta data
   rpc ContractInfo(QueryContractInfoRequest)
       returns (QueryContractInfoResponse) {
-    option (google.api.http).get = "/wasm/v1beta1/contract/{address}";
+    option (google.api.http).get = "/wasm/v1/contract/{address}";
   }
   // ContractHistory gets the contract code history
   rpc ContractHistory(QueryContractHistoryRequest)
       returns (QueryContractHistoryResponse) {
-    option (google.api.http).get = "/wasm/v1beta1/contract/{address}/history";
+    option (google.api.http).get = "/wasm/v1/contract/{address}/history";
   }
   // ContractsByCode lists all smart contracts for a code id
   rpc ContractsByCode(QueryContractsByCodeRequest)
       returns (QueryContractsByCodeResponse) {
-    option (google.api.http).get = "/wasm/v1beta1/code/{code_id}/contracts";
+    option (google.api.http).get = "/wasm/v1/code/{code_id}/contracts";
   }
   // AllContractState gets all raw store data for a single contract
   rpc AllContractState(QueryAllContractStateRequest)
       returns (QueryAllContractStateResponse) {
-    option (google.api.http).get = "/wasm/v1beta1/contract/{address}/state";
+    option (google.api.http).get = "/wasm/v1/contract/{address}/state";
   }
   // RawContractState gets single key from the raw store data of a contract
   rpc RawContractState(QueryRawContractStateRequest)
       returns (QueryRawContractStateResponse) {
     option (google.api.http).get =
-        "/wasm/v1beta1/contract/{address}/raw/{query_data}";
+        "/wasm/v1/contract/{address}/raw/{query_data}";
   }
   // SmartContractState get smart query result from the contract
   rpc SmartContractState(QuerySmartContractStateRequest)
       returns (QuerySmartContractStateResponse) {
     option (google.api.http).get =
-        "/wasm/v1beta1/contract/{address}/smart/{query_data}";
+        "/wasm/v1/contract/{address}/smart/{query_data}";
   }
   // Code gets the binary code and metadata for a singe wasm code
   rpc Code(QueryCodeRequest) returns (QueryCodeResponse) {
-    option (google.api.http).get = "/wasm/v1beta1/code/{code_id}";
+    option (google.api.http).get = "/wasm/v1/code/{code_id}";
   }
   // Codes gets the metadata for all stored wasm codes
   rpc Codes(QueryCodesRequest) returns (QueryCodesResponse) {
-    option (google.api.http).get = "/wasm/v1beta1/code";
+    option (google.api.http).get = "/wasm/v1/code";
   }
 }
 

proto/cosmwasm/wasm/v1beta1/tx.proto → proto/cosmwasm/wasm/v1/tx.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
-package cosmwasm.wasm.v1beta1;
+package cosmwasm.wasm.v1;
 
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
-import "cosmwasm/wasm/v1beta1/types.proto";
+import "cosmwasm/wasm/v1/types.proto";
 
 option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
 option (gogoproto.goproto_getters_all) = false;
@@ -57,8 +57,8 @@ message MsgInstantiateContract {
   uint64 code_id = 3 [ (gogoproto.customname) = "CodeID" ];
   // Label is optional metadata to be stored with a contract instance.
   string label = 4;
-  // InitMsg json encoded message to be passed to the contract on instantiation
-  bytes init_msg = 5;
+  // Msg json encoded message to be passed to the contract on instantiation
+  bytes msg = 5;
   // Funds coins that are transferred to the contract on instantiation
   repeated cosmos.base.v1beta1.Coin funds = 6 [
     (gogoproto.nullable) = false,
@@ -102,8 +102,8 @@ message MsgMigrateContract {
   string contract = 2;
   // CodeID references the new WASM code
   uint64 code_id = 3 [ (gogoproto.customname) = "CodeID" ];
-  // MigrateMsg json encoded message to be passed to the contract on migration
-  bytes migrate_msg = 4;
+  // Msg json encoded message to be passed to the contract on migration
+  bytes msg = 4;
 }
 
 // MsgMigrateContractResponse returns contract migration result data.

proto/cosmwasm/wasm/v1beta1/types.proto → proto/cosmwasm/wasm/v1/types.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package cosmwasm.wasm.v1beta1;
+package cosmwasm.wasm.v1;
 
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";

x/wasm/client/cli/gov_tx.go

@@ -137,7 +137,7 @@ func ProposalInstantiateContractCmd() *cobra.Command {
 				Admin:       src.Admin,
 				CodeID:      src.CodeID,
 				Label:       src.Label,
-				InitMsg:     src.InitMsg,
+				Msg:         src.Msg,
 				Funds:       src.Funds,
 			}
 
@@ -212,7 +212,7 @@ func ProposalMigrateContractCmd() *cobra.Command {
 				Description: proposalDescr,
 				Contract:    src.Contract,
 				CodeID:      src.CodeID,
-				MigrateMsg:  src.MigrateMsg,
+				Msg:         src.Msg,
 				RunAs:       runAs,
 			}
 

x/wasm/client/cli/new_tx.go

@@ -45,10 +45,10 @@ func parseMigrateContractArgs(args []string, cliCtx client.Context) (types.MsgMi
 	migrateMsg := args[2]
 
 	msg := types.MsgMigrateContract{
-		Sender:     cliCtx.GetFromAddress().String(),
-		Contract:   args[0],
-		CodeID:     codeID,
-		MigrateMsg: []byte(migrateMsg),
+		Sender:   cliCtx.GetFromAddress().String(),
+		Contract: args[0],
+		CodeID:   codeID,
+		Msg:      []byte(migrateMsg),
 	}
 	return msg, nil
 }

x/wasm/client/cli/tx.go

@@ -200,12 +200,12 @@ func parseInstantiateArgs(rawCodeID, initMsg string, sender sdk.AccAddress, flag
 
 	// build and sign the transaction, then broadcast to Tendermint
 	msg := types.MsgInstantiateContract{
-		Sender:  sender.String(),
-		CodeID:  codeID,
-		Label:   label,
-		Funds:   amount,
-		InitMsg: []byte(initMsg),
-		Admin:   adminStr,
+		Sender: sender.String(),
+		CodeID: codeID,
+		Label:  label,
+		Funds:  amount,
+		Msg:    []byte(initMsg),
+		Admin:  adminStr,
 	}
 	return msg, nil
 }

x/wasm/client/proposal_handler_test.go

@@ -158,7 +158,7 @@ func TestGovRestHandlers(t *testing.T) {
 				"admin":       "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz",
 				"code_id":     "1",
 				"label":       "https://example.com/",
-				"init_msg":    "my/builder:tag",
+				"msg":         dict{"recipient": "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz"},
 				"funds":       []dict{{"denom": "ustake", "amount": "100"}},
 				"deposit":     []dict{{"denom": "ustake", "amount": "10"}},
 				"proposer":    "cosmos1ve557a5g9yw2g2z57js3pdmcvd5my6g8ze20np",

x/wasm/client/rest/gov.go

@@ -77,11 +77,11 @@ type InstantiateProposalJsonReq struct {
 
 	RunAs string `json:"run_as" yaml:"run_as"`
 	// Admin is an optional address that can execute migrations
-	Admin   string          `json:"admin,omitempty" yaml:"admin"`
-	Code    uint64          `json:"code_id" yaml:"code_id"`
-	Label   string          `json:"label" yaml:"label"`
-	InitMsg json.RawMessage `json:"init_msg" yaml:"init_msg"`
-	Funds   sdk.Coins       `json:"funds" yaml:"funds"`
+	Admin string          `json:"admin,omitempty" yaml:"admin"`
+	Code  uint64          `json:"code_id" yaml:"code_id"`
+	Label string          `json:"label" yaml:"label"`
+	Msg   json.RawMessage `json:"msg" yaml:"msg"`
+	Funds sdk.Coins       `json:"funds" yaml:"funds"`
 }
 
 func (s InstantiateProposalJsonReq) Content() govtypes.Content {
@@ -92,7 +92,7 @@ func (s InstantiateProposalJsonReq) Content() govtypes.Content {
 		Admin:       s.Admin,
 		CodeID:      s.Code,
 		Label:       s.Label,
-		InitMsg:     s.InitMsg,
+		Msg:         s.Msg,
 		Funds:       s.Funds,
 	}
 }
@@ -128,9 +128,9 @@ type MigrateProposalJsonReq struct {
 	Proposer string    `json:"proposer" yaml:"proposer"`
 	Deposit  sdk.Coins `json:"deposit" yaml:"deposit"`
 
-	Contract   string          `json:"contract" yaml:"contract"`
-	Code       uint64          `json:"code_id" yaml:"code_id"`
-	MigrateMsg json.RawMessage `json:"msg" yaml:"msg"`
+	Contract string          `json:"contract" yaml:"contract"`
+	Code     uint64          `json:"code_id" yaml:"code_id"`
+	Msg      json.RawMessage `json:"msg" yaml:"msg"`
 	// RunAs is the role that is passed to the contract's environment
 	RunAs string `json:"run_as" yaml:"run_as"`
 }
@@ -141,7 +141,7 @@ func (s MigrateProposalJsonReq) Content() govtypes.Content {
 		Description: s.Description,
 		Contract:    s.Contract,
 		CodeID:      s.Code,
-		MigrateMsg:  s.MigrateMsg,
+		Msg:         s.Msg,
 		RunAs:       s.RunAs,
 	}
 }

x/wasm/client/rest/new_tx.go

@@ -16,10 +16,10 @@ func registerNewTxRoutes(cliCtx client.Context, r *mux.Router) {
 }
 
 type migrateContractReq struct {
-	BaseReq    rest.BaseReq `json:"base_req" yaml:"base_req"`
-	Admin      string       `json:"admin,omitempty" yaml:"admin"`
-	CodeID     uint64       `json:"code_id" yaml:"code_id"`
-	MigrateMsg []byte       `json:"migrate_msg,omitempty" yaml:"migrate_msg"`
+	BaseReq rest.BaseReq `json:"base_req" yaml:"base_req"`
+	Admin   string       `json:"admin,omitempty" yaml:"admin"`
+	CodeID  uint64       `json:"code_id" yaml:"code_id"`
+	Msg     []byte       `json:"msg,omitempty" yaml:"msg"`
 }
 
 type updateContractAdministrateReq struct {
@@ -70,10 +70,10 @@ func migrateContractHandlerFn(cliCtx client.Context) http.HandlerFunc {
 		}
 
 		msg := &types.MsgMigrateContract{
-			Sender:     req.BaseReq.From,
-			Contract:   contractAddr,
-			CodeID:     req.CodeID,
-			MigrateMsg: req.MigrateMsg,
+			Sender:   req.BaseReq.From,
+			Contract: contractAddr,
+			CodeID:   req.CodeID,
+			Msg:      req.Msg,
 		}
 		if err := msg.ValidateBasic(); err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())

x/wasm/client/rest/tx.go

@@ -29,7 +29,7 @@ type instantiateContractReq struct {
 	Label   string       `json:"label" yaml:"label"`
 	Deposit sdk.Coins    `json:"deposit" yaml:"deposit"`
 	Admin   string       `json:"admin,omitempty" yaml:"admin"`
-	InitMsg []byte       `json:"init_msg" yaml:"init_msg"`
+	Msg     []byte       `json:"msg" yaml:"msg"`
 }
 
 type executeContractReq struct {
@@ -101,12 +101,12 @@ func instantiateContractHandlerFn(cliCtx client.Context) http.HandlerFunc {
 		}
 
 		msg := types.MsgInstantiateContract{
-			Sender:  req.BaseReq.From,
-			CodeID:  codeID,
-			Label:   req.Label,
-			Funds:   req.Deposit,
-			InitMsg: req.InitMsg,
-			Admin:   req.Admin,
+			Sender: req.BaseReq.From,
+			CodeID: codeID,
+			Label:  req.Label,
+			Funds:  req.Deposit,
+			Msg:    req.Msg,
+			Admin:  req.Admin,
 		}
 
 		if err := msg.ValidateBasic(); err != nil {

x/wasm/genesis_test.go

@@ -41,10 +41,10 @@ func TestInitGenesis(t *testing.T) {
 	require.NoError(t, err)
 
 	initCmd := MsgInstantiateContract{
-		Sender:  creator.String(),
-		CodeID:  firstCodeID,
-		InitMsg: initMsgBz,
-		Funds:   deposit,
+		Sender: creator.String(),
+		CodeID: firstCodeID,
+		Msg:    initMsgBz,
+		Funds:  deposit,
 	}
 	res, err = h(data.ctx, &initCmd)
 	require.NoError(t, err)

x/wasm/ibctesting/wasm.go

@@ -64,12 +64,12 @@ func (c *TestChain) StoreCode(byteCode []byte) types.MsgStoreCodeResponse {
 
 func (c *TestChain) InstantiateContract(codeID uint64, initMsg []byte) sdk.AccAddress {
 	instantiateMsg := &types.MsgInstantiateContract{
-		Sender:  c.SenderAccount.GetAddress().String(),
-		Admin:   c.SenderAccount.GetAddress().String(),
-		CodeID:  codeID,
-		Label:   "ibc-test",
-		InitMsg: initMsg,
-		Funds:   sdk.Coins{TestCoin},
+		Sender: c.SenderAccount.GetAddress().String(),
+		Admin:  c.SenderAccount.GetAddress().String(),
+		CodeID: codeID,
+		Label:  "ibc-test",
+		Msg:    initMsg,
+		Funds:  sdk.Coins{TestCoin},
 	}
 
 	r, err := c.SendMsgs(instantiateMsg)
@@ -104,7 +104,7 @@ func (c *TestChain) SmartQuery(contractAddr string, queryMsg interface{}, respon
 
 	// TODO: what is the query?
 	res := c.App.Query(abci.RequestQuery{
-		Path: "/cosmwasm.wasm.v1beta1.Query/SmartContractState",
+		Path: "/cosmwasm.wasm.v1.Query/SmartContractState",
 		Data: reqBin,
 	})