Add instantiate permission to CodeInfoResponse (#836)

* Add instantiate permission to CodeInfoResponse

* add query code info test

* add codes query response test

docs/proto/proto-docs.md

@@ -842,6 +842,7 @@ CodeInfoResponse contains code meta data from CodeInfo
 | `code_id` | [uint64](#uint64) |  | id for legacy support |
 | `creator` | [string](#string) |  |  |
 | `data_hash` | [bytes](#bytes) |  |  |
+| `instantiate_permission` | [AccessConfig](#cosmwasm.wasm.v1.AccessConfig) |  |  |
 
 
 

proto/cosmwasm/wasm/v1/query.proto

@@ -183,6 +183,7 @@ message CodeInfoResponse {
             "github.com/tendermint/tendermint/libs/bytes.HexBytes" ];
   // Used in v1beta1
   reserved 4, 5;
+  AccessConfig instantiate_permission = 6 [ (gogoproto.nullable) = false ];
 }
 
 // QueryCodeResponse is the response type for the Query/Code RPC method

x/wasm/keeper/legacy_querier.go

@@ -124,9 +124,10 @@ func queryCodeList(ctx sdk.Context, keeper types.ViewKeeper) ([]types.CodeInfoRe
 	var info []types.CodeInfoResponse
 	keeper.IterateCodeInfos(ctx, func(i uint64, res types.CodeInfo) bool {
 		info = append(info, types.CodeInfoResponse{
-			CodeID:   i,
-			Creator:  res.Creator,
-			DataHash: res.CodeHash,
+			CodeID:                i,
+			Creator:               res.Creator,
+			DataHash:              res.CodeHash,
+			InstantiatePermission: res.InstantiateConfig,
 		})
 		return false
 	})

x/wasm/keeper/querier.go

@@ -239,9 +239,10 @@ func (q grpcQuerier) Codes(c context.Context, req *types.QueryCodesRequest) (*ty
 				return false, err
 			}
 			r = append(r, types.CodeInfoResponse{
-				CodeID:   binary.BigEndian.Uint64(key),
-				Creator:  c.Creator,
-				DataHash: c.CodeHash,
+				CodeID:                binary.BigEndian.Uint64(key),
+				Creator:               c.Creator,
+				DataHash:              c.CodeHash,
+				InstantiatePermission: c.InstantiateConfig,
 			})
 		}
 		return true, nil
@@ -275,9 +276,10 @@ func queryCode(ctx sdk.Context, codeID uint64, keeper types.ViewKeeper) (*types.
 		return nil, nil
 	}
 	info := types.CodeInfoResponse{
-		CodeID:   codeID,
-		Creator:  res.Creator,
-		DataHash: res.CodeHash,
+		CodeID:                codeID,
+		Creator:               res.Creator,
+		DataHash:              res.CodeHash,
+		InstantiatePermission: res.InstantiateConfig,
 	}
 
 	code, err := keeper.GetByteCode(ctx, codeID)

x/wasm/keeper/querier_test.go

@@ -655,6 +655,128 @@ func TestQueryPinnedCodes(t *testing.T) {
 	}
 }
 
+func TestQueryCodeInfo(t *testing.T) {
+
+	wasmCode, err := ioutil.ReadFile("./testdata/hackatom.wasm")
+	require.NoError(t, err)
+
+	ctx, keepers := CreateTestInput(t, false, SupportedFeatures)
+	keeper := keepers.WasmKeeper
+
+	anyAddress, err := sdk.AccAddressFromBech32("cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz")
+	require.NoError(t, err)
+	specs := map[string]struct {
+		codeId       uint64
+		accessConfig types.AccessConfig
+	}{
+		"everybody": {
+			codeId:       1,
+			accessConfig: types.AllowEverybody,
+		},
+		"nobody": {
+			codeId:       10,
+			accessConfig: types.AllowNobody,
+		},
+		"with_address": {
+			codeId:       20,
+			accessConfig: types.AccessTypeOnlyAddress.With(anyAddress),
+		},
+	}
+	for msg, spec := range specs {
+		t.Run(msg, func(t *testing.T) {
+			codeInfo := types.CodeInfoFixture(types.WithSHA256CodeHash(wasmCode))
+			codeInfo.InstantiateConfig = spec.accessConfig
+			require.NoError(t, keeper.importCode(ctx, spec.codeId,
+				codeInfo,
+				wasmCode),
+			)
+
+			q := Querier(keeper)
+			got, err := q.Code(sdk.WrapSDKContext(ctx), &types.QueryCodeRequest{
+				CodeId: spec.codeId,
+			})
+			require.NoError(t, err)
+			expectedResponse := &types.QueryCodeResponse{
+				CodeInfoResponse: &types.CodeInfoResponse{
+					CodeID:                spec.codeId,
+					Creator:               codeInfo.Creator,
+					DataHash:              codeInfo.CodeHash,
+					InstantiatePermission: spec.accessConfig,
+				},
+				Data: wasmCode,
+			}
+			require.NotNil(t, got.CodeInfoResponse)
+			require.EqualValues(t, expectedResponse, got)
+		})
+	}
+}
+
+func TestQueryCodeInfoList(t *testing.T) {
+
+	wasmCode, err := ioutil.ReadFile("./testdata/hackatom.wasm")
+	require.NoError(t, err)
+
+	ctx, keepers := CreateTestInput(t, false, SupportedFeatures)
+	keeper := keepers.WasmKeeper
+
+	anyAddress, err := sdk.AccAddressFromBech32("cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz")
+	require.NoError(t, err)
+	codeInfoWithConfig := func(accessConfig types.AccessConfig) types.CodeInfo {
+		codeInfo := types.CodeInfoFixture(types.WithSHA256CodeHash(wasmCode))
+		codeInfo.InstantiateConfig = accessConfig
+		return codeInfo
+	}
+
+	codes := []struct {
+		name     string
+		codeId   uint64
+		codeInfo types.CodeInfo
+	}{
+		{
+			name:     "everybody",
+			codeId:   1,
+			codeInfo: codeInfoWithConfig(types.AllowEverybody),
+		},
+		{
+			codeId:   10,
+			name:     "nobody",
+			codeInfo: codeInfoWithConfig(types.AllowNobody),
+		},
+		{
+			name:     "with_address",
+			codeId:   20,
+			codeInfo: codeInfoWithConfig(types.AccessTypeOnlyAddress.With(anyAddress)),
+		},
+	}
+
+	allCodesResponse := make([]types.CodeInfoResponse, 0)
+	for _, code := range codes {
+		t.Run(fmt.Sprintf("import_%s", code.name), func(t *testing.T) {
+			require.NoError(t, keeper.importCode(ctx, code.codeId,
+				code.codeInfo,
+				wasmCode),
+			)
+		})
+
+		allCodesResponse = append(allCodesResponse, types.CodeInfoResponse{
+			CodeID:                code.codeId,
+			Creator:               code.codeInfo.Creator,
+			DataHash:              code.codeInfo.CodeHash,
+			InstantiatePermission: code.codeInfo.InstantiateConfig,
+		})
+	}
+	q := Querier(keeper)
+	got, err := q.Codes(sdk.WrapSDKContext(ctx), &types.QueryCodesRequest{
+		Pagination: &query.PageRequest{
+			Limit: 3,
+		},
+	})
+	require.NoError(t, err)
+	require.Len(t, got.CodeInfos, 3)
+	require.EqualValues(t, allCodesResponse, got.CodeInfos)
+
+}
+
 func fromBase64(s string) []byte {
 	r, err := base64.StdEncoding.DecodeString(s)
 	if err != nil {

x/wasm/types/query.pb.go

@@ -566,9 +566,10 @@ var xxx_messageInfo_QueryCodeRequest proto.InternalMessageInfo
 
 // CodeInfoResponse contains code meta data from CodeInfo
 type CodeInfoResponse struct {
-	CodeID   uint64                                               `protobuf:"varint,1,opt,name=code_id,json=codeId,proto3" json:"id"`
-	Creator  string                                               `protobuf:"bytes,2,opt,name=creator,proto3" json:"creator,omitempty"`
-	DataHash github_com_tendermint_tendermint_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=data_hash,json=dataHash,proto3,casttype=github.com/tendermint/tendermint/libs/bytes.HexBytes" json:"data_hash,omitempty"`
+	CodeID                uint64                                               `protobuf:"varint,1,opt,name=code_id,json=codeId,proto3" json:"id"`
+	Creator               string                                               `protobuf:"bytes,2,opt,name=creator,proto3" json:"creator,omitempty"`
+	DataHash              github_com_tendermint_tendermint_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=data_hash,json=dataHash,proto3,casttype=github.com/tendermint/tendermint/libs/bytes.HexBytes" json:"data_hash,omitempty"`
+	InstantiatePermission AccessConfig                                         `protobuf:"bytes,6,opt,name=instantiate_permission,json=instantiatePermission,proto3" json:"instantiate_permission"`
 }
 
 func (m *CodeInfoResponse) Reset()         { *m = CodeInfoResponse{} }
@@ -828,79 +829,82 @@ func init() {
 func init() { proto.RegisterFile("cosmwasm/wasm/v1/query.proto", fileDescriptor_9677c207036b9f2b) }
 
 var fileDescriptor_9677c207036b9f2b = []byte{
-	// 1147 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xc7, 0x3d, 0xa9, 0xe3, 0x1f, 0x93, 0xa0, 0x9a, 0x11, 0x6a, 0x8c, 0x49, 0x77, 0xa3, 0xa5,
-	0x0a, 0xa9, 0x1b, 0x76, 0x71, 0x9a, 0xa8, 0x80, 0x84, 0x10, 0x4e, 0xa1, 0x49, 0xa4, 0x48, 0xed,
-	0x56, 0xa8, 0x12, 0x1c, 0xa2, 0xb1, 0x77, 0x6a, 0xaf, 0x64, 0xef, 0x38, 0x3b, 0x93, 0xa4, 0x56,
-	0x14, 0x40, 0x95, 0x38, 0x20, 0x21, 0x40, 0x42, 0x9c, 0xe1, 0x80, 0x0a, 0x67, 0xb8, 0x71, 0xe2,
-	0x98, 0x63, 0x24, 0x2e, 0x9c, 0x2c, 0x70, 0x38, 0xa0, 0xfc, 0x09, 0x3d, 0xa1, 0x9d, 0x9d, 0xb5,
-	0xd7, 0x3f, 0x36, 0x76, 0x22, 0x8b, 0x8b, 0xb5, 0xeb, 0x79, 0x3f, 0x3e, 0xef, 0xeb, 0x37, 0xf3,
-	0xc6, 0x70, 0xbe, 0x4c, 0x59, 0xfd, 0x00, 0xb3, 0xba, 0x21, 0x3e, 0xf6, 0x0b, 0xc6, 0xee, 0x1e,
-	0x71, 0x9b, 0x7a, 0xc3, 0xa5, 0x9c, 0xa2, 0x4c, 0xb0, 0xaa, 0x8b, 0x8f, 0xfd, 0x42, 0xee, 0xa5,
-	0x0a, 0xad, 0x50, 0xb1, 0x68, 0x78, 0x4f, 0xbe, 0x5d, 0x6e, 0x30, 0x0a, 0x6f, 0x36, 0x08, 0x0b,
-	0x56, 0x2b, 0x94, 0x56, 0x6a, 0xc4, 0xc0, 0x0d, 0xdb, 0xc0, 0x8e, 0x43, 0x39, 0xe6, 0x36, 0x75,
-	0x82, 0xd5, 0xbc, 0xe7, 0x4b, 0x99, 0x51, 0xc2, 0x8c, 0xf8, 0xc9, 0x8d, 0xfd, 0x42, 0x89, 0x70,
-	0x5c, 0x30, 0x1a, 0xb8, 0x62, 0x3b, 0xc2, 0xd8, 0xb7, 0xd5, 0x56, 0x61, 0xf6, 0x81, 0x67, 0xb1,
-	0x4e, 0x1d, 0xee, 0xe2, 0x32, 0xdf, 0x74, 0x1e, 0x53, 0x93, 0xec, 0xee, 0x11, 0xc6, 0x51, 0x16,
-	0x26, 0xb1, 0x65, 0xb9, 0x84, 0xb1, 0x2c, 0x58, 0x00, 0x4b, 0x69, 0x33, 0x78, 0xd5, 0xbe, 0x02,
-	0xf0, 0xe5, 0x21, 0x6e, 0xac, 0x41, 0x1d, 0x46, 0xa2, 0xfd, 0xd0, 0x03, 0xf8, 0x42, 0x59, 0x7a,
-	0xec, 0xd8, 0xce, 0x63, 0x9a, 0x9d, 0x5a, 0x00, 0x4b, 0x33, 0x2b, 0x8a, 0xde, 0xaf, 0x8a, 0x1e,
-	0x0e, 0x5c, 0x9c, 0x3d, 0x6e, 0xa9, 0xb1, 0x93, 0x96, 0x0a, 0xce, 0x5a, 0x6a, 0xcc, 0x9c, 0x2d,
-	0x87, 0xd6, 0xde, 0x8e, 0xff, 0xfb, 0x83, 0x0a, 0xb4, 0x4f, 0xe1, 0x2b, 0x3d, 0x3c, 0x1b, 0x36,
-	0xe3, 0xd4, 0x6d, 0x8e, 0xac, 0x04, 0x7d, 0x00, 0x61, 0x57, 0x13, 0x89, 0xb3, 0xa8, 0xfb, 0x02,
-	0xea, 0x9e, 0x80, 0xba, 0xff, 0xeb, 0x49, 0x01, 0xf5, 0xfb, 0xb8, 0x42, 0x64, 0x54, 0x33, 0xe4,
-	0xa9, 0xfd, 0x0a, 0xe0, 0xfc, 0x70, 0x02, 0x29, 0xca, 0x16, 0x4c, 0x12, 0x87, 0xbb, 0x36, 0xf1,
-	0x10, 0xae, 0x2c, 0xcd, 0xac, 0xe4, 0xa3, 0x8b, 0x5e, 0xa7, 0x16, 0x91, 0xfe, 0xef, 0x3b, 0xdc,
-	0x6d, 0x16, 0xe3, 0x9e, 0x00, 0x66, 0x10, 0x00, 0xdd, 0x1b, 0x02, 0xfd, 0xda, 0x48, 0x68, 0x1f,
-	0xa4, 0x87, 0xfa, 0x93, 0x3e, 0xd9, 0x58, 0xb1, 0xe9, 0xe5, 0x0e, 0x64, 0x9b, 0x83, 0xc9, 0x32,
-	0xb5, 0xc8, 0x8e, 0x6d, 0x09, 0xd9, 0xe2, 0x66, 0xc2, 0x7b, 0xdd, 0xb4, 0x26, 0xa6, 0xda, 0xe7,
-	0xfd, 0xaa, 0x75, 0x00, 0xa4, 0x6a, 0xf3, 0x30, 0x1d, 0xfc, 0xda, 0xbe, 0x6e, 0x69, 0xb3, 0xfb,
-	0xc5, 0xe4, 0x74, 0xf8, 0x2c, 0xe0, 0x78, 0xaf, 0x56, 0x0b, 0x50, 0x1e, 0x72, 0xcc, 0xc9, 0xff,
-	0xd7, 0x40, 0xdf, 0x03, 0x78, 0x3d, 0x02, 0x41, 0x6a, 0xb1, 0x06, 0x13, 0x75, 0x6a, 0x91, 0x5a,
-	0xd0, 0x40, 0x73, 0x83, 0x0d, 0xb4, 0xed, 0xad, 0xcb, 0x6e, 0x91, 0xc6, 0x93, 0x13, 0xe9, 0x91,
-	0xd4, 0xc8, 0xc4, 0x07, 0x17, 0xd4, 0xe8, 0x3a, 0x84, 0x22, 0xc7, 0x8e, 0x85, 0x39, 0x16, 0x08,
-	0xb3, 0x66, 0x5a, 0x7c, 0x73, 0x17, 0x73, 0xac, 0xdd, 0x96, 0x95, 0x0f, 0x06, 0x96, 0x95, 0x23,
-	0x18, 0x17, 0x9e, 0x40, 0x78, 0x8a, 0x67, 0x6d, 0x17, 0x2a, 0xc2, 0xe9, 0x61, 0x1d, 0xbb, 0xfc,
-	0x82, 0x3c, 0x6b, 0x83, 0x3c, 0xc5, 0x6b, 0xcf, 0x5b, 0x2a, 0x0a, 0x11, 0x6c, 0x13, 0xc6, 0x3c,
-	0x25, 0x42, 0x9c, 0xdb, 0x50, 0x8d, 0x4c, 0x29, 0x49, 0xf3, 0x61, 0xd2, 0xc8, 0x98, 0x7e, 0x05,
-	0xb7, 0x60, 0x46, 0xf6, 0xfe, 0xe8, 0x1d, 0xa7, 0xfd, 0x0e, 0x60, 0xc6, 0x33, 0xec, 0x39, 0x68,
-	0x6f, 0xf6, 0x59, 0x17, 0x33, 0xed, 0x96, 0x9a, 0x10, 0x66, 0x77, 0xcf, 0x5a, 0xea, 0x94, 0x6d,
-	0x75, 0x76, 0x6c, 0x16, 0x26, 0xcb, 0x2e, 0xc1, 0x9c, 0xba, 0xa2, 0xde, 0xb4, 0x19, 0xbc, 0xa2,
-	0x0f, 0x61, 0xda, 0xc3, 0xd9, 0xa9, 0x62, 0x56, 0xcd, 0x5e, 0x11, 0xdc, 0x6f, 0x3e, 0x6f, 0xa9,
-	0xab, 0x15, 0x9b, 0x57, 0xf7, 0x4a, 0x7a, 0x99, 0xd6, 0x0d, 0x4e, 0x1c, 0x8b, 0xb8, 0x75, 0xdb,
-	0xe1, 0xe1, 0xc7, 0x9a, 0x5d, 0x62, 0x46, 0xa9, 0xc9, 0x09, 0xd3, 0x37, 0xc8, 0x93, 0xa2, 0xf7,
-	0x60, 0xa6, 0xbc, 0x50, 0x1b, 0x98, 0x55, 0xfd, 0x73, 0x79, 0x2b, 0x9e, 0x8a, 0x67, 0xa6, 0xb7,
-	0xe2, 0xa9, 0xe9, 0x4c, 0x42, 0x7b, 0x0a, 0xe0, 0x8b, 0xa1, 0x82, 0x65, 0x0d, 0x9b, 0xde, 0x0e,
-	0xf7, 0x6a, 0xf0, 0xc6, 0x01, 0x10, 0xdd, 0xa9, 0x0d, 0x3b, 0x19, 0x7b, 0x4b, 0x2f, 0xa6, 0x3a,
-	0xe3, 0x20, 0x55, 0x96, 0x6b, 0x68, 0x5e, 0x8a, 0xef, 0xff, 0xa0, 0xa9, 0xb3, 0x96, 0x2a, 0xde,
-	0x7d, 0xb9, 0xe5, 0xa0, 0xf8, 0x38, 0xc4, 0xc0, 0x02, 0xd5, 0x7b, 0xf7, 0x30, 0xb8, 0xf4, 0x1e,
-	0x7e, 0x06, 0x20, 0x0a, 0x47, 0x97, 0x25, 0xde, 0x83, 0xb0, 0x53, 0x62, 0xb0, 0x79, 0xc7, 0xa9,
-	0xd1, 0xdf, 0xc7, 0xe9, 0xa0, 0xbe, 0x09, 0x6e, 0x65, 0x0c, 0xe7, 0x04, 0xe7, 0x7d, 0xdb, 0x71,
-	0x88, 0x75, 0x8e, 0x16, 0x97, 0x3f, 0xcf, 0xbe, 0x06, 0xf2, 0x66, 0xd1, 0x93, 0xa3, 0xb3, 0x4d,
-	0x52, 0xb2, 0x71, 0x7d, 0x3d, 0xe2, 0xc5, 0xab, 0x5e, 0xad, 0xed, 0x96, 0x9a, 0xf4, 0xbb, 0x97,
-	0x99, 0x49, 0xbf, 0x71, 0x27, 0x57, 0xf4, 0xca, 0x17, 0x33, 0x70, 0x5a, 0x10, 0xa1, 0xef, 0x00,
-	0x9c, 0x0d, 0x5f, 0x30, 0xd0, 0x90, 0x59, 0x1c, 0x75, 0x2b, 0xca, 0xdd, 0x1a, 0xcb, 0xd6, 0xcf,
-	0xaf, 0x2d, 0x3f, 0xfd, 0xe3, 0x9f, 0x6f, 0xa7, 0x16, 0xd1, 0x0d, 0x63, 0xe0, 0x3e, 0x17, 0x8c,
-	0x31, 0xe3, 0x50, 0x1e, 0x4b, 0x47, 0xe8, 0x19, 0x80, 0x57, 0xfb, 0xee, 0x0f, 0xe8, 0xf5, 0x11,
-	0xe9, 0x7a, 0x6f, 0x3a, 0x39, 0x7d, 0x5c, 0x73, 0x09, 0xb8, 0x2a, 0x00, 0x75, 0xb4, 0x3c, 0x0e,
-	0xa0, 0x51, 0x95, 0x50, 0x3f, 0x86, 0x40, 0xe5, 0xc8, 0x1e, 0x09, 0xda, 0x7b, 0xb7, 0x18, 0x09,
-	0xda, 0x77, 0x13, 0xd0, 0x56, 0x04, 0xe8, 0x32, 0xca, 0x0f, 0x03, 0xb5, 0x88, 0x71, 0x28, 0x1b,
-	0xea, 0xc8, 0xe8, 0xde, 0x0f, 0x7e, 0x02, 0x30, 0xd3, 0x3f, 0x4e, 0x51, 0x54, 0xe2, 0x88, 0xd1,
-	0x9f, 0x33, 0xc6, 0xb6, 0x1f, 0x87, 0x74, 0x40, 0x52, 0x26, 0xa0, 0x7e, 0x01, 0x30, 0xd3, 0x3f,
-	0xfe, 0x22, 0x49, 0x23, 0x06, 0x70, 0x24, 0x69, 0xd4, 0x5c, 0xd5, 0xde, 0x11, 0xa4, 0x77, 0xd0,
-	0xda, 0x58, 0xa4, 0x2e, 0x3e, 0x30, 0x0e, 0xbb, 0x73, 0xf3, 0x08, 0xfd, 0x06, 0x20, 0x1a, 0x9c,
-	0x85, 0xe8, 0x8d, 0x08, 0x8c, 0xc8, 0x49, 0x9d, 0x2b, 0x5c, 0xc0, 0x43, 0xa2, 0xbf, 0x2b, 0xd0,
-	0xdf, 0x42, 0x77, 0xc6, 0x13, 0xd9, 0x0b, 0xd4, 0x0b, 0xdf, 0x84, 0x71, 0xd1, 0xb6, 0x5a, 0x64,
-	0x1f, 0x76, 0x7b, 0xf5, 0xd5, 0x73, 0x6d, 0x24, 0xd1, 0x92, 0x20, 0xd2, 0xd0, 0xc2, 0xa8, 0x06,
-	0x45, 0x2e, 0x9c, 0x16, 0xc7, 0x21, 0x3a, 0x2f, 0x6e, 0x70, 0x20, 0xe7, 0x6e, 0x9c, 0x6f, 0x24,
-	0xb3, 0x2b, 0x22, 0x7b, 0x16, 0x5d, 0x1b, 0x9e, 0x1d, 0x7d, 0x09, 0xe0, 0x4c, 0xe8, 0x24, 0x46,
-	0x37, 0x23, 0xa2, 0x0e, 0x4e, 0x84, 0x5c, 0x7e, 0x1c, 0x53, 0x89, 0xb1, 0x28, 0x30, 0x16, 0x90,
-	0x32, 0x1c, 0x83, 0x19, 0x0d, 0xe1, 0x54, 0xdc, 0x38, 0xfe, 0x5b, 0x89, 0xfd, 0xdc, 0x56, 0x62,
-	0xc7, 0x6d, 0x05, 0x9c, 0xb4, 0x15, 0xf0, 0x57, 0x5b, 0x01, 0xdf, 0x9c, 0x2a, 0xb1, 0x93, 0x53,
-	0x25, 0xf6, 0xe7, 0xa9, 0x12, 0xfb, 0x68, 0x31, 0x74, 0xff, 0x58, 0xa7, 0xac, 0xfe, 0x28, 0x88,
-	0x65, 0x19, 0x4f, 0xfc, 0x98, 0xe2, 0x0f, 0x71, 0x29, 0x21, 0xfe, 0xc7, 0xde, 0xfe, 0x2f, 0x00,
-	0x00, 0xff, 0xff, 0x5a, 0x15, 0x21, 0x1e, 0x77, 0x0f, 0x00, 0x00,
+	// 1191 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0xcf, 0x4f, 0x24, 0x45,
+	0x14, 0xc7, 0xa7, 0xd8, 0x61, 0x7e, 0x14, 0x98, 0x1d, 0x2b, 0x0a, 0xe3, 0xc8, 0x76, 0x93, 0x76,
+	0x83, 0x2c, 0x8b, 0xdd, 0xc2, 0x42, 0x56, 0x4d, 0x8c, 0xd9, 0x61, 0x75, 0x81, 0x84, 0x84, 0xed,
+	0x8d, 0xd9, 0xc4, 0x3d, 0x90, 0x9a, 0xe9, 0x62, 0xe8, 0x84, 0xe9, 0x1a, 0xba, 0x0a, 0xd8, 0x09,
+	0x41, 0xcd, 0x26, 0x1e, 0x4c, 0x8c, 0x9a, 0x18, 0x8f, 0x46, 0x0f, 0x66, 0xf5, 0xac, 0x37, 0xff,
+	0x02, 0x8e, 0x24, 0x5e, 0x3c, 0x4d, 0x74, 0xf0, 0x60, 0xf8, 0x13, 0xf6, 0x64, 0xaa, 0xba, 0x7a,
+	0xe8, 0xf9, 0xd1, 0xcc, 0xb0, 0x21, 0x7b, 0x21, 0xdd, 0xd4, 0xab, 0x57, 0x9f, 0xf7, 0xed, 0x57,
+	0xef, 0xbd, 0x81, 0x13, 0x65, 0xca, 0xaa, 0xfb, 0x98, 0x55, 0x2d, 0xf9, 0x67, 0x6f, 0xce, 0xda,
+	0xd9, 0x25, 0x7e, 0xdd, 0xac, 0xf9, 0x94, 0x53, 0x94, 0x0b, 0x57, 0x4d, 0xf9, 0x67, 0x6f, 0xae,
+	0xf0, 0x4a, 0x85, 0x56, 0xa8, 0x5c, 0xb4, 0xc4, 0x53, 0x60, 0x57, 0xe8, 0xf6, 0xc2, 0xeb, 0x35,
+	0xc2, 0xc2, 0xd5, 0x0a, 0xa5, 0x95, 0x6d, 0x62, 0xe1, 0x9a, 0x6b, 0x61, 0xcf, 0xa3, 0x1c, 0x73,
+	0x97, 0x7a, 0xe1, 0xea, 0x8c, 0xd8, 0x4b, 0x99, 0x55, 0xc2, 0x8c, 0x04, 0x87, 0x5b, 0x7b, 0x73,
+	0x25, 0xc2, 0xf1, 0x9c, 0x55, 0xc3, 0x15, 0xd7, 0x93, 0xc6, 0x81, 0xad, 0xb1, 0x00, 0xf3, 0xf7,
+	0x85, 0xc5, 0x12, 0xf5, 0xb8, 0x8f, 0xcb, 0x7c, 0xc5, 0xdb, 0xa4, 0x36, 0xd9, 0xd9, 0x25, 0x8c,
+	0xa3, 0x3c, 0x4c, 0x63, 0xc7, 0xf1, 0x09, 0x63, 0x79, 0x30, 0x09, 0xa6, 0xb3, 0x76, 0xf8, 0x6a,
+	0x7c, 0x0d, 0xe0, 0x6b, 0x3d, 0xb6, 0xb1, 0x1a, 0xf5, 0x18, 0x89, 0xdf, 0x87, 0xee, 0xc3, 0x97,
+	0xca, 0x6a, 0xc7, 0x86, 0xeb, 0x6d, 0xd2, 0xfc, 0xd0, 0x24, 0x98, 0x1e, 0x99, 0xd7, 0xcc, 0x4e,
+	0x55, 0xcc, 0xa8, 0xe3, 0xe2, 0xe8, 0x51, 0x43, 0x4f, 0x1c, 0x37, 0x74, 0x70, 0xda, 0xd0, 0x13,
+	0xf6, 0x68, 0x39, 0xb2, 0xf6, 0x5e, 0xf2, 0xbf, 0x9f, 0x74, 0x60, 0x7c, 0x06, 0x5f, 0x6f, 0xe3,
+	0x59, 0x76, 0x19, 0xa7, 0x7e, 0xbd, 0x6f, 0x24, 0xe8, 0x23, 0x08, 0xcf, 0x34, 0x51, 0x38, 0x53,
+	0x66, 0x20, 0xa0, 0x29, 0x04, 0x34, 0x83, 0xaf, 0xa7, 0x04, 0x34, 0xd7, 0x71, 0x85, 0x28, 0xaf,
+	0x76, 0x64, 0xa7, 0xf1, 0x3b, 0x80, 0x13, 0xbd, 0x09, 0x94, 0x28, 0xab, 0x30, 0x4d, 0x3c, 0xee,
+	0xbb, 0x44, 0x20, 0x5c, 0x99, 0x1e, 0x99, 0x9f, 0x89, 0x0f, 0x7a, 0x89, 0x3a, 0x44, 0xed, 0xff,
+	0xd0, 0xe3, 0x7e, 0xbd, 0x98, 0x14, 0x02, 0xd8, 0xa1, 0x03, 0x74, 0xaf, 0x07, 0xf4, 0x9b, 0x7d,
+	0xa1, 0x03, 0x90, 0x36, 0xea, 0x4f, 0x3b, 0x64, 0x63, 0xc5, 0xba, 0x38, 0x3b, 0x94, 0x6d, 0x1c,
+	0xa6, 0xcb, 0xd4, 0x21, 0x1b, 0xae, 0x23, 0x65, 0x4b, 0xda, 0x29, 0xf1, 0xba, 0xe2, 0x5c, 0x9a,
+	0x6a, 0x5f, 0x74, 0xaa, 0xd6, 0x02, 0x50, 0xaa, 0x4d, 0xc0, 0x6c, 0xf8, 0xb5, 0x03, 0xdd, 0xb2,
+	0xf6, 0xd9, 0x3f, 0x2e, 0x4f, 0x87, 0xcf, 0x43, 0x8e, 0x3b, 0xdb, 0xdb, 0x21, 0xca, 0x03, 0x8e,
+	0x39, 0x79, 0x71, 0x09, 0xf4, 0x23, 0x80, 0xd7, 0x62, 0x10, 0x94, 0x16, 0x8b, 0x30, 0x55, 0xa5,
+	0x0e, 0xd9, 0x0e, 0x13, 0x68, 0xbc, 0x3b, 0x81, 0xd6, 0xc4, 0xba, 0xca, 0x16, 0x65, 0x7c, 0x79,
+	0x22, 0x3d, 0x54, 0x1a, 0xd9, 0x78, 0xff, 0x82, 0x1a, 0x5d, 0x83, 0x50, 0x9e, 0xb1, 0xe1, 0x60,
+	0x8e, 0x25, 0xc2, 0xa8, 0x9d, 0x95, 0xff, 0xb9, 0x8b, 0x39, 0x36, 0x6e, 0xa9, 0xc8, 0xbb, 0x1d,
+	0xab, 0xc8, 0x11, 0x4c, 0xca, 0x9d, 0x40, 0xee, 0x94, 0xcf, 0xc6, 0x0e, 0xd4, 0xe4, 0xa6, 0x07,
+	0x55, 0xec, 0xf3, 0x0b, 0xf2, 0x2c, 0x76, 0xf3, 0x14, 0xc7, 0x9e, 0x35, 0x74, 0x14, 0x21, 0x58,
+	0x23, 0x8c, 0x09, 0x25, 0x22, 0x9c, 0x6b, 0x50, 0x8f, 0x3d, 0x52, 0x91, 0xce, 0x44, 0x49, 0x63,
+	0x7d, 0x06, 0x11, 0xdc, 0x84, 0x39, 0x95, 0xfb, 0xfd, 0x6f, 0x9c, 0xf1, 0xc3, 0x10, 0xcc, 0x09,
+	0xc3, 0xb6, 0x42, 0x7b, 0xa3, 0xc3, 0xba, 0x98, 0x6b, 0x36, 0xf4, 0x94, 0x34, 0xbb, 0x7b, 0xda,
+	0xd0, 0x87, 0x5c, 0xa7, 0x75, 0x63, 0xf3, 0x30, 0x5d, 0xf6, 0x09, 0xe6, 0xd4, 0x97, 0xf1, 0x66,
+	0xed, 0xf0, 0x15, 0x7d, 0x0c, 0xb3, 0x02, 0x67, 0x63, 0x0b, 0xb3, 0xad, 0xfc, 0x15, 0xc9, 0xfd,
+	0xce, 0xb3, 0x86, 0xbe, 0x50, 0x71, 0xf9, 0xd6, 0x6e, 0xc9, 0x2c, 0xd3, 0xaa, 0xc5, 0x89, 0xe7,
+	0x10, 0xbf, 0xea, 0x7a, 0x3c, 0xfa, 0xb8, 0xed, 0x96, 0x98, 0x55, 0xaa, 0x73, 0xc2, 0xcc, 0x65,
+	0xf2, 0xb8, 0x28, 0x1e, 0xec, 0x8c, 0x70, 0xb5, 0x8c, 0xd9, 0x16, 0x7a, 0x04, 0xc7, 0x5c, 0x8f,
+	0x71, 0xec, 0x71, 0x17, 0x73, 0xb2, 0x51, 0x13, 0x9b, 0x18, 0x13, 0x29, 0x98, 0x8a, 0xab, 0xf9,
+	0x77, 0xca, 0x65, 0xc2, 0xd8, 0x12, 0xf5, 0x36, 0xdd, 0x8a, 0x4a, 0xe2, 0x57, 0x23, 0x3e, 0xd6,
+	0x5b, 0x2e, 0x82, 0xa2, 0xbf, 0x9a, 0xcc, 0x24, 0x73, 0xc3, 0xab, 0xc9, 0xcc, 0x70, 0x2e, 0x65,
+	0x3c, 0x01, 0xf0, 0xe5, 0x88, 0x9a, 0x4a, 0xa0, 0x15, 0x51, 0x3e, 0x84, 0x40, 0xa2, 0xd7, 0x00,
+	0x79, 0xae, 0xd1, 0xab, 0xec, 0xb6, 0xeb, 0x5a, 0xcc, 0xb4, 0x7a, 0x4d, 0xa6, 0xac, 0xd6, 0xd0,
+	0x84, 0xfa, 0xb2, 0x41, 0xb6, 0x64, 0x4e, 0x1b, 0xba, 0x7c, 0x0f, 0xbe, 0xa5, 0xea, 0x42, 0x8f,
+	0x22, 0x0c, 0x2c, 0xfc, 0xa4, 0xed, 0x05, 0x02, 0x3c, 0x77, 0x81, 0x78, 0x0a, 0x20, 0x8a, 0x7a,
+	0x57, 0x21, 0xde, 0x83, 0xb0, 0x15, 0x62, 0x58, 0x19, 0x06, 0x89, 0x31, 0xd0, 0x37, 0x1b, 0xc6,
+	0x77, 0x89, 0x75, 0x02, 0xc3, 0x71, 0xc9, 0xb9, 0xee, 0x7a, 0x1e, 0x71, 0xce, 0xd1, 0xe2, 0xf9,
+	0x8b, 0xe5, 0x37, 0x40, 0x8d, 0x2d, 0x6d, 0x67, 0xb4, 0xee, 0x60, 0x46, 0xdd, 0x8a, 0x40, 0x8f,
+	0x64, 0xf1, 0xaa, 0x88, 0xb5, 0xd9, 0xd0, 0xd3, 0xc1, 0xd5, 0x60, 0x76, 0x3a, 0xb8, 0x15, 0x97,
+	0x17, 0xf4, 0xfc, 0x97, 0x23, 0x70, 0x58, 0x12, 0xa1, 0xef, 0x01, 0x1c, 0x8d, 0x4e, 0x2f, 0xa8,
+	0x47, 0xa3, 0x8f, 0x1b, 0xb9, 0x0a, 0x37, 0x07, 0xb2, 0x0d, 0xce, 0x37, 0x66, 0x9f, 0xfc, 0xf9,
+	0xef, 0x77, 0x43, 0x53, 0xe8, 0xba, 0xd5, 0x35, 0x2c, 0x86, 0x3d, 0xd2, 0x3a, 0x50, 0x35, 0xef,
+	0x10, 0x3d, 0x05, 0xf0, 0x6a, 0xc7, 0x70, 0x82, 0xde, 0xea, 0x73, 0x5c, 0xfb, 0x18, 0x55, 0x30,
+	0x07, 0x35, 0x57, 0x80, 0x0b, 0x12, 0xd0, 0x44, 0xb3, 0x83, 0x00, 0x5a, 0x5b, 0x0a, 0xea, 0xe7,
+	0x08, 0xa8, 0x9a, 0x07, 0xfa, 0x82, 0xb6, 0x0f, 0x2e, 0x7d, 0x41, 0x3b, 0xc6, 0x0c, 0x63, 0x5e,
+	0x82, 0xce, 0xa2, 0x99, 0x5e, 0xa0, 0x0e, 0xb1, 0x0e, 0x54, 0x42, 0x1d, 0x5a, 0x67, 0xc3, 0xc7,
+	0x2f, 0x00, 0xe6, 0x3a, 0x7b, 0x35, 0x8a, 0x3b, 0x38, 0x66, 0xae, 0x28, 0x58, 0x03, 0xdb, 0x0f,
+	0x42, 0xda, 0x25, 0x29, 0x93, 0x50, 0xbf, 0x01, 0x98, 0xeb, 0xec, 0xad, 0xb1, 0xa4, 0x31, 0xdd,
+	0x3d, 0x96, 0x34, 0xae, 0x69, 0x1b, 0xef, 0x4b, 0xd2, 0xdb, 0x68, 0x71, 0x20, 0x52, 0x1f, 0xef,
+	0x5b, 0x07, 0x67, 0x4d, 0xf9, 0x10, 0xfd, 0x01, 0x20, 0xea, 0x6e, 0xb4, 0xe8, 0xed, 0x18, 0x8c,
+	0xd8, 0x31, 0xa0, 0x30, 0x77, 0x81, 0x1d, 0x0a, 0xfd, 0x03, 0x89, 0xfe, 0x2e, 0xba, 0x3d, 0x98,
+	0xc8, 0xc2, 0x51, 0x3b, 0x7c, 0x1d, 0x26, 0x65, 0xda, 0x1a, 0xb1, 0x79, 0x78, 0x96, 0xab, 0x6f,
+	0x9c, 0x6b, 0xa3, 0x88, 0xa6, 0x25, 0x91, 0x81, 0x26, 0xfb, 0x25, 0x28, 0xf2, 0xe1, 0xb0, 0x2c,
+	0x87, 0xe8, 0x3c, 0xbf, 0x61, 0x41, 0x2e, 0x5c, 0x3f, 0xdf, 0x48, 0x9d, 0xae, 0xc9, 0xd3, 0xf3,
+	0x68, 0xac, 0xf7, 0xe9, 0xe8, 0x2b, 0x00, 0x47, 0x22, 0x95, 0x18, 0xdd, 0x88, 0xf1, 0xda, 0xdd,
+	0x11, 0x0a, 0x33, 0x83, 0x98, 0x2a, 0x8c, 0x29, 0x89, 0x31, 0x89, 0xb4, 0xde, 0x18, 0xcc, 0xaa,
+	0xc9, 0x4d, 0xc5, 0xe5, 0xa3, 0x7f, 0xb4, 0xc4, 0xaf, 0x4d, 0x2d, 0x71, 0xd4, 0xd4, 0xc0, 0x71,
+	0x53, 0x03, 0x7f, 0x37, 0x35, 0xf0, 0xed, 0x89, 0x96, 0x38, 0x3e, 0xd1, 0x12, 0x7f, 0x9d, 0x68,
+	0x89, 0x4f, 0xa6, 0x22, 0xc3, 0xcd, 0x12, 0x65, 0xd5, 0x87, 0xa1, 0x2f, 0xc7, 0x7a, 0x1c, 0xf8,
+	0x94, 0xbf, 0xb6, 0x4b, 0x29, 0xf9, 0x23, 0xf9, 0xd6, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe8,
+	0x7b, 0x25, 0x05, 0xd4, 0x0f, 0x00, 0x00,
 }
 
 func (this *QueryContractInfoResponse) Equal(that interface{}) bool {
@@ -958,6 +962,9 @@ func (this *CodeInfoResponse) Equal(that interface{}) bool {
 	if !bytes.Equal(this.DataHash, that1.DataHash) {
 		return false
 	}
+	if !this.InstantiatePermission.Equal(&that1.InstantiatePermission) {
+		return false
+	}
 	return true
 }
 func (this *QueryCodeResponse) Equal(that interface{}) bool {
@@ -1892,6 +1899,16 @@ func (m *CodeInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	{
+		size, err := m.InstantiatePermission.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintQuery(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x32
 	if len(m.DataHash) > 0 {
 		i -= len(m.DataHash)
 		copy(dAtA[i:], m.DataHash)
@@ -2108,20 +2125,20 @@ func (m *QueryPinnedCodesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error
 		dAtA[i] = 0x12
 	}
 	if len(m.CodeIDs) > 0 {
-		dAtA14 := make([]byte, len(m.CodeIDs)*10)
-		var j13 int
+		dAtA15 := make([]byte, len(m.CodeIDs)*10)
+		var j14 int
 		for _, num := range m.CodeIDs {
 			for num >= 1<<7 {
-				dAtA14[j13] = uint8(uint64(num)&0x7f | 0x80)
+				dAtA15[j14] = uint8(uint64(num)&0x7f | 0x80)
 				num >>= 7
-				j13++
+				j14++
 			}
-			dAtA14[j13] = uint8(num)
-			j13++
+			dAtA15[j14] = uint8(num)
+			j14++
 		}
-		i -= j13
-		copy(dAtA[i:], dAtA14[:j13])
-		i = encodeVarintQuery(dAtA, i, uint64(j13))
+		i -= j14
+		copy(dAtA[i:], dAtA15[:j14])
+		i = encodeVarintQuery(dAtA, i, uint64(j14))
 		i--
 		dAtA[i] = 0xa
 	}
@@ -2363,6 +2380,8 @@ func (m *CodeInfoResponse) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovQuery(uint64(l))
 	}
+	l = m.InstantiatePermission.Size()
+	n += 1 + l + sovQuery(uint64(l))
 	return n
 }
 
@@ -3933,6 +3952,39 @@ func (m *CodeInfoResponse) Unmarshal(dAtA []byte) error {
 				m.DataHash = []byte{}
 			}
 			iNdEx = postIndex
+		case 6:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field InstantiatePermission", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.InstantiatePermission.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])