diff --git a/doc/proto.md b/doc/proto.md index 571fe8d60e..17c0723ad1 100644 --- a/doc/proto.md +++ b/doc/proto.md @@ -17,6 +17,19 @@ - [StoreCodeProposal](#cosmwasm.wasm.v1beta1.StoreCodeProposal) - [UpdateAdminProposal](#cosmwasm.wasm.v1beta1.UpdateAdminProposal) +- [x/wasm/internal/types/types.proto](#x/wasm/internal/types/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) + + - [AccessType](#cosmwasm.wasm.v1beta1.AccessType) + - [ContractCodeHistoryOperationType](#cosmwasm.wasm.v1beta1.ContractCodeHistoryOperationType) + - [x/wasm/internal/types/query.proto](#x/wasm/internal/types/query.proto) - [CodeInfoResponse](#cosmwasm.wasm.v1beta1.CodeInfoResponse) - [ContractInfoWithAddress](#cosmwasm.wasm.v1beta1.ContractInfoWithAddress) @@ -55,19 +68,6 @@ - [Msg](#cosmwasm.wasm.v1beta1.Msg) -- [x/wasm/internal/types/types.proto](#x/wasm/internal/types/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) - - - [AccessType](#cosmwasm.wasm.v1beta1.AccessType) - - [ContractCodeHistoryOperationType](#cosmwasm.wasm.v1beta1.ContractCodeHistoryOperationType) - - [Scalar Value Types](#scalar-value-types) @@ -289,6 +289,186 @@ UpdateAdminProposal gov proposal content type to set an admin for a contract. + +
+ +## x/wasm/internal/types/types.proto + + + + + +### AbsoluteTxPosition +AbsoluteTxPosition is a unique transaction position that allows for global ordering of transactions. + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| block_height | [uint64](#uint64) | | BlockHeight is the block the contract was created at | +| tx_index | [uint64](#uint64) | | TxIndex is a monotonic counter within the block (actual transaction index, or gas consumed) | + + + + + + + + +### AccessConfig +AccessConfig access control type. + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| permission | [AccessType](#cosmwasm.wasm.v1beta1.AccessType) | | | +| address | [string](#string) | | | + + + + + + + + +### AccessTypeParam +AccessTypeParam + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| value | [AccessType](#cosmwasm.wasm.v1beta1.AccessType) | | | + + + + + + + + +### CodeInfo +CodeInfo is data for the uploaded contract WASM code + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| code_hash | [bytes](#bytes) | | CodeHash is the unique CodeID | +| 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 | + + + + + + + + +### ContractCodeHistoryEntry +ContractCodeHistoryEntry metadata to a contract. + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| operation | [ContractCodeHistoryOperationType](#cosmwasm.wasm.v1beta1.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. | +| msg | [bytes](#bytes) | | | + + + + + + + + +### ContractInfo +ContractInfo stores a WASM contract instance + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| code_id | [uint64](#uint64) | | CodeID is the reference to the stored Wasm code | +| 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 | + + + + + + + + +### Model +Model is a struct that holds a KV pair + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| key | [bytes](#bytes) | | hex-encode key to read it better (this is often ascii) | +| value | [bytes](#bytes) | | base64-encode raw value | + + + + + + + + +### Params +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) | | | +| max_wasm_code_size | [uint64](#uint64) | | | + + + + + + + + + + +### AccessType +AccessType permission types + +| Name | Number | Description | +| ---- | ------ | ----------- | +| ACCESS_TYPE_UNSPECIFIED | 0 | AccessTypeUnspecified placeholder for empty value | +| ACCESS_TYPE_NOBODY | 1 | AccessTypeNobody forbidden | +| ACCESS_TYPE_ONLY_ADDRESS | 2 | AccessTypeOnlyAddress restricted to an address | +| ACCESS_TYPE_EVERYBODY | 3 | AccessTypeEverybody unrestricted | + + + + + +### ContractCodeHistoryOperationType +ContractCodeHistoryOperationType actions that caused a code change + +| Name | Number | Description | +| ---- | ------ | ----------- | +| CONTRACT_CODE_HISTORY_OPERATION_TYPE_UNSPECIFIED | 0 | ContractCodeHistoryOperationTypeUnspecified placeholder for empty value | +| CONTRACT_CODE_HISTORY_OPERATION_TYPE_INIT | 1 | ContractCodeHistoryOperationTypeInit on chain contract instantiation | +| CONTRACT_CODE_HISTORY_OPERATION_TYPE_MIGRATE | 2 | ContractCodeHistoryOperationTypeMigrate code migration | +| CONTRACT_CODE_HISTORY_OPERATION_TYPE_GENESIS | 3 | ContractCodeHistoryOperationTypeGenesis based on genesis data | + + + + + + + + + + @@ -702,7 +882,7 @@ MsgInstantiateContractResponse return instantiation result data | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| address | [string](#string) | | Address is the address of the new contract instance. | +| address | [string](#string) | | Address is the bech32 address of the new contract instance. | @@ -769,7 +949,7 @@ MsgStoreCodeResponse returns store result data. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| code_id | [string](#string) | | CodeID is the reference to the stored WASM code | +| code_id | [uint64](#uint64) | | CodeID is the reference to the stored WASM code | @@ -827,186 +1007,6 @@ Msg defines the wasm Msg service. - - - -## x/wasm/internal/types/types.proto - - - - - -### AbsoluteTxPosition -AbsoluteTxPosition is a unique transaction position that allows for global ordering of transactions. - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| block_height | [uint64](#uint64) | | BlockHeight is the block the contract was created at | -| tx_index | [uint64](#uint64) | | TxIndex is a monotonic counter within the block (actual transaction index, or gas consumed) | - - - - - - - - -### AccessConfig -AccessConfig access control type. - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| permission | [AccessType](#cosmwasm.wasm.v1beta1.AccessType) | | | -| address | [string](#string) | | | - - - - - - - - -### AccessTypeParam -AccessTypeParam - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| value | [AccessType](#cosmwasm.wasm.v1beta1.AccessType) | | | - - - - - - - - -### CodeInfo -CodeInfo is data for the uploaded contract WASM code - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| code_hash | [bytes](#bytes) | | CodeHash is the unique CodeID | -| 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 | - - - - - - - - -### ContractCodeHistoryEntry -ContractCodeHistoryEntry metadata to a contract. - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| operation | [ContractCodeHistoryOperationType](#cosmwasm.wasm.v1beta1.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. | -| msg | [bytes](#bytes) | | | - - - - - - - - -### ContractInfo -ContractInfo stores a WASM contract instance - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| code_id | [uint64](#uint64) | | CodeID is the reference to the stored Wasm code | -| 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 | - - - - - - - - -### Model -Model is a struct that holds a KV pair - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| key | [bytes](#bytes) | | hex-encode key to read it better (this is often ascii) | -| value | [bytes](#bytes) | | base64-encode raw value | - - - - - - - - -### Params -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) | | | -| max_wasm_code_size | [uint64](#uint64) | | | - - - - - - - - - - -### AccessType -AccessType permission types - -| Name | Number | Description | -| ---- | ------ | ----------- | -| ACCESS_TYPE_UNSPECIFIED | 0 | AccessTypeUnspecified placeholder for empty value | -| ACCESS_TYPE_NOBODY | 1 | AccessTypeNobody forbidden | -| ACCESS_TYPE_ONLY_ADDRESS | 2 | AccessTypeOnlyAddress restricted to an address | -| ACCESS_TYPE_EVERYBODY | 3 | AccessTypeEverybody unrestricted | - - - - - -### ContractCodeHistoryOperationType -ContractCodeHistoryOperationType actions that caused a code change - -| Name | Number | Description | -| ---- | ------ | ----------- | -| CONTRACT_CODE_HISTORY_OPERATION_TYPE_UNSPECIFIED | 0 | ContractCodeHistoryOperationTypeUnspecified placeholder for empty value | -| CONTRACT_CODE_HISTORY_OPERATION_TYPE_INIT | 1 | ContractCodeHistoryOperationTypeInit on chain contract instantiation | -| CONTRACT_CODE_HISTORY_OPERATION_TYPE_MIGRATE | 2 | ContractCodeHistoryOperationTypeMigrate code migration | -| CONTRACT_CODE_HISTORY_OPERATION_TYPE_GENESIS | 3 | ContractCodeHistoryOperationTypeGenesis based on genesis data | - - - - - - - - - - ## Scalar Value Types | .proto Type | Notes | C++ | Java | Python | Go | C# | PHP | Ruby | diff --git a/x/wasm/common_test.go b/x/wasm/common_test.go index e7519e4cd9..2b2d499ff8 100644 --- a/x/wasm/common_test.go +++ b/x/wasm/common_test.go @@ -3,16 +3,14 @@ package wasm import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "strconv" "testing" ) // ensure store code returns the expected response -func assertStoreCodeResponse(t *testing.T, data []byte, expected int64) { +func assertStoreCodeResponse(t *testing.T, data []byte, expected uint64) { var pStoreResp MsgStoreCodeResponse require.NoError(t, pStoreResp.Unmarshal(data)) - // TODO: change this when it we store int natively - require.Equal(t, pStoreResp.CodeID, strconv.FormatInt(expected, 10)) + require.Equal(t, pStoreResp.CodeID, expected) } // ensure execution returns the expected data diff --git a/x/wasm/internal/keeper/msg_server.go b/x/wasm/internal/keeper/msg_server.go index 8c33cf6f34..2bf2000319 100644 --- a/x/wasm/internal/keeper/msg_server.go +++ b/x/wasm/internal/keeper/msg_server.go @@ -37,7 +37,7 @@ func (m msgServer) StoreCode(goCtx context.Context, msg *types.MsgStoreCode) (*t )) return &types.MsgStoreCodeResponse{ - CodeID: fmt.Sprintf("%d", codeID), + CodeID: codeID, }, nil } diff --git a/x/wasm/internal/types/tx.pb.go b/x/wasm/internal/types/tx.pb.go index 2a9eea1893..7a85f52d71 100644 --- a/x/wasm/internal/types/tx.pb.go +++ b/x/wasm/internal/types/tx.pb.go @@ -81,7 +81,7 @@ var xxx_messageInfo_MsgStoreCode proto.InternalMessageInfo // MsgStoreCodeResponse returns store result data. type MsgStoreCodeResponse struct { // CodeID is the reference to the stored WASM code - CodeID string `protobuf:"bytes,1,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"` + CodeID uint64 `protobuf:"varint,1,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"` } func (m *MsgStoreCodeResponse) Reset() { *m = MsgStoreCodeResponse{} } @@ -168,7 +168,7 @@ var xxx_messageInfo_MsgInstantiateContract proto.InternalMessageInfo // MsgInstantiateContractResponse return instantiation result data type MsgInstantiateContractResponse struct { - // Address is the address of the new contract instance. + // Address is the bech32 address of the new contract instance. Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } @@ -550,57 +550,57 @@ func init() { proto.RegisterFile("x/wasm/internal/types/tx.proto", fileDescripto var fileDescriptor_5129e02f2349864e = []byte{ // 818 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xeb, 0x44, - 0x14, 0x8e, 0x6f, 0xfe, 0x9a, 0x93, 0x70, 0x41, 0xa6, 0x2d, 0xc6, 0x20, 0x27, 0xf8, 0x82, 0x14, - 0x04, 0xb5, 0xdb, 0x22, 0x40, 0x02, 0xb1, 0x68, 0x02, 0x48, 0x5d, 0x18, 0x21, 0x5f, 0xa1, 0x2b, - 0x55, 0x42, 0x61, 0x62, 0x4f, 0xcd, 0x94, 0x78, 0x26, 0xf2, 0x4c, 0x48, 0x2a, 0xde, 0x80, 0x15, - 0x4f, 0xc1, 0x02, 0xf1, 0x20, 0x5d, 0x76, 0xc9, 0x2a, 0x40, 0xca, 0x92, 0x27, 0x60, 0x85, 0xc6, - 0x76, 0x5c, 0x37, 0xc4, 0x91, 0x11, 0x62, 0x63, 0xcf, 0x19, 0x7f, 0xe7, 0xfb, 0x7c, 0x3e, 0x9d, - 0x33, 0x1a, 0x30, 0x16, 0xf6, 0x1c, 0xf1, 0xd0, 0x26, 0x54, 0xe0, 0x88, 0xa2, 0x89, 0x2d, 0xae, - 0xa7, 0x98, 0xdb, 0x62, 0x61, 0x4d, 0x23, 0x26, 0x98, 0x7a, 0xe0, 0x31, 0x1e, 0x4a, 0x84, 0x15, - 0x3f, 0xbe, 0x3d, 0x19, 0x63, 0x81, 0x4e, 0x74, 0x43, 0x6e, 0x33, 0x6e, 0x8f, 0x11, 0xc7, 0x76, - 0xba, 0x69, 0x7b, 0x8c, 0xd0, 0x24, 0x4d, 0xdf, 0x0f, 0x58, 0xc0, 0xe2, 0xa5, 0x2d, 0x57, 0xe9, - 0xee, 0x6b, 0x05, 0x62, 0xf2, 0x99, 0x40, 0xcc, 0x3f, 0x15, 0xe8, 0x38, 0x3c, 0x78, 0x2a, 0x58, - 0x84, 0x87, 0xcc, 0xc7, 0xea, 0x21, 0x34, 0x38, 0xa6, 0x3e, 0x8e, 0x34, 0xa5, 0xa7, 0xf4, 0x5b, - 0x6e, 0x1a, 0xa9, 0xef, 0xc1, 0x63, 0xc9, 0x35, 0x1a, 0x5f, 0x0b, 0x3c, 0xf2, 0x98, 0x8f, 0xb5, - 0x47, 0x3d, 0xa5, 0xdf, 0x19, 0xbc, 0xb0, 0x5a, 0x76, 0x3b, 0xcf, 0xce, 0x9e, 0x3a, 0x83, 0x6b, - 0x11, 0x33, 0xb8, 0x1d, 0x89, 0x5b, 0x47, 0x31, 0x1f, 0x9b, 0x45, 0x1e, 0xd6, 0xaa, 0x29, 0x5f, - 0x1c, 0xa9, 0x1a, 0x34, 0xc7, 0x33, 0x32, 0x91, 0x42, 0xb5, 0xf8, 0xc3, 0x3a, 0x54, 0x2f, 0xe0, - 0x90, 0x50, 0x2e, 0x10, 0x15, 0x04, 0x09, 0x3c, 0x9a, 0xe2, 0x28, 0x24, 0x9c, 0x13, 0x46, 0xb5, - 0x7a, 0x4f, 0xe9, 0xb7, 0x4f, 0x9f, 0x58, 0x5b, 0x3d, 0xb2, 0xce, 0x3c, 0x0f, 0x73, 0x3e, 0x64, - 0xf4, 0x92, 0x04, 0xee, 0x41, 0x8e, 0xe2, 0xf3, 0x8c, 0xc1, 0xfc, 0x10, 0xf6, 0xf3, 0xd5, 0xba, - 0x98, 0x4f, 0x19, 0xe5, 0x58, 0x7d, 0x02, 0x4d, 0x59, 0xd3, 0x88, 0xf8, 0x49, 0xd9, 0x03, 0x58, - 0x2d, 0xbb, 0x0d, 0x09, 0x39, 0xff, 0xd8, 0x6d, 0xc8, 0x4f, 0xe7, 0xbe, 0xf9, 0xe3, 0x23, 0x38, - 0x74, 0x78, 0x70, 0x7e, 0xcf, 0x3c, 0x64, 0x54, 0x44, 0xc8, 0x13, 0x85, 0xae, 0xed, 0x43, 0x1d, - 0xf9, 0x21, 0xa1, 0xb1, 0x59, 0x2d, 0x37, 0x09, 0xf2, 0x6a, 0xd2, 0x94, 0xda, 0x36, 0x35, 0x99, - 0x3a, 0x41, 0x63, 0x3c, 0x49, 0xed, 0x49, 0x02, 0xf5, 0x7d, 0xd8, 0x23, 0x94, 0x88, 0x51, 0xc8, - 0x83, 0xd8, 0x8e, 0xce, 0xe0, 0xd5, 0xbf, 0x96, 0x5d, 0x0d, 0x53, 0x8f, 0xf9, 0x84, 0x06, 0xf6, - 0x15, 0x67, 0xd4, 0x72, 0xd1, 0xdc, 0xc1, 0x9c, 0xa3, 0x00, 0xbb, 0x4d, 0x89, 0x76, 0x78, 0xa0, - 0x5e, 0x01, 0xc4, 0x89, 0x97, 0x33, 0xea, 0x73, 0xad, 0xd1, 0xab, 0xf6, 0xdb, 0xa7, 0x2f, 0x5b, - 0x49, 0x5b, 0x59, 0xb2, 0xad, 0x32, 0x1f, 0x87, 0x8c, 0xd0, 0xc1, 0xf1, 0xcd, 0xb2, 0x5b, 0xf9, - 0xe9, 0xd7, 0x6e, 0x3f, 0x20, 0xe2, 0xeb, 0xd9, 0xd8, 0xf2, 0x58, 0x68, 0xa7, 0x3d, 0x98, 0xbc, - 0x8e, 0xb8, 0xff, 0x4d, 0xda, 0x49, 0x32, 0x81, 0xbb, 0x2d, 0x49, 0xff, 0xa9, 0x64, 0x37, 0x3f, - 0x00, 0x63, 0xbb, 0x4f, 0x99, 0xdf, 0x1a, 0x34, 0x91, 0xef, 0x47, 0x98, 0xf3, 0xd4, 0xb0, 0x75, - 0x68, 0xfe, 0xa1, 0x80, 0xea, 0xf0, 0xe0, 0x93, 0x05, 0xf6, 0x66, 0x25, 0x0c, 0xd6, 0x61, 0xcf, - 0x4b, 0x31, 0xa9, 0xc7, 0x59, 0xac, 0x5a, 0x50, 0x95, 0x36, 0x55, 0x4b, 0xd8, 0x24, 0x81, 0xd2, - 0x22, 0x8e, 0xe9, 0xda, 0xa2, 0xfa, 0xff, 0x60, 0x91, 0xa4, 0x4f, 0x2c, 0x3a, 0x06, 0xfd, 0x9f, - 0x55, 0x66, 0xf6, 0xa8, 0x50, 0xf3, 0x91, 0x40, 0x71, 0xad, 0x1d, 0x37, 0x5e, 0x9b, 0x3f, 0x27, - 0xc6, 0x38, 0x24, 0x88, 0xd0, 0x7f, 0x34, 0xa6, 0x54, 0xff, 0x7d, 0x04, 0xed, 0x30, 0xd1, 0x8a, - 0x9b, 0xad, 0x56, 0xc2, 0x45, 0x48, 0x13, 0x1c, 0x1e, 0xa4, 0x05, 0x6e, 0xfc, 0xed, 0xce, 0x02, - 0x11, 0x3c, 0x76, 0x78, 0xf0, 0xc5, 0xd4, 0x47, 0x02, 0x9f, 0xc5, 0x73, 0x52, 0x54, 0xdb, 0x2b, - 0xd0, 0xa2, 0x78, 0x3e, 0xca, 0x4f, 0xd6, 0x1e, 0xc5, 0xf3, 0x24, 0x29, 0x5f, 0x78, 0xf5, 0x61, - 0xe1, 0xa6, 0x16, 0x0f, 0x70, 0x4e, 0x62, 0xfd, 0x43, 0xe6, 0x10, 0x9e, 0x73, 0x78, 0x30, 0x9c, - 0x60, 0x14, 0xed, 0xd6, 0xde, 0x45, 0xff, 0x12, 0x1c, 0x3c, 0x20, 0x59, 0xb3, 0x9f, 0x7e, 0x5f, - 0x87, 0xaa, 0x1c, 0xc2, 0x2f, 0xa1, 0x75, 0x7f, 0xd2, 0x16, 0x9d, 0x63, 0xf9, 0x03, 0x4a, 0x7f, - 0xab, 0x04, 0x28, 0x73, 0xf5, 0x3b, 0x78, 0x71, 0xdb, 0xe1, 0x74, 0x54, 0xcc, 0xb1, 0x05, 0xae, - 0xbf, 0xfb, 0xaf, 0xe0, 0x99, 0x38, 0x83, 0xe7, 0x37, 0x87, 0xf6, 0xcd, 0x62, 0xa6, 0x0d, 0xa8, - 0x7e, 0x52, 0x1a, 0x9a, 0x17, 0xdc, 0x1c, 0x86, 0x1d, 0x82, 0x1b, 0xd0, 0x5d, 0x82, 0x45, 0x4d, - 0xeb, 0x41, 0x3b, 0xdf, 0x9d, 0x6f, 0x14, 0x33, 0xe4, 0x60, 0xfa, 0x51, 0x29, 0x58, 0x26, 0xf2, - 0x15, 0x40, 0xae, 0x0b, 0x5f, 0x2f, 0x4e, 0xbe, 0x47, 0xe9, 0x6f, 0x97, 0x41, 0xad, 0x15, 0x06, - 0x9f, 0xdd, 0xfc, 0x6e, 0x54, 0x6e, 0x56, 0x86, 0x72, 0xbb, 0x32, 0x94, 0xdf, 0x56, 0x86, 0xf2, - 0xc3, 0x9d, 0x51, 0xb9, 0xbd, 0x33, 0x2a, 0xbf, 0xdc, 0x19, 0x95, 0x8b, 0xe3, 0xdc, 0x69, 0x36, - 0x64, 0x3c, 0x7c, 0x26, 0x2f, 0x10, 0x92, 0xd5, 0xb7, 0x17, 0xe9, 0xfb, 0xe1, 0x75, 0x62, 0xdc, - 0x88, 0x6f, 0x12, 0xef, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x01, 0xf3, 0xf7, 0xcc, 0xdb, 0x08, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x41, 0x6f, 0xe3, 0x44, + 0x14, 0x8e, 0x37, 0x6d, 0xd2, 0xbc, 0x84, 0x05, 0x99, 0xb6, 0x18, 0x83, 0x9c, 0xe0, 0x05, 0x29, + 0x08, 0x6a, 0xb7, 0x45, 0x80, 0x04, 0xe2, 0xd0, 0x04, 0x90, 0x7a, 0x30, 0x42, 0x5e, 0xa1, 0x95, + 0x56, 0x42, 0x61, 0x62, 0xcf, 0x9a, 0x59, 0xe2, 0x99, 0xc8, 0x33, 0x21, 0xa9, 0xf8, 0x07, 0x9c, + 0xf8, 0x15, 0x1c, 0x10, 0x3f, 0xa4, 0xc7, 0x3d, 0x72, 0x0a, 0x90, 0x72, 0xe4, 0x17, 0x70, 0x42, + 0x33, 0x76, 0x5c, 0x37, 0xc4, 0x91, 0x11, 0xe2, 0x62, 0xcf, 0x1b, 0x7f, 0xef, 0xfb, 0xfc, 0x3e, + 0xbd, 0x37, 0x1a, 0xb0, 0x16, 0xee, 0x1c, 0xf1, 0xd8, 0x25, 0x54, 0xe0, 0x84, 0xa2, 0x89, 0x2b, + 0xae, 0xa6, 0x98, 0xbb, 0x62, 0xe1, 0x4c, 0x13, 0x26, 0x98, 0x7e, 0x14, 0x30, 0x1e, 0x4b, 0x84, + 0xa3, 0x1e, 0xdf, 0x9e, 0x8d, 0xb1, 0x40, 0x67, 0xa6, 0x25, 0xb7, 0x19, 0x77, 0xc7, 0x88, 0x63, + 0x37, 0xdb, 0x74, 0x03, 0x46, 0x68, 0x9a, 0x66, 0x1e, 0x46, 0x2c, 0x62, 0x6a, 0xe9, 0xca, 0x55, + 0xb6, 0xfb, 0x5a, 0x89, 0x98, 0x7c, 0xa6, 0x10, 0xfb, 0x4f, 0x0d, 0x3a, 0x1e, 0x8f, 0x1e, 0x0a, + 0x96, 0xe0, 0x21, 0x0b, 0xb1, 0x7e, 0x0c, 0x0d, 0x8e, 0x69, 0x88, 0x13, 0x43, 0xeb, 0x69, 0xfd, + 0x96, 0x9f, 0x45, 0xfa, 0x7b, 0x70, 0x5f, 0x72, 0x8d, 0xc6, 0x57, 0x02, 0x8f, 0x02, 0x16, 0x62, + 0xe3, 0x5e, 0x4f, 0xeb, 0x77, 0x06, 0x2f, 0xac, 0x96, 0xdd, 0xce, 0xa3, 0x8b, 0x87, 0xde, 0xe0, + 0x4a, 0x28, 0x06, 0xbf, 0x23, 0x71, 0xeb, 0x48, 0xf1, 0xb1, 0x59, 0x12, 0x60, 0xa3, 0x9e, 0xf1, + 0xa9, 0x48, 0x37, 0xa0, 0x39, 0x9e, 0x91, 0x89, 0x14, 0xda, 0x53, 0x1f, 0xd6, 0xa1, 0xfe, 0x18, + 0x8e, 0x09, 0xe5, 0x02, 0x51, 0x41, 0x90, 0xc0, 0xa3, 0x29, 0x4e, 0x62, 0xc2, 0x39, 0x61, 0xd4, + 0xd8, 0xef, 0x69, 0xfd, 0xf6, 0xf9, 0x03, 0x67, 0xab, 0x47, 0xce, 0x45, 0x10, 0x60, 0xce, 0x87, + 0x8c, 0x3e, 0x21, 0x91, 0x7f, 0x54, 0xa0, 0xf8, 0x3c, 0x67, 0xb0, 0x3f, 0x84, 0xc3, 0x62, 0xb5, + 0x3e, 0xe6, 0x53, 0x46, 0x39, 0xd6, 0x1f, 0x40, 0x53, 0xd6, 0x34, 0x22, 0xa1, 0x2a, 0x7b, 0x6f, + 0x00, 0xab, 0x65, 0xb7, 0x21, 0x21, 0x97, 0x1f, 0xfb, 0x0d, 0xf9, 0xe9, 0x32, 0xb4, 0x7f, 0xbc, + 0x07, 0xc7, 0x1e, 0x8f, 0x2e, 0x6f, 0x99, 0x87, 0x8c, 0x8a, 0x04, 0x05, 0xa2, 0xd4, 0xb5, 0x43, + 0xd8, 0x47, 0x61, 0x4c, 0xa8, 0x32, 0xab, 0xe5, 0xa7, 0x41, 0x51, 0xad, 0x5e, 0xa6, 0x26, 0x53, + 0x27, 0x68, 0x8c, 0x27, 0x99, 0x3d, 0x69, 0xa0, 0xbf, 0x0f, 0x07, 0x84, 0x12, 0x31, 0x8a, 0x79, + 0xa4, 0xec, 0xe8, 0x0c, 0x5e, 0xfd, 0x6b, 0xd9, 0x35, 0x30, 0x0d, 0x58, 0x48, 0x68, 0xe4, 0x3e, + 0xe5, 0x8c, 0x3a, 0x3e, 0x9a, 0x7b, 0x98, 0x73, 0x14, 0x61, 0xbf, 0x29, 0xd1, 0x1e, 0x8f, 0xf4, + 0xa7, 0x00, 0x2a, 0xf1, 0xc9, 0x8c, 0x86, 0xdc, 0x68, 0xf4, 0xea, 0xfd, 0xf6, 0xf9, 0xcb, 0x4e, + 0xda, 0x56, 0x8e, 0x6c, 0xab, 0xdc, 0xc7, 0x21, 0x23, 0x74, 0x70, 0x7a, 0xbd, 0xec, 0xd6, 0x7e, + 0xfa, 0xb5, 0xdb, 0x8f, 0x88, 0xf8, 0x7a, 0x36, 0x76, 0x02, 0x16, 0xbb, 0x59, 0x0f, 0xa6, 0xaf, + 0x13, 0x1e, 0x7e, 0x93, 0x75, 0x92, 0x4c, 0xe0, 0x7e, 0x4b, 0xd2, 0x7f, 0x2a, 0xd9, 0xed, 0x0f, + 0xc0, 0xda, 0xee, 0x53, 0xee, 0xb7, 0x01, 0x4d, 0x14, 0x86, 0x09, 0xe6, 0x3c, 0x33, 0x6c, 0x1d, + 0xda, 0x7f, 0x68, 0xa0, 0x7b, 0x3c, 0xfa, 0x64, 0x81, 0x83, 0x59, 0x05, 0x83, 0x4d, 0x38, 0x08, + 0x32, 0x4c, 0xe6, 0x71, 0x1e, 0xeb, 0x0e, 0xd4, 0xa5, 0x4d, 0xf5, 0x0a, 0x36, 0x49, 0xa0, 0xb4, + 0x88, 0x63, 0xba, 0xb6, 0x68, 0xff, 0x7f, 0xb0, 0x48, 0xd2, 0xa7, 0x16, 0x9d, 0x82, 0xf9, 0xcf, + 0x2a, 0x73, 0x7b, 0x74, 0xd8, 0x0b, 0x91, 0x40, 0xaa, 0xd6, 0x8e, 0xaf, 0xd6, 0xf6, 0xcf, 0xa9, + 0x31, 0x1e, 0x89, 0x12, 0xf4, 0x1f, 0x8d, 0xa9, 0xd4, 0x7f, 0x1f, 0x41, 0x3b, 0x4e, 0xb5, 0x54, + 0xb3, 0xed, 0x55, 0x70, 0x11, 0xb2, 0x04, 0x8f, 0x47, 0x59, 0x81, 0x1b, 0x7f, 0xbb, 0xb3, 0x40, + 0x04, 0xf7, 0x3d, 0x1e, 0x7d, 0x31, 0x0d, 0x91, 0xc0, 0x17, 0x6a, 0x4e, 0xca, 0x6a, 0x7b, 0x05, + 0x5a, 0x14, 0xcf, 0x47, 0xc5, 0xc9, 0x3a, 0xa0, 0x78, 0x9e, 0x26, 0x15, 0x0b, 0xaf, 0xdf, 0x2d, + 0xdc, 0x36, 0xd4, 0x00, 0x17, 0x24, 0xd6, 0x3f, 0x64, 0x0f, 0xe1, 0x39, 0x8f, 0x47, 0xc3, 0x09, + 0x46, 0xc9, 0x6e, 0xed, 0x5d, 0xf4, 0x2f, 0xc1, 0xd1, 0x1d, 0x92, 0x35, 0xfb, 0xf9, 0xf7, 0xfb, + 0x50, 0x97, 0x43, 0xf8, 0x25, 0xb4, 0x6e, 0x4f, 0xda, 0xb2, 0x73, 0xac, 0x78, 0x40, 0x99, 0x6f, + 0x55, 0x00, 0xe5, 0xae, 0x7e, 0x07, 0x2f, 0x6e, 0x3b, 0x9c, 0x4e, 0xca, 0x39, 0xb6, 0xc0, 0xcd, + 0x77, 0xff, 0x15, 0x3c, 0x17, 0x67, 0xf0, 0xfc, 0xe6, 0xd0, 0xbe, 0x59, 0xce, 0xb4, 0x01, 0x35, + 0xcf, 0x2a, 0x43, 0x8b, 0x82, 0x9b, 0xc3, 0xb0, 0x43, 0x70, 0x03, 0xba, 0x4b, 0xb0, 0xac, 0x69, + 0x03, 0x68, 0x17, 0xbb, 0xf3, 0x8d, 0x72, 0x86, 0x02, 0xcc, 0x3c, 0xa9, 0x04, 0xcb, 0x45, 0xbe, + 0x02, 0x28, 0x74, 0xe1, 0xeb, 0xe5, 0xc9, 0xb7, 0x28, 0xf3, 0xed, 0x2a, 0xa8, 0xb5, 0xc2, 0xe0, + 0xb3, 0xeb, 0xdf, 0xad, 0xda, 0xf5, 0xca, 0xd2, 0x9e, 0xad, 0x2c, 0xed, 0xb7, 0x95, 0xa5, 0xfd, + 0x70, 0x63, 0xd5, 0x9e, 0xdd, 0x58, 0xb5, 0x5f, 0x6e, 0xac, 0xda, 0xe3, 0xd3, 0xc2, 0x69, 0x36, + 0x64, 0x3c, 0x7e, 0x24, 0x2f, 0x10, 0x92, 0x35, 0x74, 0x17, 0xd9, 0xfb, 0xee, 0x75, 0x62, 0xdc, + 0x50, 0x37, 0x89, 0x77, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xda, 0x83, 0x14, 0xdb, 0x08, 0x00, 0x00, } @@ -959,12 +959,10 @@ func (m *MsgStoreCodeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.CodeID) > 0 { - i -= len(m.CodeID) - copy(dAtA[i:], m.CodeID) - i = encodeVarintTx(dAtA, i, uint64(len(m.CodeID))) + if m.CodeID != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.CodeID)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -1409,9 +1407,8 @@ func (m *MsgStoreCodeResponse) Size() (n int) { } var l int _ = l - l = len(m.CodeID) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) + if m.CodeID != 0 { + n += 1 + sovTx(uint64(m.CodeID)) } return n } @@ -1851,10 +1848,10 @@ func (m *MsgStoreCodeResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { + if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field CodeID", wireType) } - var stringLen uint64 + m.CodeID = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -1864,24 +1861,11 @@ func (m *MsgStoreCodeResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.CodeID |= uint64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CodeID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) diff --git a/x/wasm/internal/types/tx.proto b/x/wasm/internal/types/tx.proto index dbfc544892..8ead7cde1e 100644 --- a/x/wasm/internal/types/tx.proto +++ b/x/wasm/internal/types/tx.proto @@ -41,7 +41,7 @@ message MsgStoreCode { // MsgStoreCodeResponse returns store result data. message MsgStoreCodeResponse{ // CodeID is the reference to the stored WASM code - string code_id = 1 [(gogoproto.customname) = "CodeID"]; + uint64 code_id = 1 [(gogoproto.customname) = "CodeID"]; } // MsgInstantiateContract create a new smart contract instance for the given code id.