From 7ea8cd788d753cdcaab73e7794050a71e5e93d33 Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Wed, 4 Aug 2021 11:14:18 +0200 Subject: [PATCH] Add organisation to grpc gateway path --- CHANGELOG.md | 2 +- contrib/local/03-grpc-queries.sh | 10 +-- docs/proto/proto-docs.md | 12 +-- proto/cosmwasm/wasm/v1/query.proto | 13 +-- x/wasm/types/query.pb.go | 137 ++++++++++++++--------------- x/wasm/types/query.pb.gw.go | 12 +-- 6 files changed, 93 insertions(+), 93 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 311fc2818f..942b013fec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## [Unreleased](https://github.com/CosmWasm/wasmd/tree/HEAD) **Api Breaking:** - +- Add organisation to grpc gateway path [\#578](https://github.com/CosmWasm/wasmd/pull/578) - Move Proto version from `v1beta1` to `v1` for all cosmwasm.wasm.* types [\#563](https://github.com/CosmWasm/wasmd/pull/563) - Renamed InitMsg and MigrateMsg fields to Msg. This applies to protobuf Msg diff --git a/contrib/local/03-grpc-queries.sh b/contrib/local/03-grpc-queries.sh index bca10cb05d..0ca625426a 100755 --- a/contrib/local/03-grpc-queries.sh +++ b/contrib/local/03-grpc-queries.sh @@ -6,26 +6,26 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" echo "-----------------------" PROTO_THRD="$DIR/../../third_party/proto" PROTO_WASMD="$DIR/../../proto" -PROTO_WASMD_QUERY="$PROTO_WASMD/cosmwasm/wasm/v1beta1/query.proto" +PROTO_WASMD_QUERY="$PROTO_WASMD/cosmwasm/wasm/v1/query.proto" echo "### List all codes" RESP=$(grpcurl -plaintext -import-path $PROTO_THRD -import-path $PROTO_WASMD -proto $PROTO_WASMD_QUERY \ - localhost:9090 cosmwasm.wasm.v1beta1.Query/Codes) + localhost:9090 cosmwasm.wasm.v1.Query/Codes) echo "$RESP" | jq CODE_ID=$(echo "$RESP" | jq -r '.codeInfos[-1].codeId') echo "### List contracts by code" RESP=$(grpcurl -plaintext -import-path $PROTO_THRD -import-path $PROTO_WASMD -proto $PROTO_WASMD_QUERY \ - -d "{\"codeId\": $CODE_ID}" localhost:9090 cosmwasm.wasm.v1beta1.Query/ContractsByCode ) + -d "{\"codeId\": $CODE_ID}" localhost:9090 cosmwasm.wasm.v1.Query/ContractsByCode ) echo $RESP | jq echo "### Show history for contract" CONTRACT=$(echo $RESP | jq -r ".contracts[-1]") grpcurl -plaintext -import-path $PROTO_THRD -import-path $PROTO_WASMD -proto $PROTO_WASMD_QUERY \ - -d "{\"address\": \"$CONTRACT\"}" localhost:9090 cosmwasm.wasm.v1beta1.Query/ContractHistory | jq + -d "{\"address\": \"$CONTRACT\"}" localhost:9090 cosmwasm.wasm.v1.Query/ContractHistory | jq echo "### Show contract state" grpcurl -plaintext -import-path $PROTO_THRD -import-path $PROTO_WASMD -proto $PROTO_WASMD_QUERY \ - -d "{\"address\": \"$CONTRACT\"}" localhost:9090 cosmwasm.wasm.v1beta1.Query/AllContractState | jq + -d "{\"address\": \"$CONTRACT\"}" localhost:9090 cosmwasm.wasm.v1.Query/AllContractState | jq echo "Empty state due to 'burner' contract cleanup" diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index 2212a16fc3..af033e0c97 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -1081,14 +1081,14 @@ Query provides defines the gRPC querier service | Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | | ----------- | ------------ | ------------- | ------------| ------- | -------- | -| `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| +| `ContractInfo` | [QueryContractInfoRequest](#cosmwasm.wasm.v1.QueryContractInfoRequest) | [QueryContractInfoResponse](#cosmwasm.wasm.v1.QueryContractInfoResponse) | ContractInfo gets the contract meta data | GET|/cosmwasm/wasm/v1/contract/{address}| +| `ContractHistory` | [QueryContractHistoryRequest](#cosmwasm.wasm.v1.QueryContractHistoryRequest) | [QueryContractHistoryResponse](#cosmwasm.wasm.v1.QueryContractHistoryResponse) | ContractHistory gets the contract code history | GET|/cosmwasm/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|/cosmwasm/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|/cosmwasm/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| +| `Code` | [QueryCodeRequest](#cosmwasm.wasm.v1.QueryCodeRequest) | [QueryCodeResponse](#cosmwasm.wasm.v1.QueryCodeResponse) | Code gets the binary code and metadata for a singe wasm code | GET|/cosmwasm/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|/cosmwasm/wasm/v1/code| diff --git a/proto/cosmwasm/wasm/v1/query.proto b/proto/cosmwasm/wasm/v1/query.proto index cc5ac2036f..4a992abb66 100644 --- a/proto/cosmwasm/wasm/v1/query.proto +++ b/proto/cosmwasm/wasm/v1/query.proto @@ -15,22 +15,23 @@ service Query { // ContractInfo gets the contract meta data rpc ContractInfo(QueryContractInfoRequest) returns (QueryContractInfoResponse) { - option (google.api.http).get = "/wasm/v1/contract/{address}"; + option (google.api.http).get = "/cosmwasm/wasm/v1/contract/{address}"; } // ContractHistory gets the contract code history rpc ContractHistory(QueryContractHistoryRequest) returns (QueryContractHistoryResponse) { - option (google.api.http).get = "/wasm/v1/contract/{address}/history"; + option (google.api.http).get = + "/cosmwasm/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/v1/code/{code_id}/contracts"; + option (google.api.http).get = "/cosmwasm/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/v1/contract/{address}/state"; + option (google.api.http).get = "/cosmwasm/wasm/v1/contract/{address}/state"; } // RawContractState gets single key from the raw store data of a contract rpc RawContractState(QueryRawContractStateRequest) @@ -46,11 +47,11 @@ service Query { } // Code gets the binary code and metadata for a singe wasm code rpc Code(QueryCodeRequest) returns (QueryCodeResponse) { - option (google.api.http).get = "/wasm/v1/code/{code_id}"; + option (google.api.http).get = "/cosmwasm/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/v1/code"; + option (google.api.http).get = "/cosmwasm/wasm/v1/code"; } } diff --git a/x/wasm/types/query.pb.go b/x/wasm/types/query.pb.go index 547771c45d..aa2793c2db 100644 --- a/x/wasm/types/query.pb.go +++ b/x/wasm/types/query.pb.go @@ -745,75 +745,74 @@ func init() { func init() { proto.RegisterFile("cosmwasm/wasm/v1/query.proto", fileDescriptor_9677c207036b9f2b) } var fileDescriptor_9677c207036b9f2b = []byte{ - // 1073 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0x4d, 0x6f, 0x1b, 0x45, - 0x18, 0xc7, 0x3d, 0xa9, 0xe3, 0xd8, 0xd3, 0x54, 0x35, 0x23, 0x50, 0x5c, 0xd7, 0xd9, 0x2d, 0x1b, - 0x28, 0x69, 0x03, 0xbb, 0x71, 0x1a, 0x10, 0xe2, 0x86, 0x53, 0x68, 0x12, 0xa9, 0x12, 0xdd, 0x08, - 0x55, 0xc0, 0x21, 0x1a, 0x7b, 0xa7, 0xf6, 0x22, 0x7b, 0xc7, 0xdd, 0x99, 0x24, 0xb5, 0xa2, 0x00, - 0xaa, 0xc4, 0x0d, 0x21, 0x24, 0x8e, 0x88, 0x97, 0x13, 0x82, 0x23, 0xf0, 0x05, 0x38, 0xe6, 0x18, - 0x89, 0x0b, 0x27, 0x0b, 0x1c, 0x0e, 0x28, 0x1f, 0xa1, 0x27, 0x34, 0xb3, 0xb3, 0xf6, 0xfa, 0x65, - 0xed, 0x14, 0x59, 0xbd, 0x58, 0xbb, 0x9e, 0xe7, 0x99, 0xf9, 0x3d, 0xff, 0x7d, 0x5e, 0x76, 0x61, - 0xa1, 0x42, 0x59, 0xe3, 0x00, 0xb3, 0x86, 0x25, 0x7f, 0xf6, 0x8b, 0xd6, 0xc3, 0x3d, 0xe2, 0xb7, - 0xcc, 0xa6, 0x4f, 0x39, 0x45, 0xd9, 0x70, 0xd5, 0x94, 0x3f, 0xfb, 0xc5, 0xfc, 0xf3, 0x55, 0x5a, - 0xa5, 0x72, 0xd1, 0x12, 0x57, 0x81, 0x5d, 0x7e, 0x78, 0x17, 0xde, 0x6a, 0x12, 0x16, 0xae, 0x56, - 0x29, 0xad, 0xd6, 0x89, 0x85, 0x9b, 0xae, 0x85, 0x3d, 0x8f, 0x72, 0xcc, 0x5d, 0xea, 0x85, 0xab, - 0x37, 0x85, 0x2f, 0x65, 0x56, 0x19, 0x33, 0x12, 0x1c, 0x6e, 0xed, 0x17, 0xcb, 0x84, 0xe3, 0xa2, - 0xd5, 0xc4, 0x55, 0xd7, 0x93, 0xc6, 0x81, 0xad, 0xb1, 0x0e, 0x73, 0xf7, 0x84, 0xc5, 0x06, 0xf5, - 0xb8, 0x8f, 0x2b, 0x7c, 0xcb, 0x7b, 0x40, 0x6d, 0xf2, 0x70, 0x8f, 0x30, 0x8e, 0x72, 0x70, 0x0e, - 0x3b, 0x8e, 0x4f, 0x18, 0xcb, 0x81, 0x6b, 0x60, 0x39, 0x63, 0x87, 0xb7, 0xc6, 0x97, 0x00, 0x5e, - 0x19, 0xe1, 0xc6, 0x9a, 0xd4, 0x63, 0x24, 0xde, 0x0f, 0xdd, 0x83, 0x97, 0x2a, 0xca, 0x63, 0xd7, - 0xf5, 0x1e, 0xd0, 0xdc, 0xcc, 0x35, 0xb0, 0x7c, 0x71, 0x4d, 0x33, 0x07, 0x55, 0x31, 0xa3, 0x1b, - 0x97, 0xe6, 0x8f, 0xdb, 0x7a, 0xe2, 0xa4, 0xad, 0x83, 0xb3, 0xb6, 0x9e, 0xb0, 0xe7, 0x2b, 0x91, - 0xb5, 0xb7, 0x92, 0xff, 0xfe, 0xa0, 0x03, 0xe3, 0x53, 0x78, 0xb5, 0x8f, 0x67, 0xd3, 0x65, 0x9c, - 0xfa, 0xad, 0x89, 0x91, 0xa0, 0x77, 0x21, 0xec, 0x69, 0xa2, 0x70, 0xae, 0x9b, 0x81, 0x80, 0xa6, - 0x10, 0xd0, 0x0c, 0x9e, 0x9e, 0x12, 0xd0, 0x7c, 0x0f, 0x57, 0x89, 0xda, 0xd5, 0x8e, 0x78, 0x1a, - 0xbf, 0x01, 0x58, 0x18, 0x4d, 0xa0, 0x44, 0xd9, 0x86, 0x73, 0xc4, 0xe3, 0xbe, 0x4b, 0x04, 0xc2, - 0x85, 0xe5, 0x8b, 0x6b, 0x37, 0xe3, 0x83, 0xde, 0xa0, 0x0e, 0x51, 0xfe, 0xef, 0x78, 0xdc, 0x6f, - 0x95, 0x92, 0x42, 0x00, 0x3b, 0xdc, 0x00, 0xdd, 0x19, 0x01, 0xfd, 0xca, 0x44, 0xe8, 0x00, 0xa4, - 0x8f, 0xfa, 0x93, 0x01, 0xd9, 0x58, 0xa9, 0x25, 0xce, 0x0e, 0x65, 0x5b, 0x80, 0x73, 0x15, 0xea, - 0x90, 0x5d, 0xd7, 0x91, 0xb2, 0x25, 0xed, 0x94, 0xb8, 0xdd, 0x72, 0xa6, 0xa6, 0xda, 0xe7, 0x83, - 0xaa, 0x75, 0x01, 0x94, 0x6a, 0x05, 0x98, 0x09, 0x9f, 0x76, 0xa0, 0x5b, 0xc6, 0xee, 0xfd, 0x31, - 0x3d, 0x1d, 0x3e, 0x0b, 0x39, 0xde, 0xae, 0xd7, 0x43, 0x94, 0x1d, 0x8e, 0x39, 0x79, 0x76, 0x09, - 0xf4, 0x3d, 0x80, 0x8b, 0x31, 0x08, 0x4a, 0x8b, 0xd7, 0x61, 0xaa, 0x41, 0x1d, 0x52, 0x0f, 0x13, - 0x68, 0x61, 0x38, 0x81, 0xee, 0x8a, 0x75, 0x95, 0x2d, 0xca, 0x78, 0x7a, 0x22, 0xdd, 0x57, 0x1a, - 0xd9, 0xf8, 0xe0, 0x29, 0x35, 0x5a, 0x84, 0x50, 0x9e, 0xb1, 0xeb, 0x60, 0x8e, 0x25, 0xc2, 0xbc, - 0x9d, 0x91, 0xff, 0xdc, 0xc6, 0x1c, 0x1b, 0xb7, 0x54, 0xe4, 0xc3, 0x1b, 0xab, 0xc8, 0x11, 0x4c, - 0x4a, 0x4f, 0x20, 0x3d, 0xe5, 0xb5, 0xf1, 0x01, 0xd4, 0xa4, 0xd3, 0x4e, 0x03, 0xfb, 0x7c, 0xba, - 0x3c, 0x3b, 0x50, 0x8f, 0xdd, 0x5a, 0x11, 0xad, 0x46, 0x89, 0x4a, 0x85, 0x27, 0x6d, 0x3d, 0x47, - 0xbc, 0x0a, 0x75, 0x5c, 0xaf, 0x6a, 0x7d, 0xcc, 0xa8, 0x67, 0xda, 0xf8, 0xe0, 0x2e, 0x61, 0x4c, - 0x68, 0x19, 0xf0, 0xae, 0xc0, 0xac, 0xca, 0xf4, 0xc9, 0xf5, 0x65, 0xfc, 0x0e, 0x60, 0x56, 0x18, - 0xf6, 0xb5, 0xd5, 0x1b, 0x03, 0xd6, 0xa5, 0x6c, 0xa7, 0xad, 0xa7, 0xa4, 0xd9, 0xed, 0xb3, 0xb6, - 0x3e, 0xe3, 0x3a, 0xdd, 0xfa, 0xcc, 0xc1, 0xb9, 0x8a, 0x4f, 0x30, 0xa7, 0xbe, 0x8c, 0x2e, 0x63, - 0x87, 0xb7, 0xe8, 0x7d, 0x98, 0x11, 0x38, 0xbb, 0x35, 0xcc, 0x6a, 0xb9, 0x0b, 0x92, 0xfe, 0xcd, - 0x27, 0x6d, 0x7d, 0xbd, 0xea, 0xf2, 0xda, 0x5e, 0xd9, 0xac, 0xd0, 0x86, 0xc5, 0x89, 0xe7, 0x10, - 0xbf, 0xe1, 0x7a, 0x3c, 0x7a, 0x59, 0x77, 0xcb, 0xcc, 0x2a, 0xb7, 0x38, 0x61, 0xe6, 0x26, 0x79, - 0x54, 0x12, 0x17, 0x76, 0x5a, 0x6c, 0xb5, 0x89, 0x59, 0x2d, 0xe8, 0xc2, 0xdb, 0xc9, 0x74, 0x32, - 0x3b, 0xbb, 0x9d, 0x4c, 0xcf, 0x66, 0x53, 0xc6, 0x63, 0x00, 0x9f, 0x8b, 0x04, 0xac, 0x62, 0xd8, - 0x12, 0xf5, 0x2c, 0x62, 0x10, 0xcd, 0x1f, 0xc8, 0x5c, 0x34, 0x46, 0xf5, 0xc1, 0xfe, 0xd0, 0x4b, - 0xe9, 0x6e, 0xf3, 0x4f, 0x57, 0xd4, 0x1a, 0x2a, 0xa8, 0x47, 0x20, 0x1f, 0x5f, 0x29, 0x7d, 0xd6, - 0xd6, 0xe5, 0x7d, 0x20, 0xb7, 0x1a, 0x0b, 0x1f, 0x45, 0x18, 0x58, 0xa8, 0x7a, 0x7f, 0xc5, 0x82, - 0xff, 0x5d, 0xb1, 0x3f, 0x02, 0x88, 0xa2, 0xbb, 0xab, 0x10, 0xef, 0x40, 0xd8, 0x0d, 0x31, 0x2c, - 0xd5, 0xf3, 0xc4, 0x18, 0x54, 0x6d, 0x26, 0x8c, 0x6f, 0x7a, 0x85, 0xbb, 0xf6, 0x6b, 0x06, 0xce, - 0x4a, 0x50, 0xf4, 0x05, 0x80, 0xf3, 0xd1, 0xc9, 0x8a, 0x46, 0x0c, 0xa1, 0xb8, 0xd7, 0x81, 0xfc, - 0xca, 0xb9, 0x6c, 0x83, 0xf3, 0x8d, 0xa5, 0xc7, 0x7f, 0xfc, 0xf3, 0xf5, 0xcc, 0x22, 0xba, 0xda, - 0x7d, 0x7f, 0x09, 0xdb, 0xb6, 0x75, 0xa8, 0xca, 0xf0, 0x08, 0x7d, 0x0b, 0xe0, 0xe5, 0x81, 0x79, - 0x89, 0x5e, 0x9b, 0x70, 0x4a, 0xff, 0x64, 0xcf, 0x9b, 0xe7, 0x35, 0x57, 0x5c, 0x2b, 0x92, 0xeb, - 0x65, 0xb4, 0x34, 0x86, 0xcb, 0xaa, 0x29, 0x96, 0x6f, 0x22, 0x7c, 0x6a, 0x32, 0x4d, 0xe4, 0xeb, - 0x1f, 0xa1, 0x13, 0xf9, 0x06, 0x06, 0x9e, 0x71, 0x43, 0xf2, 0x2d, 0xa1, 0x17, 0x23, 0x7c, 0x0e, - 0xb1, 0x0e, 0x55, 0xe5, 0x1f, 0x59, 0xbd, 0xe9, 0xf7, 0x1d, 0x80, 0xd9, 0xc1, 0x61, 0x81, 0xe2, - 0xce, 0x8b, 0x19, 0x6c, 0x79, 0xeb, 0xdc, 0xf6, 0x63, 0x00, 0x87, 0x04, 0x64, 0x92, 0xe5, 0x67, - 0x00, 0xb3, 0x83, 0x3d, 0x3d, 0x16, 0x30, 0x66, 0xaa, 0xc4, 0x02, 0xc6, 0x0d, 0x0b, 0x63, 0x5d, - 0x02, 0x9a, 0xe8, 0xd5, 0x71, 0x80, 0x3e, 0x3e, 0xb0, 0x0e, 0x7b, 0x33, 0xe0, 0x08, 0xfd, 0x02, - 0x20, 0x1a, 0xee, 0xf7, 0x68, 0x35, 0xe6, 0xf4, 0xd8, 0xa9, 0x93, 0x2f, 0x3e, 0x85, 0x87, 0x22, - 0x7e, 0x43, 0x12, 0xaf, 0x22, 0x73, 0xac, 0xa4, 0xc2, 0xbf, 0x9f, 0xb9, 0x09, 0x93, 0x32, 0x25, - 0x8d, 0xd8, 0x1c, 0xeb, 0xe5, 0xe1, 0xd2, 0x58, 0x1b, 0x05, 0xa2, 0x4b, 0x90, 0x2b, 0x68, 0x21, - 0x26, 0xf9, 0x90, 0x0b, 0x67, 0x65, 0xb3, 0x43, 0xe3, 0xb6, 0x0b, 0x1b, 0x6d, 0xfe, 0xa5, 0xf1, - 0x46, 0xea, 0xd0, 0x17, 0xe4, 0xa1, 0x97, 0xd1, 0xa5, 0xbe, 0x43, 0x4b, 0x9b, 0xc7, 0x7f, 0x6b, - 0x89, 0x9f, 0x3a, 0x5a, 0xe2, 0xb8, 0xa3, 0x81, 0x93, 0x8e, 0x06, 0xfe, 0xea, 0x68, 0xe0, 0xab, - 0x53, 0x2d, 0x71, 0x72, 0xaa, 0x25, 0xfe, 0x3c, 0xd5, 0x12, 0x1f, 0x5e, 0x8f, 0xcc, 0xac, 0x0d, - 0xca, 0x1a, 0xf7, 0xc3, 0xaf, 0x25, 0xc7, 0x7a, 0x14, 0xec, 0x25, 0x3f, 0x99, 0xca, 0x29, 0xf9, - 0xa5, 0x73, 0xeb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0xa9, 0xb5, 0x5b, 0x99, 0x0d, 0x00, - 0x00, + // 1069 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0x4f, 0x6f, 0x1b, 0xc5, + 0x1b, 0xc7, 0x3d, 0xa9, 0xe3, 0xd8, 0xd3, 0xfc, 0xf4, 0x33, 0x23, 0x44, 0x8d, 0x71, 0x77, 0xa3, + 0xa5, 0x0a, 0x21, 0x0d, 0x3b, 0x71, 0x1a, 0x10, 0xe2, 0x86, 0x53, 0x68, 0x12, 0xa9, 0x12, 0xdd, + 0x08, 0x55, 0xc0, 0x21, 0x1a, 0xef, 0x4e, 0xed, 0x45, 0xf6, 0x8e, 0xbb, 0x33, 0x49, 0x6a, 0x45, + 0x01, 0x54, 0x89, 0x2b, 0x42, 0x42, 0x9c, 0xe1, 0x80, 0x0a, 0x1c, 0x11, 0x6f, 0x80, 0x63, 0x8e, + 0x91, 0xb8, 0x70, 0xb2, 0xc0, 0xe1, 0x50, 0xe5, 0x25, 0xf4, 0x84, 0x76, 0x76, 0x36, 0x5e, 0xff, + 0x59, 0xdb, 0x45, 0x16, 0x17, 0x6b, 0xd7, 0xf3, 0x3c, 0xcf, 0x7c, 0x9e, 0xef, 0x3c, 0xf3, 0x3c, + 0x36, 0x2c, 0xd9, 0x8c, 0x37, 0x8f, 0x08, 0x6f, 0x62, 0xf9, 0x71, 0x58, 0xc6, 0x0f, 0x0f, 0xa8, + 0xdf, 0x36, 0x5b, 0x3e, 0x13, 0x0c, 0xe5, 0xa3, 0x55, 0x53, 0x7e, 0x1c, 0x96, 0x8b, 0x2f, 0xd6, + 0x58, 0x8d, 0xc9, 0x45, 0x1c, 0x3c, 0x85, 0x76, 0xc5, 0xe1, 0x28, 0xa2, 0xdd, 0xa2, 0x3c, 0x5a, + 0xad, 0x31, 0x56, 0x6b, 0x50, 0x4c, 0x5a, 0x2e, 0x26, 0x9e, 0xc7, 0x04, 0x11, 0x2e, 0xf3, 0xa2, + 0xd5, 0xd5, 0xc0, 0x97, 0x71, 0x5c, 0x25, 0x9c, 0x86, 0x9b, 0xe3, 0xc3, 0x72, 0x95, 0x0a, 0x52, + 0xc6, 0x2d, 0x52, 0x73, 0x3d, 0x69, 0x1c, 0xda, 0x1a, 0x9b, 0xb0, 0x70, 0x2f, 0xb0, 0xd8, 0x62, + 0x9e, 0xf0, 0x89, 0x2d, 0x76, 0xbc, 0x07, 0xcc, 0xa2, 0x0f, 0x0f, 0x28, 0x17, 0xa8, 0x00, 0x17, + 0x88, 0xe3, 0xf8, 0x94, 0xf3, 0x02, 0x58, 0x02, 0x2b, 0x39, 0x2b, 0x7a, 0x35, 0xbe, 0x02, 0xf0, + 0xe5, 0x11, 0x6e, 0xbc, 0xc5, 0x3c, 0x4e, 0x93, 0xfd, 0xd0, 0x3d, 0xf8, 0x3f, 0x5b, 0x79, 0xec, + 0xbb, 0xde, 0x03, 0x56, 0x98, 0x5b, 0x02, 0x2b, 0x57, 0x37, 0x34, 0x73, 0x50, 0x15, 0x33, 0x1e, + 0xb8, 0xb2, 0x78, 0xda, 0xd1, 0x53, 0x67, 0x1d, 0x1d, 0x5c, 0x74, 0xf4, 0x94, 0xb5, 0x68, 0xc7, + 0xd6, 0xde, 0x49, 0x3f, 0xfd, 0x5e, 0x07, 0xc6, 0xe7, 0xf0, 0x95, 0x3e, 0x9e, 0x6d, 0x97, 0x0b, + 0xe6, 0xb7, 0x27, 0x66, 0x82, 0xde, 0x87, 0xb0, 0xa7, 0x89, 0xc2, 0x59, 0x36, 0x43, 0x01, 0xcd, + 0x40, 0x40, 0x33, 0x3c, 0x3d, 0x25, 0xa0, 0xf9, 0x01, 0xa9, 0x51, 0x15, 0xd5, 0x8a, 0x79, 0x1a, + 0xbf, 0x02, 0x58, 0x1a, 0x4d, 0xa0, 0x44, 0xd9, 0x85, 0x0b, 0xd4, 0x13, 0xbe, 0x4b, 0x03, 0x84, + 0x2b, 0x2b, 0x57, 0x37, 0x56, 0x93, 0x93, 0xde, 0x62, 0x0e, 0x55, 0xfe, 0xef, 0x79, 0xc2, 0x6f, + 0x57, 0xd2, 0x81, 0x00, 0x56, 0x14, 0x00, 0xdd, 0x19, 0x01, 0xfd, 0xda, 0x44, 0xe8, 0x10, 0xa4, + 0x8f, 0xfa, 0xb3, 0x01, 0xd9, 0x78, 0xa5, 0x1d, 0xec, 0x1d, 0xc9, 0x76, 0x0d, 0x2e, 0xd8, 0xcc, + 0xa1, 0xfb, 0xae, 0x23, 0x65, 0x4b, 0x5b, 0x99, 0xe0, 0x75, 0xc7, 0x99, 0x99, 0x6a, 0x5f, 0x0e, + 0xaa, 0x76, 0x09, 0xa0, 0x54, 0x2b, 0xc1, 0x5c, 0x74, 0xda, 0xa1, 0x6e, 0x39, 0xab, 0xf7, 0xc5, + 0xec, 0x74, 0xf8, 0x22, 0xe2, 0x78, 0xb7, 0xd1, 0x88, 0x50, 0xf6, 0x04, 0x11, 0xf4, 0xbf, 0x2b, + 0xa0, 0xef, 0x00, 0xbc, 0x9e, 0x80, 0xa0, 0xb4, 0x78, 0x13, 0x66, 0x9a, 0xcc, 0xa1, 0x8d, 0xa8, + 0x80, 0xae, 0x0d, 0x17, 0xd0, 0xdd, 0x60, 0x5d, 0x55, 0x8b, 0x32, 0x9e, 0x9d, 0x48, 0xf7, 0x95, + 0x46, 0x16, 0x39, 0x7a, 0x4e, 0x8d, 0xae, 0x43, 0x28, 0xf7, 0xd8, 0x77, 0x88, 0x20, 0x12, 0x61, + 0xd1, 0xca, 0xc9, 0x6f, 0x6e, 0x13, 0x41, 0x8c, 0x5b, 0x2a, 0xf3, 0xe1, 0xc0, 0x2a, 0x73, 0x04, + 0xd3, 0xd2, 0x13, 0x48, 0x4f, 0xf9, 0x6c, 0x7c, 0x04, 0x35, 0xe9, 0xb4, 0xd7, 0x24, 0xbe, 0x98, + 0x2d, 0xcf, 0x1e, 0xd4, 0x13, 0x43, 0x2b, 0xa2, 0xf5, 0x38, 0x51, 0xa5, 0xf4, 0xac, 0xa3, 0x17, + 0xa8, 0x67, 0x33, 0xc7, 0xf5, 0x6a, 0xf8, 0x53, 0xce, 0x3c, 0xd3, 0x22, 0x47, 0x77, 0x29, 0xe7, + 0x81, 0x96, 0x21, 0xef, 0x4d, 0x98, 0x57, 0x95, 0x3e, 0xf9, 0x7e, 0x19, 0xbf, 0x01, 0x98, 0x0f, + 0x0c, 0xfb, 0xda, 0xea, 0xeb, 0x03, 0xd6, 0x95, 0x7c, 0xb7, 0xa3, 0x67, 0xa4, 0xd9, 0xed, 0x8b, + 0x8e, 0x3e, 0xe7, 0x3a, 0x97, 0xf7, 0xb3, 0x00, 0x17, 0x6c, 0x9f, 0x12, 0xc1, 0x7c, 0x99, 0x5d, + 0xce, 0x8a, 0x5e, 0xd1, 0x87, 0x30, 0x17, 0xe0, 0xec, 0xd7, 0x09, 0xaf, 0x17, 0xae, 0x48, 0xfa, + 0xb7, 0x9f, 0x75, 0xf4, 0xcd, 0x9a, 0x2b, 0xea, 0x07, 0x55, 0xd3, 0x66, 0x4d, 0x2c, 0xa8, 0xe7, + 0x50, 0xbf, 0xe9, 0x7a, 0x22, 0xfe, 0xd8, 0x70, 0xab, 0x1c, 0x57, 0xdb, 0x82, 0x72, 0x73, 0x9b, + 0x3e, 0xaa, 0x04, 0x0f, 0x56, 0x36, 0x08, 0xb5, 0x4d, 0x78, 0x3d, 0xec, 0xc2, 0xbb, 0xe9, 0x6c, + 0x3a, 0x3f, 0xbf, 0x9b, 0xce, 0xce, 0xe7, 0x33, 0xc6, 0x63, 0x00, 0x5f, 0x88, 0x25, 0xac, 0x72, + 0xd8, 0x09, 0xee, 0x73, 0x90, 0x43, 0xd0, 0xfc, 0x81, 0xac, 0x45, 0x63, 0x54, 0x1f, 0xec, 0x4f, + 0xbd, 0x92, 0xbd, 0x6c, 0xfe, 0x59, 0x5b, 0xad, 0xa1, 0x92, 0x3a, 0x02, 0x79, 0x7c, 0x95, 0xec, + 0x45, 0x47, 0x97, 0xef, 0xa1, 0xdc, 0x6a, 0x2c, 0x7c, 0x12, 0x63, 0xe0, 0x91, 0xea, 0xfd, 0x37, + 0x16, 0xfc, 0xeb, 0x1b, 0xfb, 0x04, 0x40, 0x14, 0x8f, 0xae, 0x52, 0xbc, 0x03, 0xe1, 0x65, 0x8a, + 0xd1, 0x55, 0x9d, 0x26, 0xc7, 0xf0, 0xd6, 0xe6, 0xa2, 0xfc, 0x66, 0x77, 0x71, 0x37, 0x9e, 0xe6, + 0xe0, 0xbc, 0x04, 0x45, 0xdf, 0x02, 0xb8, 0x18, 0x9f, 0xac, 0x68, 0xc4, 0x10, 0x4a, 0xfa, 0x39, + 0x50, 0xbc, 0x39, 0x95, 0x6d, 0xb8, 0xbf, 0xb1, 0xf6, 0xf8, 0xf7, 0xbf, 0xbf, 0x99, 0x5b, 0x46, + 0x37, 0xf0, 0xd0, 0x0f, 0x99, 0xa8, 0x7f, 0xe3, 0x63, 0x75, 0x1f, 0x4f, 0xd0, 0x13, 0x00, 0xff, + 0x3f, 0x30, 0x38, 0xd1, 0x1b, 0x13, 0xb6, 0xeb, 0x1f, 0xf1, 0x45, 0x73, 0x5a, 0x73, 0x05, 0xb8, + 0x29, 0x01, 0x4d, 0xb4, 0x36, 0x0d, 0x20, 0xae, 0x2b, 0xa8, 0x1f, 0x62, 0xa0, 0x6a, 0x56, 0x4d, + 0x04, 0xed, 0x1f, 0xaa, 0x13, 0x41, 0x07, 0x46, 0xa0, 0xb1, 0x21, 0x41, 0xd7, 0xd0, 0xea, 0x28, + 0x50, 0x87, 0xe2, 0x63, 0xd5, 0x14, 0x4e, 0x70, 0x6f, 0x30, 0xfe, 0x08, 0x60, 0x7e, 0x70, 0x8e, + 0xa0, 0xa4, 0x8d, 0x13, 0x66, 0x5e, 0x11, 0x4f, 0x6d, 0x3f, 0x0d, 0xe9, 0x90, 0xa4, 0x5c, 0x42, + 0xfd, 0x0c, 0x60, 0x7e, 0xb0, 0xef, 0x27, 0x92, 0x26, 0x4c, 0x9e, 0x44, 0xd2, 0xa4, 0x81, 0x12, + 0x3b, 0xfc, 0x31, 0x80, 0x3e, 0x39, 0xc2, 0xc7, 0xbd, 0x39, 0x71, 0x82, 0x7e, 0x01, 0x10, 0x0d, + 0xcf, 0x04, 0xb4, 0x9e, 0xb0, 0x7b, 0xe2, 0x64, 0x2a, 0x96, 0x9f, 0xc3, 0x43, 0x11, 0xbf, 0x25, + 0x89, 0xd7, 0x91, 0x39, 0x56, 0xd2, 0xc0, 0xbf, 0x9f, 0xb9, 0x0d, 0xd3, 0xb2, 0x48, 0x8d, 0xc4, + 0xaa, 0xeb, 0x55, 0xe6, 0xab, 0x63, 0x6d, 0x14, 0xc8, 0x8a, 0x04, 0x31, 0xd0, 0xd2, 0xa4, 0x72, + 0x44, 0x3e, 0x9c, 0x97, 0x9d, 0x11, 0x8d, 0x8b, 0x1b, 0x75, 0xe5, 0xe2, 0x8d, 0xf1, 0x46, 0x6a, + 0x77, 0x4d, 0xee, 0x5e, 0x40, 0x2f, 0x8d, 0xde, 0xbd, 0xb2, 0x7d, 0xfa, 0x97, 0x96, 0xfa, 0xa9, + 0xab, 0xa5, 0x4e, 0xbb, 0x1a, 0x38, 0xeb, 0x6a, 0xe0, 0xcf, 0xae, 0x06, 0xbe, 0x3e, 0xd7, 0x52, + 0x67, 0xe7, 0x5a, 0xea, 0x8f, 0x73, 0x2d, 0xf5, 0xf1, 0x72, 0x6c, 0xd2, 0x6d, 0x31, 0xde, 0xbc, + 0x1f, 0xc5, 0x70, 0xf0, 0xa3, 0x30, 0x96, 0xfc, 0xa3, 0x55, 0xcd, 0xc8, 0xff, 0x47, 0xb7, 0xfe, + 0x09, 0x00, 0x00, 0xff, 0xff, 0x34, 0x60, 0xbc, 0x68, 0xcf, 0x0d, 0x00, 0x00, } func (this *QueryContractInfoResponse) Equal(that interface{}) bool { diff --git a/x/wasm/types/query.pb.gw.go b/x/wasm/types/query.pb.gw.go index 035657a3a7..d1b047843c 100644 --- a/x/wasm/types/query.pb.gw.go +++ b/x/wasm/types/query.pb.gw.go @@ -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", "v1", "contract", "address"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ContractInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"cosmwasm", "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", "v1", "contract", "address", "history"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ContractHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"cosmwasm", "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", "v1", "code", "code_id", "contracts"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ContractsByCode_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"cosmwasm", "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", "v1", "contract", "address", "state"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AllContractState_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"cosmwasm", "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", "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", "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", "v1", "code", "code_id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Code_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"cosmwasm", "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", "v1", "code"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Codes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cosmwasm", "wasm", "v1", "code"}, "", runtime.AssumeColonVerbOpt(true))) ) var (