From 9a6f2b5c1197a8d473b15984daf5428d36dfd503 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:22:06 +0200
Subject: [PATCH 01/12] Update buf commands

See https://docs.buf.build/faq/
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c97f8dc6535..df086ed7c66 100644
--- a/Makefile
+++ b/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 \

From 1fa216580691318f3d3766ee3a2268039530830e Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:24:29 +0200
Subject: [PATCH 02/12] Rename 2 fields and regenerate protobuf

---
 docs/proto/proto-docs.md             |   4 +-
 proto/cosmwasm/wasm/v1beta1/tx.proto |   8 +-
 x/wasm/types/tx.pb.go                | 142 +++++++++++++--------------
 3 files changed, 76 insertions(+), 78 deletions(-)

diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
index 7235179730c..b706d6450ca 100644
--- a/docs/proto/proto-docs.md
+++ b/docs/proto/proto-docs.md
@@ -340,7 +340,7 @@ code id.
 | `admin` | [string](#string) |  | Admin is an optional address that can execute migrations |
 | `code_id` | [uint64](#uint64) |  | CodeID is the reference to the stored WASM code |
 | `label` | [string](#string) |  | Label is optional metadata to be stored with a contract instance. |
-| `init_msg` | [bytes](#bytes) |  | InitMsg json encoded message to be passed to the contract on instantiation |
+| `msg` | [bytes](#bytes) |  | Msg json encoded message to be passed to the contract on instantiation |
 | `funds` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | Funds coins that are transferred to the contract on instantiation |
 
 
@@ -375,7 +375,7 @@ MsgMigrateContract runs a code upgrade/ downgrade for a smart contract
 | `sender` | [string](#string) |  | Sender is the that actor that signed the messages |
 | `contract` | [string](#string) |  | Contract is the address of the smart contract |
 | `code_id` | [uint64](#uint64) |  | CodeID references the new WASM code |
-| `migrate_msg` | [bytes](#bytes) |  | MigrateMsg json encoded message to be passed to the contract on migration |
+| `msg` | [bytes](#bytes) |  | Msg json encoded message to be passed to the contract on migration |
 
 
 
diff --git a/proto/cosmwasm/wasm/v1beta1/tx.proto b/proto/cosmwasm/wasm/v1beta1/tx.proto
index c3ddd3bfff4..a78cefee6c1 100644
--- a/proto/cosmwasm/wasm/v1beta1/tx.proto
+++ b/proto/cosmwasm/wasm/v1beta1/tx.proto
@@ -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.
diff --git a/x/wasm/types/tx.pb.go b/x/wasm/types/tx.pb.go
index 4e7f7f5ca0e..7e2f6dacb4b 100644
--- a/x/wasm/types/tx.pb.go
+++ b/x/wasm/types/tx.pb.go
@@ -129,8 +129,8 @@ type MsgInstantiateContract struct {
 	CodeID uint64 `protobuf:"varint,3,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"`
 	// Label is optional metadata to be stored with a contract instance.
 	Label string `protobuf:"bytes,4,opt,name=label,proto3" json:"label,omitempty"`
-	// InitMsg json encoded message to be passed to the contract on instantiation
-	InitMsg []byte `protobuf:"bytes,5,opt,name=init_msg,json=initMsg,proto3" json:"init_msg,omitempty"`
+	// Msg json encoded message to be passed to the contract on instantiation
+	Msg []byte `protobuf:"bytes,5,opt,name=msg,proto3" json:"msg,omitempty"`
 	// Funds coins that are transferred to the contract on instantiation
 	Funds github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,6,rep,name=funds,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"funds"`
 }
@@ -301,8 +301,8 @@ type MsgMigrateContract struct {
 	Contract string `protobuf:"bytes,2,opt,name=contract,proto3" json:"contract,omitempty"`
 	// CodeID references the new WASM code
 	CodeID uint64 `protobuf:"varint,3,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"`
-	// MigrateMsg json encoded message to be passed to the contract on migration
-	MigrateMsg []byte `protobuf:"bytes,4,opt,name=migrate_msg,json=migrateMsg,proto3" json:"migrate_msg,omitempty"`
+	// Msg json encoded message to be passed to the contract on migration
+	Msg []byte `protobuf:"bytes,4,opt,name=msg,proto3" json:"msg,omitempty"`
 }
 
 func (m *MsgMigrateContract) Reset()         { *m = MsgMigrateContract{} }
@@ -554,56 +554,54 @@ func init() {
 func init() { proto.RegisterFile("cosmwasm/wasm/v1beta1/tx.proto", fileDescriptor_b74028d4038589a4) }
 
 var fileDescriptor_b74028d4038589a4 = []byte{
-	// 769 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0x8d, 0xbf, 0xfc, 0x35, 0x37, 0xf9, 0x4a, 0x65, 0xda, 0xe2, 0x1a, 0xc9, 0x09, 0x29, 0xa0,
-	0x20, 0x68, 0xd2, 0x16, 0xc1, 0x86, 0x55, 0x93, 0xb2, 0xe8, 0xc2, 0x08, 0xb9, 0x42, 0x95, 0x2a,
-	0xa1, 0x30, 0xb1, 0xa7, 0xc6, 0x22, 0xf6, 0x44, 0x9e, 0x09, 0x6d, 0xc5, 0x1b, 0xb0, 0x40, 0x3c,
-	0x07, 0xef, 0xc0, 0xbe, 0xcb, 0x2e, 0x59, 0x15, 0x48, 0xb7, 0xbc, 0x03, 0x68, 0xc6, 0x3f, 0x71,
-	0x43, 0x1c, 0x05, 0x21, 0x36, 0xc9, 0x5c, 0xcf, 0xb9, 0xe7, 0xcc, 0x3d, 0xba, 0x73, 0x07, 0x34,
-	0x93, 0x50, 0xf7, 0x18, 0x51, 0xb7, 0x25, 0x7e, 0xde, 0x6e, 0xf5, 0x30, 0x43, 0x5b, 0x2d, 0x76,
-	0xd2, 0x1c, 0xf8, 0x84, 0x11, 0x79, 0x25, 0xda, 0x6f, 0x8a, 0x9f, 0x70, 0x5f, 0x15, 0x69, 0x84,
-	0xb6, 0x7a, 0x88, 0xe2, 0x38, 0xc9, 0x24, 0x8e, 0x17, 0xa4, 0xa9, 0xcb, 0x36, 0xb1, 0x89, 0x58,
-	0xb6, 0xf8, 0x2a, 0xfc, 0x7a, 0x2b, 0x45, 0xec, 0x74, 0x80, 0x69, 0x00, 0xa9, 0xff, 0x90, 0xa0,
-	0xa2, 0x53, 0x7b, 0x9f, 0x11, 0x1f, 0x77, 0x88, 0x85, 0xe5, 0x55, 0x28, 0x50, 0xec, 0x59, 0xd8,
-	0x57, 0xa4, 0x9a, 0xd4, 0x28, 0x19, 0x61, 0x24, 0x3f, 0x86, 0x45, 0x4e, 0xd2, 0xed, 0x9d, 0x32,
-	0xdc, 0x35, 0x89, 0x85, 0x95, 0xff, 0x6a, 0x52, 0xa3, 0xd2, 0x5e, 0x1a, 0x5d, 0x54, 0x2b, 0x07,
-	0x3b, 0xfb, 0x7a, 0xfb, 0x94, 0x09, 0x06, 0xa3, 0xc2, 0x71, 0x51, 0x24, 0xf8, 0xc8, 0xd0, 0x37,
-	0xb1, 0x92, 0x0d, 0xf9, 0x44, 0x24, 0x2b, 0x50, 0xec, 0x0d, 0x9d, 0x3e, 0x17, 0xca, 0x89, 0x8d,
-	0x28, 0x94, 0x0f, 0x61, 0xd5, 0xf1, 0x28, 0x43, 0x1e, 0x73, 0x10, 0xc3, 0xdd, 0x01, 0xf6, 0x5d,
-	0x87, 0x52, 0x87, 0x78, 0x4a, 0xbe, 0x26, 0x35, 0xca, 0xdb, 0xeb, 0xcd, 0xa9, 0x1e, 0x35, 0x77,
-	0x4c, 0x13, 0x53, 0xda, 0x21, 0xde, 0x91, 0x63, 0x1b, 0x2b, 0x09, 0x8a, 0xe7, 0x31, 0x43, 0xfd,
-	0x09, 0x2c, 0x27, 0xab, 0x35, 0x30, 0x1d, 0x10, 0x8f, 0x62, 0x79, 0x1d, 0x8a, 0xbc, 0xa6, 0xae,
-	0x63, 0x89, 0xb2, 0x73, 0x6d, 0x18, 0x5d, 0x54, 0x0b, 0x1c, 0xb2, 0xb7, 0x6b, 0x14, 0xf8, 0xd6,
-	0x9e, 0x55, 0xff, 0x29, 0xc1, 0xaa, 0x4e, 0xed, 0xbd, 0x31, 0x73, 0x87, 0x78, 0xcc, 0x47, 0x26,
-	0x4b, 0x75, 0x6d, 0x19, 0xf2, 0xc8, 0x72, 0x1d, 0x4f, 0x98, 0x55, 0x32, 0x82, 0x20, 0xa9, 0x96,
-	0x4d, 0x53, 0xe3, 0xa9, 0x7d, 0xd4, 0xc3, 0xfd, 0xd0, 0x9e, 0x20, 0x90, 0xd7, 0x60, 0xc1, 0xf1,
-	0x1c, 0xd6, 0x75, 0xa9, 0x2d, 0xec, 0xa8, 0x18, 0x45, 0x1e, 0xeb, 0xd4, 0x96, 0x11, 0xe4, 0x8f,
-	0x86, 0x9e, 0x45, 0x95, 0x42, 0x2d, 0xdb, 0x28, 0x6f, 0xaf, 0x35, 0x83, 0x9e, 0x69, 0xf2, 0x9e,
-	0x89, 0x4d, 0xea, 0x10, 0xc7, 0x6b, 0x6f, 0x9e, 0x5d, 0x54, 0x33, 0x9f, 0xbe, 0x56, 0x1b, 0xb6,
-	0xc3, 0x5e, 0x0f, 0x7b, 0x4d, 0x93, 0xb8, 0xad, 0xb0, 0xc1, 0x82, 0xbf, 0x0d, 0x6a, 0xbd, 0x09,
-	0xdb, 0x84, 0x27, 0x50, 0x23, 0x60, 0xae, 0x3f, 0x03, 0x6d, 0xba, 0x01, 0xb1, 0x91, 0x0a, 0x14,
-	0x91, 0x65, 0xf9, 0x98, 0xd2, 0xd0, 0x89, 0x28, 0x94, 0x65, 0xc8, 0x59, 0x88, 0xa1, 0xa0, 0x6d,
-	0x0c, 0xb1, 0xae, 0x7f, 0x96, 0x40, 0xd6, 0xa9, 0xfd, 0xf4, 0x04, 0x9b, 0xc3, 0x39, 0xdc, 0x54,
-	0x61, 0xc1, 0x0c, 0x31, 0xa1, 0xa1, 0x71, 0x2c, 0x2f, 0x41, 0x96, 0x7b, 0x92, 0x15, 0xec, 0x7c,
-	0x39, 0xf6, 0x23, 0xff, 0xcf, 0xfc, 0xd8, 0x04, 0xf5, 0xf7, 0xe3, 0xc7, 0x5e, 0x44, 0x15, 0x4b,
-	0x89, 0x8a, 0x3f, 0x04, 0x15, 0xeb, 0x8e, 0xed, 0xa3, 0xbf, 0xac, 0x78, 0xae, 0x2e, 0xaa, 0x42,
-	0xd9, 0x0d, 0xb4, 0x44, 0xcb, 0xe4, 0xc4, 0x51, 0x20, 0xfc, 0xa4, 0x53, 0x3b, 0x2c, 0x61, 0xe2,
-	0x3c, 0x33, 0x4b, 0x40, 0xb0, 0xa8, 0x53, 0xfb, 0xc5, 0xc0, 0x42, 0x0c, 0xef, 0x88, 0x7e, 0x4e,
-	0x3b, 0xfd, 0x4d, 0x28, 0x79, 0xf8, 0xb8, 0x9b, 0xbc, 0x01, 0x0b, 0x1e, 0x3e, 0x0e, 0x92, 0x92,
-	0xa5, 0x65, 0xaf, 0x96, 0x56, 0x57, 0xc4, 0x45, 0x4b, 0x48, 0x44, 0x07, 0xaa, 0x77, 0xe0, 0x7f,
-	0x9d, 0xda, 0x9d, 0x3e, 0x46, 0xfe, 0x6c, 0xed, 0x59, 0xf4, 0x37, 0x60, 0xe5, 0x0a, 0x49, 0xc4,
-	0xbe, 0xfd, 0x3e, 0x0f, 0x59, 0x7e, 0x95, 0x5e, 0x42, 0x69, 0x3c, 0x11, 0xd3, 0xe6, 0x4d, 0x72,
-	0x90, 0xa8, 0xf7, 0xe7, 0x00, 0xc5, 0xae, 0xbe, 0x83, 0xeb, 0xd3, 0x86, 0xc8, 0x46, 0x3a, 0xc7,
-	0x14, 0xb8, 0xfa, 0xe8, 0x8f, 0xe0, 0xb1, 0x38, 0x81, 0x6b, 0x93, 0xf7, 0xed, 0x5e, 0x3a, 0xd3,
-	0x04, 0x54, 0xdd, 0x9a, 0x1b, 0x9a, 0x14, 0x9c, 0x6c, 0xf7, 0x19, 0x82, 0x13, 0xd0, 0x59, 0x82,
-	0x69, 0x4d, 0x6b, 0x42, 0x39, 0xd9, 0x9d, 0x77, 0xd2, 0x19, 0x12, 0x30, 0x75, 0x63, 0x2e, 0x58,
-	0x2c, 0xf2, 0x0a, 0x20, 0xd1, 0x85, 0xb7, 0xd3, 0x93, 0xc7, 0x28, 0xf5, 0xc1, 0x3c, 0xa8, 0x48,
-	0xa1, 0xbd, 0x7b, 0xf6, 0x5d, 0xcb, 0x9c, 0x8d, 0x34, 0xe9, 0x7c, 0xa4, 0x49, 0xdf, 0x46, 0x9a,
-	0xf4, 0xf1, 0x52, 0xcb, 0x9c, 0x5f, 0x6a, 0x99, 0x2f, 0x97, 0x5a, 0xe6, 0xf0, 0x6e, 0x62, 0x56,
-	0x75, 0x08, 0x75, 0x0f, 0xa2, 0x67, 0xde, 0x6a, 0x9d, 0x04, 0xcf, 0xbd, 0x98, 0x57, 0xbd, 0x82,
-	0x78, 0xe7, 0x1f, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x89, 0xfd, 0x57, 0xdd, 0x79, 0x08, 0x00,
-	0x00,
+	// 748 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x4a,
+	0x14, 0x8d, 0x5f, 0x3e, 0xda, 0xdc, 0xe6, 0xf5, 0x55, 0x7e, 0x6d, 0x31, 0x46, 0x72, 0x82, 0x0b,
+	0x28, 0x08, 0xea, 0xb4, 0x45, 0xb0, 0x61, 0xd5, 0xb8, 0x2c, 0xba, 0x30, 0x42, 0xae, 0x50, 0xa5,
+	0x4a, 0x28, 0x8c, 0xed, 0xa9, 0xb1, 0x88, 0x3d, 0x91, 0x67, 0x42, 0x5b, 0xb1, 0x60, 0xcf, 0x8a,
+	0xdf, 0xc1, 0x7f, 0x60, 0xdf, 0x65, 0x97, 0xac, 0x0a, 0xa4, 0x5b, 0xd6, 0xac, 0x91, 0xc7, 0x1f,
+	0x75, 0x43, 0x1c, 0x05, 0x21, 0x36, 0xce, 0xdc, 0xcc, 0xb9, 0xe7, 0xcc, 0x3d, 0x3a, 0x1e, 0x83,
+	0x62, 0x13, 0xea, 0x1f, 0x21, 0xea, 0x77, 0xf8, 0xe3, 0xcd, 0xa6, 0x85, 0x19, 0xda, 0xec, 0xb0,
+	0x63, 0x6d, 0x10, 0x12, 0x46, 0xc4, 0x95, 0x74, 0x5f, 0xe3, 0x8f, 0x64, 0x5f, 0xe6, 0x6d, 0x84,
+	0x76, 0x2c, 0x44, 0x71, 0xd6, 0x64, 0x13, 0x2f, 0x88, 0xdb, 0xe4, 0x65, 0x97, 0xb8, 0x84, 0x2f,
+	0x3b, 0xd1, 0x2a, 0xf9, 0xf7, 0x66, 0x81, 0xd8, 0xc9, 0x00, 0xd3, 0x18, 0xa2, 0x7e, 0x17, 0xa0,
+	0x61, 0x50, 0x77, 0x8f, 0x91, 0x10, 0xeb, 0xc4, 0xc1, 0xe2, 0x2a, 0xd4, 0x28, 0x0e, 0x1c, 0x1c,
+	0x4a, 0x42, 0x4b, 0x68, 0xd7, 0xcd, 0xa4, 0x12, 0x1f, 0xc1, 0x62, 0x44, 0xd2, 0xb3, 0x4e, 0x18,
+	0xee, 0xd9, 0xc4, 0xc1, 0xd2, 0x3f, 0x2d, 0xa1, 0xdd, 0xe8, 0x2e, 0x8d, 0xce, 0x9b, 0x8d, 0xfd,
+	0xed, 0x3d, 0xa3, 0x7b, 0xc2, 0x38, 0x83, 0xd9, 0x88, 0x70, 0x69, 0xc5, 0xf9, 0xc8, 0x30, 0xb4,
+	0xb1, 0x54, 0x4e, 0xf8, 0x78, 0x25, 0x4a, 0x30, 0x67, 0x0d, 0xbd, 0x7e, 0x24, 0x54, 0xe1, 0x1b,
+	0x69, 0x29, 0x1e, 0xc0, 0xaa, 0x17, 0x50, 0x86, 0x02, 0xe6, 0x21, 0x86, 0x7b, 0x03, 0x1c, 0xfa,
+	0x1e, 0xa5, 0x1e, 0x09, 0xa4, 0x6a, 0x4b, 0x68, 0x2f, 0x6c, 0xad, 0x69, 0x13, 0x3d, 0xd2, 0xb6,
+	0x6d, 0x1b, 0x53, 0xaa, 0x93, 0xe0, 0xd0, 0x73, 0xcd, 0x95, 0x1c, 0xc5, 0xb3, 0x8c, 0x41, 0x7d,
+	0x0c, 0xcb, 0xf9, 0x69, 0x4d, 0x4c, 0x07, 0x24, 0xa0, 0x58, 0x5c, 0x83, 0xb9, 0x68, 0xa6, 0x9e,
+	0xe7, 0xf0, 0xb1, 0x2b, 0x5d, 0x18, 0x9d, 0x37, 0x6b, 0x11, 0x64, 0x77, 0xc7, 0xac, 0x45, 0x5b,
+	0xbb, 0x8e, 0xfa, 0x43, 0x80, 0x55, 0x83, 0xba, 0xbb, 0x97, 0xcc, 0x3a, 0x09, 0x58, 0x88, 0x6c,
+	0x56, 0xe8, 0xda, 0x32, 0x54, 0x91, 0xe3, 0x7b, 0x01, 0x37, 0xab, 0x6e, 0xc6, 0x45, 0x5e, 0xad,
+	0x5c, 0xa4, 0x16, 0xb5, 0xf6, 0x91, 0x85, 0xfb, 0x89, 0x3d, 0x71, 0x21, 0x2e, 0x41, 0xd9, 0xa7,
+	0x2e, 0x77, 0xa2, 0x61, 0x46, 0x4b, 0x11, 0x41, 0xf5, 0x70, 0x18, 0x38, 0x54, 0xaa, 0xb5, 0xca,
+	0xed, 0x85, 0xad, 0xeb, 0x5a, 0x1c, 0x15, 0x2d, 0x8a, 0x4a, 0xe6, 0x8d, 0x4e, 0xbc, 0xa0, 0xbb,
+	0x71, 0x7a, 0xde, 0x2c, 0x7d, 0xfc, 0xd2, 0x6c, 0xbb, 0x1e, 0x7b, 0x35, 0xb4, 0x34, 0x9b, 0xf8,
+	0x9d, 0x24, 0x57, 0xf1, 0xcf, 0x3a, 0x75, 0x5e, 0x27, 0xe9, 0x88, 0x1a, 0xa8, 0x19, 0x33, 0xab,
+	0x4f, 0x41, 0x99, 0x3c, 0x77, 0xe6, 0x9f, 0x04, 0x73, 0xc8, 0x71, 0x42, 0x4c, 0x69, 0x62, 0x40,
+	0x5a, 0x8a, 0x22, 0x54, 0x1c, 0xc4, 0x50, 0x9c, 0x16, 0x93, 0xaf, 0xd5, 0x4f, 0x02, 0x88, 0x06,
+	0x75, 0x9f, 0x1c, 0x63, 0x7b, 0x38, 0x83, 0x89, 0x32, 0xcc, 0xdb, 0x09, 0x26, 0xf1, 0x31, 0xab,
+	0x53, 0x3f, 0xca, 0x13, 0xfc, 0xa8, 0xfe, 0x35, 0x3f, 0x36, 0x40, 0xfe, 0xf5, 0xf8, 0x99, 0x17,
+	0xe9, 0xc4, 0x42, 0x6e, 0xe2, 0x77, 0x7c, 0x60, 0xc3, 0x73, 0x43, 0xf4, 0x87, 0x03, 0xcf, 0x94,
+	0x9d, 0xc4, 0x95, 0x4a, 0xe6, 0x4a, 0x72, 0xe4, 0xb1, 0x03, 0x4c, 0x3d, 0x32, 0x82, 0x45, 0x83,
+	0xba, 0xcf, 0x07, 0x0e, 0x62, 0x78, 0x9b, 0xc7, 0xb6, 0xe8, 0xb8, 0x37, 0xa0, 0x1e, 0xe0, 0xa3,
+	0x5e, 0x3e, 0xe8, 0xf3, 0x01, 0x3e, 0x8a, 0x9b, 0xf2, 0xb3, 0x94, 0xaf, 0xce, 0xa2, 0x4a, 0xfc,
+	0x7d, 0xca, 0x49, 0xa4, 0x07, 0x52, 0x75, 0xf8, 0xd7, 0xa0, 0xae, 0xde, 0xc7, 0x28, 0x9c, 0xae,
+	0x3d, 0x8d, 0xfe, 0x1a, 0xac, 0x5c, 0x21, 0x49, 0xd9, 0xb7, 0xde, 0x57, 0xa1, 0x6c, 0x50, 0x57,
+	0x7c, 0x01, 0xf5, 0xcb, 0x8b, 0xaf, 0xe8, 0x5a, 0xc9, 0xdf, 0x17, 0xf2, 0xbd, 0x19, 0x40, 0x99,
+	0xab, 0x6f, 0xe1, 0xff, 0x49, 0x77, 0xc5, 0x7a, 0x31, 0xc7, 0x04, 0xb8, 0xfc, 0xf0, 0xb7, 0xe0,
+	0x99, 0x38, 0x81, 0xff, 0xc6, 0xdf, 0xaf, 0xbb, 0xc5, 0x4c, 0x63, 0x50, 0x79, 0x73, 0x66, 0x68,
+	0x5e, 0x70, 0x3c, 0xdf, 0x53, 0x04, 0xc7, 0xa0, 0xd3, 0x04, 0x8b, 0x42, 0x6b, 0xc3, 0x42, 0x3e,
+	0x9d, 0xb7, 0x8b, 0x19, 0x72, 0x30, 0x79, 0x7d, 0x26, 0x58, 0x26, 0xf2, 0x12, 0x20, 0x97, 0xc2,
+	0x5b, 0xc5, 0xcd, 0x97, 0x28, 0xf9, 0xfe, 0x2c, 0xa8, 0x54, 0xa1, 0xbb, 0x73, 0xfa, 0x4d, 0x29,
+	0x9d, 0x8e, 0x14, 0xe1, 0x6c, 0xa4, 0x08, 0x5f, 0x47, 0x8a, 0xf0, 0xe1, 0x42, 0x29, 0x9d, 0x5d,
+	0x28, 0xa5, 0xcf, 0x17, 0x4a, 0xe9, 0xe0, 0x4e, 0xee, 0x6e, 0xd2, 0x09, 0xf5, 0xf7, 0xd3, 0xaf,
+	0xb9, 0xd3, 0x39, 0x8e, 0xbf, 0xea, 0xfc, 0x7e, 0xb2, 0x6a, 0xfc, 0x73, 0xfe, 0xe0, 0x67, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xfb, 0xb3, 0x1e, 0xb6, 0x60, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1003,10 +1001,10 @@ func (m *MsgInstantiateContract) MarshalToSizedBuffer(dAtA []byte) (int, error)
 			dAtA[i] = 0x32
 		}
 	}
-	if len(m.InitMsg) > 0 {
-		i -= len(m.InitMsg)
-		copy(dAtA[i:], m.InitMsg)
-		i = encodeVarintTx(dAtA, i, uint64(len(m.InitMsg)))
+	if len(m.Msg) > 0 {
+		i -= len(m.Msg)
+		copy(dAtA[i:], m.Msg)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Msg)))
 		i--
 		dAtA[i] = 0x2a
 	}
@@ -1184,10 +1182,10 @@ func (m *MsgMigrateContract) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.MigrateMsg) > 0 {
-		i -= len(m.MigrateMsg)
-		copy(dAtA[i:], m.MigrateMsg)
-		i = encodeVarintTx(dAtA, i, uint64(len(m.MigrateMsg)))
+	if len(m.Msg) > 0 {
+		i -= len(m.Msg)
+		copy(dAtA[i:], m.Msg)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Msg)))
 		i--
 		dAtA[i] = 0x22
 	}
@@ -1443,7 +1441,7 @@ func (m *MsgInstantiateContract) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovTx(uint64(l))
 	}
-	l = len(m.InitMsg)
+	l = len(m.Msg)
 	if l > 0 {
 		n += 1 + l + sovTx(uint64(l))
 	}
@@ -1530,7 +1528,7 @@ func (m *MsgMigrateContract) Size() (n int) {
 	if m.CodeID != 0 {
 		n += 1 + sovTx(uint64(m.CodeID))
 	}
-	l = len(m.MigrateMsg)
+	l = len(m.Msg)
 	if l > 0 {
 		n += 1 + l + sovTx(uint64(l))
 	}
@@ -2043,7 +2041,7 @@ func (m *MsgInstantiateContract) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 5:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field InitMsg", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType)
 			}
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
@@ -2070,9 +2068,9 @@ func (m *MsgInstantiateContract) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.InitMsg = append(m.InitMsg[:0], dAtA[iNdEx:postIndex]...)
-			if m.InitMsg == nil {
-				m.InitMsg = []byte{}
+			m.Msg = append(m.Msg[:0], dAtA[iNdEx:postIndex]...)
+			if m.Msg == nil {
+				m.Msg = []byte{}
 			}
 			iNdEx = postIndex
 		case 6:
@@ -2626,7 +2624,7 @@ func (m *MsgMigrateContract) Unmarshal(dAtA []byte) error {
 			}
 		case 4:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field MigrateMsg", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType)
 			}
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
@@ -2653,9 +2651,9 @@ func (m *MsgMigrateContract) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.MigrateMsg = append(m.MigrateMsg[:0], dAtA[iNdEx:postIndex]...)
-			if m.MigrateMsg == nil {
-				m.MigrateMsg = []byte{}
+			m.Msg = append(m.Msg[:0], dAtA[iNdEx:postIndex]...)
+			if m.Msg == nil {
+				m.Msg = []byte{}
 			}
 			iNdEx = postIndex
 		default:

From e144b2ea76b17a3d45a71c37e7ae4ece7551b513 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:27:50 +0200
Subject: [PATCH 03/12] {Init,Migrate}Msg -> Msg in proposals as well

---
 docs/proto/proto-docs.md                   |   4 +-
 proto/cosmwasm/wasm/v1beta1/proposal.proto |   8 +-
 x/wasm/types/proposal.pb.go                | 138 ++++++++++-----------
 3 files changed, 74 insertions(+), 76 deletions(-)

diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
index b706d6450ca..2bef8e8998e 100644
--- a/docs/proto/proto-docs.md
+++ b/docs/proto/proto-docs.md
@@ -675,7 +675,7 @@ contract.
 | `admin` | [string](#string) |  | Admin is an optional address that can execute migrations |
 | `code_id` | [uint64](#uint64) |  | CodeID is the reference to the stored WASM code |
 | `label` | [string](#string) |  | Label is optional metadata to be stored with a constract instance. |
-| `init_msg` | [bytes](#bytes) |  | InitMsg json encoded message to be passed to the contract on instantiation |
+| `msg` | [bytes](#bytes) |  | Msg json encoded message to be passed to the contract on instantiation |
 | `funds` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | Funds coins that are transferred to the contract on instantiation |
 
 
@@ -696,7 +696,7 @@ MigrateContractProposal gov proposal content type to migrate a contract.
 | `run_as` | [string](#string) |  | RunAs is the address that is passed to the contract's environment as sender |
 | `contract` | [string](#string) |  | Contract is the address of the smart contract |
 | `code_id` | [uint64](#uint64) |  | CodeID references the new WASM code |
-| `migrate_msg` | [bytes](#bytes) |  | MigrateMsg json encoded message to be passed to the contract on migration |
+| `msg` | [bytes](#bytes) |  | Msg json encoded message to be passed to the contract on migration |
 
 
 
diff --git a/proto/cosmwasm/wasm/v1beta1/proposal.proto b/proto/cosmwasm/wasm/v1beta1/proposal.proto
index 4387bb67a82..f92f89b3d0c 100644
--- a/proto/cosmwasm/wasm/v1beta1/proposal.proto
+++ b/proto/cosmwasm/wasm/v1beta1/proposal.proto
@@ -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.
diff --git a/x/wasm/types/proposal.pb.go b/x/wasm/types/proposal.pb.go
index e8f3f84d093..a38e5c372fe 100644
--- a/x/wasm/types/proposal.pb.go
+++ b/x/wasm/types/proposal.pb.go
@@ -92,8 +92,8 @@ type InstantiateContractProposal struct {
 	CodeID uint64 `protobuf:"varint,5,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"`
 	// Label is optional metadata to be stored with a constract instance.
 	Label string `protobuf:"bytes,6,opt,name=label,proto3" json:"label,omitempty"`
-	// InitMsg json encoded message to be passed to the contract on instantiation
-	InitMsg []byte `protobuf:"bytes,7,opt,name=init_msg,json=initMsg,proto3" json:"init_msg,omitempty"`
+	// Msg json encoded message to be passed to the contract on instantiation
+	Msg []byte `protobuf:"bytes,7,opt,name=msg,proto3" json:"msg,omitempty"`
 	// Funds coins that are transferred to the contract on instantiation
 	Funds github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,8,rep,name=funds,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"funds"`
 }
@@ -142,8 +142,8 @@ type MigrateContractProposal struct {
 	Contract string `protobuf:"bytes,4,opt,name=contract,proto3" json:"contract,omitempty"`
 	// CodeID references the new WASM code
 	CodeID uint64 `protobuf:"varint,5,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"`
-	// MigrateMsg json encoded message to be passed to the contract on migration
-	MigrateMsg []byte `protobuf:"bytes,6,opt,name=migrate_msg,json=migrateMsg,proto3" json:"migrate_msg,omitempty"`
+	// Msg json encoded message to be passed to the contract on migration
+	Msg []byte `protobuf:"bytes,6,opt,name=msg,proto3" json:"msg,omitempty"`
 }
 
 func (m *MigrateContractProposal) Reset()      { *m = MigrateContractProposal{} }
@@ -366,52 +366,50 @@ func init() {
 }
 
 var fileDescriptor_6428c760f8f86eed = []byte{
-	// 707 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xcd, 0x6a, 0xdb, 0x4a,
-	0x14, 0xb6, 0xe2, 0xf8, 0x27, 0x63, 0x73, 0xaf, 0xef, 0x5c, 0x27, 0x57, 0xc9, 0x05, 0xc9, 0x55,
-	0x4a, 0xf0, 0xa6, 0x76, 0x93, 0x42, 0x69, 0xbb, 0xb3, 0xdc, 0x4d, 0xa0, 0x86, 0xa0, 0x10, 0x02,
-	0xd9, 0x98, 0xb1, 0x34, 0x51, 0x86, 0x5a, 0x33, 0x42, 0x33, 0x6e, 0xea, 0xb7, 0xe8, 0x03, 0xf4,
-	0x01, 0x42, 0x37, 0xa5, 0xeb, 0xbe, 0x40, 0xe8, 0x2a, 0xcb, 0xac, 0xd4, 0xc6, 0x79, 0x03, 0x3f,
-	0x41, 0x99, 0x19, 0xd9, 0x75, 0x4a, 0x28, 0x85, 0xfe, 0x40, 0x37, 0xb2, 0xcf, 0x9c, 0x6f, 0xce,
-	0xf7, 0xcd, 0x77, 0x8e, 0x46, 0xe0, 0xae, 0xcf, 0x78, 0x74, 0x8a, 0x78, 0xd4, 0x56, 0x8f, 0x17,
-	0xdb, 0x03, 0x2c, 0xd0, 0x76, 0x3b, 0x4e, 0x58, 0xcc, 0x38, 0x1a, 0xb6, 0xe2, 0x84, 0x09, 0x06,
-	0x57, 0x67, 0xa8, 0x96, 0x7a, 0x64, 0xa8, 0x8d, 0x7a, 0xc8, 0x42, 0xa6, 0x10, 0x6d, 0xf9, 0x4f,
-	0x83, 0x37, 0x2c, 0x09, 0x66, 0xbc, 0x3d, 0x40, 0x1c, 0xcf, 0x0b, 0xfa, 0x8c, 0xd0, 0x2c, 0x7f,
-	0xe7, 0x76, 0x4a, 0x31, 0x8e, 0x31, 0xd7, 0x10, 0xe7, 0x6c, 0x09, 0xfc, 0xb3, 0x2f, 0x58, 0x82,
-	0xbb, 0x2c, 0xc0, 0x7b, 0x99, 0x16, 0x58, 0x07, 0x05, 0x41, 0xc4, 0x10, 0x9b, 0x46, 0xc3, 0x68,
-	0xae, 0x78, 0x3a, 0x80, 0x0d, 0x50, 0x09, 0x30, 0xf7, 0x13, 0x12, 0x0b, 0xc2, 0xa8, 0xb9, 0xa4,
-	0x72, 0x8b, 0x4b, 0x70, 0x15, 0x14, 0x93, 0x11, 0xed, 0x23, 0x6e, 0xe6, 0xf5, 0xc6, 0x64, 0x44,
-	0x3b, 0x1c, 0x3e, 0x04, 0x7f, 0x49, 0x01, 0xfd, 0xc1, 0x58, 0xe0, 0xbe, 0xcf, 0x02, 0x6c, 0x2e,
-	0x37, 0x8c, 0x66, 0xd5, 0xad, 0x4d, 0x52, 0xbb, 0x7a, 0xd8, 0xd9, 0xef, 0xb9, 0x63, 0xa1, 0x04,
-	0x78, 0x55, 0x89, 0x9b, 0x45, 0x70, 0x0d, 0x14, 0x39, 0x1b, 0x25, 0x3e, 0x36, 0x0b, 0xaa, 0x5c,
-	0x16, 0x41, 0x13, 0x94, 0x06, 0x23, 0x32, 0x0c, 0x70, 0x62, 0x16, 0x55, 0x62, 0x16, 0xc2, 0x23,
-	0xb0, 0x46, 0x28, 0x17, 0x88, 0x0a, 0x82, 0x04, 0xee, 0xc7, 0x38, 0x89, 0x08, 0xe7, 0x52, 0x6d,
-	0xa9, 0x61, 0x34, 0x2b, 0x3b, 0x9b, 0xad, 0x5b, 0xfd, 0x6d, 0x75, 0x7c, 0x1f, 0x73, 0xde, 0x65,
-	0xf4, 0x98, 0x84, 0xde, 0xea, 0x42, 0x89, 0xbd, 0x79, 0x05, 0xe7, 0xfd, 0x12, 0xf8, 0x7f, 0xf7,
-	0x4b, 0xa6, 0xcb, 0xa8, 0x48, 0x90, 0x2f, 0x7e, 0x95, 0x69, 0x75, 0x50, 0x40, 0x41, 0x44, 0xa8,
-	0xf2, 0x6a, 0xc5, 0xd3, 0x01, 0xdc, 0x04, 0x25, 0x69, 0x60, 0x9f, 0x04, 0xca, 0x93, 0x65, 0x17,
-	0x4c, 0x52, 0xbb, 0x28, 0xdd, 0xda, 0x7d, 0xea, 0x15, 0x65, 0x6a, 0x37, 0x90, 0x5b, 0x87, 0x68,
-	0x80, 0x87, 0x99, 0x3b, 0x3a, 0x80, 0xeb, 0xa0, 0x4c, 0x28, 0x11, 0xfd, 0x88, 0x87, 0xca, 0x8d,
-	0xaa, 0x57, 0x92, 0x71, 0x8f, 0x87, 0x10, 0x81, 0xc2, 0xf1, 0x88, 0x06, 0xdc, 0x2c, 0x37, 0xf2,
-	0xcd, 0xca, 0xce, 0x7a, 0x4b, 0x0f, 0x56, 0x4b, 0x0e, 0xd6, 0xdc, 0xa3, 0x2e, 0x23, 0xd4, 0xbd,
-	0x7f, 0x9e, 0xda, 0xb9, 0x37, 0x1f, 0xed, 0x66, 0x48, 0xc4, 0xc9, 0x68, 0xd0, 0xf2, 0x59, 0xd4,
-	0xce, 0xa6, 0x50, 0xff, 0xdc, 0xe3, 0xc1, 0xf3, 0x6c, 0xc2, 0xe4, 0x06, 0xee, 0xe9, 0xca, 0xce,
-	0x07, 0x03, 0xfc, 0xd7, 0x23, 0x61, 0xf2, 0x1b, 0x9c, 0xdb, 0x00, 0x65, 0x3f, 0xa3, 0xc8, 0xcc,
-	0x9b, 0xc7, 0xdf, 0xe7, 0x9f, 0x0d, 0x2a, 0x91, 0x96, 0xaa, 0xcc, 0x2a, 0x2a, 0xb3, 0x40, 0xb6,
-	0xd4, 0xe3, 0xa1, 0xf3, 0xda, 0x00, 0xff, 0x1e, 0xc4, 0x01, 0x12, 0xb8, 0x23, 0xbb, 0xf2, 0xc3,
-	0x07, 0xd9, 0x06, 0x2b, 0x14, 0x9f, 0xf6, 0x75, 0xbf, 0xd5, 0x59, 0xdc, 0xfa, 0x34, 0xb5, 0x6b,
-	0x63, 0x14, 0x0d, 0x9f, 0x38, 0xf3, 0x94, 0xe3, 0x95, 0x29, 0x3e, 0x55, 0x94, 0xdf, 0x3a, 0xa4,
-	0x73, 0x02, 0x60, 0x77, 0x88, 0x51, 0xf2, 0x73, 0xc4, 0x2d, 0x32, 0xe5, 0xbf, 0x62, 0x7a, 0x6b,
-	0x80, 0xda, 0x1e, 0xa1, 0xd2, 0x3f, 0x3e, 0x27, 0xda, 0xba, 0x41, 0xe4, 0xd6, 0xa6, 0xa9, 0x5d,
-	0xd5, 0x27, 0x51, 0xcb, 0xce, 0x8c, 0xfa, 0xd1, 0x2d, 0xd4, 0xee, 0xda, 0x34, 0xb5, 0xa1, 0x46,
-	0x2f, 0x24, 0x9d, 0x9b, 0x92, 0x1e, 0x4b, 0x49, 0xaa, 0x8b, 0xb2, 0xf5, 0xf9, 0xe6, 0xb2, 0x6b,
-	0x4d, 0x52, 0xbb, 0xa4, 0xdb, 0xc8, 0xa7, 0xa9, 0xfd, 0xb7, 0xae, 0x30, 0x03, 0x39, 0x5e, 0x49,
-	0xb7, 0x96, 0x3b, 0xef, 0x0c, 0x00, 0x0f, 0x68, 0xfc, 0x27, 0x69, 0x76, 0x9f, 0x9d, 0x5f, 0x59,
-	0xb9, 0xcb, 0x2b, 0x2b, 0x77, 0x36, 0xb1, 0x8c, 0xf3, 0x89, 0x65, 0x5c, 0x4c, 0x2c, 0xe3, 0xd3,
-	0xc4, 0x32, 0x5e, 0x5d, 0x5b, 0xb9, 0x8b, 0x6b, 0x2b, 0x77, 0x79, 0x6d, 0xe5, 0x8e, 0xb6, 0x16,
-	0x5e, 0xc9, 0x2e, 0xe3, 0xd1, 0xe1, 0xec, 0xe2, 0x0f, 0xda, 0x2f, 0xf5, 0x07, 0x40, 0xbd, 0x96,
-	0x83, 0xa2, 0xba, 0xf9, 0x1f, 0x7c, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xdb, 0xe2, 0xec, 0x91,
-	0x06, 0x00, 0x00,
+	// 687 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xcf, 0x6e, 0xd3, 0x30,
+	0x18, 0x6f, 0xd6, 0xb5, 0xdd, 0xbc, 0x0a, 0x8a, 0xe9, 0x46, 0x18, 0x52, 0x52, 0x32, 0x34, 0xf5,
+	0x42, 0xcb, 0x86, 0x84, 0x80, 0x5b, 0x53, 0x2e, 0x93, 0x98, 0x34, 0x65, 0x9a, 0x26, 0xed, 0x52,
+	0xb9, 0x89, 0xd7, 0x59, 0x34, 0x76, 0x14, 0xbb, 0x8c, 0xbe, 0x05, 0x0f, 0xc0, 0x03, 0x4c, 0x5c,
+	0x10, 0x5c, 0x79, 0x81, 0x1d, 0x77, 0xdc, 0x29, 0xb0, 0xec, 0x0d, 0xfa, 0x04, 0xc8, 0x76, 0x1a,
+	0x3a, 0x34, 0x21, 0x24, 0xfe, 0x48, 0x5c, 0x92, 0x7c, 0xf9, 0x7e, 0xfe, 0x7e, 0x3f, 0xff, 0xbe,
+	0xcf, 0x06, 0x0f, 0x7c, 0xc6, 0xc3, 0x63, 0xc4, 0xc3, 0xb6, 0x7a, 0xbc, 0xde, 0xe8, 0x63, 0x81,
+	0x36, 0xda, 0x51, 0xcc, 0x22, 0xc6, 0xd1, 0xb0, 0x15, 0xc5, 0x4c, 0x30, 0xb8, 0x3c, 0x45, 0xb5,
+	0xd4, 0x23, 0x43, 0xad, 0xd6, 0x07, 0x6c, 0xc0, 0x14, 0xa2, 0x2d, 0xbf, 0x34, 0x78, 0xd5, 0x92,
+	0x60, 0xc6, 0xdb, 0x7d, 0xc4, 0x71, 0x5e, 0xd0, 0x67, 0x84, 0x66, 0xf9, 0xfb, 0xd7, 0x53, 0x8a,
+	0x71, 0x84, 0xb9, 0x86, 0x38, 0x27, 0x73, 0xe0, 0xd6, 0xae, 0x60, 0x31, 0xee, 0xb2, 0x00, 0xef,
+	0x64, 0x5a, 0x60, 0x1d, 0x94, 0x04, 0x11, 0x43, 0x6c, 0x1a, 0x0d, 0xa3, 0xb9, 0xe8, 0xe9, 0x00,
+	0x36, 0xc0, 0x52, 0x80, 0xb9, 0x1f, 0x93, 0x48, 0x10, 0x46, 0xcd, 0x39, 0x95, 0x9b, 0xfd, 0x05,
+	0x97, 0x41, 0x39, 0x1e, 0xd1, 0x1e, 0xe2, 0x66, 0x51, 0x2f, 0x8c, 0x47, 0xb4, 0xc3, 0xe1, 0x13,
+	0x70, 0x43, 0x0a, 0xe8, 0xf5, 0xc7, 0x02, 0xf7, 0x7c, 0x16, 0x60, 0x73, 0xbe, 0x61, 0x34, 0xab,
+	0x6e, 0x2d, 0x4d, 0xec, 0xea, 0x7e, 0x67, 0x77, 0xdb, 0x1d, 0x0b, 0x25, 0xc0, 0xab, 0x4a, 0xdc,
+	0x34, 0x82, 0x2b, 0xa0, 0xcc, 0xd9, 0x28, 0xf6, 0xb1, 0x59, 0x52, 0xe5, 0xb2, 0x08, 0x9a, 0xa0,
+	0xd2, 0x1f, 0x91, 0x61, 0x80, 0x63, 0xb3, 0xac, 0x12, 0xd3, 0x10, 0x1e, 0x80, 0x15, 0x42, 0xb9,
+	0x40, 0x54, 0x10, 0x24, 0x70, 0x2f, 0xc2, 0x71, 0x48, 0x38, 0x97, 0x6a, 0x2b, 0x0d, 0xa3, 0xb9,
+	0xb4, 0xb9, 0xd6, 0xba, 0xd6, 0xdf, 0x56, 0xc7, 0xf7, 0x31, 0xe7, 0x5d, 0x46, 0x0f, 0xc9, 0xc0,
+	0x5b, 0x9e, 0x29, 0xb1, 0x93, 0x57, 0x70, 0x3e, 0xcd, 0x81, 0x7b, 0x5b, 0xdf, 0x33, 0x5d, 0x46,
+	0x45, 0x8c, 0x7c, 0xf1, 0xb7, 0x4c, 0xab, 0x83, 0x12, 0x0a, 0x42, 0x42, 0x95, 0x57, 0x8b, 0x9e,
+	0x0e, 0xe0, 0x1a, 0xa8, 0x48, 0x03, 0x7b, 0x24, 0x50, 0x9e, 0xcc, 0xbb, 0x20, 0x4d, 0xec, 0xb2,
+	0x74, 0x6b, 0xeb, 0x85, 0x57, 0x96, 0xa9, 0xad, 0x40, 0x2e, 0x1d, 0xa2, 0x3e, 0x1e, 0x66, 0xee,
+	0xe8, 0x00, 0xd6, 0x40, 0x31, 0xe4, 0x03, 0x65, 0x44, 0xd5, 0x93, 0x9f, 0x10, 0x81, 0xd2, 0xe1,
+	0x88, 0x06, 0xdc, 0x5c, 0x68, 0x14, 0x9b, 0x4b, 0x9b, 0x77, 0x5b, 0x7a, 0x9e, 0x5a, 0x72, 0x9e,
+	0x72, 0x6b, 0xba, 0x8c, 0x50, 0xf7, 0xd1, 0x69, 0x62, 0x17, 0xde, 0x7f, 0xb1, 0x9b, 0x03, 0x22,
+	0x8e, 0x46, 0xfd, 0x96, 0xcf, 0xc2, 0x76, 0x36, 0x7c, 0xfa, 0xf5, 0x90, 0x07, 0xaf, 0xb2, 0xc1,
+	0x92, 0x0b, 0xb8, 0xa7, 0x2b, 0x3b, 0x9f, 0x0d, 0x70, 0x67, 0x9b, 0x0c, 0xe2, 0x7f, 0x60, 0xd8,
+	0x2a, 0x58, 0xf0, 0x33, 0x8a, 0xcc, 0xb3, 0x3c, 0xfe, 0x35, 0xdb, 0x32, 0x83, 0xca, 0xb9, 0x41,
+	0xce, 0x3b, 0x03, 0xdc, 0xde, 0x8b, 0x02, 0x24, 0x70, 0x47, 0xba, 0xff, 0xdb, 0xca, 0x37, 0xc0,
+	0x22, 0xc5, 0xc7, 0x3d, 0xdd, 0x57, 0x25, 0xde, 0xad, 0x4f, 0x12, 0xbb, 0x36, 0x46, 0xe1, 0xf0,
+	0xb9, 0x93, 0xa7, 0x1c, 0x6f, 0x81, 0xe2, 0x63, 0x45, 0xf9, 0xb3, 0x5d, 0x39, 0x47, 0x00, 0x76,
+	0x87, 0x18, 0xc5, 0x7f, 0x46, 0xdc, 0x2c, 0x53, 0xf1, 0x07, 0xa6, 0x0f, 0x06, 0xa8, 0xed, 0x10,
+	0x2a, 0x0d, 0xe3, 0x39, 0xd1, 0xfa, 0x15, 0x22, 0xb7, 0x36, 0x49, 0xec, 0xaa, 0xde, 0x89, 0xfa,
+	0xed, 0x4c, 0xa9, 0x9f, 0x5e, 0x43, 0xed, 0xae, 0x4c, 0x12, 0x1b, 0x6a, 0xf4, 0x4c, 0xd2, 0xb9,
+	0x2a, 0xe9, 0x99, 0x94, 0xa4, 0xda, 0x26, 0x7b, 0x5d, 0x6c, 0xce, 0xbb, 0x56, 0x9a, 0xd8, 0x15,
+	0xdd, 0x37, 0x3e, 0x49, 0xec, 0x9b, 0xba, 0xc2, 0x14, 0xe4, 0x78, 0x15, 0xdd, 0x4b, 0xee, 0x7c,
+	0x34, 0x00, 0xdc, 0xa3, 0xd1, 0xff, 0xa4, 0xd9, 0x7d, 0x79, 0x7a, 0x61, 0x15, 0xce, 0x2f, 0xac,
+	0xc2, 0x49, 0x6a, 0x19, 0xa7, 0xa9, 0x65, 0x9c, 0xa5, 0x96, 0xf1, 0x35, 0xb5, 0x8c, 0xb7, 0x97,
+	0x56, 0xe1, 0xec, 0xd2, 0x2a, 0x9c, 0x5f, 0x5a, 0x85, 0x83, 0xf5, 0x99, 0x33, 0xd8, 0x65, 0x3c,
+	0xdc, 0x9f, 0x5e, 0xf0, 0x41, 0xfb, 0x8d, 0xbe, 0xe8, 0xd5, 0x39, 0xec, 0x97, 0xd5, 0x0d, 0xff,
+	0xf8, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x63, 0xde, 0x63, 0x60, 0x79, 0x06, 0x00, 0x00,
 }
 
 func (this *StoreCodeProposal) Equal(that interface{}) bool {
@@ -493,7 +491,7 @@ func (this *InstantiateContractProposal) Equal(that interface{}) bool {
 	if this.Label != that1.Label {
 		return false
 	}
-	if !bytes.Equal(this.InitMsg, that1.InitMsg) {
+	if !bytes.Equal(this.Msg, that1.Msg) {
 		return false
 	}
 	if len(this.Funds) != len(that1.Funds) {
@@ -540,7 +538,7 @@ func (this *MigrateContractProposal) Equal(that interface{}) bool {
 	if this.CodeID != that1.CodeID {
 		return false
 	}
-	if !bytes.Equal(this.MigrateMsg, that1.MigrateMsg) {
+	if !bytes.Equal(this.Msg, that1.Msg) {
 		return false
 	}
 	return true
@@ -789,10 +787,10 @@ func (m *InstantiateContractProposal) MarshalToSizedBuffer(dAtA []byte) (int, er
 			dAtA[i] = 0x42
 		}
 	}
-	if len(m.InitMsg) > 0 {
-		i -= len(m.InitMsg)
-		copy(dAtA[i:], m.InitMsg)
-		i = encodeVarintProposal(dAtA, i, uint64(len(m.InitMsg)))
+	if len(m.Msg) > 0 {
+		i -= len(m.Msg)
+		copy(dAtA[i:], m.Msg)
+		i = encodeVarintProposal(dAtA, i, uint64(len(m.Msg)))
 		i--
 		dAtA[i] = 0x3a
 	}
@@ -859,10 +857,10 @@ func (m *MigrateContractProposal) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	_ = i
 	var l int
 	_ = l
-	if len(m.MigrateMsg) > 0 {
-		i -= len(m.MigrateMsg)
-		copy(dAtA[i:], m.MigrateMsg)
-		i = encodeVarintProposal(dAtA, i, uint64(len(m.MigrateMsg)))
+	if len(m.Msg) > 0 {
+		i -= len(m.Msg)
+		copy(dAtA[i:], m.Msg)
+		i = encodeVarintProposal(dAtA, i, uint64(len(m.Msg)))
 		i--
 		dAtA[i] = 0x32
 	}
@@ -1184,7 +1182,7 @@ func (m *InstantiateContractProposal) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovProposal(uint64(l))
 	}
-	l = len(m.InitMsg)
+	l = len(m.Msg)
 	if l > 0 {
 		n += 1 + l + sovProposal(uint64(l))
 	}
@@ -1222,7 +1220,7 @@ func (m *MigrateContractProposal) Size() (n int) {
 	if m.CodeID != 0 {
 		n += 1 + sovProposal(uint64(m.CodeID))
 	}
-	l = len(m.MigrateMsg)
+	l = len(m.Msg)
 	if l > 0 {
 		n += 1 + l + sovProposal(uint64(l))
 	}
@@ -1819,7 +1817,7 @@ func (m *InstantiateContractProposal) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 7:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field InitMsg", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType)
 			}
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
@@ -1846,9 +1844,9 @@ func (m *InstantiateContractProposal) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.InitMsg = append(m.InitMsg[:0], dAtA[iNdEx:postIndex]...)
-			if m.InitMsg == nil {
-				m.InitMsg = []byte{}
+			m.Msg = append(m.Msg[:0], dAtA[iNdEx:postIndex]...)
+			if m.Msg == nil {
+				m.Msg = []byte{}
 			}
 			iNdEx = postIndex
 		case 8:
@@ -2084,7 +2082,7 @@ func (m *MigrateContractProposal) Unmarshal(dAtA []byte) error {
 			}
 		case 6:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field MigrateMsg", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType)
 			}
 			var byteLen int
 			for shift := uint(0); ; shift += 7 {
@@ -2111,9 +2109,9 @@ func (m *MigrateContractProposal) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.MigrateMsg = append(m.MigrateMsg[:0], dAtA[iNdEx:postIndex]...)
-			if m.MigrateMsg == nil {
-				m.MigrateMsg = []byte{}
+			m.Msg = append(m.Msg[:0], dAtA[iNdEx:postIndex]...)
+			if m.Msg == nil {
+				m.Msg = []byte{}
 			}
 			iNdEx = postIndex
 		default:

From 699fbbc215cc899c61c0040653136a51cfb799f0 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:34:31 +0200
Subject: [PATCH 04/12] Changed references in code - 2 broken tests

---
 x/wasm/client/cli/gov_tx.go                   |  4 +-
 x/wasm/client/cli/new_tx.go                   |  8 +--
 x/wasm/client/cli/tx.go                       | 12 ++--
 x/wasm/client/rest/gov.go                     |  4 +-
 x/wasm/client/rest/new_tx.go                  |  8 +--
 x/wasm/client/rest/tx.go                      | 12 ++--
 x/wasm/genesis_test.go                        |  8 +--
 x/wasm/ibctesting/wasm.go                     | 12 ++--
 x/wasm/keeper/genesis_test.go                 |  2 +-
 x/wasm/keeper/handler_plugin_encoders.go      | 20 +++---
 x/wasm/keeper/handler_plugin_encoders_test.go | 20 +++---
 x/wasm/keeper/msg_server.go                   |  4 +-
 x/wasm/keeper/proposal_handler.go             |  4 +-
 x/wasm/keeper/proposal_integration_test.go    |  6 +-
 x/wasm/keeper/test_common.go                  |  2 +-
 x/wasm/module_test.go                         | 24 +++----
 x/wasm/types/proposal.go                      | 16 ++---
 x/wasm/types/proposal_test.go                 | 20 +++---
 x/wasm/types/test_fixtures.go                 | 14 ++--
 x/wasm/types/tx.go                            |  4 +-
 x/wasm/types/tx_test.go                       | 68 +++++++++----------
 x/wasm/types/wasmer_engine.go                 |  2 +-
 22 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/x/wasm/client/cli/gov_tx.go b/x/wasm/client/cli/gov_tx.go
index d36b82a5a63..32fc19ef2d4 100644
--- a/x/wasm/client/cli/gov_tx.go
+++ b/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,
 			}
 
diff --git a/x/wasm/client/cli/new_tx.go b/x/wasm/client/cli/new_tx.go
index cc0ff4ad4f1..a2e276fb466 100644
--- a/x/wasm/client/cli/new_tx.go
+++ b/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
 }
diff --git a/x/wasm/client/cli/tx.go b/x/wasm/client/cli/tx.go
index 3bf05e70b51..b7a26b029a3 100644
--- a/x/wasm/client/cli/tx.go
+++ b/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
 }
diff --git a/x/wasm/client/rest/gov.go b/x/wasm/client/rest/gov.go
index 0812e7ee3f2..a387020b1f4 100644
--- a/x/wasm/client/rest/gov.go
+++ b/x/wasm/client/rest/gov.go
@@ -92,7 +92,7 @@ func (s InstantiateProposalJsonReq) Content() govtypes.Content {
 		Admin:       s.Admin,
 		CodeID:      s.Code,
 		Label:       s.Label,
-		InitMsg:     s.InitMsg,
+		Msg:         s.InitMsg,
 		Funds:       s.Funds,
 	}
 }
@@ -141,7 +141,7 @@ func (s MigrateProposalJsonReq) Content() govtypes.Content {
 		Description: s.Description,
 		Contract:    s.Contract,
 		CodeID:      s.Code,
-		MigrateMsg:  s.MigrateMsg,
+		Msg:         s.MigrateMsg,
 		RunAs:       s.RunAs,
 	}
 }
diff --git a/x/wasm/client/rest/new_tx.go b/x/wasm/client/rest/new_tx.go
index 4be0e0d3372..6b856e42b75 100644
--- a/x/wasm/client/rest/new_tx.go
+++ b/x/wasm/client/rest/new_tx.go
@@ -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.MigrateMsg,
 		}
 		if err := msg.ValidateBasic(); err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
diff --git a/x/wasm/client/rest/tx.go b/x/wasm/client/rest/tx.go
index b1c49d71819..7842f3ed39a 100644
--- a/x/wasm/client/rest/tx.go
+++ b/x/wasm/client/rest/tx.go
@@ -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.InitMsg,
+			Admin:  req.Admin,
 		}
 
 		if err := msg.ValidateBasic(); err != nil {
diff --git a/x/wasm/genesis_test.go b/x/wasm/genesis_test.go
index 5beeb54b5d1..4e8f5b9cc0c 100644
--- a/x/wasm/genesis_test.go
+++ b/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)
diff --git a/x/wasm/ibctesting/wasm.go b/x/wasm/ibctesting/wasm.go
index 36bd6d5c271..99c90f0f024 100644
--- a/x/wasm/ibctesting/wasm.go
+++ b/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)
diff --git a/x/wasm/keeper/genesis_test.go b/x/wasm/keeper/genesis_test.go
index 2b07b3eb9f7..3a9a292e5ee 100644
--- a/x/wasm/keeper/genesis_test.go
+++ b/x/wasm/keeper/genesis_test.go
@@ -583,7 +583,7 @@ func TestSupportedGenMsgTypes(t *testing.T) {
 						Sender: myAddress.String(),
 						CodeID: 1,
 						Label:  "testing",
-						InitMsg: HackatomExampleInitMsg{
+						Msg: HackatomExampleInitMsg{
 							Verifier:    verifierAddress,
 							Beneficiary: beneficiaryAddress,
 						}.GetBytes(t),
diff --git a/x/wasm/keeper/handler_plugin_encoders.go b/x/wasm/keeper/handler_plugin_encoders.go
index 18d0a7757e8..37412b58f08 100644
--- a/x/wasm/keeper/handler_plugin_encoders.go
+++ b/x/wasm/keeper/handler_plugin_encoders.go
@@ -225,20 +225,20 @@ func EncodeWasmMsg(sender sdk.AccAddress, msg *wasmvmtypes.WasmMsg) ([]sdk.Msg,
 		}
 
 		sdkMsg := types.MsgInstantiateContract{
-			Sender:  sender.String(),
-			CodeID:  msg.Instantiate.CodeID,
-			Label:   msg.Instantiate.Label,
-			InitMsg: msg.Instantiate.Msg,
-			Admin:   msg.Instantiate.Admin,
-			Funds:   coins,
+			Sender: sender.String(),
+			CodeID: msg.Instantiate.CodeID,
+			Label:  msg.Instantiate.Label,
+			Msg:    msg.Instantiate.Msg,
+			Admin:  msg.Instantiate.Admin,
+			Funds:  coins,
 		}
 		return []sdk.Msg{&sdkMsg}, nil
 	case msg.Migrate != nil:
 		sdkMsg := types.MsgMigrateContract{
-			Sender:     sender.String(),
-			Contract:   msg.Migrate.ContractAddr,
-			CodeID:     msg.Migrate.NewCodeID,
-			MigrateMsg: msg.Migrate.Msg,
+			Sender:   sender.String(),
+			Contract: msg.Migrate.ContractAddr,
+			CodeID:   msg.Migrate.NewCodeID,
+			Msg:      msg.Migrate.Msg,
 		}
 		return []sdk.Msg{&sdkMsg}, nil
 	case msg.ClearAdmin != nil:
diff --git a/x/wasm/keeper/handler_plugin_encoders_test.go b/x/wasm/keeper/handler_plugin_encoders_test.go
index ae10886fc0c..d1fb6b45afa 100644
--- a/x/wasm/keeper/handler_plugin_encoders_test.go
+++ b/x/wasm/keeper/handler_plugin_encoders_test.go
@@ -179,12 +179,12 @@ func TestEncoding(t *testing.T) {
 			},
 			output: []sdk.Msg{
 				&types.MsgInstantiateContract{
-					Sender:  addr1.String(),
-					CodeID:  7,
-					Label:   "myLabel",
-					InitMsg: jsonMsg,
-					Funds:   sdk.NewCoins(sdk.NewInt64Coin("eth", 123)),
-					Admin:   addr2.String(),
+					Sender: addr1.String(),
+					CodeID: 7,
+					Label:  "myLabel",
+					Msg:    jsonMsg,
+					Funds:  sdk.NewCoins(sdk.NewInt64Coin("eth", 123)),
+					Admin:  addr2.String(),
 				},
 			},
 		},
@@ -201,10 +201,10 @@ func TestEncoding(t *testing.T) {
 			},
 			output: []sdk.Msg{
 				&types.MsgMigrateContract{
-					Sender:     addr2.String(),
-					Contract:   addr1.String(),
-					CodeID:     12,
-					MigrateMsg: jsonMsg,
+					Sender:   addr2.String(),
+					Contract: addr1.String(),
+					CodeID:   12,
+					Msg:      jsonMsg,
 				},
 			},
 		},
diff --git a/x/wasm/keeper/msg_server.go b/x/wasm/keeper/msg_server.go
index 86a81c6fe8c..1034c868e61 100644
--- a/x/wasm/keeper/msg_server.go
+++ b/x/wasm/keeper/msg_server.go
@@ -56,7 +56,7 @@ func (m msgServer) InstantiateContract(goCtx context.Context, msg *types.MsgInst
 		}
 	}
 
-	contractAddr, data, err := m.keeper.Instantiate(ctx, msg.CodeID, senderAddr, adminAddr, msg.InitMsg, msg.Label, msg.Funds)
+	contractAddr, data, err := m.keeper.Instantiate(ctx, msg.CodeID, senderAddr, adminAddr, msg.Msg, msg.Label, msg.Funds)
 	if err != nil {
 		return nil, err
 	}
@@ -116,7 +116,7 @@ func (m msgServer) MigrateContract(goCtx context.Context, msg *types.MsgMigrateC
 		return nil, sdkerrors.Wrap(err, "contract")
 	}
 
-	data, err := m.keeper.Migrate(ctx, contractAddr, senderAddr, msg.CodeID, msg.MigrateMsg)
+	data, err := m.keeper.Migrate(ctx, contractAddr, senderAddr, msg.CodeID, msg.Msg)
 	if err != nil {
 		return nil, err
 	}
diff --git a/x/wasm/keeper/proposal_handler.go b/x/wasm/keeper/proposal_handler.go
index c479dec6ec1..e6086e5a500 100644
--- a/x/wasm/keeper/proposal_handler.go
+++ b/x/wasm/keeper/proposal_handler.go
@@ -85,7 +85,7 @@ func handleInstantiateProposal(ctx sdk.Context, k types.ContractOpsKeeper, p typ
 		return sdkerrors.Wrap(err, "admin")
 	}
 
-	contractAddr, data, err := k.Instantiate(ctx, p.CodeID, runAsAddr, adminAddr, p.InitMsg, p.Label, p.Funds)
+	contractAddr, data, err := k.Instantiate(ctx, p.CodeID, runAsAddr, adminAddr, p.Msg, p.Label, p.Funds)
 	if err != nil {
 		return err
 	}
@@ -114,7 +114,7 @@ func handleMigrateProposal(ctx sdk.Context, k types.ContractOpsKeeper, p types.M
 	if err != nil {
 		return sdkerrors.Wrap(err, "run as address")
 	}
-	data, err := k.Migrate(ctx, contractAddr, runAsAddr, p.CodeID, p.MigrateMsg)
+	data, err := k.Migrate(ctx, contractAddr, runAsAddr, p.CodeID, p.Msg)
 	if err != nil {
 		return err
 	}
diff --git a/x/wasm/keeper/proposal_integration_test.go b/x/wasm/keeper/proposal_integration_test.go
index 6c02b57b1b8..3ab1e8da8bc 100644
--- a/x/wasm/keeper/proposal_integration_test.go
+++ b/x/wasm/keeper/proposal_integration_test.go
@@ -111,7 +111,7 @@ func TestInstantiateProposal(t *testing.T) {
 		Operation: types.ContractCodeHistoryOperationTypeInit,
 		CodeID:    src.CodeID,
 		Updated:   types.NewAbsoluteTxPosition(ctx),
-		Msg:       src.InitMsg,
+		Msg:       src.Msg,
 	}}
 	assert.Equal(t, expHistory, wasmKeeper.GetContractHistory(ctx, contractAddr))
 	// and event
@@ -161,7 +161,7 @@ func TestMigrateProposal(t *testing.T) {
 		Description: "Bar",
 		CodeID:      2,
 		Contract:    contractAddr.String(),
-		MigrateMsg:  migMsgBz,
+		Msg:         migMsgBz,
 		RunAs:       otherAddress.String(),
 	}
 
@@ -191,7 +191,7 @@ func TestMigrateProposal(t *testing.T) {
 		Operation: types.ContractCodeHistoryOperationTypeMigrate,
 		CodeID:    src.CodeID,
 		Updated:   types.NewAbsoluteTxPosition(ctx),
-		Msg:       src.MigrateMsg,
+		Msg:       src.Msg,
 	}}
 	assert.Equal(t, expHistory, wasmKeeper.GetContractHistory(ctx, contractAddr))
 	// and events emitted
diff --git a/x/wasm/keeper/test_common.go b/x/wasm/keeper/test_common.go
index cf1eedae10c..6750f1d857e 100644
--- a/x/wasm/keeper/test_common.go
+++ b/x/wasm/keeper/test_common.go
@@ -386,7 +386,7 @@ func handleInstantiate(ctx sdk.Context, k types.ContractOpsKeeper, msg *types.Ms
 		}
 	}
 
-	contractAddr, _, err := k.Instantiate(ctx, msg.CodeID, senderAddr, adminAddr, msg.InitMsg, msg.Label, msg.Funds)
+	contractAddr, _, err := k.Instantiate(ctx, msg.CodeID, senderAddr, adminAddr, msg.Msg, msg.Label, msg.Funds)
 	if err != nil {
 		return nil, err
 	}
diff --git a/x/wasm/module_test.go b/x/wasm/module_test.go
index fd71dedec65..54c71e3654a 100644
--- a/x/wasm/module_test.go
+++ b/x/wasm/module_test.go
@@ -168,10 +168,10 @@ func TestHandleInstantiate(t *testing.T) {
 
 	// create with no balance is also legal
 	initCmd := MsgInstantiateContract{
-		Sender:  creator.String(),
-		CodeID:  firstCodeID,
-		InitMsg: initMsgBz,
-		Funds:   nil,
+		Sender: creator.String(),
+		CodeID: firstCodeID,
+		Msg:    initMsgBz,
+		Funds:  nil,
 	}
 	res, err = h(data.ctx, &initCmd)
 	require.NoError(t, err)
@@ -225,10 +225,10 @@ func TestHandleExecute(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)
@@ -346,10 +346,10 @@ func TestHandleExecuteEscrow(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)
diff --git a/x/wasm/types/proposal.go b/x/wasm/types/proposal.go
index 5692596cce7..951a123288c 100644
--- a/x/wasm/types/proposal.go
+++ b/x/wasm/types/proposal.go
@@ -185,7 +185,7 @@ func (p InstantiateContractProposal) ValidateBasic() error {
 			return err
 		}
 	}
-	if !json.Valid(p.InitMsg) {
+	if !json.Valid(p.Msg) {
 		return sdkerrors.Wrap(ErrInvalid, "init msg json")
 	}
 
@@ -201,9 +201,9 @@ func (p InstantiateContractProposal) String() string {
   Admin:       %s
   Code id:     %d
   Label:       %s
-  InitMsg:     %q
+  Msg:     %q
   Funds:       %s
-`, p.Title, p.Description, p.RunAs, p.Admin, p.CodeID, p.Label, p.InitMsg, p.Funds)
+`, p.Title, p.Description, p.RunAs, p.Admin, p.CodeID, p.Label, p.Msg, p.Funds)
 }
 
 // MarshalYAML pretty prints the init message
@@ -224,7 +224,7 @@ func (p InstantiateContractProposal) MarshalYAML() (interface{}, error) {
 		Admin:       p.Admin,
 		CodeID:      p.CodeID,
 		Label:       p.Label,
-		InitMsg:     string(p.InitMsg),
+		InitMsg:     string(p.Msg),
 		Funds:       p.Funds,
 	}, nil
 }
@@ -255,7 +255,7 @@ func (p MigrateContractProposal) ValidateBasic() error {
 	if _, err := sdk.AccAddressFromBech32(p.RunAs); err != nil {
 		return sdkerrors.Wrap(err, "run as")
 	}
-	if !json.Valid(p.MigrateMsg) {
+	if !json.Valid(p.Msg) {
 		return sdkerrors.Wrap(ErrInvalid, "migrate msg json")
 	}
 	return nil
@@ -269,8 +269,8 @@ func (p MigrateContractProposal) String() string {
   Contract:    %s
   Code id:     %d
   Run as:      %s
-  MigrateMsg   %q
-`, p.Title, p.Description, p.Contract, p.CodeID, p.RunAs, p.MigrateMsg)
+  Msg   %q
+`, p.Title, p.Description, p.Contract, p.CodeID, p.RunAs, p.Msg)
 }
 
 // MarshalYAML pretty prints the migrate message
@@ -287,7 +287,7 @@ func (p MigrateContractProposal) MarshalYAML() (interface{}, error) {
 		Description: p.Description,
 		Contract:    p.Contract,
 		CodeID:      p.CodeID,
-		MigrateMsg:  string(p.MigrateMsg),
+		MigrateMsg:  string(p.Msg),
 		RunAs:       p.RunAs,
 	}, nil
 }
diff --git a/x/wasm/types/proposal_test.go b/x/wasm/types/proposal_test.go
index 94f1bf33919..f958dba7897 100644
--- a/x/wasm/types/proposal_test.go
+++ b/x/wasm/types/proposal_test.go
@@ -198,13 +198,13 @@ func TestValidateInstantiateContractProposal(t *testing.T) {
 		},
 		"without init msg": {
 			src: InstantiateContractProposalFixture(func(p *InstantiateContractProposal) {
-				p.InitMsg = nil
+				p.Msg = nil
 			}),
 			expErr: true,
 		},
 		"with invalid init msg": {
 			src: InstantiateContractProposalFixture(func(p *InstantiateContractProposal) {
-				p.InitMsg = []byte("not a json string")
+				p.Msg = []byte("not a json string")
 			}),
 			expErr: true,
 		},
@@ -288,13 +288,13 @@ func TestValidateMigrateContractProposal(t *testing.T) {
 		},
 		"without migrate msg": {
 			src: MigrateContractProposalFixture(func(p *MigrateContractProposal) {
-				p.MigrateMsg = nil
+				p.Msg = nil
 			}),
 			expErr: true,
 		},
 		"migrate msg with invalid json": {
 			src: MigrateContractProposalFixture(func(p *MigrateContractProposal) {
-				p.MigrateMsg = []byte("not a json message")
+				p.Msg = []byte("not a json message")
 			}),
 			expErr: true,
 		},
@@ -474,7 +474,7 @@ func TestProposalStrings(t *testing.T) {
   Admin:       cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
   Code id:     1
   Label:       testing
-  InitMsg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
+  Msg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
   Funds:       1foo,2bar
 `,
 		},
@@ -487,7 +487,7 @@ func TestProposalStrings(t *testing.T) {
   Admin:       cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
   Code id:     1
   Label:       testing
-  InitMsg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
+  Msg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
   Funds:       
 `,
 		},
@@ -500,7 +500,7 @@ func TestProposalStrings(t *testing.T) {
   Admin:       
   Code id:     1
   Label:       testing
-  InitMsg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
+  Msg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
   Funds:       
 `,
 		},
@@ -512,7 +512,7 @@ func TestProposalStrings(t *testing.T) {
   Contract:    cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5
   Code id:     1
   Run as:      cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
-  MigrateMsg   "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
+  Msg   "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
 `,
 		},
 		"update admin": {
@@ -737,7 +737,7 @@ func TestUnmarshalContentFromJson(t *testing.T) {
 				Admin:       "myAdminAddress",
 				CodeID:      1,
 				Label:       "testing",
-				InitMsg:     []byte("{}"),
+				Msg:         []byte("{}"),
 				Funds:       sdk.NewCoins(sdk.NewCoin("ALX", sdk.NewInt(2)), sdk.NewCoin("BLX", sdk.NewInt(3))),
 			},
 		},
@@ -758,7 +758,7 @@ func TestUnmarshalContentFromJson(t *testing.T) {
 				RunAs:       "myRunAsAddress",
 				Contract:    "myContractAddr",
 				CodeID:      1,
-				MigrateMsg:  []byte("{}"),
+				Msg:         []byte("{}"),
 			},
 		},
 	}
diff --git a/x/wasm/types/test_fixtures.go b/x/wasm/types/test_fixtures.go
index 32c86e12b41..da0a5e52c1b 100644
--- a/x/wasm/types/test_fixtures.go
+++ b/x/wasm/types/test_fixtures.go
@@ -145,11 +145,11 @@ func MsgStoreCodeFixture(mutators ...func(*MsgStoreCode)) *MsgStoreCode {
 func MsgInstantiateContractFixture(mutators ...func(*MsgInstantiateContract)) *MsgInstantiateContract {
 	const anyAddress = "cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du"
 	r := &MsgInstantiateContract{
-		Sender:  anyAddress,
-		Admin:   anyAddress,
-		CodeID:  1,
-		Label:   "testing",
-		InitMsg: []byte(`{"foo":"bar"}`),
+		Sender: anyAddress,
+		Admin:  anyAddress,
+		CodeID: 1,
+		Label:  "testing",
+		Msg:    []byte(`{"foo":"bar"}`),
 		Funds: sdk.Coins{{
 			Denom:  "stake",
 			Amount: sdk.NewInt(1),
@@ -222,7 +222,7 @@ func InstantiateContractProposalFixture(mutators ...func(p *InstantiateContractP
 		Admin:       anyAddress,
 		CodeID:      1,
 		Label:       "testing",
-		InitMsg:     initMsgBz,
+		Msg:         initMsgBz,
 		Funds:       nil,
 	}
 
@@ -254,7 +254,7 @@ func MigrateContractProposalFixture(mutators ...func(p *MigrateContractProposal)
 		Description: "Bar",
 		Contract:    contractAddr,
 		CodeID:      1,
-		MigrateMsg:  migMsgBz,
+		Msg:         migMsgBz,
 		RunAs:       anyAddress,
 	}
 
diff --git a/x/wasm/types/tx.go b/x/wasm/types/tx.go
index 54e508bad87..4208936f0c9 100644
--- a/x/wasm/types/tx.go
+++ b/x/wasm/types/tx.go
@@ -84,7 +84,7 @@ func (msg MsgInstantiateContract) ValidateBasic() error {
 			return sdkerrors.Wrap(err, "admin")
 		}
 	}
-	if !json.Valid(msg.InitMsg) {
+	if !json.Valid(msg.Msg) {
 		return sdkerrors.Wrap(ErrInvalid, "init msg json")
 	}
 	return nil
@@ -161,7 +161,7 @@ func (msg MsgMigrateContract) ValidateBasic() error {
 	if _, err := sdk.AccAddressFromBech32(msg.Contract); err != nil {
 		return sdkerrors.Wrap(err, "contract")
 	}
-	if !json.Valid(msg.MigrateMsg) {
+	if !json.Valid(msg.Msg) {
 		return sdkerrors.Wrap(ErrInvalid, "migrate msg json")
 	}
 
diff --git a/x/wasm/types/tx_test.go b/x/wasm/types/tx_test.go
index 7f98fb7aa73..f02f6a52b13 100644
--- a/x/wasm/types/tx_test.go
+++ b/x/wasm/types/tx_test.go
@@ -149,25 +149,25 @@ func TestInstantiateContractValidation(t *testing.T) {
 		},
 		"correct minimal": {
 			msg: MsgInstantiateContract{
-				Sender:  goodAddress,
-				CodeID:  firstCodeID,
-				Label:   "foo",
-				InitMsg: []byte("{}"),
+				Sender: goodAddress,
+				CodeID: firstCodeID,
+				Label:  "foo",
+				Msg:    []byte("{}"),
 			},
 			valid: true,
 		},
 		"missing code": {
 			msg: MsgInstantiateContract{
-				Sender:  goodAddress,
-				Label:   "foo",
-				InitMsg: []byte("{}"),
+				Sender: goodAddress,
+				Label:  "foo",
+				Msg:    []byte("{}"),
 			},
 			valid: false,
 		},
 		"missing label": {
 			msg: MsgInstantiateContract{
-				Sender:  goodAddress,
-				InitMsg: []byte("{}"),
+				Sender: goodAddress,
+				Msg:    []byte("{}"),
 			},
 			valid: false,
 		},
@@ -180,29 +180,29 @@ func TestInstantiateContractValidation(t *testing.T) {
 		},
 		"bad sender minimal": {
 			msg: MsgInstantiateContract{
-				Sender:  badAddress,
-				CodeID:  firstCodeID,
-				Label:   "foo",
-				InitMsg: []byte("{}"),
+				Sender: badAddress,
+				CodeID: firstCodeID,
+				Label:  "foo",
+				Msg:    []byte("{}"),
 			},
 			valid: false,
 		},
 		"correct maximal": {
 			msg: MsgInstantiateContract{
-				Sender:  goodAddress,
-				CodeID:  firstCodeID,
-				Label:   "foo",
-				InitMsg: []byte(`{"some": "data"}`),
-				Funds:   sdk.Coins{sdk.Coin{Denom: "foobar", Amount: sdk.NewInt(200)}},
+				Sender: goodAddress,
+				CodeID: firstCodeID,
+				Label:  "foo",
+				Msg:    []byte(`{"some": "data"}`),
+				Funds:  sdk.Coins{sdk.Coin{Denom: "foobar", Amount: sdk.NewInt(200)}},
 			},
 			valid: true,
 		},
 		"negative funds": {
 			msg: MsgInstantiateContract{
-				Sender:  goodAddress,
-				CodeID:  firstCodeID,
-				Label:   "foo",
-				InitMsg: []byte(`{"some": "data"}`),
+				Sender: goodAddress,
+				CodeID: firstCodeID,
+				Label:  "foo",
+				Msg:    []byte(`{"some": "data"}`),
 				// we cannot use sdk.NewCoin() constructors as they panic on creating invalid data (before we can test)
 				Funds: sdk.Coins{sdk.Coin{Denom: "foobar", Amount: sdk.NewInt(-200)}},
 			},
@@ -210,10 +210,10 @@ func TestInstantiateContractValidation(t *testing.T) {
 		},
 		"non json init msg": {
 			msg: MsgInstantiateContract{
-				Sender:  goodAddress,
-				CodeID:  firstCodeID,
-				Label:   "foo",
-				InitMsg: []byte("invalid-json"),
+				Sender: goodAddress,
+				CodeID: firstCodeID,
+				Label:  "foo",
+				Msg:    []byte("invalid-json"),
 			},
 			valid: false,
 		},
@@ -485,10 +485,10 @@ func TestMsgMigrateContract(t *testing.T) {
 	}{
 		"all good": {
 			src: MsgMigrateContract{
-				Sender:     goodAddress,
-				Contract:   anotherGoodAddress,
-				CodeID:     firstCodeID,
-				MigrateMsg: []byte("{}"),
+				Sender:   goodAddress,
+				Contract: anotherGoodAddress,
+				CodeID:   firstCodeID,
+				Msg:      []byte("{}"),
 			},
 		},
 		"bad sender": {
@@ -530,10 +530,10 @@ func TestMsgMigrateContract(t *testing.T) {
 		},
 		"non json migrateMsg": {
 			src: MsgMigrateContract{
-				Sender:     goodAddress,
-				Contract:   anotherGoodAddress,
-				CodeID:     firstCodeID,
-				MigrateMsg: []byte("invalid json"),
+				Sender:   goodAddress,
+				Contract: anotherGoodAddress,
+				CodeID:   firstCodeID,
+				Msg:      []byte("invalid json"),
 			},
 			expErr: true,
 		},
diff --git a/x/wasm/types/wasmer_engine.go b/x/wasm/types/wasmer_engine.go
index 974b909f000..d5cfd46a234 100644
--- a/x/wasm/types/wasmer_engine.go
+++ b/x/wasm/types/wasmer_engine.go
@@ -82,7 +82,7 @@ type WasmerEngine interface {
 	// replace it. This allows it to run a migration step if needed, or return an error if unable to migrate
 	// the given data.
 	//
-	// MigrateMsg has some data on how to perform the migration.
+	// Msg has some data on how to perform the migration.
 	Migrate(
 		checksum wasmvm.Checksum,
 		env wasmvmtypes.Env,

From 6c7bb9651169eeb0dfe7050fd9353d6f579ea0c7 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:38:30 +0200
Subject: [PATCH 05/12] Rename remaining {Init,Migrate}Msg fields

---
 x/wasm/client/rest/gov.go    | 20 ++++++++++----------
 x/wasm/client/rest/new_tx.go | 10 +++++-----
 x/wasm/client/rest/tx.go     |  4 ++--
 x/wasm/types/proposal.go     |  8 ++++----
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/x/wasm/client/rest/gov.go b/x/wasm/client/rest/gov.go
index a387020b1f4..00ebd45ae06 100644
--- a/x/wasm/client/rest/gov.go
+++ b/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:"init_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,
-		Msg:         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,
-		Msg:         s.MigrateMsg,
+		Msg:         s.Msg,
 		RunAs:       s.RunAs,
 	}
 }
diff --git a/x/wasm/client/rest/new_tx.go b/x/wasm/client/rest/new_tx.go
index 6b856e42b75..4e710275493 100644
--- a/x/wasm/client/rest/new_tx.go
+++ b/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:"migrate_msg"`
 }
 
 type updateContractAdministrateReq struct {
@@ -73,7 +73,7 @@ func migrateContractHandlerFn(cliCtx client.Context) http.HandlerFunc {
 			Sender:   req.BaseReq.From,
 			Contract: contractAddr,
 			CodeID:   req.CodeID,
-			Msg:      req.MigrateMsg,
+			Msg:      req.Msg,
 		}
 		if err := msg.ValidateBasic(); err != nil {
 			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
diff --git a/x/wasm/client/rest/tx.go b/x/wasm/client/rest/tx.go
index 7842f3ed39a..fdcab24e13c 100644
--- a/x/wasm/client/rest/tx.go
+++ b/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:"init_msg"`
 }
 
 type executeContractReq struct {
@@ -105,7 +105,7 @@ func instantiateContractHandlerFn(cliCtx client.Context) http.HandlerFunc {
 			CodeID: codeID,
 			Label:  req.Label,
 			Funds:  req.Deposit,
-			Msg:    req.InitMsg,
+			Msg:    req.Msg,
 			Admin:  req.Admin,
 		}
 
diff --git a/x/wasm/types/proposal.go b/x/wasm/types/proposal.go
index 951a123288c..ae606129e19 100644
--- a/x/wasm/types/proposal.go
+++ b/x/wasm/types/proposal.go
@@ -215,7 +215,7 @@ func (p InstantiateContractProposal) MarshalYAML() (interface{}, error) {
 		Admin       string    `yaml:"admin"`
 		CodeID      uint64    `yaml:"code_id"`
 		Label       string    `yaml:"label"`
-		InitMsg     string    `yaml:"init_msg"`
+		Msg         string    `yaml:"msg"`
 		Funds       sdk.Coins `yaml:"funds"`
 	}{
 		Title:       p.Title,
@@ -224,7 +224,7 @@ func (p InstantiateContractProposal) MarshalYAML() (interface{}, error) {
 		Admin:       p.Admin,
 		CodeID:      p.CodeID,
 		Label:       p.Label,
-		InitMsg:     string(p.Msg),
+		Msg:         string(p.Msg),
 		Funds:       p.Funds,
 	}, nil
 }
@@ -280,14 +280,14 @@ func (p MigrateContractProposal) MarshalYAML() (interface{}, error) {
 		Description string `yaml:"description"`
 		Contract    string `yaml:"contract"`
 		CodeID      uint64 `yaml:"code_id"`
-		MigrateMsg  string `yaml:"msg"`
+		Msg         string `yaml:"msg"`
 		RunAs       string `yaml:"run_as"`
 	}{
 		Title:       p.Title,
 		Description: p.Description,
 		Contract:    p.Contract,
 		CodeID:      p.CodeID,
-		MigrateMsg:  string(p.Msg),
+		Msg:         string(p.Msg),
 		RunAs:       p.RunAs,
 	}, nil
 }

From fa560205094d0f0e2a0275589920cb0c00480119 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:41:18 +0200
Subject: [PATCH 06/12] Add CHANGELOG entry

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 888930ea994..9a9222c80a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@
 
 [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)
+
 ## [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)

From 7eb7814437e57e00543ffb5948bc0c5616b39a61 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:42:20 +0200
Subject: [PATCH 07/12] Update JSON/YAML parsing and test code

---
 x/wasm/client/proposal_handler_test.go |  2 +-
 x/wasm/client/rest/gov.go              |  2 +-
 x/wasm/client/rest/new_tx.go           |  2 +-
 x/wasm/client/rest/tx.go               |  2 +-
 x/wasm/types/proposal_test.go          | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/x/wasm/client/proposal_handler_test.go b/x/wasm/client/proposal_handler_test.go
index 6a289f42d73..1c238adc0ae 100644
--- a/x/wasm/client/proposal_handler_test.go
+++ b/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":         "my/builder:tag",
 				"funds":       []dict{{"denom": "ustake", "amount": "100"}},
 				"deposit":     []dict{{"denom": "ustake", "amount": "10"}},
 				"proposer":    "cosmos1ve557a5g9yw2g2z57js3pdmcvd5my6g8ze20np",
diff --git a/x/wasm/client/rest/gov.go b/x/wasm/client/rest/gov.go
index 00ebd45ae06..7a2e70abc5f 100644
--- a/x/wasm/client/rest/gov.go
+++ b/x/wasm/client/rest/gov.go
@@ -80,7 +80,7 @@ type InstantiateProposalJsonReq struct {
 	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:"init_msg"`
+	Msg   json.RawMessage `json:"msg" yaml:"msg"`
 	Funds sdk.Coins       `json:"funds" yaml:"funds"`
 }
 
diff --git a/x/wasm/client/rest/new_tx.go b/x/wasm/client/rest/new_tx.go
index 4e710275493..29591c85add 100644
--- a/x/wasm/client/rest/new_tx.go
+++ b/x/wasm/client/rest/new_tx.go
@@ -19,7 +19,7 @@ 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"`
-	Msg     []byte       `json:"msg,omitempty" yaml:"migrate_msg"`
+	Msg     []byte       `json:"msg,omitempty" yaml:"msg"`
 }
 
 type updateContractAdministrateReq struct {
diff --git a/x/wasm/client/rest/tx.go b/x/wasm/client/rest/tx.go
index fdcab24e13c..3509169a4d2 100644
--- a/x/wasm/client/rest/tx.go
+++ b/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"`
-	Msg     []byte       `json:"msg" yaml:"init_msg"`
+	Msg     []byte       `json:"msg" yaml:"msg"`
 }
 
 type executeContractReq struct {
diff --git a/x/wasm/types/proposal_test.go b/x/wasm/types/proposal_test.go
index f958dba7897..d1a620c702e 100644
--- a/x/wasm/types/proposal_test.go
+++ b/x/wasm/types/proposal_test.go
@@ -592,7 +592,7 @@ run_as: cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
 admin: cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
 code_id: 1
 label: testing
-init_msg: '{"verifier":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du","beneficiary":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du"}'
+msg: '{"verifier":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du","beneficiary":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du"}'
 funds:
 - denom: foo
   amount: "1"
@@ -608,7 +608,7 @@ run_as: cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
 admin: cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
 code_id: 1
 label: testing
-init_msg: '{"verifier":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du","beneficiary":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du"}'
+msg: '{"verifier":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du","beneficiary":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du"}'
 funds: []
 `,
 		},
@@ -620,7 +620,7 @@ run_as: cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
 admin: ""
 code_id: 1
 label: testing
-init_msg: '{"verifier":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du","beneficiary":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du"}'
+msg: '{"verifier":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du","beneficiary":"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du"}'
 funds: []
 `,
 		},
@@ -725,7 +725,7 @@ func TestUnmarshalContentFromJson(t *testing.T) {
 	"admin": "myAdminAddress",
 	"code_id": 1,
 	"funds": [{"denom": "ALX", "amount": "2"},{"denom": "BLX","amount": "3"}],
-	"init_msg": "e30=",
+	"msg": "e30=",
 	"label": "testing",
 	"run_as": "myRunAsAddress"
 }`,
@@ -748,7 +748,7 @@ func TestUnmarshalContentFromJson(t *testing.T) {
 	"description": "bar",
 	"code_id": 1,
 	"contract": "myContractAddr",
-	"migrate_msg": "e30=",
+	"msg": "e30=",
 	"run_as": "myRunAsAddress"
 }`,
 			got: &MigrateContractProposal{},

From 43f698be6f89f16d8b666fd06d335fd63362f16a Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:44:41 +0200
Subject: [PATCH 08/12] Move proto files to v1

---
 .../wasm/{v1beta1 => v1}/genesis.proto        |  6 +++---
 proto/cosmwasm/wasm/{v1beta1 => v1}/ibc.proto |  2 +-
 .../wasm/{v1beta1 => v1}/proposal.proto       |  4 ++--
 .../cosmwasm/wasm/{v1beta1 => v1}/query.proto | 20 +++++++++----------
 proto/cosmwasm/wasm/{v1beta1 => v1}/tx.proto  |  4 ++--
 .../cosmwasm/wasm/{v1beta1 => v1}/types.proto |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)
 rename proto/cosmwasm/wasm/{v1beta1 => v1}/genesis.proto (93%)
 rename proto/cosmwasm/wasm/{v1beta1 => v1}/ibc.proto (97%)
 rename proto/cosmwasm/wasm/{v1beta1 => v1}/proposal.proto (98%)
 rename proto/cosmwasm/wasm/{v1beta1 => v1}/query.proto (91%)
 rename proto/cosmwasm/wasm/{v1beta1 => v1}/tx.proto (98%)
 rename proto/cosmwasm/wasm/{v1beta1 => v1}/types.proto (99%)

diff --git a/proto/cosmwasm/wasm/v1beta1/genesis.proto b/proto/cosmwasm/wasm/v1/genesis.proto
similarity index 93%
rename from proto/cosmwasm/wasm/v1beta1/genesis.proto
rename to proto/cosmwasm/wasm/v1/genesis.proto
index c00fd066bc0..f02f3307503 100644
--- a/proto/cosmwasm/wasm/v1beta1/genesis.proto
+++ b/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";
 
diff --git a/proto/cosmwasm/wasm/v1beta1/ibc.proto b/proto/cosmwasm/wasm/v1/ibc.proto
similarity index 97%
rename from proto/cosmwasm/wasm/v1beta1/ibc.proto
rename to proto/cosmwasm/wasm/v1/ibc.proto
index e0462c34b84..1b30d315c98 100644
--- a/proto/cosmwasm/wasm/v1beta1/ibc.proto
+++ b/proto/cosmwasm/wasm/v1/ibc.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package cosmwasm.wasm.v1beta1;
+package cosmwasm.wasm.v1;
 
 import "gogoproto/gogo.proto";
 
diff --git a/proto/cosmwasm/wasm/v1beta1/proposal.proto b/proto/cosmwasm/wasm/v1/proposal.proto
similarity index 98%
rename from proto/cosmwasm/wasm/v1beta1/proposal.proto
rename to proto/cosmwasm/wasm/v1/proposal.proto
index f92f89b3d0c..cca5db20383 100644
--- a/proto/cosmwasm/wasm/v1beta1/proposal.proto
+++ b/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;
diff --git a/proto/cosmwasm/wasm/v1beta1/query.proto b/proto/cosmwasm/wasm/v1/query.proto
similarity index 91%
rename from proto/cosmwasm/wasm/v1beta1/query.proto
rename to proto/cosmwasm/wasm/v1/query.proto
index 3f96cc68f10..a64f93f6634 100644
--- a/proto/cosmwasm/wasm/v1beta1/query.proto
+++ b/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";
   }
 }
 
diff --git a/proto/cosmwasm/wasm/v1beta1/tx.proto b/proto/cosmwasm/wasm/v1/tx.proto
similarity index 98%
rename from proto/cosmwasm/wasm/v1beta1/tx.proto
rename to proto/cosmwasm/wasm/v1/tx.proto
index a78cefee6c1..27128fa6400 100644
--- a/proto/cosmwasm/wasm/v1beta1/tx.proto
+++ b/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;
diff --git a/proto/cosmwasm/wasm/v1beta1/types.proto b/proto/cosmwasm/wasm/v1/types.proto
similarity index 99%
rename from proto/cosmwasm/wasm/v1beta1/types.proto
rename to proto/cosmwasm/wasm/v1/types.proto
index 6e17eeae0fd..39f93558514 100644
--- a/proto/cosmwasm/wasm/v1beta1/types.proto
+++ b/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";

From 0ebb1efb9e04f6ee3477c1758c252dee4a3b6f92 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:45:17 +0200
Subject: [PATCH 09/12] Recompile protobuf files

---
 docs/proto/proto-docs.md    | 336 ++++++++++++++++++------------------
 x/wasm/types/genesis.pb.go  | 118 +++++++------
 x/wasm/types/ibc.pb.go      |  58 +++----
 x/wasm/types/proposal.pb.go | 131 +++++++-------
 x/wasm/types/query.pb.go    | 254 +++++++++++++--------------
 x/wasm/types/query.pb.gw.go |  18 +-
 x/wasm/types/tx.pb.go       | 184 ++++++++++----------
 x/wasm/types/types.pb.go    | 212 +++++++++++------------
 8 files changed, 654 insertions(+), 657 deletions(-)

diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
index 2bef8e8998e..38684d0fc7b 100644
--- a/docs/proto/proto-docs.md
+++ b/docs/proto/proto-docs.md
@@ -4,88 +4,88 @@
 
 ## Table of Contents
 
-- [cosmwasm/wasm/v1beta1/types.proto](#cosmwasm/wasm/v1beta1/types.proto)
-    - [AbsoluteTxPosition](#cosmwasm.wasm.v1beta1.AbsoluteTxPosition)
-    - [AccessConfig](#cosmwasm.wasm.v1beta1.AccessConfig)
-    - [AccessTypeParam](#cosmwasm.wasm.v1beta1.AccessTypeParam)
-    - [CodeInfo](#cosmwasm.wasm.v1beta1.CodeInfo)
-    - [ContractCodeHistoryEntry](#cosmwasm.wasm.v1beta1.ContractCodeHistoryEntry)
-    - [ContractInfo](#cosmwasm.wasm.v1beta1.ContractInfo)
-    - [Model](#cosmwasm.wasm.v1beta1.Model)
-    - [Params](#cosmwasm.wasm.v1beta1.Params)
+- [cosmwasm/wasm/v1/types.proto](#cosmwasm/wasm/v1/types.proto)
+    - [AbsoluteTxPosition](#cosmwasm.wasm.v1.AbsoluteTxPosition)
+    - [AccessConfig](#cosmwasm.wasm.v1.AccessConfig)
+    - [AccessTypeParam](#cosmwasm.wasm.v1.AccessTypeParam)
+    - [CodeInfo](#cosmwasm.wasm.v1.CodeInfo)
+    - [ContractCodeHistoryEntry](#cosmwasm.wasm.v1.ContractCodeHistoryEntry)
+    - [ContractInfo](#cosmwasm.wasm.v1.ContractInfo)
+    - [Model](#cosmwasm.wasm.v1.Model)
+    - [Params](#cosmwasm.wasm.v1.Params)
   
-    - [AccessType](#cosmwasm.wasm.v1beta1.AccessType)
-    - [ContractCodeHistoryOperationType](#cosmwasm.wasm.v1beta1.ContractCodeHistoryOperationType)
+    - [AccessType](#cosmwasm.wasm.v1.AccessType)
+    - [ContractCodeHistoryOperationType](#cosmwasm.wasm.v1.ContractCodeHistoryOperationType)
   
-- [cosmwasm/wasm/v1beta1/tx.proto](#cosmwasm/wasm/v1beta1/tx.proto)
-    - [MsgClearAdmin](#cosmwasm.wasm.v1beta1.MsgClearAdmin)
-    - [MsgClearAdminResponse](#cosmwasm.wasm.v1beta1.MsgClearAdminResponse)
-    - [MsgExecuteContract](#cosmwasm.wasm.v1beta1.MsgExecuteContract)
-    - [MsgExecuteContractResponse](#cosmwasm.wasm.v1beta1.MsgExecuteContractResponse)
-    - [MsgInstantiateContract](#cosmwasm.wasm.v1beta1.MsgInstantiateContract)
-    - [MsgInstantiateContractResponse](#cosmwasm.wasm.v1beta1.MsgInstantiateContractResponse)
-    - [MsgMigrateContract](#cosmwasm.wasm.v1beta1.MsgMigrateContract)
-    - [MsgMigrateContractResponse](#cosmwasm.wasm.v1beta1.MsgMigrateContractResponse)
-    - [MsgStoreCode](#cosmwasm.wasm.v1beta1.MsgStoreCode)
-    - [MsgStoreCodeResponse](#cosmwasm.wasm.v1beta1.MsgStoreCodeResponse)
-    - [MsgUpdateAdmin](#cosmwasm.wasm.v1beta1.MsgUpdateAdmin)
-    - [MsgUpdateAdminResponse](#cosmwasm.wasm.v1beta1.MsgUpdateAdminResponse)
+- [cosmwasm/wasm/v1/tx.proto](#cosmwasm/wasm/v1/tx.proto)
+    - [MsgClearAdmin](#cosmwasm.wasm.v1.MsgClearAdmin)
+    - [MsgClearAdminResponse](#cosmwasm.wasm.v1.MsgClearAdminResponse)
+    - [MsgExecuteContract](#cosmwasm.wasm.v1.MsgExecuteContract)
+    - [MsgExecuteContractResponse](#cosmwasm.wasm.v1.MsgExecuteContractResponse)
+    - [MsgInstantiateContract](#cosmwasm.wasm.v1.MsgInstantiateContract)
+    - [MsgInstantiateContractResponse](#cosmwasm.wasm.v1.MsgInstantiateContractResponse)
+    - [MsgMigrateContract](#cosmwasm.wasm.v1.MsgMigrateContract)
+    - [MsgMigrateContractResponse](#cosmwasm.wasm.v1.MsgMigrateContractResponse)
+    - [MsgStoreCode](#cosmwasm.wasm.v1.MsgStoreCode)
+    - [MsgStoreCodeResponse](#cosmwasm.wasm.v1.MsgStoreCodeResponse)
+    - [MsgUpdateAdmin](#cosmwasm.wasm.v1.MsgUpdateAdmin)
+    - [MsgUpdateAdminResponse](#cosmwasm.wasm.v1.MsgUpdateAdminResponse)
   
-    - [Msg](#cosmwasm.wasm.v1beta1.Msg)
+    - [Msg](#cosmwasm.wasm.v1.Msg)
   
-- [cosmwasm/wasm/v1beta1/genesis.proto](#cosmwasm/wasm/v1beta1/genesis.proto)
-    - [Code](#cosmwasm.wasm.v1beta1.Code)
-    - [Contract](#cosmwasm.wasm.v1beta1.Contract)
-    - [GenesisState](#cosmwasm.wasm.v1beta1.GenesisState)
-    - [GenesisState.GenMsgs](#cosmwasm.wasm.v1beta1.GenesisState.GenMsgs)
-    - [Sequence](#cosmwasm.wasm.v1beta1.Sequence)
+- [cosmwasm/wasm/v1/genesis.proto](#cosmwasm/wasm/v1/genesis.proto)
+    - [Code](#cosmwasm.wasm.v1.Code)
+    - [Contract](#cosmwasm.wasm.v1.Contract)
+    - [GenesisState](#cosmwasm.wasm.v1.GenesisState)
+    - [GenesisState.GenMsgs](#cosmwasm.wasm.v1.GenesisState.GenMsgs)
+    - [Sequence](#cosmwasm.wasm.v1.Sequence)
   
-- [cosmwasm/wasm/v1beta1/ibc.proto](#cosmwasm/wasm/v1beta1/ibc.proto)
-    - [MsgIBCCloseChannel](#cosmwasm.wasm.v1beta1.MsgIBCCloseChannel)
-    - [MsgIBCSend](#cosmwasm.wasm.v1beta1.MsgIBCSend)
+- [cosmwasm/wasm/v1/ibc.proto](#cosmwasm/wasm/v1/ibc.proto)
+    - [MsgIBCCloseChannel](#cosmwasm.wasm.v1.MsgIBCCloseChannel)
+    - [MsgIBCSend](#cosmwasm.wasm.v1.MsgIBCSend)
   
-- [cosmwasm/wasm/v1beta1/proposal.proto](#cosmwasm/wasm/v1beta1/proposal.proto)
-    - [ClearAdminProposal](#cosmwasm.wasm.v1beta1.ClearAdminProposal)
-    - [InstantiateContractProposal](#cosmwasm.wasm.v1beta1.InstantiateContractProposal)
-    - [MigrateContractProposal](#cosmwasm.wasm.v1beta1.MigrateContractProposal)
-    - [PinCodesProposal](#cosmwasm.wasm.v1beta1.PinCodesProposal)
-    - [StoreCodeProposal](#cosmwasm.wasm.v1beta1.StoreCodeProposal)
-    - [UnpinCodesProposal](#cosmwasm.wasm.v1beta1.UnpinCodesProposal)
-    - [UpdateAdminProposal](#cosmwasm.wasm.v1beta1.UpdateAdminProposal)
+- [cosmwasm/wasm/v1/proposal.proto](#cosmwasm/wasm/v1/proposal.proto)
+    - [ClearAdminProposal](#cosmwasm.wasm.v1.ClearAdminProposal)
+    - [InstantiateContractProposal](#cosmwasm.wasm.v1.InstantiateContractProposal)
+    - [MigrateContractProposal](#cosmwasm.wasm.v1.MigrateContractProposal)
+    - [PinCodesProposal](#cosmwasm.wasm.v1.PinCodesProposal)
+    - [StoreCodeProposal](#cosmwasm.wasm.v1.StoreCodeProposal)
+    - [UnpinCodesProposal](#cosmwasm.wasm.v1.UnpinCodesProposal)
+    - [UpdateAdminProposal](#cosmwasm.wasm.v1.UpdateAdminProposal)
   
-- [cosmwasm/wasm/v1beta1/query.proto](#cosmwasm/wasm/v1beta1/query.proto)
-    - [CodeInfoResponse](#cosmwasm.wasm.v1beta1.CodeInfoResponse)
-    - [QueryAllContractStateRequest](#cosmwasm.wasm.v1beta1.QueryAllContractStateRequest)
-    - [QueryAllContractStateResponse](#cosmwasm.wasm.v1beta1.QueryAllContractStateResponse)
-    - [QueryCodeRequest](#cosmwasm.wasm.v1beta1.QueryCodeRequest)
-    - [QueryCodeResponse](#cosmwasm.wasm.v1beta1.QueryCodeResponse)
-    - [QueryCodesRequest](#cosmwasm.wasm.v1beta1.QueryCodesRequest)
-    - [QueryCodesResponse](#cosmwasm.wasm.v1beta1.QueryCodesResponse)
-    - [QueryContractHistoryRequest](#cosmwasm.wasm.v1beta1.QueryContractHistoryRequest)
-    - [QueryContractHistoryResponse](#cosmwasm.wasm.v1beta1.QueryContractHistoryResponse)
-    - [QueryContractInfoRequest](#cosmwasm.wasm.v1beta1.QueryContractInfoRequest)
-    - [QueryContractInfoResponse](#cosmwasm.wasm.v1beta1.QueryContractInfoResponse)
-    - [QueryContractsByCodeRequest](#cosmwasm.wasm.v1beta1.QueryContractsByCodeRequest)
-    - [QueryContractsByCodeResponse](#cosmwasm.wasm.v1beta1.QueryContractsByCodeResponse)
-    - [QueryRawContractStateRequest](#cosmwasm.wasm.v1beta1.QueryRawContractStateRequest)
-    - [QueryRawContractStateResponse](#cosmwasm.wasm.v1beta1.QueryRawContractStateResponse)
-    - [QuerySmartContractStateRequest](#cosmwasm.wasm.v1beta1.QuerySmartContractStateRequest)
-    - [QuerySmartContractStateResponse](#cosmwasm.wasm.v1beta1.QuerySmartContractStateResponse)
+- [cosmwasm/wasm/v1/query.proto](#cosmwasm/wasm/v1/query.proto)
+    - [CodeInfoResponse](#cosmwasm.wasm.v1.CodeInfoResponse)
+    - [QueryAllContractStateRequest](#cosmwasm.wasm.v1.QueryAllContractStateRequest)
+    - [QueryAllContractStateResponse](#cosmwasm.wasm.v1.QueryAllContractStateResponse)
+    - [QueryCodeRequest](#cosmwasm.wasm.v1.QueryCodeRequest)
+    - [QueryCodeResponse](#cosmwasm.wasm.v1.QueryCodeResponse)
+    - [QueryCodesRequest](#cosmwasm.wasm.v1.QueryCodesRequest)
+    - [QueryCodesResponse](#cosmwasm.wasm.v1.QueryCodesResponse)
+    - [QueryContractHistoryRequest](#cosmwasm.wasm.v1.QueryContractHistoryRequest)
+    - [QueryContractHistoryResponse](#cosmwasm.wasm.v1.QueryContractHistoryResponse)
+    - [QueryContractInfoRequest](#cosmwasm.wasm.v1.QueryContractInfoRequest)
+    - [QueryContractInfoResponse](#cosmwasm.wasm.v1.QueryContractInfoResponse)
+    - [QueryContractsByCodeRequest](#cosmwasm.wasm.v1.QueryContractsByCodeRequest)
+    - [QueryContractsByCodeResponse](#cosmwasm.wasm.v1.QueryContractsByCodeResponse)
+    - [QueryRawContractStateRequest](#cosmwasm.wasm.v1.QueryRawContractStateRequest)
+    - [QueryRawContractStateResponse](#cosmwasm.wasm.v1.QueryRawContractStateResponse)
+    - [QuerySmartContractStateRequest](#cosmwasm.wasm.v1.QuerySmartContractStateRequest)
+    - [QuerySmartContractStateResponse](#cosmwasm.wasm.v1.QuerySmartContractStateResponse)
   
-    - [Query](#cosmwasm.wasm.v1beta1.Query)
+    - [Query](#cosmwasm.wasm.v1.Query)
   
 - [Scalar Value Types](#scalar-value-types)
 
 
 
-<a name="cosmwasm/wasm/v1beta1/types.proto"></a>
+<a name="cosmwasm/wasm/v1/types.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## cosmwasm/wasm/v1beta1/types.proto
+## cosmwasm/wasm/v1/types.proto
 
 
 
-<a name="cosmwasm.wasm.v1beta1.AbsoluteTxPosition"></a>
+<a name="cosmwasm.wasm.v1.AbsoluteTxPosition"></a>
 
 ### AbsoluteTxPosition
 AbsoluteTxPosition is a unique transaction position that allows for global
@@ -102,7 +102,7 @@ ordering of transactions.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.AccessConfig"></a>
+<a name="cosmwasm.wasm.v1.AccessConfig"></a>
 
 ### AccessConfig
 AccessConfig access control type.
@@ -110,7 +110,7 @@ AccessConfig access control type.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `permission` | [AccessType](#cosmwasm.wasm.v1beta1.AccessType) |  |  |
+| `permission` | [AccessType](#cosmwasm.wasm.v1.AccessType) |  |  |
 | `address` | [string](#string) |  |  |
 
 
@@ -118,7 +118,7 @@ AccessConfig access control type.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.AccessTypeParam"></a>
+<a name="cosmwasm.wasm.v1.AccessTypeParam"></a>
 
 ### AccessTypeParam
 AccessTypeParam
@@ -126,14 +126,14 @@ AccessTypeParam
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `value` | [AccessType](#cosmwasm.wasm.v1beta1.AccessType) |  |  |
+| `value` | [AccessType](#cosmwasm.wasm.v1.AccessType) |  |  |
 
 
 
 
 
 
-<a name="cosmwasm.wasm.v1beta1.CodeInfo"></a>
+<a name="cosmwasm.wasm.v1.CodeInfo"></a>
 
 ### CodeInfo
 CodeInfo is data for the uploaded contract WASM code
@@ -145,14 +145,14 @@ CodeInfo is data for the uploaded contract WASM code
 | `creator` | [string](#string) |  | Creator address who initially stored the code |
 | `source` | [string](#string) |  | Source is a valid absolute HTTPS URI to the contract's source code, optional |
 | `builder` | [string](#string) |  | Builder is a valid docker image name with tag, optional |
-| `instantiate_config` | [AccessConfig](#cosmwasm.wasm.v1beta1.AccessConfig) |  | InstantiateConfig access control to apply on contract creation, optional |
+| `instantiate_config` | [AccessConfig](#cosmwasm.wasm.v1.AccessConfig) |  | InstantiateConfig access control to apply on contract creation, optional |
 
 
 
 
 
 
-<a name="cosmwasm.wasm.v1beta1.ContractCodeHistoryEntry"></a>
+<a name="cosmwasm.wasm.v1.ContractCodeHistoryEntry"></a>
 
 ### ContractCodeHistoryEntry
 ContractCodeHistoryEntry metadata to a contract.
@@ -160,9 +160,9 @@ ContractCodeHistoryEntry metadata to a contract.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `operation` | [ContractCodeHistoryOperationType](#cosmwasm.wasm.v1beta1.ContractCodeHistoryOperationType) |  |  |
+| `operation` | [ContractCodeHistoryOperationType](#cosmwasm.wasm.v1.ContractCodeHistoryOperationType) |  |  |
 | `code_id` | [uint64](#uint64) |  | CodeID is the reference to the stored WASM code |
-| `updated` | [AbsoluteTxPosition](#cosmwasm.wasm.v1beta1.AbsoluteTxPosition) |  | Updated Tx position when the operation was executed. |
+| `updated` | [AbsoluteTxPosition](#cosmwasm.wasm.v1.AbsoluteTxPosition) |  | Updated Tx position when the operation was executed. |
 | `msg` | [bytes](#bytes) |  |  |
 
 
@@ -170,7 +170,7 @@ ContractCodeHistoryEntry metadata to a contract.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.ContractInfo"></a>
+<a name="cosmwasm.wasm.v1.ContractInfo"></a>
 
 ### ContractInfo
 ContractInfo stores a WASM contract instance
@@ -182,7 +182,7 @@ ContractInfo stores a WASM contract instance
 | `creator` | [string](#string) |  | Creator address who initially instantiated the contract |
 | `admin` | [string](#string) |  | Admin is an optional address that can execute migrations |
 | `label` | [string](#string) |  | Label is optional metadata to be stored with a contract instance. |
-| `created` | [AbsoluteTxPosition](#cosmwasm.wasm.v1beta1.AbsoluteTxPosition) |  | Created Tx position when the contract was instantiated. This data should kept internal and not be exposed via query results. Just use for sorting |
+| `created` | [AbsoluteTxPosition](#cosmwasm.wasm.v1.AbsoluteTxPosition) |  | Created Tx position when the contract was instantiated. This data should kept internal and not be exposed via query results. Just use for sorting |
 | `ibc_port_id` | [string](#string) |  |  |
 | `extension` | [google.protobuf.Any](#google.protobuf.Any) |  | Extension is an extension point to store custom metadata within the persistence model. |
 
@@ -191,7 +191,7 @@ ContractInfo stores a WASM contract instance
 
 
 
-<a name="cosmwasm.wasm.v1beta1.Model"></a>
+<a name="cosmwasm.wasm.v1.Model"></a>
 
 ### Model
 Model is a struct that holds a KV pair
@@ -207,7 +207,7 @@ Model is a struct that holds a KV pair
 
 
 
-<a name="cosmwasm.wasm.v1beta1.Params"></a>
+<a name="cosmwasm.wasm.v1.Params"></a>
 
 ### Params
 Params defines the set of wasm parameters.
@@ -215,8 +215,8 @@ Params defines the set of wasm parameters.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `code_upload_access` | [AccessConfig](#cosmwasm.wasm.v1beta1.AccessConfig) |  |  |
-| `instantiate_default_permission` | [AccessType](#cosmwasm.wasm.v1beta1.AccessType) |  |  |
+| `code_upload_access` | [AccessConfig](#cosmwasm.wasm.v1.AccessConfig) |  |  |
+| `instantiate_default_permission` | [AccessType](#cosmwasm.wasm.v1.AccessType) |  |  |
 | `max_wasm_code_size` | [uint64](#uint64) |  |  |
 
 
@@ -226,7 +226,7 @@ Params defines the set of wasm parameters.
  <!-- end messages -->
 
 
-<a name="cosmwasm.wasm.v1beta1.AccessType"></a>
+<a name="cosmwasm.wasm.v1.AccessType"></a>
 
 ### AccessType
 AccessType permission types
@@ -240,7 +240,7 @@ AccessType permission types
 
 
 
-<a name="cosmwasm.wasm.v1beta1.ContractCodeHistoryOperationType"></a>
+<a name="cosmwasm.wasm.v1.ContractCodeHistoryOperationType"></a>
 
 ### ContractCodeHistoryOperationType
 ContractCodeHistoryOperationType actions that caused a code change
@@ -261,14 +261,14 @@ ContractCodeHistoryOperationType actions that caused a code change
 
 
 
-<a name="cosmwasm/wasm/v1beta1/tx.proto"></a>
+<a name="cosmwasm/wasm/v1/tx.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## cosmwasm/wasm/v1beta1/tx.proto
+## cosmwasm/wasm/v1/tx.proto
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgClearAdmin"></a>
+<a name="cosmwasm.wasm.v1.MsgClearAdmin"></a>
 
 ### MsgClearAdmin
 MsgClearAdmin removes any admin stored for a smart contract
@@ -284,7 +284,7 @@ MsgClearAdmin removes any admin stored for a smart contract
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgClearAdminResponse"></a>
+<a name="cosmwasm.wasm.v1.MsgClearAdminResponse"></a>
 
 ### MsgClearAdminResponse
 MsgClearAdminResponse returns empty data
@@ -294,7 +294,7 @@ MsgClearAdminResponse returns empty data
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgExecuteContract"></a>
+<a name="cosmwasm.wasm.v1.MsgExecuteContract"></a>
 
 ### MsgExecuteContract
 MsgExecuteContract submits the given message data to a smart contract
@@ -312,7 +312,7 @@ MsgExecuteContract submits the given message data to a smart contract
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgExecuteContractResponse"></a>
+<a name="cosmwasm.wasm.v1.MsgExecuteContractResponse"></a>
 
 ### MsgExecuteContractResponse
 MsgExecuteContractResponse returns execution result data.
@@ -327,7 +327,7 @@ MsgExecuteContractResponse returns execution result data.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgInstantiateContract"></a>
+<a name="cosmwasm.wasm.v1.MsgInstantiateContract"></a>
 
 ### MsgInstantiateContract
 MsgInstantiateContract create a new smart contract instance for the given
@@ -348,7 +348,7 @@ code id.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgInstantiateContractResponse"></a>
+<a name="cosmwasm.wasm.v1.MsgInstantiateContractResponse"></a>
 
 ### MsgInstantiateContractResponse
 MsgInstantiateContractResponse return instantiation result data
@@ -364,7 +364,7 @@ MsgInstantiateContractResponse return instantiation result data
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgMigrateContract"></a>
+<a name="cosmwasm.wasm.v1.MsgMigrateContract"></a>
 
 ### MsgMigrateContract
 MsgMigrateContract runs a code upgrade/ downgrade for a smart contract
@@ -382,7 +382,7 @@ MsgMigrateContract runs a code upgrade/ downgrade for a smart contract
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgMigrateContractResponse"></a>
+<a name="cosmwasm.wasm.v1.MsgMigrateContractResponse"></a>
 
 ### MsgMigrateContractResponse
 MsgMigrateContractResponse returns contract migration result data.
@@ -397,7 +397,7 @@ MsgMigrateContractResponse returns contract migration result data.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgStoreCode"></a>
+<a name="cosmwasm.wasm.v1.MsgStoreCode"></a>
 
 ### MsgStoreCode
 MsgStoreCode submit Wasm code to the system
@@ -409,14 +409,14 @@ MsgStoreCode submit Wasm code to the system
 | `wasm_byte_code` | [bytes](#bytes) |  | WASMByteCode can be raw or gzip compressed |
 | `source` | [string](#string) |  | Source is a valid absolute HTTPS URI to the contract's source code, optional |
 | `builder` | [string](#string) |  | Builder is a valid docker image name with tag, optional |
-| `instantiate_permission` | [AccessConfig](#cosmwasm.wasm.v1beta1.AccessConfig) |  | InstantiatePermission access control to apply on contract creation, optional |
+| `instantiate_permission` | [AccessConfig](#cosmwasm.wasm.v1.AccessConfig) |  | InstantiatePermission access control to apply on contract creation, optional |
 
 
 
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgStoreCodeResponse"></a>
+<a name="cosmwasm.wasm.v1.MsgStoreCodeResponse"></a>
 
 ### MsgStoreCodeResponse
 MsgStoreCodeResponse returns store result data.
@@ -431,7 +431,7 @@ MsgStoreCodeResponse returns store result data.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgUpdateAdmin"></a>
+<a name="cosmwasm.wasm.v1.MsgUpdateAdmin"></a>
 
 ### MsgUpdateAdmin
 MsgUpdateAdmin sets a new admin for a smart contract
@@ -448,7 +448,7 @@ MsgUpdateAdmin sets a new admin for a smart contract
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgUpdateAdminResponse"></a>
+<a name="cosmwasm.wasm.v1.MsgUpdateAdminResponse"></a>
 
 ### MsgUpdateAdminResponse
 MsgUpdateAdminResponse returns empty data
@@ -464,32 +464,32 @@ MsgUpdateAdminResponse returns empty data
  <!-- end HasExtensions -->
 
 
-<a name="cosmwasm.wasm.v1beta1.Msg"></a>
+<a name="cosmwasm.wasm.v1.Msg"></a>
 
 ### Msg
 Msg defines the wasm Msg service.
 
 | Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
 | ----------- | ------------ | ------------- | ------------| ------- | -------- |
-| `StoreCode` | [MsgStoreCode](#cosmwasm.wasm.v1beta1.MsgStoreCode) | [MsgStoreCodeResponse](#cosmwasm.wasm.v1beta1.MsgStoreCodeResponse) | StoreCode to submit Wasm code to the system | |
-| `InstantiateContract` | [MsgInstantiateContract](#cosmwasm.wasm.v1beta1.MsgInstantiateContract) | [MsgInstantiateContractResponse](#cosmwasm.wasm.v1beta1.MsgInstantiateContractResponse) | Instantiate creates a new smart contract instance for the given code id. | |
-| `ExecuteContract` | [MsgExecuteContract](#cosmwasm.wasm.v1beta1.MsgExecuteContract) | [MsgExecuteContractResponse](#cosmwasm.wasm.v1beta1.MsgExecuteContractResponse) | Execute submits the given message data to a smart contract | |
-| `MigrateContract` | [MsgMigrateContract](#cosmwasm.wasm.v1beta1.MsgMigrateContract) | [MsgMigrateContractResponse](#cosmwasm.wasm.v1beta1.MsgMigrateContractResponse) | Migrate runs a code upgrade/ downgrade for a smart contract | |
-| `UpdateAdmin` | [MsgUpdateAdmin](#cosmwasm.wasm.v1beta1.MsgUpdateAdmin) | [MsgUpdateAdminResponse](#cosmwasm.wasm.v1beta1.MsgUpdateAdminResponse) | UpdateAdmin sets a new admin for a smart contract | |
-| `ClearAdmin` | [MsgClearAdmin](#cosmwasm.wasm.v1beta1.MsgClearAdmin) | [MsgClearAdminResponse](#cosmwasm.wasm.v1beta1.MsgClearAdminResponse) | ClearAdmin removes any admin stored for a smart contract | |
+| `StoreCode` | [MsgStoreCode](#cosmwasm.wasm.v1.MsgStoreCode) | [MsgStoreCodeResponse](#cosmwasm.wasm.v1.MsgStoreCodeResponse) | StoreCode to submit Wasm code to the system | |
+| `InstantiateContract` | [MsgInstantiateContract](#cosmwasm.wasm.v1.MsgInstantiateContract) | [MsgInstantiateContractResponse](#cosmwasm.wasm.v1.MsgInstantiateContractResponse) | Instantiate creates a new smart contract instance for the given code id. | |
+| `ExecuteContract` | [MsgExecuteContract](#cosmwasm.wasm.v1.MsgExecuteContract) | [MsgExecuteContractResponse](#cosmwasm.wasm.v1.MsgExecuteContractResponse) | Execute submits the given message data to a smart contract | |
+| `MigrateContract` | [MsgMigrateContract](#cosmwasm.wasm.v1.MsgMigrateContract) | [MsgMigrateContractResponse](#cosmwasm.wasm.v1.MsgMigrateContractResponse) | Migrate runs a code upgrade/ downgrade for a smart contract | |
+| `UpdateAdmin` | [MsgUpdateAdmin](#cosmwasm.wasm.v1.MsgUpdateAdmin) | [MsgUpdateAdminResponse](#cosmwasm.wasm.v1.MsgUpdateAdminResponse) | UpdateAdmin sets a new admin for a smart contract | |
+| `ClearAdmin` | [MsgClearAdmin](#cosmwasm.wasm.v1.MsgClearAdmin) | [MsgClearAdminResponse](#cosmwasm.wasm.v1.MsgClearAdminResponse) | ClearAdmin removes any admin stored for a smart contract | |
 
  <!-- end services -->
 
 
 
-<a name="cosmwasm/wasm/v1beta1/genesis.proto"></a>
+<a name="cosmwasm/wasm/v1/genesis.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## cosmwasm/wasm/v1beta1/genesis.proto
+## cosmwasm/wasm/v1/genesis.proto
 
 
 
-<a name="cosmwasm.wasm.v1beta1.Code"></a>
+<a name="cosmwasm.wasm.v1.Code"></a>
 
 ### Code
 Code struct encompasses CodeInfo and CodeBytes
@@ -498,7 +498,7 @@ Code struct encompasses CodeInfo and CodeBytes
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `code_id` | [uint64](#uint64) |  |  |
-| `code_info` | [CodeInfo](#cosmwasm.wasm.v1beta1.CodeInfo) |  |  |
+| `code_info` | [CodeInfo](#cosmwasm.wasm.v1.CodeInfo) |  |  |
 | `code_bytes` | [bytes](#bytes) |  |  |
 | `pinned` | [bool](#bool) |  | Pinned to wasmvm cache |
 
@@ -507,7 +507,7 @@ Code struct encompasses CodeInfo and CodeBytes
 
 
 
-<a name="cosmwasm.wasm.v1beta1.Contract"></a>
+<a name="cosmwasm.wasm.v1.Contract"></a>
 
 ### Contract
 Contract struct encompasses ContractAddress, ContractInfo, and ContractState
@@ -516,15 +516,15 @@ Contract struct encompasses ContractAddress, ContractInfo, and ContractState
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `contract_address` | [string](#string) |  |  |
-| `contract_info` | [ContractInfo](#cosmwasm.wasm.v1beta1.ContractInfo) |  |  |
-| `contract_state` | [Model](#cosmwasm.wasm.v1beta1.Model) | repeated |  |
+| `contract_info` | [ContractInfo](#cosmwasm.wasm.v1.ContractInfo) |  |  |
+| `contract_state` | [Model](#cosmwasm.wasm.v1.Model) | repeated |  |
 
 
 
 
 
 
-<a name="cosmwasm.wasm.v1beta1.GenesisState"></a>
+<a name="cosmwasm.wasm.v1.GenesisState"></a>
 
 ### GenesisState
 GenesisState - genesis state of x/wasm
@@ -532,18 +532,18 @@ GenesisState - genesis state of x/wasm
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `params` | [Params](#cosmwasm.wasm.v1beta1.Params) |  |  |
-| `codes` | [Code](#cosmwasm.wasm.v1beta1.Code) | repeated |  |
-| `contracts` | [Contract](#cosmwasm.wasm.v1beta1.Contract) | repeated |  |
-| `sequences` | [Sequence](#cosmwasm.wasm.v1beta1.Sequence) | repeated |  |
-| `gen_msgs` | [GenesisState.GenMsgs](#cosmwasm.wasm.v1beta1.GenesisState.GenMsgs) | repeated |  |
+| `params` | [Params](#cosmwasm.wasm.v1.Params) |  |  |
+| `codes` | [Code](#cosmwasm.wasm.v1.Code) | repeated |  |
+| `contracts` | [Contract](#cosmwasm.wasm.v1.Contract) | repeated |  |
+| `sequences` | [Sequence](#cosmwasm.wasm.v1.Sequence) | repeated |  |
+| `gen_msgs` | [GenesisState.GenMsgs](#cosmwasm.wasm.v1.GenesisState.GenMsgs) | repeated |  |
 
 
 
 
 
 
-<a name="cosmwasm.wasm.v1beta1.GenesisState.GenMsgs"></a>
+<a name="cosmwasm.wasm.v1.GenesisState.GenMsgs"></a>
 
 ### GenesisState.GenMsgs
 GenMsgs define the messages that can be executed during genesis phase in
@@ -552,16 +552,16 @@ order. The intention is to have more human readable data that is auditable.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `store_code` | [MsgStoreCode](#cosmwasm.wasm.v1beta1.MsgStoreCode) |  |  |
-| `instantiate_contract` | [MsgInstantiateContract](#cosmwasm.wasm.v1beta1.MsgInstantiateContract) |  |  |
-| `execute_contract` | [MsgExecuteContract](#cosmwasm.wasm.v1beta1.MsgExecuteContract) |  |  |
+| `store_code` | [MsgStoreCode](#cosmwasm.wasm.v1.MsgStoreCode) |  |  |
+| `instantiate_contract` | [MsgInstantiateContract](#cosmwasm.wasm.v1.MsgInstantiateContract) |  |  |
+| `execute_contract` | [MsgExecuteContract](#cosmwasm.wasm.v1.MsgExecuteContract) |  |  |
 
 
 
 
 
 
-<a name="cosmwasm.wasm.v1beta1.Sequence"></a>
+<a name="cosmwasm.wasm.v1.Sequence"></a>
 
 ### Sequence
 Sequence key and value of an id generation counter
@@ -586,14 +586,14 @@ Sequence key and value of an id generation counter
 
 
 
-<a name="cosmwasm/wasm/v1beta1/ibc.proto"></a>
+<a name="cosmwasm/wasm/v1/ibc.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## cosmwasm/wasm/v1beta1/ibc.proto
+## cosmwasm/wasm/v1/ibc.proto
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgIBCCloseChannel"></a>
+<a name="cosmwasm.wasm.v1.MsgIBCCloseChannel"></a>
 
 ### MsgIBCCloseChannel
 MsgIBCCloseChannel port and channel need to be owned by the contract
@@ -608,7 +608,7 @@ MsgIBCCloseChannel port and channel need to be owned by the contract
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MsgIBCSend"></a>
+<a name="cosmwasm.wasm.v1.MsgIBCSend"></a>
 
 ### MsgIBCSend
 MsgIBCSend
@@ -635,14 +635,14 @@ MsgIBCSend
 
 
 
-<a name="cosmwasm/wasm/v1beta1/proposal.proto"></a>
+<a name="cosmwasm/wasm/v1/proposal.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## cosmwasm/wasm/v1beta1/proposal.proto
+## cosmwasm/wasm/v1/proposal.proto
 
 
 
-<a name="cosmwasm.wasm.v1beta1.ClearAdminProposal"></a>
+<a name="cosmwasm.wasm.v1.ClearAdminProposal"></a>
 
 ### ClearAdminProposal
 ClearAdminProposal gov proposal content type to clear the admin of a
@@ -660,7 +660,7 @@ contract.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.InstantiateContractProposal"></a>
+<a name="cosmwasm.wasm.v1.InstantiateContractProposal"></a>
 
 ### InstantiateContractProposal
 InstantiateContractProposal gov proposal content type to instantiate a
@@ -683,7 +683,7 @@ contract.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.MigrateContractProposal"></a>
+<a name="cosmwasm.wasm.v1.MigrateContractProposal"></a>
 
 ### MigrateContractProposal
 MigrateContractProposal gov proposal content type to migrate a contract.
@@ -703,7 +703,7 @@ MigrateContractProposal gov proposal content type to migrate a contract.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.PinCodesProposal"></a>
+<a name="cosmwasm.wasm.v1.PinCodesProposal"></a>
 
 ### PinCodesProposal
 PinCodesProposal gov proposal content type to pin a set of code ids in the
@@ -721,7 +721,7 @@ wasmvm cache.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.StoreCodeProposal"></a>
+<a name="cosmwasm.wasm.v1.StoreCodeProposal"></a>
 
 ### StoreCodeProposal
 StoreCodeProposal gov proposal content type to submit WASM code to the system
@@ -735,14 +735,14 @@ StoreCodeProposal gov proposal content type to submit WASM code to the system
 | `wasm_byte_code` | [bytes](#bytes) |  | WASMByteCode can be raw or gzip compressed |
 | `source` | [string](#string) |  | Source is a valid absolute HTTPS URI to the contract's source code, optional |
 | `builder` | [string](#string) |  | Builder is a valid docker image name with tag, optional |
-| `instantiate_permission` | [AccessConfig](#cosmwasm.wasm.v1beta1.AccessConfig) |  | InstantiatePermission to apply on contract creation, optional |
+| `instantiate_permission` | [AccessConfig](#cosmwasm.wasm.v1.AccessConfig) |  | InstantiatePermission to apply on contract creation, optional |
 
 
 
 
 
 
-<a name="cosmwasm.wasm.v1beta1.UnpinCodesProposal"></a>
+<a name="cosmwasm.wasm.v1.UnpinCodesProposal"></a>
 
 ### UnpinCodesProposal
 UnpinCodesProposal gov proposal content type to unpin a set of code ids in
@@ -760,7 +760,7 @@ the wasmvm cache.
 
 
 
-<a name="cosmwasm.wasm.v1beta1.UpdateAdminProposal"></a>
+<a name="cosmwasm.wasm.v1.UpdateAdminProposal"></a>
 
 ### UpdateAdminProposal
 UpdateAdminProposal gov proposal content type to set an admin for a contract.
@@ -787,14 +787,14 @@ UpdateAdminProposal gov proposal content type to set an admin for a contract.
 
 
 
-<a name="cosmwasm/wasm/v1beta1/query.proto"></a>
+<a name="cosmwasm/wasm/v1/query.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## cosmwasm/wasm/v1beta1/query.proto
+## cosmwasm/wasm/v1/query.proto
 
 
 
-<a name="cosmwasm.wasm.v1beta1.CodeInfoResponse"></a>
+<a name="cosmwasm.wasm.v1.CodeInfoResponse"></a>
 
 ### CodeInfoResponse
 CodeInfoResponse contains code meta data from CodeInfo
@@ -813,7 +813,7 @@ CodeInfoResponse contains code meta data from CodeInfo
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryAllContractStateRequest"></a>
+<a name="cosmwasm.wasm.v1.QueryAllContractStateRequest"></a>
 
 ### QueryAllContractStateRequest
 QueryAllContractStateRequest is the request type for the
@@ -830,7 +830,7 @@ Query/AllContractState RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryAllContractStateResponse"></a>
+<a name="cosmwasm.wasm.v1.QueryAllContractStateResponse"></a>
 
 ### QueryAllContractStateResponse
 QueryAllContractStateResponse is the response type for the
@@ -839,7 +839,7 @@ Query/AllContractState RPC method
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `models` | [Model](#cosmwasm.wasm.v1beta1.Model) | repeated |  |
+| `models` | [Model](#cosmwasm.wasm.v1.Model) | repeated |  |
 | `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) |  | pagination defines the pagination in the response. |
 
 
@@ -847,7 +847,7 @@ Query/AllContractState RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryCodeRequest"></a>
+<a name="cosmwasm.wasm.v1.QueryCodeRequest"></a>
 
 ### QueryCodeRequest
 QueryCodeRequest is the request type for the Query/Code RPC method
@@ -862,7 +862,7 @@ QueryCodeRequest is the request type for the Query/Code RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryCodeResponse"></a>
+<a name="cosmwasm.wasm.v1.QueryCodeResponse"></a>
 
 ### QueryCodeResponse
 QueryCodeResponse is the response type for the Query/Code RPC method
@@ -870,7 +870,7 @@ QueryCodeResponse is the response type for the Query/Code RPC method
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `code_info` | [CodeInfoResponse](#cosmwasm.wasm.v1beta1.CodeInfoResponse) |  |  |
+| `code_info` | [CodeInfoResponse](#cosmwasm.wasm.v1.CodeInfoResponse) |  |  |
 | `data` | [bytes](#bytes) |  |  |
 
 
@@ -878,7 +878,7 @@ QueryCodeResponse is the response type for the Query/Code RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryCodesRequest"></a>
+<a name="cosmwasm.wasm.v1.QueryCodesRequest"></a>
 
 ### QueryCodesRequest
 QueryCodesRequest is the request type for the Query/Codes RPC method
@@ -893,7 +893,7 @@ QueryCodesRequest is the request type for the Query/Codes RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryCodesResponse"></a>
+<a name="cosmwasm.wasm.v1.QueryCodesResponse"></a>
 
 ### QueryCodesResponse
 QueryCodesResponse is the response type for the Query/Codes RPC method
@@ -901,7 +901,7 @@ QueryCodesResponse is the response type for the Query/Codes RPC method
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `code_infos` | [CodeInfoResponse](#cosmwasm.wasm.v1beta1.CodeInfoResponse) | repeated |  |
+| `code_infos` | [CodeInfoResponse](#cosmwasm.wasm.v1.CodeInfoResponse) | repeated |  |
 | `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) |  | pagination defines the pagination in the response. |
 
 
@@ -909,7 +909,7 @@ QueryCodesResponse is the response type for the Query/Codes RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryContractHistoryRequest"></a>
+<a name="cosmwasm.wasm.v1.QueryContractHistoryRequest"></a>
 
 ### QueryContractHistoryRequest
 QueryContractHistoryRequest is the request type for the Query/ContractHistory
@@ -926,7 +926,7 @@ RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryContractHistoryResponse"></a>
+<a name="cosmwasm.wasm.v1.QueryContractHistoryResponse"></a>
 
 ### QueryContractHistoryResponse
 QueryContractHistoryResponse is the response type for the
@@ -935,7 +935,7 @@ Query/ContractHistory RPC method
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `entries` | [ContractCodeHistoryEntry](#cosmwasm.wasm.v1beta1.ContractCodeHistoryEntry) | repeated |  |
+| `entries` | [ContractCodeHistoryEntry](#cosmwasm.wasm.v1.ContractCodeHistoryEntry) | repeated |  |
 | `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) |  | pagination defines the pagination in the response. |
 
 
@@ -943,7 +943,7 @@ Query/ContractHistory RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryContractInfoRequest"></a>
+<a name="cosmwasm.wasm.v1.QueryContractInfoRequest"></a>
 
 ### QueryContractInfoRequest
 QueryContractInfoRequest is the request type for the Query/ContractInfo RPC
@@ -959,7 +959,7 @@ method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryContractInfoResponse"></a>
+<a name="cosmwasm.wasm.v1.QueryContractInfoResponse"></a>
 
 ### QueryContractInfoResponse
 QueryContractInfoResponse is the response type for the Query/ContractInfo RPC
@@ -969,14 +969,14 @@ method
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `address` | [string](#string) |  | address is the address of the contract |
-| `contract_info` | [ContractInfo](#cosmwasm.wasm.v1beta1.ContractInfo) |  |  |
+| `contract_info` | [ContractInfo](#cosmwasm.wasm.v1.ContractInfo) |  |  |
 
 
 
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryContractsByCodeRequest"></a>
+<a name="cosmwasm.wasm.v1.QueryContractsByCodeRequest"></a>
 
 ### QueryContractsByCodeRequest
 QueryContractsByCodeRequest is the request type for the Query/ContractsByCode
@@ -993,7 +993,7 @@ RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryContractsByCodeResponse"></a>
+<a name="cosmwasm.wasm.v1.QueryContractsByCodeResponse"></a>
 
 ### QueryContractsByCodeResponse
 QueryContractsByCodeResponse is the response type for the
@@ -1010,7 +1010,7 @@ Query/ContractsByCode RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryRawContractStateRequest"></a>
+<a name="cosmwasm.wasm.v1.QueryRawContractStateRequest"></a>
 
 ### QueryRawContractStateRequest
 QueryRawContractStateRequest is the request type for the
@@ -1027,7 +1027,7 @@ Query/RawContractState RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QueryRawContractStateResponse"></a>
+<a name="cosmwasm.wasm.v1.QueryRawContractStateResponse"></a>
 
 ### QueryRawContractStateResponse
 QueryRawContractStateResponse is the response type for the
@@ -1043,7 +1043,7 @@ Query/RawContractState RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QuerySmartContractStateRequest"></a>
+<a name="cosmwasm.wasm.v1.QuerySmartContractStateRequest"></a>
 
 ### QuerySmartContractStateRequest
 QuerySmartContractStateRequest is the request type for the
@@ -1060,7 +1060,7 @@ Query/SmartContractState RPC method
 
 
 
-<a name="cosmwasm.wasm.v1beta1.QuerySmartContractStateResponse"></a>
+<a name="cosmwasm.wasm.v1.QuerySmartContractStateResponse"></a>
 
 ### QuerySmartContractStateResponse
 QuerySmartContractStateResponse is the response type for the
@@ -1082,21 +1082,21 @@ Query/SmartContractState RPC method
  <!-- end HasExtensions -->
 
 
-<a name="cosmwasm.wasm.v1beta1.Query"></a>
+<a name="cosmwasm.wasm.v1.Query"></a>
 
 ### Query
 Query provides defines the gRPC querier service
 
 | Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
 | ----------- | ------------ | ------------- | ------------| ------- | -------- |
-| `ContractInfo` | [QueryContractInfoRequest](#cosmwasm.wasm.v1beta1.QueryContractInfoRequest) | [QueryContractInfoResponse](#cosmwasm.wasm.v1beta1.QueryContractInfoResponse) | ContractInfo gets the contract meta data | GET|/wasm/v1beta1/contract/{address}|
-| `ContractHistory` | [QueryContractHistoryRequest](#cosmwasm.wasm.v1beta1.QueryContractHistoryRequest) | [QueryContractHistoryResponse](#cosmwasm.wasm.v1beta1.QueryContractHistoryResponse) | ContractHistory gets the contract code history | GET|/wasm/v1beta1/contract/{address}/history|
-| `ContractsByCode` | [QueryContractsByCodeRequest](#cosmwasm.wasm.v1beta1.QueryContractsByCodeRequest) | [QueryContractsByCodeResponse](#cosmwasm.wasm.v1beta1.QueryContractsByCodeResponse) | ContractsByCode lists all smart contracts for a code id | GET|/wasm/v1beta1/code/{code_id}/contracts|
-| `AllContractState` | [QueryAllContractStateRequest](#cosmwasm.wasm.v1beta1.QueryAllContractStateRequest) | [QueryAllContractStateResponse](#cosmwasm.wasm.v1beta1.QueryAllContractStateResponse) | AllContractState gets all raw store data for a single contract | GET|/wasm/v1beta1/contract/{address}/state|
-| `RawContractState` | [QueryRawContractStateRequest](#cosmwasm.wasm.v1beta1.QueryRawContractStateRequest) | [QueryRawContractStateResponse](#cosmwasm.wasm.v1beta1.QueryRawContractStateResponse) | RawContractState gets single key from the raw store data of a contract | GET|/wasm/v1beta1/contract/{address}/raw/{query_data}|
-| `SmartContractState` | [QuerySmartContractStateRequest](#cosmwasm.wasm.v1beta1.QuerySmartContractStateRequest) | [QuerySmartContractStateResponse](#cosmwasm.wasm.v1beta1.QuerySmartContractStateResponse) | SmartContractState get smart query result from the contract | GET|/wasm/v1beta1/contract/{address}/smart/{query_data}|
-| `Code` | [QueryCodeRequest](#cosmwasm.wasm.v1beta1.QueryCodeRequest) | [QueryCodeResponse](#cosmwasm.wasm.v1beta1.QueryCodeResponse) | Code gets the binary code and metadata for a singe wasm code | GET|/wasm/v1beta1/code/{code_id}|
-| `Codes` | [QueryCodesRequest](#cosmwasm.wasm.v1beta1.QueryCodesRequest) | [QueryCodesResponse](#cosmwasm.wasm.v1beta1.QueryCodesResponse) | Codes gets the metadata for all stored wasm codes | GET|/wasm/v1beta1/code|
+| `ContractInfo` | [QueryContractInfoRequest](#cosmwasm.wasm.v1.QueryContractInfoRequest) | [QueryContractInfoResponse](#cosmwasm.wasm.v1.QueryContractInfoResponse) | ContractInfo gets the contract meta data | GET|/wasm/v1/contract/{address}|
+| `ContractHistory` | [QueryContractHistoryRequest](#cosmwasm.wasm.v1.QueryContractHistoryRequest) | [QueryContractHistoryResponse](#cosmwasm.wasm.v1.QueryContractHistoryResponse) | ContractHistory gets the contract code history | GET|/wasm/v1/contract/{address}/history|
+| `ContractsByCode` | [QueryContractsByCodeRequest](#cosmwasm.wasm.v1.QueryContractsByCodeRequest) | [QueryContractsByCodeResponse](#cosmwasm.wasm.v1.QueryContractsByCodeResponse) | ContractsByCode lists all smart contracts for a code id | GET|/wasm/v1/code/{code_id}/contracts|
+| `AllContractState` | [QueryAllContractStateRequest](#cosmwasm.wasm.v1.QueryAllContractStateRequest) | [QueryAllContractStateResponse](#cosmwasm.wasm.v1.QueryAllContractStateResponse) | AllContractState gets all raw store data for a single contract | GET|/wasm/v1/contract/{address}/state|
+| `RawContractState` | [QueryRawContractStateRequest](#cosmwasm.wasm.v1.QueryRawContractStateRequest) | [QueryRawContractStateResponse](#cosmwasm.wasm.v1.QueryRawContractStateResponse) | RawContractState gets single key from the raw store data of a contract | GET|/wasm/v1/contract/{address}/raw/{query_data}|
+| `SmartContractState` | [QuerySmartContractStateRequest](#cosmwasm.wasm.v1.QuerySmartContractStateRequest) | [QuerySmartContractStateResponse](#cosmwasm.wasm.v1.QuerySmartContractStateResponse) | SmartContractState get smart query result from the contract | GET|/wasm/v1/contract/{address}/smart/{query_data}|
+| `Code` | [QueryCodeRequest](#cosmwasm.wasm.v1.QueryCodeRequest) | [QueryCodeResponse](#cosmwasm.wasm.v1.QueryCodeResponse) | Code gets the binary code and metadata for a singe wasm code | GET|/wasm/v1/code/{code_id}|
+| `Codes` | [QueryCodesRequest](#cosmwasm.wasm.v1.QueryCodesRequest) | [QueryCodesResponse](#cosmwasm.wasm.v1.QueryCodesResponse) | Codes gets the metadata for all stored wasm codes | GET|/wasm/v1/code|
 
  <!-- end services -->
 
diff --git a/x/wasm/types/genesis.pb.go b/x/wasm/types/genesis.pb.go
index de95699049e..0c5096e4211 100644
--- a/x/wasm/types/genesis.pb.go
+++ b/x/wasm/types/genesis.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmwasm/wasm/v1beta1/genesis.proto
+// source: cosmwasm/wasm/v1/genesis.proto
 
 package types
 
@@ -36,7 +36,7 @@ func (m *GenesisState) Reset()         { *m = GenesisState{} }
 func (m *GenesisState) String() string { return proto.CompactTextString(m) }
 func (*GenesisState) ProtoMessage()    {}
 func (*GenesisState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_931ba204ce53afe0, []int{0}
+	return fileDescriptor_2ab3f539b23472a6, []int{0}
 }
 func (m *GenesisState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -116,7 +116,7 @@ func (m *GenesisState_GenMsgs) Reset()         { *m = GenesisState_GenMsgs{} }
 func (m *GenesisState_GenMsgs) String() string { return proto.CompactTextString(m) }
 func (*GenesisState_GenMsgs) ProtoMessage()    {}
 func (*GenesisState_GenMsgs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_931ba204ce53afe0, []int{0, 0}
+	return fileDescriptor_2ab3f539b23472a6, []int{0, 0}
 }
 func (m *GenesisState_GenMsgs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -215,7 +215,7 @@ func (m *Code) Reset()         { *m = Code{} }
 func (m *Code) String() string { return proto.CompactTextString(m) }
 func (*Code) ProtoMessage()    {}
 func (*Code) Descriptor() ([]byte, []int) {
-	return fileDescriptor_931ba204ce53afe0, []int{1}
+	return fileDescriptor_2ab3f539b23472a6, []int{1}
 }
 func (m *Code) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -283,7 +283,7 @@ func (m *Contract) Reset()         { *m = Contract{} }
 func (m *Contract) String() string { return proto.CompactTextString(m) }
 func (*Contract) ProtoMessage()    {}
 func (*Contract) Descriptor() ([]byte, []int) {
-	return fileDescriptor_931ba204ce53afe0, []int{2}
+	return fileDescriptor_2ab3f539b23472a6, []int{2}
 }
 func (m *Contract) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -343,7 +343,7 @@ func (m *Sequence) Reset()         { *m = Sequence{} }
 func (m *Sequence) String() string { return proto.CompactTextString(m) }
 func (*Sequence) ProtoMessage()    {}
 func (*Sequence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_931ba204ce53afe0, []int{3}
+	return fileDescriptor_2ab3f539b23472a6, []int{3}
 }
 func (m *Sequence) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -387,60 +387,58 @@ func (m *Sequence) GetValue() uint64 {
 }
 
 func init() {
-	proto.RegisterType((*GenesisState)(nil), "cosmwasm.wasm.v1beta1.GenesisState")
-	proto.RegisterType((*GenesisState_GenMsgs)(nil), "cosmwasm.wasm.v1beta1.GenesisState.GenMsgs")
-	proto.RegisterType((*Code)(nil), "cosmwasm.wasm.v1beta1.Code")
-	proto.RegisterType((*Contract)(nil), "cosmwasm.wasm.v1beta1.Contract")
-	proto.RegisterType((*Sequence)(nil), "cosmwasm.wasm.v1beta1.Sequence")
-}
-
-func init() {
-	proto.RegisterFile("cosmwasm/wasm/v1beta1/genesis.proto", fileDescriptor_931ba204ce53afe0)
-}
-
-var fileDescriptor_931ba204ce53afe0 = []byte{
-	// 647 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x86, 0xe3, 0x26, 0x4e, 0x93, 0x69, 0xa0, 0xd5, 0xb6, 0x80, 0x95, 0x52, 0x27, 0x24, 0x12,
-	0x6a, 0x05, 0x24, 0x6a, 0x39, 0x72, 0x01, 0xb7, 0x88, 0x86, 0xaa, 0x08, 0xb9, 0x12, 0x48, 0xbd,
-	0x44, 0x8e, 0x3d, 0x35, 0x16, 0xb5, 0x37, 0x64, 0x37, 0xa5, 0x7e, 0x0b, 0xc4, 0x43, 0xf0, 0x2c,
-	0x3d, 0xf6, 0xc8, 0x29, 0x42, 0xe9, 0x8d, 0xa7, 0x40, 0xbb, 0x5e, 0xbb, 0x46, 0xd4, 0xe5, 0x62,
-	0x79, 0x66, 0xff, 0xf9, 0x76, 0x66, 0x76, 0x76, 0xa1, 0xeb, 0x52, 0x16, 0x7e, 0x75, 0x58, 0xd8,
-	0x97, 0x9f, 0xb3, 0xed, 0x11, 0x72, 0x67, 0xbb, 0xef, 0x63, 0x84, 0x2c, 0x60, 0xbd, 0xf1, 0x84,
-	0x72, 0x4a, 0xee, 0xa5, 0xa2, 0x9e, 0xfc, 0x28, 0x51, 0x73, 0xcd, 0xa7, 0x3e, 0x95, 0x8a, 0xbe,
-	0xf8, 0x4b, 0xc4, 0xcd, 0x47, 0x37, 0x13, 0x79, 0x3c, 0x46, 0xc5, 0x6b, 0x9a, 0x05, 0x92, 0xf3,
-	0x64, 0xbd, 0x73, 0xa1, 0x43, 0xe3, 0x4d, 0x92, 0xc1, 0x11, 0x77, 0x38, 0x92, 0x17, 0x50, 0x1d,
-	0x3b, 0x13, 0x27, 0x64, 0x86, 0xd6, 0xd6, 0x36, 0x97, 0x76, 0x36, 0x7a, 0x37, 0x66, 0xd4, 0x7b,
-	0x2f, 0x45, 0x56, 0xe5, 0x62, 0xd6, 0x2a, 0xd9, 0x2a, 0x84, 0xbc, 0x05, 0xdd, 0xa5, 0x1e, 0x32,
-	0x63, 0xa1, 0x5d, 0xde, 0x5c, 0xda, 0x59, 0x2f, 0x88, 0xdd, 0xa5, 0x1e, 0x5a, 0x0f, 0x44, 0xe4,
-	0xef, 0x59, 0x6b, 0x59, 0x46, 0x3c, 0xa5, 0x61, 0xc0, 0x31, 0x1c, 0xf3, 0xd8, 0x4e, 0x10, 0xe4,
-	0x18, 0xea, 0x2e, 0x8d, 0xf8, 0xc4, 0x71, 0x39, 0x33, 0xca, 0x92, 0xd7, 0x2a, 0xe4, 0x25, 0x3a,
-	0x6b, 0x5d, 0x31, 0x57, 0xb3, 0xc8, 0x1c, 0xf7, 0x1a, 0x27, 0xd8, 0x0c, 0xbf, 0x4c, 0x31, 0x72,
-	0x91, 0x19, 0x95, 0x5b, 0xd9, 0x47, 0x4a, 0x77, 0xcd, 0xce, 0x22, 0xf3, 0xec, 0xcc, 0x49, 0x46,
-	0x50, 0xf3, 0x31, 0x1a, 0x86, 0xcc, 0x67, 0x86, 0x2e, 0xd1, 0x4f, 0x0a, 0xd0, 0xf9, 0xbe, 0x0b,
-	0xe3, 0x90, 0xf9, 0xcc, 0x6a, 0xaa, 0x6d, 0x48, 0x0a, 0xc9, 0xed, 0xb2, 0xe8, 0x27, 0xa2, 0xe6,
-	0xf7, 0x05, 0x58, 0x54, 0x01, 0x64, 0x0f, 0x80, 0x71, 0x3a, 0xc1, 0xa1, 0x68, 0x9b, 0x3a, 0xb4,
-	0x6e, 0xc1, 0x8e, 0x87, 0xcc, 0x3f, 0x12, 0x5a, 0x71, 0x00, 0xfb, 0x25, 0xbb, 0xce, 0x52, 0x83,
-	0x8c, 0x60, 0x2d, 0x88, 0x18, 0x77, 0x22, 0x1e, 0x38, 0x5c, 0xb0, 0x92, 0x56, 0x19, 0x0b, 0x92,
-	0xf7, 0xac, 0x98, 0x37, 0xb8, 0x8e, 0x4a, 0x8f, 0x61, 0xbf, 0x64, 0xaf, 0x06, 0xff, 0xba, 0xc9,
-	0x07, 0x58, 0xc1, 0x73, 0x74, 0xa7, 0x79, 0x7e, 0x59, 0xf2, 0xb7, 0x8a, 0xf9, 0xaf, 0x93, 0x88,
-	0x1c, 0x7b, 0x19, 0xff, 0x76, 0x59, 0x3a, 0x94, 0xd9, 0x34, 0xec, 0xfc, 0xd0, 0xa0, 0x22, 0x6b,
-	0xe9, 0xc2, 0xa2, 0xe8, 0xc5, 0x30, 0xf0, 0x64, 0x3b, 0x2a, 0x16, 0xcc, 0x67, 0xad, 0xaa, 0x58,
-	0x1a, 0xec, 0xd9, 0x55, 0xb1, 0x34, 0xf0, 0x88, 0x25, 0xc6, 0x4b, 0x88, 0xa2, 0x13, 0xaa, 0xaa,
-	0x6c, 0xdd, 0x32, 0xae, 0x83, 0xe8, 0x84, 0xaa, 0x61, 0xaf, 0xb9, 0xca, 0x26, 0x1b, 0x00, 0x92,
-	0x31, 0x8a, 0x39, 0x32, 0x59, 0x4a, 0xc3, 0x96, 0x54, 0x4b, 0x38, 0xc8, 0x7d, 0xa8, 0x8e, 0x83,
-	0x28, 0x42, 0xcf, 0xa8, 0xb4, 0xb5, 0xcd, 0x9a, 0xad, 0xac, 0xce, 0xa5, 0x06, 0xb5, 0xac, 0x29,
-	0x5b, 0xb0, 0x92, 0x36, 0x63, 0xe8, 0x78, 0xde, 0x04, 0x59, 0x72, 0xf3, 0xea, 0xf6, 0x72, 0xea,
-	0x7f, 0x95, 0xb8, 0xc9, 0x3b, 0xb8, 0x93, 0x49, 0x73, 0x69, 0x77, 0xff, 0x73, 0x2b, 0x72, 0xa9,
-	0x37, 0xdc, 0x9c, 0x8f, 0x0c, 0xe0, 0x6e, 0xc6, 0x63, 0x62, 0x08, 0xd5, 0x35, 0x7b, 0x58, 0x74,
-	0x1a, 0xd4, 0xc3, 0x53, 0x45, 0xca, 0x32, 0x91, 0xd3, 0xdb, 0xb1, 0xa0, 0x96, 0x5e, 0x14, 0xd2,
-	0x86, 0x6a, 0xe0, 0x0d, 0x3f, 0x63, 0x2c, 0xeb, 0x68, 0x58, 0xf5, 0xf9, 0xac, 0xa5, 0x0f, 0xf6,
-	0x0e, 0x30, 0xb6, 0xf5, 0xc0, 0x3b, 0xc0, 0x98, 0xac, 0x81, 0x7e, 0xe6, 0x9c, 0x4e, 0x51, 0x16,
-	0x50, 0xb1, 0x13, 0xc3, 0x7a, 0x79, 0x31, 0x37, 0xb5, 0xcb, 0xb9, 0xa9, 0xfd, 0x9a, 0x9b, 0xda,
-	0xb7, 0x2b, 0xb3, 0x74, 0x79, 0x65, 0x96, 0x7e, 0x5e, 0x99, 0xa5, 0xe3, 0xc7, 0x7e, 0xc0, 0x3f,
-	0x4d, 0x47, 0x3d, 0x97, 0x86, 0xfd, 0x5d, 0xca, 0xc2, 0x8f, 0xe9, 0x7b, 0xe6, 0xf5, 0xcf, 0x93,
-	0x77, 0x4d, 0x3e, 0x79, 0xa3, 0xaa, 0x7c, 0xd3, 0x9e, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xb4,
-	0x5c, 0x72, 0x53, 0x6a, 0x05, 0x00, 0x00,
+	proto.RegisterType((*GenesisState)(nil), "cosmwasm.wasm.v1.GenesisState")
+	proto.RegisterType((*GenesisState_GenMsgs)(nil), "cosmwasm.wasm.v1.GenesisState.GenMsgs")
+	proto.RegisterType((*Code)(nil), "cosmwasm.wasm.v1.Code")
+	proto.RegisterType((*Contract)(nil), "cosmwasm.wasm.v1.Contract")
+	proto.RegisterType((*Sequence)(nil), "cosmwasm.wasm.v1.Sequence")
+}
+
+func init() { proto.RegisterFile("cosmwasm/wasm/v1/genesis.proto", fileDescriptor_2ab3f539b23472a6) }
+
+var fileDescriptor_2ab3f539b23472a6 = []byte{
+	// 646 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x94, 0xcf, 0x6e, 0xd3, 0x4e,
+	0x10, 0xc7, 0xe3, 0x26, 0x4e, 0x93, 0x69, 0x7e, 0xbf, 0x56, 0xdb, 0xaa, 0x35, 0x06, 0x9c, 0x28,
+	0xa0, 0x2a, 0x48, 0x28, 0x51, 0x8b, 0xc4, 0x0d, 0x01, 0x6e, 0x2b, 0x6a, 0x55, 0x95, 0xc0, 0x15,
+	0x42, 0x42, 0xaa, 0x22, 0xd7, 0xde, 0x1a, 0x8b, 0xda, 0x1b, 0xb2, 0x9b, 0x52, 0x9f, 0x79, 0x01,
+	0x1e, 0x01, 0x5e, 0x06, 0xf5, 0xd8, 0x23, 0xa7, 0x08, 0xa5, 0x37, 0x9e, 0x02, 0xed, 0x1f, 0xbb,
+	0x06, 0xa7, 0x17, 0x2b, 0x3b, 0xf3, 0x9d, 0xcf, 0xfc, 0xc9, 0xec, 0x82, 0xe5, 0x13, 0x1a, 0x7f,
+	0xf6, 0x68, 0x3c, 0x10, 0x9f, 0xf3, 0xad, 0x41, 0x88, 0x13, 0x4c, 0x23, 0xda, 0x1f, 0x8d, 0x09,
+	0x23, 0x68, 0x25, 0xf3, 0xf7, 0xc5, 0xe7, 0x7c, 0xcb, 0x5c, 0x0b, 0x49, 0x48, 0x84, 0x73, 0xc0,
+	0x7f, 0x49, 0x9d, 0x79, 0xaf, 0xc4, 0x61, 0xe9, 0x08, 0x2b, 0x8a, 0x79, 0xa7, 0xec, 0xbd, 0x90,
+	0xae, 0xee, 0x37, 0x1d, 0x5a, 0xaf, 0x64, 0xca, 0x23, 0xe6, 0x31, 0x8c, 0x9e, 0x42, 0x7d, 0xe4,
+	0x8d, 0xbd, 0x98, 0x1a, 0x5a, 0x47, 0xeb, 0x2d, 0x6d, 0x1b, 0xfd, 0x7f, 0x4b, 0xe8, 0xbf, 0x16,
+	0x7e, 0xbb, 0x76, 0x39, 0x6d, 0x57, 0x5c, 0xa5, 0x46, 0x7b, 0xa0, 0xfb, 0x24, 0xc0, 0xd4, 0x58,
+	0xe8, 0x54, 0x7b, 0x4b, 0xdb, 0xeb, 0xe5, 0xb0, 0x1d, 0x12, 0x60, 0x7b, 0x83, 0x07, 0xfd, 0x9e,
+	0xb6, 0x97, 0x85, 0xf8, 0x31, 0x89, 0x23, 0x86, 0xe3, 0x11, 0x4b, 0x5d, 0x19, 0x8d, 0xde, 0x42,
+	0xd3, 0x27, 0x09, 0x1b, 0x7b, 0x3e, 0xa3, 0x46, 0x55, 0xa0, 0xcc, 0x79, 0x28, 0x29, 0xb1, 0xef,
+	0x2a, 0xdc, 0x6a, 0x1e, 0x54, 0x40, 0xde, 0x90, 0x38, 0x96, 0xe2, 0x4f, 0x13, 0x9c, 0xf8, 0x98,
+	0x1a, 0xb5, 0xdb, 0xb0, 0x47, 0x4a, 0x72, 0x83, 0xcd, 0x83, 0x8a, 0xd8, 0xdc, 0x88, 0x8e, 0xa1,
+	0x11, 0xe2, 0x64, 0x18, 0xd3, 0x90, 0x1a, 0xba, 0xa0, 0x6e, 0x96, 0xa9, 0xc5, 0xf1, 0xf2, 0xc3,
+	0x21, 0x0d, 0xa9, 0x6d, 0xaa, 0x0c, 0x28, 0x8b, 0x2f, 0x24, 0x58, 0x0c, 0xa5, 0xc8, 0xfc, 0xb2,
+	0x00, 0x8b, 0x2a, 0x00, 0x3d, 0x07, 0xa0, 0x8c, 0x8c, 0xf1, 0x90, 0xcf, 0x49, 0xfd, 0x37, 0x56,
+	0x39, 0xd9, 0x21, 0x0d, 0x8f, 0xb8, 0x8c, 0x0f, 0x7b, 0xbf, 0xe2, 0x36, 0x69, 0x76, 0x40, 0xc7,
+	0xb0, 0x16, 0x25, 0x94, 0x79, 0x09, 0x8b, 0x3c, 0xc6, 0x31, 0x72, 0x36, 0xc6, 0x82, 0x40, 0xf5,
+	0xe6, 0xa2, 0x9c, 0x9b, 0x80, 0x6c, 0xe4, 0xfb, 0x15, 0x77, 0x35, 0x2a, 0x9b, 0xd1, 0x1b, 0x58,
+	0xc1, 0x17, 0xd8, 0x9f, 0x14, 0xd1, 0x55, 0x81, 0x7e, 0x38, 0x17, 0xbd, 0x27, 0xc5, 0x05, 0xec,
+	0x32, 0xfe, 0xdb, 0x64, 0xeb, 0x50, 0xa5, 0x93, 0xb8, 0xfb, 0x5d, 0x83, 0x9a, 0xe8, 0xe0, 0x01,
+	0x2c, 0xf2, 0xe6, 0x87, 0x51, 0x20, 0xfa, 0xaf, 0xd9, 0x30, 0x9b, 0xb6, 0xeb, 0xdc, 0xe5, 0xec,
+	0xba, 0x75, 0xee, 0x72, 0x02, 0xf4, 0x8c, 0x2f, 0x10, 0x17, 0x25, 0xa7, 0x44, 0xf5, 0x66, 0xce,
+	0xdf, 0x45, 0x27, 0x39, 0x25, 0x6a, 0x89, 0x1b, 0xbe, 0x3a, 0xa3, 0xfb, 0x00, 0x22, 0xfc, 0x24,
+	0x65, 0x98, 0x8a, 0x06, 0x5a, 0xae, 0x00, 0xda, 0xdc, 0x80, 0xd6, 0xa1, 0x3e, 0x8a, 0x92, 0x04,
+	0x07, 0x46, 0xad, 0xa3, 0xf5, 0x1a, 0xae, 0x3a, 0x75, 0x7f, 0x68, 0xd0, 0xc8, 0x47, 0xf1, 0x08,
+	0x56, 0xb2, 0x11, 0x0c, 0xbd, 0x20, 0x18, 0x63, 0x2a, 0x2f, 0x53, 0xd3, 0x5d, 0xce, 0xec, 0x2f,
+	0xa5, 0x19, 0x39, 0xf0, 0x5f, 0x2e, 0x2d, 0x54, 0x6c, 0xdd, 0xbe, 0xf2, 0x85, 0xaa, 0x5b, 0x7e,
+	0xc1, 0x86, 0x76, 0xe1, 0xff, 0x1c, 0x45, 0xf9, 0xae, 0xa9, 0xeb, 0xb3, 0x31, 0x67, 0xfc, 0x24,
+	0xc0, 0x67, 0x0a, 0x92, 0xe7, 0x17, 0xfb, 0xd9, 0xb5, 0xa1, 0x91, 0xdd, 0x02, 0xd4, 0x81, 0x7a,
+	0x14, 0x0c, 0x3f, 0xe2, 0x54, 0x54, 0xdf, 0xb2, 0x9b, 0xb3, 0x69, 0x5b, 0x77, 0x76, 0x0f, 0x70,
+	0xea, 0xea, 0x51, 0x70, 0x80, 0x53, 0xb4, 0x06, 0xfa, 0xb9, 0x77, 0x36, 0xc1, 0xa2, 0xec, 0x9a,
+	0x2b, 0x0f, 0xf6, 0x8b, 0xcb, 0x99, 0xa5, 0x5d, 0xcd, 0x2c, 0xed, 0xd7, 0xcc, 0xd2, 0xbe, 0x5e,
+	0x5b, 0x95, 0xab, 0x6b, 0xab, 0xf2, 0xf3, 0xda, 0xaa, 0xbc, 0xdf, 0x0c, 0x23, 0xf6, 0x61, 0x72,
+	0xd2, 0xf7, 0x49, 0x3c, 0xd8, 0x21, 0x34, 0x7e, 0x97, 0xbd, 0x49, 0xc1, 0xe0, 0x42, 0xbe, 0x4d,
+	0xe2, 0xd9, 0x3a, 0xa9, 0x8b, 0xc7, 0xe9, 0xc9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x05,
+	0x87, 0xde, 0x1f, 0x05, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/wasm/types/ibc.pb.go b/x/wasm/types/ibc.pb.go
index d1a338d0940..1cbc5d8315a 100644
--- a/x/wasm/types/ibc.pb.go
+++ b/x/wasm/types/ibc.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmwasm/wasm/v1beta1/ibc.proto
+// source: cosmwasm/wasm/v1/ibc.proto
 
 package types
 
@@ -42,7 +42,7 @@ func (m *MsgIBCSend) Reset()         { *m = MsgIBCSend{} }
 func (m *MsgIBCSend) String() string { return proto.CompactTextString(m) }
 func (*MsgIBCSend) ProtoMessage()    {}
 func (*MsgIBCSend) Descriptor() ([]byte, []int) {
-	return fileDescriptor_62898492b0dd5f88, []int{0}
+	return fileDescriptor_af0d1c43ea53c4b9, []int{0}
 }
 func (m *MsgIBCSend) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -80,7 +80,7 @@ func (m *MsgIBCCloseChannel) Reset()         { *m = MsgIBCCloseChannel{} }
 func (m *MsgIBCCloseChannel) String() string { return proto.CompactTextString(m) }
 func (*MsgIBCCloseChannel) ProtoMessage()    {}
 func (*MsgIBCCloseChannel) Descriptor() ([]byte, []int) {
-	return fileDescriptor_62898492b0dd5f88, []int{1}
+	return fileDescriptor_af0d1c43ea53c4b9, []int{1}
 }
 func (m *MsgIBCCloseChannel) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -110,35 +110,35 @@ func (m *MsgIBCCloseChannel) XXX_DiscardUnknown() {
 var xxx_messageInfo_MsgIBCCloseChannel proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MsgIBCSend)(nil), "cosmwasm.wasm.v1beta1.MsgIBCSend")
-	proto.RegisterType((*MsgIBCCloseChannel)(nil), "cosmwasm.wasm.v1beta1.MsgIBCCloseChannel")
+	proto.RegisterType((*MsgIBCSend)(nil), "cosmwasm.wasm.v1.MsgIBCSend")
+	proto.RegisterType((*MsgIBCCloseChannel)(nil), "cosmwasm.wasm.v1.MsgIBCCloseChannel")
 }
 
-func init() { proto.RegisterFile("cosmwasm/wasm/v1beta1/ibc.proto", fileDescriptor_62898492b0dd5f88) }
+func init() { proto.RegisterFile("cosmwasm/wasm/v1/ibc.proto", fileDescriptor_af0d1c43ea53c4b9) }
 
-var fileDescriptor_62898492b0dd5f88 = []byte{
-	// 333 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0x31, 0x4f, 0xc2, 0x40,
-	0x14, 0xc7, 0x5b, 0x82, 0x18, 0x2f, 0x6a, 0xb4, 0x91, 0xa4, 0x1a, 0x72, 0x25, 0x1d, 0x0c, 0x53,
-	0x2b, 0x61, 0x73, 0x32, 0xad, 0x83, 0x0c, 0x2c, 0xd5, 0xc4, 0xc4, 0x85, 0x5c, 0xdb, 0xcb, 0xb5,
-	0x86, 0xbb, 0x47, 0xb8, 0x43, 0x64, 0xf3, 0x23, 0xf8, 0xb1, 0x18, 0x19, 0x9d, 0x88, 0xc2, 0x37,
-	0x60, 0x74, 0x32, 0x1c, 0xad, 0x91, 0xd5, 0xe5, 0xdd, 0xdd, 0xff, 0xfd, 0xee, 0x25, 0xef, 0xff,
-	0x47, 0x4e, 0x02, 0x92, 0x4f, 0x88, 0xe4, 0xbe, 0x2e, 0x2f, 0xed, 0x98, 0x2a, 0xd2, 0xf6, 0xf3,
-	0x38, 0xf1, 0x86, 0x23, 0x50, 0x60, 0xd5, 0x4b, 0xc0, 0xd3, 0xa5, 0x00, 0x2e, 0xce, 0x18, 0x30,
-	0xd0, 0x84, 0xbf, 0xb9, 0x6d, 0x61, 0xf7, 0xad, 0x82, 0x50, 0x4f, 0xb2, 0x6e, 0x10, 0xde, 0x53,
-	0x91, 0x5a, 0x1d, 0xb4, 0x9f, 0x64, 0x44, 0x08, 0x3a, 0xb0, 0x2b, 0x4d, 0xb3, 0x75, 0x10, 0x9c,
-	0xaf, 0x17, 0x4e, 0x7d, 0x4a, 0xf8, 0xe0, 0xda, 0x95, 0x30, 0x1e, 0x25, 0xb4, 0x5f, 0xf4, 0xdd,
-	0xa8, 0x24, 0xad, 0x1b, 0x74, 0xac, 0x72, 0x4e, 0x61, 0xac, 0xfa, 0x19, 0xcd, 0x59, 0xa6, 0xec,
-	0x6a, 0xd3, 0x6c, 0x55, 0xff, 0xfe, 0xdd, 0xed, 0xbb, 0xd1, 0x51, 0x21, 0xdc, 0xe9, 0xb7, 0xd5,
-	0x45, 0xa7, 0x25, 0xb1, 0x39, 0xa5, 0x22, 0x7c, 0x68, 0xef, 0xe9, 0x21, 0x8d, 0xf5, 0xc2, 0xb1,
-	0x77, 0x87, 0xfc, 0x22, 0x6e, 0x74, 0x52, 0x68, 0x0f, 0xa5, 0x64, 0x5d, 0xa1, 0x6a, 0x4a, 0x14,
-	0xb1, 0x6b, 0x4d, 0xb3, 0x75, 0x18, 0x34, 0xbe, 0x17, 0x8e, 0x4d, 0x45, 0x02, 0x69, 0x2e, 0x98,
-	0xff, 0x2c, 0x41, 0x78, 0x11, 0x99, 0xf4, 0xa8, 0x94, 0x84, 0xd1, 0x48, 0x93, 0x6e, 0x17, 0x59,
-	0x5b, 0x07, 0xc2, 0x01, 0x48, 0x1a, 0x16, 0x4b, 0xfd, 0xc7, 0x89, 0xe0, 0x76, 0xf6, 0x85, 0x8d,
-	0xd9, 0x12, 0x9b, 0xf3, 0x25, 0x36, 0x3f, 0x97, 0xd8, 0x7c, 0x5f, 0x61, 0x63, 0xbe, 0xc2, 0xc6,
-	0xc7, 0x0a, 0x1b, 0x4f, 0x97, 0x2c, 0x57, 0xd9, 0x38, 0xf6, 0x12, 0xe0, 0x7e, 0x08, 0x92, 0x3f,
-	0x96, 0x21, 0xa6, 0xfe, 0xeb, 0x36, 0x4c, 0x35, 0x1d, 0x52, 0x19, 0xd7, 0x74, 0x34, 0x9d, 0x9f,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x9f, 0xe8, 0x9b, 0xa4, 0xea, 0x01, 0x00, 0x00,
+var fileDescriptor_af0d1c43ea53c4b9 = []byte{
+	// 329 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xce, 0x2f, 0xce,
+	0x2d, 0x4f, 0x2c, 0xce, 0xd5, 0x07, 0x13, 0x65, 0x86, 0xfa, 0x99, 0x49, 0xc9, 0x7a, 0x05, 0x45,
+	0xf9, 0x25, 0xf9, 0x42, 0x02, 0x30, 0x39, 0x3d, 0x30, 0x51, 0x66, 0x28, 0x25, 0x92, 0x9e, 0x9f,
+	0x9e, 0x0f, 0x96, 0xd4, 0x07, 0xb1, 0x20, 0xea, 0x94, 0x1a, 0x98, 0xb8, 0xb8, 0x7c, 0x8b, 0xd3,
+	0x3d, 0x9d, 0x9c, 0x83, 0x53, 0xf3, 0x52, 0x84, 0x8c, 0xb9, 0xd8, 0x93, 0x33, 0x12, 0xf3, 0xf2,
+	0x52, 0x73, 0x24, 0x98, 0x14, 0x18, 0x35, 0x38, 0x9d, 0x24, 0x3f, 0xdd, 0x93, 0x17, 0xad, 0x4c,
+	0xcc, 0xcd, 0xb1, 0x52, 0x2a, 0xce, 0x2f, 0x2d, 0x4a, 0x4e, 0x8d, 0x87, 0xca, 0x2b, 0x05, 0xc1,
+	0x54, 0x0a, 0x39, 0x70, 0xf1, 0x95, 0x64, 0xe6, 0xa6, 0xe6, 0x97, 0x96, 0xc4, 0x67, 0xa4, 0x66,
+	0xa6, 0x67, 0x94, 0x48, 0xb0, 0x28, 0x30, 0x6a, 0xb0, 0x20, 0xeb, 0x45, 0x95, 0x57, 0x0a, 0xe2,
+	0x85, 0x0a, 0x78, 0x80, 0xf9, 0x42, 0x9e, 0x5c, 0x82, 0x30, 0x15, 0x20, 0xba, 0xb8, 0x24, 0x31,
+	0xb7, 0x40, 0x82, 0x15, 0x6c, 0x88, 0xcc, 0xa7, 0x7b, 0xf2, 0x12, 0xa8, 0x86, 0xc0, 0x95, 0x28,
+	0x05, 0x09, 0x40, 0xc5, 0x42, 0x60, 0x42, 0x42, 0x06, 0x5c, 0x2c, 0x29, 0x89, 0x25, 0x89, 0x12,
+	0x6c, 0x0a, 0x8c, 0x1a, 0x3c, 0x4e, 0x32, 0xbf, 0xee, 0xc9, 0x4b, 0xa4, 0xe6, 0x25, 0xe7, 0xa7,
+	0x64, 0xe6, 0xa5, 0xeb, 0x67, 0x15, 0xe7, 0xe7, 0xe9, 0x05, 0x25, 0x96, 0xfb, 0xa6, 0x16, 0x17,
+	0x27, 0xa6, 0xa7, 0x06, 0x81, 0x55, 0x2a, 0x79, 0x72, 0x09, 0x41, 0x42, 0xc0, 0x39, 0x27, 0xbf,
+	0x38, 0xd5, 0x19, 0xea, 0x29, 0x72, 0x42, 0xc2, 0xc9, 0xe5, 0xc4, 0x43, 0x39, 0x86, 0x13, 0x8f,
+	0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b,
+	0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x52, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2,
+	0x4b, 0xce, 0xcf, 0xd5, 0x77, 0xce, 0x2f, 0xce, 0x0d, 0x87, 0x45, 0x5d, 0x8a, 0x7e, 0x05, 0x24,
+	0x0a, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x51, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff,
+	0xff, 0x0b, 0xb9, 0xf3, 0x8c, 0xe0, 0x01, 0x00, 0x00,
 }
 
 func (m *MsgIBCSend) Marshal() (dAtA []byte, err error) {
diff --git a/x/wasm/types/proposal.pb.go b/x/wasm/types/proposal.pb.go
index a38e5c372fe..2ec1c56fffd 100644
--- a/x/wasm/types/proposal.pb.go
+++ b/x/wasm/types/proposal.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmwasm/wasm/v1beta1/proposal.proto
+// source: cosmwasm/wasm/v1/proposal.proto
 
 package types
 
@@ -48,7 +48,7 @@ type StoreCodeProposal struct {
 func (m *StoreCodeProposal) Reset()      { *m = StoreCodeProposal{} }
 func (*StoreCodeProposal) ProtoMessage() {}
 func (*StoreCodeProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6428c760f8f86eed, []int{0}
+	return fileDescriptor_be6422d717c730cb, []int{0}
 }
 func (m *StoreCodeProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -101,7 +101,7 @@ type InstantiateContractProposal struct {
 func (m *InstantiateContractProposal) Reset()      { *m = InstantiateContractProposal{} }
 func (*InstantiateContractProposal) ProtoMessage() {}
 func (*InstantiateContractProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6428c760f8f86eed, []int{1}
+	return fileDescriptor_be6422d717c730cb, []int{1}
 }
 func (m *InstantiateContractProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -149,7 +149,7 @@ type MigrateContractProposal struct {
 func (m *MigrateContractProposal) Reset()      { *m = MigrateContractProposal{} }
 func (*MigrateContractProposal) ProtoMessage() {}
 func (*MigrateContractProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6428c760f8f86eed, []int{2}
+	return fileDescriptor_be6422d717c730cb, []int{2}
 }
 func (m *MigrateContractProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -193,7 +193,7 @@ type UpdateAdminProposal struct {
 func (m *UpdateAdminProposal) Reset()      { *m = UpdateAdminProposal{} }
 func (*UpdateAdminProposal) ProtoMessage() {}
 func (*UpdateAdminProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6428c760f8f86eed, []int{3}
+	return fileDescriptor_be6422d717c730cb, []int{3}
 }
 func (m *UpdateAdminProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -236,7 +236,7 @@ type ClearAdminProposal struct {
 func (m *ClearAdminProposal) Reset()      { *m = ClearAdminProposal{} }
 func (*ClearAdminProposal) ProtoMessage() {}
 func (*ClearAdminProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6428c760f8f86eed, []int{4}
+	return fileDescriptor_be6422d717c730cb, []int{4}
 }
 func (m *ClearAdminProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -279,7 +279,7 @@ type PinCodesProposal struct {
 func (m *PinCodesProposal) Reset()      { *m = PinCodesProposal{} }
 func (*PinCodesProposal) ProtoMessage() {}
 func (*PinCodesProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6428c760f8f86eed, []int{5}
+	return fileDescriptor_be6422d717c730cb, []int{5}
 }
 func (m *PinCodesProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -322,7 +322,7 @@ type UnpinCodesProposal struct {
 func (m *UnpinCodesProposal) Reset()      { *m = UnpinCodesProposal{} }
 func (*UnpinCodesProposal) ProtoMessage() {}
 func (*UnpinCodesProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6428c760f8f86eed, []int{6}
+	return fileDescriptor_be6422d717c730cb, []int{6}
 }
 func (m *UnpinCodesProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -352,64 +352,63 @@ func (m *UnpinCodesProposal) XXX_DiscardUnknown() {
 var xxx_messageInfo_UnpinCodesProposal proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*StoreCodeProposal)(nil), "cosmwasm.wasm.v1beta1.StoreCodeProposal")
-	proto.RegisterType((*InstantiateContractProposal)(nil), "cosmwasm.wasm.v1beta1.InstantiateContractProposal")
-	proto.RegisterType((*MigrateContractProposal)(nil), "cosmwasm.wasm.v1beta1.MigrateContractProposal")
-	proto.RegisterType((*UpdateAdminProposal)(nil), "cosmwasm.wasm.v1beta1.UpdateAdminProposal")
-	proto.RegisterType((*ClearAdminProposal)(nil), "cosmwasm.wasm.v1beta1.ClearAdminProposal")
-	proto.RegisterType((*PinCodesProposal)(nil), "cosmwasm.wasm.v1beta1.PinCodesProposal")
-	proto.RegisterType((*UnpinCodesProposal)(nil), "cosmwasm.wasm.v1beta1.UnpinCodesProposal")
-}
-
-func init() {
-	proto.RegisterFile("cosmwasm/wasm/v1beta1/proposal.proto", fileDescriptor_6428c760f8f86eed)
-}
-
-var fileDescriptor_6428c760f8f86eed = []byte{
-	// 687 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xcf, 0x6e, 0xd3, 0x30,
-	0x18, 0x6f, 0xd6, 0xb5, 0xdd, 0xbc, 0x0a, 0x8a, 0xe9, 0x46, 0x18, 0x52, 0x52, 0x32, 0x34, 0xf5,
-	0x42, 0xcb, 0x86, 0x84, 0x80, 0x5b, 0x53, 0x2e, 0x93, 0x98, 0x34, 0x65, 0x9a, 0x26, 0xed, 0x52,
-	0xb9, 0x89, 0xd7, 0x59, 0x34, 0x76, 0x14, 0xbb, 0x8c, 0xbe, 0x05, 0x0f, 0xc0, 0x03, 0x4c, 0x5c,
-	0x10, 0x5c, 0x79, 0x81, 0x1d, 0x77, 0xdc, 0x29, 0xb0, 0xec, 0x0d, 0xfa, 0x04, 0xc8, 0x76, 0x1a,
-	0x3a, 0x34, 0x21, 0x24, 0xfe, 0x48, 0x5c, 0x92, 0x7c, 0xf9, 0x7e, 0xfe, 0x7e, 0x3f, 0xff, 0xbe,
-	0xcf, 0x06, 0x0f, 0x7c, 0xc6, 0xc3, 0x63, 0xc4, 0xc3, 0xb6, 0x7a, 0xbc, 0xde, 0xe8, 0x63, 0x81,
-	0x36, 0xda, 0x51, 0xcc, 0x22, 0xc6, 0xd1, 0xb0, 0x15, 0xc5, 0x4c, 0x30, 0xb8, 0x3c, 0x45, 0xb5,
-	0xd4, 0x23, 0x43, 0xad, 0xd6, 0x07, 0x6c, 0xc0, 0x14, 0xa2, 0x2d, 0xbf, 0x34, 0x78, 0xd5, 0x92,
-	0x60, 0xc6, 0xdb, 0x7d, 0xc4, 0x71, 0x5e, 0xd0, 0x67, 0x84, 0x66, 0xf9, 0xfb, 0xd7, 0x53, 0x8a,
-	0x71, 0x84, 0xb9, 0x86, 0x38, 0x27, 0x73, 0xe0, 0xd6, 0xae, 0x60, 0x31, 0xee, 0xb2, 0x00, 0xef,
-	0x64, 0x5a, 0x60, 0x1d, 0x94, 0x04, 0x11, 0x43, 0x6c, 0x1a, 0x0d, 0xa3, 0xb9, 0xe8, 0xe9, 0x00,
-	0x36, 0xc0, 0x52, 0x80, 0xb9, 0x1f, 0x93, 0x48, 0x10, 0x46, 0xcd, 0x39, 0x95, 0x9b, 0xfd, 0x05,
-	0x97, 0x41, 0x39, 0x1e, 0xd1, 0x1e, 0xe2, 0x66, 0x51, 0x2f, 0x8c, 0x47, 0xb4, 0xc3, 0xe1, 0x13,
-	0x70, 0x43, 0x0a, 0xe8, 0xf5, 0xc7, 0x02, 0xf7, 0x7c, 0x16, 0x60, 0x73, 0xbe, 0x61, 0x34, 0xab,
-	0x6e, 0x2d, 0x4d, 0xec, 0xea, 0x7e, 0x67, 0x77, 0xdb, 0x1d, 0x0b, 0x25, 0xc0, 0xab, 0x4a, 0xdc,
-	0x34, 0x82, 0x2b, 0xa0, 0xcc, 0xd9, 0x28, 0xf6, 0xb1, 0x59, 0x52, 0xe5, 0xb2, 0x08, 0x9a, 0xa0,
-	0xd2, 0x1f, 0x91, 0x61, 0x80, 0x63, 0xb3, 0xac, 0x12, 0xd3, 0x10, 0x1e, 0x80, 0x15, 0x42, 0xb9,
-	0x40, 0x54, 0x10, 0x24, 0x70, 0x2f, 0xc2, 0x71, 0x48, 0x38, 0x97, 0x6a, 0x2b, 0x0d, 0xa3, 0xb9,
-	0xb4, 0xb9, 0xd6, 0xba, 0xd6, 0xdf, 0x56, 0xc7, 0xf7, 0x31, 0xe7, 0x5d, 0x46, 0x0f, 0xc9, 0xc0,
-	0x5b, 0x9e, 0x29, 0xb1, 0x93, 0x57, 0x70, 0x3e, 0xcd, 0x81, 0x7b, 0x5b, 0xdf, 0x33, 0x5d, 0x46,
-	0x45, 0x8c, 0x7c, 0xf1, 0xb7, 0x4c, 0xab, 0x83, 0x12, 0x0a, 0x42, 0x42, 0x95, 0x57, 0x8b, 0x9e,
-	0x0e, 0xe0, 0x1a, 0xa8, 0x48, 0x03, 0x7b, 0x24, 0x50, 0x9e, 0xcc, 0xbb, 0x20, 0x4d, 0xec, 0xb2,
-	0x74, 0x6b, 0xeb, 0x85, 0x57, 0x96, 0xa9, 0xad, 0x40, 0x2e, 0x1d, 0xa2, 0x3e, 0x1e, 0x66, 0xee,
-	0xe8, 0x00, 0xd6, 0x40, 0x31, 0xe4, 0x03, 0x65, 0x44, 0xd5, 0x93, 0x9f, 0x10, 0x81, 0xd2, 0xe1,
-	0x88, 0x06, 0xdc, 0x5c, 0x68, 0x14, 0x9b, 0x4b, 0x9b, 0x77, 0x5b, 0x7a, 0x9e, 0x5a, 0x72, 0x9e,
-	0x72, 0x6b, 0xba, 0x8c, 0x50, 0xf7, 0xd1, 0x69, 0x62, 0x17, 0xde, 0x7f, 0xb1, 0x9b, 0x03, 0x22,
-	0x8e, 0x46, 0xfd, 0x96, 0xcf, 0xc2, 0x76, 0x36, 0x7c, 0xfa, 0xf5, 0x90, 0x07, 0xaf, 0xb2, 0xc1,
-	0x92, 0x0b, 0xb8, 0xa7, 0x2b, 0x3b, 0x9f, 0x0d, 0x70, 0x67, 0x9b, 0x0c, 0xe2, 0x7f, 0x60, 0xd8,
-	0x2a, 0x58, 0xf0, 0x33, 0x8a, 0xcc, 0xb3, 0x3c, 0xfe, 0x35, 0xdb, 0x32, 0x83, 0xca, 0xb9, 0x41,
-	0xce, 0x3b, 0x03, 0xdc, 0xde, 0x8b, 0x02, 0x24, 0x70, 0x47, 0xba, 0xff, 0xdb, 0xca, 0x37, 0xc0,
-	0x22, 0xc5, 0xc7, 0x3d, 0xdd, 0x57, 0x25, 0xde, 0xad, 0x4f, 0x12, 0xbb, 0x36, 0x46, 0xe1, 0xf0,
-	0xb9, 0x93, 0xa7, 0x1c, 0x6f, 0x81, 0xe2, 0x63, 0x45, 0xf9, 0xb3, 0x5d, 0x39, 0x47, 0x00, 0x76,
-	0x87, 0x18, 0xc5, 0x7f, 0x46, 0xdc, 0x2c, 0x53, 0xf1, 0x07, 0xa6, 0x0f, 0x06, 0xa8, 0xed, 0x10,
-	0x2a, 0x0d, 0xe3, 0x39, 0xd1, 0xfa, 0x15, 0x22, 0xb7, 0x36, 0x49, 0xec, 0xaa, 0xde, 0x89, 0xfa,
-	0xed, 0x4c, 0xa9, 0x9f, 0x5e, 0x43, 0xed, 0xae, 0x4c, 0x12, 0x1b, 0x6a, 0xf4, 0x4c, 0xd2, 0xb9,
-	0x2a, 0xe9, 0x99, 0x94, 0xa4, 0xda, 0x26, 0x7b, 0x5d, 0x6c, 0xce, 0xbb, 0x56, 0x9a, 0xd8, 0x15,
-	0xdd, 0x37, 0x3e, 0x49, 0xec, 0x9b, 0xba, 0xc2, 0x14, 0xe4, 0x78, 0x15, 0xdd, 0x4b, 0xee, 0x7c,
-	0x34, 0x00, 0xdc, 0xa3, 0xd1, 0xff, 0xa4, 0xd9, 0x7d, 0x79, 0x7a, 0x61, 0x15, 0xce, 0x2f, 0xac,
-	0xc2, 0x49, 0x6a, 0x19, 0xa7, 0xa9, 0x65, 0x9c, 0xa5, 0x96, 0xf1, 0x35, 0xb5, 0x8c, 0xb7, 0x97,
-	0x56, 0xe1, 0xec, 0xd2, 0x2a, 0x9c, 0x5f, 0x5a, 0x85, 0x83, 0xf5, 0x99, 0x33, 0xd8, 0x65, 0x3c,
-	0xdc, 0x9f, 0x5e, 0xf0, 0x41, 0xfb, 0x8d, 0xbe, 0xe8, 0xd5, 0x39, 0xec, 0x97, 0xd5, 0x0d, 0xff,
-	0xf8, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x63, 0xde, 0x63, 0x60, 0x79, 0x06, 0x00, 0x00,
+	proto.RegisterType((*StoreCodeProposal)(nil), "cosmwasm.wasm.v1.StoreCodeProposal")
+	proto.RegisterType((*InstantiateContractProposal)(nil), "cosmwasm.wasm.v1.InstantiateContractProposal")
+	proto.RegisterType((*MigrateContractProposal)(nil), "cosmwasm.wasm.v1.MigrateContractProposal")
+	proto.RegisterType((*UpdateAdminProposal)(nil), "cosmwasm.wasm.v1.UpdateAdminProposal")
+	proto.RegisterType((*ClearAdminProposal)(nil), "cosmwasm.wasm.v1.ClearAdminProposal")
+	proto.RegisterType((*PinCodesProposal)(nil), "cosmwasm.wasm.v1.PinCodesProposal")
+	proto.RegisterType((*UnpinCodesProposal)(nil), "cosmwasm.wasm.v1.UnpinCodesProposal")
+}
+
+func init() { proto.RegisterFile("cosmwasm/wasm/v1/proposal.proto", fileDescriptor_be6422d717c730cb) }
+
+var fileDescriptor_be6422d717c730cb = []byte{
+	// 690 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0x8d, 0x9b, 0x26, 0x69, 0xa7, 0xd1, 0xf7, 0x85, 0x21, 0x2d, 0xa6, 0x20, 0x3b, 0x32, 0x52,
+	0x95, 0x0d, 0x36, 0x29, 0x12, 0x02, 0x76, 0x71, 0xd8, 0x54, 0xa2, 0x52, 0xe5, 0xaa, 0xaa, 0xc4,
+	0x26, 0x9a, 0xd8, 0xd3, 0x74, 0x44, 0x3c, 0x63, 0x79, 0x26, 0x2d, 0x79, 0x0b, 0x1e, 0x80, 0x1d,
+	0x1b, 0xc4, 0x06, 0xc1, 0x96, 0x17, 0xe8, 0xb2, 0xcb, 0xae, 0x0c, 0x4d, 0xdf, 0x20, 0x4f, 0x80,
+	0x66, 0xc6, 0x09, 0x69, 0x41, 0x08, 0x89, 0x1f, 0x89, 0x8d, 0xed, 0xeb, 0x73, 0xef, 0x9c, 0x33,
+	0xe7, 0xde, 0x19, 0x60, 0x87, 0x8c, 0xc7, 0xc7, 0x88, 0xc7, 0x9e, 0x7a, 0x1c, 0xb5, 0xbc, 0x24,
+	0x65, 0x09, 0xe3, 0x68, 0xe0, 0x26, 0x29, 0x13, 0x0c, 0xd6, 0xa6, 0x09, 0xae, 0x7a, 0x1c, 0xb5,
+	0xd6, 0xeb, 0x7d, 0xd6, 0x67, 0x0a, 0xf4, 0xe4, 0x97, 0xce, 0x5b, 0xb7, 0x64, 0x1e, 0xe3, 0x5e,
+	0x0f, 0x71, 0xec, 0x1d, 0xb5, 0x7a, 0x58, 0xa0, 0x96, 0x17, 0x32, 0x42, 0x73, 0xfc, 0xf6, 0x37,
+	0x44, 0x62, 0x94, 0x60, 0xae, 0x51, 0xe7, 0xf5, 0x02, 0xb8, 0xb6, 0x2b, 0x58, 0x8a, 0x3b, 0x2c,
+	0xc2, 0x3b, 0xb9, 0x02, 0x58, 0x07, 0x25, 0x41, 0xc4, 0x00, 0x9b, 0x46, 0xc3, 0x68, 0x2e, 0x07,
+	0x3a, 0x80, 0x0d, 0xb0, 0x12, 0x61, 0x1e, 0xa6, 0x24, 0x11, 0x84, 0x51, 0x73, 0x41, 0x61, 0xf3,
+	0xbf, 0xe0, 0x2a, 0x28, 0xa7, 0x43, 0xda, 0x45, 0xdc, 0x2c, 0xea, 0xc2, 0x74, 0x48, 0xdb, 0x1c,
+	0x3e, 0x00, 0xff, 0x49, 0xee, 0x6e, 0x6f, 0x24, 0x70, 0x37, 0x64, 0x11, 0x36, 0x17, 0x1b, 0x46,
+	0xb3, 0xea, 0xd7, 0xc6, 0x99, 0x5d, 0xdd, 0x6f, 0xef, 0x6e, 0xfb, 0x23, 0xa1, 0x04, 0x04, 0x55,
+	0x99, 0x37, 0x8d, 0xe0, 0x1a, 0x28, 0x73, 0x36, 0x4c, 0x43, 0x6c, 0x96, 0xd4, 0x72, 0x79, 0x04,
+	0x4d, 0x50, 0xe9, 0x0d, 0xc9, 0x20, 0xc2, 0xa9, 0x59, 0x56, 0xc0, 0x34, 0x84, 0x7b, 0x60, 0x8d,
+	0x50, 0x2e, 0x10, 0x15, 0x04, 0x09, 0xdc, 0x4d, 0x70, 0x1a, 0x13, 0xce, 0xa5, 0xda, 0x4a, 0xc3,
+	0x68, 0xae, 0x6c, 0x5a, 0xee, 0x55, 0x57, 0xdd, 0x76, 0x18, 0x62, 0xce, 0x3b, 0x8c, 0x1e, 0x90,
+	0x7e, 0xb0, 0x3a, 0x57, 0xbd, 0x33, 0x2b, 0x76, 0x3e, 0x2c, 0x80, 0x5b, 0x5b, 0x5f, 0x91, 0x0e,
+	0xa3, 0x22, 0x45, 0xa1, 0xf8, 0x53, 0x7e, 0xd5, 0x41, 0x09, 0x45, 0x31, 0xa1, 0xca, 0xa6, 0xe5,
+	0x40, 0x07, 0xf0, 0x0e, 0xa8, 0x48, 0xef, 0xba, 0x24, 0x52, 0x76, 0x2c, 0xfa, 0x60, 0x9c, 0xd9,
+	0x65, 0x69, 0xd4, 0xd6, 0x93, 0xa0, 0x2c, 0xa1, 0xad, 0x48, 0x96, 0x0e, 0x50, 0x0f, 0x0f, 0x72,
+	0x63, 0x74, 0x00, 0x6b, 0xa0, 0x18, 0xf3, 0xbe, 0xf2, 0xa0, 0x1a, 0xc8, 0x4f, 0x88, 0x40, 0xe9,
+	0x60, 0x48, 0x23, 0x6e, 0x2e, 0x35, 0x8a, 0xcd, 0x95, 0xcd, 0x9b, 0xae, 0x9e, 0x22, 0x57, 0x4e,
+	0x91, 0x9b, 0x4f, 0x91, 0xdb, 0x61, 0x84, 0xfa, 0xf7, 0x4e, 0x32, 0xbb, 0xf0, 0xf6, 0x93, 0xdd,
+	0xec, 0x13, 0x71, 0x38, 0xec, 0xb9, 0x21, 0x8b, 0xbd, 0x7c, 0xe4, 0xf4, 0xeb, 0x2e, 0x8f, 0x9e,
+	0xe7, 0x33, 0x25, 0x0b, 0x78, 0xa0, 0x57, 0x76, 0x3e, 0x1a, 0xe0, 0xc6, 0x36, 0xe9, 0xa7, 0x7f,
+	0xc1, 0xb0, 0x75, 0xb0, 0x14, 0xe6, 0x14, 0xb9, 0x67, 0xb3, 0xf8, 0xe7, 0x6c, 0xcb, 0x0d, 0x2a,
+	0xcf, 0x0c, 0x72, 0x5e, 0x19, 0xe0, 0xfa, 0x5e, 0x12, 0x21, 0x81, 0xdb, 0xd2, 0xfd, 0x5f, 0x56,
+	0xde, 0x02, 0xcb, 0x14, 0x1f, 0x77, 0x75, 0x5f, 0x95, 0x78, 0xbf, 0x3e, 0xc9, 0xec, 0xda, 0x08,
+	0xc5, 0x83, 0xc7, 0xce, 0x0c, 0x72, 0x82, 0x25, 0x8a, 0x8f, 0x15, 0xe5, 0x8f, 0x76, 0xe5, 0x1c,
+	0x02, 0xd8, 0x19, 0x60, 0x94, 0xfe, 0x1e, 0x71, 0xf3, 0x4c, 0xc5, 0x2b, 0x4c, 0xef, 0x0c, 0x50,
+	0xdb, 0x21, 0x54, 0x1a, 0xc6, 0x67, 0x44, 0x1b, 0x97, 0x88, 0xfc, 0xda, 0x24, 0xb3, 0xab, 0x7a,
+	0x27, 0xea, 0xb7, 0x33, 0xa5, 0x7e, 0xf8, 0x1d, 0x6a, 0x7f, 0x6d, 0x92, 0xd9, 0x50, 0x67, 0xcf,
+	0x81, 0xce, 0x65, 0x49, 0x8f, 0xa4, 0x24, 0xd5, 0x36, 0xd9, 0xeb, 0x62, 0x73, 0xd1, 0xb7, 0xc6,
+	0x99, 0x5d, 0xd1, 0x7d, 0xe3, 0x93, 0xcc, 0xfe, 0x5f, 0xaf, 0x30, 0x4d, 0x72, 0x82, 0x8a, 0xee,
+	0x25, 0x77, 0xde, 0x1b, 0x00, 0xee, 0xd1, 0xe4, 0x5f, 0xd2, 0xec, 0x3f, 0x3d, 0x39, 0xb7, 0x0a,
+	0x67, 0xe7, 0x56, 0xe1, 0xcd, 0xd8, 0x32, 0x4e, 0xc6, 0x96, 0x71, 0x3a, 0xb6, 0x8c, 0xcf, 0x63,
+	0xcb, 0x78, 0x79, 0x61, 0x15, 0x4e, 0x2f, 0xac, 0xc2, 0xd9, 0x85, 0x55, 0x78, 0xb6, 0x31, 0x77,
+	0x06, 0x3b, 0x8c, 0xc7, 0xfb, 0xd3, 0x6b, 0x3d, 0xf2, 0x5e, 0xe8, 0xeb, 0x5d, 0x9d, 0xc3, 0x5e,
+	0x59, 0x5d, 0xee, 0xf7, 0xbf, 0x04, 0x00, 0x00, 0xff, 0xff, 0xce, 0x2e, 0x5e, 0x09, 0x65, 0x06,
+	0x00, 0x00,
 }
 
 func (this *StoreCodeProposal) Equal(that interface{}) bool {
diff --git a/x/wasm/types/query.pb.go b/x/wasm/types/query.pb.go
index 8b2c6cdb961..4e55b7bc866 100644
--- a/x/wasm/types/query.pb.go
+++ b/x/wasm/types/query.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmwasm/wasm/v1beta1/query.proto
+// source: cosmwasm/wasm/v1/query.proto
 
 package types
 
@@ -44,7 +44,7 @@ func (m *QueryContractInfoRequest) Reset()         { *m = QueryContractInfoReque
 func (m *QueryContractInfoRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryContractInfoRequest) ProtoMessage()    {}
 func (*QueryContractInfoRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{0}
+	return fileDescriptor_9677c207036b9f2b, []int{0}
 }
 func (m *QueryContractInfoRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -85,7 +85,7 @@ func (m *QueryContractInfoResponse) Reset()         { *m = QueryContractInfoResp
 func (m *QueryContractInfoResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryContractInfoResponse) ProtoMessage()    {}
 func (*QueryContractInfoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{1}
+	return fileDescriptor_9677c207036b9f2b, []int{1}
 }
 func (m *QueryContractInfoResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -127,7 +127,7 @@ func (m *QueryContractHistoryRequest) Reset()         { *m = QueryContractHistor
 func (m *QueryContractHistoryRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryContractHistoryRequest) ProtoMessage()    {}
 func (*QueryContractHistoryRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{2}
+	return fileDescriptor_9677c207036b9f2b, []int{2}
 }
 func (m *QueryContractHistoryRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -168,7 +168,7 @@ func (m *QueryContractHistoryResponse) Reset()         { *m = QueryContractHisto
 func (m *QueryContractHistoryResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryContractHistoryResponse) ProtoMessage()    {}
 func (*QueryContractHistoryResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{3}
+	return fileDescriptor_9677c207036b9f2b, []int{3}
 }
 func (m *QueryContractHistoryResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -209,7 +209,7 @@ func (m *QueryContractsByCodeRequest) Reset()         { *m = QueryContractsByCod
 func (m *QueryContractsByCodeRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryContractsByCodeRequest) ProtoMessage()    {}
 func (*QueryContractsByCodeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{4}
+	return fileDescriptor_9677c207036b9f2b, []int{4}
 }
 func (m *QueryContractsByCodeRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -251,7 +251,7 @@ func (m *QueryContractsByCodeResponse) Reset()         { *m = QueryContractsByCo
 func (m *QueryContractsByCodeResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryContractsByCodeResponse) ProtoMessage()    {}
 func (*QueryContractsByCodeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{5}
+	return fileDescriptor_9677c207036b9f2b, []int{5}
 }
 func (m *QueryContractsByCodeResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -293,7 +293,7 @@ func (m *QueryAllContractStateRequest) Reset()         { *m = QueryAllContractSt
 func (m *QueryAllContractStateRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryAllContractStateRequest) ProtoMessage()    {}
 func (*QueryAllContractStateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{6}
+	return fileDescriptor_9677c207036b9f2b, []int{6}
 }
 func (m *QueryAllContractStateRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -334,7 +334,7 @@ func (m *QueryAllContractStateResponse) Reset()         { *m = QueryAllContractS
 func (m *QueryAllContractStateResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryAllContractStateResponse) ProtoMessage()    {}
 func (*QueryAllContractStateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{7}
+	return fileDescriptor_9677c207036b9f2b, []int{7}
 }
 func (m *QueryAllContractStateResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -375,7 +375,7 @@ func (m *QueryRawContractStateRequest) Reset()         { *m = QueryRawContractSt
 func (m *QueryRawContractStateRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryRawContractStateRequest) ProtoMessage()    {}
 func (*QueryRawContractStateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{8}
+	return fileDescriptor_9677c207036b9f2b, []int{8}
 }
 func (m *QueryRawContractStateRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -415,7 +415,7 @@ func (m *QueryRawContractStateResponse) Reset()         { *m = QueryRawContractS
 func (m *QueryRawContractStateResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryRawContractStateResponse) ProtoMessage()    {}
 func (*QueryRawContractStateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{9}
+	return fileDescriptor_9677c207036b9f2b, []int{9}
 }
 func (m *QueryRawContractStateResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -457,7 +457,7 @@ func (m *QuerySmartContractStateRequest) Reset()         { *m = QuerySmartContra
 func (m *QuerySmartContractStateRequest) String() string { return proto.CompactTextString(m) }
 func (*QuerySmartContractStateRequest) ProtoMessage()    {}
 func (*QuerySmartContractStateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{10}
+	return fileDescriptor_9677c207036b9f2b, []int{10}
 }
 func (m *QuerySmartContractStateRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -497,7 +497,7 @@ func (m *QuerySmartContractStateResponse) Reset()         { *m = QuerySmartContr
 func (m *QuerySmartContractStateResponse) String() string { return proto.CompactTextString(m) }
 func (*QuerySmartContractStateResponse) ProtoMessage()    {}
 func (*QuerySmartContractStateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{11}
+	return fileDescriptor_9677c207036b9f2b, []int{11}
 }
 func (m *QuerySmartContractStateResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -535,7 +535,7 @@ func (m *QueryCodeRequest) Reset()         { *m = QueryCodeRequest{} }
 func (m *QueryCodeRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryCodeRequest) ProtoMessage()    {}
 func (*QueryCodeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{12}
+	return fileDescriptor_9677c207036b9f2b, []int{12}
 }
 func (m *QueryCodeRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -577,7 +577,7 @@ func (m *CodeInfoResponse) Reset()         { *m = CodeInfoResponse{} }
 func (m *CodeInfoResponse) String() string { return proto.CompactTextString(m) }
 func (*CodeInfoResponse) ProtoMessage()    {}
 func (*CodeInfoResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{13}
+	return fileDescriptor_9677c207036b9f2b, []int{13}
 }
 func (m *CodeInfoResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -616,7 +616,7 @@ func (m *QueryCodeResponse) Reset()         { *m = QueryCodeResponse{} }
 func (m *QueryCodeResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryCodeResponse) ProtoMessage()    {}
 func (*QueryCodeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{14}
+	return fileDescriptor_9677c207036b9f2b, []int{14}
 }
 func (m *QueryCodeResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -655,7 +655,7 @@ func (m *QueryCodesRequest) Reset()         { *m = QueryCodesRequest{} }
 func (m *QueryCodesRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryCodesRequest) ProtoMessage()    {}
 func (*QueryCodesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{15}
+	return fileDescriptor_9677c207036b9f2b, []int{15}
 }
 func (m *QueryCodesRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -695,7 +695,7 @@ func (m *QueryCodesResponse) Reset()         { *m = QueryCodesResponse{} }
 func (m *QueryCodesResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryCodesResponse) ProtoMessage()    {}
 func (*QueryCodesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e8595715dfdf95d1, []int{16}
+	return fileDescriptor_9677c207036b9f2b, []int{16}
 }
 func (m *QueryCodesResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -725,97 +725,97 @@ func (m *QueryCodesResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_QueryCodesResponse proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*QueryContractInfoRequest)(nil), "cosmwasm.wasm.v1beta1.QueryContractInfoRequest")
-	proto.RegisterType((*QueryContractInfoResponse)(nil), "cosmwasm.wasm.v1beta1.QueryContractInfoResponse")
-	proto.RegisterType((*QueryContractHistoryRequest)(nil), "cosmwasm.wasm.v1beta1.QueryContractHistoryRequest")
-	proto.RegisterType((*QueryContractHistoryResponse)(nil), "cosmwasm.wasm.v1beta1.QueryContractHistoryResponse")
-	proto.RegisterType((*QueryContractsByCodeRequest)(nil), "cosmwasm.wasm.v1beta1.QueryContractsByCodeRequest")
-	proto.RegisterType((*QueryContractsByCodeResponse)(nil), "cosmwasm.wasm.v1beta1.QueryContractsByCodeResponse")
-	proto.RegisterType((*QueryAllContractStateRequest)(nil), "cosmwasm.wasm.v1beta1.QueryAllContractStateRequest")
-	proto.RegisterType((*QueryAllContractStateResponse)(nil), "cosmwasm.wasm.v1beta1.QueryAllContractStateResponse")
-	proto.RegisterType((*QueryRawContractStateRequest)(nil), "cosmwasm.wasm.v1beta1.QueryRawContractStateRequest")
-	proto.RegisterType((*QueryRawContractStateResponse)(nil), "cosmwasm.wasm.v1beta1.QueryRawContractStateResponse")
-	proto.RegisterType((*QuerySmartContractStateRequest)(nil), "cosmwasm.wasm.v1beta1.QuerySmartContractStateRequest")
-	proto.RegisterType((*QuerySmartContractStateResponse)(nil), "cosmwasm.wasm.v1beta1.QuerySmartContractStateResponse")
-	proto.RegisterType((*QueryCodeRequest)(nil), "cosmwasm.wasm.v1beta1.QueryCodeRequest")
-	proto.RegisterType((*CodeInfoResponse)(nil), "cosmwasm.wasm.v1beta1.CodeInfoResponse")
-	proto.RegisterType((*QueryCodeResponse)(nil), "cosmwasm.wasm.v1beta1.QueryCodeResponse")
-	proto.RegisterType((*QueryCodesRequest)(nil), "cosmwasm.wasm.v1beta1.QueryCodesRequest")
-	proto.RegisterType((*QueryCodesResponse)(nil), "cosmwasm.wasm.v1beta1.QueryCodesResponse")
-}
-
-func init() { proto.RegisterFile("cosmwasm/wasm/v1beta1/query.proto", fileDescriptor_e8595715dfdf95d1) }
-
-var fileDescriptor_e8595715dfdf95d1 = []byte{
-	// 1084 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0xcf, 0x6f, 0xe3, 0x44,
-	0x14, 0xc7, 0x33, 0xdd, 0xf4, 0x47, 0x66, 0x8b, 0x28, 0xa3, 0x05, 0x42, 0xc8, 0xda, 0xc5, 0xa0,
-	0x6e, 0x76, 0x91, 0xec, 0xfe, 0x5a, 0x04, 0xcb, 0x89, 0x74, 0x81, 0xae, 0xc4, 0xf2, 0xc3, 0x15,
-	0xac, 0x80, 0x43, 0x35, 0xb1, 0x67, 0x13, 0xa3, 0xc4, 0x93, 0xf5, 0x4c, 0x68, 0xa3, 0xaa, 0x2c,
-	0x42, 0x42, 0x5c, 0x91, 0xf6, 0xc8, 0x85, 0x03, 0x07, 0xb4, 0xc0, 0x7d, 0x8f, 0x1c, 0x7b, 0xac,
-	0xc4, 0x85, 0x53, 0x04, 0x29, 0x42, 0xa8, 0x7f, 0xc2, 0x9e, 0xd0, 0x8c, 0xc7, 0x89, 0x93, 0xc6,
-	0x71, 0x8a, 0x22, 0x2e, 0x91, 0x27, 0x7e, 0xef, 0xf9, 0xf3, 0xbe, 0xf3, 0xde, 0x3c, 0x1b, 0xbe,
-	0xe0, 0x50, 0xd6, 0xd8, 0xc3, 0xac, 0x61, 0xc9, 0x9f, 0xcf, 0xd7, 0x2a, 0x84, 0xe3, 0x35, 0xeb,
-	0x5e, 0x8b, 0x04, 0x6d, 0xb3, 0x19, 0x50, 0x4e, 0xd1, 0xd3, 0x91, 0x89, 0x29, 0x7f, 0x94, 0x49,
-	0xe1, 0x52, 0x95, 0x56, 0xa9, 0xb4, 0xb0, 0xc4, 0x55, 0x68, 0x5c, 0x48, 0x88, 0xc7, 0xdb, 0x4d,
-	0xc2, 0x94, 0x49, 0xb1, 0x4a, 0x69, 0xb5, 0x4e, 0x2c, 0xdc, 0xf4, 0x2c, 0xec, 0xfb, 0x94, 0x63,
-	0xee, 0x51, 0x3f, 0xba, 0x7b, 0x4d, 0x04, 0xa0, 0xcc, 0xaa, 0x60, 0x46, 0x42, 0x8c, 0x5e, 0x90,
-	0x26, 0xae, 0x7a, 0xbe, 0x34, 0x0e, 0x6d, 0x8d, 0x4d, 0x98, 0xff, 0x40, 0x58, 0x6c, 0x51, 0x9f,
-	0x07, 0xd8, 0xe1, 0xb7, 0xfc, 0xbb, 0xd4, 0x26, 0xf7, 0x5a, 0x84, 0x71, 0x94, 0x87, 0xf3, 0xd8,
-	0x75, 0x03, 0xc2, 0x58, 0x1e, 0x2c, 0x83, 0x52, 0xce, 0x8e, 0x96, 0xc6, 0x03, 0x00, 0x9f, 0x1b,
-	0xe1, 0xc6, 0x9a, 0xd4, 0x67, 0x24, 0xd9, 0x0f, 0x7d, 0x04, 0x9f, 0x70, 0x94, 0xc7, 0xae, 0xe7,
-	0xdf, 0xa5, 0xf9, 0x99, 0x65, 0x50, 0xba, 0xb8, 0xfe, 0xa2, 0x39, 0x52, 0x1f, 0x33, 0x1e, 0xbd,
-	0xbc, 0x78, 0xd4, 0xd1, 0x33, 0xc7, 0x1d, 0x1d, 0x9c, 0x76, 0xf4, 0x8c, 0xbd, 0xe8, 0xc4, 0xee,
-	0xdd, 0xc8, 0xfe, 0xf3, 0xbd, 0x0e, 0x8c, 0xfb, 0xf0, 0xf9, 0x01, 0xa8, 0x6d, 0x8f, 0x71, 0x1a,
-	0xb4, 0x53, 0xd3, 0x41, 0x6f, 0x41, 0xd8, 0x17, 0x46, 0x31, 0xad, 0x98, 0xa1, 0x8a, 0xa6, 0x50,
-	0xd1, 0x0c, 0x37, 0x33, 0xe2, 0x7a, 0x1f, 0x57, 0x89, 0x8a, 0x6a, 0xc7, 0x3c, 0x8d, 0x47, 0x00,
-	0x16, 0x47, 0x13, 0x28, 0x65, 0xde, 0x83, 0xf3, 0xc4, 0xe7, 0x81, 0x47, 0x04, 0xc2, 0x85, 0xd2,
-	0xc5, 0x75, 0x2b, 0x25, 0xf3, 0x2d, 0xea, 0x12, 0x15, 0xe4, 0x4d, 0x9f, 0x07, 0xed, 0x72, 0x56,
-	0xa8, 0x60, 0x47, 0x51, 0xd0, 0xdb, 0x23, 0xc8, 0xaf, 0xa4, 0x92, 0x87, 0x34, 0x03, 0xe8, 0x5f,
-	0x0c, 0x69, 0xc7, 0xca, 0x6d, 0xf1, 0xec, 0x48, 0xbb, 0x67, 0xe1, 0xbc, 0x43, 0x5d, 0xb2, 0xeb,
-	0xb9, 0x52, 0xbb, 0xac, 0x3d, 0x27, 0x96, 0xb7, 0xdc, 0xa9, 0x49, 0xf7, 0xf5, 0xb0, 0x74, 0x3d,
-	0x00, 0x25, 0x5d, 0x11, 0xe6, 0xa2, 0x2d, 0x0f, 0xc5, 0xcb, 0xd9, 0xfd, 0x3f, 0xa6, 0xa7, 0xc3,
-	0x97, 0x11, 0xc7, 0x1b, 0xf5, 0x7a, 0x84, 0xb2, 0xc3, 0x31, 0x27, 0xff, 0x5f, 0x15, 0xfd, 0x00,
-	0xe0, 0xe5, 0x04, 0x04, 0xa5, 0xc5, 0x0d, 0x38, 0xd7, 0xa0, 0x2e, 0xa9, 0x47, 0x55, 0x54, 0x4c,
-	0xa8, 0xa2, 0xdb, 0xc2, 0x48, 0x95, 0x8c, 0xf2, 0x98, 0x9e, 0x52, 0x77, 0x94, 0x50, 0x36, 0xde,
-	0x3b, 0xa7, 0x50, 0x97, 0x21, 0x94, 0xcf, 0xd8, 0x75, 0x31, 0xc7, 0x12, 0x61, 0xd1, 0xce, 0xc9,
-	0x7f, 0x6e, 0x62, 0x8e, 0x8d, 0x0d, 0x95, 0xfe, 0xd9, 0xc0, 0x2a, 0x7d, 0x04, 0xb3, 0xd2, 0x13,
-	0x48, 0x4f, 0x79, 0x6d, 0x7c, 0x0c, 0x35, 0xe9, 0xb4, 0xd3, 0xc0, 0x01, 0x9f, 0x2e, 0xcf, 0x0e,
-	0xd4, 0x13, 0x43, 0x2b, 0xa2, 0xd5, 0x38, 0x51, 0xb9, 0xf8, 0xb8, 0xa3, 0xe7, 0x89, 0xef, 0x50,
-	0xd7, 0xf3, 0xab, 0xd6, 0x67, 0x8c, 0xfa, 0xa6, 0x8d, 0xf7, 0x6e, 0x13, 0xc6, 0x84, 0x96, 0x21,
-	0xef, 0xcb, 0x70, 0x49, 0x95, 0x7b, 0x7a, 0x93, 0x19, 0x7f, 0x03, 0xb8, 0x24, 0x0c, 0x07, 0x4e,
-	0xd9, 0xab, 0x43, 0xd6, 0xe5, 0xa5, 0x6e, 0x47, 0x9f, 0x93, 0x66, 0x37, 0x4f, 0x3b, 0xfa, 0x8c,
-	0xe7, 0xf6, 0x9a, 0x34, 0x0f, 0xe7, 0x9d, 0x80, 0x60, 0x4e, 0x03, 0x99, 0x5d, 0xce, 0x8e, 0x96,
-	0xe8, 0x43, 0x98, 0x13, 0x38, 0xbb, 0x35, 0xcc, 0x6a, 0xf9, 0x0b, 0x92, 0xfe, 0xd5, 0xc7, 0x1d,
-	0x7d, 0xb3, 0xea, 0xf1, 0x5a, 0xab, 0x62, 0x3a, 0xb4, 0x61, 0x71, 0xe2, 0xbb, 0x24, 0x68, 0x78,
-	0x3e, 0x8f, 0x5f, 0xd6, 0xbd, 0x0a, 0xb3, 0x2a, 0x6d, 0x4e, 0x98, 0xb9, 0x4d, 0xf6, 0xcb, 0xe2,
-	0xc2, 0x5e, 0x10, 0xa1, 0xb6, 0x31, 0xab, 0xa1, 0x67, 0xe0, 0x1c, 0xa3, 0xad, 0xc0, 0x21, 0xf9,
-	0xac, 0x7c, 0x9e, 0x5a, 0x09, 0x90, 0x4a, 0xcb, 0xab, 0xbb, 0x24, 0xc8, 0xcf, 0x86, 0x20, 0x6a,
-	0xa9, 0x4e, 0xf0, 0x6f, 0x00, 0x7c, 0x2a, 0x26, 0x8b, 0xca, 0xf4, 0x5d, 0xd1, 0xfa, 0x22, 0x53,
-	0x31, 0x31, 0x40, 0xac, 0x62, 0x47, 0x9d, 0x9b, 0x83, 0x2a, 0x95, 0x17, 0x7a, 0x13, 0x63, 0xc1,
-	0x51, 0xf7, 0x50, 0x51, 0xed, 0x96, 0xdc, 0xe9, 0xf2, 0xc2, 0x69, 0x47, 0x97, 0xeb, 0x70, 0x67,
-	0x14, 0xc9, 0xa7, 0x31, 0x10, 0x16, 0x6d, 0xd0, 0x60, 0x87, 0x83, 0xff, 0xdc, 0xe1, 0x3f, 0x01,
-	0x88, 0xe2, 0xd1, 0x55, 0x9e, 0xef, 0x40, 0xd8, 0xcb, 0x33, 0x6a, 0xed, 0x89, 0x13, 0x0d, 0xbb,
-	0x3c, 0x17, 0x25, 0x39, 0xbd, 0x46, 0x5f, 0x7f, 0x08, 0xe1, 0xac, 0xa4, 0x45, 0xdf, 0x01, 0xb8,
-	0x18, 0x9f, 0xc9, 0x28, 0x69, 0x7c, 0x25, 0xbd, 0x52, 0x14, 0x56, 0x27, 0x77, 0x08, 0x49, 0x8c,
-	0xd2, 0x57, 0xbf, 0xfd, 0xf5, 0x60, 0xc6, 0x40, 0xcb, 0x83, 0x6f, 0x43, 0xd1, 0xd1, 0x6f, 0x1d,
-	0xa8, 0x2e, 0x3e, 0x44, 0x3f, 0x03, 0xf8, 0xe4, 0xd0, 0xe0, 0x45, 0xeb, 0x93, 0x3c, 0x6f, 0xf0,
-	0x3d, 0xa1, 0xb0, 0x71, 0x2e, 0x1f, 0x85, 0xb9, 0x2a, 0x31, 0xaf, 0xa1, 0x52, 0x1a, 0xa6, 0x55,
-	0x53, 0x68, 0x0f, 0x63, 0xb8, 0x6a, 0xd8, 0x4d, 0x86, 0x3b, 0x38, 0x9a, 0x27, 0xc3, 0x1d, 0x9a,
-	0xa6, 0x86, 0x29, 0x71, 0x4b, 0x68, 0x65, 0x18, 0xd7, 0x25, 0xd6, 0x81, 0x3a, 0x56, 0x0e, 0xad,
-	0xfe, 0x7c, 0xfd, 0x05, 0xc0, 0xa5, 0xe1, 0x71, 0x84, 0xc6, 0x3e, 0x39, 0x61, 0x7e, 0x16, 0x36,
-	0xcf, 0xe7, 0x94, 0xc6, 0x7b, 0x46, 0x5e, 0x26, 0xd1, 0x1e, 0x01, 0xb8, 0x34, 0x3c, 0x3f, 0xc6,
-	0xf3, 0x26, 0x8c, 0xb1, 0xf1, 0xbc, 0x49, 0x23, 0xca, 0x78, 0x4d, 0xf2, 0x6e, 0xa0, 0xb5, 0x54,
-	0xde, 0x00, 0xef, 0x59, 0x07, 0xfd, 0xf1, 0x73, 0x88, 0x7e, 0x05, 0x10, 0x9d, 0x1d, 0x35, 0xe8,
-	0xfa, 0x38, 0x8e, 0xc4, 0xa9, 0x57, 0x78, 0xe5, 0xbc, 0x6e, 0x2a, 0x81, 0xd7, 0x65, 0x02, 0xd7,
-	0xd1, 0x46, 0xba, 0xe0, 0x22, 0xc8, 0x60, 0x0a, 0xf7, 0x61, 0x56, 0x96, 0xf3, 0x95, 0xf1, 0xa5,
-	0xd9, 0xaf, 0xe1, 0x52, 0xba, 0xa1, 0xe2, 0x7a, 0x49, 0x72, 0x69, 0xa8, 0x38, 0xae, 0x70, 0xd1,
-	0x3e, 0x9c, 0x95, 0x47, 0x2b, 0x4a, 0x0d, 0x1c, 0x9d, 0xed, 0x85, 0xab, 0x13, 0x58, 0x2a, 0x86,
-	0x82, 0x64, 0xb8, 0x84, 0xd0, 0x59, 0x86, 0xf2, 0xf6, 0xd1, 0x9f, 0x5a, 0xe6, 0xc7, 0xae, 0x96,
-	0x39, 0xea, 0x6a, 0xe0, 0xb8, 0xab, 0x81, 0x3f, 0xba, 0x1a, 0xf8, 0xf6, 0x44, 0xcb, 0x1c, 0x9f,
-	0x68, 0x99, 0xdf, 0x4f, 0xb4, 0xcc, 0x27, 0x2b, 0xb1, 0xd9, 0xba, 0x45, 0x59, 0xe3, 0x4e, 0xf4,
-	0xa5, 0xe7, 0x5a, 0xfb, 0x61, 0x40, 0xf9, 0xa5, 0x57, 0x99, 0x93, 0x1f, 0x68, 0x1b, 0xff, 0x06,
-	0x00, 0x00, 0xff, 0xff, 0xcc, 0x4d, 0x4e, 0xc2, 0x5f, 0x0e, 0x00, 0x00,
+	proto.RegisterType((*QueryContractInfoRequest)(nil), "cosmwasm.wasm.v1.QueryContractInfoRequest")
+	proto.RegisterType((*QueryContractInfoResponse)(nil), "cosmwasm.wasm.v1.QueryContractInfoResponse")
+	proto.RegisterType((*QueryContractHistoryRequest)(nil), "cosmwasm.wasm.v1.QueryContractHistoryRequest")
+	proto.RegisterType((*QueryContractHistoryResponse)(nil), "cosmwasm.wasm.v1.QueryContractHistoryResponse")
+	proto.RegisterType((*QueryContractsByCodeRequest)(nil), "cosmwasm.wasm.v1.QueryContractsByCodeRequest")
+	proto.RegisterType((*QueryContractsByCodeResponse)(nil), "cosmwasm.wasm.v1.QueryContractsByCodeResponse")
+	proto.RegisterType((*QueryAllContractStateRequest)(nil), "cosmwasm.wasm.v1.QueryAllContractStateRequest")
+	proto.RegisterType((*QueryAllContractStateResponse)(nil), "cosmwasm.wasm.v1.QueryAllContractStateResponse")
+	proto.RegisterType((*QueryRawContractStateRequest)(nil), "cosmwasm.wasm.v1.QueryRawContractStateRequest")
+	proto.RegisterType((*QueryRawContractStateResponse)(nil), "cosmwasm.wasm.v1.QueryRawContractStateResponse")
+	proto.RegisterType((*QuerySmartContractStateRequest)(nil), "cosmwasm.wasm.v1.QuerySmartContractStateRequest")
+	proto.RegisterType((*QuerySmartContractStateResponse)(nil), "cosmwasm.wasm.v1.QuerySmartContractStateResponse")
+	proto.RegisterType((*QueryCodeRequest)(nil), "cosmwasm.wasm.v1.QueryCodeRequest")
+	proto.RegisterType((*CodeInfoResponse)(nil), "cosmwasm.wasm.v1.CodeInfoResponse")
+	proto.RegisterType((*QueryCodeResponse)(nil), "cosmwasm.wasm.v1.QueryCodeResponse")
+	proto.RegisterType((*QueryCodesRequest)(nil), "cosmwasm.wasm.v1.QueryCodesRequest")
+	proto.RegisterType((*QueryCodesResponse)(nil), "cosmwasm.wasm.v1.QueryCodesResponse")
+}
+
+func init() { proto.RegisterFile("cosmwasm/wasm/v1/query.proto", fileDescriptor_9677c207036b9f2b) }
+
+var fileDescriptor_9677c207036b9f2b = []byte{
+	// 1087 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0xcd, 0x6f, 0x1b, 0xc5,
+	0x1b, 0xc7, 0x3d, 0xa9, 0xf3, 0xe2, 0x69, 0xaa, 0xfa, 0x37, 0xfa, 0x41, 0x5c, 0xd7, 0xd9, 0x2d,
+	0x1b, 0x28, 0x69, 0x03, 0xbb, 0x71, 0x1a, 0x10, 0xe2, 0x86, 0x53, 0x68, 0x82, 0x54, 0x89, 0x6e,
+	0x84, 0x2a, 0xe0, 0x10, 0x8d, 0x77, 0xa7, 0xf6, 0x22, 0x7b, 0xc7, 0xdd, 0x19, 0x27, 0xb5, 0xa2,
+	0x00, 0xaa, 0xc4, 0x0d, 0x21, 0x24, 0x8e, 0x88, 0x97, 0x13, 0x82, 0x23, 0xf0, 0x4f, 0xe4, 0x18,
+	0x89, 0x0b, 0x27, 0x0b, 0x1c, 0x84, 0x50, 0xfe, 0x84, 0x9e, 0xd0, 0xcc, 0xce, 0xda, 0xeb, 0x97,
+	0xb5, 0x53, 0x64, 0x71, 0xb1, 0x76, 0x3c, 0xcf, 0x33, 0xcf, 0xe7, 0xf9, 0xce, 0x33, 0xf3, 0xec,
+	0xc2, 0x82, 0x43, 0x59, 0xfd, 0x00, 0xb3, 0xba, 0x25, 0x7f, 0xf6, 0x8b, 0xd6, 0xc3, 0x26, 0x09,
+	0x5a, 0x66, 0x23, 0xa0, 0x9c, 0xa2, 0x6c, 0x34, 0x6b, 0xca, 0x9f, 0xfd, 0x62, 0xfe, 0xff, 0x15,
+	0x5a, 0xa1, 0x72, 0xd2, 0x12, 0x4f, 0xa1, 0x5d, 0x7e, 0x78, 0x15, 0xde, 0x6a, 0x10, 0x16, 0xcd,
+	0x56, 0x28, 0xad, 0xd4, 0x88, 0x85, 0x1b, 0x9e, 0x85, 0x7d, 0x9f, 0x72, 0xcc, 0x3d, 0xea, 0x47,
+	0xb3, 0x37, 0x85, 0x2f, 0x65, 0x56, 0x19, 0x33, 0x12, 0x06, 0xb7, 0xf6, 0x8b, 0x65, 0xc2, 0x71,
+	0xd1, 0x6a, 0xe0, 0x8a, 0xe7, 0x4b, 0xe3, 0xd0, 0xd6, 0xd8, 0x84, 0xb9, 0x7b, 0xc2, 0x62, 0x8b,
+	0xfa, 0x3c, 0xc0, 0x0e, 0xdf, 0xf1, 0x1f, 0x50, 0x9b, 0x3c, 0x6c, 0x12, 0xc6, 0x51, 0x0e, 0xce,
+	0x63, 0xd7, 0x0d, 0x08, 0x63, 0x39, 0x70, 0x0d, 0xac, 0x66, 0xec, 0x68, 0x68, 0x7c, 0x0e, 0xe0,
+	0x95, 0x11, 0x6e, 0xac, 0x41, 0x7d, 0x46, 0x92, 0xfd, 0xd0, 0x3d, 0x78, 0xc9, 0x51, 0x1e, 0x7b,
+	0x9e, 0xff, 0x80, 0xe6, 0x66, 0xae, 0x81, 0xd5, 0x8b, 0x1b, 0x9a, 0x39, 0xa8, 0x8a, 0x19, 0x5f,
+	0xb8, 0xb4, 0x78, 0xdc, 0xd6, 0x53, 0x27, 0x6d, 0x1d, 0x9c, 0xb5, 0xf5, 0x94, 0xbd, 0xe8, 0xc4,
+	0xe6, 0x5e, 0x4f, 0xff, 0xfd, 0x9d, 0x0e, 0x8c, 0x8f, 0xe1, 0xd5, 0x3e, 0x9e, 0x6d, 0x8f, 0x71,
+	0x1a, 0xb4, 0x26, 0x66, 0x82, 0xde, 0x82, 0xb0, 0xa7, 0x89, 0xc2, 0xb9, 0x6e, 0x86, 0x02, 0x9a,
+	0x42, 0x40, 0x33, 0xdc, 0x3d, 0x25, 0xa0, 0xf9, 0x0e, 0xae, 0x10, 0xb5, 0xaa, 0x1d, 0xf3, 0x34,
+	0x7e, 0x01, 0xb0, 0x30, 0x9a, 0x40, 0x89, 0xf2, 0x36, 0x9c, 0x27, 0x3e, 0x0f, 0x3c, 0x22, 0x10,
+	0x2e, 0xac, 0x5e, 0xdc, 0xb8, 0x99, 0x9c, 0xf4, 0x16, 0x75, 0x89, 0xf2, 0x7f, 0xd3, 0xe7, 0x41,
+	0xab, 0x94, 0x16, 0x02, 0xd8, 0xd1, 0x02, 0xe8, 0xce, 0x08, 0xe8, 0x17, 0x27, 0x42, 0x87, 0x20,
+	0x7d, 0xd4, 0x1f, 0x0d, 0xc8, 0xc6, 0x4a, 0x2d, 0x11, 0x3b, 0x92, 0x6d, 0x09, 0xce, 0x3b, 0xd4,
+	0x25, 0x7b, 0x9e, 0x2b, 0x65, 0x4b, 0xdb, 0x73, 0x62, 0xb8, 0xe3, 0x4e, 0x4d, 0xb5, 0x4f, 0x07,
+	0x55, 0xeb, 0x02, 0x28, 0xd5, 0x0a, 0x30, 0x13, 0xed, 0x76, 0xa8, 0x5b, 0xc6, 0xee, 0xfd, 0x31,
+	0x3d, 0x1d, 0x3e, 0x89, 0x38, 0xde, 0xa8, 0xd5, 0x22, 0x94, 0x5d, 0x8e, 0x39, 0xf9, 0xef, 0x0a,
+	0xe8, 0x5b, 0x00, 0x97, 0x13, 0x10, 0x94, 0x16, 0xaf, 0xc0, 0xb9, 0x3a, 0x75, 0x49, 0x2d, 0x2a,
+	0xa0, 0xa5, 0xe1, 0x02, 0xba, 0x2b, 0xe6, 0x55, 0xb5, 0x28, 0xe3, 0xe9, 0x89, 0x74, 0x5f, 0x69,
+	0x64, 0xe3, 0x83, 0xa7, 0xd4, 0x68, 0x19, 0x42, 0x19, 0x63, 0xcf, 0xc5, 0x1c, 0x4b, 0x84, 0x45,
+	0x3b, 0x23, 0xff, 0xb9, 0x8d, 0x39, 0x36, 0x6e, 0xa9, 0xcc, 0x87, 0x17, 0x56, 0x99, 0x23, 0x98,
+	0x96, 0x9e, 0x40, 0x7a, 0xca, 0x67, 0xe3, 0x3d, 0xa8, 0x49, 0xa7, 0xdd, 0x3a, 0x0e, 0xf8, 0x74,
+	0x79, 0x76, 0xa1, 0x9e, 0xb8, 0xb4, 0x22, 0x5a, 0x8f, 0x13, 0x95, 0x0a, 0x4f, 0xda, 0x7a, 0x8e,
+	0xf8, 0x0e, 0x75, 0x3d, 0xbf, 0x62, 0x7d, 0xc8, 0xa8, 0x6f, 0xda, 0xf8, 0xe0, 0x2e, 0x61, 0x4c,
+	0x68, 0x19, 0xf2, 0xae, 0xc1, 0xac, 0xaa, 0xf4, 0xc9, 0xe7, 0xcb, 0xf8, 0x0b, 0xc0, 0xac, 0x30,
+	0xec, 0xbb, 0x56, 0x6f, 0x0c, 0x58, 0x97, 0xb2, 0x9d, 0xb6, 0x3e, 0x27, 0xcd, 0x6e, 0x9f, 0xb5,
+	0xf5, 0x19, 0xcf, 0xed, 0x9e, 0xcf, 0x1c, 0x9c, 0x77, 0x02, 0x82, 0x39, 0x0d, 0x64, 0x76, 0x19,
+	0x3b, 0x1a, 0xa2, 0x77, 0x61, 0x46, 0xe0, 0xec, 0x55, 0x31, 0xab, 0xe6, 0x2e, 0x48, 0xfa, 0xd7,
+	0x9e, 0xb4, 0xf5, 0xcd, 0x8a, 0xc7, 0xab, 0xcd, 0xb2, 0xe9, 0xd0, 0xba, 0xc5, 0x89, 0xef, 0x92,
+	0xa0, 0xee, 0xf9, 0x3c, 0xfe, 0x58, 0xf3, 0xca, 0xcc, 0x2a, 0xb7, 0x38, 0x61, 0xe6, 0x36, 0x79,
+	0x54, 0x12, 0x0f, 0xf6, 0x82, 0x58, 0x6a, 0x1b, 0xb3, 0x2a, 0x7a, 0x16, 0xce, 0x31, 0xda, 0x0c,
+	0x1c, 0x92, 0x4b, 0xcb, 0x78, 0x6a, 0x24, 0x40, 0xca, 0x4d, 0xaf, 0xe6, 0x92, 0x20, 0x37, 0x1b,
+	0x82, 0xa8, 0xa1, 0xba, 0xb7, 0x1f, 0x03, 0xf8, 0xbf, 0x98, 0x2c, 0x2a, 0xd3, 0x1d, 0x71, 0xea,
+	0x45, 0xa6, 0xa2, 0x45, 0x00, 0x59, 0xb1, 0xc6, 0xa8, 0xdb, 0xb2, 0x5f, 0xa0, 0xd2, 0x42, 0xb7,
+	0x45, 0x2c, 0x38, 0x6a, 0x0e, 0x15, 0xd4, 0x46, 0xc9, 0x4d, 0x2e, 0x2d, 0x9c, 0xb5, 0x75, 0x39,
+	0x0e, 0x37, 0x45, 0x41, 0x7c, 0x10, 0x63, 0x60, 0xd1, 0xde, 0xf4, 0x9f, 0x6b, 0xf0, 0xaf, 0xcf,
+	0xf5, 0xf7, 0x00, 0xa2, 0xf8, 0xea, 0x2a, 0xc5, 0x3b, 0x10, 0x76, 0x53, 0x8c, 0x0e, 0xf4, 0x79,
+	0x72, 0x0c, 0xcf, 0x76, 0x26, 0xca, 0x6f, 0x7a, 0xc7, 0x7b, 0xe3, 0xe7, 0x0c, 0x9c, 0x95, 0xa0,
+	0xe8, 0x33, 0x00, 0x17, 0xe3, 0xfd, 0x17, 0x8d, 0x68, 0x55, 0x49, 0x2f, 0x0d, 0xf9, 0xb5, 0x73,
+	0xd9, 0x86, 0xf1, 0x8d, 0x95, 0xc7, 0xbf, 0xfe, 0xf9, 0xe5, 0xcc, 0x32, 0xba, 0xda, 0x7d, 0xcb,
+	0x89, 0x2e, 0x77, 0xeb, 0x50, 0x1d, 0xd6, 0x23, 0xf4, 0x35, 0x80, 0x97, 0x07, 0xba, 0x2a, 0x7a,
+	0x79, 0x42, 0x94, 0xfe, 0xfe, 0x9f, 0x37, 0xcf, 0x6b, 0xae, 0xb8, 0xd6, 0x24, 0xd7, 0x0b, 0x68,
+	0x65, 0x0c, 0x97, 0x55, 0x55, 0x2c, 0x5f, 0xc5, 0xf8, 0x54, 0xff, 0x9a, 0xc8, 0xd7, 0xdf, 0x68,
+	0x27, 0xf2, 0x0d, 0xb4, 0x45, 0xe3, 0x86, 0xe4, 0x5b, 0x41, 0xcf, 0xc5, 0xf8, 0x5c, 0x62, 0x1d,
+	0xaa, 0xfb, 0xe1, 0xc8, 0xea, 0xf5, 0xc8, 0x6f, 0x00, 0xcc, 0x0e, 0xb6, 0x14, 0x94, 0x14, 0x2f,
+	0xa1, 0xfd, 0xe5, 0xad, 0x73, 0xdb, 0x8f, 0x01, 0x1c, 0x12, 0x90, 0x49, 0x96, 0x1f, 0x01, 0xcc,
+	0x0e, 0xde, 0xfc, 0x89, 0x80, 0x09, 0xbd, 0x27, 0x11, 0x30, 0xa9, 0xa5, 0x18, 0x9b, 0x12, 0xd0,
+	0x44, 0x2f, 0x8d, 0x03, 0x0c, 0xf0, 0x81, 0x75, 0xd8, 0xeb, 0x14, 0x47, 0xe8, 0x27, 0x00, 0xd1,
+	0x70, 0x57, 0x40, 0xeb, 0x09, 0xd1, 0x13, 0x7b, 0x53, 0xbe, 0xf8, 0x14, 0x1e, 0x8a, 0xf8, 0x55,
+	0x49, 0xbc, 0x8e, 0xcc, 0xb1, 0x92, 0x0a, 0xff, 0x7e, 0xe6, 0x06, 0x4c, 0xcb, 0x92, 0x34, 0x12,
+	0x6b, 0xac, 0x57, 0x87, 0x2b, 0x63, 0x6d, 0x14, 0x88, 0x2e, 0x41, 0xae, 0xa0, 0xa5, 0x84, 0xe2,
+	0x43, 0x1e, 0x9c, 0x95, 0x97, 0x1d, 0x1a, 0xb7, 0x5c, 0x74, 0xd1, 0xe6, 0x9f, 0x1f, 0x6f, 0xa4,
+	0x82, 0x3e, 0x23, 0x83, 0x5e, 0x46, 0x97, 0xfa, 0x82, 0x96, 0xb6, 0x8f, 0xff, 0xd0, 0x52, 0x3f,
+	0x74, 0xb4, 0xd4, 0x71, 0x47, 0x03, 0x27, 0x1d, 0x0d, 0xfc, 0xde, 0xd1, 0xc0, 0x17, 0xa7, 0x5a,
+	0xea, 0xe4, 0x54, 0x4b, 0xfd, 0x76, 0xaa, 0xa5, 0xde, 0xbf, 0x1e, 0xeb, 0x6c, 0x5b, 0x94, 0xd5,
+	0xef, 0x47, 0xdf, 0x54, 0xae, 0xf5, 0x28, 0x5c, 0x4b, 0x7e, 0x58, 0x95, 0xe7, 0xe4, 0xf7, 0xd0,
+	0xad, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x06, 0x26, 0x46, 0xb4, 0xbf, 0x0d, 0x00, 0x00,
 }
 
 func (this *QueryContractInfoResponse) Equal(that interface{}) bool {
@@ -949,7 +949,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient {
 
 func (c *queryClient) ContractInfo(ctx context.Context, in *QueryContractInfoRequest, opts ...grpc.CallOption) (*QueryContractInfoResponse, error) {
 	out := new(QueryContractInfoResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Query/ContractInfo", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Query/ContractInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -958,7 +958,7 @@ func (c *queryClient) ContractInfo(ctx context.Context, in *QueryContractInfoReq
 
 func (c *queryClient) ContractHistory(ctx context.Context, in *QueryContractHistoryRequest, opts ...grpc.CallOption) (*QueryContractHistoryResponse, error) {
 	out := new(QueryContractHistoryResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Query/ContractHistory", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Query/ContractHistory", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -967,7 +967,7 @@ func (c *queryClient) ContractHistory(ctx context.Context, in *QueryContractHist
 
 func (c *queryClient) ContractsByCode(ctx context.Context, in *QueryContractsByCodeRequest, opts ...grpc.CallOption) (*QueryContractsByCodeResponse, error) {
 	out := new(QueryContractsByCodeResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Query/ContractsByCode", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Query/ContractsByCode", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -976,7 +976,7 @@ func (c *queryClient) ContractsByCode(ctx context.Context, in *QueryContractsByC
 
 func (c *queryClient) AllContractState(ctx context.Context, in *QueryAllContractStateRequest, opts ...grpc.CallOption) (*QueryAllContractStateResponse, error) {
 	out := new(QueryAllContractStateResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Query/AllContractState", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Query/AllContractState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -985,7 +985,7 @@ func (c *queryClient) AllContractState(ctx context.Context, in *QueryAllContract
 
 func (c *queryClient) RawContractState(ctx context.Context, in *QueryRawContractStateRequest, opts ...grpc.CallOption) (*QueryRawContractStateResponse, error) {
 	out := new(QueryRawContractStateResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Query/RawContractState", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Query/RawContractState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -994,7 +994,7 @@ func (c *queryClient) RawContractState(ctx context.Context, in *QueryRawContract
 
 func (c *queryClient) SmartContractState(ctx context.Context, in *QuerySmartContractStateRequest, opts ...grpc.CallOption) (*QuerySmartContractStateResponse, error) {
 	out := new(QuerySmartContractStateResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Query/SmartContractState", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Query/SmartContractState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1003,7 +1003,7 @@ func (c *queryClient) SmartContractState(ctx context.Context, in *QuerySmartCont
 
 func (c *queryClient) Code(ctx context.Context, in *QueryCodeRequest, opts ...grpc.CallOption) (*QueryCodeResponse, error) {
 	out := new(QueryCodeResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Query/Code", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Query/Code", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1012,7 +1012,7 @@ func (c *queryClient) Code(ctx context.Context, in *QueryCodeRequest, opts ...gr
 
 func (c *queryClient) Codes(ctx context.Context, in *QueryCodesRequest, opts ...grpc.CallOption) (*QueryCodesResponse, error) {
 	out := new(QueryCodesResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Query/Codes", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Query/Codes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1082,7 +1082,7 @@ func _Query_ContractInfo_Handler(srv interface{}, ctx context.Context, dec func(
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Query/ContractInfo",
+		FullMethod: "/cosmwasm.wasm.v1.Query/ContractInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).ContractInfo(ctx, req.(*QueryContractInfoRequest))
@@ -1100,7 +1100,7 @@ func _Query_ContractHistory_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Query/ContractHistory",
+		FullMethod: "/cosmwasm.wasm.v1.Query/ContractHistory",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).ContractHistory(ctx, req.(*QueryContractHistoryRequest))
@@ -1118,7 +1118,7 @@ func _Query_ContractsByCode_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Query/ContractsByCode",
+		FullMethod: "/cosmwasm.wasm.v1.Query/ContractsByCode",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).ContractsByCode(ctx, req.(*QueryContractsByCodeRequest))
@@ -1136,7 +1136,7 @@ func _Query_AllContractState_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Query/AllContractState",
+		FullMethod: "/cosmwasm.wasm.v1.Query/AllContractState",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).AllContractState(ctx, req.(*QueryAllContractStateRequest))
@@ -1154,7 +1154,7 @@ func _Query_RawContractState_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Query/RawContractState",
+		FullMethod: "/cosmwasm.wasm.v1.Query/RawContractState",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).RawContractState(ctx, req.(*QueryRawContractStateRequest))
@@ -1172,7 +1172,7 @@ func _Query_SmartContractState_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Query/SmartContractState",
+		FullMethod: "/cosmwasm.wasm.v1.Query/SmartContractState",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).SmartContractState(ctx, req.(*QuerySmartContractStateRequest))
@@ -1190,7 +1190,7 @@ func _Query_Code_Handler(srv interface{}, ctx context.Context, dec func(interfac
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Query/Code",
+		FullMethod: "/cosmwasm.wasm.v1.Query/Code",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).Code(ctx, req.(*QueryCodeRequest))
@@ -1208,7 +1208,7 @@ func _Query_Codes_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Query/Codes",
+		FullMethod: "/cosmwasm.wasm.v1.Query/Codes",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).Codes(ctx, req.(*QueryCodesRequest))
@@ -1217,7 +1217,7 @@ func _Query_Codes_Handler(srv interface{}, ctx context.Context, dec func(interfa
 }
 
 var _Query_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "cosmwasm.wasm.v1beta1.Query",
+	ServiceName: "cosmwasm.wasm.v1.Query",
 	HandlerType: (*QueryServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -1254,7 +1254,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "cosmwasm/wasm/v1beta1/query.proto",
+	Metadata: "cosmwasm/wasm/v1/query.proto",
 }
 
 func (m *QueryContractInfoRequest) Marshal() (dAtA []byte, err error) {
diff --git a/x/wasm/types/query.pb.gw.go b/x/wasm/types/query.pb.gw.go
index fbde946d491..035657a3a74 100644
--- a/x/wasm/types/query.pb.gw.go
+++ b/x/wasm/types/query.pb.gw.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
-// source: cosmwasm/wasm/v1beta1/query.proto
+// source: cosmwasm/wasm/v1/query.proto
 
 /*
 Package types is a reverse proxy.
@@ -914,21 +914,21 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_ContractInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"wasm", "v1beta1", "contract", "address"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_ContractInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"wasm", "v1", "contract", "address"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_ContractHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"wasm", "v1beta1", "contract", "address", "history"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_ContractHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"wasm", "v1", "contract", "address", "history"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_ContractsByCode_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"wasm", "v1beta1", "code", "code_id", "contracts"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_ContractsByCode_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"wasm", "v1", "code", "code_id", "contracts"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_AllContractState_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"wasm", "v1beta1", "contract", "address", "state"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_AllContractState_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"wasm", "v1", "contract", "address", "state"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_RawContractState_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"wasm", "v1beta1", "contract", "address", "raw", "query_data"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_RawContractState_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"wasm", "v1", "contract", "address", "raw", "query_data"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_SmartContractState_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"wasm", "v1beta1", "contract", "address", "smart", "query_data"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_SmartContractState_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"wasm", "v1", "contract", "address", "smart", "query_data"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_Code_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"wasm", "v1beta1", "code", "code_id"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_Code_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"wasm", "v1", "code", "code_id"}, "", runtime.AssumeColonVerbOpt(true)))
 
-	pattern_Query_Codes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"wasm", "v1beta1", "code"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_Codes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"wasm", "v1", "code"}, "", runtime.AssumeColonVerbOpt(true)))
 )
 
 var (
diff --git a/x/wasm/types/tx.pb.go b/x/wasm/types/tx.pb.go
index 7e2f6dacb4b..04ea838dac0 100644
--- a/x/wasm/types/tx.pb.go
+++ b/x/wasm/types/tx.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmwasm/wasm/v1beta1/tx.proto
+// source: cosmwasm/wasm/v1/tx.proto
 
 package types
 
@@ -50,7 +50,7 @@ func (m *MsgStoreCode) Reset()         { *m = MsgStoreCode{} }
 func (m *MsgStoreCode) String() string { return proto.CompactTextString(m) }
 func (*MsgStoreCode) ProtoMessage()    {}
 func (*MsgStoreCode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{0}
+	return fileDescriptor_4f74d82755520264, []int{0}
 }
 func (m *MsgStoreCode) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -89,7 +89,7 @@ func (m *MsgStoreCodeResponse) Reset()         { *m = MsgStoreCodeResponse{} }
 func (m *MsgStoreCodeResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgStoreCodeResponse) ProtoMessage()    {}
 func (*MsgStoreCodeResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{1}
+	return fileDescriptor_4f74d82755520264, []int{1}
 }
 func (m *MsgStoreCodeResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -139,7 +139,7 @@ func (m *MsgInstantiateContract) Reset()         { *m = MsgInstantiateContract{}
 func (m *MsgInstantiateContract) String() string { return proto.CompactTextString(m) }
 func (*MsgInstantiateContract) ProtoMessage()    {}
 func (*MsgInstantiateContract) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{2}
+	return fileDescriptor_4f74d82755520264, []int{2}
 }
 func (m *MsgInstantiateContract) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -180,7 +180,7 @@ func (m *MsgInstantiateContractResponse) Reset()         { *m = MsgInstantiateCo
 func (m *MsgInstantiateContractResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgInstantiateContractResponse) ProtoMessage()    {}
 func (*MsgInstantiateContractResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{3}
+	return fileDescriptor_4f74d82755520264, []int{3}
 }
 func (m *MsgInstantiateContractResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -225,7 +225,7 @@ func (m *MsgExecuteContract) Reset()         { *m = MsgExecuteContract{} }
 func (m *MsgExecuteContract) String() string { return proto.CompactTextString(m) }
 func (*MsgExecuteContract) ProtoMessage()    {}
 func (*MsgExecuteContract) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{4}
+	return fileDescriptor_4f74d82755520264, []int{4}
 }
 func (m *MsgExecuteContract) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -264,7 +264,7 @@ func (m *MsgExecuteContractResponse) Reset()         { *m = MsgExecuteContractRe
 func (m *MsgExecuteContractResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgExecuteContractResponse) ProtoMessage()    {}
 func (*MsgExecuteContractResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{5}
+	return fileDescriptor_4f74d82755520264, []int{5}
 }
 func (m *MsgExecuteContractResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -309,7 +309,7 @@ func (m *MsgMigrateContract) Reset()         { *m = MsgMigrateContract{} }
 func (m *MsgMigrateContract) String() string { return proto.CompactTextString(m) }
 func (*MsgMigrateContract) ProtoMessage()    {}
 func (*MsgMigrateContract) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{6}
+	return fileDescriptor_4f74d82755520264, []int{6}
 }
 func (m *MsgMigrateContract) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -349,7 +349,7 @@ func (m *MsgMigrateContractResponse) Reset()         { *m = MsgMigrateContractRe
 func (m *MsgMigrateContractResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgMigrateContractResponse) ProtoMessage()    {}
 func (*MsgMigrateContractResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{7}
+	return fileDescriptor_4f74d82755520264, []int{7}
 }
 func (m *MsgMigrateContractResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -392,7 +392,7 @@ func (m *MsgUpdateAdmin) Reset()         { *m = MsgUpdateAdmin{} }
 func (m *MsgUpdateAdmin) String() string { return proto.CompactTextString(m) }
 func (*MsgUpdateAdmin) ProtoMessage()    {}
 func (*MsgUpdateAdmin) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{8}
+	return fileDescriptor_4f74d82755520264, []int{8}
 }
 func (m *MsgUpdateAdmin) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -429,7 +429,7 @@ func (m *MsgUpdateAdminResponse) Reset()         { *m = MsgUpdateAdminResponse{}
 func (m *MsgUpdateAdminResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgUpdateAdminResponse) ProtoMessage()    {}
 func (*MsgUpdateAdminResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{9}
+	return fileDescriptor_4f74d82755520264, []int{9}
 }
 func (m *MsgUpdateAdminResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -470,7 +470,7 @@ func (m *MsgClearAdmin) Reset()         { *m = MsgClearAdmin{} }
 func (m *MsgClearAdmin) String() string { return proto.CompactTextString(m) }
 func (*MsgClearAdmin) ProtoMessage()    {}
 func (*MsgClearAdmin) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{10}
+	return fileDescriptor_4f74d82755520264, []int{10}
 }
 func (m *MsgClearAdmin) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -507,7 +507,7 @@ func (m *MsgClearAdminResponse) Reset()         { *m = MsgClearAdminResponse{} }
 func (m *MsgClearAdminResponse) String() string { return proto.CompactTextString(m) }
 func (*MsgClearAdminResponse) ProtoMessage()    {}
 func (*MsgClearAdminResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_b74028d4038589a4, []int{11}
+	return fileDescriptor_4f74d82755520264, []int{11}
 }
 func (m *MsgClearAdminResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -537,71 +537,71 @@ func (m *MsgClearAdminResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_MsgClearAdminResponse proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterType((*MsgStoreCode)(nil), "cosmwasm.wasm.v1beta1.MsgStoreCode")
-	proto.RegisterType((*MsgStoreCodeResponse)(nil), "cosmwasm.wasm.v1beta1.MsgStoreCodeResponse")
-	proto.RegisterType((*MsgInstantiateContract)(nil), "cosmwasm.wasm.v1beta1.MsgInstantiateContract")
-	proto.RegisterType((*MsgInstantiateContractResponse)(nil), "cosmwasm.wasm.v1beta1.MsgInstantiateContractResponse")
-	proto.RegisterType((*MsgExecuteContract)(nil), "cosmwasm.wasm.v1beta1.MsgExecuteContract")
-	proto.RegisterType((*MsgExecuteContractResponse)(nil), "cosmwasm.wasm.v1beta1.MsgExecuteContractResponse")
-	proto.RegisterType((*MsgMigrateContract)(nil), "cosmwasm.wasm.v1beta1.MsgMigrateContract")
-	proto.RegisterType((*MsgMigrateContractResponse)(nil), "cosmwasm.wasm.v1beta1.MsgMigrateContractResponse")
-	proto.RegisterType((*MsgUpdateAdmin)(nil), "cosmwasm.wasm.v1beta1.MsgUpdateAdmin")
-	proto.RegisterType((*MsgUpdateAdminResponse)(nil), "cosmwasm.wasm.v1beta1.MsgUpdateAdminResponse")
-	proto.RegisterType((*MsgClearAdmin)(nil), "cosmwasm.wasm.v1beta1.MsgClearAdmin")
-	proto.RegisterType((*MsgClearAdminResponse)(nil), "cosmwasm.wasm.v1beta1.MsgClearAdminResponse")
-}
-
-func init() { proto.RegisterFile("cosmwasm/wasm/v1beta1/tx.proto", fileDescriptor_b74028d4038589a4) }
-
-var fileDescriptor_b74028d4038589a4 = []byte{
-	// 748 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4d, 0x6f, 0xd3, 0x4a,
-	0x14, 0x8d, 0x5f, 0x3e, 0xda, 0xdc, 0xe6, 0xf5, 0x55, 0x7e, 0x6d, 0x31, 0x46, 0x72, 0x82, 0x0b,
-	0x28, 0x08, 0xea, 0xb4, 0x45, 0xb0, 0x61, 0xd5, 0xb8, 0x2c, 0xba, 0x30, 0x42, 0xae, 0x50, 0xa5,
-	0x4a, 0x28, 0x8c, 0xed, 0xa9, 0xb1, 0x88, 0x3d, 0x91, 0x67, 0x42, 0x5b, 0xb1, 0x60, 0xcf, 0x8a,
-	0xdf, 0xc1, 0x7f, 0x60, 0xdf, 0x65, 0x97, 0xac, 0x0a, 0xa4, 0x5b, 0xd6, 0xac, 0x91, 0xc7, 0x1f,
-	0x75, 0x43, 0x1c, 0x05, 0x21, 0x36, 0xce, 0xdc, 0xcc, 0xb9, 0xe7, 0xcc, 0x3d, 0x3a, 0x1e, 0x83,
-	0x62, 0x13, 0xea, 0x1f, 0x21, 0xea, 0x77, 0xf8, 0xe3, 0xcd, 0xa6, 0x85, 0x19, 0xda, 0xec, 0xb0,
-	0x63, 0x6d, 0x10, 0x12, 0x46, 0xc4, 0x95, 0x74, 0x5f, 0xe3, 0x8f, 0x64, 0x5f, 0xe6, 0x6d, 0x84,
-	0x76, 0x2c, 0x44, 0x71, 0xd6, 0x64, 0x13, 0x2f, 0x88, 0xdb, 0xe4, 0x65, 0x97, 0xb8, 0x84, 0x2f,
-	0x3b, 0xd1, 0x2a, 0xf9, 0xf7, 0x66, 0x81, 0xd8, 0xc9, 0x00, 0xd3, 0x18, 0xa2, 0x7e, 0x17, 0xa0,
-	0x61, 0x50, 0x77, 0x8f, 0x91, 0x10, 0xeb, 0xc4, 0xc1, 0xe2, 0x2a, 0xd4, 0x28, 0x0e, 0x1c, 0x1c,
-	0x4a, 0x42, 0x4b, 0x68, 0xd7, 0xcd, 0xa4, 0x12, 0x1f, 0xc1, 0x62, 0x44, 0xd2, 0xb3, 0x4e, 0x18,
-	0xee, 0xd9, 0xc4, 0xc1, 0xd2, 0x3f, 0x2d, 0xa1, 0xdd, 0xe8, 0x2e, 0x8d, 0xce, 0x9b, 0x8d, 0xfd,
-	0xed, 0x3d, 0xa3, 0x7b, 0xc2, 0x38, 0x83, 0xd9, 0x88, 0x70, 0x69, 0xc5, 0xf9, 0xc8, 0x30, 0xb4,
-	0xb1, 0x54, 0x4e, 0xf8, 0x78, 0x25, 0x4a, 0x30, 0x67, 0x0d, 0xbd, 0x7e, 0x24, 0x54, 0xe1, 0x1b,
-	0x69, 0x29, 0x1e, 0xc0, 0xaa, 0x17, 0x50, 0x86, 0x02, 0xe6, 0x21, 0x86, 0x7b, 0x03, 0x1c, 0xfa,
-	0x1e, 0xa5, 0x1e, 0x09, 0xa4, 0x6a, 0x4b, 0x68, 0x2f, 0x6c, 0xad, 0x69, 0x13, 0x3d, 0xd2, 0xb6,
-	0x6d, 0x1b, 0x53, 0xaa, 0x93, 0xe0, 0xd0, 0x73, 0xcd, 0x95, 0x1c, 0xc5, 0xb3, 0x8c, 0x41, 0x7d,
-	0x0c, 0xcb, 0xf9, 0x69, 0x4d, 0x4c, 0x07, 0x24, 0xa0, 0x58, 0x5c, 0x83, 0xb9, 0x68, 0xa6, 0x9e,
-	0xe7, 0xf0, 0xb1, 0x2b, 0x5d, 0x18, 0x9d, 0x37, 0x6b, 0x11, 0x64, 0x77, 0xc7, 0xac, 0x45, 0x5b,
-	0xbb, 0x8e, 0xfa, 0x43, 0x80, 0x55, 0x83, 0xba, 0xbb, 0x97, 0xcc, 0x3a, 0x09, 0x58, 0x88, 0x6c,
-	0x56, 0xe8, 0xda, 0x32, 0x54, 0x91, 0xe3, 0x7b, 0x01, 0x37, 0xab, 0x6e, 0xc6, 0x45, 0x5e, 0xad,
-	0x5c, 0xa4, 0x16, 0xb5, 0xf6, 0x91, 0x85, 0xfb, 0x89, 0x3d, 0x71, 0x21, 0x2e, 0x41, 0xd9, 0xa7,
-	0x2e, 0x77, 0xa2, 0x61, 0x46, 0x4b, 0x11, 0x41, 0xf5, 0x70, 0x18, 0x38, 0x54, 0xaa, 0xb5, 0xca,
-	0xed, 0x85, 0xad, 0xeb, 0x5a, 0x1c, 0x15, 0x2d, 0x8a, 0x4a, 0xe6, 0x8d, 0x4e, 0xbc, 0xa0, 0xbb,
-	0x71, 0x7a, 0xde, 0x2c, 0x7d, 0xfc, 0xd2, 0x6c, 0xbb, 0x1e, 0x7b, 0x35, 0xb4, 0x34, 0x9b, 0xf8,
-	0x9d, 0x24, 0x57, 0xf1, 0xcf, 0x3a, 0x75, 0x5e, 0x27, 0xe9, 0x88, 0x1a, 0xa8, 0x19, 0x33, 0xab,
-	0x4f, 0x41, 0x99, 0x3c, 0x77, 0xe6, 0x9f, 0x04, 0x73, 0xc8, 0x71, 0x42, 0x4c, 0x69, 0x62, 0x40,
-	0x5a, 0x8a, 0x22, 0x54, 0x1c, 0xc4, 0x50, 0x9c, 0x16, 0x93, 0xaf, 0xd5, 0x4f, 0x02, 0x88, 0x06,
-	0x75, 0x9f, 0x1c, 0x63, 0x7b, 0x38, 0x83, 0x89, 0x32, 0xcc, 0xdb, 0x09, 0x26, 0xf1, 0x31, 0xab,
-	0x53, 0x3f, 0xca, 0x13, 0xfc, 0xa8, 0xfe, 0x35, 0x3f, 0x36, 0x40, 0xfe, 0xf5, 0xf8, 0x99, 0x17,
-	0xe9, 0xc4, 0x42, 0x6e, 0xe2, 0x77, 0x7c, 0x60, 0xc3, 0x73, 0x43, 0xf4, 0x87, 0x03, 0xcf, 0x94,
-	0x9d, 0xc4, 0x95, 0x4a, 0xe6, 0x4a, 0x72, 0xe4, 0xb1, 0x03, 0x4c, 0x3d, 0x32, 0x82, 0x45, 0x83,
-	0xba, 0xcf, 0x07, 0x0e, 0x62, 0x78, 0x9b, 0xc7, 0xb6, 0xe8, 0xb8, 0x37, 0xa0, 0x1e, 0xe0, 0xa3,
-	0x5e, 0x3e, 0xe8, 0xf3, 0x01, 0x3e, 0x8a, 0x9b, 0xf2, 0xb3, 0x94, 0xaf, 0xce, 0xa2, 0x4a, 0xfc,
-	0x7d, 0xca, 0x49, 0xa4, 0x07, 0x52, 0x75, 0xf8, 0xd7, 0xa0, 0xae, 0xde, 0xc7, 0x28, 0x9c, 0xae,
-	0x3d, 0x8d, 0xfe, 0x1a, 0xac, 0x5c, 0x21, 0x49, 0xd9, 0xb7, 0xde, 0x57, 0xa1, 0x6c, 0x50, 0x57,
-	0x7c, 0x01, 0xf5, 0xcb, 0x8b, 0xaf, 0xe8, 0x5a, 0xc9, 0xdf, 0x17, 0xf2, 0xbd, 0x19, 0x40, 0x99,
-	0xab, 0x6f, 0xe1, 0xff, 0x49, 0x77, 0xc5, 0x7a, 0x31, 0xc7, 0x04, 0xb8, 0xfc, 0xf0, 0xb7, 0xe0,
-	0x99, 0x38, 0x81, 0xff, 0xc6, 0xdf, 0xaf, 0xbb, 0xc5, 0x4c, 0x63, 0x50, 0x79, 0x73, 0x66, 0x68,
-	0x5e, 0x70, 0x3c, 0xdf, 0x53, 0x04, 0xc7, 0xa0, 0xd3, 0x04, 0x8b, 0x42, 0x6b, 0xc3, 0x42, 0x3e,
-	0x9d, 0xb7, 0x8b, 0x19, 0x72, 0x30, 0x79, 0x7d, 0x26, 0x58, 0x26, 0xf2, 0x12, 0x20, 0x97, 0xc2,
-	0x5b, 0xc5, 0xcd, 0x97, 0x28, 0xf9, 0xfe, 0x2c, 0xa8, 0x54, 0xa1, 0xbb, 0x73, 0xfa, 0x4d, 0x29,
-	0x9d, 0x8e, 0x14, 0xe1, 0x6c, 0xa4, 0x08, 0x5f, 0x47, 0x8a, 0xf0, 0xe1, 0x42, 0x29, 0x9d, 0x5d,
-	0x28, 0xa5, 0xcf, 0x17, 0x4a, 0xe9, 0xe0, 0x4e, 0xee, 0x6e, 0xd2, 0x09, 0xf5, 0xf7, 0xd3, 0xaf,
-	0xb9, 0xd3, 0x39, 0x8e, 0xbf, 0xea, 0xfc, 0x7e, 0xb2, 0x6a, 0xfc, 0x73, 0xfe, 0xe0, 0x67, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xfb, 0xb3, 0x1e, 0xb6, 0x60, 0x08, 0x00, 0x00,
+	proto.RegisterType((*MsgStoreCode)(nil), "cosmwasm.wasm.v1.MsgStoreCode")
+	proto.RegisterType((*MsgStoreCodeResponse)(nil), "cosmwasm.wasm.v1.MsgStoreCodeResponse")
+	proto.RegisterType((*MsgInstantiateContract)(nil), "cosmwasm.wasm.v1.MsgInstantiateContract")
+	proto.RegisterType((*MsgInstantiateContractResponse)(nil), "cosmwasm.wasm.v1.MsgInstantiateContractResponse")
+	proto.RegisterType((*MsgExecuteContract)(nil), "cosmwasm.wasm.v1.MsgExecuteContract")
+	proto.RegisterType((*MsgExecuteContractResponse)(nil), "cosmwasm.wasm.v1.MsgExecuteContractResponse")
+	proto.RegisterType((*MsgMigrateContract)(nil), "cosmwasm.wasm.v1.MsgMigrateContract")
+	proto.RegisterType((*MsgMigrateContractResponse)(nil), "cosmwasm.wasm.v1.MsgMigrateContractResponse")
+	proto.RegisterType((*MsgUpdateAdmin)(nil), "cosmwasm.wasm.v1.MsgUpdateAdmin")
+	proto.RegisterType((*MsgUpdateAdminResponse)(nil), "cosmwasm.wasm.v1.MsgUpdateAdminResponse")
+	proto.RegisterType((*MsgClearAdmin)(nil), "cosmwasm.wasm.v1.MsgClearAdmin")
+	proto.RegisterType((*MsgClearAdminResponse)(nil), "cosmwasm.wasm.v1.MsgClearAdminResponse")
+}
+
+func init() { proto.RegisterFile("cosmwasm/wasm/v1/tx.proto", fileDescriptor_4f74d82755520264) }
+
+var fileDescriptor_4f74d82755520264 = []byte{
+	// 749 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0x8e, 0xc9, 0x4f, 0x9b, 0x69, 0x28, 0x95, 0x69, 0x8b, 0x6b, 0x90, 0x13, 0x05, 0x54, 0x72,
+	0x00, 0xbb, 0x29, 0x12, 0x17, 0x4e, 0x4d, 0xca, 0xa1, 0x07, 0x23, 0xe4, 0xaa, 0x54, 0x70, 0x89,
+	0xd6, 0xf6, 0xd6, 0x58, 0xc4, 0xde, 0xe0, 0xdd, 0xf4, 0xe7, 0xc4, 0x2b, 0xf0, 0x1c, 0xbc, 0x03,
+	0xf7, 0x9e, 0x50, 0x8f, 0x9c, 0x0a, 0xa4, 0x07, 0xde, 0x80, 0x33, 0xf2, 0xfa, 0xa7, 0x6e, 0xea,
+	0xa4, 0x91, 0x10, 0x97, 0x64, 0xc7, 0xfb, 0xcd, 0x37, 0x33, 0x9f, 0x3e, 0x8f, 0x61, 0xcd, 0x22,
+	0xd4, 0x3b, 0x42, 0xd4, 0xd3, 0xf8, 0xcf, 0x61, 0x5b, 0x63, 0xc7, 0xea, 0x20, 0x20, 0x8c, 0x88,
+	0x4b, 0xc9, 0x95, 0xca, 0x7f, 0x0e, 0xdb, 0xb2, 0x12, 0x3e, 0x21, 0x54, 0x33, 0x11, 0xc5, 0xda,
+	0x61, 0xdb, 0xc4, 0x0c, 0xb5, 0x35, 0x8b, 0xb8, 0x7e, 0x94, 0x21, 0x2f, 0x3b, 0xc4, 0x21, 0xfc,
+	0xa8, 0x85, 0xa7, 0xf8, 0xe9, 0x83, 0xeb, 0x25, 0x4e, 0x06, 0x98, 0x46, 0xb7, 0xcd, 0xdf, 0x02,
+	0xd4, 0x74, 0xea, 0xec, 0x32, 0x12, 0xe0, 0x2e, 0xb1, 0xb1, 0xb8, 0x0a, 0x15, 0x8a, 0x7d, 0x1b,
+	0x07, 0x92, 0xd0, 0x10, 0x5a, 0x55, 0x23, 0x8e, 0xc4, 0xe7, 0xb0, 0x18, 0xe6, 0xf7, 0xcc, 0x13,
+	0x86, 0x7b, 0x16, 0xb1, 0xb1, 0x74, 0xab, 0x21, 0xb4, 0x6a, 0x9d, 0xa5, 0xd1, 0x79, 0xbd, 0xb6,
+	0xbf, 0xb5, 0xab, 0x77, 0x4e, 0x18, 0x67, 0x30, 0x6a, 0x21, 0x2e, 0x89, 0x38, 0x1f, 0x19, 0x06,
+	0x16, 0x96, 0x8a, 0x31, 0x1f, 0x8f, 0x44, 0x09, 0xe6, 0xcc, 0xa1, 0xdb, 0x0f, 0x0b, 0x95, 0xf8,
+	0x45, 0x12, 0x8a, 0x7b, 0xb0, 0xea, 0xfa, 0x94, 0x21, 0x9f, 0xb9, 0x88, 0xe1, 0xde, 0x00, 0x07,
+	0x9e, 0x4b, 0xa9, 0x4b, 0x7c, 0xa9, 0xdc, 0x10, 0x5a, 0x0b, 0x9b, 0x8a, 0x3a, 0xae, 0x8c, 0xba,
+	0x65, 0x59, 0x98, 0xd2, 0x2e, 0xf1, 0x0f, 0x5c, 0xc7, 0x58, 0xc9, 0x64, 0xbf, 0x4e, 0x93, 0x9b,
+	0x2f, 0x60, 0x39, 0x3b, 0xa8, 0x81, 0xe9, 0x80, 0xf8, 0x14, 0x8b, 0x0f, 0x61, 0x2e, 0x1c, 0xa7,
+	0xe7, 0xda, 0x7c, 0xe2, 0x52, 0x07, 0x46, 0xe7, 0xf5, 0x4a, 0x08, 0xd9, 0xd9, 0x36, 0x2a, 0xe1,
+	0xd5, 0x8e, 0xdd, 0xfc, 0x23, 0xc0, 0xaa, 0x4e, 0x9d, 0x9d, 0x4b, 0xe6, 0x2e, 0xf1, 0x59, 0x80,
+	0x2c, 0x36, 0x51, 0xb0, 0x65, 0x28, 0x23, 0xdb, 0x73, 0x7d, 0xae, 0x53, 0xd5, 0x88, 0x82, 0x6c,
+	0xb5, 0xe2, 0xa4, 0x6a, 0x61, 0x6a, 0x1f, 0x99, 0xb8, 0x1f, 0x2b, 0x13, 0x05, 0xe2, 0x12, 0x14,
+	0x3d, 0xea, 0x70, 0x11, 0x6a, 0x46, 0x78, 0x14, 0x11, 0x94, 0x0f, 0x86, 0xbe, 0x4d, 0xa5, 0x4a,
+	0xa3, 0xd8, 0x5a, 0xd8, 0x5c, 0x53, 0x23, 0x83, 0xa8, 0xa1, 0x41, 0xd4, 0xd8, 0x20, 0x6a, 0x97,
+	0xb8, 0x7e, 0x67, 0xe3, 0xf4, 0xbc, 0x5e, 0xf8, 0xf2, 0xa3, 0xde, 0x72, 0x5c, 0xf6, 0x7e, 0x68,
+	0xaa, 0x16, 0xf1, 0xb4, 0xd8, 0x4d, 0xd1, 0xdf, 0x53, 0x6a, 0x7f, 0x88, 0x8d, 0x11, 0x26, 0x50,
+	0x23, 0x62, 0x6e, 0xbe, 0x02, 0x25, 0x7f, 0xee, 0x54, 0x3f, 0x09, 0xe6, 0x90, 0x6d, 0x07, 0x98,
+	0xd2, 0x58, 0x80, 0x24, 0x14, 0x45, 0x28, 0xd9, 0x88, 0xa1, 0xc8, 0x28, 0x06, 0x3f, 0x37, 0xbf,
+	0x0a, 0x20, 0xea, 0xd4, 0x79, 0x79, 0x8c, 0xad, 0xe1, 0x0c, 0x22, 0xca, 0x30, 0x6f, 0xc5, 0x98,
+	0x58, 0xc7, 0x34, 0x4e, 0xf4, 0x28, 0xe6, 0xe8, 0x51, 0xfe, 0x6f, 0x7a, 0x6c, 0x80, 0x7c, 0xbd,
+	0xfd, 0x54, 0x8b, 0x64, 0x62, 0x21, 0x33, 0xf1, 0x27, 0x3e, 0xb0, 0xee, 0x3a, 0x01, 0xfa, 0xc7,
+	0x81, 0x67, 0xf2, 0x4e, 0xac, 0x4a, 0x29, 0x55, 0x25, 0x6e, 0x79, 0xac, 0x81, 0xa9, 0x2d, 0x23,
+	0x58, 0xd4, 0xa9, 0xb3, 0x37, 0xb0, 0x11, 0xc3, 0x5b, 0xdc, 0xb6, 0x93, 0xda, 0xbd, 0x0f, 0x55,
+	0x1f, 0x1f, 0xf5, 0xb2, 0x46, 0x9f, 0xf7, 0xf1, 0x51, 0x94, 0x94, 0x9d, 0xa5, 0x78, 0x75, 0x96,
+	0xa6, 0xc4, 0xdf, 0xa7, 0x4c, 0x89, 0xa4, 0xa1, 0x66, 0x17, 0x6e, 0xeb, 0xd4, 0xe9, 0xf6, 0x31,
+	0x0a, 0xa6, 0xd7, 0x9e, 0x46, 0x7f, 0x0f, 0x56, 0xae, 0x90, 0x24, 0xec, 0x9b, 0xdf, 0x4a, 0x50,
+	0xd4, 0xa9, 0x23, 0xee, 0x42, 0xf5, 0x72, 0xe7, 0xe5, 0x6c, 0x94, 0xec, 0xaa, 0x90, 0xd7, 0xa7,
+	0xdf, 0xa7, 0x5a, 0x7e, 0x84, 0xbb, 0x79, 0x1b, 0xa2, 0x95, 0x9b, 0x9e, 0x83, 0x94, 0x37, 0x66,
+	0x45, 0xa6, 0x25, 0x31, 0xdc, 0x19, 0x7f, 0x97, 0x1e, 0xe5, 0x92, 0x8c, 0xa1, 0xe4, 0x27, 0xb3,
+	0xa0, 0xb2, 0x65, 0xc6, 0x1d, 0x9c, 0x5f, 0x66, 0x0c, 0x35, 0xa1, 0xcc, 0x24, 0x33, 0xbe, 0x85,
+	0x85, 0xac, 0xeb, 0x1a, 0xb9, 0xc9, 0x19, 0x84, 0xdc, 0xba, 0x09, 0x91, 0x52, 0xbf, 0x01, 0xc8,
+	0x78, 0xaa, 0x9e, 0x9b, 0x77, 0x09, 0x90, 0x1f, 0xdf, 0x00, 0x48, 0x78, 0x3b, 0xdb, 0xa7, 0xbf,
+	0x94, 0xc2, 0xe9, 0x48, 0x11, 0xce, 0x46, 0x8a, 0xf0, 0x73, 0xa4, 0x08, 0x9f, 0x2f, 0x94, 0xc2,
+	0xd9, 0x85, 0x52, 0xf8, 0x7e, 0xa1, 0x14, 0xde, 0xad, 0x67, 0xf6, 0x4b, 0x97, 0x50, 0x6f, 0x3f,
+	0xf9, 0x0e, 0xdb, 0xda, 0x71, 0xf4, 0x3d, 0xe6, 0x3b, 0xc6, 0xac, 0xf0, 0xaf, 0xf1, 0xb3, 0xbf,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x91, 0xf1, 0x98, 0x10, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -640,7 +640,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient {
 
 func (c *msgClient) StoreCode(ctx context.Context, in *MsgStoreCode, opts ...grpc.CallOption) (*MsgStoreCodeResponse, error) {
 	out := new(MsgStoreCodeResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Msg/StoreCode", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Msg/StoreCode", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -649,7 +649,7 @@ func (c *msgClient) StoreCode(ctx context.Context, in *MsgStoreCode, opts ...grp
 
 func (c *msgClient) InstantiateContract(ctx context.Context, in *MsgInstantiateContract, opts ...grpc.CallOption) (*MsgInstantiateContractResponse, error) {
 	out := new(MsgInstantiateContractResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Msg/InstantiateContract", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Msg/InstantiateContract", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -658,7 +658,7 @@ func (c *msgClient) InstantiateContract(ctx context.Context, in *MsgInstantiateC
 
 func (c *msgClient) ExecuteContract(ctx context.Context, in *MsgExecuteContract, opts ...grpc.CallOption) (*MsgExecuteContractResponse, error) {
 	out := new(MsgExecuteContractResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Msg/ExecuteContract", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Msg/ExecuteContract", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -667,7 +667,7 @@ func (c *msgClient) ExecuteContract(ctx context.Context, in *MsgExecuteContract,
 
 func (c *msgClient) MigrateContract(ctx context.Context, in *MsgMigrateContract, opts ...grpc.CallOption) (*MsgMigrateContractResponse, error) {
 	out := new(MsgMigrateContractResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Msg/MigrateContract", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Msg/MigrateContract", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -676,7 +676,7 @@ func (c *msgClient) MigrateContract(ctx context.Context, in *MsgMigrateContract,
 
 func (c *msgClient) UpdateAdmin(ctx context.Context, in *MsgUpdateAdmin, opts ...grpc.CallOption) (*MsgUpdateAdminResponse, error) {
 	out := new(MsgUpdateAdminResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Msg/UpdateAdmin", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Msg/UpdateAdmin", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -685,7 +685,7 @@ func (c *msgClient) UpdateAdmin(ctx context.Context, in *MsgUpdateAdmin, opts ..
 
 func (c *msgClient) ClearAdmin(ctx context.Context, in *MsgClearAdmin, opts ...grpc.CallOption) (*MsgClearAdminResponse, error) {
 	out := new(MsgClearAdminResponse)
-	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1beta1.Msg/ClearAdmin", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/cosmwasm.wasm.v1.Msg/ClearAdmin", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -745,7 +745,7 @@ func _Msg_StoreCode_Handler(srv interface{}, ctx context.Context, dec func(inter
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Msg/StoreCode",
+		FullMethod: "/cosmwasm.wasm.v1.Msg/StoreCode",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).StoreCode(ctx, req.(*MsgStoreCode))
@@ -763,7 +763,7 @@ func _Msg_InstantiateContract_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Msg/InstantiateContract",
+		FullMethod: "/cosmwasm.wasm.v1.Msg/InstantiateContract",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).InstantiateContract(ctx, req.(*MsgInstantiateContract))
@@ -781,7 +781,7 @@ func _Msg_ExecuteContract_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Msg/ExecuteContract",
+		FullMethod: "/cosmwasm.wasm.v1.Msg/ExecuteContract",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).ExecuteContract(ctx, req.(*MsgExecuteContract))
@@ -799,7 +799,7 @@ func _Msg_MigrateContract_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Msg/MigrateContract",
+		FullMethod: "/cosmwasm.wasm.v1.Msg/MigrateContract",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).MigrateContract(ctx, req.(*MsgMigrateContract))
@@ -817,7 +817,7 @@ func _Msg_UpdateAdmin_Handler(srv interface{}, ctx context.Context, dec func(int
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Msg/UpdateAdmin",
+		FullMethod: "/cosmwasm.wasm.v1.Msg/UpdateAdmin",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).UpdateAdmin(ctx, req.(*MsgUpdateAdmin))
@@ -835,7 +835,7 @@ func _Msg_ClearAdmin_Handler(srv interface{}, ctx context.Context, dec func(inte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/cosmwasm.wasm.v1beta1.Msg/ClearAdmin",
+		FullMethod: "/cosmwasm.wasm.v1.Msg/ClearAdmin",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MsgServer).ClearAdmin(ctx, req.(*MsgClearAdmin))
@@ -844,7 +844,7 @@ func _Msg_ClearAdmin_Handler(srv interface{}, ctx context.Context, dec func(inte
 }
 
 var _Msg_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "cosmwasm.wasm.v1beta1.Msg",
+	ServiceName: "cosmwasm.wasm.v1.Msg",
 	HandlerType: (*MsgServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -873,7 +873,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "cosmwasm/wasm/v1beta1/tx.proto",
+	Metadata: "cosmwasm/wasm/v1/tx.proto",
 }
 
 func (m *MsgStoreCode) Marshal() (dAtA []byte, err error) {
diff --git a/x/wasm/types/types.pb.go b/x/wasm/types/types.pb.go
index a7d3d388731..ead34972fd9 100644
--- a/x/wasm/types/types.pb.go
+++ b/x/wasm/types/types.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: cosmwasm/wasm/v1beta1/types.proto
+// source: cosmwasm/wasm/v1/types.proto
 
 package types
 
@@ -57,7 +57,7 @@ var AccessType_value = map[string]int32{
 }
 
 func (AccessType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{0}
+	return fileDescriptor_e6155d98fa173e02, []int{0}
 }
 
 // ContractCodeHistoryOperationType actions that caused a code change
@@ -93,19 +93,19 @@ func (x ContractCodeHistoryOperationType) String() string {
 }
 
 func (ContractCodeHistoryOperationType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{1}
+	return fileDescriptor_e6155d98fa173e02, []int{1}
 }
 
 // AccessTypeParam
 type AccessTypeParam struct {
-	Value AccessType `protobuf:"varint,1,opt,name=value,proto3,enum=cosmwasm.wasm.v1beta1.AccessType" json:"value,omitempty" yaml:"value"`
+	Value AccessType `protobuf:"varint,1,opt,name=value,proto3,enum=cosmwasm.wasm.v1.AccessType" json:"value,omitempty" yaml:"value"`
 }
 
 func (m *AccessTypeParam) Reset()         { *m = AccessTypeParam{} }
 func (m *AccessTypeParam) String() string { return proto.CompactTextString(m) }
 func (*AccessTypeParam) ProtoMessage()    {}
 func (*AccessTypeParam) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{0}
+	return fileDescriptor_e6155d98fa173e02, []int{0}
 }
 func (m *AccessTypeParam) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -136,7 +136,7 @@ var xxx_messageInfo_AccessTypeParam proto.InternalMessageInfo
 
 // AccessConfig access control type.
 type AccessConfig struct {
-	Permission AccessType `protobuf:"varint,1,opt,name=permission,proto3,enum=cosmwasm.wasm.v1beta1.AccessType" json:"permission,omitempty" yaml:"permission"`
+	Permission AccessType `protobuf:"varint,1,opt,name=permission,proto3,enum=cosmwasm.wasm.v1.AccessType" json:"permission,omitempty" yaml:"permission"`
 	Address    string     `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty" yaml:"address"`
 }
 
@@ -144,7 +144,7 @@ func (m *AccessConfig) Reset()         { *m = AccessConfig{} }
 func (m *AccessConfig) String() string { return proto.CompactTextString(m) }
 func (*AccessConfig) ProtoMessage()    {}
 func (*AccessConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{1}
+	return fileDescriptor_e6155d98fa173e02, []int{1}
 }
 func (m *AccessConfig) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -176,14 +176,14 @@ var xxx_messageInfo_AccessConfig proto.InternalMessageInfo
 // Params defines the set of wasm parameters.
 type Params struct {
 	CodeUploadAccess             AccessConfig `protobuf:"bytes,1,opt,name=code_upload_access,json=codeUploadAccess,proto3" json:"code_upload_access" yaml:"code_upload_access"`
-	InstantiateDefaultPermission AccessType   `protobuf:"varint,2,opt,name=instantiate_default_permission,json=instantiateDefaultPermission,proto3,enum=cosmwasm.wasm.v1beta1.AccessType" json:"instantiate_default_permission,omitempty" yaml:"instantiate_default_permission"`
+	InstantiateDefaultPermission AccessType   `protobuf:"varint,2,opt,name=instantiate_default_permission,json=instantiateDefaultPermission,proto3,enum=cosmwasm.wasm.v1.AccessType" json:"instantiate_default_permission,omitempty" yaml:"instantiate_default_permission"`
 	MaxWasmCodeSize              uint64       `protobuf:"varint,3,opt,name=max_wasm_code_size,json=maxWasmCodeSize,proto3" json:"max_wasm_code_size,omitempty" yaml:"max_wasm_code_size"`
 }
 
 func (m *Params) Reset()      { *m = Params{} }
 func (*Params) ProtoMessage() {}
 func (*Params) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{2}
+	return fileDescriptor_e6155d98fa173e02, []int{2}
 }
 func (m *Params) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -231,7 +231,7 @@ func (m *CodeInfo) Reset()         { *m = CodeInfo{} }
 func (m *CodeInfo) String() string { return proto.CompactTextString(m) }
 func (*CodeInfo) ProtoMessage()    {}
 func (*CodeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{3}
+	return fileDescriptor_e6155d98fa173e02, []int{3}
 }
 func (m *CodeInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -284,7 +284,7 @@ func (m *ContractInfo) Reset()         { *m = ContractInfo{} }
 func (m *ContractInfo) String() string { return proto.CompactTextString(m) }
 func (*ContractInfo) ProtoMessage()    {}
 func (*ContractInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{4}
+	return fileDescriptor_e6155d98fa173e02, []int{4}
 }
 func (m *ContractInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -315,7 +315,7 @@ var xxx_messageInfo_ContractInfo proto.InternalMessageInfo
 
 // ContractCodeHistoryEntry metadata to a contract.
 type ContractCodeHistoryEntry struct {
-	Operation ContractCodeHistoryOperationType `protobuf:"varint,1,opt,name=operation,proto3,enum=cosmwasm.wasm.v1beta1.ContractCodeHistoryOperationType" json:"operation,omitempty"`
+	Operation ContractCodeHistoryOperationType `protobuf:"varint,1,opt,name=operation,proto3,enum=cosmwasm.wasm.v1.ContractCodeHistoryOperationType" json:"operation,omitempty"`
 	// CodeID is the reference to the stored WASM code
 	CodeID uint64 `protobuf:"varint,2,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"`
 	// Updated Tx position when the operation was executed.
@@ -327,7 +327,7 @@ func (m *ContractCodeHistoryEntry) Reset()         { *m = ContractCodeHistoryEnt
 func (m *ContractCodeHistoryEntry) String() string { return proto.CompactTextString(m) }
 func (*ContractCodeHistoryEntry) ProtoMessage()    {}
 func (*ContractCodeHistoryEntry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{5}
+	return fileDescriptor_e6155d98fa173e02, []int{5}
 }
 func (m *ContractCodeHistoryEntry) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -370,7 +370,7 @@ func (m *AbsoluteTxPosition) Reset()         { *m = AbsoluteTxPosition{} }
 func (m *AbsoluteTxPosition) String() string { return proto.CompactTextString(m) }
 func (*AbsoluteTxPosition) ProtoMessage()    {}
 func (*AbsoluteTxPosition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{6}
+	return fileDescriptor_e6155d98fa173e02, []int{6}
 }
 func (m *AbsoluteTxPosition) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -411,7 +411,7 @@ func (m *Model) Reset()         { *m = Model{} }
 func (m *Model) String() string { return proto.CompactTextString(m) }
 func (*Model) ProtoMessage()    {}
 func (*Model) Descriptor() ([]byte, []int) {
-	return fileDescriptor_2548aa229a1f29bc, []int{7}
+	return fileDescriptor_e6155d98fa173e02, []int{7}
 }
 func (m *Model) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -441,97 +441,97 @@ func (m *Model) XXX_DiscardUnknown() {
 var xxx_messageInfo_Model proto.InternalMessageInfo
 
 func init() {
-	proto.RegisterEnum("cosmwasm.wasm.v1beta1.AccessType", AccessType_name, AccessType_value)
-	proto.RegisterEnum("cosmwasm.wasm.v1beta1.ContractCodeHistoryOperationType", ContractCodeHistoryOperationType_name, ContractCodeHistoryOperationType_value)
-	proto.RegisterType((*AccessTypeParam)(nil), "cosmwasm.wasm.v1beta1.AccessTypeParam")
-	proto.RegisterType((*AccessConfig)(nil), "cosmwasm.wasm.v1beta1.AccessConfig")
-	proto.RegisterType((*Params)(nil), "cosmwasm.wasm.v1beta1.Params")
-	proto.RegisterType((*CodeInfo)(nil), "cosmwasm.wasm.v1beta1.CodeInfo")
-	proto.RegisterType((*ContractInfo)(nil), "cosmwasm.wasm.v1beta1.ContractInfo")
-	proto.RegisterType((*ContractCodeHistoryEntry)(nil), "cosmwasm.wasm.v1beta1.ContractCodeHistoryEntry")
-	proto.RegisterType((*AbsoluteTxPosition)(nil), "cosmwasm.wasm.v1beta1.AbsoluteTxPosition")
-	proto.RegisterType((*Model)(nil), "cosmwasm.wasm.v1beta1.Model")
-}
-
-func init() { proto.RegisterFile("cosmwasm/wasm/v1beta1/types.proto", fileDescriptor_2548aa229a1f29bc) }
-
-var fileDescriptor_2548aa229a1f29bc = []byte{
-	// 1190 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x5d, 0x6f, 0x1b, 0x45,
-	0x17, 0xf6, 0xda, 0xce, 0x87, 0xa7, 0x79, 0x5b, 0x77, 0xde, 0x84, 0x3a, 0xa6, 0xd8, 0xce, 0x96,
-	0x8f, 0xf4, 0xcb, 0xa6, 0x05, 0x51, 0xd4, 0x3b, 0x7b, 0xbd, 0x34, 0x5b, 0x11, 0xdb, 0x1a, 0x3b,
-	0xb4, 0x41, 0x42, 0xab, 0xd9, 0xdd, 0x89, 0x33, 0x74, 0xbd, 0x63, 0xed, 0x8c, 0x5b, 0xbb, 0xbf,
-	0x00, 0x85, 0x1b, 0xc4, 0x15, 0x17, 0x44, 0x42, 0x02, 0xa1, 0xfe, 0x00, 0x7e, 0x01, 0x57, 0x15,
-	0x12, 0x52, 0x2f, 0xb9, 0xb2, 0x20, 0x15, 0x12, 0xdc, 0xe6, 0xb2, 0x57, 0x68, 0x67, 0x6c, 0x79,
-	0x45, 0x3f, 0x62, 0x6e, 0xac, 0x39, 0x67, 0xce, 0xf3, 0x9c, 0x79, 0xce, 0x99, 0x33, 0x5e, 0xb0,
-	0xe1, 0x32, 0xde, 0x7b, 0x80, 0x79, 0xaf, 0x22, 0x7f, 0xee, 0x5f, 0x73, 0x88, 0xc0, 0xd7, 0x2a,
-	0x62, 0xd4, 0x27, 0xbc, 0xdc, 0x0f, 0x99, 0x60, 0x70, 0x6d, 0x1a, 0x52, 0x96, 0x3f, 0x93, 0x90,
-	0xfc, 0x7a, 0xe4, 0x66, 0xdc, 0x96, 0x41, 0x15, 0x65, 0x28, 0x44, 0x7e, 0xb5, 0xcb, 0xba, 0x4c,
-	0xf9, 0xa3, 0xd5, 0xc4, 0xbb, 0xde, 0x65, 0xac, 0xeb, 0x93, 0x8a, 0xb4, 0x9c, 0xc1, 0x5e, 0x05,
-	0x07, 0x23, 0xb5, 0xa5, 0x3b, 0xe0, 0x4c, 0xd5, 0x75, 0x09, 0xe7, 0x9d, 0x51, 0x9f, 0xb4, 0x70,
-	0x88, 0x7b, 0xd0, 0x02, 0x0b, 0xf7, 0xb1, 0x3f, 0x20, 0x39, 0xad, 0xa4, 0x6d, 0x9e, 0xbe, 0xbe,
-	0x51, 0x7e, 0xe1, 0x29, 0xca, 0x33, 0x58, 0x2d, 0x7b, 0x3c, 0x2e, 0xae, 0x8c, 0x70, 0xcf, 0xbf,
-	0xa9, 0x4b, 0xa4, 0x8e, 0x14, 0xc3, 0xcd, 0xf4, 0x37, 0xdf, 0x15, 0x35, 0xfd, 0x5b, 0x0d, 0xac,
-	0xa8, 0x68, 0x83, 0x05, 0x7b, 0xb4, 0x0b, 0xef, 0x02, 0xd0, 0x27, 0x61, 0x8f, 0x72, 0x4e, 0x59,
-	0x30, 0x7f, 0x9a, 0xb5, 0xe3, 0x71, 0xf1, 0xac, 0x4a, 0x33, 0x83, 0xeb, 0x28, 0xc6, 0x05, 0xaf,
-	0x80, 0x25, 0xec, 0x79, 0x21, 0xe1, 0x3c, 0x97, 0x2c, 0x69, 0x9b, 0x99, 0x1a, 0x3c, 0x1e, 0x17,
-	0x4f, 0x2b, 0xcc, 0x64, 0x43, 0x47, 0xd3, 0x90, 0xc9, 0xf1, 0xfe, 0x4c, 0x82, 0x45, 0xa9, 0x9c,
-	0x43, 0x01, 0xa0, 0xcb, 0x3c, 0x62, 0x0f, 0xfa, 0x3e, 0xc3, 0x9e, 0x8d, 0x65, 0x6e, 0x79, 0xc0,
-	0x53, 0xd7, 0x2f, 0xbc, 0xf2, 0x80, 0x4a, 0x59, 0x6d, 0xe3, 0xf1, 0xb8, 0x98, 0x38, 0x1e, 0x17,
-	0xd7, 0x55, 0xca, 0xe7, 0xc9, 0x74, 0x94, 0x8d, 0x9c, 0x3b, 0xd2, 0xa7, 0xa0, 0xf0, 0x6b, 0x0d,
-	0x14, 0x68, 0xc0, 0x05, 0x0e, 0x04, 0xc5, 0x82, 0xd8, 0x1e, 0xd9, 0xc3, 0x03, 0x5f, 0xd8, 0xb1,
-	0x1a, 0x25, 0xe7, 0xad, 0xd1, 0xc5, 0xe3, 0x71, 0xf1, 0x2d, 0x95, 0xfc, 0xd5, 0x94, 0x3a, 0x3a,
-	0x1f, 0x0b, 0xa8, 0xab, 0xfd, 0xd6, 0xac, 0x92, 0xb7, 0x01, 0xec, 0xe1, 0xa1, 0x1d, 0xe5, 0xb1,
-	0xa5, 0x0c, 0x4e, 0x1f, 0x92, 0x5c, 0xaa, 0xa4, 0x6d, 0xa6, 0x6b, 0x6f, 0xcc, 0x14, 0x3e, 0x1f,
-	0xa3, 0xa3, 0x33, 0x3d, 0x3c, 0xbc, 0x83, 0x79, 0xcf, 0x60, 0x1e, 0x69, 0xd3, 0x87, 0xea, 0x1a,
-	0x24, 0xf4, 0x5f, 0x35, 0xb0, 0x1c, 0xb9, 0xac, 0x60, 0x8f, 0xc1, 0xd7, 0x41, 0x46, 0x22, 0xf6,
-	0x31, 0xdf, 0x97, 0x05, 0x5e, 0x41, 0xcb, 0x91, 0x63, 0x0b, 0xf3, 0x7d, 0x98, 0x03, 0x4b, 0x6e,
-	0x48, 0xb0, 0x60, 0xa1, 0xea, 0x22, 0x9a, 0x9a, 0xf0, 0x35, 0xb0, 0xc8, 0xd9, 0x20, 0x74, 0xd5,
-	0x49, 0x32, 0x68, 0x62, 0x45, 0x08, 0x67, 0x40, 0x7d, 0x8f, 0x84, 0xb9, 0xb4, 0x42, 0x4c, 0x4c,
-	0x78, 0x17, 0xc0, 0x78, 0x21, 0x5c, 0xd9, 0xa7, 0xdc, 0xc2, 0xfc, 0x2d, 0x4d, 0x47, 0x2d, 0x45,
-	0x67, 0x63, 0x24, 0x6a, 0x43, 0xff, 0x39, 0x09, 0x56, 0x0c, 0x16, 0x88, 0x10, 0xbb, 0x42, 0x6a,
-	0xba, 0x00, 0x96, 0xa4, 0x26, 0xea, 0x49, 0x45, 0xe9, 0x1a, 0x38, 0x1a, 0x17, 0x17, 0xa5, 0xe4,
-	0x3a, 0x5a, 0x8c, 0xb6, 0x2c, 0xef, 0x15, 0xda, 0x56, 0xc1, 0x02, 0xf6, 0x7a, 0x34, 0x98, 0x48,
-	0x53, 0x46, 0xe4, 0xf5, 0xb1, 0x43, 0xfc, 0x89, 0x2e, 0x65, 0x40, 0x63, 0xc2, 0x42, 0xbc, 0x89,
-	0x94, 0x8b, 0x2f, 0x93, 0xe2, 0x70, 0xe6, 0x0f, 0x04, 0xe9, 0x0c, 0x5b, 0x8c, 0x53, 0x41, 0x59,
-	0x80, 0xa6, 0x48, 0x78, 0x15, 0x9c, 0xa2, 0x8e, 0x6b, 0xf7, 0x59, 0x28, 0xa2, 0x33, 0x2f, 0xca,
-	0x81, 0xf9, 0xdf, 0xd1, 0xb8, 0x98, 0xb1, 0x6a, 0x46, 0x8b, 0x85, 0xc2, 0xaa, 0xa3, 0x0c, 0x75,
-	0x5c, 0xb9, 0xf4, 0xe0, 0x36, 0xc8, 0x90, 0xa1, 0x20, 0x81, 0xbc, 0x90, 0x4b, 0x32, 0xeb, 0x6a,
-	0x59, 0xbd, 0x2c, 0xe5, 0xe9, 0xcb, 0x52, 0xae, 0x06, 0xa3, 0xda, 0xfa, 0x2f, 0x3f, 0x5d, 0x5d,
-	0x8b, 0x57, 0xc6, 0x9c, 0xc2, 0xd0, 0x8c, 0xe1, 0x66, 0xfa, 0xaf, 0x68, 0xf8, 0xbe, 0x4c, 0x82,
-	0xdc, 0x34, 0x34, 0xaa, 0xd4, 0x16, 0xe5, 0x82, 0x85, 0x23, 0x33, 0x10, 0xe1, 0x08, 0xee, 0x80,
-	0x0c, 0xeb, 0x93, 0x10, 0x8b, 0xd9, 0x33, 0x71, 0xe3, 0x25, 0x3a, 0x5f, 0xc0, 0xd1, 0x9c, 0x42,
-	0xa3, 0xc1, 0x40, 0x33, 0xa6, 0x78, 0x9f, 0x92, 0x2f, 0xed, 0x93, 0x01, 0x96, 0x06, 0x7d, 0x4f,
-	0x56, 0x38, 0xf5, 0x9f, 0x2b, 0x3c, 0x41, 0xc2, 0x32, 0x48, 0xf5, 0x78, 0x57, 0xb6, 0x6e, 0xa5,
-	0x76, 0xfe, 0xd9, 0xb8, 0x98, 0x23, 0x81, 0xcb, 0x3c, 0x1a, 0x74, 0x2b, 0x9f, 0x73, 0x16, 0x94,
-	0x11, 0x7e, 0xb0, 0x4d, 0x38, 0xc7, 0x5d, 0x82, 0xa2, 0x40, 0x1d, 0x01, 0xf8, 0x3c, 0x1d, 0xdc,
-	0x00, 0x2b, 0x8e, 0xcf, 0xdc, 0x7b, 0xf6, 0x3e, 0xa1, 0xdd, 0x7d, 0xa1, 0x2e, 0x17, 0x3a, 0x25,
-	0x7d, 0x5b, 0xd2, 0x05, 0xd7, 0xc1, 0xb2, 0x18, 0xda, 0x34, 0xf0, 0xc8, 0x50, 0x69, 0x42, 0x4b,
-	0x62, 0x68, 0x45, 0xa6, 0x4e, 0xc1, 0xc2, 0x36, 0xf3, 0x88, 0x0f, 0x6f, 0x83, 0xd4, 0x3d, 0x32,
-	0x52, 0xc3, 0x56, 0xfb, 0xf0, 0xd9, 0xb8, 0xf8, 0x7e, 0x97, 0x8a, 0xfd, 0x81, 0x53, 0x76, 0x59,
-	0xaf, 0x22, 0x48, 0xe0, 0x45, 0xc3, 0x1f, 0x88, 0xf8, 0xd2, 0xa7, 0x0e, 0xaf, 0x38, 0x23, 0x41,
-	0x78, 0x79, 0x8b, 0x0c, 0x6b, 0xd1, 0x02, 0x45, 0x24, 0xd1, 0xad, 0x54, 0xff, 0x11, 0x49, 0x39,
-	0xba, 0xca, 0xb8, 0xf4, 0xb7, 0x06, 0xc0, 0xec, 0x2d, 0x82, 0x1f, 0x80, 0x73, 0x55, 0xc3, 0x30,
-	0xdb, 0x6d, 0xbb, 0xb3, 0xdb, 0x32, 0xed, 0x9d, 0x46, 0xbb, 0x65, 0x1a, 0xd6, 0x47, 0x96, 0x59,
-	0xcf, 0x26, 0xf2, 0xeb, 0x07, 0x87, 0xa5, 0xb5, 0x59, 0xf0, 0x4e, 0xc0, 0xfb, 0xc4, 0xa5, 0x7b,
-	0x94, 0x78, 0xf0, 0x0a, 0x80, 0x71, 0x5c, 0xa3, 0x59, 0x6b, 0xd6, 0x77, 0xb3, 0x5a, 0x7e, 0xf5,
-	0xe0, 0xb0, 0x94, 0x9d, 0x41, 0x1a, 0xcc, 0x61, 0xde, 0x08, 0xde, 0x00, 0xb9, 0x78, 0x74, 0xb3,
-	0xf1, 0xf1, 0xae, 0x5d, 0xad, 0xd7, 0x91, 0xd9, 0x6e, 0x67, 0x93, 0xff, 0x4e, 0xd3, 0x0c, 0xfc,
-	0x51, 0x55, 0xbd, 0xfe, 0xf0, 0x3a, 0x58, 0x8b, 0x03, 0xcd, 0x4f, 0x4c, 0xb4, 0x2b, 0x33, 0xa5,
-	0xf2, 0xe7, 0x0e, 0x0e, 0x4b, 0xff, 0x9f, 0xa1, 0xcc, 0xfb, 0x24, 0x1c, 0x45, 0xc9, 0xf2, 0xcb,
-	0x5f, 0x7c, 0x5f, 0x48, 0x3c, 0xfa, 0xa1, 0x90, 0xb8, 0xf4, 0x63, 0x0a, 0x94, 0x4e, 0xba, 0x74,
-	0x90, 0x80, 0x77, 0x8d, 0x66, 0xa3, 0x83, 0xaa, 0x46, 0xc7, 0x36, 0x9a, 0x75, 0xd3, 0xde, 0xb2,
-	0xda, 0x9d, 0x26, 0xda, 0xb5, 0x9b, 0x2d, 0x13, 0x55, 0x3b, 0x56, 0xb3, 0xf1, 0xa2, 0xd2, 0x54,
-	0x0e, 0x0e, 0x4b, 0x97, 0x4f, 0xe2, 0x8e, 0x17, 0xec, 0x0e, 0xb8, 0x38, 0x57, 0x1a, 0xab, 0x61,
-	0x75, 0xb2, 0x5a, 0x7e, 0xf3, 0xe0, 0xb0, 0xf4, 0xe6, 0x49, 0xfc, 0x56, 0x40, 0x05, 0xfc, 0x0c,
-	0x5c, 0x99, 0x8b, 0x78, 0xdb, 0xba, 0x85, 0xaa, 0x1d, 0x33, 0x9b, 0xcc, 0x5f, 0x3e, 0x38, 0x2c,
-	0xbd, 0x73, 0x12, 0xf7, 0x36, 0xed, 0x86, 0x58, 0x90, 0xb9, 0xe9, 0x6f, 0x99, 0x0d, 0xb3, 0x6d,
-	0xb5, 0xb3, 0xa9, 0xf9, 0xe8, 0x6f, 0x91, 0x80, 0x70, 0xca, 0xf3, 0xe9, 0xa8, 0x59, 0xb5, 0xad,
-	0xc7, 0x7f, 0x14, 0x12, 0x8f, 0x8e, 0x0a, 0xda, 0xe3, 0xa3, 0x82, 0xf6, 0xe4, 0xa8, 0xa0, 0xfd,
-	0x7e, 0x54, 0xd0, 0xbe, 0x7a, 0x5a, 0x48, 0x3c, 0x79, 0x5a, 0x48, 0xfc, 0xf6, 0xb4, 0x90, 0xf8,
-	0xf4, 0xed, 0xd8, 0x1c, 0x18, 0x8c, 0xf7, 0xee, 0x4c, 0x3f, 0xca, 0xbc, 0xca, 0x50, 0x7d, 0x9c,
-	0xc9, 0x8f, 0x32, 0x67, 0x51, 0xbe, 0x72, 0xef, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf0, 0xea,
-	0x50, 0x19, 0xba, 0x09, 0x00, 0x00,
+	proto.RegisterEnum("cosmwasm.wasm.v1.AccessType", AccessType_name, AccessType_value)
+	proto.RegisterEnum("cosmwasm.wasm.v1.ContractCodeHistoryOperationType", ContractCodeHistoryOperationType_name, ContractCodeHistoryOperationType_value)
+	proto.RegisterType((*AccessTypeParam)(nil), "cosmwasm.wasm.v1.AccessTypeParam")
+	proto.RegisterType((*AccessConfig)(nil), "cosmwasm.wasm.v1.AccessConfig")
+	proto.RegisterType((*Params)(nil), "cosmwasm.wasm.v1.Params")
+	proto.RegisterType((*CodeInfo)(nil), "cosmwasm.wasm.v1.CodeInfo")
+	proto.RegisterType((*ContractInfo)(nil), "cosmwasm.wasm.v1.ContractInfo")
+	proto.RegisterType((*ContractCodeHistoryEntry)(nil), "cosmwasm.wasm.v1.ContractCodeHistoryEntry")
+	proto.RegisterType((*AbsoluteTxPosition)(nil), "cosmwasm.wasm.v1.AbsoluteTxPosition")
+	proto.RegisterType((*Model)(nil), "cosmwasm.wasm.v1.Model")
+}
+
+func init() { proto.RegisterFile("cosmwasm/wasm/v1/types.proto", fileDescriptor_e6155d98fa173e02) }
+
+var fileDescriptor_e6155d98fa173e02 = []byte{
+	// 1185 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcf, 0x6f, 0x1b, 0xc5,
+	0x17, 0xf7, 0xda, 0xce, 0x0f, 0x4f, 0xf3, 0x6d, 0xdd, 0xf9, 0x26, 0xd4, 0x31, 0xc1, 0x76, 0x97,
+	0x02, 0xe9, 0x2f, 0x9b, 0x06, 0x04, 0xa8, 0x87, 0x4a, 0xfe, 0xb1, 0x34, 0x5b, 0x11, 0xdb, 0x1a,
+	0xbb, 0x54, 0x41, 0xaa, 0x56, 0xe3, 0xdd, 0x89, 0x33, 0x74, 0xbd, 0x63, 0xed, 0x8c, 0x53, 0x6f,
+	0x6f, 0xdc, 0x50, 0x24, 0x24, 0x6e, 0x70, 0x89, 0x84, 0x04, 0x42, 0xfd, 0x03, 0xb8, 0x72, 0x8f,
+	0x38, 0xf5, 0x88, 0x84, 0x64, 0x41, 0x7a, 0x81, 0x6b, 0x8e, 0x3d, 0xa1, 0x9d, 0xb1, 0xe5, 0x55,
+	0x93, 0x36, 0xe6, 0xb2, 0x9a, 0xf7, 0xe6, 0x7d, 0x3e, 0x6f, 0x3e, 0xef, 0xcd, 0x3c, 0x2d, 0x58,
+	0xb3, 0x19, 0xef, 0x3d, 0xc6, 0xbc, 0x57, 0x92, 0x9f, 0xbd, 0x5b, 0x25, 0x11, 0xf4, 0x09, 0x2f,
+	0xf6, 0x7d, 0x26, 0x18, 0x4c, 0x4f, 0x76, 0x8b, 0xf2, 0xb3, 0x77, 0x2b, 0xbb, 0x1a, 0x7a, 0x18,
+	0xb7, 0xe4, 0x7e, 0x49, 0x19, 0x2a, 0x38, 0xbb, 0xdc, 0x65, 0x5d, 0xa6, 0xfc, 0xe1, 0x6a, 0xec,
+	0x5d, 0xed, 0x32, 0xd6, 0x75, 0x49, 0x49, 0x5a, 0x9d, 0xc1, 0x4e, 0x09, 0x7b, 0x81, 0xda, 0xd2,
+	0x1f, 0x82, 0x0b, 0x65, 0xdb, 0x26, 0x9c, 0xb7, 0x83, 0x3e, 0x69, 0x62, 0x1f, 0xf7, 0x60, 0x0d,
+	0xcc, 0xed, 0x61, 0x77, 0x40, 0x32, 0x5a, 0x41, 0x5b, 0x3f, 0xbf, 0xb1, 0x56, 0x7c, 0xf9, 0x00,
+	0xc5, 0x29, 0xa2, 0x92, 0x3e, 0x1e, 0xe5, 0x97, 0x02, 0xdc, 0x73, 0x6f, 0xeb, 0x12, 0xa4, 0x23,
+	0x05, 0xbe, 0x9d, 0xfc, 0xfe, 0x87, 0xbc, 0xa6, 0x7f, 0xa7, 0x81, 0x25, 0x15, 0x5d, 0x65, 0xde,
+	0x0e, 0xed, 0xc2, 0x16, 0x00, 0x7d, 0xe2, 0xf7, 0x28, 0xe7, 0x94, 0x79, 0x33, 0x65, 0x58, 0x39,
+	0x1e, 0xe5, 0x2f, 0xaa, 0x0c, 0x53, 0xa4, 0x8e, 0x22, 0x34, 0xf0, 0x06, 0x58, 0xc0, 0x8e, 0xe3,
+	0x13, 0xce, 0x33, 0xf1, 0x82, 0xb6, 0x9e, 0xaa, 0xc0, 0xe3, 0x51, 0xfe, 0xbc, 0xc2, 0x8c, 0x37,
+	0x74, 0x34, 0x09, 0x19, 0x9f, 0xec, 0x8f, 0x38, 0x98, 0x97, 0x7a, 0x39, 0x64, 0x00, 0xda, 0xcc,
+	0x21, 0xd6, 0xa0, 0xef, 0x32, 0xec, 0x58, 0x58, 0xe6, 0x96, 0x67, 0x3b, 0xb7, 0x91, 0x7b, 0xd5,
+	0xd9, 0x94, 0x9e, 0xca, 0xe5, 0xc3, 0x51, 0x3e, 0x76, 0x3c, 0xca, 0xaf, 0xaa, 0x6c, 0x27, 0x79,
+	0x74, 0x94, 0x0e, 0x9d, 0xf7, 0xa5, 0x4f, 0x41, 0xe1, 0x37, 0x1a, 0xc8, 0x51, 0x8f, 0x0b, 0xec,
+	0x09, 0x8a, 0x05, 0xb1, 0x1c, 0xb2, 0x83, 0x07, 0xae, 0xb0, 0x22, 0x95, 0x89, 0xcf, 0x50, 0x99,
+	0xab, 0xc7, 0xa3, 0xfc, 0x3b, 0x2a, 0xef, 0xeb, 0xd9, 0x74, 0xb4, 0x16, 0x09, 0xa8, 0xa9, 0xfd,
+	0xe6, 0xb4, 0x7e, 0xf7, 0x00, 0xec, 0xe1, 0xa1, 0x15, 0xa6, 0xb0, 0xa4, 0x02, 0x4e, 0x9f, 0x90,
+	0x4c, 0xa2, 0xa0, 0xad, 0x27, 0x2b, 0x6f, 0x4d, 0xc5, 0x9d, 0x8c, 0xd1, 0xd1, 0x85, 0x1e, 0x1e,
+	0x3e, 0xc0, 0xbc, 0x57, 0x65, 0x0e, 0x69, 0xd1, 0x27, 0xaa, 0xef, 0x31, 0xfd, 0x50, 0x03, 0x8b,
+	0xa1, 0xcb, 0xf4, 0x76, 0x18, 0x7c, 0x13, 0xa4, 0x24, 0x62, 0x17, 0xf3, 0x5d, 0x59, 0xd6, 0x25,
+	0xb4, 0x18, 0x3a, 0x36, 0x31, 0xdf, 0x85, 0x19, 0xb0, 0x60, 0xfb, 0x04, 0x0b, 0xe6, 0xab, 0xde,
+	0xa1, 0x89, 0x09, 0xdf, 0x00, 0xf3, 0x9c, 0x0d, 0x7c, 0x5b, 0x9d, 0x24, 0x85, 0xc6, 0x56, 0x88,
+	0xe8, 0x0c, 0xa8, 0xeb, 0x10, 0x3f, 0x93, 0x54, 0x88, 0xb1, 0x09, 0x5b, 0x00, 0x46, 0x0b, 0x61,
+	0xcb, 0x16, 0x65, 0xe6, 0x66, 0x6a, 0x64, 0x32, 0x6c, 0x24, 0xba, 0x18, 0xc1, 0xab, 0x0d, 0xfd,
+	0xd7, 0x38, 0x58, 0xaa, 0x32, 0x4f, 0xf8, 0xd8, 0x16, 0x52, 0xce, 0xdb, 0x60, 0x41, 0xca, 0xa1,
+	0x8e, 0x14, 0x93, 0xac, 0x80, 0xa3, 0x51, 0x7e, 0x5e, 0xaa, 0xad, 0xa1, 0xf9, 0x70, 0xcb, 0x74,
+	0x5e, 0x23, 0x6b, 0x19, 0xcc, 0x61, 0xa7, 0x47, 0xbd, 0xb1, 0x2a, 0x65, 0x84, 0x5e, 0x17, 0x77,
+	0x88, 0x3b, 0x96, 0xa4, 0x0c, 0x78, 0x67, 0xcc, 0x42, 0x9c, 0xb1, 0x8a, 0x2b, 0xa7, 0xa8, 0xe8,
+	0x70, 0xe6, 0x0e, 0x04, 0x69, 0x0f, 0x9b, 0x8c, 0x53, 0x41, 0x99, 0x87, 0x26, 0x20, 0x78, 0x13,
+	0x9c, 0xa3, 0x1d, 0xdb, 0xea, 0x33, 0x5f, 0x84, 0xc7, 0x9d, 0x97, 0x8f, 0xe3, 0x7f, 0x47, 0xa3,
+	0x7c, 0xca, 0xac, 0x54, 0x9b, 0xcc, 0x17, 0x66, 0x0d, 0xa5, 0x68, 0xc7, 0x96, 0x4b, 0x07, 0x6e,
+	0x81, 0x14, 0x19, 0x0a, 0xe2, 0xc9, 0x1b, 0xb8, 0x20, 0x13, 0x2e, 0x17, 0xd5, 0xec, 0x28, 0x4e,
+	0x66, 0x47, 0xb1, 0xec, 0x05, 0x95, 0xd5, 0xdf, 0x7e, 0xb9, 0xb9, 0x12, 0x2d, 0x8a, 0x31, 0x81,
+	0xa1, 0x29, 0xc3, 0xed, 0xe4, 0xdf, 0xe1, 0x43, 0xfb, 0x2a, 0x0e, 0x32, 0x93, 0xd0, 0xb0, 0x48,
+	0x9b, 0x94, 0x0b, 0xe6, 0x07, 0x86, 0x27, 0xfc, 0x00, 0x36, 0x41, 0x8a, 0xf5, 0x89, 0x8f, 0xc5,
+	0x74, 0x1a, 0x6c, 0x9c, 0x94, 0x78, 0x0a, 0xbc, 0x31, 0x41, 0x85, 0x2f, 0x01, 0x4d, 0x49, 0xa2,
+	0xdd, 0x89, 0xbf, 0xb2, 0x3b, 0x77, 0xc0, 0xc2, 0xa0, 0xef, 0xc8, 0xba, 0x26, 0xfe, 0x4b, 0x5d,
+	0xc7, 0x20, 0x58, 0x04, 0x89, 0x1e, 0xef, 0xca, 0x5e, 0x2d, 0x55, 0xd6, 0x5e, 0x8c, 0xf2, 0x19,
+	0xe2, 0xd9, 0xcc, 0xa1, 0x5e, 0xb7, 0xf4, 0x25, 0x67, 0x5e, 0x11, 0xe1, 0xc7, 0x5b, 0x84, 0x73,
+	0xdc, 0x25, 0x28, 0x0c, 0xd4, 0x11, 0x80, 0x27, 0xe9, 0xe0, 0x65, 0xb0, 0xd4, 0x71, 0x99, 0xfd,
+	0xc8, 0xda, 0x25, 0xb4, 0xbb, 0x2b, 0xd4, 0x6d, 0x42, 0xe7, 0xa4, 0x6f, 0x53, 0xba, 0xe0, 0x2a,
+	0x58, 0x14, 0x43, 0x8b, 0x7a, 0x0e, 0x19, 0x2a, 0x39, 0x68, 0x41, 0x0c, 0xcd, 0xd0, 0xd4, 0x29,
+	0x98, 0xdb, 0x62, 0x0e, 0x71, 0xe1, 0x3d, 0x90, 0x78, 0x44, 0x02, 0xf5, 0xb0, 0x2a, 0x9f, 0xbc,
+	0x18, 0xe5, 0x3f, 0xec, 0x52, 0xb1, 0x3b, 0xe8, 0x14, 0x6d, 0xd6, 0x2b, 0x09, 0xe2, 0x39, 0xe1,
+	0x43, 0xf7, 0x44, 0x74, 0xe9, 0xd2, 0x0e, 0x2f, 0x75, 0x02, 0x41, 0x78, 0x71, 0x93, 0x0c, 0x2b,
+	0xe1, 0x02, 0x85, 0x24, 0xe1, 0x35, 0x54, 0xb3, 0x3f, 0x2e, 0x9f, 0xa9, 0x32, 0xae, 0xfd, 0xa3,
+	0x01, 0x30, 0x9d, 0x3b, 0xf0, 0x23, 0x70, 0xa9, 0x5c, 0xad, 0x1a, 0xad, 0x96, 0xd5, 0xde, 0x6e,
+	0x1a, 0xd6, 0xfd, 0x7a, 0xab, 0x69, 0x54, 0xcd, 0x4f, 0x4d, 0xa3, 0x96, 0x8e, 0x65, 0x57, 0xf7,
+	0x0f, 0x0a, 0x2b, 0xd3, 0xe0, 0xfb, 0x1e, 0xef, 0x13, 0x9b, 0xee, 0x50, 0xe2, 0xc0, 0x1b, 0x00,
+	0x46, 0x71, 0xf5, 0x46, 0xa5, 0x51, 0xdb, 0x4e, 0x6b, 0xd9, 0xe5, 0xfd, 0x83, 0x42, 0x7a, 0x0a,
+	0xa9, 0xb3, 0x0e, 0x73, 0x02, 0xf8, 0x31, 0xc8, 0x44, 0xa3, 0x1b, 0xf5, 0xcf, 0xb6, 0xad, 0x72,
+	0xad, 0x86, 0x8c, 0x56, 0x2b, 0x1d, 0x7f, 0x39, 0x4d, 0xc3, 0x73, 0x83, 0xb2, 0x9a, 0xef, 0x70,
+	0x03, 0xac, 0x44, 0x81, 0xc6, 0xe7, 0x06, 0xda, 0x96, 0x99, 0x12, 0xd9, 0x4b, 0xfb, 0x07, 0x85,
+	0xff, 0x4f, 0x51, 0xc6, 0x1e, 0xf1, 0x83, 0x30, 0x59, 0x76, 0xf1, 0xeb, 0x1f, 0x73, 0xb1, 0xa7,
+	0x3f, 0xe5, 0x62, 0xd7, 0x7e, 0x4e, 0x80, 0xc2, 0x59, 0xf7, 0x0d, 0x12, 0xf0, 0x7e, 0xb5, 0x51,
+	0x6f, 0xa3, 0x72, 0xb5, 0x6d, 0x55, 0x1b, 0x35, 0xc3, 0xda, 0x34, 0x5b, 0xed, 0x06, 0xda, 0xb6,
+	0x1a, 0x4d, 0x03, 0x95, 0xdb, 0x66, 0xa3, 0x7e, 0x5a, 0x69, 0x4a, 0xfb, 0x07, 0x85, 0xeb, 0x67,
+	0x71, 0x47, 0x0b, 0xf6, 0x00, 0x5c, 0x9d, 0x29, 0x8d, 0x59, 0x37, 0xdb, 0x69, 0x2d, 0xbb, 0xbe,
+	0x7f, 0x50, 0xb8, 0x72, 0x16, 0xbf, 0xe9, 0x51, 0x01, 0x1f, 0x82, 0x1b, 0x33, 0x11, 0x6f, 0x99,
+	0x77, 0x51, 0xb9, 0x6d, 0xa4, 0xe3, 0xd9, 0xeb, 0xfb, 0x07, 0x85, 0xf7, 0xce, 0xe2, 0xde, 0xa2,
+	0x5d, 0x1f, 0x0b, 0x32, 0x33, 0xfd, 0x5d, 0xa3, 0x6e, 0xb4, 0xcc, 0x56, 0x3a, 0x31, 0x1b, 0xfd,
+	0x5d, 0xe2, 0x11, 0x4e, 0x79, 0x36, 0x19, 0x36, 0xab, 0xb2, 0x79, 0xf8, 0x57, 0x2e, 0xf6, 0xf4,
+	0x28, 0xa7, 0x1d, 0x1e, 0xe5, 0xb4, 0x67, 0x47, 0x39, 0xed, 0xcf, 0xa3, 0x9c, 0xf6, 0xed, 0xf3,
+	0x5c, 0xec, 0xd9, 0xf3, 0x5c, 0xec, 0xf7, 0xe7, 0xb9, 0xd8, 0x17, 0xef, 0x46, 0xde, 0x41, 0x95,
+	0xf1, 0xde, 0x83, 0xc9, 0x2f, 0x96, 0x53, 0x1a, 0xaa, 0x5f, 0x2d, 0xf9, 0x9f, 0xd5, 0x99, 0x97,
+	0xb3, 0xed, 0x83, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x1d, 0xc8, 0xe9, 0x88, 0x09, 0x00,
+	0x00,
 }
 
 func (this *AccessTypeParam) Equal(that interface{}) bool {

From fb01b799c28addd90a82b1a229c6f30fe3691fa3 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 09:47:34 +0200
Subject: [PATCH 10/12] Adapt code to v1beta1 -> v1 rename

---
 CHANGELOG.md              | 2 ++
 x/wasm/ibctesting/wasm.go | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a9222c80a8..f7f26cc4bbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 
 - 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)
 
diff --git a/x/wasm/ibctesting/wasm.go b/x/wasm/ibctesting/wasm.go
index 99c90f0f024..19010a88c40 100644
--- a/x/wasm/ibctesting/wasm.go
+++ b/x/wasm/ibctesting/wasm.go
@@ -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,
 	})
 

From 997b53032db9ea95fff4087c3744bbed03ebbfd7 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 14:20:01 +0200
Subject: [PATCH 11/12] Fix up whitespace issues

---
 x/wasm/types/proposal.go      | 4 ++--
 x/wasm/types/proposal_test.go | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x/wasm/types/proposal.go b/x/wasm/types/proposal.go
index ae606129e19..76df026b10f 100644
--- a/x/wasm/types/proposal.go
+++ b/x/wasm/types/proposal.go
@@ -201,7 +201,7 @@ func (p InstantiateContractProposal) String() string {
   Admin:       %s
   Code id:     %d
   Label:       %s
-  Msg:     %q
+  Msg:         %q
   Funds:       %s
 `, p.Title, p.Description, p.RunAs, p.Admin, p.CodeID, p.Label, p.Msg, p.Funds)
 }
@@ -269,7 +269,7 @@ func (p MigrateContractProposal) String() string {
   Contract:    %s
   Code id:     %d
   Run as:      %s
-  Msg   %q
+  Msg          %q
 `, p.Title, p.Description, p.Contract, p.CodeID, p.RunAs, p.Msg)
 }
 
diff --git a/x/wasm/types/proposal_test.go b/x/wasm/types/proposal_test.go
index d1a620c702e..f7ce323540d 100644
--- a/x/wasm/types/proposal_test.go
+++ b/x/wasm/types/proposal_test.go
@@ -474,7 +474,7 @@ func TestProposalStrings(t *testing.T) {
   Admin:       cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
   Code id:     1
   Label:       testing
-  Msg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
+  Msg:         "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
   Funds:       1foo,2bar
 `,
 		},
@@ -487,7 +487,7 @@ func TestProposalStrings(t *testing.T) {
   Admin:       cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
   Code id:     1
   Label:       testing
-  Msg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
+  Msg:         "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
   Funds:       
 `,
 		},
@@ -500,7 +500,7 @@ func TestProposalStrings(t *testing.T) {
   Admin:       
   Code id:     1
   Label:       testing
-  Msg:     "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
+  Msg:         "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\",\"beneficiary\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
   Funds:       
 `,
 		},
@@ -512,7 +512,7 @@ func TestProposalStrings(t *testing.T) {
   Contract:    cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5
   Code id:     1
   Run as:      cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du
-  Msg   "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
+  Msg          "{\"verifier\":\"cosmos1qyqszqgpqyqszqgpqyqszqgpqyqszqgpjnp7du\"}"
 `,
 		},
 		"update admin": {

From d6432413a687a2fe2b8aef90df7cd4f88f6f40c2 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 27 Jul 2021 14:25:22 +0200
Subject: [PATCH 12/12] Fixed remaining PR comments

---
 x/wasm/client/proposal_handler_test.go | 2 +-
 x/wasm/types/wasmer_engine.go          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x/wasm/client/proposal_handler_test.go b/x/wasm/client/proposal_handler_test.go
index 1c238adc0ae..755972b6a90 100644
--- a/x/wasm/client/proposal_handler_test.go
+++ b/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/",
-				"msg":         "my/builder:tag",
+				"msg":         dict{"recipient": "cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz"},
 				"funds":       []dict{{"denom": "ustake", "amount": "100"}},
 				"deposit":     []dict{{"denom": "ustake", "amount": "10"}},
 				"proposer":    "cosmos1ve557a5g9yw2g2z57js3pdmcvd5my6g8ze20np",
diff --git a/x/wasm/types/wasmer_engine.go b/x/wasm/types/wasmer_engine.go
index d5cfd46a234..974b909f000 100644
--- a/x/wasm/types/wasmer_engine.go
+++ b/x/wasm/types/wasmer_engine.go
@@ -82,7 +82,7 @@ type WasmerEngine interface {
 	// replace it. This allows it to run a migration step if needed, or return an error if unable to migrate
 	// the given data.
 	//
-	// Msg has some data on how to perform the migration.
+	// MigrateMsg has some data on how to perform the migration.
 	Migrate(
 		checksum wasmvm.Checksum,
 		env wasmvmtypes.Env,