From 03dcf24786877422cb6a6cff9921bd973ef33e14 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Mon, 29 Jul 2024 12:57:49 +0200 Subject: [PATCH 01/18] add more descriptive comments about ICQ module interface and types --- proto/neutron/interchainqueries/genesis.proto | 51 +++--- proto/neutron/interchainqueries/params.proto | 15 +- proto/neutron/interchainqueries/query.proto | 65 ++++--- proto/neutron/interchainqueries/tx.proto | 162 +++++++++++------- x/contractmanager/types/sudo.go | 28 ++- x/interchainqueries/README.md | 3 + 6 files changed, 198 insertions(+), 126 deletions(-) create mode 100644 x/interchainqueries/README.md diff --git a/proto/neutron/interchainqueries/genesis.proto b/proto/neutron/interchainqueries/genesis.proto index 41ff37339..b184be106 100644 --- a/proto/neutron/interchainqueries/genesis.proto +++ b/proto/neutron/interchainqueries/genesis.proto @@ -8,57 +8,56 @@ import "neutron/interchainqueries/params.proto"; option go_package = "github.com/neutron-org/neutron/v4/x/interchainqueries/types"; +// Information about an Interchain Query registered in the interchainqueries module. message RegisteredQuery { // The unique id of the registered query. uint64 id = 1; - - // The address that registered the query. + // The address of the contract that registered the query. string owner = 2; - - // The query type identifier: `kv` or `tx` now + // The query type identifier: `kv` or `tx`. string query_type = 3; - - // The KV-storage keys for which we want to get values from remote chain + // The KV-storage keys for which to get values from the remote chain. Only applicable for the + // KV-typed Interchain Queries. repeated KVKey keys = 4; - - // The filter for transaction search ICQ + // A stringified list of filters for remote transactions search. Only applicable for the TX-typed + // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". string transactions_filter = 5; - - // The IBC connection ID for getting ConsensusState to verify proofs + // The IBC connection ID to the remote chain (the source of querying data). Is used for getting + // ConsensusState from the respective IBC client to verify query result proofs. string connection_id = 6; - - // Parameter that defines how often the query must be updated. + // Parameter that defines the minimal delay between consecutive query executions (i.e. the + // minimal delay between query results update). uint64 update_period = 7; - - // The local chain last block height when the query result was updated. + // The local chain block height of the last query results update. uint64 last_submitted_result_local_height = 8; - - // The remote chain last block height when the query result was updated. + // The remote chain block height that corresponds to the last query result update. ibc.core.client.v1.Height last_submitted_result_remote_height = 9; - - // Amount of coins deposited for the query. + // Amount of coins paid for the Interchain Query registration. The deposit is paid back to the + // remover. The remover can be either the query owner (during the submit timeout) or anybody. repeated cosmos.base.v1beta1.Coin deposit = 10 [ (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.nullable) = false ]; - - // Timeout before query becomes available for everybody to remove. + // Duration in blocks that is required to pass since the query registration/update for the + // query to become available for anybody to be removed. uint64 submit_timeout = 11; - - // The local chain height when the query was registered. + // The local chain block height of the Interchain Query registration. uint64 registered_at_height = 12; } +// A path to an IAVL storage node. message KVKey { - // Path (storage prefix) to the storage where you want to read value by key - // (usually name of cosmos-sdk module: 'staking', 'bank', etc.) + // The first half of the storage path. It is supposed to be a substore name for the query + // (e.g. bank, staking, etc.). string path = 1; - // Key you want to read from the storage + // The second half of the storage path. The remaining part of a full path to an IAVL storage node. bytes key = 2; } -// GenesisState defines the interchainqueries module's genesis state. +// The interchainqueries module's genesis state model. message GenesisState { + // The parameters of the module. Params params = 1 [(gogoproto.nullable) = false]; + // A list of registered Interchain Queries. repeated RegisteredQuery registered_queries = 2; } diff --git a/proto/neutron/interchainqueries/params.proto b/proto/neutron/interchainqueries/params.proto index 0dca4a206..2e8f26430 100644 --- a/proto/neutron/interchainqueries/params.proto +++ b/proto/neutron/interchainqueries/params.proto @@ -6,21 +6,18 @@ import "gogoproto/gogo.proto"; option go_package = "github.com/neutron-org/neutron/v4/x/interchainqueries/types"; -// Params defines the parameters for the module. +// The parameters for the module. message Params { option (gogoproto.goproto_stringer) = false; - // Defines amount of blocks required before query becomes available for - // removal by anybody + // The amount of blocks required to pass since an Interchain Query registration/update for the + // query to become available for removal by anybody. uint64 query_submit_timeout = 1; - - // Amount of coins deposited for the query. + // Amount of coins required to be provided as deposit on Interchain Query registration. repeated cosmos.base.v1beta1.Coin query_deposit = 2 [ (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.nullable) = false ]; - - // Amount of tx hashes to be removed during a single EndBlock. Can vary to - // balance between network cleaning speed and EndBlock duration. A zero value - // means no limit. + // Amount of tx hashes to be removed during a single EndBlock. Can vary to balance between + // network cleaning speed and EndBlock duration. A zero value means no limit. uint64 tx_query_removal_limit = 3; } diff --git a/proto/neutron/interchainqueries/query.proto b/proto/neutron/interchainqueries/query.proto index 0a802d5d7..85836719a 100644 --- a/proto/neutron/interchainqueries/query.proto +++ b/proto/neutron/interchainqueries/query.proto @@ -10,78 +10,99 @@ import "neutron/interchainqueries/tx.proto"; option go_package = "github.com/neutron-org/neutron/v4/x/interchainqueries/types"; -// Query defines the gRPC querier service. +// Defines the Query interface of the module. service Query { - // Parameters queries the parameters of the module. + // Queries the current parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { option (google.api.http).get = "/neutron/interchainqueries/params"; } - + // Queries all the registered Interchain Queries in the module with filtration by owner and/or + // connection ID. rpc RegisteredQueries(QueryRegisteredQueriesRequest) returns (QueryRegisteredQueriesResponse) { option (google.api.http).get = "/neutron/interchainqueries/registered_queries"; } - + // Queries a registered Interchain Query by ID. rpc RegisteredQuery(QueryRegisteredQueryRequest) returns (QueryRegisteredQueryResponse) { option (google.api.http).get = "/neutron/interchainqueries/registered_query"; } - - rpc QueryResult(QueryRegisteredQueryResultRequest) returns (QueryRegisteredQueryResultResponse) { + // Queries the last successfully submitted result of an Interchain Query. + rpc QueryResult(QueryQueryResultRequest) returns (QueryQueryResultResponse) { option (google.api.http).get = "/neutron/interchainqueries/query_result"; } - - rpc LastRemoteHeight(QueryLastRemoteHeight) returns (QueryLastRemoteHeightResponse) { + // Queries the last height of a remote chain known to the IBC client behind a given connection ID. + rpc LastRemoteHeight(QueryLastRemoteHeightRequest) returns (QueryLastRemoteHeightResponse) { option (google.api.http).get = "/neutron/interchainqueries/remote_height"; } } -// QueryParamsRequest is request type for the Query/Params RPC method. +// Request type for the Query/Params RPC method. message QueryParamsRequest {} -// QueryParamsResponse is response type for the Query/Params RPC method. +// Response type for the Query/Params RPC method. message QueryParamsResponse { - // params holds all the parameters of this module. + // Stores all parameters of the module. Params params = 1 [(gogoproto.nullable) = false]; } +// Request type for the Query/RegisteredQueries RPC method. message QueryRegisteredQueriesRequest { + // A list of owners of Interchain Queries. Query response will contain only Interchain Queries + // that are owned by one of the owners in the list. If none, Interchain Queries are not filtered + // out by the owner field. repeated string owners = 1; + // IBC connection ID. Query response will contain only Interchain Queries that have the same IBC + // connection ID parameter. If none, Interchain Queries are not filtered out by the connection ID + // field. string connection_id = 2; + // Pagination parameters for the request. Use values from previous response in the next request + // in consecutive requests with paginated responses. cosmos.base.query.v1beta1.PageRequest pagination = 3; } +// Response type for the Query/RegisteredQueries RPC method. message QueryRegisteredQueriesResponse { + // A list of registered Interchain Queries. repeated RegisteredQuery registered_queries = 1 [(gogoproto.nullable) = false]; - - // pagination defines the pagination in the response. + // Current page information. Use values from previous response in the next request in consecutive + // requests with paginated responses. cosmos.base.query.v1beta1.PageResponse pagination = 2; } +// Request type for the Query/RegisteredQuery RPC method. message QueryRegisteredQueryRequest { + // ID of an Interchain Query. uint64 query_id = 1; } +// Response type for the Query/RegisteredQuery RPC method. message QueryRegisteredQueryResponse { + // A registered Interchain Query. RegisteredQuery registered_query = 1; } -message QueryRegisteredQueryResultRequest { +// Request type for the Query/QueryResult RPC method. +message QueryQueryResultRequest { + // ID of an Interchain Query. uint64 query_id = 1; } -message QueryRegisteredQueryResultResponse { +// Response type for the Query/QueryResult RPC method. +message QueryQueryResultResponse { + // The last successfully submitted result of an Interchain Query. QueryResult result = 1; } -message Transaction { - uint64 id = 1; - uint64 height = 2; - bytes data = 3; -} - -message QueryLastRemoteHeight { +// Request type for the Query/LastRemoteHeight RPC method. +message QueryLastRemoteHeightRequest { + // Connection ID of an IBC connection to a remote chain. Determines the IBC client used in query + // handling. string connection_id = 1; } +// Response type for the Query/LastRemoteHeight RPC method. message QueryLastRemoteHeightResponse { + // The height of the chain that the IBC client is currently on. uint64 height = 1; + // The revision of the chain that the IBC client is currently on. + uint64 revision = 2; } diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index c61432c78..438d31769 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -13,146 +13,184 @@ import "tendermint/crypto/proof.proto"; option go_package = "github.com/neutron-org/neutron/v4/x/interchainqueries/types"; -// Msg defines the Msg service. +// Defines the Msg interface of the module. service Msg { option (cosmos.msg.v1.service) = true; - - rpc RegisterInterchainQuery(MsgRegisterInterchainQuery) returns (MsgRegisterInterchainQueryResponse); - rpc SubmitQueryResult(MsgSubmitQueryResult) returns (MsgSubmitQueryResultResponse); + // Registers a new Interchain Query in the interchainqueries module. This message is supposed to + // be issued only by a smart contract. The caller contract is charged a query registration deposit + // automatically in the amount defined as the module's query deposit parameter. The deposit is + // paid back on the query removal. Make sure to have enough assets on the contract's account + // at the time of the message execution. + // + // Returns an ID assigned to the registered query. Handle this message response via a reply + // handler in order to make use of the ID. + rpc RegisterInterchainQuery(MsgRegisterInterchainQueryRequest) returns (MsgRegisterInterchainQueryResponse); + // Submits a result of an Interchain Query execution to the chain. This message handling may + // include passing of the result to the query's owner smart contract for processing which might + // be a pretty gas-consumable operation. + rpc SubmitQueryResult(MsgSubmitQueryResultRequest) returns (MsgSubmitQueryResultResponse); + // Removes a given Interchain Query from the module. Can be removed only by the owner of the + // query during the query's submit timeout, and by anyone after the query has been timed out. + // The query deposit is returned to the caller on a success call. rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse); + // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse); - rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); + // Updates params of the interchainqueries module. Only callable by the module's authority. + rpc UpdateParams(MsgUpdateParamsRequest) returns (MsgUpdateParamsResponse); } -message MsgRegisterInterchainQuery { +// Request type for the Msg/RegisterInterchainQuery RPC method. +message MsgRegisterInterchainQueryRequest { option (cosmos.msg.v1.signer) = "sender"; - - // defines a query type: `kv` or `tx` now + // The query type identifier: `kv` or `tx`. string query_type = 1; - - // is used to define KV-storage keys for which we want to get values from - // remote chain + // The KV-storage keys for which we want to get values from remote chain. Only applicable for the + // KV-typed Interchain Queries. repeated KVKey keys = 2; - - // is used to define a filter for transaction search ICQ + // A stringified list of filters for remote transactions search. Only applicable for the TX-typed + // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". string transactions_filter = 3; - - // is IBC connection ID for getting ConsensusState to verify proofs + // The IBC connection ID to the remote chain (the source of querying data). Is used for getting + // ConsensusState from the respective IBC client to verify query result proofs. string connection_id = 4; - - // is used to specify how often (in neutron blocks) the query must be updated + // Parameter that defines the minimal delay between consecutive query executions (i.e. the + // minimal delay between query results update). uint64 update_period = 5; - - // is the signer of the message + // The signer of the message. string sender = 6; } +// Response type for the Msg/RegisterInterchainQuery RPC method. message MsgRegisterInterchainQueryResponse { + // The ID assigned to the registered Interchain Query by the module. uint64 id = 1; } -message MsgSubmitQueryResult { +// Request type for the Msg/SubmitQueryResult RPC method. +message MsgSubmitQueryResultRequest { option (cosmos.msg.v1.signer) = "sender"; - + // The ID of the Interchain Query. uint64 query_id = 1; + // The signer of the message. string sender = 2; - - // is the IBC client ID for an IBC connection between Neutron chain and target - // chain (where the result was obtained from) + // The IBC client ID that corresponds to the IBC connection to the remote chain (where the + // query result is coming from). string client_id = 3; + // The result of the Interchain Query execution. QueryResult result = 4; } +// Contains different information about a single Interchain Query execution result. Currently, +// this structure is used both in query result submission via an ICQ Relayer and as a query result +// storage for read/write operations to interchainqueries module, but the structure fields are +// populated in a bit different ways. When submitting a query result, all fields are populated and +// provided to the interchainqueries module in order to verify the result against the IBC client's +// state. But in order to lighten the chain state, the interchainqueries module removes the block +// field and proofs from the kv_results. message QueryResult { + // A list of a KV Interchain Query execution results. Each result contains query parameters, a + // response value and a proof. repeated StorageValue kv_results = 1; + // A TX Interchain Query execution result. Contains metainformation about the blocks of the query + // execution height. Only populated when submitting an Interchain Query result for verification + // and emptied when saving the result on chain. Block block = 2; + // The height of the chain at the moment of the Interchain Query execution. uint64 height = 3; + // The revision number of the chain at the moment of the Interchain Query execution. uint64 revision = 4; + // Whether to send the query result to the owner contract as a sudo message. Only applicable for + // KV type of Interchain Queries. bool allow_kv_callbacks = 5; } +// A verifiable result of performing a single KVKey read. message StorageValue { - // is the substore name (acc, staking, etc.) + // The first half of the storage path. It is supposed to be a substore name for the query + // (e.g. bank, staking, etc.). string storage_prefix = 1; - - // is the key in IAVL store + // The second half of the storage path. The remaining part of a full path to an IAVL storage node. bytes key = 2; - - // is the value in IAVL store + // A base64-encoded value read from the given storage path. bytes value = 3; - - // is the Merkle Proof which proves existence of key-value pair in IAVL - // storage + // The Merkle Proof which proves existence of key-value pair in IAVL storage. Is used to verify + // the pair against the respective remote chain's header. tendermint.crypto.ProofOps Proof = 4; } +// A single verifiable result of an Interchain Query of TX type. message Block { - // We need to know block X+1 to verify response of transaction for block X - // since LastResultsHash is root hash of all results from the txs from the - // previous block + // The header of the block next to the block the transaction is included in. It is needed to know + // block X+1 header to verify response of transaction for block X since LastResultsHash is root + // hash of all results of the txs from the previous block. google.protobuf.Any next_block_header = 1; - - // We need to know block X to verify inclusion of transaction for block X + // The header of the block the transaction is included in. It is needed to know block header to + // verify inclusion of the transaction. google.protobuf.Any header = 2; - + // The transaction matched by the Interchain Query's transaction filter. TxValue tx = 3; } +// Contains transaction body, response, and proofs of inclusion and delivery. message TxValue { + // The result of the transaction execution. tendermint.abci.ExecTxResult response = 1; - - // is the Merkle Proof which proves existence of response in block with height - // next_block_header.Height + // The Merkle Proof which proves existence of response in the block next to the block the + // transaction is included in. tendermint.crypto.Proof delivery_proof = 2; - - // is the Merkle Proof which proves existence of data in block with height - // header.Height + // The Merkle Proof which proves inclusion of the transaction in the block. tendermint.crypto.Proof inclusion_proof = 3; - - // is body of the transaction + // The arbitrary data typed body of the transaction. bytes data = 4; } +// Response type for the Msg/SubmitQueryResult RPC method. message MsgSubmitQueryResultResponse {} +// Request type for the Msg/RemoveInterchainQuery RPC method. message MsgRemoveInterchainQueryRequest { option (cosmos.msg.v1.signer) = "sender"; + // The ID of the query to remove. uint64 query_id = 1; - string sender = 2; // is the signer of the message + // The signer of the message. + string sender = 2; } + +// Response type for the Msg/RemoveInterchainQuery RPC method. message MsgRemoveInterchainQueryResponse {} +// Request type for the Msg/UpdateInterchainQuery RPC method. message MsgUpdateInterchainQueryRequest { option (cosmos.msg.v1.signer) = "sender"; + // The ID of the query to update. uint64 query_id = 1; + // A new list of KV-storage keys for which to get values from the remote chain. Only applicable + // for a KV-typed Interchain Query. repeated KVKey new_keys = 2; + // A new minimal delay between consecutive query executions. uint64 new_update_period = 3; + // A new list of filters for remote transactions search. Only applicable for a TX-typed + // Interchain Query. string new_transactions_filter = 4; - string sender = 5; // is the signer of the message + // The signer of the message. + string sender = 5; } + +// Response type for the Msg/UpdateInterchainQuery RPC method. message MsgUpdateInterchainQueryResponse {} -// MsgUpdateParams is the MsgUpdateParams request type. -// -// Since: 0.47 -message MsgUpdateParams { +// Request type for the Msg/UpdateParams RPC method. +message MsgUpdateParamsRequest { option (amino.name) = "interchainqueries/MsgUpdateParams"; option (cosmos.msg.v1.signer) = "authority"; - - // Authority is the address of the governance account. + // The address of the authority of the module. string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - - // params defines the x/interchainqueries parameters to update. - // - // NOTE: All parameters must be supplied. + // The new parameters of the module. All parameters must be supplied. Params params = 2 [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ]; } -// MsgUpdateParamsResponse defines the response structure for executing a -// MsgUpdateParams message. -// -// Since: 0.47 +// Response type for the Msg/UpdateParams RPC method. message MsgUpdateParamsResponse {} diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index 5cdc86348..dca727692 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -5,20 +5,34 @@ import ( channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ) -// MessageTxQueryResult is passed to a contract's sudo() entrypoint when a tx was submitted -// for a transaction query. +// MessageTxQueryResult is the model of the sudo message sent to a smart contract on a TX-typed +// Interchain Query result submission. The owner of a TX-typed Interchain Query must define a +// `sudo` entry_point for handling `tx_query_result` messages and place the needed logic there. +// The `tx_query_result` handler is treated by the interchainqueries module as a callback that is +// called each time a TX-typed query result is submitted. type MessageTxQueryResult struct { TxQueryResult struct { - QueryID uint64 `json:"query_id"` - Height ibcclienttypes.Height `json:"height"` - Data []byte `json:"data"` + // QueryID is the ID of the TX query which result is being submitted. + QueryID uint64 `json:"query_id"` + // Height is the remote chain's block height the transaction was included in. + Height ibcclienttypes.Height `json:"height"` + // Data is the body of the transaction. + Data []byte `json:"data"` } `json:"tx_query_result"` } -// MessageKVQueryResult is passed to a contract's sudo() entrypoint when a result -// was submitted for a kv-query. +// MessageKVQueryResult is the model of the sudo message sent to a smart contract on a KV-typed +// Interchain Query result submission. If the owner of a KV-typed Interchain Query wants to handle +// the query updates, it must define a `sudo` entry_point for handling `kv_query_result` messages +// and place the needed logic there. The `kv_query_result` handler is treated by the +// interchainqueries module as a callback that is called each time a KV-typed query result is +// submitted. +// +// Note that there is no query result sent, only the query ID. In order to access the actual +// result, use the Query/QueryResult RPC of the interchainqueries module. type MessageKVQueryResult struct { KVQueryResult struct { + // QueryID is the ID of the KV query which result is being submitted. QueryID uint64 `json:"query_id"` } `json:"kv_query_result"` } diff --git a/x/interchainqueries/README.md b/x/interchainqueries/README.md new file mode 100644 index 000000000..4928336a9 --- /dev/null +++ b/x/interchainqueries/README.md @@ -0,0 +1,3 @@ +# `x/interchainqueries` + +Documentation: https://docs.neutron.org/neutron/modules/interchain-queries/overview From 6208f8ff160c5b70d339097c61b5acf2149bfb56 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Wed, 31 Jul 2024 17:56:57 +0200 Subject: [PATCH 02/18] rebuild protos --- proto/neutron/interchainqueries/tx.proto | 6 +- x/contractmanager/types/failure.pb.go | 5 +- x/contractmanager/types/genesis.pb.go | 5 +- x/contractmanager/types/params.pb.go | 5 +- x/contractmanager/types/query.pb.go | 7 +- x/contractmanager/types/tx.pb.go | 7 +- x/contractmanager/types/v1/failure.pb.go | 3 +- x/cron/types/genesis.pb.go | 5 +- x/cron/types/params.pb.go | 5 +- x/cron/types/query.pb.go | 7 +- x/cron/types/schedule.pb.go | 5 +- x/cron/types/tx.pb.go | 7 +- x/dex/types/deposit_record.pb.go | 7 +- x/dex/types/genesis.pb.go | 5 +- x/dex/types/limit_order_expiration.pb.go | 9 +- x/dex/types/limit_order_tranche.pb.go | 14 +- x/dex/types/limit_order_tranche_user.pb.go | 7 +- x/dex/types/pair_id.pb.go | 3 +- x/dex/types/params.pb.go | 5 +- x/dex/types/pool.pb.go | 5 +- x/dex/types/pool_metadata.pb.go | 3 +- x/dex/types/pool_reserves.pb.go | 10 +- x/dex/types/query.pb.go | 14 +- x/dex/types/tick_liquidity.pb.go | 5 +- x/dex/types/trade_pair_id.pb.go | 3 +- x/dex/types/tx.pb.go | 14 +- x/dex/types/v2/params.pb.go | 8 +- x/dynamicfees/types/genesis.pb.go | 5 +- x/dynamicfees/types/params.pb.go | 7 +- x/dynamicfees/types/query.pb.go | 7 +- x/dynamicfees/types/tx.pb.go | 7 +- x/feeburner/types/genesis.pb.go | 5 +- x/feeburner/types/params.pb.go | 5 +- x/feeburner/types/query.pb.go | 7 +- .../types/total_burned_neutrons_amount.pb.go | 7 +- x/feeburner/types/tx.pb.go | 7 +- x/feerefunder/types/fee.pb.go | 7 +- x/feerefunder/types/genesis.pb.go | 5 +- x/feerefunder/types/params.pb.go | 5 +- x/feerefunder/types/query.pb.go | 7 +- x/feerefunder/types/tx.pb.go | 7 +- x/globalfee/types/genesis.pb.go | 5 +- x/globalfee/types/params.pb.go | 7 +- x/globalfee/types/query.pb.go | 7 +- x/globalfee/types/tx.pb.go | 7 +- x/interchainqueries/types/genesis.pb.go | 49 +- x/interchainqueries/types/params.pb.go | 20 +- x/interchainqueries/types/query.pb.go | 600 +++++++----------- x/interchainqueries/types/query.pb.gw.go | 8 +- x/interchainqueries/types/tx.pb.go | 521 ++++++++------- x/interchaintxs/types/genesis.pb.go | 5 +- x/interchaintxs/types/params.pb.go | 7 +- x/interchaintxs/types/query.pb.go | 7 +- x/interchaintxs/types/tx.pb.go | 10 +- x/tokenfactory/types/authorityMetadata.pb.go | 7 +- x/tokenfactory/types/genesis.pb.go | 5 +- x/tokenfactory/types/params.pb.go | 7 +- x/tokenfactory/types/query.pb.go | 7 +- x/tokenfactory/types/tx.pb.go | 7 +- x/tokenfactory/types/v1beta1/params.pb.go | 7 +- x/transfer/types/query.pb.go | 3 +- x/transfer/types/tx.pb.go | 10 +- 62 files changed, 707 insertions(+), 866 deletions(-) diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 438d31769..a41930947 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -29,9 +29,9 @@ service Msg { // include passing of the result to the query's owner smart contract for processing which might // be a pretty gas-consumable operation. rpc SubmitQueryResult(MsgSubmitQueryResultRequest) returns (MsgSubmitQueryResultResponse); - // Removes a given Interchain Query from the module. Can be removed only by the owner of the - // query during the query's submit timeout, and by anyone after the query has been timed out. - // The query deposit is returned to the caller on a success call. + // Removes a given Interchain Query and its results from the module. Can be removed only by the + // owner of the query during the query's submit timeout, and by anyone after the query has been + // timed out. The query deposit is returned to the caller on a success call. rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse); // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse); diff --git a/x/contractmanager/types/failure.pb.go b/x/contractmanager/types/failure.pb.go index 108230c3d..635899d81 100644 --- a/x/contractmanager/types/failure.pb.go +++ b/x/contractmanager/types/failure.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + proto "github.com/cosmos/gogoproto/proto" + _ "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" io "io" math "math" math_bits "math/bits" - - proto "github.com/cosmos/gogoproto/proto" - _ "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index 198452eec..fbf415eda 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/params.pb.go b/x/contractmanager/types/params.pb.go index 2ca0e44c5..a3294bbd0 100644 --- a/x/contractmanager/types/params.pb.go +++ b/x/contractmanager/types/params.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/query.pb.go b/x/contractmanager/types/query.pb.go index 7e3209a8c..b5b0f5543 100644 --- a/x/contractmanager/types/query.pb.go +++ b/x/contractmanager/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -18,6 +14,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/tx.pb.go b/x/contractmanager/types/tx.pb.go index eaad796ed..3a69490ae 100644 --- a/x/contractmanager/types/tx.pb.go +++ b/x/contractmanager/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -19,6 +15,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/v1/failure.pb.go b/x/contractmanager/types/v1/failure.pb.go index af2f28754..597eb369b 100644 --- a/x/contractmanager/types/v1/failure.pb.go +++ b/x/contractmanager/types/v1/failure.pb.go @@ -5,11 +5,10 @@ package v1 import ( fmt "fmt" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/genesis.pb.go b/x/cron/types/genesis.pb.go index 6853c1bb0..2d3546994 100644 --- a/x/cron/types/genesis.pb.go +++ b/x/cron/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/params.pb.go b/x/cron/types/params.pb.go index 5a10eefdc..c71904ce8 100644 --- a/x/cron/types/params.pb.go +++ b/x/cron/types/params.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/query.pb.go b/x/cron/types/query.pb.go index 20f19b2cc..c34c6c3f9 100644 --- a/x/cron/types/query.pb.go +++ b/x/cron/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -18,6 +14,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/schedule.pb.go b/x/cron/types/schedule.pb.go index f9c1893cc..cda29cf72 100644 --- a/x/cron/types/schedule.pb.go +++ b/x/cron/types/schedule.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/tx.pb.go b/x/cron/types/tx.pb.go index 68d972249..217bb879c 100644 --- a/x/cron/types/tx.pb.go +++ b/x/cron/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -19,6 +15,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go index 0941327f6..8d3ca7286 100644 --- a/x/dex/types/deposit_record.pb.go +++ b/x/dex/types/deposit_record.pb.go @@ -4,14 +4,13 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - cosmossdk_io_math "cosmossdk.io/math" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/genesis.pb.go b/x/dex/types/genesis.pb.go index 474636568..167877ac6 100644 --- a/x/dex/types/genesis.pb.go +++ b/x/dex/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/limit_order_expiration.pb.go b/x/dex/types/limit_order_expiration.pb.go index 27544964d..c983de898 100644 --- a/x/dex/types/limit_order_expiration.pb.go +++ b/x/dex/types/limit_order_expiration.pb.go @@ -5,15 +5,14 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - time "time" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/limit_order_tranche.pb.go b/x/dex/types/limit_order_tranche.pb.go index 79df59140..e35ecd9cc 100644 --- a/x/dex/types/limit_order_tranche.pb.go +++ b/x/dex/types/limit_order_tranche.pb.go @@ -4,19 +4,17 @@ package types import ( - fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - time "time" - cosmossdk_io_math "cosmossdk.io/math" + fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - _ "google.golang.org/protobuf/types/known/timestamppb" - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + _ "google.golang.org/protobuf/types/known/timestamppb" + io "io" + math "math" + math_bits "math/bits" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go index 75737b1c2..b0e65087b 100644 --- a/x/dex/types/limit_order_tranche_user.pb.go +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -4,14 +4,13 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - cosmossdk_io_math "cosmossdk.io/math" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/pair_id.pb.go b/x/dex/types/pair_id.pb.go index 5d72b9f75..1b97bd856 100644 --- a/x/dex/types/pair_id.pb.go +++ b/x/dex/types/pair_id.pb.go @@ -5,11 +5,10 @@ package types import ( fmt "fmt" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/params.pb.go b/x/dex/types/params.pb.go index 28d0899dd..ca28efd3e 100644 --- a/x/dex/types/params.pb.go +++ b/x/dex/types/params.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/pool.pb.go b/x/dex/types/pool.pb.go index c33507555..7468d843b 100644 --- a/x/dex/types/pool.pb.go +++ b/x/dex/types/pool.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/pool_metadata.pb.go b/x/dex/types/pool_metadata.pb.go index 03aaaed20..47c15c2ae 100644 --- a/x/dex/types/pool_metadata.pb.go +++ b/x/dex/types/pool_metadata.pb.go @@ -5,11 +5,10 @@ package types import ( fmt "fmt" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/pool_reserves.pb.go b/x/dex/types/pool_reserves.pb.go index c889d1e69..10e0f6d50 100644 --- a/x/dex/types/pool_reserves.pb.go +++ b/x/dex/types/pool_reserves.pb.go @@ -4,16 +4,14 @@ package types import ( - fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - cosmossdk_io_math "cosmossdk.io/math" + fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/query.pb.go b/x/dex/types/query.pb.go index 953d59f96..9450a4a07 100644 --- a/x/dex/types/query.pb.go +++ b/x/dex/types/query.pb.go @@ -5,13 +5,8 @@ package types import ( context "context" - fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - time "time" - cosmossdk_io_math "cosmossdk.io/math" + fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" @@ -19,13 +14,16 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" _ "google.golang.org/protobuf/types/known/timestamppb" - - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + io "io" + math "math" + math_bits "math/bits" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/tick_liquidity.pb.go b/x/dex/types/tick_liquidity.pb.go index 0f2443566..c35f64b63 100644 --- a/x/dex/types/tick_liquidity.pb.go +++ b/x/dex/types/tick_liquidity.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/trade_pair_id.pb.go b/x/dex/types/trade_pair_id.pb.go index 3c4f1980e..d2d64ef4e 100644 --- a/x/dex/types/trade_pair_id.pb.go +++ b/x/dex/types/trade_pair_id.pb.go @@ -5,11 +5,10 @@ package types import ( fmt "fmt" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/tx.pb.go b/x/dex/types/tx.pb.go index f94f0bee3..433e795c2 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -5,13 +5,8 @@ package types import ( context "context" - fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - time "time" - cosmossdk_io_math "cosmossdk.io/math" + fmt "fmt" _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" @@ -21,12 +16,15 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" _ "google.golang.org/protobuf/types/known/timestamppb" - - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + io "io" + math "math" + math_bits "math/bits" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dex/types/v2/params.pb.go b/x/dex/types/v2/params.pb.go index 297167892..b6e4ad499 100644 --- a/x/dex/types/v2/params.pb.go +++ b/x/dex/types/v2/params.pb.go @@ -5,14 +5,12 @@ package v2 import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dynamicfees/types/genesis.pb.go b/x/dynamicfees/types/genesis.pb.go index a5f13a155..ff1c4b185 100644 --- a/x/dynamicfees/types/genesis.pb.go +++ b/x/dynamicfees/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dynamicfees/types/params.pb.go b/x/dynamicfees/types/params.pb.go index 130de4b33..cd6c8940e 100644 --- a/x/dynamicfees/types/params.pb.go +++ b/x/dynamicfees/types/params.pb.go @@ -5,14 +5,13 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dynamicfees/types/query.pb.go b/x/dynamicfees/types/query.pb.go index ef6c9cb99..51fb31b92 100644 --- a/x/dynamicfees/types/query.pb.go +++ b/x/dynamicfees/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -17,6 +13,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dynamicfees/types/tx.pb.go b/x/dynamicfees/types/tx.pb.go index 8ba50ed26..a2dc42872 100644 --- a/x/dynamicfees/types/tx.pb.go +++ b/x/dynamicfees/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -19,6 +15,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/genesis.pb.go b/x/feeburner/types/genesis.pb.go index b378b9102..817cad2ff 100644 --- a/x/feeburner/types/genesis.pb.go +++ b/x/feeburner/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/params.pb.go b/x/feeburner/types/params.pb.go index 76c19721e..2f539541e 100644 --- a/x/feeburner/types/params.pb.go +++ b/x/feeburner/types/params.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/query.pb.go b/x/feeburner/types/query.pb.go index 8a3622a36..ea85ae590 100644 --- a/x/feeburner/types/query.pb.go +++ b/x/feeburner/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -18,6 +14,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/total_burned_neutrons_amount.pb.go b/x/feeburner/types/total_burned_neutrons_amount.pb.go index 438b721a3..8e9acf9f1 100644 --- a/x/feeburner/types/total_burned_neutrons_amount.pb.go +++ b/x/feeburner/types/total_burned_neutrons_amount.pb.go @@ -5,13 +5,12 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/tx.pb.go b/x/feeburner/types/tx.pb.go index d0c1092f9..d25168e3c 100644 --- a/x/feeburner/types/tx.pb.go +++ b/x/feeburner/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -19,6 +15,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/fee.pb.go b/x/feerefunder/types/fee.pb.go index e69c14109..540bc0581 100644 --- a/x/feerefunder/types/fee.pb.go +++ b/x/feerefunder/types/fee.pb.go @@ -5,14 +5,13 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/genesis.pb.go b/x/feerefunder/types/genesis.pb.go index 800255d34..682002bcf 100644 --- a/x/feerefunder/types/genesis.pb.go +++ b/x/feerefunder/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/params.pb.go b/x/feerefunder/types/params.pb.go index 62f1e84fa..1bdb0da76 100644 --- a/x/feerefunder/types/params.pb.go +++ b/x/feerefunder/types/params.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/query.pb.go b/x/feerefunder/types/query.pb.go index fe73033ba..7bd8573fa 100644 --- a/x/feerefunder/types/query.pb.go +++ b/x/feerefunder/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -18,6 +14,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/tx.pb.go b/x/feerefunder/types/tx.pb.go index 8aaab733d..3688fce95 100644 --- a/x/feerefunder/types/tx.pb.go +++ b/x/feerefunder/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -19,6 +15,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/globalfee/types/genesis.pb.go b/x/globalfee/types/genesis.pb.go index 49f7929e2..349c454df 100644 --- a/x/globalfee/types/genesis.pb.go +++ b/x/globalfee/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/globalfee/types/params.pb.go b/x/globalfee/types/params.pb.go index caae5be0a..f6bc1a627 100644 --- a/x/globalfee/types/params.pb.go +++ b/x/globalfee/types/params.pb.go @@ -5,14 +5,13 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/globalfee/types/query.pb.go b/x/globalfee/types/query.pb.go index 4e5e58d3e..1f802433c 100644 --- a/x/globalfee/types/query.pb.go +++ b/x/globalfee/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -17,6 +13,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/globalfee/types/tx.pb.go b/x/globalfee/types/tx.pb.go index 5b61253dc..31da98227 100644 --- a/x/globalfee/types/tx.pb.go +++ b/x/globalfee/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -19,6 +15,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchainqueries/types/genesis.pb.go b/x/interchainqueries/types/genesis.pb.go index ef69e7dd3..b7c42cd50 100644 --- a/x/interchainqueries/types/genesis.pb.go +++ b/x/interchainqueries/types/genesis.pb.go @@ -5,15 +5,14 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types1 "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" types "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. @@ -27,30 +26,37 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +// Information about an Interchain Query registered in the interchainqueries module. type RegisteredQuery struct { // The unique id of the registered query. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - // The address that registered the query. + // The address of the contract that registered the query. Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"` - // The query type identifier: `kv` or `tx` now + // The query type identifier: `kv` or `tx`. QueryType string `protobuf:"bytes,3,opt,name=query_type,json=queryType,proto3" json:"query_type,omitempty"` - // The KV-storage keys for which we want to get values from remote chain + // The KV-storage keys for which to get values from the remote chain. Only applicable for the + // KV-typed Interchain Queries. Keys []*KVKey `protobuf:"bytes,4,rep,name=keys,proto3" json:"keys,omitempty"` - // The filter for transaction search ICQ + // A stringified list of filters for remote transactions search. Only applicable for the TX-typed + // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". TransactionsFilter string `protobuf:"bytes,5,opt,name=transactions_filter,json=transactionsFilter,proto3" json:"transactions_filter,omitempty"` - // The IBC connection ID for getting ConsensusState to verify proofs + // The IBC connection ID to the remote chain (the source of querying data). Is used for getting + // ConsensusState from the respective IBC client to verify query result proofs. ConnectionId string `protobuf:"bytes,6,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` - // Parameter that defines how often the query must be updated. + // Parameter that defines the minimal delay between consecutive query executions (i.e. the + // minimal delay between query results update). UpdatePeriod uint64 `protobuf:"varint,7,opt,name=update_period,json=updatePeriod,proto3" json:"update_period,omitempty"` - // The local chain last block height when the query result was updated. + // The local chain block height of the last query results update. LastSubmittedResultLocalHeight uint64 `protobuf:"varint,8,opt,name=last_submitted_result_local_height,json=lastSubmittedResultLocalHeight,proto3" json:"last_submitted_result_local_height,omitempty"` - // The remote chain last block height when the query result was updated. + // The remote chain block height that corresponds to the last query result update. LastSubmittedResultRemoteHeight *types.Height `protobuf:"bytes,9,opt,name=last_submitted_result_remote_height,json=lastSubmittedResultRemoteHeight,proto3" json:"last_submitted_result_remote_height,omitempty"` - // Amount of coins deposited for the query. + // Amount of coins paid for the Interchain Query registration. The deposit is paid back to the + // remover. The remover can be either the query owner (during the submit timeout) or anybody. Deposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,10,rep,name=deposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"deposit"` - // Timeout before query becomes available for everybody to remove. + // Duration in blocks that is required to pass since the query registration/update for the + // query to become available for anybody to be removed. SubmitTimeout uint64 `protobuf:"varint,11,opt,name=submit_timeout,json=submitTimeout,proto3" json:"submit_timeout,omitempty"` - // The local chain height when the query was registered. + // The local chain block height of the Interchain Query registration. RegisteredAtHeight uint64 `protobuf:"varint,12,opt,name=registered_at_height,json=registeredAtHeight,proto3" json:"registered_at_height,omitempty"` } @@ -171,11 +177,12 @@ func (m *RegisteredQuery) GetRegisteredAtHeight() uint64 { return 0 } +// A path to an IAVL storage node. type KVKey struct { - // Path (storage prefix) to the storage where you want to read value by key - // (usually name of cosmos-sdk module: 'staking', 'bank', etc.) + // The first half of the storage path. It is supposed to be a substore name for the query + // (e.g. bank, staking, etc.). Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - // Key you want to read from the storage + // The second half of the storage path. The remaining part of a full path to an IAVL storage node. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` } @@ -226,9 +233,11 @@ func (m *KVKey) GetKey() []byte { return nil } -// GenesisState defines the interchainqueries module's genesis state. +// The interchainqueries module's genesis state model. type GenesisState struct { - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + // The parameters of the module. + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + // A list of registered Interchain Queries. RegisteredQueries []*RegisteredQuery `protobuf:"bytes,2,rep,name=registered_queries,json=registeredQueries,proto3" json:"registered_queries,omitempty"` } diff --git a/x/interchainqueries/types/params.pb.go b/x/interchainqueries/types/params.pb.go index db88e9007..23d2d97a6 100644 --- a/x/interchainqueries/types/params.pb.go +++ b/x/interchainqueries/types/params.pb.go @@ -5,14 +5,13 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. @@ -26,16 +25,15 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// Params defines the parameters for the module. +// The parameters for the module. type Params struct { - // Defines amount of blocks required before query becomes available for - // removal by anybody + // The amount of blocks required to pass since an Interchain Query registration/update for the + // query to become available for removal by anybody. QuerySubmitTimeout uint64 `protobuf:"varint,1,opt,name=query_submit_timeout,json=querySubmitTimeout,proto3" json:"query_submit_timeout,omitempty"` - // Amount of coins deposited for the query. + // Amount of coins required to be provided as deposit on Interchain Query registration. QueryDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=query_deposit,json=queryDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"query_deposit"` - // Amount of tx hashes to be removed during a single EndBlock. Can vary to - // balance between network cleaning speed and EndBlock duration. A zero value - // means no limit. + // Amount of tx hashes to be removed during a single EndBlock. Can vary to balance between + // network cleaning speed and EndBlock duration. A zero value means no limit. TxQueryRemovalLimit uint64 `protobuf:"varint,3,opt,name=tx_query_removal_limit,json=txQueryRemovalLimit,proto3" json:"tx_query_removal_limit,omitempty"` } diff --git a/x/interchainqueries/types/query.pb.go b/x/interchainqueries/types/query.pb.go index 0f1972e02..0b40d656b 100644 --- a/x/interchainqueries/types/query.pb.go +++ b/x/interchainqueries/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -18,6 +14,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. @@ -31,7 +30,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// QueryParamsRequest is request type for the Query/Params RPC method. +// Request type for the Query/Params RPC method. type QueryParamsRequest struct { } @@ -68,9 +67,9 @@ func (m *QueryParamsRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo -// QueryParamsResponse is response type for the Query/Params RPC method. +// Response type for the Query/Params RPC method. type QueryParamsResponse struct { - // params holds all the parameters of this module. + // Stores all parameters of the module. Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` } @@ -114,10 +113,19 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } +// Request type for the Query/RegisteredQueries RPC method. type QueryRegisteredQueriesRequest struct { - Owners []string `protobuf:"bytes,1,rep,name=owners,proto3" json:"owners,omitempty"` - ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` - Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` + // A list of owners of Interchain Queries. Query response will contain only Interchain Queries + // that are owned by one of the owners in the list. If none, Interchain Queries are not filtered + // out by the owner field. + Owners []string `protobuf:"bytes,1,rep,name=owners,proto3" json:"owners,omitempty"` + // IBC connection ID. Query response will contain only Interchain Queries that have the same IBC + // connection ID parameter. If none, Interchain Queries are not filtered out by the connection ID + // field. + ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + // Pagination parameters for the request. Use values from previous response in the next request + // in consecutive requests with paginated responses. + Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryRegisteredQueriesRequest) Reset() { *m = QueryRegisteredQueriesRequest{} } @@ -174,9 +182,12 @@ func (m *QueryRegisteredQueriesRequest) GetPagination() *query.PageRequest { return nil } +// Response type for the Query/RegisteredQueries RPC method. type QueryRegisteredQueriesResponse struct { + // A list of registered Interchain Queries. RegisteredQueries []RegisteredQuery `protobuf:"bytes,1,rep,name=registered_queries,json=registeredQueries,proto3" json:"registered_queries"` - // pagination defines the pagination in the response. + // Current page information. Use values from previous response in the next request in consecutive + // requests with paginated responses. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -227,7 +238,9 @@ func (m *QueryRegisteredQueriesResponse) GetPagination() *query.PageResponse { return nil } +// Request type for the Query/RegisteredQuery RPC method. type QueryRegisteredQueryRequest struct { + // ID of an Interchain Query. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` } @@ -271,7 +284,9 @@ func (m *QueryRegisteredQueryRequest) GetQueryId() uint64 { return 0 } +// Response type for the Query/RegisteredQuery RPC method. type QueryRegisteredQueryResponse struct { + // A registered Interchain Query. RegisteredQuery *RegisteredQuery `protobuf:"bytes,1,opt,name=registered_query,json=registeredQuery,proto3" json:"registered_query,omitempty"` } @@ -315,22 +330,24 @@ func (m *QueryRegisteredQueryResponse) GetRegisteredQuery() *RegisteredQuery { return nil } -type QueryRegisteredQueryResultRequest struct { +// Request type for the Query/QueryResult RPC method. +type QueryQueryResultRequest struct { + // ID of an Interchain Query. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` } -func (m *QueryRegisteredQueryResultRequest) Reset() { *m = QueryRegisteredQueryResultRequest{} } -func (m *QueryRegisteredQueryResultRequest) String() string { return proto.CompactTextString(m) } -func (*QueryRegisteredQueryResultRequest) ProtoMessage() {} -func (*QueryRegisteredQueryResultRequest) Descriptor() ([]byte, []int) { +func (m *QueryQueryResultRequest) Reset() { *m = QueryQueryResultRequest{} } +func (m *QueryQueryResultRequest) String() string { return proto.CompactTextString(m) } +func (*QueryQueryResultRequest) ProtoMessage() {} +func (*QueryQueryResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2254be23ba3ff3b4, []int{6} } -func (m *QueryRegisteredQueryResultRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryQueryResultRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryRegisteredQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryRegisteredQueryResultRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryQueryResultRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -340,41 +357,43 @@ func (m *QueryRegisteredQueryResultRequest) XXX_Marshal(b []byte, deterministic return b[:n], nil } } -func (m *QueryRegisteredQueryResultRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryRegisteredQueryResultRequest.Merge(m, src) +func (m *QueryQueryResultRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryQueryResultRequest.Merge(m, src) } -func (m *QueryRegisteredQueryResultRequest) XXX_Size() int { +func (m *QueryQueryResultRequest) XXX_Size() int { return m.Size() } -func (m *QueryRegisteredQueryResultRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryRegisteredQueryResultRequest.DiscardUnknown(m) +func (m *QueryQueryResultRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryQueryResultRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryRegisteredQueryResultRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryQueryResultRequest proto.InternalMessageInfo -func (m *QueryRegisteredQueryResultRequest) GetQueryId() uint64 { +func (m *QueryQueryResultRequest) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -type QueryRegisteredQueryResultResponse struct { +// Response type for the Query/QueryResult RPC method. +type QueryQueryResultResponse struct { + // The last successfully submitted result of an Interchain Query. Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"` } -func (m *QueryRegisteredQueryResultResponse) Reset() { *m = QueryRegisteredQueryResultResponse{} } -func (m *QueryRegisteredQueryResultResponse) String() string { return proto.CompactTextString(m) } -func (*QueryRegisteredQueryResultResponse) ProtoMessage() {} -func (*QueryRegisteredQueryResultResponse) Descriptor() ([]byte, []int) { +func (m *QueryQueryResultResponse) Reset() { *m = QueryQueryResultResponse{} } +func (m *QueryQueryResultResponse) String() string { return proto.CompactTextString(m) } +func (*QueryQueryResultResponse) ProtoMessage() {} +func (*QueryQueryResultResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2254be23ba3ff3b4, []int{7} } -func (m *QueryRegisteredQueryResultResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryQueryResultResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryRegisteredQueryResultResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryQueryResultResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryRegisteredQueryResultResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryQueryResultResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -384,101 +403,44 @@ func (m *QueryRegisteredQueryResultResponse) XXX_Marshal(b []byte, deterministic return b[:n], nil } } -func (m *QueryRegisteredQueryResultResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryRegisteredQueryResultResponse.Merge(m, src) +func (m *QueryQueryResultResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryQueryResultResponse.Merge(m, src) } -func (m *QueryRegisteredQueryResultResponse) XXX_Size() int { +func (m *QueryQueryResultResponse) XXX_Size() int { return m.Size() } -func (m *QueryRegisteredQueryResultResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryRegisteredQueryResultResponse.DiscardUnknown(m) +func (m *QueryQueryResultResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryQueryResultResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryRegisteredQueryResultResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryQueryResultResponse proto.InternalMessageInfo -func (m *QueryRegisteredQueryResultResponse) GetResult() *QueryResult { +func (m *QueryQueryResultResponse) GetResult() *QueryResult { if m != nil { return m.Result } return nil } -type Transaction struct { - Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` - Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` -} - -func (m *Transaction) Reset() { *m = Transaction{} } -func (m *Transaction) String() string { return proto.CompactTextString(m) } -func (*Transaction) ProtoMessage() {} -func (*Transaction) Descriptor() ([]byte, []int) { - return fileDescriptor_2254be23ba3ff3b4, []int{8} -} -func (m *Transaction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Transaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Transaction.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Transaction) XXX_Merge(src proto.Message) { - xxx_messageInfo_Transaction.Merge(m, src) -} -func (m *Transaction) XXX_Size() int { - return m.Size() -} -func (m *Transaction) XXX_DiscardUnknown() { - xxx_messageInfo_Transaction.DiscardUnknown(m) -} - -var xxx_messageInfo_Transaction proto.InternalMessageInfo - -func (m *Transaction) GetId() uint64 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *Transaction) GetHeight() uint64 { - if m != nil { - return m.Height - } - return 0 -} - -func (m *Transaction) GetData() []byte { - if m != nil { - return m.Data - } - return nil -} - -type QueryLastRemoteHeight struct { +// Request type for the Query/LastRemoteHeight RPC method. +type QueryLastRemoteHeightRequest struct { + // Connection ID of an IBC connection to a remote chain. Determines the IBC client used in query + // handling. ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` } -func (m *QueryLastRemoteHeight) Reset() { *m = QueryLastRemoteHeight{} } -func (m *QueryLastRemoteHeight) String() string { return proto.CompactTextString(m) } -func (*QueryLastRemoteHeight) ProtoMessage() {} -func (*QueryLastRemoteHeight) Descriptor() ([]byte, []int) { - return fileDescriptor_2254be23ba3ff3b4, []int{9} +func (m *QueryLastRemoteHeightRequest) Reset() { *m = QueryLastRemoteHeightRequest{} } +func (m *QueryLastRemoteHeightRequest) String() string { return proto.CompactTextString(m) } +func (*QueryLastRemoteHeightRequest) ProtoMessage() {} +func (*QueryLastRemoteHeightRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_2254be23ba3ff3b4, []int{8} } -func (m *QueryLastRemoteHeight) XXX_Unmarshal(b []byte) error { +func (m *QueryLastRemoteHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryLastRemoteHeight) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryLastRemoteHeightRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryLastRemoteHeight.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryLastRemoteHeightRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -488,34 +450,38 @@ func (m *QueryLastRemoteHeight) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *QueryLastRemoteHeight) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryLastRemoteHeight.Merge(m, src) +func (m *QueryLastRemoteHeightRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryLastRemoteHeightRequest.Merge(m, src) } -func (m *QueryLastRemoteHeight) XXX_Size() int { +func (m *QueryLastRemoteHeightRequest) XXX_Size() int { return m.Size() } -func (m *QueryLastRemoteHeight) XXX_DiscardUnknown() { - xxx_messageInfo_QueryLastRemoteHeight.DiscardUnknown(m) +func (m *QueryLastRemoteHeightRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryLastRemoteHeightRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryLastRemoteHeight proto.InternalMessageInfo +var xxx_messageInfo_QueryLastRemoteHeightRequest proto.InternalMessageInfo -func (m *QueryLastRemoteHeight) GetConnectionId() string { +func (m *QueryLastRemoteHeightRequest) GetConnectionId() string { if m != nil { return m.ConnectionId } return "" } +// Response type for the Query/LastRemoteHeight RPC method. type QueryLastRemoteHeightResponse struct { + // The height of the chain that the IBC client is currently on. Height uint64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` + // The revision of the chain that the IBC client is currently on. + Revision uint64 `protobuf:"varint,2,opt,name=revision,proto3" json:"revision,omitempty"` } func (m *QueryLastRemoteHeightResponse) Reset() { *m = QueryLastRemoteHeightResponse{} } func (m *QueryLastRemoteHeightResponse) String() string { return proto.CompactTextString(m) } func (*QueryLastRemoteHeightResponse) ProtoMessage() {} func (*QueryLastRemoteHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2254be23ba3ff3b4, []int{10} + return fileDescriptor_2254be23ba3ff3b4, []int{9} } func (m *QueryLastRemoteHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -551,6 +517,13 @@ func (m *QueryLastRemoteHeightResponse) GetHeight() uint64 { return 0 } +func (m *QueryLastRemoteHeightResponse) GetRevision() uint64 { + if m != nil { + return m.Revision + } + return 0 +} + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "neutron.interchainqueries.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "neutron.interchainqueries.QueryParamsResponse") @@ -558,10 +531,9 @@ func init() { proto.RegisterType((*QueryRegisteredQueriesResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueriesResponse") proto.RegisterType((*QueryRegisteredQueryRequest)(nil), "neutron.interchainqueries.QueryRegisteredQueryRequest") proto.RegisterType((*QueryRegisteredQueryResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueryResponse") - proto.RegisterType((*QueryRegisteredQueryResultRequest)(nil), "neutron.interchainqueries.QueryRegisteredQueryResultRequest") - proto.RegisterType((*QueryRegisteredQueryResultResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueryResultResponse") - proto.RegisterType((*Transaction)(nil), "neutron.interchainqueries.Transaction") - proto.RegisterType((*QueryLastRemoteHeight)(nil), "neutron.interchainqueries.QueryLastRemoteHeight") + proto.RegisterType((*QueryQueryResultRequest)(nil), "neutron.interchainqueries.QueryQueryResultRequest") + proto.RegisterType((*QueryQueryResultResponse)(nil), "neutron.interchainqueries.QueryQueryResultResponse") + proto.RegisterType((*QueryLastRemoteHeightRequest)(nil), "neutron.interchainqueries.QueryLastRemoteHeightRequest") proto.RegisterType((*QueryLastRemoteHeightResponse)(nil), "neutron.interchainqueries.QueryLastRemoteHeightResponse") } @@ -570,55 +542,53 @@ func init() { } var fileDescriptor_2254be23ba3ff3b4 = []byte{ - // 758 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4d, 0x4f, 0x14, 0x4d, - 0x10, 0xde, 0x5e, 0xf6, 0x5d, 0x5e, 0x6a, 0x79, 0x5f, 0xa0, 0x45, 0x03, 0x2b, 0xae, 0x30, 0x44, - 0x58, 0x30, 0x3b, 0xc3, 0x87, 0x0a, 0x46, 0xc4, 0x84, 0x83, 0x4a, 0xe2, 0x01, 0x26, 0xe2, 0xc1, - 0xcb, 0xa6, 0x77, 0xb7, 0x33, 0x3b, 0x09, 0xdb, 0xbd, 0xcc, 0xf4, 0x22, 0x73, 0xf5, 0xe6, 0xcd, - 0xe8, 0x5f, 0xf0, 0x07, 0x78, 0xf3, 0xe0, 0xc1, 0x2b, 0xf1, 0x44, 0xe2, 0xc5, 0x93, 0x31, 0xe0, - 0x0f, 0x31, 0xd3, 0xdd, 0xfb, 0xfd, 0xc5, 0x72, 0x9a, 0xee, 0x9e, 0x7a, 0xaa, 0x9e, 0x7a, 0xaa, - 0xaa, 0x1b, 0xee, 0x30, 0x5a, 0x11, 0x1e, 0x67, 0x96, 0xcb, 0x04, 0xf5, 0xf2, 0x45, 0xe2, 0xb2, - 0xa3, 0x0a, 0xf5, 0x5c, 0xea, 0x5b, 0xe1, 0x37, 0x30, 0xcb, 0x1e, 0x17, 0x1c, 0x4f, 0x6b, 0x33, - 0xb3, 0xcd, 0x2c, 0xb9, 0x9c, 0xe7, 0x7e, 0x89, 0xfb, 0x56, 0x8e, 0xf8, 0x54, 0x61, 0xac, 0xe3, - 0xd5, 0x1c, 0x15, 0x64, 0xd5, 0x2a, 0x13, 0xc7, 0x65, 0x44, 0xb8, 0x9c, 0x29, 0x37, 0xc9, 0x49, - 0x87, 0x3b, 0x5c, 0x2e, 0xad, 0x70, 0xa5, 0x4f, 0x67, 0x1c, 0xce, 0x9d, 0x43, 0x6a, 0x91, 0xb2, - 0x6b, 0x11, 0xc6, 0xb8, 0x90, 0x10, 0x5f, 0xff, 0x5d, 0xec, 0xce, 0xd0, 0xa1, 0x8c, 0xfa, 0x6e, - 0xd5, 0x70, 0xa1, 0xbb, 0x61, 0x99, 0x78, 0xa4, 0x54, 0xb5, 0x33, 0xba, 0xdb, 0x89, 0x13, 0x65, - 0x63, 0x4c, 0x02, 0xde, 0x0f, 0x53, 0xd9, 0x93, 0x40, 0x9b, 0x1e, 0x55, 0xa8, 0x2f, 0x8c, 0x57, - 0x70, 0xad, 0xe9, 0xd4, 0x2f, 0x73, 0xe6, 0x53, 0xfc, 0x04, 0xe2, 0x2a, 0xc0, 0x14, 0x9a, 0x45, - 0xe9, 0xc4, 0xda, 0x9c, 0xd9, 0x55, 0x2d, 0x53, 0x41, 0x77, 0x62, 0xa7, 0xbf, 0x6e, 0x47, 0x6c, - 0x0d, 0x33, 0x3e, 0x21, 0xb8, 0x25, 0x1d, 0xdb, 0xd4, 0x71, 0x7d, 0x41, 0x3d, 0x5a, 0xd8, 0x57, - 0xf6, 0x3a, 0x32, 0xbe, 0x01, 0x71, 0xfe, 0x86, 0x51, 0x2f, 0x0c, 0x31, 0x94, 0x1e, 0xb1, 0xf5, - 0x0e, 0xcf, 0xc3, 0x7f, 0x79, 0xce, 0x18, 0xcd, 0x87, 0x8a, 0x65, 0xdd, 0xc2, 0x54, 0x74, 0x16, - 0xa5, 0x47, 0xec, 0xd1, 0xfa, 0xe1, 0x6e, 0x01, 0x3f, 0x05, 0xa8, 0x57, 0x62, 0x6a, 0x48, 0x72, - 0x5c, 0x30, 0x55, 0xd9, 0xcc, 0xb0, 0x6c, 0xa6, 0x2a, 0xb5, 0x2e, 0x9b, 0xb9, 0x47, 0x1c, 0xaa, - 0x03, 0xdb, 0x0d, 0x48, 0xe3, 0x3b, 0x82, 0x54, 0x37, 0x9a, 0x5a, 0x8a, 0x2c, 0x60, 0xaf, 0xf6, - 0x33, 0xab, 0x93, 0x96, 0x9c, 0x13, 0x6b, 0xcb, 0x3d, 0x64, 0x69, 0xf6, 0x18, 0x68, 0x7d, 0x26, - 0xbc, 0xd6, 0x40, 0xf8, 0x59, 0x53, 0x2e, 0x51, 0x99, 0xcb, 0x62, 0xdf, 0x5c, 0x14, 0xbb, 0xa6, - 0x64, 0x36, 0xe1, 0x66, 0x87, 0x5c, 0x82, 0xaa, 0xe0, 0xd3, 0xf0, 0xaf, 0x74, 0x14, 0x6a, 0x1a, - 0x56, 0x35, 0x66, 0x0f, 0xcb, 0xfd, 0x6e, 0xc1, 0xa8, 0xc0, 0x4c, 0x67, 0xa4, 0xd6, 0xe0, 0x00, - 0xc6, 0x5b, 0x34, 0x08, 0x74, 0x63, 0x0c, 0xa0, 0x80, 0x3d, 0xd6, 0x9c, 0x7b, 0x60, 0x6c, 0xc3, - 0x5c, 0x97, 0xb0, 0x95, 0x43, 0x71, 0x09, 0xda, 0x05, 0x30, 0x7a, 0xe1, 0x35, 0xf9, 0x6d, 0x88, - 0x7b, 0xf2, 0x44, 0x53, 0x5e, 0xe8, 0x41, 0xb9, 0x11, 0xaf, 0x51, 0xc6, 0x2e, 0x24, 0x5e, 0x7a, - 0x84, 0xf9, 0x44, 0x36, 0x1f, 0xfe, 0x1f, 0xa2, 0x35, 0x26, 0x51, 0xb7, 0x10, 0xf6, 0x71, 0x91, - 0xba, 0x4e, 0x51, 0xc8, 0xd2, 0xc5, 0x6c, 0xbd, 0xc3, 0x18, 0x62, 0x05, 0x22, 0x88, 0x6c, 0xce, - 0x51, 0x5b, 0xae, 0x8d, 0x2d, 0xb8, 0x2e, 0x23, 0xbc, 0x20, 0xbe, 0xb0, 0x69, 0x89, 0x0b, 0xfa, - 0x5c, 0x19, 0xb7, 0x35, 0x3d, 0x6a, 0x6f, 0x7a, 0x63, 0x43, 0x8f, 0x54, 0x2b, 0xba, 0x96, 0x69, - 0x9d, 0x0a, 0x6a, 0xa4, 0xb2, 0xf6, 0x6e, 0x18, 0xfe, 0x91, 0x48, 0xfc, 0x01, 0x41, 0x5c, 0xcd, - 0x2b, 0xce, 0xf4, 0x93, 0xa1, 0xe9, 0xa2, 0x48, 0x9a, 0x97, 0x35, 0x57, 0x5c, 0x8c, 0xa5, 0xb7, - 0x3f, 0xfe, 0x7c, 0x8c, 0xce, 0xe3, 0x39, 0xab, 0xdf, 0x1d, 0x86, 0xbf, 0x21, 0x98, 0x68, 0x9b, - 0x3f, 0xbc, 0xd9, 0xbf, 0x4c, 0x9d, 0x6f, 0x96, 0xe4, 0xc3, 0x2b, 0x20, 0x35, 0xeb, 0xfb, 0x92, - 0xb5, 0x85, 0x33, 0x3d, 0x58, 0xb7, 0xdf, 0x06, 0xf8, 0x0b, 0x82, 0xb1, 0x96, 0x26, 0xc4, 0x0f, - 0x06, 0x63, 0x51, 0x1d, 0xd3, 0xe4, 0xc6, 0xc0, 0x38, 0xcd, 0x7d, 0x5d, 0x72, 0xcf, 0xe0, 0xbb, - 0x97, 0xe7, 0x1e, 0xe0, 0xaf, 0x08, 0x12, 0x0d, 0x4d, 0x8f, 0xb7, 0x06, 0x8f, 0x5e, 0x9f, 0xd5, - 0xe4, 0xe3, 0x2b, 0xa2, 0x75, 0x06, 0x96, 0xcc, 0x60, 0x09, 0x2f, 0x5a, 0x7d, 0x9e, 0xf0, 0xac, - 0x1a, 0x4d, 0xfc, 0x19, 0xc1, 0x78, 0xdb, 0x2c, 0xad, 0xf4, 0x23, 0xd1, 0x8a, 0x48, 0x6e, 0x0e, - 0x8a, 0xa8, 0x31, 0x5e, 0x91, 0x8c, 0x97, 0x71, 0xba, 0xa7, 0xe6, 0x21, 0x30, 0xab, 0x66, 0x71, - 0xe7, 0xe0, 0xf4, 0x3c, 0x85, 0xce, 0xce, 0x53, 0xe8, 0xf7, 0x79, 0x0a, 0xbd, 0xbf, 0x48, 0x45, - 0xce, 0x2e, 0x52, 0x91, 0x9f, 0x17, 0xa9, 0xc8, 0xeb, 0x47, 0x8e, 0x2b, 0x8a, 0x95, 0x9c, 0x99, - 0xe7, 0xa5, 0xaa, 0xb7, 0x0c, 0xf7, 0x9c, 0x9a, 0xe7, 0xe3, 0x7b, 0xd6, 0x49, 0xa7, 0x07, 0x3e, - 0x28, 0x53, 0x3f, 0x17, 0x97, 0x8f, 0xfc, 0xfa, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x60, 0x57, - 0x58, 0xcf, 0xfd, 0x08, 0x00, 0x00, + // 732 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x41, 0x4f, 0x13, 0x41, + 0x14, 0xee, 0x02, 0xae, 0x30, 0x68, 0x80, 0x91, 0x60, 0x59, 0x71, 0x85, 0x25, 0x42, 0xc1, 0x74, + 0x47, 0x0a, 0x2a, 0xc6, 0x44, 0x13, 0x4c, 0x54, 0x12, 0x0f, 0xb0, 0x06, 0x0f, 0x5c, 0x9a, 0x6d, + 0x3b, 0xd9, 0x6e, 0x42, 0x67, 0xca, 0xce, 0x14, 0xd9, 0xab, 0xbf, 0xc0, 0xe8, 0x5f, 0x30, 0xf1, + 0x27, 0x78, 0xf4, 0x4a, 0x3c, 0x91, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x33, 0x3c, 0x98, 0x9d, 0x99, + 0x2d, 0xb4, 0xdb, 0x76, 0x5b, 0x4f, 0x9d, 0x79, 0x7d, 0xdf, 0x7b, 0xdf, 0xfb, 0xde, 0x7b, 0x3b, + 0xe0, 0x2e, 0xc1, 0x0d, 0x1e, 0x50, 0x82, 0x7c, 0xc2, 0x71, 0x50, 0xae, 0xba, 0x3e, 0x39, 0x6c, + 0xe0, 0xc0, 0xc7, 0x0c, 0x45, 0xbf, 0xa1, 0x5d, 0x0f, 0x28, 0xa7, 0x70, 0x56, 0xb9, 0xd9, 0x09, + 0x37, 0x63, 0xb5, 0x4c, 0x59, 0x8d, 0x32, 0x54, 0x72, 0x19, 0x96, 0x18, 0x74, 0xb4, 0x56, 0xc2, + 0xdc, 0x5d, 0x43, 0x75, 0xd7, 0xf3, 0x89, 0xcb, 0x7d, 0x4a, 0x64, 0x18, 0x63, 0xda, 0xa3, 0x1e, + 0x15, 0x47, 0x14, 0x9d, 0x94, 0x75, 0xce, 0xa3, 0xd4, 0x3b, 0xc0, 0xc8, 0xad, 0xfb, 0xc8, 0x25, + 0x84, 0x72, 0x01, 0x61, 0xea, 0xdf, 0xe5, 0xee, 0x0c, 0x3d, 0x4c, 0x30, 0xf3, 0x63, 0xc7, 0xa5, + 0xee, 0x8e, 0x75, 0x37, 0x70, 0x6b, 0xb1, 0x9f, 0xd5, 0xdd, 0x8f, 0x1f, 0x4b, 0x1f, 0x6b, 0x1a, + 0xc0, 0xdd, 0xa8, 0x94, 0x1d, 0x01, 0x74, 0xf0, 0x61, 0x03, 0x33, 0x6e, 0xbd, 0x05, 0x37, 0x5a, + 0xac, 0xac, 0x4e, 0x09, 0xc3, 0xf0, 0x19, 0xd0, 0x65, 0x82, 0xac, 0x36, 0xaf, 0xe5, 0xc6, 0x0b, + 0x0b, 0x76, 0x57, 0xb5, 0x6c, 0x09, 0xdd, 0x1a, 0x39, 0xf9, 0x75, 0x27, 0xe3, 0x28, 0x98, 0xf5, + 0x59, 0x03, 0xb7, 0x45, 0x60, 0x07, 0x7b, 0x3e, 0xe3, 0x38, 0xc0, 0x95, 0x5d, 0xe9, 0xaf, 0x32, + 0xc3, 0x19, 0xa0, 0xd3, 0x77, 0x04, 0x07, 0x51, 0x8a, 0xe1, 0xdc, 0x98, 0xa3, 0x6e, 0x70, 0x11, + 0x5c, 0x2f, 0x53, 0x42, 0x70, 0x39, 0x52, 0xac, 0xe8, 0x57, 0xb2, 0x43, 0xf3, 0x5a, 0x6e, 0xcc, + 0xb9, 0x76, 0x61, 0xdc, 0xae, 0xc0, 0x17, 0x00, 0x5c, 0x74, 0x22, 0x3b, 0x2c, 0x38, 0x2e, 0xd9, + 0xb2, 0x6d, 0x76, 0xd4, 0x36, 0x5b, 0xb6, 0x5a, 0xb5, 0xcd, 0xde, 0x71, 0x3d, 0xac, 0x12, 0x3b, + 0x97, 0x90, 0xd6, 0x77, 0x0d, 0x98, 0xdd, 0x68, 0x2a, 0x29, 0x8a, 0x00, 0x06, 0xcd, 0x3f, 0x8b, + 0xaa, 0x68, 0xc1, 0x79, 0xbc, 0xb0, 0xda, 0x43, 0x96, 0xd6, 0x88, 0xa1, 0xd2, 0x67, 0x2a, 0x68, + 0x4f, 0x04, 0x5f, 0xb6, 0xd4, 0x32, 0x24, 0x6a, 0x59, 0x4e, 0xad, 0x45, 0xb2, 0x6b, 0x29, 0x66, + 0x13, 0xdc, 0xea, 0x50, 0x4b, 0x18, 0x0b, 0x3e, 0x0b, 0x46, 0x45, 0xa0, 0x48, 0xd3, 0xa8, 0xab, + 0x23, 0xce, 0x55, 0x71, 0xdf, 0xae, 0x58, 0x0d, 0x30, 0xd7, 0x19, 0xa9, 0x34, 0xd8, 0x03, 0x93, + 0x6d, 0x1a, 0x84, 0x6a, 0x30, 0x06, 0x50, 0xc0, 0x99, 0x68, 0xad, 0x3d, 0xb4, 0x36, 0xc0, 0x4d, + 0x71, 0x88, 0x93, 0x35, 0x0e, 0x78, 0x1f, 0x64, 0xf7, 0x41, 0x36, 0x89, 0x52, 0x44, 0x9f, 0x02, + 0x3d, 0x10, 0x16, 0x45, 0x6f, 0xa9, 0x07, 0xbd, 0xcb, 0x78, 0x85, 0xb2, 0x9e, 0x2b, 0x21, 0x5e, + 0xbb, 0x8c, 0x3b, 0xb8, 0x46, 0x39, 0x7e, 0x85, 0x7d, 0xaf, 0xda, 0xa4, 0x95, 0x18, 0x4e, 0x2d, + 0x39, 0x9c, 0xd6, 0x1b, 0x35, 0xfa, 0xc9, 0x20, 0x8a, 0xe5, 0x0c, 0xd0, 0xab, 0xc2, 0xa2, 0x4a, + 0x53, 0x37, 0x68, 0x80, 0xd1, 0x00, 0x1f, 0xf9, 0x2c, 0x9e, 0x83, 0x11, 0xa7, 0x79, 0x2f, 0xfc, + 0xd5, 0xc1, 0x15, 0x11, 0x15, 0x7e, 0xd4, 0x80, 0x2e, 0x77, 0x0e, 0xe6, 0xd3, 0xca, 0x6b, 0x59, + 0x76, 0xc3, 0xee, 0xd7, 0x5d, 0xf2, 0xb4, 0x56, 0xde, 0xff, 0xf8, 0xf3, 0x69, 0x68, 0x11, 0x2e, + 0xa0, 0xb4, 0xef, 0x10, 0xfc, 0xa6, 0x81, 0xa9, 0xc4, 0x0e, 0xc1, 0xcd, 0x74, 0xf9, 0x3b, 0x7f, + 0x1d, 0x8c, 0xc7, 0xff, 0x81, 0x54, 0xac, 0x1f, 0x08, 0xd6, 0x08, 0xe6, 0x7b, 0xb0, 0x4e, 0x6e, + 0x34, 0xfc, 0xaa, 0x81, 0x89, 0xb6, 0x89, 0x85, 0x0f, 0x07, 0x63, 0x11, 0xaf, 0x9a, 0xf1, 0x68, + 0x60, 0x9c, 0xe2, 0xbe, 0x2e, 0xb8, 0xe7, 0xe1, 0xbd, 0xfe, 0xb9, 0x87, 0xf0, 0x8b, 0x06, 0xc6, + 0x2f, 0x0d, 0x33, 0x2c, 0xa4, 0x65, 0x4f, 0xee, 0x9b, 0xb1, 0x3e, 0x10, 0x46, 0xb1, 0x45, 0x82, + 0xed, 0x0a, 0x5c, 0x46, 0x29, 0x4f, 0x6e, 0x51, 0xae, 0x57, 0xa4, 0xf1, 0x64, 0xfb, 0x56, 0xc0, + 0x54, 0xb1, 0xba, 0x2c, 0xa3, 0xb1, 0x39, 0x38, 0x50, 0x11, 0xbf, 0x2f, 0x88, 0xaf, 0xc2, 0x5c, + 0x4f, 0x99, 0x23, 0x60, 0x51, 0xae, 0xe6, 0xd6, 0xde, 0xc9, 0x99, 0xa9, 0x9d, 0x9e, 0x99, 0xda, + 0xef, 0x33, 0x53, 0xfb, 0x70, 0x6e, 0x66, 0x4e, 0xcf, 0xcd, 0xcc, 0xcf, 0x73, 0x33, 0xb3, 0xff, + 0xc4, 0xf3, 0x79, 0xb5, 0x51, 0xb2, 0xcb, 0xb4, 0x16, 0x47, 0xcb, 0xd3, 0xc0, 0x6b, 0x46, 0x3e, + 0xda, 0x40, 0xc7, 0x9d, 0xde, 0xe5, 0xb0, 0x8e, 0x59, 0x49, 0x17, 0x6f, 0xf3, 0xfa, 0xbf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x40, 0x9d, 0x80, 0xce, 0xb4, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -633,12 +603,17 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { - // Parameters queries the parameters of the module. + // Queries the current parameters of the module. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + // Queries all the registered Interchain Queries in the module with filtration by owner and/or + // connection ID. RegisteredQueries(ctx context.Context, in *QueryRegisteredQueriesRequest, opts ...grpc.CallOption) (*QueryRegisteredQueriesResponse, error) + // Queries a registered Interchain Query by ID. RegisteredQuery(ctx context.Context, in *QueryRegisteredQueryRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResponse, error) - QueryResult(ctx context.Context, in *QueryRegisteredQueryResultRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResultResponse, error) - LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeight, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) + // Queries the last successfully submitted result of an Interchain Query. + QueryResult(ctx context.Context, in *QueryQueryResultRequest, opts ...grpc.CallOption) (*QueryQueryResultResponse, error) + // Queries the last height of a remote chain known to the IBC client behind a given connection ID. + LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeightRequest, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) } type queryClient struct { @@ -676,8 +651,8 @@ func (c *queryClient) RegisteredQuery(ctx context.Context, in *QueryRegisteredQu return out, nil } -func (c *queryClient) QueryResult(ctx context.Context, in *QueryRegisteredQueryResultRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResultResponse, error) { - out := new(QueryRegisteredQueryResultResponse) +func (c *queryClient) QueryResult(ctx context.Context, in *QueryQueryResultRequest, opts ...grpc.CallOption) (*QueryQueryResultResponse, error) { + out := new(QueryQueryResultResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Query/QueryResult", in, out, opts...) if err != nil { return nil, err @@ -685,7 +660,7 @@ func (c *queryClient) QueryResult(ctx context.Context, in *QueryRegisteredQueryR return out, nil } -func (c *queryClient) LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeight, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) { +func (c *queryClient) LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeightRequest, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) { out := new(QueryLastRemoteHeightResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Query/LastRemoteHeight", in, out, opts...) if err != nil { @@ -696,12 +671,17 @@ func (c *queryClient) LastRemoteHeight(ctx context.Context, in *QueryLastRemoteH // QueryServer is the server API for Query service. type QueryServer interface { - // Parameters queries the parameters of the module. + // Queries the current parameters of the module. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + // Queries all the registered Interchain Queries in the module with filtration by owner and/or + // connection ID. RegisteredQueries(context.Context, *QueryRegisteredQueriesRequest) (*QueryRegisteredQueriesResponse, error) + // Queries a registered Interchain Query by ID. RegisteredQuery(context.Context, *QueryRegisteredQueryRequest) (*QueryRegisteredQueryResponse, error) - QueryResult(context.Context, *QueryRegisteredQueryResultRequest) (*QueryRegisteredQueryResultResponse, error) - LastRemoteHeight(context.Context, *QueryLastRemoteHeight) (*QueryLastRemoteHeightResponse, error) + // Queries the last successfully submitted result of an Interchain Query. + QueryResult(context.Context, *QueryQueryResultRequest) (*QueryQueryResultResponse, error) + // Queries the last height of a remote chain known to the IBC client behind a given connection ID. + LastRemoteHeight(context.Context, *QueryLastRemoteHeightRequest) (*QueryLastRemoteHeightResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -717,10 +697,10 @@ func (*UnimplementedQueryServer) RegisteredQueries(ctx context.Context, req *Que func (*UnimplementedQueryServer) RegisteredQuery(ctx context.Context, req *QueryRegisteredQueryRequest) (*QueryRegisteredQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RegisteredQuery not implemented") } -func (*UnimplementedQueryServer) QueryResult(ctx context.Context, req *QueryRegisteredQueryResultRequest) (*QueryRegisteredQueryResultResponse, error) { +func (*UnimplementedQueryServer) QueryResult(ctx context.Context, req *QueryQueryResultRequest) (*QueryQueryResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryResult not implemented") } -func (*UnimplementedQueryServer) LastRemoteHeight(ctx context.Context, req *QueryLastRemoteHeight) (*QueryLastRemoteHeightResponse, error) { +func (*UnimplementedQueryServer) LastRemoteHeight(ctx context.Context, req *QueryLastRemoteHeightRequest) (*QueryLastRemoteHeightResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method LastRemoteHeight not implemented") } @@ -783,7 +763,7 @@ func _Query_RegisteredQuery_Handler(srv interface{}, ctx context.Context, dec fu } func _Query_QueryResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryRegisteredQueryResultRequest) + in := new(QueryQueryResultRequest) if err := dec(in); err != nil { return nil, err } @@ -795,13 +775,13 @@ func _Query_QueryResult_Handler(srv interface{}, ctx context.Context, dec func(i FullMethod: "/neutron.interchainqueries.Query/QueryResult", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QueryResult(ctx, req.(*QueryRegisteredQueryResultRequest)) + return srv.(QueryServer).QueryResult(ctx, req.(*QueryQueryResultRequest)) } return interceptor(ctx, in, info, handler) } func _Query_LastRemoteHeight_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryLastRemoteHeight) + in := new(QueryLastRemoteHeightRequest) if err := dec(in); err != nil { return nil, err } @@ -813,7 +793,7 @@ func _Query_LastRemoteHeight_Handler(srv interface{}, ctx context.Context, dec f FullMethod: "/neutron.interchainqueries.Query/LastRemoteHeight", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).LastRemoteHeight(ctx, req.(*QueryLastRemoteHeight)) + return srv.(QueryServer).LastRemoteHeight(ctx, req.(*QueryLastRemoteHeightRequest)) } return interceptor(ctx, in, info, handler) } @@ -1066,7 +1046,7 @@ func (m *QueryRegisteredQueryResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryRegisteredQueryResultRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryQueryResultRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1076,12 +1056,12 @@ func (m *QueryRegisteredQueryResultRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryRegisteredQueryResultRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryQueryResultRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryRegisteredQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1094,7 +1074,7 @@ func (m *QueryRegisteredQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (i return len(dAtA) - i, nil } -func (m *QueryRegisteredQueryResultResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryQueryResultResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1104,12 +1084,12 @@ func (m *QueryRegisteredQueryResultResponse) Marshal() (dAtA []byte, err error) return dAtA[:n], nil } -func (m *QueryRegisteredQueryResultResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryQueryResultResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryRegisteredQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1129,7 +1109,7 @@ func (m *QueryRegisteredQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) ( return len(dAtA) - i, nil } -func (m *Transaction) Marshal() (dAtA []byte, err error) { +func (m *QueryLastRemoteHeightRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1139,52 +1119,12 @@ func (m *Transaction) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Transaction) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryLastRemoteHeightRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Transaction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Data) > 0 { - i -= len(m.Data) - copy(dAtA[i:], m.Data) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Data))) - i-- - dAtA[i] = 0x1a - } - if m.Height != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Height)) - i-- - dAtA[i] = 0x10 - } - if m.Id != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Id)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *QueryLastRemoteHeight) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *QueryLastRemoteHeight) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryLastRemoteHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryLastRemoteHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1219,6 +1159,11 @@ func (m *QueryLastRemoteHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, _ = i var l int _ = l + if m.Revision != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Revision)) + i-- + dAtA[i] = 0x10 + } if m.Height != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.Height)) i-- @@ -1325,7 +1270,7 @@ func (m *QueryRegisteredQueryResponse) Size() (n int) { return n } -func (m *QueryRegisteredQueryResultRequest) Size() (n int) { +func (m *QueryQueryResultRequest) Size() (n int) { if m == nil { return 0 } @@ -1337,7 +1282,7 @@ func (m *QueryRegisteredQueryResultRequest) Size() (n int) { return n } -func (m *QueryRegisteredQueryResultResponse) Size() (n int) { +func (m *QueryQueryResultResponse) Size() (n int) { if m == nil { return 0 } @@ -1350,26 +1295,7 @@ func (m *QueryRegisteredQueryResultResponse) Size() (n int) { return n } -func (m *Transaction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Id != 0 { - n += 1 + sovQuery(uint64(m.Id)) - } - if m.Height != 0 { - n += 1 + sovQuery(uint64(m.Height)) - } - l = len(m.Data) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryLastRemoteHeight) Size() (n int) { +func (m *QueryLastRemoteHeightRequest) Size() (n int) { if m == nil { return 0 } @@ -1391,6 +1317,9 @@ func (m *QueryLastRemoteHeightResponse) Size() (n int) { if m.Height != 0 { n += 1 + sovQuery(uint64(m.Height)) } + if m.Revision != 0 { + n += 1 + sovQuery(uint64(m.Revision)) + } return n } @@ -1958,7 +1887,7 @@ func (m *QueryRegisteredQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryRegisteredQueryResultRequest) Unmarshal(dAtA []byte) error { +func (m *QueryQueryResultRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1981,10 +1910,10 @@ func (m *QueryRegisteredQueryResultRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryRegisteredQueryResultRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryQueryResultRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryRegisteredQueryResultRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryQueryResultRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2027,7 +1956,7 @@ func (m *QueryRegisteredQueryResultRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryRegisteredQueryResultResponse) Unmarshal(dAtA []byte) error { +func (m *QueryQueryResultResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2050,10 +1979,10 @@ func (m *QueryRegisteredQueryResultResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryRegisteredQueryResultResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryQueryResultResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryRegisteredQueryResultResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryQueryResultResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2113,7 +2042,7 @@ func (m *QueryRegisteredQueryResultResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *Transaction) Unmarshal(dAtA []byte) error { +func (m *QueryLastRemoteHeightRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2136,55 +2065,17 @@ func (m *Transaction) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Transaction: wiretype end group for non-group") + return fmt.Errorf("proto: QueryLastRemoteHeightRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Transaction: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryLastRemoteHeightRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) - } - m.Id = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Id |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) - } - m.Height = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Height |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -2194,25 +2085,23 @@ func (m *Transaction) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) - if m.Data == nil { - m.Data = []byte{} - } + m.ConnectionId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -2235,7 +2124,7 @@ func (m *Transaction) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryLastRemoteHeight) Unmarshal(dAtA []byte) error { +func (m *QueryLastRemoteHeightResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2258,17 +2147,17 @@ func (m *QueryLastRemoteHeight) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryLastRemoteHeight: wiretype end group for non-group") + return fmt.Errorf("proto: QueryLastRemoteHeightResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryLastRemoteHeight: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryLastRemoteHeightResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) } - var stringLen uint64 + m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -2278,79 +2167,16 @@ func (m *QueryLastRemoteHeight) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.Height |= uint64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ConnectionId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryLastRemoteHeightResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryLastRemoteHeightResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryLastRemoteHeightResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + case 2: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Revision", wireType) } - m.Height = 0 + m.Revision = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -2360,7 +2186,7 @@ func (m *QueryLastRemoteHeightResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Height |= uint64(b&0x7F) << shift + m.Revision |= uint64(b&0x7F) << shift if b < 0x80 { break } diff --git a/x/interchainqueries/types/query.pb.gw.go b/x/interchainqueries/types/query.pb.gw.go index 8cbfcdc6f..c59d065af 100644 --- a/x/interchainqueries/types/query.pb.gw.go +++ b/x/interchainqueries/types/query.pb.gw.go @@ -128,7 +128,7 @@ var ( ) func request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryRegisteredQueryResultRequest + var protoReq QueryQueryResultRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -144,7 +144,7 @@ func request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshale } func local_request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryRegisteredQueryResultRequest + var protoReq QueryQueryResultRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -164,7 +164,7 @@ var ( ) func request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryLastRemoteHeight + var protoReq QueryLastRemoteHeightRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -180,7 +180,7 @@ func request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Mar } func local_request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryLastRemoteHeight + var protoReq QueryLastRemoteHeightRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index a4a4ca2d9..255a24f47 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - types1 "github.com/cometbft/cometbft/abci/types" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/cosmos-proto" @@ -22,6 +18,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. @@ -35,34 +34,38 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -type MsgRegisterInterchainQuery struct { - // defines a query type: `kv` or `tx` now +// Request type for the Msg/RegisterInterchainQuery RPC method. +type MsgRegisterInterchainQueryRequest struct { + // The query type identifier: `kv` or `tx`. QueryType string `protobuf:"bytes,1,opt,name=query_type,json=queryType,proto3" json:"query_type,omitempty"` - // is used to define KV-storage keys for which we want to get values from - // remote chain + // The KV-storage keys for which we want to get values from remote chain. Only applicable for the + // KV-typed Interchain Queries. Keys []*KVKey `protobuf:"bytes,2,rep,name=keys,proto3" json:"keys,omitempty"` - // is used to define a filter for transaction search ICQ + // A stringified list of filters for remote transactions search. Only applicable for the TX-typed + // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". TransactionsFilter string `protobuf:"bytes,3,opt,name=transactions_filter,json=transactionsFilter,proto3" json:"transactions_filter,omitempty"` - // is IBC connection ID for getting ConsensusState to verify proofs + // The IBC connection ID to the remote chain (the source of querying data). Is used for getting + // ConsensusState from the respective IBC client to verify query result proofs. ConnectionId string `protobuf:"bytes,4,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` - // is used to specify how often (in neutron blocks) the query must be updated + // Parameter that defines the minimal delay between consecutive query executions (i.e. the + // minimal delay between query results update). UpdatePeriod uint64 `protobuf:"varint,5,opt,name=update_period,json=updatePeriod,proto3" json:"update_period,omitempty"` - // is the signer of the message + // The signer of the message. Sender string `protobuf:"bytes,6,opt,name=sender,proto3" json:"sender,omitempty"` } -func (m *MsgRegisterInterchainQuery) Reset() { *m = MsgRegisterInterchainQuery{} } -func (m *MsgRegisterInterchainQuery) String() string { return proto.CompactTextString(m) } -func (*MsgRegisterInterchainQuery) ProtoMessage() {} -func (*MsgRegisterInterchainQuery) Descriptor() ([]byte, []int) { +func (m *MsgRegisterInterchainQueryRequest) Reset() { *m = MsgRegisterInterchainQueryRequest{} } +func (m *MsgRegisterInterchainQueryRequest) String() string { return proto.CompactTextString(m) } +func (*MsgRegisterInterchainQueryRequest) ProtoMessage() {} +func (*MsgRegisterInterchainQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{0} } -func (m *MsgRegisterInterchainQuery) XXX_Unmarshal(b []byte) error { +func (m *MsgRegisterInterchainQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgRegisterInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgRegisterInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgRegisterInterchainQuery.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgRegisterInterchainQueryRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -72,61 +75,63 @@ func (m *MsgRegisterInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } -func (m *MsgRegisterInterchainQuery) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRegisterInterchainQuery.Merge(m, src) +func (m *MsgRegisterInterchainQueryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRegisterInterchainQueryRequest.Merge(m, src) } -func (m *MsgRegisterInterchainQuery) XXX_Size() int { +func (m *MsgRegisterInterchainQueryRequest) XXX_Size() int { return m.Size() } -func (m *MsgRegisterInterchainQuery) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRegisterInterchainQuery.DiscardUnknown(m) +func (m *MsgRegisterInterchainQueryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRegisterInterchainQueryRequest.DiscardUnknown(m) } -var xxx_messageInfo_MsgRegisterInterchainQuery proto.InternalMessageInfo +var xxx_messageInfo_MsgRegisterInterchainQueryRequest proto.InternalMessageInfo -func (m *MsgRegisterInterchainQuery) GetQueryType() string { +func (m *MsgRegisterInterchainQueryRequest) GetQueryType() string { if m != nil { return m.QueryType } return "" } -func (m *MsgRegisterInterchainQuery) GetKeys() []*KVKey { +func (m *MsgRegisterInterchainQueryRequest) GetKeys() []*KVKey { if m != nil { return m.Keys } return nil } -func (m *MsgRegisterInterchainQuery) GetTransactionsFilter() string { +func (m *MsgRegisterInterchainQueryRequest) GetTransactionsFilter() string { if m != nil { return m.TransactionsFilter } return "" } -func (m *MsgRegisterInterchainQuery) GetConnectionId() string { +func (m *MsgRegisterInterchainQueryRequest) GetConnectionId() string { if m != nil { return m.ConnectionId } return "" } -func (m *MsgRegisterInterchainQuery) GetUpdatePeriod() uint64 { +func (m *MsgRegisterInterchainQueryRequest) GetUpdatePeriod() uint64 { if m != nil { return m.UpdatePeriod } return 0 } -func (m *MsgRegisterInterchainQuery) GetSender() string { +func (m *MsgRegisterInterchainQueryRequest) GetSender() string { if m != nil { return m.Sender } return "" } +// Response type for the Msg/RegisterInterchainQuery RPC method. type MsgRegisterInterchainQueryResponse struct { + // The ID assigned to the registered Interchain Query by the module. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` } @@ -170,27 +175,31 @@ func (m *MsgRegisterInterchainQueryResponse) GetId() uint64 { return 0 } -type MsgSubmitQueryResult struct { +// Request type for the Msg/SubmitQueryResult RPC method. +type MsgSubmitQueryResultRequest struct { + // The ID of the Interchain Query. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` - Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` - // is the IBC client ID for an IBC connection between Neutron chain and target - // chain (where the result was obtained from) - ClientId string `protobuf:"bytes,3,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - Result *QueryResult `protobuf:"bytes,4,opt,name=result,proto3" json:"result,omitempty"` -} - -func (m *MsgSubmitQueryResult) Reset() { *m = MsgSubmitQueryResult{} } -func (m *MsgSubmitQueryResult) String() string { return proto.CompactTextString(m) } -func (*MsgSubmitQueryResult) ProtoMessage() {} -func (*MsgSubmitQueryResult) Descriptor() ([]byte, []int) { + // The signer of the message. + Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` + // The IBC client ID that corresponds to the IBC connection to the remote chain (where the + // query result is coming from). + ClientId string `protobuf:"bytes,3,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + // The result of the Interchain Query execution. + Result *QueryResult `protobuf:"bytes,4,opt,name=result,proto3" json:"result,omitempty"` +} + +func (m *MsgSubmitQueryResultRequest) Reset() { *m = MsgSubmitQueryResultRequest{} } +func (m *MsgSubmitQueryResultRequest) String() string { return proto.CompactTextString(m) } +func (*MsgSubmitQueryResultRequest) ProtoMessage() {} +func (*MsgSubmitQueryResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{2} } -func (m *MsgSubmitQueryResult) XXX_Unmarshal(b []byte) error { +func (m *MsgSubmitQueryResultRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgSubmitQueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgSubmitQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgSubmitQueryResult.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgSubmitQueryResultRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -200,52 +209,68 @@ func (m *MsgSubmitQueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *MsgSubmitQueryResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSubmitQueryResult.Merge(m, src) +func (m *MsgSubmitQueryResultRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSubmitQueryResultRequest.Merge(m, src) } -func (m *MsgSubmitQueryResult) XXX_Size() int { +func (m *MsgSubmitQueryResultRequest) XXX_Size() int { return m.Size() } -func (m *MsgSubmitQueryResult) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSubmitQueryResult.DiscardUnknown(m) +func (m *MsgSubmitQueryResultRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSubmitQueryResultRequest.DiscardUnknown(m) } -var xxx_messageInfo_MsgSubmitQueryResult proto.InternalMessageInfo +var xxx_messageInfo_MsgSubmitQueryResultRequest proto.InternalMessageInfo -func (m *MsgSubmitQueryResult) GetQueryId() uint64 { +func (m *MsgSubmitQueryResultRequest) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -func (m *MsgSubmitQueryResult) GetSender() string { +func (m *MsgSubmitQueryResultRequest) GetSender() string { if m != nil { return m.Sender } return "" } -func (m *MsgSubmitQueryResult) GetClientId() string { +func (m *MsgSubmitQueryResultRequest) GetClientId() string { if m != nil { return m.ClientId } return "" } -func (m *MsgSubmitQueryResult) GetResult() *QueryResult { +func (m *MsgSubmitQueryResultRequest) GetResult() *QueryResult { if m != nil { return m.Result } return nil } +// Contains different information about a single Interchain Query execution result. Currently, +// this structure is used both in query result submission via an ICQ Relayer and as a query result +// storage for read/write operations to interchainqueries module, but the structure fields are +// populated in a bit different ways. When submitting a query result, all fields are populated and +// provided to the interchainqueries module in order to verify the result against the IBC client's +// state. But in order to lighten the chain state, the interchainqueries module removes the block +// field and proofs from the kv_results. type QueryResult struct { - KvResults []*StorageValue `protobuf:"bytes,1,rep,name=kv_results,json=kvResults,proto3" json:"kv_results,omitempty"` - Block *Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` - Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` - Revision uint64 `protobuf:"varint,4,opt,name=revision,proto3" json:"revision,omitempty"` - AllowKvCallbacks bool `protobuf:"varint,5,opt,name=allow_kv_callbacks,json=allowKvCallbacks,proto3" json:"allow_kv_callbacks,omitempty"` + // A list of a KV Interchain Query execution results. Each result contains query parameters, a + // response value and a proof. + KvResults []*StorageValue `protobuf:"bytes,1,rep,name=kv_results,json=kvResults,proto3" json:"kv_results,omitempty"` + // A TX Interchain Query execution result. Contains metainformation about the blocks of the query + // execution height. Only populated when submitting an Interchain Query result for verification + // and emptied when saving the result on chain. + Block *Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + // The height of the chain at the moment of the Interchain Query execution. + Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` + // The revision number of the chain at the moment of the Interchain Query execution. + Revision uint64 `protobuf:"varint,4,opt,name=revision,proto3" json:"revision,omitempty"` + // Whether to send the query result to the owner contract as a sudo message. Only applicable for + // KV type of Interchain Queries. + AllowKvCallbacks bool `protobuf:"varint,5,opt,name=allow_kv_callbacks,json=allowKvCallbacks,proto3" json:"allow_kv_callbacks,omitempty"` } func (m *QueryResult) Reset() { *m = QueryResult{} } @@ -316,15 +341,17 @@ func (m *QueryResult) GetAllowKvCallbacks() bool { return false } +// A verifiable result of performing a single KVKey read. type StorageValue struct { - // is the substore name (acc, staking, etc.) + // The first half of the storage path. It is supposed to be a substore name for the query + // (e.g. bank, staking, etc.). StoragePrefix string `protobuf:"bytes,1,opt,name=storage_prefix,json=storagePrefix,proto3" json:"storage_prefix,omitempty"` - // is the key in IAVL store + // The second half of the storage path. The remaining part of a full path to an IAVL storage node. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` - // is the value in IAVL store + // A base64-encoded value read from the given storage path. Value []byte `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` - // is the Merkle Proof which proves existence of key-value pair in IAVL - // storage + // The Merkle Proof which proves existence of key-value pair in IAVL storage. Is used to verify + // the pair against the respective remote chain's header. Proof *crypto.ProofOps `protobuf:"bytes,4,opt,name=Proof,proto3" json:"Proof,omitempty"` } @@ -389,14 +416,17 @@ func (m *StorageValue) GetProof() *crypto.ProofOps { return nil } +// A single verifiable result of an Interchain Query of TX type. type Block struct { - // We need to know block X+1 to verify response of transaction for block X - // since LastResultsHash is root hash of all results from the txs from the - // previous block + // The header of the block next to the block the transaction is included in. It is needed to know + // block X+1 header to verify response of transaction for block X since LastResultsHash is root + // hash of all results of the txs from the previous block. NextBlockHeader *types.Any `protobuf:"bytes,1,opt,name=next_block_header,json=nextBlockHeader,proto3" json:"next_block_header,omitempty"` - // We need to know block X to verify inclusion of transaction for block X + // The header of the block the transaction is included in. It is needed to know block header to + // verify inclusion of the transaction. Header *types.Any `protobuf:"bytes,2,opt,name=header,proto3" json:"header,omitempty"` - Tx *TxValue `protobuf:"bytes,3,opt,name=tx,proto3" json:"tx,omitempty"` + // The transaction matched by the Interchain Query's transaction filter. + Tx *TxValue `protobuf:"bytes,3,opt,name=tx,proto3" json:"tx,omitempty"` } func (m *Block) Reset() { *m = Block{} } @@ -453,15 +483,16 @@ func (m *Block) GetTx() *TxValue { return nil } +// Contains transaction body, response, and proofs of inclusion and delivery. type TxValue struct { + // The result of the transaction execution. Response *types1.ExecTxResult `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"` - // is the Merkle Proof which proves existence of response in block with height - // next_block_header.Height + // The Merkle Proof which proves existence of response in the block next to the block the + // transaction is included in. DeliveryProof *crypto.Proof `protobuf:"bytes,2,opt,name=delivery_proof,json=deliveryProof,proto3" json:"delivery_proof,omitempty"` - // is the Merkle Proof which proves existence of data in block with height - // header.Height + // The Merkle Proof which proves inclusion of the transaction in the block. InclusionProof *crypto.Proof `protobuf:"bytes,3,opt,name=inclusion_proof,json=inclusionProof,proto3" json:"inclusion_proof,omitempty"` - // is body of the transaction + // The arbitrary data typed body of the transaction. Data []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"` } @@ -526,6 +557,7 @@ func (m *TxValue) GetData() []byte { return nil } +// Response type for the Msg/SubmitQueryResult RPC method. type MsgSubmitQueryResultResponse struct { } @@ -562,9 +594,12 @@ func (m *MsgSubmitQueryResultResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSubmitQueryResultResponse proto.InternalMessageInfo +// Request type for the Msg/RemoveInterchainQuery RPC method. type MsgRemoveInterchainQueryRequest struct { + // The ID of the query to remove. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` - Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` + // The signer of the message. + Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` } func (m *MsgRemoveInterchainQueryRequest) Reset() { *m = MsgRemoveInterchainQueryRequest{} } @@ -614,6 +649,7 @@ func (m *MsgRemoveInterchainQueryRequest) GetSender() string { return "" } +// Response type for the Msg/RemoveInterchainQuery RPC method. type MsgRemoveInterchainQueryResponse struct { } @@ -650,12 +686,20 @@ func (m *MsgRemoveInterchainQueryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRemoveInterchainQueryResponse proto.InternalMessageInfo +// Request type for the Msg/UpdateInterchainQuery RPC method. type MsgUpdateInterchainQueryRequest struct { - QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` - NewKeys []*KVKey `protobuf:"bytes,2,rep,name=new_keys,json=newKeys,proto3" json:"new_keys,omitempty"` - NewUpdatePeriod uint64 `protobuf:"varint,3,opt,name=new_update_period,json=newUpdatePeriod,proto3" json:"new_update_period,omitempty"` - NewTransactionsFilter string `protobuf:"bytes,4,opt,name=new_transactions_filter,json=newTransactionsFilter,proto3" json:"new_transactions_filter,omitempty"` - Sender string `protobuf:"bytes,5,opt,name=sender,proto3" json:"sender,omitempty"` + // The ID of the query to update. + QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` + // A new list of KV-storage keys for which to get values from the remote chain. Only applicable + // for a KV-typed Interchain Query. + NewKeys []*KVKey `protobuf:"bytes,2,rep,name=new_keys,json=newKeys,proto3" json:"new_keys,omitempty"` + // A new minimal delay between consecutive query executions. + NewUpdatePeriod uint64 `protobuf:"varint,3,opt,name=new_update_period,json=newUpdatePeriod,proto3" json:"new_update_period,omitempty"` + // A new list of filters for remote transactions search. Only applicable for a TX-typed + // Interchain Query. + NewTransactionsFilter string `protobuf:"bytes,4,opt,name=new_transactions_filter,json=newTransactionsFilter,proto3" json:"new_transactions_filter,omitempty"` + // The signer of the message. + Sender string `protobuf:"bytes,5,opt,name=sender,proto3" json:"sender,omitempty"` } func (m *MsgUpdateInterchainQueryRequest) Reset() { *m = MsgUpdateInterchainQueryRequest{} } @@ -726,6 +770,7 @@ func (m *MsgUpdateInterchainQueryRequest) GetSender() string { return "" } +// Response type for the Msg/UpdateInterchainQuery RPC method. type MsgUpdateInterchainQueryResponse struct { } @@ -762,30 +807,26 @@ func (m *MsgUpdateInterchainQueryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateInterchainQueryResponse proto.InternalMessageInfo -// MsgUpdateParams is the MsgUpdateParams request type. -// -// Since: 0.47 -type MsgUpdateParams struct { - // Authority is the address of the governance account. +// Request type for the Msg/UpdateParams RPC method. +type MsgUpdateParamsRequest struct { + // The address of the authority of the module. Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` - // params defines the x/interchainqueries parameters to update. - // - // NOTE: All parameters must be supplied. + // The new parameters of the module. All parameters must be supplied. Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` } -func (m *MsgUpdateParams) Reset() { *m = MsgUpdateParams{} } -func (m *MsgUpdateParams) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateParams) ProtoMessage() {} -func (*MsgUpdateParams) Descriptor() ([]byte, []int) { +func (m *MsgUpdateParamsRequest) Reset() { *m = MsgUpdateParamsRequest{} } +func (m *MsgUpdateParamsRequest) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateParamsRequest) ProtoMessage() {} +func (*MsgUpdateParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{12} } -func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateParams.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateParamsRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -795,36 +836,33 @@ func (m *MsgUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (m *MsgUpdateParams) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateParams.Merge(m, src) +func (m *MsgUpdateParamsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParamsRequest.Merge(m, src) } -func (m *MsgUpdateParams) XXX_Size() int { +func (m *MsgUpdateParamsRequest) XXX_Size() int { return m.Size() } -func (m *MsgUpdateParams) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateParams.DiscardUnknown(m) +func (m *MsgUpdateParamsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateParamsRequest.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateParamsRequest proto.InternalMessageInfo -func (m *MsgUpdateParams) GetAuthority() string { +func (m *MsgUpdateParamsRequest) GetAuthority() string { if m != nil { return m.Authority } return "" } -func (m *MsgUpdateParams) GetParams() Params { +func (m *MsgUpdateParamsRequest) GetParams() Params { if m != nil { return m.Params } return Params{} } -// MsgUpdateParamsResponse defines the response structure for executing a -// MsgUpdateParams message. -// -// Since: 0.47 +// Response type for the Msg/UpdateParams RPC method. type MsgUpdateParamsResponse struct { } @@ -862,9 +900,9 @@ func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgRegisterInterchainQuery)(nil), "neutron.interchainqueries.MsgRegisterInterchainQuery") + proto.RegisterType((*MsgRegisterInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgRegisterInterchainQueryRequest") proto.RegisterType((*MsgRegisterInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgRegisterInterchainQueryResponse") - proto.RegisterType((*MsgSubmitQueryResult)(nil), "neutron.interchainqueries.MsgSubmitQueryResult") + proto.RegisterType((*MsgSubmitQueryResultRequest)(nil), "neutron.interchainqueries.MsgSubmitQueryResultRequest") proto.RegisterType((*QueryResult)(nil), "neutron.interchainqueries.QueryResult") proto.RegisterType((*StorageValue)(nil), "neutron.interchainqueries.StorageValue") proto.RegisterType((*Block)(nil), "neutron.interchainqueries.Block") @@ -874,7 +912,7 @@ func init() { proto.RegisterType((*MsgRemoveInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgRemoveInterchainQueryResponse") proto.RegisterType((*MsgUpdateInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryRequest") proto.RegisterType((*MsgUpdateInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryResponse") - proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchainqueries.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsRequest)(nil), "neutron.interchainqueries.MsgUpdateParamsRequest") proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchainqueries.MsgUpdateParamsResponse") } @@ -883,80 +921,81 @@ func init() { } var fileDescriptor_d4793837a316491e = []byte{ - // 1164 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x4f, 0x1b, 0x47, - 0x14, 0x67, 0x8d, 0x4d, 0xf0, 0xe0, 0x40, 0x32, 0x25, 0xc5, 0x38, 0x8d, 0x43, 0xb6, 0x6a, 0x12, - 0xa1, 0x64, 0x57, 0x71, 0x29, 0x55, 0x41, 0xfd, 0x03, 0x6d, 0xa3, 0x22, 0x84, 0x4a, 0x17, 0xc8, - 0xa1, 0x97, 0xd5, 0x7a, 0x77, 0x58, 0x8f, 0xbc, 0x9e, 0x71, 0x76, 0x66, 0xfd, 0xe7, 0x50, 0xa9, - 0xca, 0xb1, 0x97, 0xd2, 0x6f, 0x51, 0xa9, 0x17, 0xa4, 0xf4, 0x2b, 0x54, 0xca, 0x31, 0xea, 0xa9, - 0x87, 0xaa, 0xaa, 0xe0, 0xc0, 0xb1, 0x5f, 0xa1, 0x9a, 0x3f, 0x6b, 0x4c, 0x8c, 0x4d, 0xe0, 0x02, - 0xfb, 0xde, 0xfb, 0xbd, 0x37, 0xbf, 0xf9, 0xcd, 0xbc, 0x37, 0x06, 0x26, 0x41, 0x09, 0x8f, 0x29, - 0xb1, 0x31, 0xe1, 0x28, 0xf6, 0x6b, 0x1e, 0x26, 0xcf, 0x13, 0x14, 0x63, 0xc4, 0x6c, 0xde, 0xb1, - 0x9a, 0x31, 0xe5, 0x14, 0xce, 0x6b, 0x8c, 0x35, 0x80, 0x29, 0xdd, 0xf4, 0x1a, 0x98, 0x50, 0x5b, - 0xfe, 0x55, 0xe8, 0xd2, 0x9c, 0x4f, 0x59, 0x83, 0x32, 0xbb, 0xc1, 0x42, 0xbb, 0xf5, 0x44, 0xfc, - 0xd3, 0x81, 0x79, 0x15, 0x70, 0xa5, 0x65, 0x2b, 0x43, 0x87, 0x66, 0x43, 0x1a, 0x52, 0xe5, 0x17, - 0x5f, 0x69, 0x42, 0x48, 0x69, 0x18, 0x21, 0x5b, 0x5a, 0xd5, 0x64, 0xdf, 0xf6, 0x48, 0x57, 0x87, - 0x1e, 0x0c, 0xa7, 0x1d, 0x22, 0x82, 0x18, 0x4e, 0x2b, 0xdf, 0x1f, 0x0e, 0x6c, 0x7a, 0xb1, 0xd7, - 0x48, 0x71, 0xb7, 0x39, 0x22, 0x01, 0x8a, 0x1b, 0x98, 0x70, 0xdb, 0xab, 0xfa, 0xd8, 0xe6, 0xdd, - 0x26, 0x4a, 0x83, 0x77, 0xfa, 0x82, 0x7e, 0xdc, 0x6d, 0x72, 0x2a, 0x38, 0xd1, 0x7d, 0x15, 0x36, - 0x7f, 0xc9, 0x80, 0xd2, 0x16, 0x0b, 0x1d, 0x14, 0x62, 0xc6, 0x51, 0xbc, 0xd1, 0x5b, 0xe9, 0xbb, - 0x04, 0xc5, 0x5d, 0x78, 0x07, 0x00, 0xb1, 0x64, 0xd7, 0x15, 0x25, 0x8b, 0xc6, 0x82, 0xf1, 0x30, - 0xef, 0xe4, 0xa5, 0x67, 0xb7, 0xdb, 0x44, 0x70, 0x09, 0x64, 0xeb, 0xa8, 0xcb, 0x8a, 0x99, 0x85, - 0xf1, 0x87, 0x53, 0x95, 0x05, 0x6b, 0xa8, 0xd8, 0xd6, 0xe6, 0xb3, 0x4d, 0xd4, 0x75, 0x24, 0x1a, - 0xda, 0xe0, 0x1d, 0x1e, 0x7b, 0x84, 0x79, 0x3e, 0xc7, 0x94, 0x30, 0x77, 0x1f, 0x47, 0x1c, 0xc5, - 0xc5, 0x71, 0x59, 0x1d, 0xf6, 0x87, 0x9e, 0xca, 0x08, 0x7c, 0x1f, 0x5c, 0xf7, 0x29, 0x21, 0x48, - 0x3a, 0x5d, 0x1c, 0x14, 0xb3, 0x12, 0x5a, 0x38, 0x75, 0x6e, 0x04, 0x02, 0x94, 0x34, 0x03, 0x8f, - 0x23, 0xb7, 0x89, 0x62, 0x4c, 0x83, 0x62, 0x6e, 0xc1, 0x78, 0x98, 0x75, 0x0a, 0xca, 0xb9, 0x2d, - 0x7d, 0xf0, 0x5d, 0x30, 0xc1, 0xa4, 0x1e, 0xc5, 0x09, 0x59, 0x42, 0x5b, 0x2b, 0x53, 0x2f, 0x4e, - 0x0e, 0x17, 0xb5, 0x61, 0x2e, 0x01, 0x73, 0xb8, 0x24, 0x0e, 0x62, 0x4d, 0x4a, 0x18, 0x82, 0xd3, - 0x20, 0x83, 0x03, 0x29, 0x49, 0xd6, 0xc9, 0xe0, 0xc0, 0x7c, 0x69, 0x80, 0xd9, 0x2d, 0x16, 0xee, - 0x24, 0xd5, 0x06, 0xe6, 0x29, 0x34, 0x89, 0x38, 0x9c, 0x07, 0x93, 0x4a, 0xc3, 0x1e, 0xfc, 0x9a, - 0xb4, 0x37, 0xfa, 0xe9, 0x64, 0xfa, 0xe9, 0xc0, 0xdb, 0x20, 0xef, 0x47, 0x18, 0x11, 0x2e, 0x72, - 0x94, 0x2e, 0x93, 0xca, 0xb1, 0x11, 0xc0, 0xcf, 0xc0, 0x44, 0x2c, 0x2b, 0x4b, 0x19, 0xa6, 0x2a, - 0xf7, 0x47, 0xc8, 0xde, 0xc7, 0xc3, 0xd1, 0x59, 0x67, 0xf7, 0xfa, 0x9f, 0x01, 0xa6, 0xfa, 0xc9, - 0x3e, 0x05, 0xa0, 0xde, 0x72, 0x15, 0x92, 0x15, 0x0d, 0x79, 0xae, 0x0f, 0x46, 0x2c, 0xb0, 0xc3, - 0x69, 0xec, 0x85, 0xe8, 0x99, 0x17, 0x25, 0xc8, 0xc9, 0xd7, 0x5b, 0xaa, 0x0c, 0x83, 0xcb, 0x20, - 0x57, 0x8d, 0xa8, 0x5f, 0x97, 0x1b, 0x1b, 0x7d, 0x35, 0xd6, 0x05, 0xce, 0x51, 0x70, 0xa1, 0x48, - 0x0d, 0xe1, 0xb0, 0xc6, 0xe5, 0xb6, 0xb3, 0x8e, 0xb6, 0x60, 0x09, 0x4c, 0xc6, 0xa8, 0x85, 0x19, - 0xa6, 0x44, 0x6e, 0x3b, 0xeb, 0xf4, 0x6c, 0xf8, 0x08, 0x40, 0x2f, 0x8a, 0x68, 0xdb, 0xad, 0xb7, - 0x5c, 0xdf, 0x8b, 0xa2, 0xaa, 0xe7, 0xd7, 0x99, 0x3c, 0xfe, 0x49, 0xe7, 0x86, 0x8c, 0x6c, 0xb6, - 0xbe, 0x4c, 0xfd, 0xe6, 0x81, 0x01, 0x0a, 0xfd, 0xac, 0xe1, 0x07, 0x60, 0x9a, 0x29, 0xdb, 0x6d, - 0xc6, 0x68, 0x1f, 0x77, 0xf4, 0x3d, 0xbf, 0xae, 0xbd, 0xdb, 0xd2, 0x09, 0x6f, 0x80, 0xf1, 0x3a, - 0xea, 0xca, 0xfd, 0x14, 0x1c, 0xf1, 0x09, 0x67, 0x41, 0xae, 0x25, 0x2a, 0x48, 0xaa, 0x05, 0x47, - 0x19, 0xf0, 0x09, 0xc8, 0x6d, 0x8b, 0x06, 0xd3, 0xa7, 0x73, 0xdb, 0x3a, 0x6d, 0x40, 0x4b, 0x35, - 0xa0, 0x25, 0xe3, 0xdf, 0x36, 0x99, 0xa3, 0x90, 0xe6, 0x6f, 0x06, 0xc8, 0x49, 0x15, 0xe0, 0x17, - 0xe0, 0x26, 0x41, 0x1d, 0xee, 0x4a, 0x31, 0xdc, 0x1a, 0xf2, 0xc4, 0xdd, 0x30, 0x64, 0xa1, 0x59, - 0x4b, 0x8d, 0x14, 0x2b, 0x1d, 0x29, 0xd6, 0x1a, 0xe9, 0x3a, 0x33, 0x02, 0x2e, 0x73, 0xbf, 0x91, - 0x60, 0xf8, 0x48, 0x08, 0xe8, 0xa5, 0x57, 0x6a, 0x58, 0x9a, 0xc6, 0xc0, 0x0a, 0xc8, 0xf0, 0x8e, - 0xe4, 0x3f, 0x55, 0x31, 0x47, 0x9c, 0xd1, 0x6e, 0x47, 0x9d, 0x70, 0x86, 0x77, 0xcc, 0xbf, 0x0d, - 0x70, 0x4d, 0xdb, 0xf0, 0x13, 0x71, 0x2c, 0xaa, 0x21, 0x34, 0xcd, 0x3b, 0xfd, 0xfb, 0x15, 0xd3, - 0xc8, 0xfa, 0xba, 0x83, 0xfc, 0xdd, 0x8e, 0xbe, 0x84, 0x3d, 0x38, 0xfc, 0x1c, 0x4c, 0x07, 0x28, - 0xc2, 0x2d, 0xd1, 0x19, 0x72, 0x22, 0x69, 0xc2, 0xc5, 0x61, 0x82, 0x39, 0xd7, 0x53, 0xbc, 0x34, - 0xe1, 0x1a, 0x98, 0xc1, 0xc4, 0x8f, 0x12, 0x71, 0x07, 0x74, 0x85, 0xf1, 0x0b, 0x2a, 0x4c, 0xf7, - 0x12, 0x54, 0x09, 0x08, 0xb2, 0x81, 0xc7, 0x3d, 0x79, 0x54, 0x05, 0x47, 0x7e, 0x9b, 0x65, 0xf0, - 0xde, 0x79, 0x6d, 0x9c, 0xf6, 0xbd, 0xe9, 0x81, 0xbb, 0x72, 0x3a, 0x34, 0x68, 0x0b, 0x0d, 0xcc, - 0x86, 0xe7, 0x09, 0x62, 0x57, 0xe9, 0xf8, 0xb3, 0x4d, 0x69, 0x82, 0x85, 0xe1, 0x4b, 0x68, 0x1a, - 0x2f, 0x32, 0x92, 0xc7, 0x9e, 0x9c, 0x6e, 0x97, 0xe7, 0xb1, 0x0a, 0x26, 0x09, 0x6a, 0xbb, 0x97, - 0x9a, 0xde, 0xd7, 0x08, 0x6a, 0x6f, 0x8a, 0x01, 0xbe, 0x28, 0x6e, 0x69, 0xdb, 0x3d, 0x3b, 0x6e, - 0x55, 0xbf, 0xce, 0x10, 0xd4, 0xde, 0xeb, 0x9f, 0xb8, 0xcb, 0x60, 0x4e, 0x60, 0xcf, 0x1b, 0xf8, - 0x6a, 0x8a, 0xdf, 0x22, 0xa8, 0xbd, 0x3b, 0x38, 0xf3, 0x4f, 0x85, 0xca, 0x5d, 0x24, 0xd4, 0x10, - 0x0d, 0xb4, 0x50, 0x7f, 0x18, 0x60, 0xa6, 0x07, 0xda, 0x96, 0xef, 0x26, 0x5c, 0x06, 0x79, 0x2f, - 0xe1, 0x35, 0x1a, 0x63, 0xde, 0x55, 0xdd, 0xbe, 0x5e, 0xfc, 0xf3, 0xf7, 0xc7, 0xb3, 0xfa, 0x61, - 0x5f, 0x0b, 0x82, 0x18, 0x31, 0xb6, 0xc3, 0x63, 0x4c, 0x42, 0xe7, 0x14, 0x0a, 0xbf, 0x02, 0x13, - 0xea, 0xe5, 0xd5, 0x77, 0xf5, 0xde, 0x08, 0xcd, 0xd4, 0x52, 0xeb, 0xf9, 0x57, 0xff, 0xdc, 0x1d, - 0xfb, 0xf5, 0xe4, 0x70, 0xd1, 0x70, 0x74, 0xee, 0xca, 0x92, 0xd8, 0xc2, 0x69, 0xd5, 0x9f, 0x4e, - 0x0e, 0x17, 0xef, 0x0d, 0x3e, 0xf1, 0x6f, 0x70, 0x36, 0xe7, 0xc1, 0xdc, 0x1b, 0xae, 0x74, 0x8b, - 0x95, 0x97, 0x39, 0x30, 0xbe, 0xc5, 0x42, 0xf8, 0xb3, 0x01, 0xe6, 0x86, 0xbd, 0xe4, 0x1f, 0x8d, - 0xa0, 0x3a, 0xfc, 0xb5, 0x2b, 0x7d, 0x7a, 0xa5, 0xb4, 0xde, 0x23, 0xf9, 0x03, 0xb8, 0x39, 0xf8, - 0x20, 0xda, 0xa3, 0x6b, 0x0e, 0x24, 0x94, 0x3e, 0xbe, 0x64, 0x42, 0x6f, 0xf9, 0x03, 0x03, 0xdc, - 0x3a, 0xb7, 0x8d, 0xe0, 0xca, 0x45, 0xfb, 0x1a, 0xde, 0xde, 0xa5, 0xd5, 0x2b, 0xe5, 0xf6, 0x51, - 0x3a, 0xf7, 0xc2, 0x5e, 0x44, 0x69, 0x54, 0xa7, 0x5f, 0x44, 0x69, 0x64, 0x87, 0x40, 0x02, 0x0a, - 0x67, 0xba, 0x63, 0xf1, 0x6d, 0x8a, 0x29, 0x6c, 0xa9, 0xf2, 0xf6, 0xd8, 0x74, 0xbd, 0x52, 0xee, - 0x47, 0xd1, 0x0e, 0xeb, 0x7b, 0xaf, 0x8e, 0xca, 0xc6, 0xeb, 0xa3, 0xb2, 0xf1, 0xef, 0x51, 0xd9, - 0x38, 0x38, 0x2e, 0x8f, 0xbd, 0x3e, 0x2e, 0x8f, 0xfd, 0x75, 0x5c, 0x1e, 0xfb, 0x7e, 0x35, 0xc4, - 0xbc, 0x96, 0x54, 0x2d, 0x9f, 0x36, 0x6c, 0x5d, 0xfe, 0x31, 0x8d, 0xc3, 0xf4, 0xdb, 0x6e, 0x2d, - 0xd9, 0x9d, 0xf3, 0x7e, 0xf4, 0x8b, 0x9f, 0xbd, 0xd5, 0x09, 0xf9, 0xd0, 0x7d, 0xf8, 0x7f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xaf, 0x02, 0x2b, 0xa7, 0x1e, 0x0c, 0x00, 0x00, + // 1175 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcf, 0x4f, 0x1b, 0xc7, + 0x17, 0x67, 0x8d, 0x4d, 0xf0, 0xe0, 0x90, 0x64, 0xbe, 0x24, 0x18, 0xf3, 0x8d, 0x43, 0xb6, 0x6a, + 0x82, 0x50, 0xb2, 0x2b, 0x5c, 0x44, 0x55, 0xe8, 0x2f, 0x68, 0x1b, 0x15, 0x21, 0x54, 0xba, 0x40, + 0x0e, 0xbd, 0xac, 0xd6, 0xbb, 0xc3, 0x7a, 0xe4, 0xf5, 0x8c, 0xb3, 0x33, 0xeb, 0x1f, 0xb7, 0x2a, + 0xea, 0xa9, 0x27, 0x4e, 0x55, 0xff, 0x84, 0x4a, 0xbd, 0x70, 0xe8, 0xa9, 0x7f, 0x41, 0x2a, 0xf5, + 0x10, 0xf5, 0xd4, 0x43, 0x55, 0x55, 0x70, 0xe0, 0xd8, 0x7f, 0xa1, 0x9a, 0x1f, 0x6b, 0x4c, 0xc1, + 0x76, 0xc9, 0x25, 0xd9, 0x37, 0xef, 0xf3, 0xde, 0x7c, 0xe6, 0x33, 0xef, 0xbd, 0x31, 0xc0, 0x24, + 0x28, 0xe1, 0x31, 0x25, 0x36, 0x26, 0x1c, 0xc5, 0x7e, 0xcd, 0xc3, 0xe4, 0x45, 0x82, 0x62, 0x8c, + 0x98, 0xcd, 0x3b, 0x56, 0x33, 0xa6, 0x9c, 0xc2, 0x39, 0x8d, 0xb1, 0x2e, 0x61, 0x4a, 0x77, 0xbc, + 0x06, 0x26, 0xd4, 0x96, 0xff, 0x2a, 0x74, 0x69, 0xd6, 0xa7, 0xac, 0x41, 0x99, 0xdd, 0x60, 0xa1, + 0xdd, 0x5a, 0x16, 0xff, 0x69, 0xc7, 0x9c, 0x72, 0xb8, 0xd2, 0xb2, 0x95, 0xa1, 0x5d, 0x33, 0x21, + 0x0d, 0xa9, 0x5a, 0x17, 0x5f, 0x69, 0x40, 0x48, 0x69, 0x18, 0x21, 0x5b, 0x5a, 0xd5, 0xe4, 0xd0, + 0xf6, 0x48, 0x57, 0xbb, 0x1e, 0x0f, 0xa6, 0x1d, 0x22, 0x82, 0x18, 0x4e, 0x33, 0x3f, 0x1a, 0x0c, + 0x6c, 0x7a, 0xb1, 0xd7, 0x48, 0x71, 0xf3, 0x1c, 0x91, 0x00, 0xc5, 0x0d, 0x4c, 0xb8, 0xed, 0x55, + 0x7d, 0x6c, 0xf3, 0x6e, 0x13, 0xa5, 0xce, 0xfb, 0x7d, 0x4e, 0x3f, 0xee, 0x36, 0x39, 0x15, 0x9c, + 0xe8, 0xa1, 0x72, 0x9b, 0xdf, 0x67, 0xc0, 0xc3, 0x1d, 0x16, 0x3a, 0x28, 0xc4, 0x8c, 0xa3, 0x78, + 0xab, 0xb7, 0xd3, 0x97, 0x09, 0x8a, 0xbb, 0x0e, 0x7a, 0x91, 0x20, 0xc6, 0xe1, 0x7d, 0x00, 0xc4, + 0xce, 0x5d, 0x57, 0x64, 0x2e, 0x1a, 0x0b, 0xc6, 0x62, 0xde, 0xc9, 0xcb, 0x95, 0xfd, 0x6e, 0x13, + 0xc1, 0x15, 0x90, 0xad, 0xa3, 0x2e, 0x2b, 0x66, 0x16, 0xc6, 0x17, 0xa7, 0x2a, 0x0b, 0xd6, 0x40, + 0xcd, 0xad, 0xed, 0xe7, 0xdb, 0xa8, 0xeb, 0x48, 0x34, 0xb4, 0xc1, 0xff, 0x78, 0xec, 0x11, 0xe6, + 0xf9, 0x1c, 0x53, 0xc2, 0xdc, 0x43, 0x1c, 0x71, 0x14, 0x17, 0xc7, 0x65, 0x76, 0xd8, 0xef, 0x7a, + 0x26, 0x3d, 0xf0, 0x2d, 0x70, 0xd3, 0xa7, 0x84, 0x20, 0xb9, 0xe8, 0xe2, 0xa0, 0x98, 0x95, 0xd0, + 0xc2, 0xf9, 0xe2, 0x56, 0x20, 0x40, 0x49, 0x33, 0xf0, 0x38, 0x72, 0x9b, 0x28, 0xc6, 0x34, 0x28, + 0xe6, 0x16, 0x8c, 0xc5, 0xac, 0x53, 0x50, 0x8b, 0xbb, 0x72, 0x0d, 0xde, 0x03, 0x13, 0x4c, 0xca, + 0x52, 0x9c, 0x90, 0x29, 0xb4, 0xb5, 0x36, 0xf5, 0xf2, 0xec, 0x78, 0x49, 0x1b, 0xe6, 0x0a, 0x30, + 0x87, 0x29, 0xc3, 0x9a, 0x94, 0x30, 0x04, 0xa7, 0x41, 0x06, 0x07, 0x52, 0x92, 0xac, 0x93, 0xc1, + 0x81, 0xf9, 0xb3, 0x01, 0xe6, 0x77, 0x58, 0xb8, 0x97, 0x54, 0x1b, 0x98, 0xa7, 0xd0, 0x24, 0xe2, + 0xa9, 0x94, 0x73, 0x60, 0x52, 0x49, 0xd9, 0x8b, 0xba, 0x21, 0xed, 0xad, 0x7e, 0x56, 0x99, 0x7e, + 0x56, 0x70, 0x1e, 0xe4, 0xfd, 0x08, 0x23, 0xc2, 0x45, 0x8c, 0x92, 0x67, 0x52, 0x2d, 0x6c, 0x05, + 0xf0, 0x43, 0x30, 0x11, 0xcb, 0x0d, 0xa4, 0x1a, 0x53, 0x95, 0x47, 0x43, 0xd4, 0xef, 0xa7, 0xa3, + 0xa3, 0x2e, 0x1e, 0xf9, 0x6f, 0x03, 0x4c, 0xf5, 0x81, 0xe0, 0x33, 0x00, 0xea, 0x2d, 0x57, 0x21, + 0x59, 0xd1, 0x90, 0xd7, 0xfb, 0x78, 0xc8, 0x06, 0x7b, 0x9c, 0xc6, 0x5e, 0x88, 0x9e, 0x7b, 0x51, + 0x82, 0x9c, 0x7c, 0xbd, 0xa5, 0xd2, 0x30, 0xb8, 0x0a, 0x72, 0xd5, 0x88, 0xfa, 0x75, 0x79, 0xb0, + 0xe1, 0x15, 0xb2, 0x29, 0x70, 0x8e, 0x82, 0x0b, 0x45, 0x6a, 0x08, 0x87, 0x35, 0x2e, 0x8f, 0x9d, + 0x75, 0xb4, 0x05, 0x4b, 0x60, 0x32, 0x46, 0x2d, 0xcc, 0x30, 0x25, 0xf2, 0xd8, 0x59, 0xa7, 0x67, + 0xc3, 0x27, 0x00, 0x7a, 0x51, 0x44, 0xdb, 0x6e, 0xbd, 0xe5, 0xfa, 0x5e, 0x14, 0x55, 0x3d, 0xbf, + 0xce, 0x64, 0x15, 0x4c, 0x3a, 0xb7, 0xa5, 0x67, 0xbb, 0xf5, 0x49, 0xba, 0x6e, 0x1e, 0x19, 0xa0, + 0xd0, 0xcf, 0x1a, 0xbe, 0x0d, 0xa6, 0x99, 0xb2, 0xdd, 0x66, 0x8c, 0x0e, 0x71, 0x47, 0x97, 0xfb, + 0x4d, 0xbd, 0xba, 0x2b, 0x17, 0xe1, 0x6d, 0x30, 0x5e, 0x47, 0x5d, 0x79, 0x9e, 0x82, 0x23, 0x3e, + 0xe1, 0x0c, 0xc8, 0xb5, 0x44, 0x06, 0x49, 0xb5, 0xe0, 0x28, 0x03, 0x2e, 0x83, 0xdc, 0xae, 0x68, + 0x37, 0x7d, 0x3b, 0xf3, 0xd6, 0x79, 0x3b, 0x5a, 0xaa, 0x1d, 0x2d, 0xe9, 0xff, 0xa2, 0xc9, 0x1c, + 0x85, 0x34, 0x7f, 0x34, 0x40, 0x4e, 0xaa, 0x00, 0x3f, 0x06, 0x77, 0x08, 0xea, 0x70, 0x57, 0x8a, + 0xe1, 0xd6, 0x90, 0x27, 0x6a, 0xc3, 0x90, 0x89, 0x66, 0x2c, 0x35, 0x60, 0xac, 0x74, 0xc0, 0x58, + 0x1b, 0xa4, 0xeb, 0xdc, 0x12, 0x70, 0x19, 0xfb, 0xb9, 0x04, 0xc3, 0x27, 0x42, 0x40, 0x2f, 0x2d, + 0xa9, 0x41, 0x61, 0x1a, 0x03, 0x2b, 0x20, 0xc3, 0x3b, 0x92, 0xff, 0x54, 0xc5, 0x1c, 0x72, 0x47, + 0xfb, 0x1d, 0x75, 0xc3, 0x19, 0xde, 0x31, 0xff, 0x30, 0xc0, 0x0d, 0x6d, 0xc3, 0xf7, 0xc4, 0xb5, + 0xa8, 0xbe, 0xd0, 0x34, 0xef, 0xf7, 0x9f, 0x57, 0xcc, 0x26, 0xeb, 0xb3, 0x0e, 0xf2, 0xf7, 0x3b, + 0xba, 0x08, 0x7b, 0x70, 0xf8, 0x11, 0x98, 0x0e, 0x50, 0x84, 0x5b, 0xa2, 0x33, 0xe4, 0x7c, 0xd2, + 0x84, 0x8b, 0x83, 0x04, 0x73, 0x6e, 0xa6, 0x78, 0x69, 0xc2, 0x0d, 0x70, 0x0b, 0x13, 0x3f, 0x4a, + 0x44, 0x0d, 0xe8, 0x0c, 0xe3, 0x23, 0x32, 0x4c, 0xf7, 0x02, 0x54, 0x0a, 0x08, 0xb2, 0x81, 0xc7, + 0x3d, 0x79, 0x55, 0x05, 0x47, 0x7e, 0x9b, 0x65, 0xf0, 0xff, 0xab, 0xbb, 0x59, 0xf1, 0x36, 0x3d, + 0xf0, 0x40, 0x0e, 0x89, 0x06, 0x6d, 0xa1, 0x01, 0xc3, 0xf3, 0xfa, 0x1d, 0x7f, 0xb1, 0x29, 0x4d, + 0xb0, 0x30, 0x78, 0x0b, 0x4d, 0xe3, 0x65, 0x46, 0xf2, 0x38, 0x90, 0x43, 0xee, 0xfa, 0x3c, 0xd6, + 0xc1, 0x24, 0x41, 0x6d, 0xf7, 0x5a, 0x43, 0xfc, 0x06, 0x41, 0xed, 0x6d, 0x31, 0xc7, 0x97, 0x44, + 0x95, 0xb6, 0xdd, 0x8b, 0x53, 0x57, 0xf5, 0xeb, 0x2d, 0x82, 0xda, 0x07, 0xfd, 0x83, 0x77, 0x15, + 0xcc, 0x0a, 0xec, 0x55, 0x73, 0x5f, 0x0d, 0xf3, 0xbb, 0x04, 0xb5, 0xf7, 0x2f, 0x8f, 0xfe, 0x73, + 0xa1, 0x72, 0xa3, 0x84, 0x1a, 0xa0, 0x81, 0x16, 0xea, 0x57, 0x03, 0xdc, 0xeb, 0x81, 0x76, 0xe5, + 0x2b, 0x9a, 0xea, 0xb3, 0x0a, 0xf2, 0x5e, 0xc2, 0x6b, 0x34, 0xc6, 0xbc, 0xab, 0x9a, 0x7e, 0xb3, + 0xf8, 0xdb, 0x4f, 0x4f, 0x67, 0xf4, 0x6b, 0xbf, 0x11, 0x04, 0x31, 0x62, 0x6c, 0x8f, 0xc7, 0x98, + 0x84, 0xce, 0x39, 0x14, 0x7e, 0x0a, 0x26, 0xd4, 0x73, 0xac, 0x4b, 0xf6, 0xe1, 0x10, 0xe9, 0xd4, + 0x8e, 0x9b, 0xf9, 0x57, 0x7f, 0x3e, 0x18, 0xfb, 0xe1, 0xec, 0x78, 0xc9, 0x70, 0x74, 0xec, 0xda, + 0x8a, 0x38, 0xc9, 0x79, 0xd6, 0x6f, 0xcf, 0x8e, 0x97, 0x1e, 0x5e, 0x7e, 0xf7, 0xff, 0x45, 0xdd, + 0x9c, 0x03, 0xb3, 0x97, 0x4e, 0xa3, 0x4e, 0x5a, 0xf9, 0x25, 0x07, 0xc6, 0x77, 0x58, 0x08, 0xbf, + 0x33, 0xc0, 0xec, 0x80, 0x47, 0x0c, 0xbe, 0x3f, 0x84, 0xea, 0xc8, 0x5f, 0x05, 0xa5, 0x0f, 0xde, + 0x30, 0x5a, 0xb7, 0xfc, 0x37, 0x06, 0xb8, 0x73, 0xa9, 0xb1, 0xe0, 0xea, 0xf0, 0xa4, 0x83, 0xde, + 0xd5, 0xd2, 0xbb, 0xd7, 0x8e, 0xd3, 0x34, 0x8e, 0x0c, 0x70, 0xf7, 0xca, 0xe6, 0x82, 0x6b, 0xa3, + 0xce, 0x37, 0xb8, 0xe9, 0x4b, 0xeb, 0x6f, 0x14, 0xdb, 0x47, 0xe9, 0xca, 0x32, 0x1e, 0x45, 0x69, + 0x58, 0xff, 0x8f, 0xa2, 0x34, 0xb4, 0x6f, 0x60, 0x02, 0x0a, 0xfd, 0x55, 0x06, 0x97, 0xff, 0x4b, + 0xb2, 0x0b, 0xfd, 0x55, 0xaa, 0x5c, 0x27, 0x44, 0x6d, 0x5b, 0xca, 0x7d, 0x2d, 0x9a, 0x64, 0xf3, + 0xe0, 0xd5, 0x49, 0xd9, 0x78, 0x7d, 0x52, 0x36, 0xfe, 0x3a, 0x29, 0x1b, 0x47, 0xa7, 0xe5, 0xb1, + 0xd7, 0xa7, 0xe5, 0xb1, 0xdf, 0x4f, 0xcb, 0x63, 0x5f, 0xad, 0x87, 0x98, 0xd7, 0x92, 0xaa, 0xe5, + 0xd3, 0x86, 0xad, 0xd3, 0x3f, 0xa5, 0x71, 0x98, 0x7e, 0xdb, 0xad, 0x15, 0xbb, 0x73, 0xd5, 0xdf, + 0x07, 0xe2, 0x17, 0x72, 0x75, 0x42, 0xbe, 0x82, 0xef, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xea, + 0x29, 0x2e, 0x6b, 0x49, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -971,11 +1010,27 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MsgClient interface { - RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQuery, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) - SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResult, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) + // Registers a new Interchain Query in the interchainqueries module. This message is supposed to + // be issued only by a smart contract. The caller contract is charged a query registration deposit + // automatically in the amount defined as the module's query deposit parameter. The deposit is + // paid back on the query removal. Make sure to have enough assets on the contract's account + // at the time of the message execution. + // + // Returns an ID assigned to the registered query. Handle this message response via a reply + // handler in order to make use of the ID. + RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) + // Submits a result of an Interchain Query execution to the chain. This message handling may + // include passing of the result to the query's owner smart contract for processing which might + // be a pretty gas-consumable operation. + SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResultRequest, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) + // Removes a given Interchain Query and its results from the module. Can be removed only by the + // owner of the query during the query's submit timeout, and by anyone after the query has been + // timed out. The query deposit is returned to the caller on a success call. RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) + // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) - UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) + // Updates params of the interchainqueries module. Only callable by the module's authority. + UpdateParams(ctx context.Context, in *MsgUpdateParamsRequest, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } type msgClient struct { @@ -986,7 +1041,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { return &msgClient{cc} } -func (c *msgClient) RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQuery, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) { +func (c *msgClient) RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) { out := new(MsgRegisterInterchainQueryResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/RegisterInterchainQuery", in, out, opts...) if err != nil { @@ -995,7 +1050,7 @@ func (c *msgClient) RegisterInterchainQuery(ctx context.Context, in *MsgRegister return out, nil } -func (c *msgClient) SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResult, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) { +func (c *msgClient) SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResultRequest, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) { out := new(MsgSubmitQueryResultResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/SubmitQueryResult", in, out, opts...) if err != nil { @@ -1022,7 +1077,7 @@ func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInte return out, nil } -func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParamsRequest, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { out := new(MsgUpdateParamsResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/UpdateParams", in, out, opts...) if err != nil { @@ -1033,21 +1088,37 @@ func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts // MsgServer is the server API for Msg service. type MsgServer interface { - RegisterInterchainQuery(context.Context, *MsgRegisterInterchainQuery) (*MsgRegisterInterchainQueryResponse, error) - SubmitQueryResult(context.Context, *MsgSubmitQueryResult) (*MsgSubmitQueryResultResponse, error) + // Registers a new Interchain Query in the interchainqueries module. This message is supposed to + // be issued only by a smart contract. The caller contract is charged a query registration deposit + // automatically in the amount defined as the module's query deposit parameter. The deposit is + // paid back on the query removal. Make sure to have enough assets on the contract's account + // at the time of the message execution. + // + // Returns an ID assigned to the registered query. Handle this message response via a reply + // handler in order to make use of the ID. + RegisterInterchainQuery(context.Context, *MsgRegisterInterchainQueryRequest) (*MsgRegisterInterchainQueryResponse, error) + // Submits a result of an Interchain Query execution to the chain. This message handling may + // include passing of the result to the query's owner smart contract for processing which might + // be a pretty gas-consumable operation. + SubmitQueryResult(context.Context, *MsgSubmitQueryResultRequest) (*MsgSubmitQueryResultResponse, error) + // Removes a given Interchain Query and its results from the module. Can be removed only by the + // owner of the query during the query's submit timeout, and by anyone after the query has been + // timed out. The query deposit is returned to the caller on a success call. RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) + // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) - UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) + // Updates params of the interchainqueries module. Only callable by the module's authority. + UpdateParams(context.Context, *MsgUpdateParamsRequest) (*MsgUpdateParamsResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. type UnimplementedMsgServer struct { } -func (*UnimplementedMsgServer) RegisterInterchainQuery(ctx context.Context, req *MsgRegisterInterchainQuery) (*MsgRegisterInterchainQueryResponse, error) { +func (*UnimplementedMsgServer) RegisterInterchainQuery(ctx context.Context, req *MsgRegisterInterchainQueryRequest) (*MsgRegisterInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RegisterInterchainQuery not implemented") } -func (*UnimplementedMsgServer) SubmitQueryResult(ctx context.Context, req *MsgSubmitQueryResult) (*MsgSubmitQueryResultResponse, error) { +func (*UnimplementedMsgServer) SubmitQueryResult(ctx context.Context, req *MsgSubmitQueryResultRequest) (*MsgSubmitQueryResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitQueryResult not implemented") } func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) { @@ -1056,7 +1127,7 @@ func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *M func (*UnimplementedMsgServer) UpdateInterchainQuery(ctx context.Context, req *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateInterchainQuery not implemented") } -func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { +func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParamsRequest) (*MsgUpdateParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented") } @@ -1065,7 +1136,7 @@ func RegisterMsgServer(s grpc1.Server, srv MsgServer) { } func _Msg_RegisterInterchainQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRegisterInterchainQuery) + in := new(MsgRegisterInterchainQueryRequest) if err := dec(in); err != nil { return nil, err } @@ -1077,13 +1148,13 @@ func _Msg_RegisterInterchainQuery_Handler(srv interface{}, ctx context.Context, FullMethod: "/neutron.interchainqueries.Msg/RegisterInterchainQuery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).RegisterInterchainQuery(ctx, req.(*MsgRegisterInterchainQuery)) + return srv.(MsgServer).RegisterInterchainQuery(ctx, req.(*MsgRegisterInterchainQueryRequest)) } return interceptor(ctx, in, info, handler) } func _Msg_SubmitQueryResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgSubmitQueryResult) + in := new(MsgSubmitQueryResultRequest) if err := dec(in); err != nil { return nil, err } @@ -1095,7 +1166,7 @@ func _Msg_SubmitQueryResult_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: "/neutron.interchainqueries.Msg/SubmitQueryResult", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).SubmitQueryResult(ctx, req.(*MsgSubmitQueryResult)) + return srv.(MsgServer).SubmitQueryResult(ctx, req.(*MsgSubmitQueryResultRequest)) } return interceptor(ctx, in, info, handler) } @@ -1137,7 +1208,7 @@ func _Msg_UpdateInterchainQuery_Handler(srv interface{}, ctx context.Context, de } func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateParams) + in := new(MsgUpdateParamsRequest) if err := dec(in); err != nil { return nil, err } @@ -1149,7 +1220,7 @@ func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/neutron.interchainqueries.Msg/UpdateParams", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams)) + return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParamsRequest)) } return interceptor(ctx, in, info, handler) } @@ -1183,7 +1254,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Metadata: "neutron/interchainqueries/tx.proto", } -func (m *MsgRegisterInterchainQuery) Marshal() (dAtA []byte, err error) { +func (m *MsgRegisterInterchainQueryRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1193,12 +1264,12 @@ func (m *MsgRegisterInterchainQuery) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRegisterInterchainQuery) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgRegisterInterchainQueryRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRegisterInterchainQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgRegisterInterchainQueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1281,7 +1352,7 @@ func (m *MsgRegisterInterchainQueryResponse) MarshalToSizedBuffer(dAtA []byte) ( return len(dAtA) - i, nil } -func (m *MsgSubmitQueryResult) Marshal() (dAtA []byte, err error) { +func (m *MsgSubmitQueryResultRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1291,12 +1362,12 @@ func (m *MsgSubmitQueryResult) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgSubmitQueryResult) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSubmitQueryResultRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgSubmitQueryResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSubmitQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1750,7 +1821,7 @@ func (m *MsgUpdateInterchainQueryResponse) MarshalToSizedBuffer(dAtA []byte) (in return len(dAtA) - i, nil } -func (m *MsgUpdateParams) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateParamsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1760,12 +1831,12 @@ func (m *MsgUpdateParams) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateParams) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateParamsRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1824,7 +1895,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *MsgRegisterInterchainQuery) Size() (n int) { +func (m *MsgRegisterInterchainQueryRequest) Size() (n int) { if m == nil { return 0 } @@ -1870,7 +1941,7 @@ func (m *MsgRegisterInterchainQueryResponse) Size() (n int) { return n } -func (m *MsgSubmitQueryResult) Size() (n int) { +func (m *MsgSubmitQueryResultRequest) Size() (n int) { if m == nil { return 0 } @@ -2065,7 +2136,7 @@ func (m *MsgUpdateInterchainQueryResponse) Size() (n int) { return n } -func (m *MsgUpdateParams) Size() (n int) { +func (m *MsgUpdateParamsRequest) Size() (n int) { if m == nil { return 0 } @@ -2095,7 +2166,7 @@ func sovTx(x uint64) (n int) { func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *MsgRegisterInterchainQuery) Unmarshal(dAtA []byte) error { +func (m *MsgRegisterInterchainQueryRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2118,10 +2189,10 @@ func (m *MsgRegisterInterchainQuery) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRegisterInterchainQuery: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRegisterInterchainQueryRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRegisterInterchainQuery: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRegisterInterchainQueryRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2395,7 +2466,7 @@ func (m *MsgRegisterInterchainQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgSubmitQueryResult) Unmarshal(dAtA []byte) error { +func (m *MsgSubmitQueryResultRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2418,10 +2489,10 @@ func (m *MsgSubmitQueryResult) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSubmitQueryResult: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSubmitQueryResultRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSubmitQueryResult: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSubmitQueryResultRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3715,7 +3786,7 @@ func (m *MsgUpdateInterchainQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3738,10 +3809,10 @@ func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateParams: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateParamsRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateParams: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/interchaintxs/types/genesis.pb.go b/x/interchaintxs/types/genesis.pb.go index 85e6a2c74..25770ae3c 100644 --- a/x/interchaintxs/types/genesis.pb.go +++ b/x/interchaintxs/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/params.pb.go b/x/interchaintxs/types/params.pb.go index 3012954b6..e2f86cfc9 100644 --- a/x/interchaintxs/types/params.pb.go +++ b/x/interchaintxs/types/params.pb.go @@ -5,13 +5,12 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 1518bda64..5f71e842b 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -18,6 +14,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 9f5693111..8b7fb7755 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" types1 "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" @@ -19,12 +15,14 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + types2 "github.com/neutron-org/neutron/v4/x/feerefunder/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - - types2 "github.com/neutron-org/neutron/v4/x/feerefunder/types" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go index 3d12d5ed5..ad2ace108 100644 --- a/x/tokenfactory/types/authorityMetadata.pb.go +++ b/x/tokenfactory/types/authorityMetadata.pb.go @@ -5,13 +5,12 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index cd03eb3bb..3415f1e6c 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 48cfdb88f..a5b112b5a 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -5,15 +5,14 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index 3d6b122ff..5e6fb2b06 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -17,6 +13,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index 236c58ed4..e20ba1f2c 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" @@ -21,6 +17,9 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/v1beta1/params.pb.go b/x/tokenfactory/types/v1beta1/params.pb.go index 2cf60f11d..cf863a97c 100644 --- a/x/tokenfactory/types/v1beta1/params.pb.go +++ b/x/tokenfactory/types/v1beta1/params.pb.go @@ -5,15 +5,14 @@ package v1beta1 import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/transfer/types/query.pb.go b/x/transfer/types/query.pb.go index 499576586..4d562d622 100644 --- a/x/transfer/types/query.pb.go +++ b/x/transfer/types/query.pb.go @@ -6,8 +6,6 @@ package types import ( context "context" fmt "fmt" - math "math" - grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" types "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" @@ -15,6 +13,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/transfer/types/tx.pb.go b/x/transfer/types/tx.pb.go index 5f1c663ba..94361dafa 100644 --- a/x/transfer/types/tx.pb.go +++ b/x/transfer/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/gogoproto/gogoproto" @@ -17,11 +13,13 @@ import ( proto "github.com/cosmos/gogoproto/proto" types3 "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" types1 "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + types2 "github.com/neutron-org/neutron/v4/x/feerefunder/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - - types2 "github.com/neutron-org/neutron/v4/x/feerefunder/types" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. From cf37896504a16318a970be628008d113b53f26ba Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Wed, 31 Jul 2024 18:08:16 +0200 Subject: [PATCH 03/18] proto format --- proto/neutron/interchainqueries/tx.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index a41930947..bb2c6309e 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -21,7 +21,7 @@ service Msg { // automatically in the amount defined as the module's query deposit parameter. The deposit is // paid back on the query removal. Make sure to have enough assets on the contract's account // at the time of the message execution. - // + // // Returns an ID assigned to the registered query. Handle this message response via a reply // handler in order to make use of the ID. rpc RegisterInterchainQuery(MsgRegisterInterchainQueryRequest) returns (MsgRegisterInterchainQueryResponse); From a5ac09834001147a19d5478b3dc8d22174a026ae Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Wed, 31 Jul 2024 18:19:36 +0200 Subject: [PATCH 04/18] fix tests after ICQ proto type renames --- app/proposals_allowlisting.go | 2 +- wasmbinding/message_plugin.go | 2 +- wasmbinding/stargate_allowlist.go | 2 +- wasmbinding/test/custom_query_test.go | 4 +- x/interchainqueries/client/cli/query.go | 4 +- x/interchainqueries/client/cli/tx.go | 2 +- x/interchainqueries/keeper/grpc_query.go | 6 +- x/interchainqueries/keeper/grpc_query_test.go | 16 ++-- x/interchainqueries/keeper/keeper_test.go | 84 +++++++++---------- x/interchainqueries/keeper/msg_server.go | 6 +- x/interchainqueries/keeper/msg_server_test.go | 46 +++++----- x/interchainqueries/types/codec.go | 10 +-- x/interchainqueries/types/tx.go | 40 ++++----- x/interchainqueries/types/tx_test.go | 4 +- 14 files changed, 114 insertions(+), 114 deletions(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 8af48963b..7e6875579 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -68,7 +68,7 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *ibcclienttypes.MsgRecoverClient, *ibcclienttypes.MsgIBCSoftwareUpgrade, *tokenfactorytypes.MsgUpdateParams, - *interchainqueriestypes.MsgUpdateParams, + *interchainqueriestypes.MsgUpdateParamsRequest, *interchaintxstypes.MsgUpdateParams, *feeburnertypes.MsgUpdateParams, *feerefundertypes.MsgUpdateParams, diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index a22c5e78d..b24d59826 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -927,7 +927,7 @@ func (m *CustomMessenger) registerInterchainQuery(ctx sdk.Context, contractAddr } func (m *CustomMessenger) performRegisterInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, reg *bindings.RegisterInterchainQuery) (*icqtypes.MsgRegisterInterchainQueryResponse, error) { - msg := icqtypes.MsgRegisterInterchainQuery{ + msg := icqtypes.MsgRegisterInterchainQueryRequest{ Keys: reg.Keys, TransactionsFilter: reg.TransactionsFilter, QueryType: reg.QueryType, diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 13d8ab761..d94bf26ae 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -64,7 +64,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries { "/neutron.interchainqueries.Query/Params": &interchainqueriestypes.QueryParamsResponse{}, "/neutron.interchainqueries.Query/RegisteredQueries": &interchainqueriestypes.QueryRegisteredQueriesResponse{}, "/neutron.interchainqueries.Query/RegisteredQuery": &interchainqueriestypes.QueryRegisteredQueryResponse{}, - "/neutron.interchainqueries.Query/QueryResult": &interchainqueriestypes.QueryRegisteredQueryResultResponse{}, + "/neutron.interchainqueries.Query/QueryResult": &interchainqueriestypes.QueryQueryResultResponse{}, "/neutron.interchainqueries.Query/LastRemoteHeight": &interchainqueriestypes.QueryLastRemoteHeightResponse{}, // feeburner diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 781151936..99e5442e4 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -88,7 +88,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResult() { QueryID: lastID, }, } - resp := icqtypes.QueryRegisteredQueryResultResponse{} + resp := icqtypes.QueryQueryResultResponse{} err = suite.queryCustom(ctx, contractAddress, query, &resp) suite.Require().NoError(err) @@ -121,7 +121,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResultNotFound() { QueryID: 1, }, } - resp := icqtypes.QueryRegisteredQueryResultResponse{} + resp := icqtypes.QueryQueryResultResponse{} err := suite.queryCustom(ctx, contractAddress, query, &resp) expectedErrMsg := fmt.Sprintf("Generic error: Querier contract error: codespace: interchainqueries, code: %d: query wasm contract failed", icqtypes.ErrNoQueryResult.ABCICode()) suite.Require().ErrorContains(err, expectedErrMsg) diff --git a/x/interchainqueries/client/cli/query.go b/x/interchainqueries/client/cli/query.go index 9ceee5da5..29f519ab3 100644 --- a/x/interchainqueries/client/cli/query.go +++ b/x/interchainqueries/client/cli/query.go @@ -119,7 +119,7 @@ func CmdQueryRegisteredQueryResult() *cobra.Command { return fmt.Errorf("failed to parse query id: %w", err) } - res, err := queryClient.QueryResult(context.Background(), &types.QueryRegisteredQueryResultRequest{QueryId: queryID}) + res, err := queryClient.QueryResult(context.Background(), &types.QueryQueryResultRequest{QueryId: queryID}) if err != nil { return err } @@ -142,7 +142,7 @@ func CmdQueryLastRemoteHeight() *cobra.Command { clientCtx := client.GetClientContextFromCmd(cmd) connectionID := args[0] queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeight{ConnectionId: connectionID}) + res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeightRequest{ConnectionId: connectionID}) if err != nil { return err } diff --git a/x/interchainqueries/client/cli/tx.go b/x/interchainqueries/client/cli/tx.go index e70f5477d..efe430ad8 100644 --- a/x/interchainqueries/client/cli/tx.go +++ b/x/interchainqueries/client/cli/tx.go @@ -84,7 +84,7 @@ func SubmitQueryResultCmd() *cobra.Command { return fmt.Errorf("failed to read query result file: %w", err) } - msg := types.MsgSubmitQueryResult{QueryId: queryID, Sender: string(sender)} + msg := types.MsgSubmitQueryResultRequest{QueryId: queryID, Sender: string(sender)} if err := json.Unmarshal(result, &msg.Result); err != nil { return fmt.Errorf("failed to unmarshal query result: %w", err) } diff --git a/x/interchainqueries/keeper/grpc_query.go b/x/interchainqueries/keeper/grpc_query.go index eef0fb642..0386207e7 100644 --- a/x/interchainqueries/keeper/grpc_query.go +++ b/x/interchainqueries/keeper/grpc_query.go @@ -75,7 +75,7 @@ func (k Keeper) GetRegisteredQueries(ctx sdk.Context, req *types.QueryRegistered return &types.QueryRegisteredQueriesResponse{RegisteredQueries: queries, Pagination: pageRes}, nil } -func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryRegisteredQueryResultRequest) (*types.QueryRegisteredQueryResultResponse, error) { +func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResultRequest) (*types.QueryQueryResultResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) if !k.checkRegisteredQueryExists(ctx, request.QueryId) { @@ -86,10 +86,10 @@ func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryRegistere if err != nil { return nil, errors.Wrapf(err, "failed to get query result by query id: %v", err) } - return &types.QueryRegisteredQueryResultResponse{Result: result}, nil + return &types.QueryQueryResultResponse{Result: result}, nil } -func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeight) (*types.QueryLastRemoteHeightResponse, error) { +func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeightRequest) (*types.QueryLastRemoteHeightResponse, error) { req := contypes.QueryConnectionClientStateRequest{ConnectionId: request.ConnectionId} r, err := k.ibcKeeper.ConnectionClientState(goCtx, &req) if err != nil { diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go index a9223fba8..98d368451 100644 --- a/x/interchainqueries/keeper/grpc_query_test.go +++ b/x/interchainqueries/keeper/grpc_query_test.go @@ -25,7 +25,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() { "wrong connection id", func() { ctx := suite.ChainA.GetContext() - _, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: "test"}) + _, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: "test"}) suite.Require().Error(err) }, }, @@ -34,7 +34,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() { func() { ctx := suite.ChainA.GetContext() - oldHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: suite.Path.EndpointA.ConnectionID}) + oldHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: suite.Path.EndpointA.ConnectionID}) suite.Require().NoError(err) suite.Require().Greater(oldHeight.Height, uint64(0)) @@ -44,7 +44,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() { suite.NoError(suite.Path.EndpointA.UpdateClient()) } - updatedHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: suite.Path.EndpointA.ConnectionID}) + updatedHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: suite.Path.EndpointA.ConnectionID}) suite.Require().Equal(updatedHeight.Height, oldHeight.Height+N) // check that last remote height really equals oldHeight+N suite.Require().NoError(err) }, @@ -478,7 +478,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { contractOwner := wasmKeeper.RandomAccountAddress(suite.T()) codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -508,7 +508,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { }) suite.Require().NoError(err) - msg := iqtypes.MsgSubmitQueryResult{ + msg := iqtypes.MsgSubmitQueryResultRequest{ QueryId: regQuery1.Id, Sender: contractAddress.String(), ClientId: suite.Path.EndpointA.ClientID, @@ -530,7 +530,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { _, err = msgSrv.SubmitQueryResult(ctx, &msg) suite.NoError(err) - queryResultResponse, err := suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{ + queryResultResponse, err := suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{ QueryId: regQuery1.Id, }) suite.NoError(err) @@ -547,12 +547,12 @@ func (suite *KeeperTestSuite) TestQueryResult() { } suite.Equal(len(expectKvResults), len(queryKvResult)) - _, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{ + _, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{ QueryId: regQuery2.Id, }) suite.ErrorContains(err, "no query result") - _, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{ + _, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{ QueryId: regQuery2.Id + 1, }) suite.ErrorContains(err, "invalid query id") diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index f0f25a2ed..6c73b50c8 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/x/interchainqueries/keeper/keeper_test.go @@ -33,7 +33,7 @@ type KeeperTestSuite struct { } func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { - var msg iqtypes.MsgRegisterInterchainQuery + var msg iqtypes.MsgRegisterInterchainQueryRequest tests := []struct { name string @@ -45,7 +45,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "invalid connection", true, func(sender string) { - msg = iqtypes.MsgRegisterInterchainQuery{ + msg = iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: "unknown", TransactionsFilter: "[]", Keys: nil, @@ -60,7 +60,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "insufficient funds for deposit", false, func(sender string) { - msg = iqtypes.MsgRegisterInterchainQuery{ + msg = iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, TransactionsFilter: "[]", Keys: nil, @@ -75,7 +75,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "not a contract address", false, func(_ string) { - msg = iqtypes.MsgRegisterInterchainQuery{ + msg = iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, TransactionsFilter: "[]", Keys: nil, @@ -90,7 +90,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "invalid bech32 sender address", false, func(_ string) { - msg = iqtypes.MsgRegisterInterchainQuery{ + msg = iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, TransactionsFilter: "[]", Keys: nil, @@ -105,7 +105,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "valid", true, func(sender string) { - msg = iqtypes.MsgRegisterInterchainQuery{ + msg = iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, TransactionsFilter: "[]", Keys: nil, @@ -164,7 +164,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { var msg iqtypes.MsgUpdateInterchainQueryRequest - originalKVQuery := iqtypes.MsgRegisterInterchainQuery{ + originalKVQuery := iqtypes.MsgRegisterInterchainQueryRequest{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{ { @@ -178,7 +178,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { Sender: "", } - originalTXQuery := iqtypes.MsgRegisterInterchainQuery{ + originalTXQuery := iqtypes.MsgRegisterInterchainQueryRequest{ QueryType: string(iqtypes.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -194,7 +194,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { expectedPeriod uint64 expectedQueryKeys []*iqtypes.KVKey expectedQueryTXFilter string - query iqtypes.MsgRegisterInterchainQuery + query iqtypes.MsgRegisterInterchainQueryRequest }{ { "valid update period for kv", @@ -450,7 +450,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { suite.SetupTest() var msg iqtypes.MsgRemoveInterchainQueryRequest - var query iqtypes.MsgRegisterInterchainQuery + var query iqtypes.MsgRegisterInterchainQueryRequest var txQueryHashes [][]byte tests := []struct { @@ -465,7 +465,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { QueryId: 1, Sender: sender, } - query = iqtypes.MsgRegisterInterchainQuery{ + query = iqtypes.MsgRegisterInterchainQueryRequest{ QueryType: string(iqtypes.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -487,7 +487,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { QueryId: 1, Sender: sender, } - query = iqtypes.MsgRegisterInterchainQuery{ + query = iqtypes.MsgRegisterInterchainQueryRequest{ QueryType: string(iqtypes.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -512,7 +512,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { QueryId: 1, Sender: sender, } - query = iqtypes.MsgRegisterInterchainQuery{ + query = iqtypes.MsgRegisterInterchainQueryRequest{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{{Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "", @@ -530,7 +530,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { QueryId: 2, Sender: sender, } - query = iqtypes.MsgRegisterInterchainQuery{ + query = iqtypes.MsgRegisterInterchainQueryRequest{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{{Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "", @@ -555,7 +555,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { QueryId: 1, Sender: newContractAddress.String(), } - query = iqtypes.MsgRegisterInterchainQuery{ + query = iqtypes.MsgRegisterInterchainQueryRequest{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{{Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "", @@ -748,7 +748,7 @@ func (suite *KeeperTestSuite) TestGetAllRegisteredQueries() { } func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { - var msg iqtypes.MsgSubmitQueryResult + var msg iqtypes.MsgSubmitQueryResultRequest tests := []struct { name string @@ -768,7 +768,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: 1, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -792,7 +792,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "valid KV storage proof", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -818,7 +818,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -843,7 +843,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "invalid number of KvResults", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -869,7 +869,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -899,7 +899,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "invalid query type", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: nil, TransactionsFilter: "[]", @@ -924,7 +924,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -949,7 +949,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "nil proof", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -975,7 +975,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -1001,7 +1001,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1026,7 +1026,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -1051,7 +1051,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1077,7 +1077,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -1103,7 +1103,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := []byte("non_existed_key") - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1130,7 +1130,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, // A bit weird that query owner submits the results, but it doesn't really matter ClientId: suite.Path.EndpointA.ClientID, @@ -1155,7 +1155,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "header with invalid height", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1181,7 +1181,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -1205,7 +1205,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "invalid KV storage value", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1231,7 +1231,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -1256,7 +1256,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1285,7 +1285,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -1310,7 +1310,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1342,7 +1342,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, ClientId: suite.Path.EndpointA.ClientID, @@ -1370,7 +1370,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { keyWithSpecialBytes, err := hex.DecodeString("0220c746274d3fe20c2c9d06c017e15f8e03f92598fca39d7540aab02244073efe26756a756e6f78") suite.Require().NoError(err) - registerMsg := iqtypes.MsgRegisterInterchainQuery{ + registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: keyWithSpecialBytes}, @@ -1397,7 +1397,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResult{ + msg = iqtypes.MsgSubmitQueryResultRequest{ QueryId: res.Id, Sender: sender, // A bit weird that query owner submits the results, but it doesn't really matter ClientId: suite.Path.EndpointA.ClientID, @@ -1716,7 +1716,7 @@ func (suite *KeeperTestSuite) TestRemoveFreshlyCreatedICQ() { suite.Require().NoError(err) msgSrv := keeper.NewMsgServerImpl(iqkeeper) - resRegister, err := msgSrv.RegisterInterchainQuery(ctx, &iqtypes.MsgRegisterInterchainQuery{ + resRegister, err := msgSrv.RegisterInterchainQuery(ctx, &iqtypes.MsgRegisterInterchainQueryRequest{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{{Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "", diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 384c9d6b1..7a978fb3a 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -33,7 +33,7 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer { return &msgServer{Keeper: keeper} } -func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.MsgRegisterInterchainQuery) (*types.MsgRegisterInterchainQueryResponse, error) { +func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.MsgRegisterInterchainQueryRequest) (*types.MsgRegisterInterchainQueryResponse, error) { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelRegisterInterchainQuery) if err := msg.Validate(); err != nil { @@ -167,7 +167,7 @@ func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUp return &types.MsgUpdateInterchainQueryResponse{}, nil } -func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmitQueryResult) (*types.MsgSubmitQueryResultResponse, error) { +func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmitQueryResultRequest) (*types.MsgSubmitQueryResultResponse, error) { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelRegisterInterchainQuery) if err := msg.Validate(); err != nil { @@ -328,7 +328,7 @@ func (m msgServer) validateUpdateInterchainQueryParams( } // UpdateParams updates the module parameters -func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { +func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParamsRequest) (*types.MsgUpdateParamsResponse, error) { if err := req.Validate(); err != nil { return nil, errors.Wrap(err, "failed to validate MsgUpdateParams") } diff --git a/x/interchainqueries/keeper/msg_server_test.go b/x/interchainqueries/keeper/msg_server_test.go index a92a7f6d8..6c9fa9159 100644 --- a/x/interchainqueries/keeper/msg_server_test.go +++ b/x/interchainqueries/keeper/msg_server_test.go @@ -20,12 +20,12 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { tests := []struct { name string - msg types.MsgRegisterInterchainQuery + msg types.MsgRegisterInterchainQueryRequest expectedErr error }{ { "invalid update period", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -37,7 +37,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty sender", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -49,7 +49,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "invalid sender", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -61,7 +61,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty connection id", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -73,7 +73,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "invalid query type", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: "invalid_type", Keys: nil, TransactionsFilter: "[]", @@ -85,7 +85,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty keys", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeKV), Keys: nil, TransactionsFilter: "[]", @@ -97,7 +97,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "too many keys", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeKV), Keys: make([]*types.KVKey, types.MaxKVQueryKeysCount+1), TransactionsFilter: "[]", @@ -109,7 +109,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "nil key", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeKV), Keys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, nil}, TransactionsFilter: "[]", @@ -121,7 +121,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "duplicated keys", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeKV), Keys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, {Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "[]", @@ -133,7 +133,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty key path", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeKV), Keys: []*types.KVKey{{Key: []byte("key1"), Path: ""}}, TransactionsFilter: "[]", @@ -145,7 +145,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty key id", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeKV), Keys: []*types.KVKey{{Key: []byte(""), Path: "path"}}, TransactionsFilter: "[]", @@ -157,7 +157,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "invalid transactions filter format", - types.MsgRegisterInterchainQuery{ + types.MsgRegisterInterchainQueryRequest{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "&)(^Y(*&(*&(&(*", @@ -185,12 +185,12 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { tests := []struct { name string - msg types.MsgSubmitQueryResult + msg types.MsgSubmitQueryResultRequest expectedErr error }{ { "empty result", - types.MsgSubmitQueryResult{ + types.MsgSubmitQueryResultRequest{ QueryId: 1, Sender: testutil.TestOwnerAddress, ClientId: "client-id", @@ -200,7 +200,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "empty kv results and block result", - types.MsgSubmitQueryResult{ + types.MsgSubmitQueryResultRequest{ QueryId: 1, Sender: testutil.TestOwnerAddress, ClientId: "client-id", @@ -215,7 +215,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "zero query id", - types.MsgSubmitQueryResult{ + types.MsgSubmitQueryResultRequest{ QueryId: 0, Sender: testutil.TestOwnerAddress, ClientId: "client-id", @@ -241,7 +241,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "empty sender", - types.MsgSubmitQueryResult{ + types.MsgSubmitQueryResultRequest{ QueryId: 1, Sender: "", ClientId: "client-id", @@ -267,7 +267,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "invalid sender", - types.MsgSubmitQueryResult{ + types.MsgSubmitQueryResultRequest{ QueryId: 1, Sender: "invalid_sender", ClientId: "client-id", @@ -293,7 +293,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "empty client id", - types.MsgSubmitQueryResult{ + types.MsgSubmitQueryResultRequest{ QueryId: 1, Sender: testutil.TestOwnerAddress, ClientId: "", @@ -507,19 +507,19 @@ func TestMsgUpdateParamsValidate(t *testing.T) { tests := []struct { name string - msg types.MsgUpdateParams + msg types.MsgUpdateParamsRequest expectedErr string }{ { "empty authority", - types.MsgUpdateParams{ + types.MsgUpdateParamsRequest{ Authority: "", }, "authority is invalid", }, { "invalid authority", - types.MsgUpdateParams{ + types.MsgUpdateParamsRequest{ Authority: "invalid authority", }, "authority is invalid", diff --git a/x/interchainqueries/types/codec.go b/x/interchainqueries/types/codec.go index 985707a3e..d72abc8ca 100644 --- a/x/interchainqueries/types/codec.go +++ b/x/interchainqueries/types/codec.go @@ -8,18 +8,18 @@ import ( ) func RegisterCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&MsgRegisterInterchainQuery{}, "interchainqueries/RegisterQuery", nil) - cdc.RegisterConcrete(&MsgUpdateParams{}, "interchainqueries/MsgUpdateParams", nil) + cdc.RegisterConcrete(&MsgRegisterInterchainQueryRequest{}, "interchainqueries/RegisterQuery", nil) + cdc.RegisterConcrete(&MsgUpdateParamsRequest{}, "interchainqueries/MsgUpdateParams", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { registry.RegisterImplementations( (*sdk.Msg)(nil), - &MsgRegisterInterchainQuery{}, - &MsgSubmitQueryResult{}, + &MsgRegisterInterchainQueryRequest{}, + &MsgSubmitQueryResultRequest{}, &MsgUpdateInterchainQueryRequest{}, &MsgRemoveInterchainQueryRequest{}, - &MsgUpdateParams{}, + &MsgUpdateParamsRequest{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } diff --git a/x/interchainqueries/types/tx.go b/x/interchainqueries/types/tx.go index 6bce76392..2eaa771fc 100644 --- a/x/interchainqueries/types/tx.go +++ b/x/interchainqueries/types/tx.go @@ -16,19 +16,19 @@ const ( ) var ( - _ sdk.Msg = &MsgSubmitQueryResult{} - _ codectypes.UnpackInterfacesMessage = MsgSubmitQueryResult{} + _ sdk.Msg = &MsgSubmitQueryResultRequest{} + _ codectypes.UnpackInterfacesMessage = MsgSubmitQueryResultRequest{} ) -func (msg MsgSubmitQueryResult) Route() string { +func (msg MsgSubmitQueryResultRequest) Route() string { return RouterKey } -func (msg MsgSubmitQueryResult) Type() string { +func (msg MsgSubmitQueryResultRequest) Type() string { return "submit-query-result" } -func (msg MsgSubmitQueryResult) Validate() error { +func (msg MsgSubmitQueryResultRequest) Validate() error { if msg.Result == nil { return errors.Wrap(ErrEmptyResult, "query result can't be empty") } @@ -56,11 +56,11 @@ func (msg MsgSubmitQueryResult) Validate() error { return nil } -func (msg MsgSubmitQueryResult) GetSignBytes() []byte { +func (msg MsgSubmitQueryResultRequest) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgSubmitQueryResult) GetSigners() []sdk.AccAddress { +func (msg MsgSubmitQueryResultRequest) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) @@ -69,7 +69,7 @@ func (msg MsgSubmitQueryResult) GetSigners() []sdk.AccAddress { } // UnpackInterfaces implements UnpackInterfacesMessage.UnpackInterfaces -func (msg MsgSubmitQueryResult) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { +func (msg MsgSubmitQueryResultRequest) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { var header exported.ClientMessage if err := unpacker.UnpackAny(msg.Result.GetBlock().GetHeader(), &header); err != nil { return err @@ -80,17 +80,17 @@ func (msg MsgSubmitQueryResult) UnpackInterfaces(unpacker codectypes.AnyUnpacker //---------------------------------------------------------------- -var _ sdk.Msg = &MsgRegisterInterchainQuery{} +var _ sdk.Msg = &MsgRegisterInterchainQueryRequest{} -func (msg MsgRegisterInterchainQuery) Route() string { +func (msg MsgRegisterInterchainQueryRequest) Route() string { return RouterKey } -func (msg MsgRegisterInterchainQuery) Type() string { +func (msg MsgRegisterInterchainQueryRequest) Type() string { return "register-interchain-query" } -func (msg MsgRegisterInterchainQuery) Validate() error { +func (msg MsgRegisterInterchainQueryRequest) Validate() error { if msg.UpdatePeriod == 0 { return errors.Wrap(ErrInvalidUpdatePeriod, "update period can not be equal to zero") } @@ -128,11 +128,11 @@ func (msg MsgRegisterInterchainQuery) Validate() error { return nil } -func (msg MsgRegisterInterchainQuery) GetSignBytes() []byte { +func (msg MsgRegisterInterchainQueryRequest) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgRegisterInterchainQuery) GetSigners() []sdk.AccAddress { +func (msg MsgRegisterInterchainQueryRequest) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) @@ -201,17 +201,17 @@ func (msg MsgUpdateInterchainQueryRequest) GetSigners() []sdk.AccAddress { //---------------------------------------------------------------- -var _ sdk.Msg = &MsgUpdateParams{} +var _ sdk.Msg = &MsgUpdateParamsRequest{} -func (msg *MsgUpdateParams) Route() string { +func (msg *MsgUpdateParamsRequest) Route() string { return RouterKey } -func (msg *MsgUpdateParams) Type() string { +func (msg *MsgUpdateParamsRequest) Type() string { return "update-params" } -func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress { +func (msg *MsgUpdateParamsRequest) GetSigners() []sdk.AccAddress { authority, err := sdk.AccAddressFromBech32(msg.Authority) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) @@ -219,11 +219,11 @@ func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{authority} } -func (msg *MsgUpdateParams) GetSignBytes() []byte { +func (msg *MsgUpdateParamsRequest) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(msg) } -func (msg *MsgUpdateParams) Validate() error { +func (msg *MsgUpdateParamsRequest) Validate() error { if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { return errors.Wrap(err, "authority is invalid") } diff --git a/x/interchainqueries/types/tx_test.go b/x/interchainqueries/types/tx_test.go index a813c4212..2ee4a063c 100644 --- a/x/interchainqueries/types/tx_test.go +++ b/x/interchainqueries/types/tx_test.go @@ -21,7 +21,7 @@ func TestMsgRegisterInterchainQueryGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgRegisterInterchainQuery{ + return &iqtypes.MsgRegisterInterchainQueryRequest{ ConnectionId: "connection-0", TransactionsFilter: "{}", Keys: nil, @@ -48,7 +48,7 @@ func TestMsgSubmitQueryResultGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgSubmitQueryResult{ + return &iqtypes.MsgSubmitQueryResultRequest{ QueryId: 1, Sender: TestAddress, ClientId: "client-id", From 2264e95ec7986ae0bf4955df997adfb43bf186c4 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 14 Nov 2024 08:47:26 +0300 Subject: [PATCH 05/18] polish ICQ module doc comments --- proto/neutron/interchainqueries/genesis.proto | 9 ++++++--- proto/neutron/interchainqueries/tx.proto | 18 ++++++++++++------ x/contractmanager/types/sudo.go | 16 ++++++++-------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/proto/neutron/interchainqueries/genesis.proto b/proto/neutron/interchainqueries/genesis.proto index a39c3e4b7..016d300a2 100644 --- a/proto/neutron/interchainqueries/genesis.proto +++ b/proto/neutron/interchainqueries/genesis.proto @@ -17,10 +17,13 @@ message RegisteredQuery { // The query type identifier: `kv` or `tx`. string query_type = 3; // The KV-storage keys for which to get values from the remote chain. Only applicable for the - // KV-typed Interchain Queries. + // KV Interchain Queries. Max amount of keys is limited by the module's `max_kv_query_keys_count` + // parameters. repeated KVKey keys = 4; - // A stringified list of filters for remote transactions search. Only applicable for the TX-typed + // A stringified list of filters for remote transactions search. Only applicable for the TX // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + // Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount of filter conditions is limited + // by the module's `max_transactions_filters` parameters. string transactions_filter = 5; // The IBC connection ID to the remote chain (the source of querying data). Is used for getting // ConsensusState from the respective IBC client to verify query result proofs. @@ -50,7 +53,7 @@ message KVKey { // The first half of the storage path. It is supposed to be a substore name for the query // (e.g. bank, staking, etc.). string path = 1; - // The second half of the storage path. The remaining part of a full path to an IAVL storage node. + // The second half of the storage path. The remaining part of the full path to an IAVL storage node. bytes key = 2; } diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 18ceb3dbc..a3fa94822 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -45,10 +45,13 @@ message MsgRegisterInterchainQueryRequest { // The query type identifier: `kv` or `tx`. string query_type = 1; // The KV-storage keys for which we want to get values from remote chain. Only applicable for the - // KV-typed Interchain Queries. + // KV Interchain Queries. Max amount of keys is limited by the module's `max_kv_query_keys_count` + // parameters. repeated KVKey keys = 2; - // A stringified list of filters for remote transactions search. Only applicable for the TX-typed + // A stringified list of filters for remote transactions search. Only applicable for the TX // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + // Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount of filter conditions is + // limited by the module's `max_transactions_filters` parameters. string transactions_filter = 3; // The IBC connection ID to the remote chain (the source of querying data). Is used for getting // ConsensusState from the respective IBC client to verify query result proofs. @@ -110,7 +113,7 @@ message StorageValue { // The first half of the storage path. It is supposed to be a substore name for the query // (e.g. bank, staking, etc.). string storage_prefix = 1; - // The second half of the storage path. The remaining part of a full path to an IAVL storage node. + // The second half of the storage path. The remaining part of the full path to an IAVL storage node. bytes key = 2; // A base64-encoded value read from the given storage path. bytes value = 3; @@ -166,12 +169,15 @@ message MsgUpdateInterchainQueryRequest { // The ID of the query to update. uint64 query_id = 1; // A new list of KV-storage keys for which to get values from the remote chain. Only applicable - // for a KV-typed Interchain Query. + // for a KV Interchain Query. Max amount of keys is limited by the module's `max_kv_query_keys_count` + // parameters. repeated KVKey new_keys = 2; // A new minimal delay between consecutive query executions. uint64 new_update_period = 3; - // A new list of filters for remote transactions search. Only applicable for a TX-typed - // Interchain Query. + // A new list of filters for remote transactions search. Only applicable for a TX Interchain + // Query. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + // Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount of filter conditions is + // limited by the module's `max_transactions_filters` parameters. string new_transactions_filter = 4; // The signer of the message. string sender = 5; diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index dca727692..2ef52b974 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -5,11 +5,11 @@ import ( channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ) -// MessageTxQueryResult is the model of the sudo message sent to a smart contract on a TX-typed -// Interchain Query result submission. The owner of a TX-typed Interchain Query must define a -// `sudo` entry_point for handling `tx_query_result` messages and place the needed logic there. +// MessageTxQueryResult is the model of the sudo message sent to a smart contract on a TX +// Interchain Query result submission. The owner of a TX Interchain Query must define a `sudo` +// entry_point for handling `tx_query_result` messages and place the needed logic there. // The `tx_query_result` handler is treated by the interchainqueries module as a callback that is -// called each time a TX-typed query result is submitted. +// called each time a TX query result is submitted. type MessageTxQueryResult struct { TxQueryResult struct { // QueryID is the ID of the TX query which result is being submitted. @@ -21,11 +21,11 @@ type MessageTxQueryResult struct { } `json:"tx_query_result"` } -// MessageKVQueryResult is the model of the sudo message sent to a smart contract on a KV-typed -// Interchain Query result submission. If the owner of a KV-typed Interchain Query wants to handle -// the query updates, it must define a `sudo` entry_point for handling `kv_query_result` messages +// MessageKVQueryResult is the model of the sudo message sent to a smart contract on a KV +// Interchain Query result submission. If the owner of a KV Interchain Query wants to handle the +// query updates, it must define a `sudo` entry_point for handling `kv_query_result` messages // and place the needed logic there. The `kv_query_result` handler is treated by the -// interchainqueries module as a callback that is called each time a KV-typed query result is +// interchainqueries module as a callback that is called each time a KV query result is // submitted. // // Note that there is no query result sent, only the query ID. In order to access the actual From 0464849b3cbad03d7e8a0ed9bbb3cd5d3c565718 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 14 Nov 2024 08:56:11 +0300 Subject: [PATCH 06/18] uniform ICQ module msg request type names --- app/proposals_allowlisting.go | 2 +- proto/neutron/interchainqueries/genesis.proto | 2 +- proto/neutron/interchainqueries/tx.proto | 22 +- wasmbinding/message_plugin.go | 6 +- x/interchainqueries/client/cli/tx.go | 2 +- x/interchainqueries/keeper/grpc_query_test.go | 4 +- x/interchainqueries/keeper/keeper_test.go | 120 ++--- x/interchainqueries/keeper/msg_server.go | 12 +- x/interchainqueries/keeper/msg_server_test.go | 78 +-- x/interchainqueries/types/codec.go | 14 +- x/interchainqueries/types/genesis.pb.go | 9 +- .../types/message_remove_interchain_query.go | 16 +- x/interchainqueries/types/tx.go | 48 +- x/interchainqueries/types/tx.pb.go | 486 +++++++++--------- x/interchainqueries/types/tx_test.go | 8 +- 15 files changed, 419 insertions(+), 410 deletions(-) diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index d51f2a7fb..646f9d890 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -72,7 +72,7 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *ibcclienttypes.MsgRecoverClient, *ibcclienttypes.MsgIBCSoftwareUpgrade, *tokenfactorytypes.MsgUpdateParams, - *interchainqueriestypes.MsgUpdateParamsRequest, + *interchainqueriestypes.MsgUpdateParams, *interchaintxstypes.MsgUpdateParams, *feeburnertypes.MsgUpdateParams, *feerefundertypes.MsgUpdateParams, diff --git a/proto/neutron/interchainqueries/genesis.proto b/proto/neutron/interchainqueries/genesis.proto index 016d300a2..e9e882655 100644 --- a/proto/neutron/interchainqueries/genesis.proto +++ b/proto/neutron/interchainqueries/genesis.proto @@ -18,7 +18,7 @@ message RegisteredQuery { string query_type = 3; // The KV-storage keys for which to get values from the remote chain. Only applicable for the // KV Interchain Queries. Max amount of keys is limited by the module's `max_kv_query_keys_count` - // parameters. + // parameters. repeated KVKey keys = 4; // A stringified list of filters for remote transactions search. Only applicable for the TX // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index a3fa94822..414e336c2 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -24,23 +24,23 @@ service Msg { // // Returns an ID assigned to the registered query. Handle this message response via a reply // handler in order to make use of the ID. - rpc RegisterInterchainQuery(MsgRegisterInterchainQueryRequest) returns (MsgRegisterInterchainQueryResponse); + rpc RegisterInterchainQuery(MsgRegisterInterchainQuery) returns (MsgRegisterInterchainQueryResponse); // Submits a result of an Interchain Query execution to the chain. This message handling may // include passing of the result to the query's owner smart contract for processing which might // be a pretty gas-consumable operation. - rpc SubmitQueryResult(MsgSubmitQueryResultRequest) returns (MsgSubmitQueryResultResponse); + rpc SubmitQueryResult(MsgSubmitQueryResult) returns (MsgSubmitQueryResultResponse); // Removes a given Interchain Query and its results from the module. Can be removed only by the // owner of the query during the query's submit timeout, and by anyone after the query has been // timed out. The query deposit is returned to the caller on a success call. - rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse); + rpc RemoveInterchainQuery(MsgRemoveInterchainQuery) returns (MsgRemoveInterchainQueryResponse); // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. - rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse); + rpc UpdateInterchainQuery(MsgUpdateInterchainQuery) returns (MsgUpdateInterchainQueryResponse); // Updates params of the interchainqueries module. Only callable by the module's authority. - rpc UpdateParams(MsgUpdateParamsRequest) returns (MsgUpdateParamsResponse); + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); } // Request type for the Msg/RegisterInterchainQuery RPC method. -message MsgRegisterInterchainQueryRequest { +message MsgRegisterInterchainQuery { option (cosmos.msg.v1.signer) = "sender"; // The query type identifier: `kv` or `tx`. string query_type = 1; @@ -70,7 +70,7 @@ message MsgRegisterInterchainQueryResponse { } // Request type for the Msg/SubmitQueryResult RPC method. -message MsgSubmitQueryResultRequest { +message MsgSubmitQueryResult { option (cosmos.msg.v1.signer) = "sender"; // The ID of the Interchain Query. uint64 query_id = 1; @@ -152,7 +152,7 @@ message TxValue { message MsgSubmitQueryResultResponse {} // Request type for the Msg/RemoveInterchainQuery RPC method. -message MsgRemoveInterchainQueryRequest { +message MsgRemoveInterchainQuery { option (cosmos.msg.v1.signer) = "sender"; // The ID of the query to remove. uint64 query_id = 1; @@ -164,13 +164,13 @@ message MsgRemoveInterchainQueryRequest { message MsgRemoveInterchainQueryResponse {} // Request type for the Msg/UpdateInterchainQuery RPC method. -message MsgUpdateInterchainQueryRequest { +message MsgUpdateInterchainQuery { option (cosmos.msg.v1.signer) = "sender"; // The ID of the query to update. uint64 query_id = 1; // A new list of KV-storage keys for which to get values from the remote chain. Only applicable // for a KV Interchain Query. Max amount of keys is limited by the module's `max_kv_query_keys_count` - // parameters. + // parameters. repeated KVKey new_keys = 2; // A new minimal delay between consecutive query executions. uint64 new_update_period = 3; @@ -187,7 +187,7 @@ message MsgUpdateInterchainQueryRequest { message MsgUpdateInterchainQueryResponse {} // Request type for the Msg/UpdateParams RPC method. -message MsgUpdateParamsRequest { +message MsgUpdateParams { option (amino.name) = "interchainqueries/MsgUpdateParams"; option (cosmos.msg.v1.signer) = "authority"; // The address of the authority of the module. diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 0f66daadd..c1b603d74 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -351,7 +351,7 @@ func (m *CustomMessenger) updateInterchainQuery(ctx sdk.Context, contractAddr sd } func (m *CustomMessenger) performUpdateInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.UpdateInterchainQuery) (*icqtypes.MsgUpdateInterchainQueryResponse, error) { - msg := icqtypes.MsgUpdateInterchainQueryRequest{ + msg := icqtypes.MsgUpdateInterchainQuery{ QueryId: updateQuery.QueryId, NewKeys: updateQuery.NewKeys, NewUpdatePeriod: updateQuery.NewUpdatePeriod, @@ -402,7 +402,7 @@ func (m *CustomMessenger) removeInterchainQuery(ctx sdk.Context, contractAddr sd } func (m *CustomMessenger) performRemoveInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.RemoveInterchainQuery) (*icqtypes.MsgRemoveInterchainQueryResponse, error) { - msg := icqtypes.MsgRemoveInterchainQueryRequest{ + msg := icqtypes.MsgRemoveInterchainQuery{ QueryId: updateQuery.QueryId, Sender: contractAddr.String(), } @@ -945,7 +945,7 @@ func (m *CustomMessenger) registerInterchainQuery(ctx sdk.Context, contractAddr } func (m *CustomMessenger) performRegisterInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, reg *bindings.RegisterInterchainQuery) (*icqtypes.MsgRegisterInterchainQueryResponse, error) { - msg := icqtypes.MsgRegisterInterchainQueryRequest{ + msg := icqtypes.MsgRegisterInterchainQuery{ Keys: reg.Keys, TransactionsFilter: reg.TransactionsFilter, QueryType: reg.QueryType, diff --git a/x/interchainqueries/client/cli/tx.go b/x/interchainqueries/client/cli/tx.go index f9448534f..4e30ec8a7 100644 --- a/x/interchainqueries/client/cli/tx.go +++ b/x/interchainqueries/client/cli/tx.go @@ -84,7 +84,7 @@ func SubmitQueryResultCmd() *cobra.Command { return fmt.Errorf("failed to read query result file: %w", err) } - msg := types.MsgSubmitQueryResultRequest{QueryId: queryID, Sender: string(sender)} + msg := types.MsgSubmitQueryResult{QueryId: queryID, Sender: string(sender)} if err := json.Unmarshal(result, &msg.Result); err != nil { return fmt.Errorf("failed to unmarshal query result: %w", err) } diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go index 8c337f3d8..73be134ca 100644 --- a/x/interchainqueries/keeper/grpc_query_test.go +++ b/x/interchainqueries/keeper/grpc_query_test.go @@ -478,7 +478,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { contractOwner := wasmKeeper.RandomAccountAddress(suite.T()) codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) contractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -508,7 +508,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { }) suite.Require().NoError(err) - msg := iqtypes.MsgSubmitQueryResultRequest{ + msg := iqtypes.MsgSubmitQueryResult{ QueryId: regQuery1.Id, Sender: contractAddress.String(), Result: &iqtypes.QueryResult{ diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index af7ca453a..b612d0a50 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/x/interchainqueries/keeper/keeper_test.go @@ -33,7 +33,7 @@ type KeeperTestSuite struct { } func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { - var msg iqtypes.MsgRegisterInterchainQueryRequest + var msg iqtypes.MsgRegisterInterchainQuery tests := []struct { name string @@ -45,7 +45,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "invalid connection", true, func(sender string) { - msg = iqtypes.MsgRegisterInterchainQueryRequest{ + msg = iqtypes.MsgRegisterInterchainQuery{ ConnectionId: "unknown", TransactionsFilter: "[]", Keys: nil, @@ -60,7 +60,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "insufficient funds for deposit", false, func(sender string) { - msg = iqtypes.MsgRegisterInterchainQueryRequest{ + msg = iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, TransactionsFilter: "[]", Keys: nil, @@ -75,7 +75,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "not a contract address", false, func(_ string) { - msg = iqtypes.MsgRegisterInterchainQueryRequest{ + msg = iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, TransactionsFilter: "[]", Keys: nil, @@ -90,7 +90,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "invalid bech32 sender address", false, func(_ string) { - msg = iqtypes.MsgRegisterInterchainQueryRequest{ + msg = iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, TransactionsFilter: "[]", Keys: nil, @@ -105,7 +105,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { "valid", true, func(sender string) { - msg = iqtypes.MsgRegisterInterchainQueryRequest{ + msg = iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, TransactionsFilter: "[]", Keys: nil, @@ -163,8 +163,8 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { } func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { - var msg iqtypes.MsgUpdateInterchainQueryRequest - originalKVQuery := iqtypes.MsgRegisterInterchainQueryRequest{ + var msg iqtypes.MsgUpdateInterchainQuery + originalKVQuery := iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{ { @@ -178,7 +178,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { Sender: "", } - originalTXQuery := iqtypes.MsgRegisterInterchainQueryRequest{ + originalTXQuery := iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -194,12 +194,12 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { expectedPeriod uint64 expectedQueryKeys []*iqtypes.KVKey expectedQueryTXFilter string - query iqtypes.MsgRegisterInterchainQueryRequest + query iqtypes.MsgRegisterInterchainQuery }{ { "valid update period for kv", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 2, @@ -215,7 +215,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid update period for tx", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 2, @@ -231,7 +231,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid kv query data", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*iqtypes.KVKey{ { @@ -257,7 +257,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid tx filter", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewUpdatePeriod: 0, NewTransactionsFilter: "[]", @@ -273,7 +273,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid kv query both query keys and update period and ignore tx filter", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*iqtypes.KVKey{ { @@ -299,7 +299,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid tx query both tx filter and update period and ignore query keys", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewUpdatePeriod: 2, NewTransactionsFilter: "[]", @@ -315,7 +315,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "must fail on update filter for a kv query", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewUpdatePeriod: 2, NewTransactionsFilter: "[]", @@ -331,7 +331,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "must fail on update keys for a tx query", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*iqtypes.KVKey{ { @@ -352,7 +352,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "invalid query id", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 2, NewKeys: []*iqtypes.KVKey{ { @@ -380,7 +380,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) - msg = iqtypes.MsgUpdateInterchainQueryRequest{ + msg = iqtypes.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 2, @@ -449,8 +449,8 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { suite.SetupTest() - var msg iqtypes.MsgRemoveInterchainQueryRequest - var query iqtypes.MsgRegisterInterchainQueryRequest + var msg iqtypes.MsgRemoveInterchainQuery + var query iqtypes.MsgRegisterInterchainQuery var txQueryHashes [][]byte tests := []struct { @@ -461,11 +461,11 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { { "valid TX remove", func(sender string) { - msg = iqtypes.MsgRemoveInterchainQueryRequest{ + msg = iqtypes.MsgRemoveInterchainQuery{ QueryId: 1, Sender: sender, } - query = iqtypes.MsgRegisterInterchainQueryRequest{ + query = iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -483,11 +483,11 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { { "valid large TX remove", func(sender string) { - msg = iqtypes.MsgRemoveInterchainQueryRequest{ + msg = iqtypes.MsgRemoveInterchainQuery{ QueryId: 1, Sender: sender, } - query = iqtypes.MsgRegisterInterchainQueryRequest{ + query = iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -508,11 +508,11 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { { "valid KV remove", func(sender string) { - msg = iqtypes.MsgRemoveInterchainQueryRequest{ + msg = iqtypes.MsgRemoveInterchainQuery{ QueryId: 1, Sender: sender, } - query = iqtypes.MsgRegisterInterchainQueryRequest{ + query = iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{{Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "", @@ -526,11 +526,11 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { { "invalid query id", func(sender string) { - msg = iqtypes.MsgRemoveInterchainQueryRequest{ + msg = iqtypes.MsgRemoveInterchainQuery{ QueryId: 2, Sender: sender, } - query = iqtypes.MsgRegisterInterchainQueryRequest{ + query = iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{{Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "", @@ -551,11 +551,11 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) - msg = iqtypes.MsgRemoveInterchainQueryRequest{ + msg = iqtypes.MsgRemoveInterchainQuery{ QueryId: 1, Sender: newContractAddress.String(), } - query = iqtypes.MsgRegisterInterchainQueryRequest{ + query = iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{{Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "", @@ -748,7 +748,7 @@ func (suite *KeeperTestSuite) TestGetAllRegisteredQueries() { } func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { - var msg iqtypes.MsgSubmitQueryResultRequest + var msg iqtypes.MsgSubmitQueryResult tests := []struct { name string @@ -768,7 +768,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: 1, Sender: sender, Result: &iqtypes.QueryResult{ @@ -791,7 +791,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "valid KV storage proof", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -817,7 +817,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -841,7 +841,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "invalid number of KvResults", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -867,7 +867,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -896,7 +896,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "invalid query type", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: nil, TransactionsFilter: "[]", @@ -921,7 +921,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -945,7 +945,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "nil proof", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -971,7 +971,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -996,7 +996,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1021,7 +1021,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -1045,7 +1045,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1071,7 +1071,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -1096,7 +1096,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := []byte("non_existed_key") - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1123,7 +1123,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, // A bit weird that query owner submits the results, but it doesn't really matter Result: &iqtypes.QueryResult{ @@ -1147,7 +1147,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "header with invalid height", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1173,7 +1173,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -1196,7 +1196,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { "invalid KV storage value", func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1222,7 +1222,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -1246,7 +1246,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1275,7 +1275,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -1299,7 +1299,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { func(sender string, ctx sdk.Context) { clientKey := host.FullClientStateKey(suite.Path.EndpointB.ClientID) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: clientKey}, @@ -1331,7 +1331,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, Result: &iqtypes.QueryResult{ @@ -1358,7 +1358,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { keyWithSpecialBytes, err := hex.DecodeString("0220c746274d3fe20c2c9d06c017e15f8e03f92598fca39d7540aab02244073efe26756a756e6f78") suite.Require().NoError(err) - registerMsg := iqtypes.MsgRegisterInterchainQueryRequest{ + registerMsg := iqtypes.MsgRegisterInterchainQuery{ ConnectionId: suite.Path.EndpointA.ConnectionID, Keys: []*iqtypes.KVKey{ {Path: ibchost.StoreKey, Key: keyWithSpecialBytes}, @@ -1385,7 +1385,7 @@ func (suite *KeeperTestSuite) TestSubmitInterchainQueryResult() { }) suite.Require().NoError(err) - msg = iqtypes.MsgSubmitQueryResultRequest{ + msg = iqtypes.MsgSubmitQueryResult{ QueryId: res.Id, Sender: sender, // A bit weird that query owner submits the results, but it doesn't really matter Result: &iqtypes.QueryResult{ @@ -1703,7 +1703,7 @@ func (suite *KeeperTestSuite) TestRemoveFreshlyCreatedICQ() { suite.Require().NoError(err) msgSrv := keeper.NewMsgServerImpl(iqkeeper) - resRegister, err := msgSrv.RegisterInterchainQuery(ctx, &iqtypes.MsgRegisterInterchainQueryRequest{ + resRegister, err := msgSrv.RegisterInterchainQuery(ctx, &iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{{Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "", @@ -1723,7 +1723,7 @@ func (suite *KeeperTestSuite) TestRemoveFreshlyCreatedICQ() { newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) - resp, err := msgSrv.RemoveInterchainQuery(ctx, &iqtypes.MsgRemoveInterchainQueryRequest{ + resp, err := msgSrv.RemoveInterchainQuery(ctx, &iqtypes.MsgRemoveInterchainQuery{ QueryId: 1, Sender: newContractAddress.String(), }) diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 283b9d84e..68d7f7b31 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -33,7 +33,7 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer { return &msgServer{Keeper: keeper} } -func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.MsgRegisterInterchainQueryRequest) (*types.MsgRegisterInterchainQueryResponse, error) { +func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.MsgRegisterInterchainQuery) (*types.MsgRegisterInterchainQueryResponse, error) { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelRegisterInterchainQuery) ctx := sdk.UnwrapSDKContext(goCtx) ctx.Logger().Debug("RegisterInterchainQuery", "msg", msg) @@ -92,7 +92,7 @@ func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg return &types.MsgRegisterInterchainQueryResponse{Id: lastID}, nil } -func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQueryRequest) (*types.MsgRemoveInterchainQueryResponse, error) { +func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQuery) (*types.MsgRemoveInterchainQueryResponse, error) { if err := msg.Validate(); err != nil { return nil, errors.Wrap(err, "failed to validate MsgRemoveInterchainQueryRequest") } @@ -119,7 +119,7 @@ func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRe return &types.MsgRemoveInterchainQueryResponse{}, nil } -func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQueryRequest) (*types.MsgUpdateInterchainQueryResponse, error) { +func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQuery) (*types.MsgUpdateInterchainQueryResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) ctx.Logger().Debug("UpdateInterchainQuery", "msg", msg) params := m.GetParams(ctx) @@ -166,7 +166,7 @@ func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUp return &types.MsgUpdateInterchainQueryResponse{}, nil } -func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmitQueryResultRequest) (*types.MsgSubmitQueryResultResponse, error) { +func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmitQueryResult) (*types.MsgSubmitQueryResultResponse, error) { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), LabelRegisterInterchainQuery) if err := msg.Validate(); err != nil { @@ -316,7 +316,7 @@ func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit // with the query type. func (m msgServer) validateUpdateInterchainQueryParams( query *types.RegisteredQuery, - msg *types.MsgUpdateInterchainQueryRequest, + msg *types.MsgUpdateInterchainQuery, ) error { queryType := types.InterchainQueryType(query.GetQueryType()) newKvKeysSet := len(msg.GetNewKeys()) != 0 @@ -332,7 +332,7 @@ func (m msgServer) validateUpdateInterchainQueryParams( } // UpdateParams updates the module parameters -func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParamsRequest) (*types.MsgUpdateParamsResponse, error) { +func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { if err := req.Validate(); err != nil { return nil, errors.Wrap(err, "failed to validate MsgUpdateParams") } diff --git a/x/interchainqueries/keeper/msg_server_test.go b/x/interchainqueries/keeper/msg_server_test.go index dc464337c..7f2bea9f2 100644 --- a/x/interchainqueries/keeper/msg_server_test.go +++ b/x/interchainqueries/keeper/msg_server_test.go @@ -20,12 +20,12 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { tests := []struct { name string - msg types.MsgRegisterInterchainQueryRequest + msg types.MsgRegisterInterchainQuery expectedErr error }{ { "invalid update period", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -37,7 +37,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty sender", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -49,7 +49,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "invalid sender", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -61,7 +61,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty connection id", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "[]", @@ -73,7 +73,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "invalid query type", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: "invalid_type", Keys: nil, TransactionsFilter: "[]", @@ -85,7 +85,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty keys", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeKV), Keys: nil, TransactionsFilter: "[]", @@ -97,7 +97,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "too many keys", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeKV), Keys: make([]*types.KVKey, types.DefaultMaxKvQueryKeysCount+1), TransactionsFilter: "[]", @@ -109,7 +109,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "nil key", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeKV), Keys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, nil}, TransactionsFilter: "[]", @@ -121,7 +121,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "duplicated keys", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeKV), Keys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, {Key: []byte("key1"), Path: "path1"}}, TransactionsFilter: "[]", @@ -133,7 +133,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty key path", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeKV), Keys: []*types.KVKey{{Key: []byte("key1"), Path: ""}}, TransactionsFilter: "[]", @@ -145,7 +145,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "empty key id", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeKV), Keys: []*types.KVKey{{Key: []byte(""), Path: "path"}}, TransactionsFilter: "[]", @@ -157,7 +157,7 @@ func TestMsgRegisterInterchainQueryValidate(t *testing.T) { }, { "invalid transactions filter format", - types.MsgRegisterInterchainQueryRequest{ + types.MsgRegisterInterchainQuery{ QueryType: string(types.InterchainQueryTypeTX), Keys: nil, TransactionsFilter: "&)(^Y(*&(*&(&(*", @@ -185,12 +185,12 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { tests := []struct { name string - msg types.MsgSubmitQueryResultRequest + msg types.MsgSubmitQueryResult expectedErr error }{ { "empty result", - types.MsgSubmitQueryResultRequest{ + types.MsgSubmitQueryResult{ QueryId: 1, Sender: testutil.TestOwnerAddress, Result: nil, @@ -199,7 +199,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "empty kv results and block result", - types.MsgSubmitQueryResultRequest{ + types.MsgSubmitQueryResult{ QueryId: 1, Sender: testutil.TestOwnerAddress, Result: &types.QueryResult{ @@ -213,7 +213,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "zero query id", - types.MsgSubmitQueryResultRequest{ + types.MsgSubmitQueryResult{ QueryId: 0, Sender: testutil.TestOwnerAddress, Result: &types.QueryResult{ @@ -238,7 +238,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "empty sender", - types.MsgSubmitQueryResultRequest{ + types.MsgSubmitQueryResult{ QueryId: 1, Sender: "", Result: &types.QueryResult{ @@ -263,7 +263,7 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { }, { "invalid sender", - types.MsgSubmitQueryResultRequest{ + types.MsgSubmitQueryResult{ QueryId: 1, Sender: "invalid_sender", Result: &types.QueryResult{ @@ -298,18 +298,18 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { } } -func TestMsgRemoveInterchainQueryRequestValidate(t *testing.T) { +func TestMsgRemoveInterchainQueryValidate(t *testing.T) { k, ctx := testkeeper.InterchainQueriesKeeper(t, nil, nil, nil, nil) msgServer := keeper.NewMsgServerImpl(*k) tests := []struct { name string - msg types.MsgRemoveInterchainQueryRequest + msg types.MsgRemoveInterchainQuery expectedErr error }{ { "invalid query id", - types.MsgRemoveInterchainQueryRequest{ + types.MsgRemoveInterchainQuery{ QueryId: 0, Sender: testutil.TestOwnerAddress, }, @@ -317,7 +317,7 @@ func TestMsgRemoveInterchainQueryRequestValidate(t *testing.T) { }, { "empty sender", - types.MsgRemoveInterchainQueryRequest{ + types.MsgRemoveInterchainQuery{ QueryId: 1, Sender: "", }, @@ -325,7 +325,7 @@ func TestMsgRemoveInterchainQueryRequestValidate(t *testing.T) { }, { "invalid sender", - types.MsgRemoveInterchainQueryRequest{ + types.MsgRemoveInterchainQuery{ QueryId: 1, Sender: "invalid-sender", }, @@ -343,18 +343,18 @@ func TestMsgRemoveInterchainQueryRequestValidate(t *testing.T) { } } -func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { +func TestMsgUpdateInterchainQueryValidate(t *testing.T) { k, ctx := testkeeper.InterchainQueriesKeeper(t, nil, nil, nil, nil) msgServer := keeper.NewMsgServerImpl(*k) tests := []struct { name string - msg types.MsgUpdateInterchainQueryRequest + msg types.MsgUpdateInterchainQuery expectedErr error }{ { "invalid query id", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 0, NewKeys: []*types.KVKey{{ Path: "staking", @@ -367,7 +367,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "empty keys, update_period and tx filter", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 0, @@ -378,7 +378,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "both keys and filter sent", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", @@ -392,7 +392,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "too many keys", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: make([]*types.KVKey, types.DefaultMaxKvQueryKeysCount+1), NewUpdatePeriod: 0, @@ -402,7 +402,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "nil key", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, nil}, NewUpdatePeriod: 0, @@ -412,7 +412,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "duplicated keys", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, {Key: []byte("key1"), Path: "path1"}}, NewUpdatePeriod: 0, @@ -422,7 +422,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "empty key path", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: ""}}, NewUpdatePeriod: 0, @@ -432,7 +432,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "empty key id", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte(""), Path: "path"}}, NewUpdatePeriod: 0, @@ -442,7 +442,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "empty sender", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", @@ -455,7 +455,7 @@ func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { }, { "invalid sender", - types.MsgUpdateInterchainQueryRequest{ + types.MsgUpdateInterchainQuery{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", @@ -483,19 +483,19 @@ func TestMsgUpdateParamsValidate(t *testing.T) { tests := []struct { name string - msg types.MsgUpdateParamsRequest + msg types.MsgUpdateParams expectedErr string }{ { "empty authority", - types.MsgUpdateParamsRequest{ + types.MsgUpdateParams{ Authority: "", }, "authority is invalid", }, { "invalid authority", - types.MsgUpdateParamsRequest{ + types.MsgUpdateParams{ Authority: "invalid authority", }, "authority is invalid", diff --git a/x/interchainqueries/types/codec.go b/x/interchainqueries/types/codec.go index d72abc8ca..c1698cf14 100644 --- a/x/interchainqueries/types/codec.go +++ b/x/interchainqueries/types/codec.go @@ -8,18 +8,18 @@ import ( ) func RegisterCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&MsgRegisterInterchainQueryRequest{}, "interchainqueries/RegisterQuery", nil) - cdc.RegisterConcrete(&MsgUpdateParamsRequest{}, "interchainqueries/MsgUpdateParams", nil) + cdc.RegisterConcrete(&MsgRegisterInterchainQuery{}, "interchainqueries/RegisterQuery", nil) + cdc.RegisterConcrete(&MsgUpdateParams{}, "interchainqueries/MsgUpdateParams", nil) } func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { registry.RegisterImplementations( (*sdk.Msg)(nil), - &MsgRegisterInterchainQueryRequest{}, - &MsgSubmitQueryResultRequest{}, - &MsgUpdateInterchainQueryRequest{}, - &MsgRemoveInterchainQueryRequest{}, - &MsgUpdateParamsRequest{}, + &MsgRegisterInterchainQuery{}, + &MsgSubmitQueryResult{}, + &MsgUpdateInterchainQuery{}, + &MsgRemoveInterchainQuery{}, + &MsgUpdateParams{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } diff --git a/x/interchainqueries/types/genesis.pb.go b/x/interchainqueries/types/genesis.pb.go index de58e1e32..b004a6786 100644 --- a/x/interchainqueries/types/genesis.pb.go +++ b/x/interchainqueries/types/genesis.pb.go @@ -35,10 +35,13 @@ type RegisteredQuery struct { // The query type identifier: `kv` or `tx`. QueryType string `protobuf:"bytes,3,opt,name=query_type,json=queryType,proto3" json:"query_type,omitempty"` // The KV-storage keys for which to get values from the remote chain. Only applicable for the - // KV-typed Interchain Queries. + // KV Interchain Queries. Max amount of keys is limited by the module's `max_kv_query_keys_count` + // parameters. Keys []*KVKey `protobuf:"bytes,4,rep,name=keys,proto3" json:"keys,omitempty"` - // A stringified list of filters for remote transactions search. Only applicable for the TX-typed + // A stringified list of filters for remote transactions search. Only applicable for the TX // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + // Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount of filter conditions is limited + // by the module's `max_transactions_filters` parameters. TransactionsFilter string `protobuf:"bytes,5,opt,name=transactions_filter,json=transactionsFilter,proto3" json:"transactions_filter,omitempty"` // The IBC connection ID to the remote chain (the source of querying data). Is used for getting // ConsensusState from the respective IBC client to verify query result proofs. @@ -182,7 +185,7 @@ type KVKey struct { // The first half of the storage path. It is supposed to be a substore name for the query // (e.g. bank, staking, etc.). Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - // The second half of the storage path. The remaining part of a full path to an IAVL storage node. + // The second half of the storage path. The remaining part of the full path to an IAVL storage node. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` } diff --git a/x/interchainqueries/types/message_remove_interchain_query.go b/x/interchainqueries/types/message_remove_interchain_query.go index 632c4a552..0667de398 100644 --- a/x/interchainqueries/types/message_remove_interchain_query.go +++ b/x/interchainqueries/types/message_remove_interchain_query.go @@ -9,24 +9,24 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -var _ sdk.Msg = &MsgRemoveInterchainQueryRequest{} +var _ sdk.Msg = &MsgRemoveInterchainQuery{} -func NewMsgRemoveInterchainQuery(sender string, queryID uint64) MsgRemoveInterchainQueryRequest { - return MsgRemoveInterchainQueryRequest{ +func NewMsgRemoveInterchainQuery(sender string, queryID uint64) MsgRemoveInterchainQuery { + return MsgRemoveInterchainQuery{ QueryId: queryID, Sender: sender, } } -func (msg MsgRemoveInterchainQueryRequest) Route() string { +func (msg MsgRemoveInterchainQuery) Route() string { return RouterKey } -func (msg MsgRemoveInterchainQueryRequest) Type() string { +func (msg MsgRemoveInterchainQuery) Type() string { return "remove-interchain-query" } -func (msg MsgRemoveInterchainQueryRequest) Validate() error { +func (msg MsgRemoveInterchainQuery) Validate() error { if msg.GetQueryId() == 0 { return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") } @@ -42,11 +42,11 @@ func (msg MsgRemoveInterchainQueryRequest) Validate() error { return nil } -func (msg MsgRemoveInterchainQueryRequest) GetSignBytes() []byte { +func (msg MsgRemoveInterchainQuery) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgRemoveInterchainQueryRequest) GetSigners() []sdk.AccAddress { +func (msg MsgRemoveInterchainQuery) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) diff --git a/x/interchainqueries/types/tx.go b/x/interchainqueries/types/tx.go index c9429ab2d..d40da497f 100644 --- a/x/interchainqueries/types/tx.go +++ b/x/interchainqueries/types/tx.go @@ -12,19 +12,19 @@ import ( ) var ( - _ sdk.Msg = &MsgSubmitQueryResultRequest{} - _ codectypes.UnpackInterfacesMessage = MsgSubmitQueryResultRequest{} + _ sdk.Msg = &MsgSubmitQueryResult{} + _ codectypes.UnpackInterfacesMessage = MsgSubmitQueryResult{} ) -func (msg MsgSubmitQueryResultRequest) Route() string { +func (msg MsgSubmitQueryResult) Route() string { return RouterKey } -func (msg MsgSubmitQueryResultRequest) Type() string { +func (msg MsgSubmitQueryResult) Type() string { return "submit-query-result" } -func (msg MsgSubmitQueryResultRequest) Validate() error { +func (msg MsgSubmitQueryResult) Validate() error { if msg.Result == nil { return errors.Wrap(ErrEmptyResult, "query result can't be empty") } @@ -48,11 +48,11 @@ func (msg MsgSubmitQueryResultRequest) Validate() error { return nil } -func (msg MsgSubmitQueryResultRequest) GetSignBytes() []byte { +func (msg MsgSubmitQueryResult) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgSubmitQueryResultRequest) GetSigners() []sdk.AccAddress { +func (msg MsgSubmitQueryResult) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) @@ -61,7 +61,7 @@ func (msg MsgSubmitQueryResultRequest) GetSigners() []sdk.AccAddress { } // UnpackInterfaces implements UnpackInterfacesMessage.UnpackInterfaces -func (msg MsgSubmitQueryResultRequest) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { +func (msg MsgSubmitQueryResult) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { var header exported.ClientMessage if err := unpacker.UnpackAny(msg.Result.GetBlock().GetHeader(), &header); err != nil { return err @@ -72,17 +72,17 @@ func (msg MsgSubmitQueryResultRequest) UnpackInterfaces(unpacker codectypes.AnyU //---------------------------------------------------------------- -var _ sdk.Msg = &MsgRegisterInterchainQueryRequest{} +var _ sdk.Msg = &MsgRegisterInterchainQuery{} -func (msg MsgRegisterInterchainQueryRequest) Route() string { +func (msg MsgRegisterInterchainQuery) Route() string { return RouterKey } -func (msg MsgRegisterInterchainQueryRequest) Type() string { +func (msg MsgRegisterInterchainQuery) Type() string { return "register-interchain-query" } -func (msg MsgRegisterInterchainQueryRequest) Validate(params Params) error { +func (msg MsgRegisterInterchainQuery) Validate(params Params) error { if msg.UpdatePeriod == 0 { return errors.Wrap(ErrInvalidUpdatePeriod, "update period can not be equal to zero") } @@ -120,11 +120,11 @@ func (msg MsgRegisterInterchainQueryRequest) Validate(params Params) error { return nil } -func (msg MsgRegisterInterchainQueryRequest) GetSignBytes() []byte { +func (msg MsgRegisterInterchainQuery) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgRegisterInterchainQueryRequest) GetSigners() []sdk.AccAddress { +func (msg MsgRegisterInterchainQuery) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) @@ -134,9 +134,9 @@ func (msg MsgRegisterInterchainQueryRequest) GetSigners() []sdk.AccAddress { //---------------------------------------------------------------- -var _ sdk.Msg = &MsgUpdateInterchainQueryRequest{} +var _ sdk.Msg = &MsgUpdateInterchainQuery{} -func (msg MsgUpdateInterchainQueryRequest) Validate(params Params) error { +func (msg MsgUpdateInterchainQuery) Validate(params Params) error { if msg.GetQueryId() == 0 { return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") } @@ -179,11 +179,11 @@ func (msg MsgUpdateInterchainQueryRequest) Validate(params Params) error { return nil } -func (msg MsgUpdateInterchainQueryRequest) GetSignBytes() []byte { +func (msg MsgUpdateInterchainQuery) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgUpdateInterchainQueryRequest) GetSigners() []sdk.AccAddress { +func (msg MsgUpdateInterchainQuery) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) @@ -193,17 +193,17 @@ func (msg MsgUpdateInterchainQueryRequest) GetSigners() []sdk.AccAddress { //---------------------------------------------------------------- -var _ sdk.Msg = &MsgUpdateParamsRequest{} +var _ sdk.Msg = &MsgUpdateParams{} -func (msg *MsgUpdateParamsRequest) Route() string { +func (msg *MsgUpdateParams) Route() string { return RouterKey } -func (msg *MsgUpdateParamsRequest) Type() string { +func (msg *MsgUpdateParams) Type() string { return "update-params" } -func (msg *MsgUpdateParamsRequest) GetSigners() []sdk.AccAddress { +func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress { authority, err := sdk.AccAddressFromBech32(msg.Authority) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) @@ -211,11 +211,11 @@ func (msg *MsgUpdateParamsRequest) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{authority} } -func (msg *MsgUpdateParamsRequest) GetSignBytes() []byte { +func (msg *MsgUpdateParams) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(msg) } -func (msg *MsgUpdateParamsRequest) Validate() error { +func (msg *MsgUpdateParams) Validate() error { if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { return errors.Wrap(err, "authority is invalid") } diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 4390f6227..1f10becdc 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -35,14 +35,17 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Request type for the Msg/RegisterInterchainQuery RPC method. -type MsgRegisterInterchainQueryRequest struct { +type MsgRegisterInterchainQuery struct { // The query type identifier: `kv` or `tx`. QueryType string `protobuf:"bytes,1,opt,name=query_type,json=queryType,proto3" json:"query_type,omitempty"` // The KV-storage keys for which we want to get values from remote chain. Only applicable for the - // KV-typed Interchain Queries. + // KV Interchain Queries. Max amount of keys is limited by the module's `max_kv_query_keys_count` + // parameters. Keys []*KVKey `protobuf:"bytes,2,rep,name=keys,proto3" json:"keys,omitempty"` - // A stringified list of filters for remote transactions search. Only applicable for the TX-typed + // A stringified list of filters for remote transactions search. Only applicable for the TX // Interchain Queries. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + // Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount of filter conditions is + // limited by the module's `max_transactions_filters` parameters. TransactionsFilter string `protobuf:"bytes,3,opt,name=transactions_filter,json=transactionsFilter,proto3" json:"transactions_filter,omitempty"` // The IBC connection ID to the remote chain (the source of querying data). Is used for getting // ConsensusState from the respective IBC client to verify query result proofs. @@ -54,18 +57,18 @@ type MsgRegisterInterchainQueryRequest struct { Sender string `protobuf:"bytes,6,opt,name=sender,proto3" json:"sender,omitempty"` } -func (m *MsgRegisterInterchainQueryRequest) Reset() { *m = MsgRegisterInterchainQueryRequest{} } -func (m *MsgRegisterInterchainQueryRequest) String() string { return proto.CompactTextString(m) } -func (*MsgRegisterInterchainQueryRequest) ProtoMessage() {} -func (*MsgRegisterInterchainQueryRequest) Descriptor() ([]byte, []int) { +func (m *MsgRegisterInterchainQuery) Reset() { *m = MsgRegisterInterchainQuery{} } +func (m *MsgRegisterInterchainQuery) String() string { return proto.CompactTextString(m) } +func (*MsgRegisterInterchainQuery) ProtoMessage() {} +func (*MsgRegisterInterchainQuery) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{0} } -func (m *MsgRegisterInterchainQueryRequest) XXX_Unmarshal(b []byte) error { +func (m *MsgRegisterInterchainQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgRegisterInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgRegisterInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgRegisterInterchainQueryRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgRegisterInterchainQuery.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -75,54 +78,54 @@ func (m *MsgRegisterInterchainQueryRequest) XXX_Marshal(b []byte, deterministic return b[:n], nil } } -func (m *MsgRegisterInterchainQueryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRegisterInterchainQueryRequest.Merge(m, src) +func (m *MsgRegisterInterchainQuery) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRegisterInterchainQuery.Merge(m, src) } -func (m *MsgRegisterInterchainQueryRequest) XXX_Size() int { +func (m *MsgRegisterInterchainQuery) XXX_Size() int { return m.Size() } -func (m *MsgRegisterInterchainQueryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRegisterInterchainQueryRequest.DiscardUnknown(m) +func (m *MsgRegisterInterchainQuery) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRegisterInterchainQuery.DiscardUnknown(m) } -var xxx_messageInfo_MsgRegisterInterchainQueryRequest proto.InternalMessageInfo +var xxx_messageInfo_MsgRegisterInterchainQuery proto.InternalMessageInfo -func (m *MsgRegisterInterchainQueryRequest) GetQueryType() string { +func (m *MsgRegisterInterchainQuery) GetQueryType() string { if m != nil { return m.QueryType } return "" } -func (m *MsgRegisterInterchainQueryRequest) GetKeys() []*KVKey { +func (m *MsgRegisterInterchainQuery) GetKeys() []*KVKey { if m != nil { return m.Keys } return nil } -func (m *MsgRegisterInterchainQueryRequest) GetTransactionsFilter() string { +func (m *MsgRegisterInterchainQuery) GetTransactionsFilter() string { if m != nil { return m.TransactionsFilter } return "" } -func (m *MsgRegisterInterchainQueryRequest) GetConnectionId() string { +func (m *MsgRegisterInterchainQuery) GetConnectionId() string { if m != nil { return m.ConnectionId } return "" } -func (m *MsgRegisterInterchainQueryRequest) GetUpdatePeriod() uint64 { +func (m *MsgRegisterInterchainQuery) GetUpdatePeriod() uint64 { if m != nil { return m.UpdatePeriod } return 0 } -func (m *MsgRegisterInterchainQueryRequest) GetSender() string { +func (m *MsgRegisterInterchainQuery) GetSender() string { if m != nil { return m.Sender } @@ -176,7 +179,7 @@ func (m *MsgRegisterInterchainQueryResponse) GetId() uint64 { } // Request type for the Msg/SubmitQueryResult RPC method. -type MsgSubmitQueryResultRequest struct { +type MsgSubmitQueryResult struct { // The ID of the Interchain Query. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` // The signer of the message. @@ -189,18 +192,18 @@ type MsgSubmitQueryResultRequest struct { Result *QueryResult `protobuf:"bytes,4,opt,name=result,proto3" json:"result,omitempty"` } -func (m *MsgSubmitQueryResultRequest) Reset() { *m = MsgSubmitQueryResultRequest{} } -func (m *MsgSubmitQueryResultRequest) String() string { return proto.CompactTextString(m) } -func (*MsgSubmitQueryResultRequest) ProtoMessage() {} -func (*MsgSubmitQueryResultRequest) Descriptor() ([]byte, []int) { +func (m *MsgSubmitQueryResult) Reset() { *m = MsgSubmitQueryResult{} } +func (m *MsgSubmitQueryResult) String() string { return proto.CompactTextString(m) } +func (*MsgSubmitQueryResult) ProtoMessage() {} +func (*MsgSubmitQueryResult) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{2} } -func (m *MsgSubmitQueryResultRequest) XXX_Unmarshal(b []byte) error { +func (m *MsgSubmitQueryResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgSubmitQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgSubmitQueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgSubmitQueryResultRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgSubmitQueryResult.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -210,26 +213,26 @@ func (m *MsgSubmitQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *MsgSubmitQueryResultRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSubmitQueryResultRequest.Merge(m, src) +func (m *MsgSubmitQueryResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSubmitQueryResult.Merge(m, src) } -func (m *MsgSubmitQueryResultRequest) XXX_Size() int { +func (m *MsgSubmitQueryResult) XXX_Size() int { return m.Size() } -func (m *MsgSubmitQueryResultRequest) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSubmitQueryResultRequest.DiscardUnknown(m) +func (m *MsgSubmitQueryResult) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSubmitQueryResult.DiscardUnknown(m) } -var xxx_messageInfo_MsgSubmitQueryResultRequest proto.InternalMessageInfo +var xxx_messageInfo_MsgSubmitQueryResult proto.InternalMessageInfo -func (m *MsgSubmitQueryResultRequest) GetQueryId() uint64 { +func (m *MsgSubmitQueryResult) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -func (m *MsgSubmitQueryResultRequest) GetSender() string { +func (m *MsgSubmitQueryResult) GetSender() string { if m != nil { return m.Sender } @@ -237,14 +240,14 @@ func (m *MsgSubmitQueryResultRequest) GetSender() string { } // Deprecated: Do not use. -func (m *MsgSubmitQueryResultRequest) GetClientId() string { +func (m *MsgSubmitQueryResult) GetClientId() string { if m != nil { return m.ClientId } return "" } -func (m *MsgSubmitQueryResultRequest) GetResult() *QueryResult { +func (m *MsgSubmitQueryResult) GetResult() *QueryResult { if m != nil { return m.Result } @@ -348,7 +351,7 @@ type StorageValue struct { // The first half of the storage path. It is supposed to be a substore name for the query // (e.g. bank, staking, etc.). StoragePrefix string `protobuf:"bytes,1,opt,name=storage_prefix,json=storagePrefix,proto3" json:"storage_prefix,omitempty"` - // The second half of the storage path. The remaining part of a full path to an IAVL storage node. + // The second half of the storage path. The remaining part of the full path to an IAVL storage node. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` // A base64-encoded value read from the given storage path. Value []byte `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` @@ -597,25 +600,25 @@ func (m *MsgSubmitQueryResultResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSubmitQueryResultResponse proto.InternalMessageInfo // Request type for the Msg/RemoveInterchainQuery RPC method. -type MsgRemoveInterchainQueryRequest struct { +type MsgRemoveInterchainQuery struct { // The ID of the query to remove. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` // The signer of the message. Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` } -func (m *MsgRemoveInterchainQueryRequest) Reset() { *m = MsgRemoveInterchainQueryRequest{} } -func (m *MsgRemoveInterchainQueryRequest) String() string { return proto.CompactTextString(m) } -func (*MsgRemoveInterchainQueryRequest) ProtoMessage() {} -func (*MsgRemoveInterchainQueryRequest) Descriptor() ([]byte, []int) { +func (m *MsgRemoveInterchainQuery) Reset() { *m = MsgRemoveInterchainQuery{} } +func (m *MsgRemoveInterchainQuery) String() string { return proto.CompactTextString(m) } +func (*MsgRemoveInterchainQuery) ProtoMessage() {} +func (*MsgRemoveInterchainQuery) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{8} } -func (m *MsgRemoveInterchainQueryRequest) XXX_Unmarshal(b []byte) error { +func (m *MsgRemoveInterchainQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgRemoveInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgRemoveInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgRemoveInterchainQueryRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgRemoveInterchainQuery.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -625,26 +628,26 @@ func (m *MsgRemoveInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bo return b[:n], nil } } -func (m *MsgRemoveInterchainQueryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRemoveInterchainQueryRequest.Merge(m, src) +func (m *MsgRemoveInterchainQuery) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRemoveInterchainQuery.Merge(m, src) } -func (m *MsgRemoveInterchainQueryRequest) XXX_Size() int { +func (m *MsgRemoveInterchainQuery) XXX_Size() int { return m.Size() } -func (m *MsgRemoveInterchainQueryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRemoveInterchainQueryRequest.DiscardUnknown(m) +func (m *MsgRemoveInterchainQuery) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRemoveInterchainQuery.DiscardUnknown(m) } -var xxx_messageInfo_MsgRemoveInterchainQueryRequest proto.InternalMessageInfo +var xxx_messageInfo_MsgRemoveInterchainQuery proto.InternalMessageInfo -func (m *MsgRemoveInterchainQueryRequest) GetQueryId() uint64 { +func (m *MsgRemoveInterchainQuery) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -func (m *MsgRemoveInterchainQueryRequest) GetSender() string { +func (m *MsgRemoveInterchainQuery) GetSender() string { if m != nil { return m.Sender } @@ -689,33 +692,36 @@ func (m *MsgRemoveInterchainQueryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRemoveInterchainQueryResponse proto.InternalMessageInfo // Request type for the Msg/UpdateInterchainQuery RPC method. -type MsgUpdateInterchainQueryRequest struct { +type MsgUpdateInterchainQuery struct { // The ID of the query to update. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` // A new list of KV-storage keys for which to get values from the remote chain. Only applicable - // for a KV-typed Interchain Query. + // for a KV Interchain Query. Max amount of keys is limited by the module's `max_kv_query_keys_count` + // parameters. NewKeys []*KVKey `protobuf:"bytes,2,rep,name=new_keys,json=newKeys,proto3" json:"new_keys,omitempty"` // A new minimal delay between consecutive query executions. NewUpdatePeriod uint64 `protobuf:"varint,3,opt,name=new_update_period,json=newUpdatePeriod,proto3" json:"new_update_period,omitempty"` - // A new list of filters for remote transactions search. Only applicable for a TX-typed - // Interchain Query. + // A new list of filters for remote transactions search. Only applicable for a TX Interchain + // Query. Example: "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + // Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount of filter conditions is + // limited by the module's `max_transactions_filters` parameters. NewTransactionsFilter string `protobuf:"bytes,4,opt,name=new_transactions_filter,json=newTransactionsFilter,proto3" json:"new_transactions_filter,omitempty"` // The signer of the message. Sender string `protobuf:"bytes,5,opt,name=sender,proto3" json:"sender,omitempty"` } -func (m *MsgUpdateInterchainQueryRequest) Reset() { *m = MsgUpdateInterchainQueryRequest{} } -func (m *MsgUpdateInterchainQueryRequest) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateInterchainQueryRequest) ProtoMessage() {} -func (*MsgUpdateInterchainQueryRequest) Descriptor() ([]byte, []int) { +func (m *MsgUpdateInterchainQuery) Reset() { *m = MsgUpdateInterchainQuery{} } +func (m *MsgUpdateInterchainQuery) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateInterchainQuery) ProtoMessage() {} +func (*MsgUpdateInterchainQuery) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{10} } -func (m *MsgUpdateInterchainQueryRequest) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateInterchainQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateInterchainQueryRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateInterchainQuery.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -725,47 +731,47 @@ func (m *MsgUpdateInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bo return b[:n], nil } } -func (m *MsgUpdateInterchainQueryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateInterchainQueryRequest.Merge(m, src) +func (m *MsgUpdateInterchainQuery) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateInterchainQuery.Merge(m, src) } -func (m *MsgUpdateInterchainQueryRequest) XXX_Size() int { +func (m *MsgUpdateInterchainQuery) XXX_Size() int { return m.Size() } -func (m *MsgUpdateInterchainQueryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateInterchainQueryRequest.DiscardUnknown(m) +func (m *MsgUpdateInterchainQuery) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateInterchainQuery.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateInterchainQueryRequest proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateInterchainQuery proto.InternalMessageInfo -func (m *MsgUpdateInterchainQueryRequest) GetQueryId() uint64 { +func (m *MsgUpdateInterchainQuery) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -func (m *MsgUpdateInterchainQueryRequest) GetNewKeys() []*KVKey { +func (m *MsgUpdateInterchainQuery) GetNewKeys() []*KVKey { if m != nil { return m.NewKeys } return nil } -func (m *MsgUpdateInterchainQueryRequest) GetNewUpdatePeriod() uint64 { +func (m *MsgUpdateInterchainQuery) GetNewUpdatePeriod() uint64 { if m != nil { return m.NewUpdatePeriod } return 0 } -func (m *MsgUpdateInterchainQueryRequest) GetNewTransactionsFilter() string { +func (m *MsgUpdateInterchainQuery) GetNewTransactionsFilter() string { if m != nil { return m.NewTransactionsFilter } return "" } -func (m *MsgUpdateInterchainQueryRequest) GetSender() string { +func (m *MsgUpdateInterchainQuery) GetSender() string { if m != nil { return m.Sender } @@ -810,25 +816,25 @@ func (m *MsgUpdateInterchainQueryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateInterchainQueryResponse proto.InternalMessageInfo // Request type for the Msg/UpdateParams RPC method. -type MsgUpdateParamsRequest struct { +type MsgUpdateParams struct { // The address of the authority of the module. Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` // The new parameters of the module. All parameters must be supplied. Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` } -func (m *MsgUpdateParamsRequest) Reset() { *m = MsgUpdateParamsRequest{} } -func (m *MsgUpdateParamsRequest) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateParamsRequest) ProtoMessage() {} -func (*MsgUpdateParamsRequest) Descriptor() ([]byte, []int) { +func (m *MsgUpdateParams) Reset() { *m = MsgUpdateParams{} } +func (m *MsgUpdateParams) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateParams) ProtoMessage() {} +func (*MsgUpdateParams) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{12} } -func (m *MsgUpdateParamsRequest) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateParamsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -838,26 +844,26 @@ func (m *MsgUpdateParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *MsgUpdateParamsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateParamsRequest.Merge(m, src) +func (m *MsgUpdateParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParams.Merge(m, src) } -func (m *MsgUpdateParamsRequest) XXX_Size() int { +func (m *MsgUpdateParams) XXX_Size() int { return m.Size() } -func (m *MsgUpdateParamsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateParamsRequest.DiscardUnknown(m) +func (m *MsgUpdateParams) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateParams.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateParamsRequest proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo -func (m *MsgUpdateParamsRequest) GetAuthority() string { +func (m *MsgUpdateParams) GetAuthority() string { if m != nil { return m.Authority } return "" } -func (m *MsgUpdateParamsRequest) GetParams() Params { +func (m *MsgUpdateParams) GetParams() Params { if m != nil { return m.Params } @@ -902,19 +908,19 @@ func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgRegisterInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgRegisterInterchainQueryRequest") + proto.RegisterType((*MsgRegisterInterchainQuery)(nil), "neutron.interchainqueries.MsgRegisterInterchainQuery") proto.RegisterType((*MsgRegisterInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgRegisterInterchainQueryResponse") - proto.RegisterType((*MsgSubmitQueryResultRequest)(nil), "neutron.interchainqueries.MsgSubmitQueryResultRequest") + proto.RegisterType((*MsgSubmitQueryResult)(nil), "neutron.interchainqueries.MsgSubmitQueryResult") proto.RegisterType((*QueryResult)(nil), "neutron.interchainqueries.QueryResult") proto.RegisterType((*StorageValue)(nil), "neutron.interchainqueries.StorageValue") proto.RegisterType((*Block)(nil), "neutron.interchainqueries.Block") proto.RegisterType((*TxValue)(nil), "neutron.interchainqueries.TxValue") proto.RegisterType((*MsgSubmitQueryResultResponse)(nil), "neutron.interchainqueries.MsgSubmitQueryResultResponse") - proto.RegisterType((*MsgRemoveInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgRemoveInterchainQueryRequest") + proto.RegisterType((*MsgRemoveInterchainQuery)(nil), "neutron.interchainqueries.MsgRemoveInterchainQuery") proto.RegisterType((*MsgRemoveInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgRemoveInterchainQueryResponse") - proto.RegisterType((*MsgUpdateInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryRequest") + proto.RegisterType((*MsgUpdateInterchainQuery)(nil), "neutron.interchainqueries.MsgUpdateInterchainQuery") proto.RegisterType((*MsgUpdateInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryResponse") - proto.RegisterType((*MsgUpdateParamsRequest)(nil), "neutron.interchainqueries.MsgUpdateParamsRequest") + proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchainqueries.MsgUpdateParams") proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchainqueries.MsgUpdateParamsResponse") } @@ -923,81 +929,81 @@ func init() { } var fileDescriptor_d4793837a316491e = []byte{ - // 1178 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcd, 0x4f, 0x1b, 0x47, - 0x14, 0x67, 0x8d, 0x4d, 0xf0, 0xe0, 0x90, 0x64, 0x4a, 0x82, 0x71, 0x1a, 0x87, 0x6c, 0xd5, 0x04, - 0xa1, 0x64, 0x57, 0xb8, 0x94, 0xaa, 0xd0, 0x2f, 0x68, 0x1b, 0x15, 0x21, 0x54, 0xba, 0x40, 0x0e, - 0xbd, 0xac, 0xd6, 0xbb, 0xc3, 0x7a, 0xe4, 0xf5, 0x8c, 0xb3, 0x33, 0xeb, 0x8f, 0x5b, 0x15, 0xf5, - 0xd4, 0x13, 0xa7, 0xaa, 0x7f, 0x42, 0xa5, 0x5e, 0x38, 0xf4, 0xdc, 0x73, 0x2a, 0xf5, 0x10, 0xf5, - 0xd4, 0x43, 0x55, 0x55, 0x70, 0xe0, 0xd8, 0x7f, 0xa1, 0x9a, 0x8f, 0x35, 0xa6, 0x60, 0xbb, 0xe4, - 0x92, 0xec, 0x7b, 0xef, 0xf7, 0xde, 0xfc, 0xde, 0x9b, 0xf7, 0xde, 0x18, 0x60, 0x12, 0x94, 0xf0, - 0x98, 0x12, 0x1b, 0x13, 0x8e, 0x62, 0xbf, 0xe6, 0x61, 0xf2, 0x3c, 0x41, 0x31, 0x46, 0xcc, 0xe6, - 0x1d, 0xab, 0x19, 0x53, 0x4e, 0xe1, 0x9c, 0xc6, 0x58, 0x17, 0x30, 0xa5, 0x5b, 0x5e, 0x03, 0x13, - 0x6a, 0xcb, 0x7f, 0x15, 0xba, 0x34, 0xeb, 0x53, 0xd6, 0xa0, 0xcc, 0x6e, 0xb0, 0xd0, 0x6e, 0x2d, - 0x89, 0xff, 0xb4, 0x61, 0x4e, 0x19, 0x5c, 0x29, 0xd9, 0x4a, 0xd0, 0xa6, 0x99, 0x90, 0x86, 0x54, - 0xe9, 0xc5, 0x57, 0xea, 0x10, 0x52, 0x1a, 0x46, 0xc8, 0x96, 0x52, 0x35, 0x39, 0xb0, 0x3d, 0xd2, - 0xd5, 0xa6, 0x47, 0x83, 0x69, 0x87, 0x88, 0x20, 0x86, 0xd3, 0xc8, 0x0f, 0x07, 0x03, 0x9b, 0x5e, - 0xec, 0x35, 0x52, 0xdc, 0x5d, 0x8e, 0x48, 0x80, 0xe2, 0x06, 0x26, 0xdc, 0xf6, 0xaa, 0x3e, 0xb6, - 0x79, 0xb7, 0x89, 0x52, 0xe3, 0xbd, 0x3e, 0xa3, 0x1f, 0x77, 0x9b, 0x9c, 0x0a, 0x4e, 0xf4, 0x40, - 0x99, 0xcd, 0x1f, 0x32, 0xe0, 0xc1, 0x36, 0x0b, 0x1d, 0x14, 0x62, 0xc6, 0x51, 0xbc, 0xd9, 0x3b, - 0xe9, 0xab, 0x04, 0xc5, 0x5d, 0x07, 0x3d, 0x4f, 0x10, 0xe3, 0xf0, 0x1e, 0x00, 0xe2, 0xe4, 0xae, - 0x2b, 0x22, 0x17, 0x8d, 0x79, 0x63, 0x21, 0xef, 0xe4, 0xa5, 0x66, 0xaf, 0xdb, 0x44, 0x70, 0x19, - 0x64, 0xeb, 0xa8, 0xcb, 0x8a, 0x99, 0xf9, 0xf1, 0x85, 0xa9, 0xca, 0xbc, 0x35, 0xb0, 0xe6, 0xd6, - 0xd6, 0xb3, 0x2d, 0xd4, 0x75, 0x24, 0x1a, 0xda, 0xe0, 0x0d, 0x1e, 0x7b, 0x84, 0x79, 0x3e, 0xc7, - 0x94, 0x30, 0xf7, 0x00, 0x47, 0x1c, 0xc5, 0xc5, 0x71, 0x19, 0x1d, 0xf6, 0x9b, 0x9e, 0x4a, 0x0b, - 0x7c, 0x0b, 0x5c, 0xf7, 0x29, 0x21, 0x48, 0x2a, 0x5d, 0x1c, 0x14, 0xb3, 0x12, 0x5a, 0x38, 0x53, - 0x6e, 0x06, 0x02, 0x94, 0x34, 0x03, 0x8f, 0x23, 0xb7, 0x89, 0x62, 0x4c, 0x83, 0x62, 0x6e, 0xde, - 0x58, 0xc8, 0x3a, 0x05, 0xa5, 0xdc, 0x91, 0x3a, 0x78, 0x07, 0x4c, 0x30, 0x59, 0x96, 0xe2, 0x84, - 0x0c, 0xa1, 0xa5, 0xd5, 0xa9, 0x17, 0xa7, 0x47, 0x8b, 0x5a, 0x30, 0x97, 0x81, 0x39, 0xac, 0x32, - 0xac, 0x49, 0x09, 0x43, 0x70, 0x1a, 0x64, 0x70, 0x20, 0x4b, 0x92, 0x75, 0x32, 0x38, 0x30, 0x7f, - 0x31, 0xc0, 0xdd, 0x6d, 0x16, 0xee, 0x26, 0xd5, 0x06, 0xe6, 0x29, 0x34, 0x89, 0x78, 0x5a, 0xca, - 0x39, 0x30, 0xa9, 0x4a, 0xd9, 0xf3, 0xba, 0x26, 0xe5, 0xcd, 0x7e, 0x56, 0x99, 0x7e, 0x56, 0xf0, - 0x3e, 0xc8, 0xfb, 0x11, 0x46, 0x84, 0x0b, 0x1f, 0x59, 0x9e, 0x8d, 0x4c, 0xd1, 0x70, 0x26, 0x95, - 0x72, 0x33, 0x80, 0x1f, 0x81, 0x89, 0x58, 0x1e, 0x22, 0x2b, 0x32, 0x55, 0x79, 0x38, 0xe4, 0x06, - 0xfa, 0x29, 0x69, 0xaf, 0xf3, 0x69, 0xff, 0x63, 0x80, 0xa9, 0x3e, 0x10, 0x7c, 0x0a, 0x40, 0xbd, - 0xe5, 0x2a, 0x24, 0x2b, 0x1a, 0xf2, 0x8a, 0x1f, 0x0d, 0x39, 0x60, 0x97, 0xd3, 0xd8, 0x0b, 0xd1, - 0x33, 0x2f, 0x4a, 0x90, 0x93, 0xaf, 0xb7, 0x54, 0x18, 0x06, 0x57, 0x40, 0xae, 0x1a, 0x51, 0xbf, - 0x2e, 0x93, 0x1b, 0xde, 0x25, 0x1b, 0x02, 0xe7, 0x28, 0xb8, 0xa8, 0x4a, 0x0d, 0xe1, 0xb0, 0xc6, - 0x65, 0xea, 0x59, 0x47, 0x4b, 0xb0, 0x04, 0x26, 0x63, 0xd4, 0xc2, 0x0c, 0x53, 0x22, 0xd3, 0xce, - 0x3a, 0x3d, 0x19, 0x3e, 0x06, 0xd0, 0x8b, 0x22, 0xda, 0x76, 0xeb, 0x2d, 0xd7, 0xf7, 0xa2, 0xa8, - 0xea, 0xf9, 0x75, 0x26, 0x3b, 0x61, 0xd2, 0xb9, 0x29, 0x2d, 0x5b, 0xad, 0x4f, 0x53, 0xbd, 0x79, - 0x68, 0x80, 0x42, 0x3f, 0x6b, 0xf8, 0x36, 0x98, 0x66, 0x4a, 0x76, 0x9b, 0x31, 0x3a, 0xc0, 0x1d, - 0xdd, 0xf2, 0xd7, 0xb5, 0x76, 0x47, 0x2a, 0xe1, 0x4d, 0x30, 0x5e, 0x47, 0x5d, 0x99, 0x4f, 0xc1, - 0x11, 0x9f, 0x70, 0x06, 0xe4, 0x5a, 0x22, 0x82, 0xa4, 0x5a, 0x70, 0x94, 0x00, 0x97, 0x40, 0x6e, - 0x47, 0x8c, 0x9c, 0xbe, 0x9d, 0xbb, 0xd6, 0xd9, 0x48, 0x5a, 0x6a, 0x24, 0x2d, 0x69, 0xff, 0xb2, - 0xc9, 0x1c, 0x85, 0x34, 0x7f, 0x32, 0x40, 0x4e, 0x56, 0x01, 0x7e, 0x02, 0x6e, 0x11, 0xd4, 0xe1, - 0xae, 0x2c, 0x86, 0x5b, 0x43, 0x9e, 0xe8, 0x0f, 0x43, 0x06, 0x9a, 0xb1, 0xd4, 0x92, 0xb1, 0xd2, - 0x25, 0x63, 0xad, 0x93, 0xae, 0x73, 0x43, 0xc0, 0xa5, 0xef, 0x17, 0x12, 0x0c, 0x1f, 0x8b, 0x02, - 0x7a, 0x69, 0x5b, 0x0d, 0x72, 0xd3, 0x18, 0x58, 0x01, 0x19, 0xde, 0x91, 0xfc, 0xa7, 0x2a, 0xe6, - 0x90, 0x3b, 0xda, 0xeb, 0xa8, 0x1b, 0xce, 0xf0, 0x8e, 0xf9, 0xa7, 0x01, 0xae, 0x69, 0x19, 0xbe, - 0x2f, 0xae, 0x45, 0xcd, 0x86, 0xa6, 0x79, 0xaf, 0x3f, 0x5f, 0xb1, 0x9f, 0xac, 0xcf, 0x3b, 0xc8, - 0xdf, 0xeb, 0xe8, 0x26, 0xec, 0xc1, 0xe1, 0xc7, 0x60, 0x3a, 0x40, 0x11, 0x6e, 0x89, 0xe9, 0x90, - 0x3b, 0x4a, 0x13, 0x2e, 0x0e, 0x2a, 0x98, 0x73, 0x3d, 0xc5, 0x4b, 0x11, 0xae, 0x83, 0x1b, 0x98, - 0xf8, 0x51, 0x22, 0x7a, 0x40, 0x47, 0x18, 0x1f, 0x11, 0x61, 0xba, 0xe7, 0xa0, 0x42, 0x40, 0x90, - 0x0d, 0x3c, 0xee, 0xc9, 0xab, 0x2a, 0x38, 0xf2, 0xdb, 0x2c, 0x83, 0x37, 0x2f, 0x9f, 0x68, 0xc5, - 0xdb, 0xf4, 0xc0, 0x7d, 0xb9, 0x28, 0x1a, 0xb4, 0x85, 0x06, 0x2c, 0xd0, 0xab, 0x4f, 0xfd, 0xf9, - 0xa1, 0x34, 0xc1, 0xfc, 0xe0, 0x23, 0x34, 0x8d, 0x17, 0x19, 0xc9, 0x63, 0x5f, 0x2e, 0xba, 0xab, - 0xf3, 0x58, 0x03, 0x93, 0x04, 0xb5, 0xdd, 0x2b, 0x2d, 0xf2, 0x6b, 0x04, 0xb5, 0xb7, 0xc4, 0x2e, - 0x5f, 0x14, 0x5d, 0xda, 0x76, 0xcf, 0x6f, 0x5e, 0x35, 0xaf, 0x37, 0x08, 0x6a, 0xef, 0xf7, 0x2f, - 0xdf, 0x15, 0x30, 0x2b, 0xb0, 0x97, 0xed, 0x7e, 0xb5, 0xd0, 0x6f, 0x13, 0xd4, 0xde, 0xbb, 0xb8, - 0xfe, 0xcf, 0x0a, 0x95, 0x1b, 0x55, 0xa8, 0x01, 0x35, 0xd0, 0x85, 0xfa, 0xcd, 0x00, 0x77, 0x7a, - 0xa0, 0x1d, 0xf9, 0x92, 0xa6, 0xf5, 0x59, 0x01, 0x79, 0x2f, 0xe1, 0x35, 0x1a, 0x63, 0xde, 0x55, - 0x43, 0xbf, 0x51, 0xfc, 0xfd, 0xe7, 0x27, 0x33, 0xfa, 0xc5, 0x5f, 0x0f, 0x82, 0x18, 0x31, 0xb6, - 0xcb, 0x63, 0x4c, 0x42, 0xe7, 0x0c, 0x0a, 0x3f, 0x03, 0x13, 0xea, 0x49, 0xd6, 0x2d, 0xfb, 0x60, - 0x48, 0xe9, 0xd4, 0x89, 0x1b, 0xf9, 0x97, 0x7f, 0xdd, 0x1f, 0xfb, 0xf1, 0xf4, 0x68, 0xd1, 0x70, - 0xb4, 0xef, 0xea, 0xb2, 0xc8, 0xe4, 0x2c, 0xea, 0x77, 0xa7, 0x47, 0x8b, 0x0f, 0x2e, 0xbe, 0xfd, - 0xff, 0xa1, 0x6e, 0xce, 0x81, 0xd9, 0x0b, 0xd9, 0xa8, 0x4c, 0x2b, 0xbf, 0xe6, 0xc0, 0xf8, 0x36, - 0x0b, 0xe1, 0xf7, 0x06, 0x98, 0x1d, 0xf0, 0x90, 0xc1, 0x0f, 0x86, 0x50, 0x1d, 0xf9, 0xcb, 0xa0, - 0xf4, 0xe1, 0x6b, 0x7a, 0xeb, 0x91, 0xff, 0xd6, 0x00, 0xb7, 0x2e, 0x0c, 0x16, 0x5c, 0x19, 0x1e, - 0x74, 0xd0, 0xdb, 0x5a, 0x7a, 0xef, 0xca, 0x7e, 0x9a, 0xc6, 0xa1, 0x01, 0x6e, 0x5f, 0x3a, 0x5c, - 0x70, 0x75, 0x54, 0x7e, 0x83, 0x87, 0xbe, 0xb4, 0xf6, 0x5a, 0xbe, 0x7d, 0x94, 0x2e, 0x6d, 0xe3, - 0x51, 0x94, 0x86, 0xcd, 0xff, 0x28, 0x4a, 0x43, 0xe7, 0x06, 0x26, 0xa0, 0xd0, 0xdf, 0x65, 0x70, - 0xe9, 0xff, 0x04, 0x3b, 0x37, 0x5f, 0xa5, 0xca, 0x55, 0x5c, 0xd4, 0xb1, 0xa5, 0xdc, 0x37, 0x62, - 0x48, 0x36, 0xf6, 0x5f, 0x1e, 0x97, 0x8d, 0x57, 0xc7, 0x65, 0xe3, 0xef, 0xe3, 0xb2, 0x71, 0x78, - 0x52, 0x1e, 0x7b, 0x75, 0x52, 0x1e, 0xfb, 0xe3, 0xa4, 0x3c, 0xf6, 0xf5, 0x5a, 0x88, 0x79, 0x2d, - 0xa9, 0x5a, 0x3e, 0x6d, 0xd8, 0x3a, 0xfc, 0x13, 0x1a, 0x87, 0xe9, 0xb7, 0xdd, 0x7a, 0xd7, 0xee, - 0x5c, 0xf6, 0x37, 0x82, 0xf8, 0x95, 0x5c, 0x9d, 0x90, 0xaf, 0xe0, 0x3b, 0xff, 0x06, 0x00, 0x00, - 0xff, 0xff, 0xe3, 0x2e, 0x2e, 0xb3, 0x4d, 0x0c, 0x00, 0x00, + // 1169 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x4f, 0x1b, 0xc7, + 0x17, 0x67, 0x8d, 0x0d, 0xf8, 0x61, 0x20, 0xcc, 0x97, 0x7c, 0x31, 0x4e, 0x71, 0xc8, 0x56, 0x4d, + 0x10, 0x4a, 0x76, 0x15, 0x87, 0x50, 0x35, 0xa8, 0x3f, 0xa0, 0x6d, 0x54, 0x84, 0x50, 0xe9, 0x02, + 0x39, 0xe4, 0xb2, 0x5a, 0xef, 0x0e, 0xeb, 0x91, 0xd7, 0x33, 0xee, 0xee, 0xf8, 0xd7, 0xa1, 0x52, + 0xd5, 0x5b, 0x7b, 0x69, 0xfa, 0x47, 0x54, 0xaa, 0xd4, 0x0b, 0x87, 0x4a, 0xfd, 0x0b, 0x2a, 0xe5, + 0x18, 0xf5, 0xd4, 0x43, 0x55, 0x55, 0x70, 0xe0, 0xd8, 0x3f, 0xa0, 0x97, 0x6a, 0x66, 0x76, 0x8d, + 0x01, 0xdb, 0x84, 0x5c, 0x60, 0xdf, 0x7b, 0x9f, 0xf7, 0xe6, 0xf3, 0xde, 0xcc, 0x7b, 0xcf, 0xa0, + 0x53, 0xdc, 0xe0, 0x21, 0xa3, 0x26, 0xa1, 0x1c, 0x87, 0x6e, 0xc5, 0x21, 0xf4, 0xcb, 0x06, 0x0e, + 0x09, 0x8e, 0x4c, 0xde, 0x36, 0xea, 0x21, 0xe3, 0x0c, 0x2d, 0xc4, 0x18, 0xe3, 0x12, 0xa6, 0x30, + 0xeb, 0xd4, 0x08, 0x65, 0xa6, 0xfc, 0xab, 0xd0, 0x85, 0x79, 0x97, 0x45, 0x35, 0x16, 0x99, 0xb5, + 0xc8, 0x37, 0x9b, 0x0f, 0xc5, 0xbf, 0xd8, 0xb0, 0xa0, 0x0c, 0xb6, 0x94, 0x4c, 0x25, 0xc4, 0xa6, + 0x39, 0x9f, 0xf9, 0x4c, 0xe9, 0xc5, 0x57, 0xe2, 0xe0, 0x33, 0xe6, 0x07, 0xd8, 0x94, 0x52, 0xb9, + 0x71, 0x68, 0x3a, 0xb4, 0x13, 0x9b, 0xee, 0x0d, 0xa6, 0xed, 0x63, 0x8a, 0x23, 0x92, 0x44, 0xbe, + 0x3b, 0x18, 0x58, 0x77, 0x42, 0xa7, 0x96, 0xe0, 0x6e, 0x71, 0x4c, 0x3d, 0x1c, 0xd6, 0x08, 0xe5, + 0xa6, 0x53, 0x76, 0x89, 0xc9, 0x3b, 0x75, 0x9c, 0x18, 0x17, 0x7b, 0x8c, 0x6e, 0xd8, 0xa9, 0x73, + 0x26, 0x38, 0xb1, 0x43, 0x65, 0xd6, 0x7f, 0x48, 0x41, 0x61, 0x27, 0xf2, 0x2d, 0xec, 0x93, 0x88, + 0xe3, 0x70, 0xab, 0x7b, 0xd2, 0x17, 0x0d, 0x1c, 0x76, 0xd0, 0x22, 0x80, 0x38, 0xb2, 0x63, 0x8b, + 0x90, 0x79, 0x6d, 0x49, 0x5b, 0xce, 0x5a, 0x59, 0xa9, 0xd9, 0xef, 0xd4, 0x31, 0x5a, 0x85, 0x74, + 0x15, 0x77, 0xa2, 0x7c, 0x6a, 0x69, 0x74, 0x79, 0xb2, 0xb4, 0x64, 0x0c, 0x2c, 0xb6, 0xb1, 0xfd, + 0x6c, 0x1b, 0x77, 0x2c, 0x89, 0x46, 0x26, 0xfc, 0x8f, 0x87, 0x0e, 0x8d, 0x1c, 0x97, 0x13, 0x46, + 0x23, 0xfb, 0x90, 0x04, 0x1c, 0x87, 0xf9, 0x51, 0x19, 0x1d, 0xf5, 0x9a, 0x9e, 0x4a, 0x0b, 0x7a, + 0x1b, 0xa6, 0x5c, 0x46, 0x29, 0x96, 0x4a, 0x9b, 0x78, 0xf9, 0xb4, 0x84, 0xe6, 0xce, 0x94, 0x5b, + 0x9e, 0x00, 0x35, 0xea, 0x9e, 0xc3, 0xb1, 0x5d, 0xc7, 0x21, 0x61, 0x5e, 0x3e, 0xb3, 0xa4, 0x2d, + 0xa7, 0xad, 0x9c, 0x52, 0xee, 0x4a, 0x1d, 0xfa, 0x3f, 0x8c, 0x45, 0xb2, 0x1e, 0xf9, 0x31, 0x19, + 0x22, 0x96, 0x9e, 0x4c, 0x7e, 0x73, 0x7a, 0xb4, 0x12, 0x0b, 0xfa, 0x2a, 0xe8, 0x83, 0x4b, 0x62, + 0xe1, 0xa8, 0xce, 0x68, 0x84, 0xd1, 0x34, 0xa4, 0x88, 0x27, 0x4b, 0x92, 0xb6, 0x52, 0xc4, 0xd3, + 0x7f, 0xd5, 0x60, 0x6e, 0x27, 0xf2, 0xf7, 0x1a, 0xe5, 0x1a, 0xe1, 0x09, 0xb4, 0x11, 0x70, 0xb4, + 0x00, 0x13, 0xaa, 0x86, 0x5d, 0xf8, 0xb8, 0x94, 0xb7, 0x7a, 0xe9, 0xa4, 0x7a, 0xe9, 0xa0, 0xdb, + 0x90, 0x75, 0x03, 0x82, 0x29, 0x17, 0x3e, 0xb2, 0x2e, 0x9b, 0xa9, 0xbc, 0x66, 0x4d, 0x28, 0xe5, + 0x96, 0x87, 0x3e, 0x80, 0xb1, 0x50, 0x46, 0x97, 0xa5, 0x98, 0x2c, 0xdd, 0x1d, 0x52, 0xfa, 0x1e, + 0x2e, 0x56, 0xec, 0x75, 0x3e, 0xdf, 0x7f, 0x34, 0x98, 0xec, 0x25, 0xfc, 0x14, 0xa0, 0xda, 0xb4, + 0x15, 0x32, 0xca, 0x6b, 0xf2, 0x6e, 0xef, 0x0d, 0x39, 0x60, 0x8f, 0xb3, 0xd0, 0xf1, 0xf1, 0x33, + 0x27, 0x68, 0x60, 0x2b, 0x5b, 0x6d, 0xaa, 0x30, 0x11, 0x5a, 0x83, 0x4c, 0x39, 0x60, 0x6e, 0x55, + 0x26, 0x37, 0xfc, 0x79, 0x6c, 0x0a, 0x9c, 0xa5, 0xe0, 0xa2, 0x2a, 0x15, 0x4c, 0xfc, 0x0a, 0x97, + 0xa9, 0xa7, 0xad, 0x58, 0x42, 0x05, 0x98, 0x08, 0x71, 0x93, 0x44, 0x84, 0x51, 0x99, 0x76, 0xda, + 0xea, 0xca, 0xe8, 0x3e, 0x20, 0x27, 0x08, 0x58, 0xcb, 0xae, 0x36, 0x6d, 0xd7, 0x09, 0x82, 0xb2, + 0xe3, 0x56, 0x23, 0xf9, 0x04, 0x26, 0xac, 0x1b, 0xd2, 0xb2, 0xdd, 0xfc, 0x38, 0xd1, 0xeb, 0x2f, + 0x34, 0xc8, 0xf5, 0xb2, 0x46, 0xef, 0xc0, 0x74, 0xa4, 0x64, 0xbb, 0x1e, 0xe2, 0x43, 0xd2, 0x8e, + 0xdf, 0xfa, 0x54, 0xac, 0xdd, 0x95, 0x4a, 0x74, 0x03, 0x46, 0xab, 0xb8, 0x23, 0xf3, 0xc9, 0x59, + 0xe2, 0x13, 0xcd, 0x41, 0xa6, 0x29, 0x22, 0x48, 0xaa, 0x39, 0x4b, 0x09, 0xe8, 0x21, 0x64, 0x76, + 0x45, 0x93, 0xc5, 0xb7, 0x73, 0xcb, 0x38, 0x6b, 0x42, 0x43, 0x35, 0xa1, 0x21, 0xed, 0x9f, 0xd7, + 0x23, 0x4b, 0x21, 0xf5, 0x9f, 0x35, 0xc8, 0xc8, 0x2a, 0xa0, 0x8f, 0x60, 0x96, 0xe2, 0x36, 0xb7, + 0x65, 0x31, 0xec, 0x0a, 0x76, 0xc4, 0xfb, 0xd0, 0x64, 0xa0, 0x39, 0x43, 0x8d, 0x15, 0x23, 0x19, + 0x2b, 0xc6, 0x06, 0xed, 0x58, 0x33, 0x02, 0x2e, 0x7d, 0x3f, 0x93, 0x60, 0x74, 0x5f, 0x14, 0xd0, + 0x49, 0x9e, 0xd5, 0x20, 0xb7, 0x18, 0x83, 0x4a, 0x90, 0xe2, 0x6d, 0xc9, 0x7f, 0xb2, 0xa4, 0x0f, + 0xb9, 0xa3, 0xfd, 0xb6, 0xba, 0xe1, 0x14, 0x6f, 0xeb, 0x7f, 0x6a, 0x30, 0x1e, 0xcb, 0xe8, 0x3d, + 0x71, 0x2d, 0xaa, 0x29, 0x62, 0x9a, 0x8b, 0xbd, 0xf9, 0x8a, 0x89, 0x64, 0x7c, 0xda, 0xc6, 0xee, + 0x7e, 0x3b, 0x7e, 0x84, 0x5d, 0x38, 0xfa, 0x10, 0xa6, 0x3d, 0x1c, 0x90, 0xa6, 0xe8, 0x0e, 0x39, + 0x95, 0x62, 0xc2, 0xf9, 0x41, 0x05, 0xb3, 0xa6, 0x12, 0xbc, 0x14, 0xd1, 0x06, 0xcc, 0x10, 0xea, + 0x06, 0x0d, 0xf1, 0x06, 0xe2, 0x08, 0xa3, 0x57, 0x44, 0x98, 0xee, 0x3a, 0xa8, 0x10, 0x08, 0xd2, + 0x9e, 0xc3, 0x1d, 0x79, 0x55, 0x39, 0x4b, 0x7e, 0xeb, 0x45, 0x78, 0xab, 0x5f, 0x2b, 0x27, 0xbd, + 0xaf, 0x3f, 0x87, 0xbc, 0x9c, 0x10, 0x35, 0xd6, 0xc4, 0x17, 0x47, 0xe6, 0xf5, 0xdb, 0xfd, 0x7c, + 0x37, 0xea, 0xb0, 0x34, 0x28, 0x76, 0xf7, 0xfc, 0x7f, 0x35, 0x49, 0xe0, 0x40, 0x8e, 0xb6, 0x6b, + 0x10, 0x58, 0x87, 0x09, 0x8a, 0x5b, 0xf6, 0xb5, 0x66, 0xf6, 0x38, 0xc5, 0xad, 0x6d, 0x31, 0xb6, + 0x57, 0xc4, 0xbb, 0x6c, 0xd9, 0xe7, 0x87, 0xac, 0xea, 0xd0, 0x19, 0x8a, 0x5b, 0x07, 0xbd, 0x73, + 0x76, 0x0d, 0xe6, 0x05, 0xb6, 0xdf, 0x98, 0x57, 0xb3, 0xfb, 0x26, 0xc5, 0xad, 0xfd, 0xcb, 0x93, + 0xfe, 0xac, 0x42, 0x99, 0xab, 0x2a, 0xd4, 0x37, 0xf9, 0x6e, 0x85, 0x7e, 0xd3, 0x60, 0xa6, 0x0b, + 0xda, 0x95, 0xdb, 0x12, 0xad, 0x41, 0xd6, 0x69, 0xf0, 0x0a, 0x0b, 0x09, 0xef, 0xa8, 0xfe, 0xde, + 0xcc, 0xff, 0xfe, 0xcb, 0x83, 0xb9, 0x78, 0x9d, 0x6f, 0x78, 0x5e, 0x88, 0xa3, 0x68, 0x8f, 0x87, + 0x84, 0xfa, 0xd6, 0x19, 0x14, 0x7d, 0x02, 0x63, 0x6a, 0xdf, 0xc6, 0xaf, 0xf3, 0xce, 0x90, 0x9a, + 0xa9, 0xa3, 0x36, 0xb3, 0x2f, 0xff, 0xba, 0x3d, 0xf2, 0xd3, 0xe9, 0xd1, 0x8a, 0x66, 0xc5, 0xbe, + 0x4f, 0x56, 0x45, 0x0a, 0x67, 0x51, 0xbf, 0x3b, 0x3d, 0x5a, 0xb9, 0x73, 0x79, 0xb1, 0x5f, 0xe0, + 0xac, 0x2f, 0xc0, 0xfc, 0x05, 0x55, 0x92, 0x62, 0xe9, 0xc7, 0x0c, 0x8c, 0xee, 0x44, 0x3e, 0xfa, + 0x5e, 0x83, 0xf9, 0x41, 0xfb, 0xfb, 0xf1, 0x10, 0xaa, 0x83, 0x77, 0x5c, 0xe1, 0xfd, 0x37, 0x72, + 0xeb, 0xae, 0xc6, 0xaf, 0x60, 0xf6, 0xf2, 0x1a, 0x34, 0x87, 0xc7, 0xbc, 0xe4, 0x50, 0x78, 0xf7, + 0x9a, 0x0e, 0xdd, 0xe3, 0xbf, 0xd5, 0xe0, 0x66, 0xff, 0xde, 0x7c, 0x74, 0x55, 0x5e, 0x7d, 0x9c, + 0x0a, 0xeb, 0x6f, 0xe0, 0x74, 0x8e, 0x4b, 0xff, 0x36, 0xbd, 0x82, 0x4b, 0x5f, 0xa7, 0xab, 0xb8, + 0x0c, 0xed, 0x09, 0x44, 0x21, 0x77, 0xae, 0x1f, 0x56, 0x5e, 0x27, 0x98, 0xc2, 0x16, 0x4a, 0xaf, + 0x8f, 0x4d, 0xce, 0x2b, 0x64, 0xbe, 0x16, 0x0d, 0xb0, 0x79, 0xf0, 0xf2, 0xb8, 0xa8, 0xbd, 0x3a, + 0x2e, 0x6a, 0x7f, 0x1f, 0x17, 0xb5, 0x17, 0x27, 0xc5, 0x91, 0x57, 0x27, 0xc5, 0x91, 0x3f, 0x4e, + 0x8a, 0x23, 0xcf, 0xd7, 0x7d, 0xc2, 0x2b, 0x8d, 0xb2, 0xe1, 0xb2, 0x9a, 0x19, 0x87, 0x7f, 0xc0, + 0x42, 0x3f, 0xf9, 0x36, 0x9b, 0x8f, 0xcd, 0x76, 0xbf, 0x1f, 0xf7, 0xe2, 0xe7, 0x6d, 0x79, 0x4c, + 0x2e, 0xb3, 0x47, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x36, 0x3d, 0xe1, 0x10, 0x06, 0x0c, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1020,19 +1026,19 @@ type MsgClient interface { // // Returns an ID assigned to the registered query. Handle this message response via a reply // handler in order to make use of the ID. - RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) + RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQuery, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) // Submits a result of an Interchain Query execution to the chain. This message handling may // include passing of the result to the query's owner smart contract for processing which might // be a pretty gas-consumable operation. - SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResultRequest, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) + SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResult, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) // Removes a given Interchain Query and its results from the module. Can be removed only by the // owner of the query during the query's submit timeout, and by anyone after the query has been // timed out. The query deposit is returned to the caller on a success call. - RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) + RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQuery, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. - UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) + UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQuery, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) // Updates params of the interchainqueries module. Only callable by the module's authority. - UpdateParams(ctx context.Context, in *MsgUpdateParamsRequest, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } type msgClient struct { @@ -1043,7 +1049,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { return &msgClient{cc} } -func (c *msgClient) RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) { +func (c *msgClient) RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQuery, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) { out := new(MsgRegisterInterchainQueryResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/RegisterInterchainQuery", in, out, opts...) if err != nil { @@ -1052,7 +1058,7 @@ func (c *msgClient) RegisterInterchainQuery(ctx context.Context, in *MsgRegister return out, nil } -func (c *msgClient) SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResultRequest, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) { +func (c *msgClient) SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResult, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) { out := new(MsgSubmitQueryResultResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/SubmitQueryResult", in, out, opts...) if err != nil { @@ -1061,7 +1067,7 @@ func (c *msgClient) SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryRes return out, nil } -func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) { +func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQuery, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) { out := new(MsgRemoveInterchainQueryResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/RemoveInterchainQuery", in, out, opts...) if err != nil { @@ -1070,7 +1076,7 @@ func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInte return out, nil } -func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) { +func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQuery, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) { out := new(MsgUpdateInterchainQueryResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/UpdateInterchainQuery", in, out, opts...) if err != nil { @@ -1079,7 +1085,7 @@ func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInte return out, nil } -func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParamsRequest, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { out := new(MsgUpdateParamsResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/UpdateParams", in, out, opts...) if err != nil { @@ -1098,38 +1104,38 @@ type MsgServer interface { // // Returns an ID assigned to the registered query. Handle this message response via a reply // handler in order to make use of the ID. - RegisterInterchainQuery(context.Context, *MsgRegisterInterchainQueryRequest) (*MsgRegisterInterchainQueryResponse, error) + RegisterInterchainQuery(context.Context, *MsgRegisterInterchainQuery) (*MsgRegisterInterchainQueryResponse, error) // Submits a result of an Interchain Query execution to the chain. This message handling may // include passing of the result to the query's owner smart contract for processing which might // be a pretty gas-consumable operation. - SubmitQueryResult(context.Context, *MsgSubmitQueryResultRequest) (*MsgSubmitQueryResultResponse, error) + SubmitQueryResult(context.Context, *MsgSubmitQueryResult) (*MsgSubmitQueryResultResponse, error) // Removes a given Interchain Query and its results from the module. Can be removed only by the // owner of the query during the query's submit timeout, and by anyone after the query has been // timed out. The query deposit is returned to the caller on a success call. - RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) + RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQuery) (*MsgRemoveInterchainQueryResponse, error) // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. - UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) + UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQuery) (*MsgUpdateInterchainQueryResponse, error) // Updates params of the interchainqueries module. Only callable by the module's authority. - UpdateParams(context.Context, *MsgUpdateParamsRequest) (*MsgUpdateParamsResponse, error) + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. type UnimplementedMsgServer struct { } -func (*UnimplementedMsgServer) RegisterInterchainQuery(ctx context.Context, req *MsgRegisterInterchainQueryRequest) (*MsgRegisterInterchainQueryResponse, error) { +func (*UnimplementedMsgServer) RegisterInterchainQuery(ctx context.Context, req *MsgRegisterInterchainQuery) (*MsgRegisterInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RegisterInterchainQuery not implemented") } -func (*UnimplementedMsgServer) SubmitQueryResult(ctx context.Context, req *MsgSubmitQueryResultRequest) (*MsgSubmitQueryResultResponse, error) { +func (*UnimplementedMsgServer) SubmitQueryResult(ctx context.Context, req *MsgSubmitQueryResult) (*MsgSubmitQueryResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitQueryResult not implemented") } -func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) { +func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *MsgRemoveInterchainQuery) (*MsgRemoveInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveInterchainQuery not implemented") } -func (*UnimplementedMsgServer) UpdateInterchainQuery(ctx context.Context, req *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) { +func (*UnimplementedMsgServer) UpdateInterchainQuery(ctx context.Context, req *MsgUpdateInterchainQuery) (*MsgUpdateInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateInterchainQuery not implemented") } -func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParamsRequest) (*MsgUpdateParamsResponse, error) { +func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented") } @@ -1138,7 +1144,7 @@ func RegisterMsgServer(s grpc1.Server, srv MsgServer) { } func _Msg_RegisterInterchainQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRegisterInterchainQueryRequest) + in := new(MsgRegisterInterchainQuery) if err := dec(in); err != nil { return nil, err } @@ -1150,13 +1156,13 @@ func _Msg_RegisterInterchainQuery_Handler(srv interface{}, ctx context.Context, FullMethod: "/neutron.interchainqueries.Msg/RegisterInterchainQuery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).RegisterInterchainQuery(ctx, req.(*MsgRegisterInterchainQueryRequest)) + return srv.(MsgServer).RegisterInterchainQuery(ctx, req.(*MsgRegisterInterchainQuery)) } return interceptor(ctx, in, info, handler) } func _Msg_SubmitQueryResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgSubmitQueryResultRequest) + in := new(MsgSubmitQueryResult) if err := dec(in); err != nil { return nil, err } @@ -1168,13 +1174,13 @@ func _Msg_SubmitQueryResult_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: "/neutron.interchainqueries.Msg/SubmitQueryResult", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).SubmitQueryResult(ctx, req.(*MsgSubmitQueryResultRequest)) + return srv.(MsgServer).SubmitQueryResult(ctx, req.(*MsgSubmitQueryResult)) } return interceptor(ctx, in, info, handler) } func _Msg_RemoveInterchainQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRemoveInterchainQueryRequest) + in := new(MsgRemoveInterchainQuery) if err := dec(in); err != nil { return nil, err } @@ -1186,13 +1192,13 @@ func _Msg_RemoveInterchainQuery_Handler(srv interface{}, ctx context.Context, de FullMethod: "/neutron.interchainqueries.Msg/RemoveInterchainQuery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).RemoveInterchainQuery(ctx, req.(*MsgRemoveInterchainQueryRequest)) + return srv.(MsgServer).RemoveInterchainQuery(ctx, req.(*MsgRemoveInterchainQuery)) } return interceptor(ctx, in, info, handler) } func _Msg_UpdateInterchainQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateInterchainQueryRequest) + in := new(MsgUpdateInterchainQuery) if err := dec(in); err != nil { return nil, err } @@ -1204,13 +1210,13 @@ func _Msg_UpdateInterchainQuery_Handler(srv interface{}, ctx context.Context, de FullMethod: "/neutron.interchainqueries.Msg/UpdateInterchainQuery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateInterchainQuery(ctx, req.(*MsgUpdateInterchainQueryRequest)) + return srv.(MsgServer).UpdateInterchainQuery(ctx, req.(*MsgUpdateInterchainQuery)) } return interceptor(ctx, in, info, handler) } func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateParamsRequest) + in := new(MsgUpdateParams) if err := dec(in); err != nil { return nil, err } @@ -1222,7 +1228,7 @@ func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/neutron.interchainqueries.Msg/UpdateParams", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParamsRequest)) + return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams)) } return interceptor(ctx, in, info, handler) } @@ -1256,7 +1262,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Metadata: "neutron/interchainqueries/tx.proto", } -func (m *MsgRegisterInterchainQueryRequest) Marshal() (dAtA []byte, err error) { +func (m *MsgRegisterInterchainQuery) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1266,12 +1272,12 @@ func (m *MsgRegisterInterchainQueryRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRegisterInterchainQueryRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgRegisterInterchainQuery) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRegisterInterchainQueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgRegisterInterchainQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1354,7 +1360,7 @@ func (m *MsgRegisterInterchainQueryResponse) MarshalToSizedBuffer(dAtA []byte) ( return len(dAtA) - i, nil } -func (m *MsgSubmitQueryResultRequest) Marshal() (dAtA []byte, err error) { +func (m *MsgSubmitQueryResult) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1364,12 +1370,12 @@ func (m *MsgSubmitQueryResultRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgSubmitQueryResultRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSubmitQueryResult) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgSubmitQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSubmitQueryResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1681,7 +1687,7 @@ func (m *MsgSubmitQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *MsgRemoveInterchainQueryRequest) Marshal() (dAtA []byte, err error) { +func (m *MsgRemoveInterchainQuery) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1691,12 +1697,12 @@ func (m *MsgRemoveInterchainQueryRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRemoveInterchainQueryRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgRemoveInterchainQuery) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRemoveInterchainQueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgRemoveInterchainQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1739,7 +1745,7 @@ func (m *MsgRemoveInterchainQueryResponse) MarshalToSizedBuffer(dAtA []byte) (in return len(dAtA) - i, nil } -func (m *MsgUpdateInterchainQueryRequest) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateInterchainQuery) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1749,12 +1755,12 @@ func (m *MsgUpdateInterchainQueryRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateInterchainQueryRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateInterchainQuery) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateInterchainQueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateInterchainQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1823,7 +1829,7 @@ func (m *MsgUpdateInterchainQueryResponse) MarshalToSizedBuffer(dAtA []byte) (in return len(dAtA) - i, nil } -func (m *MsgUpdateParamsRequest) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1833,12 +1839,12 @@ func (m *MsgUpdateParamsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateParamsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateParams) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1897,7 +1903,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *MsgRegisterInterchainQueryRequest) Size() (n int) { +func (m *MsgRegisterInterchainQuery) Size() (n int) { if m == nil { return 0 } @@ -1943,7 +1949,7 @@ func (m *MsgRegisterInterchainQueryResponse) Size() (n int) { return n } -func (m *MsgSubmitQueryResultRequest) Size() (n int) { +func (m *MsgSubmitQueryResult) Size() (n int) { if m == nil { return 0 } @@ -2075,7 +2081,7 @@ func (m *MsgSubmitQueryResultResponse) Size() (n int) { return n } -func (m *MsgRemoveInterchainQueryRequest) Size() (n int) { +func (m *MsgRemoveInterchainQuery) Size() (n int) { if m == nil { return 0 } @@ -2100,7 +2106,7 @@ func (m *MsgRemoveInterchainQueryResponse) Size() (n int) { return n } -func (m *MsgUpdateInterchainQueryRequest) Size() (n int) { +func (m *MsgUpdateInterchainQuery) Size() (n int) { if m == nil { return 0 } @@ -2138,7 +2144,7 @@ func (m *MsgUpdateInterchainQueryResponse) Size() (n int) { return n } -func (m *MsgUpdateParamsRequest) Size() (n int) { +func (m *MsgUpdateParams) Size() (n int) { if m == nil { return 0 } @@ -2168,7 +2174,7 @@ func sovTx(x uint64) (n int) { func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *MsgRegisterInterchainQueryRequest) Unmarshal(dAtA []byte) error { +func (m *MsgRegisterInterchainQuery) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2191,10 +2197,10 @@ func (m *MsgRegisterInterchainQueryRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRegisterInterchainQueryRequest: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRegisterInterchainQuery: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRegisterInterchainQueryRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRegisterInterchainQuery: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2468,7 +2474,7 @@ func (m *MsgRegisterInterchainQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgSubmitQueryResultRequest) Unmarshal(dAtA []byte) error { +func (m *MsgSubmitQueryResult) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2491,10 +2497,10 @@ func (m *MsgSubmitQueryResultRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSubmitQueryResultRequest: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSubmitQueryResult: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSubmitQueryResultRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSubmitQueryResult: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3401,7 +3407,7 @@ func (m *MsgSubmitQueryResultResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRemoveInterchainQueryRequest) Unmarshal(dAtA []byte) error { +func (m *MsgRemoveInterchainQuery) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3424,10 +3430,10 @@ func (m *MsgRemoveInterchainQueryRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRemoveInterchainQueryRequest: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRemoveInterchainQuery: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRemoveInterchainQueryRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRemoveInterchainQuery: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3552,7 +3558,7 @@ func (m *MsgRemoveInterchainQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateInterchainQueryRequest) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateInterchainQuery) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3575,10 +3581,10 @@ func (m *MsgUpdateInterchainQueryRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateInterchainQueryRequest: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateInterchainQuery: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateInterchainQueryRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateInterchainQuery: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3788,7 +3794,7 @@ func (m *MsgUpdateInterchainQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateParamsRequest) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3811,10 +3817,10 @@ func (m *MsgUpdateParamsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateParamsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateParams: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateParams: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/interchainqueries/types/tx_test.go b/x/interchainqueries/types/tx_test.go index 393abd6a0..f39fafff6 100644 --- a/x/interchainqueries/types/tx_test.go +++ b/x/interchainqueries/types/tx_test.go @@ -21,7 +21,7 @@ func TestMsgRegisterInterchainQueryGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgRegisterInterchainQueryRequest{ + return &iqtypes.MsgRegisterInterchainQuery{ ConnectionId: "connection-0", TransactionsFilter: "{}", Keys: nil, @@ -48,7 +48,7 @@ func TestMsgSubmitQueryResultGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgSubmitQueryResultRequest{ + return &iqtypes.MsgSubmitQueryResult{ QueryId: 1, Sender: TestAddress, ClientId: "client-id", @@ -89,7 +89,7 @@ func TestMsgUpdateQueryGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgUpdateInterchainQueryRequest{ + return &iqtypes.MsgUpdateInterchainQuery{ Sender: TestAddress, } }, @@ -111,7 +111,7 @@ func TestMsgRemoveQueryGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgRemoveInterchainQueryRequest{ + return &iqtypes.MsgRemoveInterchainQuery{ Sender: TestAddress, } }, From c5b2703526af08245ce2cbd20c0402c70e605225 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Mon, 18 Nov 2024 14:19:37 +0300 Subject: [PATCH 07/18] rollback ICQ messages renaming --- proto/neutron/interchainqueries/query.proto | 16 +- proto/neutron/interchainqueries/tx.proto | 8 +- wasmbinding/message_plugin.go | 4 +- wasmbinding/stargate_allowlist.go | 2 +- wasmbinding/test/custom_query_test.go | 4 +- x/interchainqueries/client/cli/query.go | 4 +- x/interchainqueries/keeper/grpc_query.go | 6 +- x/interchainqueries/keeper/grpc_query_test.go | 12 +- x/interchainqueries/keeper/keeper_test.go | 36 +- x/interchainqueries/keeper/msg_server.go | 6 +- x/interchainqueries/keeper/msg_server_test.go | 34 +- x/interchainqueries/types/codec.go | 4 +- .../types/message_remove_interchain_query.go | 16 +- x/interchainqueries/types/query.pb.go | 508 +++++++++++++----- x/interchainqueries/types/query.pb.gw.go | 8 +- x/interchainqueries/types/tx.go | 8 +- x/interchainqueries/types/tx.pb.go | 274 +++++----- x/interchainqueries/types/tx_test.go | 9 +- 18 files changed, 605 insertions(+), 354 deletions(-) diff --git a/proto/neutron/interchainqueries/query.proto b/proto/neutron/interchainqueries/query.proto index cbb8ed718..2829badc8 100644 --- a/proto/neutron/interchainqueries/query.proto +++ b/proto/neutron/interchainqueries/query.proto @@ -26,11 +26,11 @@ service Query { option (google.api.http).get = "/neutron/interchainqueries/registered_query"; } // Queries the last successfully submitted result of an Interchain Query. - rpc QueryResult(QueryQueryResultRequest) returns (QueryQueryResultResponse) { + rpc QueryResult(QueryRegisteredQueryResultRequest) returns (QueryRegisteredQueryResultResponse) { option (google.api.http).get = "/neutron/interchainqueries/query_result"; } // Queries the last height of a remote chain known to the IBC client behind a given connection ID. - rpc LastRemoteHeight(QueryLastRemoteHeightRequest) returns (QueryLastRemoteHeightResponse) { + rpc LastRemoteHeight(QueryLastRemoteHeight) returns (QueryLastRemoteHeightResponse) { option (google.api.http).get = "/neutron/interchainqueries/remote_height"; } } @@ -81,19 +81,25 @@ message QueryRegisteredQueryResponse { } // Request type for the Query/QueryResult RPC method. -message QueryQueryResultRequest { +message QueryRegisteredQueryResultRequest { // ID of an Interchain Query. uint64 query_id = 1; } // Response type for the Query/QueryResult RPC method. -message QueryQueryResultResponse { +message QueryRegisteredQueryResultResponse { // The last successfully submitted result of an Interchain Query. QueryResult result = 1; } +message Transaction { + uint64 id = 1; + uint64 height = 2; + bytes data = 3; +} + // Request type for the Query/LastRemoteHeight RPC method. -message QueryLastRemoteHeightRequest { +message QueryLastRemoteHeight { // Connection ID of an IBC connection to a remote chain. Determines the IBC client used in query // handling. string connection_id = 1; diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 414e336c2..343257c85 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -32,9 +32,9 @@ service Msg { // Removes a given Interchain Query and its results from the module. Can be removed only by the // owner of the query during the query's submit timeout, and by anyone after the query has been // timed out. The query deposit is returned to the caller on a success call. - rpc RemoveInterchainQuery(MsgRemoveInterchainQuery) returns (MsgRemoveInterchainQueryResponse); + rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse); // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. - rpc UpdateInterchainQuery(MsgUpdateInterchainQuery) returns (MsgUpdateInterchainQueryResponse); + rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse); // Updates params of the interchainqueries module. Only callable by the module's authority. rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); } @@ -152,7 +152,7 @@ message TxValue { message MsgSubmitQueryResultResponse {} // Request type for the Msg/RemoveInterchainQuery RPC method. -message MsgRemoveInterchainQuery { +message MsgRemoveInterchainQueryRequest { option (cosmos.msg.v1.signer) = "sender"; // The ID of the query to remove. uint64 query_id = 1; @@ -164,7 +164,7 @@ message MsgRemoveInterchainQuery { message MsgRemoveInterchainQueryResponse {} // Request type for the Msg/UpdateInterchainQuery RPC method. -message MsgUpdateInterchainQuery { +message MsgUpdateInterchainQueryRequest { option (cosmos.msg.v1.signer) = "sender"; // The ID of the query to update. uint64 query_id = 1; diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index c1b603d74..ed76a8ed3 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -351,7 +351,7 @@ func (m *CustomMessenger) updateInterchainQuery(ctx sdk.Context, contractAddr sd } func (m *CustomMessenger) performUpdateInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.UpdateInterchainQuery) (*icqtypes.MsgUpdateInterchainQueryResponse, error) { - msg := icqtypes.MsgUpdateInterchainQuery{ + msg := icqtypes.MsgUpdateInterchainQueryRequest{ QueryId: updateQuery.QueryId, NewKeys: updateQuery.NewKeys, NewUpdatePeriod: updateQuery.NewUpdatePeriod, @@ -402,7 +402,7 @@ func (m *CustomMessenger) removeInterchainQuery(ctx sdk.Context, contractAddr sd } func (m *CustomMessenger) performRemoveInterchainQuery(ctx sdk.Context, contractAddr sdk.AccAddress, updateQuery *bindings.RemoveInterchainQuery) (*icqtypes.MsgRemoveInterchainQueryResponse, error) { - msg := icqtypes.MsgRemoveInterchainQuery{ + msg := icqtypes.MsgRemoveInterchainQueryRequest{ QueryId: updateQuery.QueryId, Sender: contractAddr.String(), } diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 0f7c18f31..1364c94a4 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -66,7 +66,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries { "/neutron.interchainqueries.Query/Params": &interchainqueriestypes.QueryParamsResponse{}, "/neutron.interchainqueries.Query/RegisteredQueries": &interchainqueriestypes.QueryRegisteredQueriesResponse{}, "/neutron.interchainqueries.Query/RegisteredQuery": &interchainqueriestypes.QueryRegisteredQueryResponse{}, - "/neutron.interchainqueries.Query/QueryResult": &interchainqueriestypes.QueryQueryResultResponse{}, + "/neutron.interchainqueries.Query/QueryResult": &interchainqueriestypes.QueryRegisteredQueryResultResponse{}, "/neutron.interchainqueries.Query/LastRemoteHeight": &interchainqueriestypes.QueryLastRemoteHeightResponse{}, // feeburner diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 5d52a5fa1..d3fecbcf5 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -88,7 +88,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResult() { QueryID: lastID, }, } - resp := icqtypes.QueryQueryResultResponse{} + resp := icqtypes.QueryRegisteredQueryResultResponse{} err = suite.queryCustom(ctx, contractAddress, query, &resp) suite.Require().NoError(err) @@ -121,7 +121,7 @@ func (suite *CustomQuerierTestSuite) TestInterchainQueryResultNotFound() { QueryID: 1, }, } - resp := icqtypes.QueryQueryResultResponse{} + resp := icqtypes.QueryRegisteredQueryResultResponse{} err := suite.queryCustom(ctx, contractAddress, query, &resp) expectedErrMsg := fmt.Sprintf("Generic error: Querier contract error: codespace: interchainqueries, code: %d: query wasm contract failed", icqtypes.ErrNoQueryResult.ABCICode()) suite.Require().ErrorContains(err, expectedErrMsg) diff --git a/x/interchainqueries/client/cli/query.go b/x/interchainqueries/client/cli/query.go index d63790abd..90f6fea84 100644 --- a/x/interchainqueries/client/cli/query.go +++ b/x/interchainqueries/client/cli/query.go @@ -119,7 +119,7 @@ func CmdQueryRegisteredQueryResult() *cobra.Command { return fmt.Errorf("failed to parse query id: %w", err) } - res, err := queryClient.QueryResult(context.Background(), &types.QueryQueryResultRequest{QueryId: queryID}) + res, err := queryClient.QueryResult(context.Background(), &types.QueryRegisteredQueryResultRequest{QueryId: queryID}) if err != nil { return err } @@ -142,7 +142,7 @@ func CmdQueryLastRemoteHeight() *cobra.Command { clientCtx := client.GetClientContextFromCmd(cmd) connectionID := args[0] queryClient := types.NewQueryClient(clientCtx) - res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeightRequest{ConnectionId: connectionID}) + res, err := queryClient.LastRemoteHeight(context.Background(), &types.QueryLastRemoteHeight{ConnectionId: connectionID}) if err != nil { return err } diff --git a/x/interchainqueries/keeper/grpc_query.go b/x/interchainqueries/keeper/grpc_query.go index 367309be2..767109134 100644 --- a/x/interchainqueries/keeper/grpc_query.go +++ b/x/interchainqueries/keeper/grpc_query.go @@ -75,7 +75,7 @@ func (k Keeper) GetRegisteredQueries(ctx sdk.Context, req *types.QueryRegistered return &types.QueryRegisteredQueriesResponse{RegisteredQueries: queries, Pagination: pageRes}, nil } -func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResultRequest) (*types.QueryQueryResultResponse, error) { +func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryRegisteredQueryResultRequest) (*types.QueryRegisteredQueryResultResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) if !k.checkRegisteredQueryExists(ctx, request.QueryId) { @@ -86,10 +86,10 @@ func (k Keeper) QueryResult(goCtx context.Context, request *types.QueryQueryResu if err != nil { return nil, errors.Wrapf(err, "failed to get query result by query id: %v", err) } - return &types.QueryQueryResultResponse{Result: result}, nil + return &types.QueryRegisteredQueryResultResponse{Result: result}, nil } -func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeightRequest) (*types.QueryLastRemoteHeightResponse, error) { +func (k Keeper) LastRemoteHeight(goCtx context.Context, request *types.QueryLastRemoteHeight) (*types.QueryLastRemoteHeightResponse, error) { req := contypes.QueryConnectionClientStateRequest{ConnectionId: request.ConnectionId} r, err := k.ibcKeeper.ConnectionClientState(goCtx, &req) if err != nil { diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go index 73be134ca..0f9908fd3 100644 --- a/x/interchainqueries/keeper/grpc_query_test.go +++ b/x/interchainqueries/keeper/grpc_query_test.go @@ -25,7 +25,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() { "wrong connection id", func() { ctx := suite.ChainA.GetContext() - _, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: "test"}) + _, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: "test"}) suite.Require().Error(err) }, }, @@ -34,7 +34,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() { func() { ctx := suite.ChainA.GetContext() - oldHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: suite.Path.EndpointA.ConnectionID}) + oldHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: suite.Path.EndpointA.ConnectionID}) suite.Require().NoError(err) suite.Require().Greater(oldHeight.Height, uint64(0)) @@ -44,7 +44,7 @@ func (suite *KeeperTestSuite) TestRemoteLastHeight() { suite.NoError(suite.Path.EndpointA.UpdateClient()) } - updatedHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeightRequest{ConnectionId: suite.Path.EndpointA.ConnectionID}) + updatedHeight, err := keeper.Keeper.LastRemoteHeight(suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper, ctx, &iqtypes.QueryLastRemoteHeight{ConnectionId: suite.Path.EndpointA.ConnectionID}) suite.Require().Equal(updatedHeight.Height, oldHeight.Height+N) // check that last remote height really equals oldHeight+N suite.Require().NoError(err) }, @@ -529,7 +529,7 @@ func (suite *KeeperTestSuite) TestQueryResult() { _, err = msgSrv.SubmitQueryResult(ctx, &msg) suite.NoError(err) - queryResultResponse, err := suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{ + queryResultResponse, err := suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{ QueryId: regQuery1.Id, }) suite.NoError(err) @@ -546,12 +546,12 @@ func (suite *KeeperTestSuite) TestQueryResult() { } suite.Equal(len(expectKvResults), len(queryKvResult)) - _, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{ + _, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{ QueryId: regQuery2.Id, }) suite.ErrorContains(err, "no query result") - _, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryQueryResultRequest{ + _, err = suite.GetNeutronZoneApp(suite.ChainA).InterchainQueriesKeeper.QueryResult(ctx, &iqtypes.QueryRegisteredQueryResultRequest{ QueryId: regQuery2.Id + 1, }) suite.ErrorContains(err, "invalid query id") diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index b612d0a50..9ac2b5228 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/x/interchainqueries/keeper/keeper_test.go @@ -163,7 +163,7 @@ func (suite *KeeperTestSuite) TestRegisterInterchainQuery() { } func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { - var msg iqtypes.MsgUpdateInterchainQuery + var msg iqtypes.MsgUpdateInterchainQueryRequest originalKVQuery := iqtypes.MsgRegisterInterchainQuery{ QueryType: string(iqtypes.InterchainQueryTypeKV), Keys: []*iqtypes.KVKey{ @@ -199,7 +199,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid update period for kv", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 2, @@ -215,7 +215,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid update period for tx", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 2, @@ -231,7 +231,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid kv query data", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*iqtypes.KVKey{ { @@ -257,7 +257,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid tx filter", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewUpdatePeriod: 0, NewTransactionsFilter: "[]", @@ -273,7 +273,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid kv query both query keys and update period and ignore tx filter", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*iqtypes.KVKey{ { @@ -299,7 +299,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "valid tx query both tx filter and update period and ignore query keys", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewUpdatePeriod: 2, NewTransactionsFilter: "[]", @@ -315,7 +315,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "must fail on update filter for a kv query", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewUpdatePeriod: 2, NewTransactionsFilter: "[]", @@ -331,7 +331,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "must fail on update keys for a tx query", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*iqtypes.KVKey{ { @@ -352,7 +352,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { { "invalid query id", func(sender string) { - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 2, NewKeys: []*iqtypes.KVKey{ { @@ -380,7 +380,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) - msg = iqtypes.MsgUpdateInterchainQuery{ + msg = iqtypes.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 2, @@ -449,7 +449,7 @@ func (suite *KeeperTestSuite) TestUpdateInterchainQuery() { func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { suite.SetupTest() - var msg iqtypes.MsgRemoveInterchainQuery + var msg iqtypes.MsgRemoveInterchainQueryRequest var query iqtypes.MsgRegisterInterchainQuery var txQueryHashes [][]byte @@ -461,7 +461,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { { "valid TX remove", func(sender string) { - msg = iqtypes.MsgRemoveInterchainQuery{ + msg = iqtypes.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: sender, } @@ -483,7 +483,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { { "valid large TX remove", func(sender string) { - msg = iqtypes.MsgRemoveInterchainQuery{ + msg = iqtypes.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: sender, } @@ -508,7 +508,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { { "valid KV remove", func(sender string) { - msg = iqtypes.MsgRemoveInterchainQuery{ + msg = iqtypes.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: sender, } @@ -526,7 +526,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { { "invalid query id", func(sender string) { - msg = iqtypes.MsgRemoveInterchainQuery{ + msg = iqtypes.MsgRemoveInterchainQueryRequest{ QueryId: 2, Sender: sender, } @@ -551,7 +551,7 @@ func (suite *KeeperTestSuite) TestRemoveInterchainQuery() { codeID := suite.StoreTestCode(ctx, contractOwner, reflectContractPath) newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) - msg = iqtypes.MsgRemoveInterchainQuery{ + msg = iqtypes.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: newContractAddress.String(), } @@ -1723,7 +1723,7 @@ func (suite *KeeperTestSuite) TestRemoveFreshlyCreatedICQ() { newContractAddress := suite.InstantiateTestContract(ctx, contractOwner, codeID) suite.Require().NotEmpty(newContractAddress) - resp, err := msgSrv.RemoveInterchainQuery(ctx, &iqtypes.MsgRemoveInterchainQuery{ + resp, err := msgSrv.RemoveInterchainQuery(ctx, &iqtypes.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: newContractAddress.String(), }) diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 68d7f7b31..50f30fa97 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -92,7 +92,7 @@ func (m msgServer) RegisterInterchainQuery(goCtx context.Context, msg *types.Msg return &types.MsgRegisterInterchainQueryResponse{Id: lastID}, nil } -func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQuery) (*types.MsgRemoveInterchainQueryResponse, error) { +func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRemoveInterchainQueryRequest) (*types.MsgRemoveInterchainQueryResponse, error) { if err := msg.Validate(); err != nil { return nil, errors.Wrap(err, "failed to validate MsgRemoveInterchainQueryRequest") } @@ -119,7 +119,7 @@ func (m msgServer) RemoveInterchainQuery(goCtx context.Context, msg *types.MsgRe return &types.MsgRemoveInterchainQueryResponse{}, nil } -func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQuery) (*types.MsgUpdateInterchainQueryResponse, error) { +func (m msgServer) UpdateInterchainQuery(goCtx context.Context, msg *types.MsgUpdateInterchainQueryRequest) (*types.MsgUpdateInterchainQueryResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) ctx.Logger().Debug("UpdateInterchainQuery", "msg", msg) params := m.GetParams(ctx) @@ -316,7 +316,7 @@ func (m msgServer) SubmitQueryResult(goCtx context.Context, msg *types.MsgSubmit // with the query type. func (m msgServer) validateUpdateInterchainQueryParams( query *types.RegisteredQuery, - msg *types.MsgUpdateInterchainQuery, + msg *types.MsgUpdateInterchainQueryRequest, ) error { queryType := types.InterchainQueryType(query.GetQueryType()) newKvKeysSet := len(msg.GetNewKeys()) != 0 diff --git a/x/interchainqueries/keeper/msg_server_test.go b/x/interchainqueries/keeper/msg_server_test.go index 7f2bea9f2..26b30bc94 100644 --- a/x/interchainqueries/keeper/msg_server_test.go +++ b/x/interchainqueries/keeper/msg_server_test.go @@ -298,18 +298,18 @@ func TestMsgSubmitQueryResultValidate(t *testing.T) { } } -func TestMsgRemoveInterchainQueryValidate(t *testing.T) { +func TestMsgRemoveInterchainQueryRequestValidate(t *testing.T) { k, ctx := testkeeper.InterchainQueriesKeeper(t, nil, nil, nil, nil) msgServer := keeper.NewMsgServerImpl(*k) tests := []struct { name string - msg types.MsgRemoveInterchainQuery + msg types.MsgRemoveInterchainQueryRequest expectedErr error }{ { "invalid query id", - types.MsgRemoveInterchainQuery{ + types.MsgRemoveInterchainQueryRequest{ QueryId: 0, Sender: testutil.TestOwnerAddress, }, @@ -317,7 +317,7 @@ func TestMsgRemoveInterchainQueryValidate(t *testing.T) { }, { "empty sender", - types.MsgRemoveInterchainQuery{ + types.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: "", }, @@ -325,7 +325,7 @@ func TestMsgRemoveInterchainQueryValidate(t *testing.T) { }, { "invalid sender", - types.MsgRemoveInterchainQuery{ + types.MsgRemoveInterchainQueryRequest{ QueryId: 1, Sender: "invalid-sender", }, @@ -343,18 +343,18 @@ func TestMsgRemoveInterchainQueryValidate(t *testing.T) { } } -func TestMsgUpdateInterchainQueryValidate(t *testing.T) { +func TestMsgUpdateInterchainQueryRequestValidate(t *testing.T) { k, ctx := testkeeper.InterchainQueriesKeeper(t, nil, nil, nil, nil) msgServer := keeper.NewMsgServerImpl(*k) tests := []struct { name string - msg types.MsgUpdateInterchainQuery + msg types.MsgUpdateInterchainQueryRequest expectedErr error }{ { "invalid query id", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 0, NewKeys: []*types.KVKey{{ Path: "staking", @@ -367,7 +367,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "empty keys, update_period and tx filter", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: nil, NewUpdatePeriod: 0, @@ -378,7 +378,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "both keys and filter sent", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", @@ -392,7 +392,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "too many keys", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: make([]*types.KVKey, types.DefaultMaxKvQueryKeysCount+1), NewUpdatePeriod: 0, @@ -402,7 +402,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "nil key", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, nil}, NewUpdatePeriod: 0, @@ -412,7 +412,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "duplicated keys", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: "path1"}, {Key: []byte("key1"), Path: "path1"}}, NewUpdatePeriod: 0, @@ -422,7 +422,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "empty key path", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte("key1"), Path: ""}}, NewUpdatePeriod: 0, @@ -432,7 +432,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "empty key id", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{Key: []byte(""), Path: "path"}}, NewUpdatePeriod: 0, @@ -442,7 +442,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "empty sender", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", @@ -455,7 +455,7 @@ func TestMsgUpdateInterchainQueryValidate(t *testing.T) { }, { "invalid sender", - types.MsgUpdateInterchainQuery{ + types.MsgUpdateInterchainQueryRequest{ QueryId: 1, NewKeys: []*types.KVKey{{ Path: "staking", diff --git a/x/interchainqueries/types/codec.go b/x/interchainqueries/types/codec.go index c1698cf14..985707a3e 100644 --- a/x/interchainqueries/types/codec.go +++ b/x/interchainqueries/types/codec.go @@ -17,8 +17,8 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { (*sdk.Msg)(nil), &MsgRegisterInterchainQuery{}, &MsgSubmitQueryResult{}, - &MsgUpdateInterchainQuery{}, - &MsgRemoveInterchainQuery{}, + &MsgUpdateInterchainQueryRequest{}, + &MsgRemoveInterchainQueryRequest{}, &MsgUpdateParams{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) diff --git a/x/interchainqueries/types/message_remove_interchain_query.go b/x/interchainqueries/types/message_remove_interchain_query.go index 0667de398..632c4a552 100644 --- a/x/interchainqueries/types/message_remove_interchain_query.go +++ b/x/interchainqueries/types/message_remove_interchain_query.go @@ -9,24 +9,24 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -var _ sdk.Msg = &MsgRemoveInterchainQuery{} +var _ sdk.Msg = &MsgRemoveInterchainQueryRequest{} -func NewMsgRemoveInterchainQuery(sender string, queryID uint64) MsgRemoveInterchainQuery { - return MsgRemoveInterchainQuery{ +func NewMsgRemoveInterchainQuery(sender string, queryID uint64) MsgRemoveInterchainQueryRequest { + return MsgRemoveInterchainQueryRequest{ QueryId: queryID, Sender: sender, } } -func (msg MsgRemoveInterchainQuery) Route() string { +func (msg MsgRemoveInterchainQueryRequest) Route() string { return RouterKey } -func (msg MsgRemoveInterchainQuery) Type() string { +func (msg MsgRemoveInterchainQueryRequest) Type() string { return "remove-interchain-query" } -func (msg MsgRemoveInterchainQuery) Validate() error { +func (msg MsgRemoveInterchainQueryRequest) Validate() error { if msg.GetQueryId() == 0 { return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") } @@ -42,11 +42,11 @@ func (msg MsgRemoveInterchainQuery) Validate() error { return nil } -func (msg MsgRemoveInterchainQuery) GetSignBytes() []byte { +func (msg MsgRemoveInterchainQueryRequest) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgRemoveInterchainQuery) GetSigners() []sdk.AccAddress { +func (msg MsgRemoveInterchainQueryRequest) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) diff --git a/x/interchainqueries/types/query.pb.go b/x/interchainqueries/types/query.pb.go index cb08fa6c6..0300e73fa 100644 --- a/x/interchainqueries/types/query.pb.go +++ b/x/interchainqueries/types/query.pb.go @@ -331,23 +331,23 @@ func (m *QueryRegisteredQueryResponse) GetRegisteredQuery() *RegisteredQuery { } // Request type for the Query/QueryResult RPC method. -type QueryQueryResultRequest struct { +type QueryRegisteredQueryResultRequest struct { // ID of an Interchain Query. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` } -func (m *QueryQueryResultRequest) Reset() { *m = QueryQueryResultRequest{} } -func (m *QueryQueryResultRequest) String() string { return proto.CompactTextString(m) } -func (*QueryQueryResultRequest) ProtoMessage() {} -func (*QueryQueryResultRequest) Descriptor() ([]byte, []int) { +func (m *QueryRegisteredQueryResultRequest) Reset() { *m = QueryRegisteredQueryResultRequest{} } +func (m *QueryRegisteredQueryResultRequest) String() string { return proto.CompactTextString(m) } +func (*QueryRegisteredQueryResultRequest) ProtoMessage() {} +func (*QueryRegisteredQueryResultRequest) Descriptor() ([]byte, []int) { return fileDescriptor_2254be23ba3ff3b4, []int{6} } -func (m *QueryQueryResultRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryRegisteredQueryResultRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryRegisteredQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryQueryResultRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryRegisteredQueryResultRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -357,19 +357,19 @@ func (m *QueryQueryResultRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *QueryQueryResultRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryQueryResultRequest.Merge(m, src) +func (m *QueryRegisteredQueryResultRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryRegisteredQueryResultRequest.Merge(m, src) } -func (m *QueryQueryResultRequest) XXX_Size() int { +func (m *QueryRegisteredQueryResultRequest) XXX_Size() int { return m.Size() } -func (m *QueryQueryResultRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryQueryResultRequest.DiscardUnknown(m) +func (m *QueryRegisteredQueryResultRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryRegisteredQueryResultRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryQueryResultRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryRegisteredQueryResultRequest proto.InternalMessageInfo -func (m *QueryQueryResultRequest) GetQueryId() uint64 { +func (m *QueryRegisteredQueryResultRequest) GetQueryId() uint64 { if m != nil { return m.QueryId } @@ -377,23 +377,23 @@ func (m *QueryQueryResultRequest) GetQueryId() uint64 { } // Response type for the Query/QueryResult RPC method. -type QueryQueryResultResponse struct { +type QueryRegisteredQueryResultResponse struct { // The last successfully submitted result of an Interchain Query. Result *QueryResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"` } -func (m *QueryQueryResultResponse) Reset() { *m = QueryQueryResultResponse{} } -func (m *QueryQueryResultResponse) String() string { return proto.CompactTextString(m) } -func (*QueryQueryResultResponse) ProtoMessage() {} -func (*QueryQueryResultResponse) Descriptor() ([]byte, []int) { +func (m *QueryRegisteredQueryResultResponse) Reset() { *m = QueryRegisteredQueryResultResponse{} } +func (m *QueryRegisteredQueryResultResponse) String() string { return proto.CompactTextString(m) } +func (*QueryRegisteredQueryResultResponse) ProtoMessage() {} +func (*QueryRegisteredQueryResultResponse) Descriptor() ([]byte, []int) { return fileDescriptor_2254be23ba3ff3b4, []int{7} } -func (m *QueryQueryResultResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryRegisteredQueryResultResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryQueryResultResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryRegisteredQueryResultResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryQueryResultResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryRegisteredQueryResultResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -403,44 +403,105 @@ func (m *QueryQueryResultResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *QueryQueryResultResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryQueryResultResponse.Merge(m, src) +func (m *QueryRegisteredQueryResultResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryRegisteredQueryResultResponse.Merge(m, src) } -func (m *QueryQueryResultResponse) XXX_Size() int { +func (m *QueryRegisteredQueryResultResponse) XXX_Size() int { return m.Size() } -func (m *QueryQueryResultResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryQueryResultResponse.DiscardUnknown(m) +func (m *QueryRegisteredQueryResultResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryRegisteredQueryResultResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryQueryResultResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryRegisteredQueryResultResponse proto.InternalMessageInfo -func (m *QueryQueryResultResponse) GetResult() *QueryResult { +func (m *QueryRegisteredQueryResultResponse) GetResult() *QueryResult { if m != nil { return m.Result } return nil } +// Deprecated: Do not use. +type Transaction struct { + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` + Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` +} + +func (m *Transaction) Reset() { *m = Transaction{} } +func (m *Transaction) String() string { return proto.CompactTextString(m) } +func (*Transaction) ProtoMessage() {} +func (*Transaction) Descriptor() ([]byte, []int) { + return fileDescriptor_2254be23ba3ff3b4, []int{8} +} +func (m *Transaction) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Transaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Transaction.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Transaction) XXX_Merge(src proto.Message) { + xxx_messageInfo_Transaction.Merge(m, src) +} +func (m *Transaction) XXX_Size() int { + return m.Size() +} +func (m *Transaction) XXX_DiscardUnknown() { + xxx_messageInfo_Transaction.DiscardUnknown(m) +} + +var xxx_messageInfo_Transaction proto.InternalMessageInfo + +func (m *Transaction) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *Transaction) GetHeight() uint64 { + if m != nil { + return m.Height + } + return 0 +} + +func (m *Transaction) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + // Request type for the Query/LastRemoteHeight RPC method. -type QueryLastRemoteHeightRequest struct { +type QueryLastRemoteHeight struct { // Connection ID of an IBC connection to a remote chain. Determines the IBC client used in query // handling. ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` } -func (m *QueryLastRemoteHeightRequest) Reset() { *m = QueryLastRemoteHeightRequest{} } -func (m *QueryLastRemoteHeightRequest) String() string { return proto.CompactTextString(m) } -func (*QueryLastRemoteHeightRequest) ProtoMessage() {} -func (*QueryLastRemoteHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_2254be23ba3ff3b4, []int{8} +func (m *QueryLastRemoteHeight) Reset() { *m = QueryLastRemoteHeight{} } +func (m *QueryLastRemoteHeight) String() string { return proto.CompactTextString(m) } +func (*QueryLastRemoteHeight) ProtoMessage() {} +func (*QueryLastRemoteHeight) Descriptor() ([]byte, []int) { + return fileDescriptor_2254be23ba3ff3b4, []int{9} } -func (m *QueryLastRemoteHeightRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryLastRemoteHeight) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryLastRemoteHeightRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryLastRemoteHeight) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryLastRemoteHeightRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryLastRemoteHeight.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -450,19 +511,19 @@ func (m *QueryLastRemoteHeightRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *QueryLastRemoteHeightRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryLastRemoteHeightRequest.Merge(m, src) +func (m *QueryLastRemoteHeight) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryLastRemoteHeight.Merge(m, src) } -func (m *QueryLastRemoteHeightRequest) XXX_Size() int { +func (m *QueryLastRemoteHeight) XXX_Size() int { return m.Size() } -func (m *QueryLastRemoteHeightRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryLastRemoteHeightRequest.DiscardUnknown(m) +func (m *QueryLastRemoteHeight) XXX_DiscardUnknown() { + xxx_messageInfo_QueryLastRemoteHeight.DiscardUnknown(m) } -var xxx_messageInfo_QueryLastRemoteHeightRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryLastRemoteHeight proto.InternalMessageInfo -func (m *QueryLastRemoteHeightRequest) GetConnectionId() string { +func (m *QueryLastRemoteHeight) GetConnectionId() string { if m != nil { return m.ConnectionId } @@ -481,7 +542,7 @@ func (m *QueryLastRemoteHeightResponse) Reset() { *m = QueryLastRemoteHe func (m *QueryLastRemoteHeightResponse) String() string { return proto.CompactTextString(m) } func (*QueryLastRemoteHeightResponse) ProtoMessage() {} func (*QueryLastRemoteHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_2254be23ba3ff3b4, []int{9} + return fileDescriptor_2254be23ba3ff3b4, []int{10} } func (m *QueryLastRemoteHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -531,9 +592,10 @@ func init() { proto.RegisterType((*QueryRegisteredQueriesResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueriesResponse") proto.RegisterType((*QueryRegisteredQueryRequest)(nil), "neutron.interchainqueries.QueryRegisteredQueryRequest") proto.RegisterType((*QueryRegisteredQueryResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueryResponse") - proto.RegisterType((*QueryQueryResultRequest)(nil), "neutron.interchainqueries.QueryQueryResultRequest") - proto.RegisterType((*QueryQueryResultResponse)(nil), "neutron.interchainqueries.QueryQueryResultResponse") - proto.RegisterType((*QueryLastRemoteHeightRequest)(nil), "neutron.interchainqueries.QueryLastRemoteHeightRequest") + proto.RegisterType((*QueryRegisteredQueryResultRequest)(nil), "neutron.interchainqueries.QueryRegisteredQueryResultRequest") + proto.RegisterType((*QueryRegisteredQueryResultResponse)(nil), "neutron.interchainqueries.QueryRegisteredQueryResultResponse") + proto.RegisterType((*Transaction)(nil), "neutron.interchainqueries.Transaction") + proto.RegisterType((*QueryLastRemoteHeight)(nil), "neutron.interchainqueries.QueryLastRemoteHeight") proto.RegisterType((*QueryLastRemoteHeightResponse)(nil), "neutron.interchainqueries.QueryLastRemoteHeightResponse") } @@ -542,53 +604,56 @@ func init() { } var fileDescriptor_2254be23ba3ff3b4 = []byte{ - // 732 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x41, 0x4f, 0x13, 0x41, - 0x14, 0xee, 0x02, 0xae, 0x30, 0x68, 0x80, 0x91, 0x60, 0x59, 0x71, 0x85, 0x25, 0x42, 0xc1, 0x74, - 0x47, 0x8a, 0x28, 0xc6, 0x44, 0x13, 0x4c, 0x54, 0x12, 0x0f, 0xb0, 0x06, 0x0f, 0x5c, 0x9a, 0x6d, - 0x3b, 0xd9, 0x6e, 0x42, 0x67, 0xca, 0xce, 0x14, 0xd9, 0xab, 0xbf, 0xc0, 0xe8, 0x5f, 0x30, 0xf1, - 0x27, 0x78, 0xf4, 0x4a, 0x3c, 0x91, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x33, 0x3c, 0x98, 0x9d, 0x99, - 0x2d, 0xb4, 0xdb, 0x76, 0x5b, 0x4f, 0x9d, 0x79, 0x7d, 0xdf, 0x7b, 0xdf, 0xfb, 0xde, 0x7b, 0x3b, - 0xe0, 0x2e, 0xc1, 0x0d, 0x1e, 0x50, 0x82, 0x7c, 0xc2, 0x71, 0x50, 0xae, 0xba, 0x3e, 0x39, 0x6c, - 0xe0, 0xc0, 0xc7, 0x0c, 0x45, 0xbf, 0xa1, 0x5d, 0x0f, 0x28, 0xa7, 0x70, 0x56, 0xb9, 0xd9, 0x09, - 0x37, 0x63, 0xb5, 0x4c, 0x59, 0x8d, 0x32, 0x54, 0x72, 0x19, 0x96, 0x18, 0x74, 0xb4, 0x56, 0xc2, - 0xdc, 0x5d, 0x43, 0x75, 0xd7, 0xf3, 0x89, 0xcb, 0x7d, 0x4a, 0x64, 0x18, 0x63, 0xda, 0xa3, 0x1e, - 0x15, 0x47, 0x14, 0x9d, 0x94, 0x75, 0xce, 0xa3, 0xd4, 0x3b, 0xc0, 0xc8, 0xad, 0xfb, 0xc8, 0x25, - 0x84, 0x72, 0x01, 0x61, 0xea, 0xdf, 0xe5, 0xee, 0x0c, 0x3d, 0x4c, 0x30, 0xf3, 0x63, 0xc7, 0xa5, - 0xee, 0x8e, 0x75, 0x37, 0x70, 0x6b, 0xb1, 0x9f, 0xd5, 0xdd, 0x8f, 0x1f, 0x4b, 0x1f, 0x6b, 0x1a, - 0xc0, 0xdd, 0xa8, 0x94, 0x1d, 0x01, 0x74, 0xf0, 0x61, 0x03, 0x33, 0x6e, 0xbd, 0x05, 0x37, 0x5a, - 0xac, 0xac, 0x4e, 0x09, 0xc3, 0xf0, 0x19, 0xd0, 0x65, 0x82, 0xac, 0x36, 0xaf, 0xe5, 0xc6, 0x0b, - 0x0b, 0x76, 0x57, 0xb5, 0x6c, 0x09, 0xdd, 0x1a, 0x39, 0xf9, 0x75, 0x27, 0xe3, 0x28, 0x98, 0xf5, - 0x59, 0x03, 0xb7, 0x45, 0x60, 0x07, 0x7b, 0x3e, 0xe3, 0x38, 0xc0, 0x95, 0x5d, 0xe9, 0xaf, 0x32, - 0xc3, 0x19, 0xa0, 0xd3, 0x77, 0x04, 0x07, 0x51, 0x8a, 0xe1, 0xdc, 0x98, 0xa3, 0x6e, 0x70, 0x11, - 0x5c, 0x2f, 0x53, 0x42, 0x70, 0x39, 0x52, 0xac, 0xe8, 0x57, 0xb2, 0x43, 0xf3, 0x5a, 0x6e, 0xcc, - 0xb9, 0x76, 0x61, 0xdc, 0xae, 0xc0, 0x17, 0x00, 0x5c, 0x74, 0x22, 0x3b, 0x2c, 0x38, 0x2e, 0xd9, - 0xb2, 0x6d, 0x76, 0xd4, 0x36, 0x5b, 0xb6, 0x5a, 0xb5, 0xcd, 0xde, 0x71, 0x3d, 0xac, 0x12, 0x3b, - 0x97, 0x90, 0xd6, 0x77, 0x0d, 0x98, 0xdd, 0x68, 0x2a, 0x29, 0x8a, 0x00, 0x06, 0xcd, 0x3f, 0x8b, - 0xaa, 0x68, 0xc1, 0x79, 0xbc, 0xb0, 0xda, 0x43, 0x96, 0xd6, 0x88, 0xa1, 0xd2, 0x67, 0x2a, 0x68, - 0x4f, 0x04, 0x5f, 0xb6, 0xd4, 0x32, 0x24, 0x6a, 0x59, 0x4e, 0xad, 0x45, 0xb2, 0x6b, 0x29, 0x66, - 0x13, 0xdc, 0xea, 0x50, 0x4b, 0x18, 0x0b, 0x3e, 0x0b, 0x46, 0x45, 0xa0, 0x48, 0xd3, 0xa8, 0xab, - 0x23, 0xce, 0x55, 0x71, 0xdf, 0xae, 0x58, 0x0d, 0x30, 0xd7, 0x19, 0xa9, 0x34, 0xd8, 0x03, 0x93, - 0x6d, 0x1a, 0x84, 0x6a, 0x30, 0x06, 0x50, 0xc0, 0x99, 0x68, 0xad, 0x3d, 0xb4, 0x1e, 0x80, 0x9b, - 0xe2, 0x10, 0x27, 0x6b, 0x1c, 0xf0, 0x3e, 0xc8, 0xee, 0x83, 0x6c, 0x12, 0xa5, 0x88, 0x3e, 0x05, - 0x7a, 0x20, 0x2c, 0x8a, 0xde, 0x52, 0x0f, 0x7a, 0x97, 0xf1, 0x0a, 0x65, 0x3d, 0x57, 0x42, 0xbc, - 0x76, 0x19, 0x77, 0x70, 0x8d, 0x72, 0xfc, 0x0a, 0xfb, 0x5e, 0xb5, 0x49, 0x2b, 0x31, 0x9c, 0x5a, - 0x72, 0x38, 0xad, 0x37, 0x6a, 0xf4, 0x93, 0x41, 0x14, 0xcb, 0x19, 0xa0, 0x57, 0x85, 0x45, 0x95, - 0xa6, 0x6e, 0xd0, 0x00, 0xa3, 0x01, 0x3e, 0xf2, 0x59, 0x3c, 0x07, 0x23, 0x4e, 0xf3, 0x5e, 0xf8, - 0xab, 0x83, 0x2b, 0x22, 0x2a, 0xfc, 0xa8, 0x01, 0x5d, 0xee, 0x1c, 0xcc, 0xa7, 0x95, 0xd7, 0xb2, - 0xec, 0x86, 0xdd, 0xaf, 0xbb, 0xe4, 0x69, 0xad, 0xbc, 0xff, 0xf1, 0xe7, 0xd3, 0xd0, 0x22, 0x5c, - 0x40, 0x69, 0xdf, 0x21, 0xf8, 0x4d, 0x03, 0x53, 0x89, 0x1d, 0x82, 0x9b, 0xe9, 0xf2, 0x77, 0xfe, - 0x3a, 0x18, 0x8f, 0xff, 0x03, 0xa9, 0x58, 0x6f, 0x08, 0xd6, 0x08, 0xe6, 0x7b, 0xb0, 0x4e, 0x6e, - 0x34, 0xfc, 0xaa, 0x81, 0x89, 0xb6, 0x89, 0x85, 0x0f, 0x07, 0x63, 0x11, 0xaf, 0x9a, 0xf1, 0x68, - 0x60, 0x9c, 0xe2, 0xbe, 0x2e, 0xb8, 0xe7, 0xe1, 0xbd, 0xfe, 0xb9, 0x87, 0xf0, 0x8b, 0x06, 0xc6, - 0x2f, 0x0d, 0x33, 0x2c, 0xa4, 0x65, 0x4f, 0xee, 0x9b, 0xb1, 0x3e, 0x10, 0x46, 0xb1, 0x45, 0x82, - 0xed, 0x0a, 0x5c, 0x46, 0x29, 0x4f, 0x6e, 0x51, 0xae, 0x57, 0xa4, 0xf1, 0x64, 0xfb, 0x56, 0xc0, - 0x54, 0xb1, 0xba, 0x2c, 0xa3, 0xb1, 0x39, 0x38, 0x50, 0x11, 0xbf, 0x2f, 0x88, 0xaf, 0xc2, 0x5c, - 0x4f, 0x99, 0x23, 0x60, 0x51, 0xae, 0xe6, 0xd6, 0xde, 0xc9, 0x99, 0xa9, 0x9d, 0x9e, 0x99, 0xda, - 0xef, 0x33, 0x53, 0xfb, 0x70, 0x6e, 0x66, 0x4e, 0xcf, 0xcd, 0xcc, 0xcf, 0x73, 0x33, 0xb3, 0xff, - 0xc4, 0xf3, 0x79, 0xb5, 0x51, 0xb2, 0xcb, 0xb4, 0x16, 0x47, 0xcb, 0xd3, 0xc0, 0x6b, 0x46, 0x3e, - 0xda, 0x40, 0xc7, 0x9d, 0xde, 0xe5, 0xb0, 0x8e, 0x59, 0x49, 0x17, 0x6f, 0xf3, 0xfa, 0xbf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x88, 0x8a, 0x1e, 0x01, 0xb4, 0x08, 0x00, 0x00, + // 775 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x4f, 0x13, 0x4f, + 0x14, 0xef, 0x94, 0x7e, 0x0b, 0xbc, 0xf2, 0x15, 0x18, 0xd1, 0x94, 0x15, 0x2b, 0x2c, 0x11, 0x0a, + 0xa6, 0xbb, 0xfc, 0x08, 0x8a, 0x8a, 0x98, 0x70, 0x50, 0x49, 0x34, 0x81, 0x55, 0x3c, 0x78, 0x69, + 0xa6, 0xed, 0x64, 0xbb, 0x09, 0xdd, 0x29, 0xbb, 0x53, 0xa4, 0x57, 0x6f, 0xde, 0x8c, 0xfe, 0x0b, + 0xfe, 0x01, 0xde, 0x3c, 0x78, 0xf0, 0x4a, 0x3c, 0x91, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x87, 0x98, + 0x9d, 0x99, 0xb6, 0x6c, 0x7f, 0x52, 0x4e, 0x9d, 0x99, 0x7d, 0x9f, 0xf7, 0x3e, 0xef, 0xf3, 0xde, + 0x9b, 0x0e, 0xdc, 0x76, 0x69, 0x85, 0x7b, 0xcc, 0x35, 0x1d, 0x97, 0x53, 0x2f, 0x5f, 0x24, 0x8e, + 0x7b, 0x50, 0xa1, 0x9e, 0x43, 0x7d, 0x33, 0xf8, 0xad, 0x1a, 0x65, 0x8f, 0x71, 0x86, 0x27, 0x95, + 0x99, 0xd1, 0x62, 0xa6, 0x2d, 0xe6, 0x99, 0x5f, 0x62, 0xbe, 0x99, 0x23, 0x3e, 0x95, 0x18, 0xf3, + 0x70, 0x39, 0x47, 0x39, 0x59, 0x36, 0xcb, 0xc4, 0x76, 0x5c, 0xc2, 0x1d, 0xe6, 0x4a, 0x37, 0xda, + 0x84, 0xcd, 0x6c, 0x26, 0x96, 0x66, 0xb0, 0x52, 0xa7, 0x53, 0x36, 0x63, 0xf6, 0x3e, 0x35, 0x49, + 0xd9, 0x31, 0x89, 0xeb, 0x32, 0x2e, 0x20, 0xbe, 0xfa, 0x3a, 0xdf, 0x99, 0xa1, 0x4d, 0x5d, 0xea, + 0x3b, 0x35, 0xc3, 0xb9, 0xce, 0x86, 0x65, 0xe2, 0x91, 0x52, 0xcd, 0x4e, 0xef, 0x6c, 0xc7, 0x8f, + 0xa4, 0x8d, 0x3e, 0x01, 0x78, 0x37, 0x48, 0x65, 0x47, 0x00, 0x2d, 0x7a, 0x50, 0xa1, 0x3e, 0xd7, + 0x5f, 0xc3, 0xd5, 0xd0, 0xa9, 0x5f, 0x66, 0xae, 0x4f, 0xf1, 0x63, 0x88, 0xcb, 0x00, 0x49, 0x34, + 0x8d, 0xd2, 0x89, 0x95, 0x19, 0xa3, 0xa3, 0x5a, 0x86, 0x84, 0x6e, 0xc5, 0x8e, 0x7f, 0xdf, 0x8a, + 0x58, 0x0a, 0xa6, 0x7f, 0x46, 0x70, 0x53, 0x38, 0xb6, 0xa8, 0xed, 0xf8, 0x9c, 0x7a, 0xb4, 0xb0, + 0x2b, 0xed, 0x55, 0x64, 0x7c, 0x1d, 0xe2, 0xec, 0xad, 0x4b, 0xbd, 0x20, 0xc4, 0x40, 0x7a, 0xd8, + 0x52, 0x3b, 0x3c, 0x0b, 0xff, 0xe7, 0x99, 0xeb, 0xd2, 0x7c, 0xa0, 0x58, 0xd6, 0x29, 0x24, 0xa3, + 0xd3, 0x28, 0x3d, 0x6c, 0x8d, 0x34, 0x0e, 0xb7, 0x0b, 0xf8, 0x09, 0x40, 0xa3, 0x12, 0xc9, 0x01, + 0xc1, 0x71, 0xce, 0x90, 0x65, 0x33, 0x82, 0xb2, 0x19, 0xb2, 0xd4, 0xaa, 0x6c, 0xc6, 0x0e, 0xb1, + 0xa9, 0x0a, 0x6c, 0x9d, 0x43, 0xea, 0x3f, 0x10, 0xa4, 0x3a, 0xd1, 0x54, 0x52, 0x64, 0x01, 0x7b, + 0xf5, 0x8f, 0x59, 0x95, 0xb4, 0xe0, 0x9c, 0x58, 0x59, 0xec, 0x22, 0x4b, 0xd8, 0x63, 0x55, 0xe9, + 0x33, 0xee, 0x35, 0x07, 0xc2, 0x4f, 0x43, 0xb9, 0x44, 0x45, 0x2e, 0xf3, 0x3d, 0x73, 0x91, 0xec, + 0x42, 0xc9, 0xac, 0xc3, 0x8d, 0x36, 0xb9, 0x54, 0x6b, 0x82, 0x4f, 0xc2, 0x90, 0x70, 0x14, 0x68, + 0x1a, 0x54, 0x35, 0x66, 0x0d, 0x8a, 0xfd, 0x76, 0x41, 0xaf, 0xc0, 0x54, 0x7b, 0xa4, 0xd2, 0x60, + 0x0f, 0xc6, 0x9a, 0x34, 0xa8, 0xaa, 0xc6, 0xe8, 0x43, 0x01, 0x6b, 0x34, 0x9c, 0x7b, 0x55, 0xdf, + 0x84, 0x99, 0x0e, 0x61, 0x2b, 0xfb, 0xfc, 0x02, 0xb4, 0x0b, 0xa0, 0x77, 0xc3, 0x2b, 0xf2, 0x9b, + 0x10, 0xf7, 0xc4, 0x89, 0xa2, 0x3c, 0xd7, 0x85, 0xf2, 0x79, 0xbc, 0x42, 0xe9, 0x2f, 0x20, 0xf1, + 0xca, 0x23, 0xae, 0x4f, 0x44, 0xf3, 0xe1, 0x2b, 0x10, 0xad, 0x33, 0x89, 0x3a, 0x85, 0xa0, 0x8f, + 0x8b, 0xd4, 0xb1, 0x8b, 0x5c, 0x94, 0x2e, 0x66, 0xa9, 0x1d, 0xc6, 0x10, 0x2b, 0x10, 0x4e, 0x44, + 0x73, 0x8e, 0x58, 0x62, 0xfd, 0x20, 0x9a, 0x44, 0xfa, 0x06, 0x5c, 0x13, 0x51, 0x9e, 0x13, 0x9f, + 0x5b, 0xb4, 0xc4, 0x38, 0x7d, 0x26, 0x01, 0x2d, 0x8d, 0x8f, 0x5a, 0x1b, 0x5f, 0x7f, 0xa9, 0xc6, + 0xaa, 0x19, 0x5d, 0xcf, 0xb6, 0x41, 0x07, 0x85, 0xe8, 0x68, 0x30, 0xe4, 0xd1, 0x43, 0xc7, 0xaf, + 0xf5, 0x58, 0xcc, 0xaa, 0xef, 0x57, 0xde, 0x0f, 0xc2, 0x7f, 0xc2, 0x2b, 0xfe, 0x88, 0x20, 0x2e, + 0xe7, 0x19, 0x67, 0x7a, 0xc9, 0x14, 0xba, 0x48, 0x34, 0xe3, 0xa2, 0xe6, 0x92, 0xa7, 0xbe, 0xf0, + 0xee, 0xe7, 0xdf, 0x4f, 0xd1, 0x59, 0x3c, 0x63, 0xf6, 0xba, 0xe3, 0xf0, 0x77, 0x04, 0xe3, 0x2d, + 0xf3, 0x89, 0xd7, 0x7b, 0x97, 0xb1, 0xfd, 0xcd, 0xa3, 0xdd, 0xbf, 0x04, 0x52, 0xb1, 0x5e, 0x13, + 0xac, 0x4d, 0x9c, 0xe9, 0xc2, 0xba, 0xf5, 0xb6, 0xc0, 0x5f, 0x11, 0x8c, 0x36, 0x35, 0x29, 0xbe, + 0xdb, 0x1f, 0x8b, 0xda, 0x18, 0x6b, 0xf7, 0xfa, 0xc6, 0x29, 0xee, 0xab, 0x82, 0x7b, 0x06, 0xdf, + 0xb9, 0x38, 0xf7, 0x2a, 0xfe, 0x86, 0x20, 0x71, 0x6e, 0x28, 0xf0, 0x46, 0xff, 0xd1, 0x1b, 0xb3, + 0xac, 0x3d, 0xba, 0x24, 0x5a, 0x65, 0x60, 0x8a, 0x0c, 0x16, 0xf0, 0xbc, 0xd9, 0xe3, 0x2f, 0x3e, + 0x2b, 0x47, 0x17, 0x7f, 0x41, 0x30, 0xd6, 0x32, 0x67, 0x4b, 0xbd, 0x48, 0x34, 0x23, 0xb4, 0xf5, + 0x7e, 0x11, 0x75, 0xc6, 0x4b, 0x82, 0xf1, 0x22, 0x4e, 0x77, 0xd5, 0x3c, 0x00, 0x66, 0xe5, 0x9c, + 0x6e, 0xed, 0x1d, 0x9f, 0xa6, 0xd0, 0xc9, 0x69, 0x0a, 0xfd, 0x39, 0x4d, 0xa1, 0x0f, 0x67, 0xa9, + 0xc8, 0xc9, 0x59, 0x2a, 0xf2, 0xeb, 0x2c, 0x15, 0x79, 0xf3, 0xd0, 0x76, 0x78, 0xb1, 0x92, 0x33, + 0xf2, 0xac, 0x54, 0xf3, 0x96, 0x61, 0x9e, 0x5d, 0xf7, 0x7c, 0xb8, 0x66, 0x1e, 0xb5, 0x7b, 0x00, + 0x54, 0xcb, 0xd4, 0xcf, 0xc5, 0xc5, 0x23, 0x60, 0xf5, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17, + 0x6f, 0x80, 0x31, 0x1d, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -611,9 +676,9 @@ type QueryClient interface { // Queries a registered Interchain Query by ID. RegisteredQuery(ctx context.Context, in *QueryRegisteredQueryRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResponse, error) // Queries the last successfully submitted result of an Interchain Query. - QueryResult(ctx context.Context, in *QueryQueryResultRequest, opts ...grpc.CallOption) (*QueryQueryResultResponse, error) + QueryResult(ctx context.Context, in *QueryRegisteredQueryResultRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResultResponse, error) // Queries the last height of a remote chain known to the IBC client behind a given connection ID. - LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeightRequest, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) + LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeight, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) } type queryClient struct { @@ -651,8 +716,8 @@ func (c *queryClient) RegisteredQuery(ctx context.Context, in *QueryRegisteredQu return out, nil } -func (c *queryClient) QueryResult(ctx context.Context, in *QueryQueryResultRequest, opts ...grpc.CallOption) (*QueryQueryResultResponse, error) { - out := new(QueryQueryResultResponse) +func (c *queryClient) QueryResult(ctx context.Context, in *QueryRegisteredQueryResultRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResultResponse, error) { + out := new(QueryRegisteredQueryResultResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Query/QueryResult", in, out, opts...) if err != nil { return nil, err @@ -660,7 +725,7 @@ func (c *queryClient) QueryResult(ctx context.Context, in *QueryQueryResultReque return out, nil } -func (c *queryClient) LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeightRequest, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) { +func (c *queryClient) LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeight, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) { out := new(QueryLastRemoteHeightResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Query/LastRemoteHeight", in, out, opts...) if err != nil { @@ -679,9 +744,9 @@ type QueryServer interface { // Queries a registered Interchain Query by ID. RegisteredQuery(context.Context, *QueryRegisteredQueryRequest) (*QueryRegisteredQueryResponse, error) // Queries the last successfully submitted result of an Interchain Query. - QueryResult(context.Context, *QueryQueryResultRequest) (*QueryQueryResultResponse, error) + QueryResult(context.Context, *QueryRegisteredQueryResultRequest) (*QueryRegisteredQueryResultResponse, error) // Queries the last height of a remote chain known to the IBC client behind a given connection ID. - LastRemoteHeight(context.Context, *QueryLastRemoteHeightRequest) (*QueryLastRemoteHeightResponse, error) + LastRemoteHeight(context.Context, *QueryLastRemoteHeight) (*QueryLastRemoteHeightResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -697,10 +762,10 @@ func (*UnimplementedQueryServer) RegisteredQueries(ctx context.Context, req *Que func (*UnimplementedQueryServer) RegisteredQuery(ctx context.Context, req *QueryRegisteredQueryRequest) (*QueryRegisteredQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RegisteredQuery not implemented") } -func (*UnimplementedQueryServer) QueryResult(ctx context.Context, req *QueryQueryResultRequest) (*QueryQueryResultResponse, error) { +func (*UnimplementedQueryServer) QueryResult(ctx context.Context, req *QueryRegisteredQueryResultRequest) (*QueryRegisteredQueryResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryResult not implemented") } -func (*UnimplementedQueryServer) LastRemoteHeight(ctx context.Context, req *QueryLastRemoteHeightRequest) (*QueryLastRemoteHeightResponse, error) { +func (*UnimplementedQueryServer) LastRemoteHeight(ctx context.Context, req *QueryLastRemoteHeight) (*QueryLastRemoteHeightResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method LastRemoteHeight not implemented") } @@ -763,7 +828,7 @@ func _Query_RegisteredQuery_Handler(srv interface{}, ctx context.Context, dec fu } func _Query_QueryResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryQueryResultRequest) + in := new(QueryRegisteredQueryResultRequest) if err := dec(in); err != nil { return nil, err } @@ -775,13 +840,13 @@ func _Query_QueryResult_Handler(srv interface{}, ctx context.Context, dec func(i FullMethod: "/neutron.interchainqueries.Query/QueryResult", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QueryResult(ctx, req.(*QueryQueryResultRequest)) + return srv.(QueryServer).QueryResult(ctx, req.(*QueryRegisteredQueryResultRequest)) } return interceptor(ctx, in, info, handler) } func _Query_LastRemoteHeight_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryLastRemoteHeightRequest) + in := new(QueryLastRemoteHeight) if err := dec(in); err != nil { return nil, err } @@ -793,7 +858,7 @@ func _Query_LastRemoteHeight_Handler(srv interface{}, ctx context.Context, dec f FullMethod: "/neutron.interchainqueries.Query/LastRemoteHeight", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).LastRemoteHeight(ctx, req.(*QueryLastRemoteHeightRequest)) + return srv.(QueryServer).LastRemoteHeight(ctx, req.(*QueryLastRemoteHeight)) } return interceptor(ctx, in, info, handler) } @@ -1046,7 +1111,7 @@ func (m *QueryRegisteredQueryResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryQueryResultRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryRegisteredQueryResultRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1056,12 +1121,12 @@ func (m *QueryQueryResultRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryQueryResultRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryRegisteredQueryResultRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryRegisteredQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1074,7 +1139,7 @@ func (m *QueryQueryResultRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryQueryResultResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryRegisteredQueryResultResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1084,12 +1149,12 @@ func (m *QueryQueryResultResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryQueryResultResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryRegisteredQueryResultResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryRegisteredQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1109,7 +1174,47 @@ func (m *QueryQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *QueryLastRemoteHeightRequest) Marshal() (dAtA []byte, err error) { +func (m *Transaction) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Transaction) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Transaction) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0x1a + } + if m.Height != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x10 + } + if m.Id != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *QueryLastRemoteHeight) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1119,12 +1224,12 @@ func (m *QueryLastRemoteHeightRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryLastRemoteHeightRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryLastRemoteHeight) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryLastRemoteHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryLastRemoteHeight) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1270,7 +1375,7 @@ func (m *QueryRegisteredQueryResponse) Size() (n int) { return n } -func (m *QueryQueryResultRequest) Size() (n int) { +func (m *QueryRegisteredQueryResultRequest) Size() (n int) { if m == nil { return 0 } @@ -1282,7 +1387,7 @@ func (m *QueryQueryResultRequest) Size() (n int) { return n } -func (m *QueryQueryResultResponse) Size() (n int) { +func (m *QueryRegisteredQueryResultResponse) Size() (n int) { if m == nil { return 0 } @@ -1295,7 +1400,26 @@ func (m *QueryQueryResultResponse) Size() (n int) { return n } -func (m *QueryLastRemoteHeightRequest) Size() (n int) { +func (m *Transaction) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Id != 0 { + n += 1 + sovQuery(uint64(m.Id)) + } + if m.Height != 0 { + n += 1 + sovQuery(uint64(m.Height)) + } + l = len(m.Data) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryLastRemoteHeight) Size() (n int) { if m == nil { return 0 } @@ -1887,7 +2011,7 @@ func (m *QueryRegisteredQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryQueryResultRequest) Unmarshal(dAtA []byte) error { +func (m *QueryRegisteredQueryResultRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1910,10 +2034,10 @@ func (m *QueryQueryResultRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryQueryResultRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryRegisteredQueryResultRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryQueryResultRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryRegisteredQueryResultRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1956,7 +2080,7 @@ func (m *QueryQueryResultRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryQueryResultResponse) Unmarshal(dAtA []byte) error { +func (m *QueryRegisteredQueryResultResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1979,10 +2103,10 @@ func (m *QueryQueryResultResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryQueryResultResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryRegisteredQueryResultResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryQueryResultResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryRegisteredQueryResultResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2042,7 +2166,129 @@ func (m *QueryQueryResultResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryLastRemoteHeightRequest) Unmarshal(dAtA []byte) error { +func (m *Transaction) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Transaction: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Transaction: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + } + m.Id = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Id |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Data = append(m.Data[:0], dAtA[iNdEx:postIndex]...) + if m.Data == nil { + m.Data = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryLastRemoteHeight) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2065,10 +2311,10 @@ func (m *QueryLastRemoteHeightRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryLastRemoteHeightRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryLastRemoteHeight: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryLastRemoteHeightRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryLastRemoteHeight: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/interchainqueries/types/query.pb.gw.go b/x/interchainqueries/types/query.pb.gw.go index c59d065af..8cbfcdc6f 100644 --- a/x/interchainqueries/types/query.pb.gw.go +++ b/x/interchainqueries/types/query.pb.gw.go @@ -128,7 +128,7 @@ var ( ) func request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryQueryResultRequest + var protoReq QueryRegisteredQueryResultRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -144,7 +144,7 @@ func request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshale } func local_request_Query_QueryResult_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryQueryResultRequest + var protoReq QueryRegisteredQueryResultRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -164,7 +164,7 @@ var ( ) func request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryLastRemoteHeightRequest + var protoReq QueryLastRemoteHeight var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -180,7 +180,7 @@ func request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Mar } func local_request_Query_LastRemoteHeight_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryLastRemoteHeightRequest + var protoReq QueryLastRemoteHeight var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { diff --git a/x/interchainqueries/types/tx.go b/x/interchainqueries/types/tx.go index d40da497f..7e1fbb766 100644 --- a/x/interchainqueries/types/tx.go +++ b/x/interchainqueries/types/tx.go @@ -134,9 +134,9 @@ func (msg MsgRegisterInterchainQuery) GetSigners() []sdk.AccAddress { //---------------------------------------------------------------- -var _ sdk.Msg = &MsgUpdateInterchainQuery{} +var _ sdk.Msg = &MsgUpdateInterchainQueryRequest{} -func (msg MsgUpdateInterchainQuery) Validate(params Params) error { +func (msg MsgUpdateInterchainQueryRequest) Validate(params Params) error { if msg.GetQueryId() == 0 { return errors.Wrap(ErrInvalidQueryID, "query_id cannot be empty or equal to 0") } @@ -179,11 +179,11 @@ func (msg MsgUpdateInterchainQuery) Validate(params Params) error { return nil } -func (msg MsgUpdateInterchainQuery) GetSignBytes() []byte { +func (msg MsgUpdateInterchainQueryRequest) GetSignBytes() []byte { return ModuleCdc.MustMarshalJSON(&msg) } -func (msg MsgUpdateInterchainQuery) GetSigners() []sdk.AccAddress { +func (msg MsgUpdateInterchainQueryRequest) GetSigners() []sdk.AccAddress { senderAddr, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { // should never happen as valid basic rejects invalid addresses panic(err.Error()) diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 1f10becdc..266884af2 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -600,25 +600,25 @@ func (m *MsgSubmitQueryResultResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSubmitQueryResultResponse proto.InternalMessageInfo // Request type for the Msg/RemoveInterchainQuery RPC method. -type MsgRemoveInterchainQuery struct { +type MsgRemoveInterchainQueryRequest struct { // The ID of the query to remove. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` // The signer of the message. Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"` } -func (m *MsgRemoveInterchainQuery) Reset() { *m = MsgRemoveInterchainQuery{} } -func (m *MsgRemoveInterchainQuery) String() string { return proto.CompactTextString(m) } -func (*MsgRemoveInterchainQuery) ProtoMessage() {} -func (*MsgRemoveInterchainQuery) Descriptor() ([]byte, []int) { +func (m *MsgRemoveInterchainQueryRequest) Reset() { *m = MsgRemoveInterchainQueryRequest{} } +func (m *MsgRemoveInterchainQueryRequest) String() string { return proto.CompactTextString(m) } +func (*MsgRemoveInterchainQueryRequest) ProtoMessage() {} +func (*MsgRemoveInterchainQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{8} } -func (m *MsgRemoveInterchainQuery) XXX_Unmarshal(b []byte) error { +func (m *MsgRemoveInterchainQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgRemoveInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgRemoveInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgRemoveInterchainQuery.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgRemoveInterchainQueryRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -628,26 +628,26 @@ func (m *MsgRemoveInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *MsgRemoveInterchainQuery) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRemoveInterchainQuery.Merge(m, src) +func (m *MsgRemoveInterchainQueryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRemoveInterchainQueryRequest.Merge(m, src) } -func (m *MsgRemoveInterchainQuery) XXX_Size() int { +func (m *MsgRemoveInterchainQueryRequest) XXX_Size() int { return m.Size() } -func (m *MsgRemoveInterchainQuery) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRemoveInterchainQuery.DiscardUnknown(m) +func (m *MsgRemoveInterchainQueryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRemoveInterchainQueryRequest.DiscardUnknown(m) } -var xxx_messageInfo_MsgRemoveInterchainQuery proto.InternalMessageInfo +var xxx_messageInfo_MsgRemoveInterchainQueryRequest proto.InternalMessageInfo -func (m *MsgRemoveInterchainQuery) GetQueryId() uint64 { +func (m *MsgRemoveInterchainQueryRequest) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -func (m *MsgRemoveInterchainQuery) GetSender() string { +func (m *MsgRemoveInterchainQueryRequest) GetSender() string { if m != nil { return m.Sender } @@ -692,7 +692,7 @@ func (m *MsgRemoveInterchainQueryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRemoveInterchainQueryResponse proto.InternalMessageInfo // Request type for the Msg/UpdateInterchainQuery RPC method. -type MsgUpdateInterchainQuery struct { +type MsgUpdateInterchainQueryRequest struct { // The ID of the query to update. QueryId uint64 `protobuf:"varint,1,opt,name=query_id,json=queryId,proto3" json:"query_id,omitempty"` // A new list of KV-storage keys for which to get values from the remote chain. Only applicable @@ -710,18 +710,18 @@ type MsgUpdateInterchainQuery struct { Sender string `protobuf:"bytes,5,opt,name=sender,proto3" json:"sender,omitempty"` } -func (m *MsgUpdateInterchainQuery) Reset() { *m = MsgUpdateInterchainQuery{} } -func (m *MsgUpdateInterchainQuery) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateInterchainQuery) ProtoMessage() {} -func (*MsgUpdateInterchainQuery) Descriptor() ([]byte, []int) { +func (m *MsgUpdateInterchainQueryRequest) Reset() { *m = MsgUpdateInterchainQueryRequest{} } +func (m *MsgUpdateInterchainQueryRequest) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateInterchainQueryRequest) ProtoMessage() {} +func (*MsgUpdateInterchainQueryRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d4793837a316491e, []int{10} } -func (m *MsgUpdateInterchainQuery) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateInterchainQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateInterchainQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateInterchainQuery.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateInterchainQueryRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -731,47 +731,47 @@ func (m *MsgUpdateInterchainQuery) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *MsgUpdateInterchainQuery) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateInterchainQuery.Merge(m, src) +func (m *MsgUpdateInterchainQueryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateInterchainQueryRequest.Merge(m, src) } -func (m *MsgUpdateInterchainQuery) XXX_Size() int { +func (m *MsgUpdateInterchainQueryRequest) XXX_Size() int { return m.Size() } -func (m *MsgUpdateInterchainQuery) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateInterchainQuery.DiscardUnknown(m) +func (m *MsgUpdateInterchainQueryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateInterchainQueryRequest.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateInterchainQuery proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateInterchainQueryRequest proto.InternalMessageInfo -func (m *MsgUpdateInterchainQuery) GetQueryId() uint64 { +func (m *MsgUpdateInterchainQueryRequest) GetQueryId() uint64 { if m != nil { return m.QueryId } return 0 } -func (m *MsgUpdateInterchainQuery) GetNewKeys() []*KVKey { +func (m *MsgUpdateInterchainQueryRequest) GetNewKeys() []*KVKey { if m != nil { return m.NewKeys } return nil } -func (m *MsgUpdateInterchainQuery) GetNewUpdatePeriod() uint64 { +func (m *MsgUpdateInterchainQueryRequest) GetNewUpdatePeriod() uint64 { if m != nil { return m.NewUpdatePeriod } return 0 } -func (m *MsgUpdateInterchainQuery) GetNewTransactionsFilter() string { +func (m *MsgUpdateInterchainQueryRequest) GetNewTransactionsFilter() string { if m != nil { return m.NewTransactionsFilter } return "" } -func (m *MsgUpdateInterchainQuery) GetSender() string { +func (m *MsgUpdateInterchainQueryRequest) GetSender() string { if m != nil { return m.Sender } @@ -916,9 +916,9 @@ func init() { proto.RegisterType((*Block)(nil), "neutron.interchainqueries.Block") proto.RegisterType((*TxValue)(nil), "neutron.interchainqueries.TxValue") proto.RegisterType((*MsgSubmitQueryResultResponse)(nil), "neutron.interchainqueries.MsgSubmitQueryResultResponse") - proto.RegisterType((*MsgRemoveInterchainQuery)(nil), "neutron.interchainqueries.MsgRemoveInterchainQuery") + proto.RegisterType((*MsgRemoveInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgRemoveInterchainQueryRequest") proto.RegisterType((*MsgRemoveInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgRemoveInterchainQueryResponse") - proto.RegisterType((*MsgUpdateInterchainQuery)(nil), "neutron.interchainqueries.MsgUpdateInterchainQuery") + proto.RegisterType((*MsgUpdateInterchainQueryRequest)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryRequest") proto.RegisterType((*MsgUpdateInterchainQueryResponse)(nil), "neutron.interchainqueries.MsgUpdateInterchainQueryResponse") proto.RegisterType((*MsgUpdateParams)(nil), "neutron.interchainqueries.MsgUpdateParams") proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.interchainqueries.MsgUpdateParamsResponse") @@ -929,81 +929,81 @@ func init() { } var fileDescriptor_d4793837a316491e = []byte{ - // 1169 bytes of a gzipped FileDescriptorProto + // 1170 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x4f, 0x1b, 0xc7, - 0x17, 0x67, 0x8d, 0x0d, 0xf8, 0x61, 0x20, 0xcc, 0x97, 0x7c, 0x31, 0x4e, 0x71, 0xc8, 0x56, 0x4d, - 0x10, 0x4a, 0x76, 0x15, 0x87, 0x50, 0x35, 0xa8, 0x3f, 0xa0, 0x6d, 0x54, 0x84, 0x50, 0xe9, 0x02, - 0x39, 0xe4, 0xb2, 0x5a, 0xef, 0x0e, 0xeb, 0x91, 0xd7, 0x33, 0xee, 0xee, 0xf8, 0xd7, 0xa1, 0x52, - 0xd5, 0x5b, 0x7b, 0x69, 0xfa, 0x47, 0x54, 0xaa, 0xd4, 0x0b, 0x87, 0x4a, 0xfd, 0x0b, 0x2a, 0xe5, - 0x18, 0xf5, 0xd4, 0x43, 0x55, 0x55, 0x70, 0xe0, 0xd8, 0x3f, 0xa0, 0x97, 0x6a, 0x66, 0x76, 0x8d, - 0x01, 0xdb, 0x84, 0x5c, 0x60, 0xdf, 0x7b, 0x9f, 0xf7, 0xe6, 0xf3, 0xde, 0xcc, 0x7b, 0xcf, 0xa0, - 0x53, 0xdc, 0xe0, 0x21, 0xa3, 0x26, 0xa1, 0x1c, 0x87, 0x6e, 0xc5, 0x21, 0xf4, 0xcb, 0x06, 0x0e, - 0x09, 0x8e, 0x4c, 0xde, 0x36, 0xea, 0x21, 0xe3, 0x0c, 0x2d, 0xc4, 0x18, 0xe3, 0x12, 0xa6, 0x30, - 0xeb, 0xd4, 0x08, 0x65, 0xa6, 0xfc, 0xab, 0xd0, 0x85, 0x79, 0x97, 0x45, 0x35, 0x16, 0x99, 0xb5, - 0xc8, 0x37, 0x9b, 0x0f, 0xc5, 0xbf, 0xd8, 0xb0, 0xa0, 0x0c, 0xb6, 0x94, 0x4c, 0x25, 0xc4, 0xa6, - 0x39, 0x9f, 0xf9, 0x4c, 0xe9, 0xc5, 0x57, 0xe2, 0xe0, 0x33, 0xe6, 0x07, 0xd8, 0x94, 0x52, 0xb9, - 0x71, 0x68, 0x3a, 0xb4, 0x13, 0x9b, 0xee, 0x0d, 0xa6, 0xed, 0x63, 0x8a, 0x23, 0x92, 0x44, 0xbe, - 0x3b, 0x18, 0x58, 0x77, 0x42, 0xa7, 0x96, 0xe0, 0x6e, 0x71, 0x4c, 0x3d, 0x1c, 0xd6, 0x08, 0xe5, - 0xa6, 0x53, 0x76, 0x89, 0xc9, 0x3b, 0x75, 0x9c, 0x18, 0x17, 0x7b, 0x8c, 0x6e, 0xd8, 0xa9, 0x73, - 0x26, 0x38, 0xb1, 0x43, 0x65, 0xd6, 0x7f, 0x48, 0x41, 0x61, 0x27, 0xf2, 0x2d, 0xec, 0x93, 0x88, - 0xe3, 0x70, 0xab, 0x7b, 0xd2, 0x17, 0x0d, 0x1c, 0x76, 0xd0, 0x22, 0x80, 0x38, 0xb2, 0x63, 0x8b, - 0x90, 0x79, 0x6d, 0x49, 0x5b, 0xce, 0x5a, 0x59, 0xa9, 0xd9, 0xef, 0xd4, 0x31, 0x5a, 0x85, 0x74, - 0x15, 0x77, 0xa2, 0x7c, 0x6a, 0x69, 0x74, 0x79, 0xb2, 0xb4, 0x64, 0x0c, 0x2c, 0xb6, 0xb1, 0xfd, - 0x6c, 0x1b, 0x77, 0x2c, 0x89, 0x46, 0x26, 0xfc, 0x8f, 0x87, 0x0e, 0x8d, 0x1c, 0x97, 0x13, 0x46, - 0x23, 0xfb, 0x90, 0x04, 0x1c, 0x87, 0xf9, 0x51, 0x19, 0x1d, 0xf5, 0x9a, 0x9e, 0x4a, 0x0b, 0x7a, - 0x1b, 0xa6, 0x5c, 0x46, 0x29, 0x96, 0x4a, 0x9b, 0x78, 0xf9, 0xb4, 0x84, 0xe6, 0xce, 0x94, 0x5b, - 0x9e, 0x00, 0x35, 0xea, 0x9e, 0xc3, 0xb1, 0x5d, 0xc7, 0x21, 0x61, 0x5e, 0x3e, 0xb3, 0xa4, 0x2d, - 0xa7, 0xad, 0x9c, 0x52, 0xee, 0x4a, 0x1d, 0xfa, 0x3f, 0x8c, 0x45, 0xb2, 0x1e, 0xf9, 0x31, 0x19, - 0x22, 0x96, 0x9e, 0x4c, 0x7e, 0x73, 0x7a, 0xb4, 0x12, 0x0b, 0xfa, 0x2a, 0xe8, 0x83, 0x4b, 0x62, - 0xe1, 0xa8, 0xce, 0x68, 0x84, 0xd1, 0x34, 0xa4, 0x88, 0x27, 0x4b, 0x92, 0xb6, 0x52, 0xc4, 0xd3, - 0x7f, 0xd5, 0x60, 0x6e, 0x27, 0xf2, 0xf7, 0x1a, 0xe5, 0x1a, 0xe1, 0x09, 0xb4, 0x11, 0x70, 0xb4, - 0x00, 0x13, 0xaa, 0x86, 0x5d, 0xf8, 0xb8, 0x94, 0xb7, 0x7a, 0xe9, 0xa4, 0x7a, 0xe9, 0xa0, 0xdb, - 0x90, 0x75, 0x03, 0x82, 0x29, 0x17, 0x3e, 0xb2, 0x2e, 0x9b, 0xa9, 0xbc, 0x66, 0x4d, 0x28, 0xe5, - 0x96, 0x87, 0x3e, 0x80, 0xb1, 0x50, 0x46, 0x97, 0xa5, 0x98, 0x2c, 0xdd, 0x1d, 0x52, 0xfa, 0x1e, - 0x2e, 0x56, 0xec, 0x75, 0x3e, 0xdf, 0x7f, 0x34, 0x98, 0xec, 0x25, 0xfc, 0x14, 0xa0, 0xda, 0xb4, - 0x15, 0x32, 0xca, 0x6b, 0xf2, 0x6e, 0xef, 0x0d, 0x39, 0x60, 0x8f, 0xb3, 0xd0, 0xf1, 0xf1, 0x33, - 0x27, 0x68, 0x60, 0x2b, 0x5b, 0x6d, 0xaa, 0x30, 0x11, 0x5a, 0x83, 0x4c, 0x39, 0x60, 0x6e, 0x55, - 0x26, 0x37, 0xfc, 0x79, 0x6c, 0x0a, 0x9c, 0xa5, 0xe0, 0xa2, 0x2a, 0x15, 0x4c, 0xfc, 0x0a, 0x97, - 0xa9, 0xa7, 0xad, 0x58, 0x42, 0x05, 0x98, 0x08, 0x71, 0x93, 0x44, 0x84, 0x51, 0x99, 0x76, 0xda, - 0xea, 0xca, 0xe8, 0x3e, 0x20, 0x27, 0x08, 0x58, 0xcb, 0xae, 0x36, 0x6d, 0xd7, 0x09, 0x82, 0xb2, - 0xe3, 0x56, 0x23, 0xf9, 0x04, 0x26, 0xac, 0x1b, 0xd2, 0xb2, 0xdd, 0xfc, 0x38, 0xd1, 0xeb, 0x2f, - 0x34, 0xc8, 0xf5, 0xb2, 0x46, 0xef, 0xc0, 0x74, 0xa4, 0x64, 0xbb, 0x1e, 0xe2, 0x43, 0xd2, 0x8e, - 0xdf, 0xfa, 0x54, 0xac, 0xdd, 0x95, 0x4a, 0x74, 0x03, 0x46, 0xab, 0xb8, 0x23, 0xf3, 0xc9, 0x59, - 0xe2, 0x13, 0xcd, 0x41, 0xa6, 0x29, 0x22, 0x48, 0xaa, 0x39, 0x4b, 0x09, 0xe8, 0x21, 0x64, 0x76, - 0x45, 0x93, 0xc5, 0xb7, 0x73, 0xcb, 0x38, 0x6b, 0x42, 0x43, 0x35, 0xa1, 0x21, 0xed, 0x9f, 0xd7, - 0x23, 0x4b, 0x21, 0xf5, 0x9f, 0x35, 0xc8, 0xc8, 0x2a, 0xa0, 0x8f, 0x60, 0x96, 0xe2, 0x36, 0xb7, - 0x65, 0x31, 0xec, 0x0a, 0x76, 0xc4, 0xfb, 0xd0, 0x64, 0xa0, 0x39, 0x43, 0x8d, 0x15, 0x23, 0x19, - 0x2b, 0xc6, 0x06, 0xed, 0x58, 0x33, 0x02, 0x2e, 0x7d, 0x3f, 0x93, 0x60, 0x74, 0x5f, 0x14, 0xd0, - 0x49, 0x9e, 0xd5, 0x20, 0xb7, 0x18, 0x83, 0x4a, 0x90, 0xe2, 0x6d, 0xc9, 0x7f, 0xb2, 0xa4, 0x0f, - 0xb9, 0xa3, 0xfd, 0xb6, 0xba, 0xe1, 0x14, 0x6f, 0xeb, 0x7f, 0x6a, 0x30, 0x1e, 0xcb, 0xe8, 0x3d, - 0x71, 0x2d, 0xaa, 0x29, 0x62, 0x9a, 0x8b, 0xbd, 0xf9, 0x8a, 0x89, 0x64, 0x7c, 0xda, 0xc6, 0xee, - 0x7e, 0x3b, 0x7e, 0x84, 0x5d, 0x38, 0xfa, 0x10, 0xa6, 0x3d, 0x1c, 0x90, 0xa6, 0xe8, 0x0e, 0x39, - 0x95, 0x62, 0xc2, 0xf9, 0x41, 0x05, 0xb3, 0xa6, 0x12, 0xbc, 0x14, 0xd1, 0x06, 0xcc, 0x10, 0xea, - 0x06, 0x0d, 0xf1, 0x06, 0xe2, 0x08, 0xa3, 0x57, 0x44, 0x98, 0xee, 0x3a, 0xa8, 0x10, 0x08, 0xd2, - 0x9e, 0xc3, 0x1d, 0x79, 0x55, 0x39, 0x4b, 0x7e, 0xeb, 0x45, 0x78, 0xab, 0x5f, 0x2b, 0x27, 0xbd, - 0xaf, 0x3f, 0x87, 0xbc, 0x9c, 0x10, 0x35, 0xd6, 0xc4, 0x17, 0x47, 0xe6, 0xf5, 0xdb, 0xfd, 0x7c, - 0x37, 0xea, 0xb0, 0x34, 0x28, 0x76, 0xf7, 0xfc, 0x7f, 0x35, 0x49, 0xe0, 0x40, 0x8e, 0xb6, 0x6b, - 0x10, 0x58, 0x87, 0x09, 0x8a, 0x5b, 0xf6, 0xb5, 0x66, 0xf6, 0x38, 0xc5, 0xad, 0x6d, 0x31, 0xb6, - 0x57, 0xc4, 0xbb, 0x6c, 0xd9, 0xe7, 0x87, 0xac, 0xea, 0xd0, 0x19, 0x8a, 0x5b, 0x07, 0xbd, 0x73, - 0x76, 0x0d, 0xe6, 0x05, 0xb6, 0xdf, 0x98, 0x57, 0xb3, 0xfb, 0x26, 0xc5, 0xad, 0xfd, 0xcb, 0x93, - 0xfe, 0xac, 0x42, 0x99, 0xab, 0x2a, 0xd4, 0x37, 0xf9, 0x6e, 0x85, 0x7e, 0xd3, 0x60, 0xa6, 0x0b, - 0xda, 0x95, 0xdb, 0x12, 0xad, 0x41, 0xd6, 0x69, 0xf0, 0x0a, 0x0b, 0x09, 0xef, 0xa8, 0xfe, 0xde, - 0xcc, 0xff, 0xfe, 0xcb, 0x83, 0xb9, 0x78, 0x9d, 0x6f, 0x78, 0x5e, 0x88, 0xa3, 0x68, 0x8f, 0x87, - 0x84, 0xfa, 0xd6, 0x19, 0x14, 0x7d, 0x02, 0x63, 0x6a, 0xdf, 0xc6, 0xaf, 0xf3, 0xce, 0x90, 0x9a, - 0xa9, 0xa3, 0x36, 0xb3, 0x2f, 0xff, 0xba, 0x3d, 0xf2, 0xd3, 0xe9, 0xd1, 0x8a, 0x66, 0xc5, 0xbe, - 0x4f, 0x56, 0x45, 0x0a, 0x67, 0x51, 0xbf, 0x3b, 0x3d, 0x5a, 0xb9, 0x73, 0x79, 0xb1, 0x5f, 0xe0, - 0xac, 0x2f, 0xc0, 0xfc, 0x05, 0x55, 0x92, 0x62, 0xe9, 0xc7, 0x0c, 0x8c, 0xee, 0x44, 0x3e, 0xfa, - 0x5e, 0x83, 0xf9, 0x41, 0xfb, 0xfb, 0xf1, 0x10, 0xaa, 0x83, 0x77, 0x5c, 0xe1, 0xfd, 0x37, 0x72, - 0xeb, 0xae, 0xc6, 0xaf, 0x60, 0xf6, 0xf2, 0x1a, 0x34, 0x87, 0xc7, 0xbc, 0xe4, 0x50, 0x78, 0xf7, - 0x9a, 0x0e, 0xdd, 0xe3, 0xbf, 0xd5, 0xe0, 0x66, 0xff, 0xde, 0x7c, 0x74, 0x55, 0x5e, 0x7d, 0x9c, - 0x0a, 0xeb, 0x6f, 0xe0, 0x74, 0x8e, 0x4b, 0xff, 0x36, 0xbd, 0x82, 0x4b, 0x5f, 0xa7, 0xab, 0xb8, - 0x0c, 0xed, 0x09, 0x44, 0x21, 0x77, 0xae, 0x1f, 0x56, 0x5e, 0x27, 0x98, 0xc2, 0x16, 0x4a, 0xaf, - 0x8f, 0x4d, 0xce, 0x2b, 0x64, 0xbe, 0x16, 0x0d, 0xb0, 0x79, 0xf0, 0xf2, 0xb8, 0xa8, 0xbd, 0x3a, - 0x2e, 0x6a, 0x7f, 0x1f, 0x17, 0xb5, 0x17, 0x27, 0xc5, 0x91, 0x57, 0x27, 0xc5, 0x91, 0x3f, 0x4e, - 0x8a, 0x23, 0xcf, 0xd7, 0x7d, 0xc2, 0x2b, 0x8d, 0xb2, 0xe1, 0xb2, 0x9a, 0x19, 0x87, 0x7f, 0xc0, - 0x42, 0x3f, 0xf9, 0x36, 0x9b, 0x8f, 0xcd, 0x76, 0xbf, 0x1f, 0xf7, 0xe2, 0xe7, 0x6d, 0x79, 0x4c, - 0x2e, 0xb3, 0x47, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x36, 0x3d, 0xe1, 0x10, 0x06, 0x0c, 0x00, - 0x00, + 0x17, 0x67, 0x8d, 0x4d, 0xf0, 0xe0, 0x40, 0x32, 0x5f, 0xf2, 0xc5, 0x38, 0x8d, 0x43, 0xb6, 0x6a, + 0x12, 0xa1, 0x64, 0x57, 0x71, 0x09, 0x55, 0x41, 0xfd, 0x01, 0x6d, 0xa3, 0x22, 0x84, 0x4a, 0x17, + 0xc8, 0xa1, 0x97, 0xd5, 0x7a, 0x77, 0x58, 0x8f, 0xbc, 0x9e, 0x71, 0x76, 0x66, 0xfd, 0xe3, 0x50, + 0xa9, 0xca, 0xb1, 0x97, 0xd2, 0xff, 0xa2, 0x52, 0x2f, 0x48, 0xad, 0xd4, 0xbf, 0xa0, 0x52, 0x8e, + 0x51, 0x4f, 0x3d, 0x54, 0x55, 0x05, 0x07, 0x8e, 0xfd, 0x17, 0xaa, 0xf9, 0xb1, 0xc6, 0xc4, 0xd8, + 0x04, 0x2e, 0xb0, 0xef, 0xbd, 0xcf, 0x7b, 0xf3, 0x99, 0x37, 0xef, 0x87, 0x81, 0x49, 0x50, 0xc2, + 0x63, 0x4a, 0x6c, 0x4c, 0x38, 0x8a, 0xfd, 0x9a, 0x87, 0xc9, 0x8b, 0x04, 0xc5, 0x18, 0x31, 0x9b, + 0x77, 0xac, 0x66, 0x4c, 0x39, 0x85, 0xf3, 0x1a, 0x63, 0x0d, 0x60, 0x4a, 0x37, 0xbd, 0x06, 0x26, + 0xd4, 0x96, 0x7f, 0x15, 0xba, 0x34, 0xe7, 0x53, 0xd6, 0xa0, 0xcc, 0x6e, 0xb0, 0xd0, 0x6e, 0x3d, + 0x11, 0xff, 0xb4, 0x61, 0x5e, 0x19, 0x5c, 0x29, 0xd9, 0x4a, 0xd0, 0xa6, 0xd9, 0x90, 0x86, 0x54, + 0xe9, 0xc5, 0x57, 0xea, 0x10, 0x52, 0x1a, 0x46, 0xc8, 0x96, 0x52, 0x35, 0xd9, 0xb7, 0x3d, 0xd2, + 0xd5, 0xa6, 0x07, 0xc3, 0x69, 0x87, 0x88, 0x20, 0x86, 0xd3, 0xc8, 0xf7, 0x87, 0x03, 0x9b, 0x5e, + 0xec, 0x35, 0x52, 0xdc, 0x6d, 0x8e, 0x48, 0x80, 0xe2, 0x06, 0x26, 0xdc, 0xf6, 0xaa, 0x3e, 0xb6, + 0x79, 0xb7, 0x89, 0x52, 0xe3, 0x9d, 0x3e, 0xa3, 0x1f, 0x77, 0x9b, 0x9c, 0x0a, 0x4e, 0x74, 0x5f, + 0x99, 0xcd, 0x1f, 0x33, 0xa0, 0xb4, 0xc5, 0x42, 0x07, 0x85, 0x98, 0x71, 0x14, 0x6f, 0xf4, 0x4e, + 0xfa, 0x3a, 0x41, 0x71, 0x17, 0xde, 0x01, 0x40, 0x1c, 0xd9, 0x75, 0x45, 0xc8, 0xa2, 0xb1, 0x60, + 0x3c, 0xcc, 0x3b, 0x79, 0xa9, 0xd9, 0xed, 0x36, 0x11, 0x5c, 0x02, 0xd9, 0x3a, 0xea, 0xb2, 0x62, + 0x66, 0x61, 0xfc, 0xe1, 0x54, 0x65, 0xc1, 0x1a, 0x9a, 0x6c, 0x6b, 0xf3, 0xf9, 0x26, 0xea, 0x3a, + 0x12, 0x0d, 0x6d, 0xf0, 0x3f, 0x1e, 0x7b, 0x84, 0x79, 0x3e, 0xc7, 0x94, 0x30, 0x77, 0x1f, 0x47, + 0x1c, 0xc5, 0xc5, 0x71, 0x19, 0x1d, 0xf6, 0x9b, 0x9e, 0x49, 0x0b, 0x7c, 0x17, 0x5c, 0xf7, 0x29, + 0x21, 0x48, 0x2a, 0x5d, 0x1c, 0x14, 0xb3, 0x12, 0x5a, 0x38, 0x55, 0x6e, 0x04, 0x02, 0x94, 0x34, + 0x03, 0x8f, 0x23, 0xb7, 0x89, 0x62, 0x4c, 0x83, 0x62, 0x6e, 0xc1, 0x78, 0x98, 0x75, 0x0a, 0x4a, + 0xb9, 0x2d, 0x75, 0xf0, 0xff, 0x60, 0x82, 0xc9, 0x7c, 0x14, 0x27, 0x64, 0x08, 0x2d, 0xad, 0x4c, + 0xbd, 0x3c, 0x39, 0x5c, 0xd4, 0x82, 0xb9, 0x04, 0xcc, 0xe1, 0x29, 0x71, 0x10, 0x6b, 0x52, 0xc2, + 0x10, 0x9c, 0x06, 0x19, 0x1c, 0xc8, 0x94, 0x64, 0x9d, 0x0c, 0x0e, 0xcc, 0xdf, 0x0c, 0x30, 0xbb, + 0xc5, 0xc2, 0x9d, 0xa4, 0xda, 0xc0, 0x3c, 0x85, 0x26, 0x11, 0x87, 0xf3, 0x60, 0x52, 0xe5, 0xb0, + 0x07, 0xbf, 0x26, 0xe5, 0x8d, 0x7e, 0x3a, 0x99, 0x7e, 0x3a, 0xf0, 0x2e, 0xc8, 0xfb, 0x11, 0x46, + 0x84, 0x0b, 0x1f, 0x99, 0x97, 0xf5, 0x4c, 0xd1, 0x70, 0x26, 0x95, 0x72, 0x23, 0x80, 0x1f, 0x83, + 0x89, 0x58, 0x46, 0x97, 0xa9, 0x98, 0xaa, 0xdc, 0x1f, 0x91, 0xfa, 0x3e, 0x2e, 0x8e, 0xf6, 0x3a, + 0x7b, 0xdf, 0x7f, 0x0d, 0x30, 0xd5, 0x4f, 0xf8, 0x19, 0x00, 0xf5, 0x96, 0xab, 0x90, 0xac, 0x68, + 0xc8, 0xb7, 0x7d, 0x30, 0xe2, 0x80, 0x1d, 0x4e, 0x63, 0x2f, 0x44, 0xcf, 0xbd, 0x28, 0x41, 0x4e, + 0xbe, 0xde, 0x52, 0x61, 0x18, 0x5c, 0x06, 0xb9, 0x6a, 0x44, 0xfd, 0xba, 0xbc, 0xdc, 0xe8, 0xf2, + 0x58, 0x17, 0x38, 0x47, 0xc1, 0x45, 0x56, 0x6a, 0x08, 0x87, 0x35, 0x2e, 0xaf, 0x9e, 0x75, 0xb4, + 0x04, 0x4b, 0x60, 0x32, 0x46, 0x2d, 0xcc, 0x30, 0x25, 0xf2, 0xda, 0x59, 0xa7, 0x27, 0xc3, 0x47, + 0x00, 0x7a, 0x51, 0x44, 0xdb, 0x6e, 0xbd, 0xe5, 0xfa, 0x5e, 0x14, 0x55, 0x3d, 0xbf, 0xce, 0x64, + 0x09, 0x4c, 0x3a, 0x37, 0xa4, 0x65, 0xb3, 0xf5, 0x59, 0xaa, 0x37, 0x0f, 0x0c, 0x50, 0xe8, 0x67, + 0x0d, 0xdf, 0x03, 0xd3, 0x4c, 0xc9, 0x6e, 0x33, 0x46, 0xfb, 0xb8, 0xa3, 0x6b, 0xfd, 0xba, 0xd6, + 0x6e, 0x4b, 0x25, 0xbc, 0x01, 0xc6, 0xeb, 0xa8, 0x2b, 0xef, 0x53, 0x70, 0xc4, 0x27, 0x9c, 0x05, + 0xb9, 0x96, 0x88, 0x20, 0xa9, 0x16, 0x1c, 0x25, 0xc0, 0x27, 0x20, 0xb7, 0x2d, 0x9a, 0x4c, 0xbf, + 0xce, 0x6d, 0xeb, 0xb4, 0x09, 0x2d, 0xd5, 0x84, 0x96, 0xb4, 0x7f, 0xd5, 0x64, 0x8e, 0x42, 0x9a, + 0x3f, 0x1b, 0x20, 0x27, 0xb3, 0x00, 0x3f, 0x05, 0x37, 0x09, 0xea, 0x70, 0x57, 0x26, 0xc3, 0xad, + 0x21, 0x4f, 0xd4, 0x87, 0x21, 0x03, 0xcd, 0x5a, 0x6a, 0xac, 0x58, 0xe9, 0x58, 0xb1, 0xd6, 0x48, + 0xd7, 0x99, 0x11, 0x70, 0xe9, 0xfb, 0xa5, 0x04, 0xc3, 0x47, 0x22, 0x81, 0x5e, 0x5a, 0x56, 0xc3, + 0xdc, 0x34, 0x06, 0x56, 0x40, 0x86, 0x77, 0x24, 0xff, 0xa9, 0x8a, 0x39, 0xe2, 0x8d, 0x76, 0x3b, + 0xea, 0x85, 0x33, 0xbc, 0x63, 0xfe, 0x65, 0x80, 0x6b, 0x5a, 0x86, 0x1f, 0x8a, 0x67, 0x51, 0x4d, + 0xa1, 0x69, 0xde, 0xe9, 0xbf, 0xaf, 0x98, 0x48, 0xd6, 0x17, 0x1d, 0xe4, 0xef, 0x76, 0x74, 0x11, + 0xf6, 0xe0, 0xf0, 0x13, 0x30, 0x1d, 0xa0, 0x08, 0xb7, 0x44, 0x77, 0xc8, 0xa9, 0xa4, 0x09, 0x17, + 0x87, 0x25, 0xcc, 0xb9, 0x9e, 0xe2, 0xa5, 0x08, 0xd7, 0xc0, 0x0c, 0x26, 0x7e, 0x94, 0x88, 0x1a, + 0xd0, 0x11, 0xc6, 0x2f, 0x88, 0x30, 0xdd, 0x73, 0x50, 0x21, 0x20, 0xc8, 0x06, 0x1e, 0xf7, 0xe4, + 0x53, 0x15, 0x1c, 0xf9, 0x6d, 0x96, 0xc1, 0x3b, 0xe7, 0xb5, 0x72, 0xda, 0xfb, 0xa6, 0x07, 0xee, + 0xca, 0x09, 0xd1, 0xa0, 0x2d, 0x34, 0x30, 0x1f, 0x5e, 0x24, 0x88, 0x5d, 0xa5, 0xeb, 0xcf, 0x36, + 0xa5, 0x09, 0x16, 0x86, 0x1f, 0xa1, 0x69, 0xbc, 0xcc, 0x48, 0x1e, 0x7b, 0x72, 0xc2, 0x5d, 0x9e, + 0xc7, 0x2a, 0x98, 0x24, 0xa8, 0xed, 0x5e, 0x6a, 0x82, 0x5f, 0x23, 0xa8, 0xbd, 0x29, 0x86, 0xf8, + 0xa2, 0xa8, 0xd2, 0xb6, 0x7b, 0x76, 0xe4, 0xaa, 0x7e, 0x9d, 0x21, 0xa8, 0xbd, 0xd7, 0x3f, 0x75, + 0x97, 0xc1, 0x9c, 0xc0, 0x9e, 0x37, 0xf4, 0xd5, 0x24, 0xbf, 0x45, 0x50, 0x7b, 0x77, 0x70, 0xee, + 0x9f, 0x26, 0x2a, 0x77, 0x51, 0xa2, 0x86, 0xe4, 0x40, 0x27, 0xea, 0x77, 0x03, 0xcc, 0xf4, 0x40, + 0xdb, 0x72, 0x77, 0xc2, 0x65, 0x90, 0xf7, 0x12, 0x5e, 0xa3, 0x31, 0xe6, 0x5d, 0xd5, 0xed, 0xeb, + 0xc5, 0x3f, 0x7e, 0x7d, 0x3c, 0xab, 0x97, 0xfb, 0x5a, 0x10, 0xc4, 0x88, 0xb1, 0x1d, 0x1e, 0x63, + 0x12, 0x3a, 0xa7, 0x50, 0xf8, 0x39, 0x98, 0x50, 0xdb, 0x57, 0xd7, 0xea, 0xbd, 0x11, 0x39, 0x53, + 0x47, 0xad, 0xe7, 0x5f, 0xfd, 0x7d, 0x77, 0xec, 0xa7, 0x93, 0xc3, 0x45, 0xc3, 0xd1, 0xbe, 0x2b, + 0x4b, 0xe2, 0x0a, 0xa7, 0x51, 0xbf, 0x3f, 0x39, 0x5c, 0xbc, 0x37, 0xb8, 0xe6, 0xdf, 0xe0, 0x6c, + 0xce, 0x83, 0xb9, 0x37, 0x54, 0xe9, 0x15, 0x2b, 0xbf, 0xe4, 0xc0, 0xf8, 0x16, 0x0b, 0xe1, 0x0f, + 0x06, 0x98, 0x1b, 0xb6, 0xcd, 0x9f, 0x8e, 0xa0, 0x3a, 0x7c, 0xe3, 0x95, 0x3e, 0xba, 0x92, 0x5b, + 0x6f, 0x51, 0x7e, 0x0b, 0x6e, 0x0e, 0x2e, 0x45, 0x7b, 0x74, 0xcc, 0x01, 0x87, 0xd2, 0x07, 0x97, + 0x74, 0xe8, 0x1d, 0x7f, 0x60, 0x80, 0x5b, 0xe7, 0xb6, 0x11, 0x5c, 0xb9, 0xe8, 0x5e, 0xc3, 0xdb, + 0xbb, 0xb4, 0x7a, 0x25, 0xdf, 0x3e, 0x4a, 0xe7, 0x16, 0xec, 0x45, 0x94, 0x46, 0x75, 0xfa, 0x45, + 0x94, 0x46, 0x76, 0x08, 0x24, 0xa0, 0x70, 0xa6, 0x3b, 0x16, 0xdf, 0x26, 0x98, 0xc2, 0x96, 0x2a, + 0x6f, 0x8f, 0x4d, 0xcf, 0x2b, 0xe5, 0xbe, 0x13, 0xed, 0xb0, 0xbe, 0xf7, 0xea, 0xa8, 0x6c, 0xbc, + 0x3e, 0x2a, 0x1b, 0xff, 0x1c, 0x95, 0x8d, 0x83, 0xe3, 0xf2, 0xd8, 0xeb, 0xe3, 0xf2, 0xd8, 0x9f, + 0xc7, 0xe5, 0xb1, 0x6f, 0x56, 0x43, 0xcc, 0x6b, 0x49, 0xd5, 0xf2, 0x69, 0xc3, 0xd6, 0xe1, 0x1f, + 0xd3, 0x38, 0x4c, 0xbf, 0xed, 0xd6, 0x53, 0xbb, 0x73, 0xde, 0x0f, 0x7f, 0xf1, 0xd3, 0xb7, 0x3a, + 0x21, 0x17, 0xdd, 0xfb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xaf, 0xe2, 0x7e, 0x22, 0x0c, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1034,9 +1034,9 @@ type MsgClient interface { // Removes a given Interchain Query and its results from the module. Can be removed only by the // owner of the query during the query's submit timeout, and by anyone after the query has been // timed out. The query deposit is returned to the caller on a success call. - RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQuery, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) + RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. - UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQuery, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) + UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) // Updates params of the interchainqueries module. Only callable by the module's authority. UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } @@ -1067,7 +1067,7 @@ func (c *msgClient) SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryRes return out, nil } -func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQuery, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) { +func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) { out := new(MsgRemoveInterchainQueryResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/RemoveInterchainQuery", in, out, opts...) if err != nil { @@ -1076,7 +1076,7 @@ func (c *msgClient) RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInte return out, nil } -func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQuery, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) { +func (c *msgClient) UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) { out := new(MsgUpdateInterchainQueryResponse) err := c.cc.Invoke(ctx, "/neutron.interchainqueries.Msg/UpdateInterchainQuery", in, out, opts...) if err != nil { @@ -1112,9 +1112,9 @@ type MsgServer interface { // Removes a given Interchain Query and its results from the module. Can be removed only by the // owner of the query during the query's submit timeout, and by anyone after the query has been // timed out. The query deposit is returned to the caller on a success call. - RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQuery) (*MsgRemoveInterchainQueryResponse, error) + RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. - UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQuery) (*MsgUpdateInterchainQueryResponse, error) + UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) // Updates params of the interchainqueries module. Only callable by the module's authority. UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } @@ -1129,10 +1129,10 @@ func (*UnimplementedMsgServer) RegisterInterchainQuery(ctx context.Context, req func (*UnimplementedMsgServer) SubmitQueryResult(ctx context.Context, req *MsgSubmitQueryResult) (*MsgSubmitQueryResultResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitQueryResult not implemented") } -func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *MsgRemoveInterchainQuery) (*MsgRemoveInterchainQueryResponse, error) { +func (*UnimplementedMsgServer) RemoveInterchainQuery(ctx context.Context, req *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveInterchainQuery not implemented") } -func (*UnimplementedMsgServer) UpdateInterchainQuery(ctx context.Context, req *MsgUpdateInterchainQuery) (*MsgUpdateInterchainQueryResponse, error) { +func (*UnimplementedMsgServer) UpdateInterchainQuery(ctx context.Context, req *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateInterchainQuery not implemented") } func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { @@ -1180,7 +1180,7 @@ func _Msg_SubmitQueryResult_Handler(srv interface{}, ctx context.Context, dec fu } func _Msg_RemoveInterchainQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRemoveInterchainQuery) + in := new(MsgRemoveInterchainQueryRequest) if err := dec(in); err != nil { return nil, err } @@ -1192,13 +1192,13 @@ func _Msg_RemoveInterchainQuery_Handler(srv interface{}, ctx context.Context, de FullMethod: "/neutron.interchainqueries.Msg/RemoveInterchainQuery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).RemoveInterchainQuery(ctx, req.(*MsgRemoveInterchainQuery)) + return srv.(MsgServer).RemoveInterchainQuery(ctx, req.(*MsgRemoveInterchainQueryRequest)) } return interceptor(ctx, in, info, handler) } func _Msg_UpdateInterchainQuery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateInterchainQuery) + in := new(MsgUpdateInterchainQueryRequest) if err := dec(in); err != nil { return nil, err } @@ -1210,7 +1210,7 @@ func _Msg_UpdateInterchainQuery_Handler(srv interface{}, ctx context.Context, de FullMethod: "/neutron.interchainqueries.Msg/UpdateInterchainQuery", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateInterchainQuery(ctx, req.(*MsgUpdateInterchainQuery)) + return srv.(MsgServer).UpdateInterchainQuery(ctx, req.(*MsgUpdateInterchainQueryRequest)) } return interceptor(ctx, in, info, handler) } @@ -1687,7 +1687,7 @@ func (m *MsgSubmitQueryResultResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *MsgRemoveInterchainQuery) Marshal() (dAtA []byte, err error) { +func (m *MsgRemoveInterchainQueryRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1697,12 +1697,12 @@ func (m *MsgRemoveInterchainQuery) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRemoveInterchainQuery) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgRemoveInterchainQueryRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRemoveInterchainQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgRemoveInterchainQueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1745,7 +1745,7 @@ func (m *MsgRemoveInterchainQueryResponse) MarshalToSizedBuffer(dAtA []byte) (in return len(dAtA) - i, nil } -func (m *MsgUpdateInterchainQuery) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateInterchainQueryRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1755,12 +1755,12 @@ func (m *MsgUpdateInterchainQuery) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateInterchainQuery) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateInterchainQueryRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateInterchainQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateInterchainQueryRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2081,7 +2081,7 @@ func (m *MsgSubmitQueryResultResponse) Size() (n int) { return n } -func (m *MsgRemoveInterchainQuery) Size() (n int) { +func (m *MsgRemoveInterchainQueryRequest) Size() (n int) { if m == nil { return 0 } @@ -2106,7 +2106,7 @@ func (m *MsgRemoveInterchainQueryResponse) Size() (n int) { return n } -func (m *MsgUpdateInterchainQuery) Size() (n int) { +func (m *MsgUpdateInterchainQueryRequest) Size() (n int) { if m == nil { return 0 } @@ -3407,7 +3407,7 @@ func (m *MsgSubmitQueryResultResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRemoveInterchainQuery) Unmarshal(dAtA []byte) error { +func (m *MsgRemoveInterchainQueryRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3430,10 +3430,10 @@ func (m *MsgRemoveInterchainQuery) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRemoveInterchainQuery: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRemoveInterchainQueryRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRemoveInterchainQuery: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRemoveInterchainQueryRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3558,7 +3558,7 @@ func (m *MsgRemoveInterchainQueryResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateInterchainQuery) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateInterchainQueryRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3581,10 +3581,10 @@ func (m *MsgUpdateInterchainQuery) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateInterchainQuery: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateInterchainQueryRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateInterchainQuery: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateInterchainQueryRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/interchainqueries/types/tx_test.go b/x/interchainqueries/types/tx_test.go index f39fafff6..0addf3d3b 100644 --- a/x/interchainqueries/types/tx_test.go +++ b/x/interchainqueries/types/tx_test.go @@ -49,9 +49,8 @@ func TestMsgSubmitQueryResultGetSigners(t *testing.T) { "valid_signer", func() sdktypes.LegacyMsg { return &iqtypes.MsgSubmitQueryResult{ - QueryId: 1, - Sender: TestAddress, - ClientId: "client-id", + QueryId: 1, + Sender: TestAddress, Result: &iqtypes.QueryResult{ KvResults: []*iqtypes.StorageValue{{ Key: []byte{10}, @@ -89,7 +88,7 @@ func TestMsgUpdateQueryGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgUpdateInterchainQuery{ + return &iqtypes.MsgUpdateInterchainQueryRequest{ Sender: TestAddress, } }, @@ -111,7 +110,7 @@ func TestMsgRemoveQueryGetSigners(t *testing.T) { { "valid_signer", func() sdktypes.LegacyMsg { - return &iqtypes.MsgRemoveInterchainQuery{ + return &iqtypes.MsgRemoveInterchainQueryRequest{ Sender: TestAddress, } }, From c359219049e1820b0789bba43fcf3fd8a0b05c2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 18:44:12 +0000 Subject: [PATCH 08/18] Bump cosmossdk.io/log from 1.4.1 to 1.5.0 Bumps [cosmossdk.io/log](https://github.com/cosmos/cosmos-sdk) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/cosmos/cosmos-sdk/releases) - [Changelog](https://github.com/cosmos/cosmos-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/cosmos/cosmos-sdk/compare/log/v1.4.1...log/v1.5.0) --- updated-dependencies: - dependency-name: cosmossdk.io/log dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 9 ++++++++- go.sum | 21 +++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 550853bd4..772db222c 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( cosmossdk.io/client/v2 v2.0.0-beta.4 cosmossdk.io/core v0.11.1 cosmossdk.io/errors v1.0.1 - cosmossdk.io/log v1.4.1 + cosmossdk.io/log v1.5.0 cosmossdk.io/math v1.4.0 cosmossdk.io/store v1.1.1 cosmossdk.io/x/evidence v0.1.1 @@ -74,9 +74,13 @@ require ( github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/bits-and-blooms/bitset v1.13.0 // indirect + github.com/bytedance/sonic v1.12.3 // indirect + github.com/bytedance/sonic/loader v0.2.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chzyer/readline v1.5.1 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/cockroachdb/errors v1.11.3 // indirect github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect @@ -148,6 +152,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.9 // indirect @@ -185,6 +190,7 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ulikunitz/xz v0.5.11 // indirect github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect @@ -198,6 +204,7 @@ require ( go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect + golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect golang.org/x/crypto v0.28.0 // indirect golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect diff --git a/go.sum b/go.sum index c38fdc06a..9d72656d4 100644 --- a/go.sum +++ b/go.sum @@ -198,8 +198,8 @@ cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8= cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= -cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= -cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= +cosmossdk.io/log v1.5.0 h1:dVdzPJW9kMrnAYyMf1duqacoidB9uZIl+7c6z0mnq0g= +cosmossdk.io/log v1.5.0/go.mod h1:Tr46PUJjiUthlwQ+hxYtUtPn4D/oCZXAkYevBeh5+FI= cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= cosmossdk.io/store v1.1.1 h1:NA3PioJtWDVU7cHHeyvdva5J/ggyLDkyH0hGHl2804Y= @@ -281,6 +281,11 @@ github.com/btcsuite/btcd/btcutil v1.1.6 h1:zFL2+c3Lb9gEgqKNzowKUPQNb8jV7v5Oaodi/ github.com/btcsuite/btcd/btcutil v1.1.6/go.mod h1:9dFymx8HpuLqBnsPELrImQeTQfKBQqzqGbbV3jK55aE= github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= +github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU= +github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM= +github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -306,6 +311,10 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -746,6 +755,9 @@ github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -1019,6 +1031,8 @@ github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI= github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= @@ -1090,6 +1104,8 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -1715,6 +1731,7 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From eb2ec6012c7a6b653b5c94f6a432fb65e394f820 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Mon, 25 Nov 2024 15:53:44 +0300 Subject: [PATCH 09/18] improve grammar in ICQ docs --- proto/neutron/interchainqueries/query.proto | 14 ++- proto/neutron/interchainqueries/tx.proto | 32 ++--- x/contractmanager/types/sudo.go | 25 ++-- x/interchainqueries/types/query.pb.go | 127 ++++++++++---------- x/interchainqueries/types/tx.pb.go | 64 +++++----- 5 files changed, 136 insertions(+), 126 deletions(-) diff --git a/proto/neutron/interchainqueries/query.proto b/proto/neutron/interchainqueries/query.proto index 2829badc8..31558f28e 100644 --- a/proto/neutron/interchainqueries/query.proto +++ b/proto/neutron/interchainqueries/query.proto @@ -12,24 +12,26 @@ option go_package = "github.com/neutron-org/neutron/v5/x/interchainqueries/types // Defines the Query interface of the module. service Query { - // Queries the current parameters of the module. + // Fetches the current parameters of the interchainqueries module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { option (google.api.http).get = "/neutron/interchainqueries/params"; } - // Queries all the registered Interchain Queries in the module with filtration by owner and/or - // connection ID. + // Retrieves all registered Interchain Queries in the module, with optional filtering by owner + // and/or connection ID. rpc RegisteredQueries(QueryRegisteredQueriesRequest) returns (QueryRegisteredQueriesResponse) { option (google.api.http).get = "/neutron/interchainqueries/registered_queries"; } - // Queries a registered Interchain Query by ID. + // Fetches details of a registered Interchain Query using its ID. rpc RegisteredQuery(QueryRegisteredQueryRequest) returns (QueryRegisteredQueryResponse) { option (google.api.http).get = "/neutron/interchainqueries/registered_query"; } - // Queries the last successfully submitted result of an Interchain Query. + // Retrieves the most recent successfully submitted result of an Interchain Query. This is only + // applicable for KV Interchain Queries. rpc QueryResult(QueryRegisteredQueryResultRequest) returns (QueryRegisteredQueryResultResponse) { option (google.api.http).get = "/neutron/interchainqueries/query_result"; } - // Queries the last height of a remote chain known to the IBC client behind a given connection ID. + // Retrieves the most recent height of a remote chain as known by the IBC client associated with + // a given connection ID. rpc LastRemoteHeight(QueryLastRemoteHeight) returns (QueryLastRemoteHeightResponse) { option (google.api.http).get = "/neutron/interchainqueries/remote_height"; } diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 343257c85..7361a56cd 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -16,26 +16,28 @@ option go_package = "github.com/neutron-org/neutron/v5/x/interchainqueries/types // Defines the Msg interface of the module. service Msg { option (cosmos.msg.v1.service) = true; - // Registers a new Interchain Query in the interchainqueries module. This message is supposed to - // be issued only by a smart contract. The caller contract is charged a query registration deposit - // automatically in the amount defined as the module's query deposit parameter. The deposit is - // paid back on the query removal. Make sure to have enough assets on the contract's account - // at the time of the message execution. + // Registers a new Interchain Query in the `interchainqueries` module. This message should only + // be issued by a smart contract. The calling contract is automatically charged a query + // registration deposit, based on the module's query deposit parameter. The deposit is refunded + // when the query is removed. Ensure the contract's account has sufficient assets at the time of + // message execution. // - // Returns an ID assigned to the registered query. Handle this message response via a reply - // handler in order to make use of the ID. + // The response includes the ID assigned to the registered query. Use a reply handler to process + // this response and utilize the query ID. rpc RegisterInterchainQuery(MsgRegisterInterchainQuery) returns (MsgRegisterInterchainQueryResponse); - // Submits a result of an Interchain Query execution to the chain. This message handling may - // include passing of the result to the query's owner smart contract for processing which might - // be a pretty gas-consumable operation. + // Submits the result of an Interchain Query execution to the chain. Handling this message may + // involve forwarding the result to the smart contract that owns the query for processing, which + // could require significant gas usage. rpc SubmitQueryResult(MsgSubmitQueryResult) returns (MsgSubmitQueryResultResponse); - // Removes a given Interchain Query and its results from the module. Can be removed only by the - // owner of the query during the query's submit timeout, and by anyone after the query has been - // timed out. The query deposit is returned to the caller on a success call. + // Removes a specific Interchain Query and its results from the module. The query can only be + // removed by its owner during the query's submit timeout. After the timeout, anyone can remove + // it. Upon successful removal, the query deposit is refunded to the caller. rpc RemoveInterchainQuery(MsgRemoveInterchainQueryRequest) returns (MsgRemoveInterchainQueryResponse); - // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. + // Updates the parameters of a registered Interchain Query. This action can only be performed by + // the query's owner. rpc UpdateInterchainQuery(MsgUpdateInterchainQueryRequest) returns (MsgUpdateInterchainQueryResponse); - // Updates params of the interchainqueries module. Only callable by the module's authority. + // Updates the parameters of the `interchainqueries` module. This action can only be performed + // by the module's authority. rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); } diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index 2ef52b974..893b710d2 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -5,11 +5,11 @@ import ( channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ) -// MessageTxQueryResult is the model of the sudo message sent to a smart contract on a TX -// Interchain Query result submission. The owner of a TX Interchain Query must define a `sudo` -// entry_point for handling `tx_query_result` messages and place the needed logic there. -// The `tx_query_result` handler is treated by the interchainqueries module as a callback that is -// called each time a TX query result is submitted. +// MessageTxQueryResult is the model of the `sudo` message sent to a smart contract when a TX +// Interchain Query result is submitted. The owner of a TX Interchain Query must implement a `sudo` +// entry point to handle `tx_query_result` messages and include the necessary logic in it. The +// `tx_query_result` handler functions as a callback, triggered by the `interchainqueries` module +// each time a TX query result is submitted. type MessageTxQueryResult struct { TxQueryResult struct { // QueryID is the ID of the TX query which result is being submitted. @@ -21,15 +21,14 @@ type MessageTxQueryResult struct { } `json:"tx_query_result"` } -// MessageKVQueryResult is the model of the sudo message sent to a smart contract on a KV -// Interchain Query result submission. If the owner of a KV Interchain Query wants to handle the -// query updates, it must define a `sudo` entry_point for handling `kv_query_result` messages -// and place the needed logic there. The `kv_query_result` handler is treated by the -// interchainqueries module as a callback that is called each time a KV query result is -// submitted. +// MessageKvQueryResult is the model of the `sudo` message sent to a smart contract when a KV +// Interchain Query result is submitted. If the owner of a KV Interchain Query wants to handle +// updates, they must implement a `sudo` entry point to process `kv_query_result` messages and +// include the necessary logic in it. The `kv_query_result` handler acts as a callback, triggered +// by the interchainqueries module whenever a KV query result is submitted. // -// Note that there is no query result sent, only the query ID. In order to access the actual -// result, use the Query/QueryResult RPC of the interchainqueries module. +// Note that the message does not include the actual query result, only the query ID. To access the +// result data, use the `Query/QueryResult` RPC of the `interchainqueries` module. type MessageKVQueryResult struct { KVQueryResult struct { // QueryID is the ID of the KV query which result is being submitted. diff --git a/x/interchainqueries/types/query.pb.go b/x/interchainqueries/types/query.pb.go index 0300e73fa..c2222f9c5 100644 --- a/x/interchainqueries/types/query.pb.go +++ b/x/interchainqueries/types/query.pb.go @@ -422,7 +422,6 @@ func (m *QueryRegisteredQueryResultResponse) GetResult() *QueryResult { return nil } -// Deprecated: Do not use. type Transaction struct { Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` @@ -604,56 +603,56 @@ func init() { } var fileDescriptor_2254be23ba3ff3b4 = []byte{ - // 775 bytes of a gzipped FileDescriptorProto + // 770 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x4f, 0x13, 0x4f, - 0x14, 0xef, 0x94, 0x7e, 0x0b, 0xbc, 0xf2, 0x15, 0x18, 0xd1, 0x94, 0x15, 0x2b, 0x2c, 0x11, 0x0a, - 0xa6, 0xbb, 0xfc, 0x08, 0x8a, 0x8a, 0x98, 0x70, 0x50, 0x49, 0x34, 0x81, 0x55, 0x3c, 0x78, 0x69, - 0xa6, 0xed, 0x64, 0xbb, 0x09, 0xdd, 0x29, 0xbb, 0x53, 0xa4, 0x57, 0x6f, 0xde, 0x8c, 0xfe, 0x0b, - 0xfe, 0x01, 0xde, 0x3c, 0x78, 0xf0, 0x4a, 0x3c, 0x91, 0x78, 0xf1, 0x64, 0x0c, 0xf8, 0x87, 0x98, - 0x9d, 0x99, 0xb6, 0x6c, 0x7f, 0x52, 0x4e, 0x9d, 0x99, 0x7d, 0x9f, 0xf7, 0x3e, 0xef, 0xf3, 0xde, - 0x9b, 0x0e, 0xdc, 0x76, 0x69, 0x85, 0x7b, 0xcc, 0x35, 0x1d, 0x97, 0x53, 0x2f, 0x5f, 0x24, 0x8e, - 0x7b, 0x50, 0xa1, 0x9e, 0x43, 0x7d, 0x33, 0xf8, 0xad, 0x1a, 0x65, 0x8f, 0x71, 0x86, 0x27, 0x95, - 0x99, 0xd1, 0x62, 0xa6, 0x2d, 0xe6, 0x99, 0x5f, 0x62, 0xbe, 0x99, 0x23, 0x3e, 0x95, 0x18, 0xf3, - 0x70, 0x39, 0x47, 0x39, 0x59, 0x36, 0xcb, 0xc4, 0x76, 0x5c, 0xc2, 0x1d, 0xe6, 0x4a, 0x37, 0xda, - 0x84, 0xcd, 0x6c, 0x26, 0x96, 0x66, 0xb0, 0x52, 0xa7, 0x53, 0x36, 0x63, 0xf6, 0x3e, 0x35, 0x49, - 0xd9, 0x31, 0x89, 0xeb, 0x32, 0x2e, 0x20, 0xbe, 0xfa, 0x3a, 0xdf, 0x99, 0xa1, 0x4d, 0x5d, 0xea, - 0x3b, 0x35, 0xc3, 0xb9, 0xce, 0x86, 0x65, 0xe2, 0x91, 0x52, 0xcd, 0x4e, 0xef, 0x6c, 0xc7, 0x8f, - 0xa4, 0x8d, 0x3e, 0x01, 0x78, 0x37, 0x48, 0x65, 0x47, 0x00, 0x2d, 0x7a, 0x50, 0xa1, 0x3e, 0xd7, - 0x5f, 0xc3, 0xd5, 0xd0, 0xa9, 0x5f, 0x66, 0xae, 0x4f, 0xf1, 0x63, 0x88, 0xcb, 0x00, 0x49, 0x34, - 0x8d, 0xd2, 0x89, 0x95, 0x19, 0xa3, 0xa3, 0x5a, 0x86, 0x84, 0x6e, 0xc5, 0x8e, 0x7f, 0xdf, 0x8a, - 0x58, 0x0a, 0xa6, 0x7f, 0x46, 0x70, 0x53, 0x38, 0xb6, 0xa8, 0xed, 0xf8, 0x9c, 0x7a, 0xb4, 0xb0, - 0x2b, 0xed, 0x55, 0x64, 0x7c, 0x1d, 0xe2, 0xec, 0xad, 0x4b, 0xbd, 0x20, 0xc4, 0x40, 0x7a, 0xd8, - 0x52, 0x3b, 0x3c, 0x0b, 0xff, 0xe7, 0x99, 0xeb, 0xd2, 0x7c, 0xa0, 0x58, 0xd6, 0x29, 0x24, 0xa3, - 0xd3, 0x28, 0x3d, 0x6c, 0x8d, 0x34, 0x0e, 0xb7, 0x0b, 0xf8, 0x09, 0x40, 0xa3, 0x12, 0xc9, 0x01, - 0xc1, 0x71, 0xce, 0x90, 0x65, 0x33, 0x82, 0xb2, 0x19, 0xb2, 0xd4, 0xaa, 0x6c, 0xc6, 0x0e, 0xb1, - 0xa9, 0x0a, 0x6c, 0x9d, 0x43, 0xea, 0x3f, 0x10, 0xa4, 0x3a, 0xd1, 0x54, 0x52, 0x64, 0x01, 0x7b, - 0xf5, 0x8f, 0x59, 0x95, 0xb4, 0xe0, 0x9c, 0x58, 0x59, 0xec, 0x22, 0x4b, 0xd8, 0x63, 0x55, 0xe9, - 0x33, 0xee, 0x35, 0x07, 0xc2, 0x4f, 0x43, 0xb9, 0x44, 0x45, 0x2e, 0xf3, 0x3d, 0x73, 0x91, 0xec, - 0x42, 0xc9, 0xac, 0xc3, 0x8d, 0x36, 0xb9, 0x54, 0x6b, 0x82, 0x4f, 0xc2, 0x90, 0x70, 0x14, 0x68, - 0x1a, 0x54, 0x35, 0x66, 0x0d, 0x8a, 0xfd, 0x76, 0x41, 0xaf, 0xc0, 0x54, 0x7b, 0xa4, 0xd2, 0x60, - 0x0f, 0xc6, 0x9a, 0x34, 0xa8, 0xaa, 0xc6, 0xe8, 0x43, 0x01, 0x6b, 0x34, 0x9c, 0x7b, 0x55, 0xdf, - 0x84, 0x99, 0x0e, 0x61, 0x2b, 0xfb, 0xfc, 0x02, 0xb4, 0x0b, 0xa0, 0x77, 0xc3, 0x2b, 0xf2, 0x9b, - 0x10, 0xf7, 0xc4, 0x89, 0xa2, 0x3c, 0xd7, 0x85, 0xf2, 0x79, 0xbc, 0x42, 0xe9, 0x2f, 0x20, 0xf1, - 0xca, 0x23, 0xae, 0x4f, 0x44, 0xf3, 0xe1, 0x2b, 0x10, 0xad, 0x33, 0x89, 0x3a, 0x85, 0xa0, 0x8f, - 0x8b, 0xd4, 0xb1, 0x8b, 0x5c, 0x94, 0x2e, 0x66, 0xa9, 0x1d, 0xc6, 0x10, 0x2b, 0x10, 0x4e, 0x44, - 0x73, 0x8e, 0x58, 0x62, 0xfd, 0x20, 0x9a, 0x44, 0xfa, 0x06, 0x5c, 0x13, 0x51, 0x9e, 0x13, 0x9f, - 0x5b, 0xb4, 0xc4, 0x38, 0x7d, 0x26, 0x01, 0x2d, 0x8d, 0x8f, 0x5a, 0x1b, 0x5f, 0x7f, 0xa9, 0xc6, - 0xaa, 0x19, 0x5d, 0xcf, 0xb6, 0x41, 0x07, 0x85, 0xe8, 0x68, 0x30, 0xe4, 0xd1, 0x43, 0xc7, 0xaf, - 0xf5, 0x58, 0xcc, 0xaa, 0xef, 0x57, 0xde, 0x0f, 0xc2, 0x7f, 0xc2, 0x2b, 0xfe, 0x88, 0x20, 0x2e, - 0xe7, 0x19, 0x67, 0x7a, 0xc9, 0x14, 0xba, 0x48, 0x34, 0xe3, 0xa2, 0xe6, 0x92, 0xa7, 0xbe, 0xf0, - 0xee, 0xe7, 0xdf, 0x4f, 0xd1, 0x59, 0x3c, 0x63, 0xf6, 0xba, 0xe3, 0xf0, 0x77, 0x04, 0xe3, 0x2d, - 0xf3, 0x89, 0xd7, 0x7b, 0x97, 0xb1, 0xfd, 0xcd, 0xa3, 0xdd, 0xbf, 0x04, 0x52, 0xb1, 0x5e, 0x13, - 0xac, 0x4d, 0x9c, 0xe9, 0xc2, 0xba, 0xf5, 0xb6, 0xc0, 0x5f, 0x11, 0x8c, 0x36, 0x35, 0x29, 0xbe, - 0xdb, 0x1f, 0x8b, 0xda, 0x18, 0x6b, 0xf7, 0xfa, 0xc6, 0x29, 0xee, 0xab, 0x82, 0x7b, 0x06, 0xdf, - 0xb9, 0x38, 0xf7, 0x2a, 0xfe, 0x86, 0x20, 0x71, 0x6e, 0x28, 0xf0, 0x46, 0xff, 0xd1, 0x1b, 0xb3, - 0xac, 0x3d, 0xba, 0x24, 0x5a, 0x65, 0x60, 0x8a, 0x0c, 0x16, 0xf0, 0xbc, 0xd9, 0xe3, 0x2f, 0x3e, - 0x2b, 0x47, 0x17, 0x7f, 0x41, 0x30, 0xd6, 0x32, 0x67, 0x4b, 0xbd, 0x48, 0x34, 0x23, 0xb4, 0xf5, - 0x7e, 0x11, 0x75, 0xc6, 0x4b, 0x82, 0xf1, 0x22, 0x4e, 0x77, 0xd5, 0x3c, 0x00, 0x66, 0xe5, 0x9c, - 0x6e, 0xed, 0x1d, 0x9f, 0xa6, 0xd0, 0xc9, 0x69, 0x0a, 0xfd, 0x39, 0x4d, 0xa1, 0x0f, 0x67, 0xa9, - 0xc8, 0xc9, 0x59, 0x2a, 0xf2, 0xeb, 0x2c, 0x15, 0x79, 0xf3, 0xd0, 0x76, 0x78, 0xb1, 0x92, 0x33, - 0xf2, 0xac, 0x54, 0xf3, 0x96, 0x61, 0x9e, 0x5d, 0xf7, 0x7c, 0xb8, 0x66, 0x1e, 0xb5, 0x7b, 0x00, - 0x54, 0xcb, 0xd4, 0xcf, 0xc5, 0xc5, 0x23, 0x60, 0xf5, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17, - 0x6f, 0x80, 0x31, 0x1d, 0x09, 0x00, 0x00, + 0x14, 0xef, 0x94, 0x7e, 0x0b, 0xbc, 0xf2, 0x15, 0x18, 0xd1, 0xc0, 0x8a, 0x15, 0x96, 0x08, 0x05, + 0xd3, 0x5d, 0x7e, 0x04, 0xc5, 0x88, 0x98, 0x70, 0x50, 0x49, 0x3c, 0xc0, 0x2a, 0x1e, 0xbc, 0x34, + 0xd3, 0x76, 0xb2, 0xdd, 0x84, 0xee, 0x94, 0x9d, 0x29, 0xd2, 0xab, 0x37, 0x6f, 0x46, 0xff, 0x05, + 0xff, 0x00, 0x6f, 0x1e, 0x3c, 0x78, 0x25, 0x9e, 0x48, 0xbc, 0x78, 0x32, 0x06, 0xfc, 0x43, 0xcc, + 0xce, 0x4c, 0x5b, 0xfa, 0x9b, 0x72, 0xea, 0xcc, 0xec, 0xfb, 0xbc, 0xf7, 0x79, 0x9f, 0xf7, 0xde, + 0x4c, 0xe1, 0xae, 0x4f, 0xcb, 0x22, 0x60, 0xbe, 0xed, 0xf9, 0x82, 0x06, 0xb9, 0x02, 0xf1, 0xfc, + 0xc3, 0x32, 0x0d, 0x3c, 0xca, 0xed, 0xf0, 0xb7, 0x62, 0x95, 0x02, 0x26, 0x18, 0x9e, 0xd2, 0x66, + 0x56, 0x8b, 0x99, 0xb1, 0x94, 0x63, 0xbc, 0xc8, 0xb8, 0x9d, 0x25, 0x9c, 0x2a, 0x8c, 0x7d, 0xb4, + 0x92, 0xa5, 0x82, 0xac, 0xd8, 0x25, 0xe2, 0x7a, 0x3e, 0x11, 0x1e, 0xf3, 0x95, 0x1b, 0x63, 0xc2, + 0x65, 0x2e, 0x93, 0x4b, 0x3b, 0x5c, 0xe9, 0xd3, 0x69, 0x97, 0x31, 0xf7, 0x80, 0xda, 0xa4, 0xe4, + 0xd9, 0xc4, 0xf7, 0x99, 0x90, 0x10, 0xae, 0xbf, 0x2e, 0x74, 0x66, 0xe8, 0x52, 0x9f, 0x72, 0xaf, + 0x6a, 0x38, 0xdf, 0xd9, 0xb0, 0x44, 0x02, 0x52, 0xac, 0xda, 0x99, 0x9d, 0xed, 0xc4, 0xb1, 0xb2, + 0x31, 0x27, 0x00, 0xef, 0x85, 0xa9, 0xec, 0x4a, 0xa0, 0x43, 0x0f, 0xcb, 0x94, 0x0b, 0xf3, 0x35, + 0x5c, 0x6f, 0x38, 0xe5, 0x25, 0xe6, 0x73, 0x8a, 0x9f, 0x40, 0x5c, 0x05, 0x98, 0x44, 0x33, 0x28, + 0x95, 0x58, 0x9d, 0xb5, 0x3a, 0xaa, 0x65, 0x29, 0xe8, 0x76, 0xec, 0xe4, 0xf7, 0x9d, 0x88, 0xa3, + 0x61, 0xe6, 0x67, 0x04, 0xb7, 0xa5, 0x63, 0x87, 0xba, 0x1e, 0x17, 0x34, 0xa0, 0xf9, 0x3d, 0x65, + 0xaf, 0x23, 0xe3, 0x9b, 0x10, 0x67, 0x6f, 0x7d, 0x1a, 0x84, 0x21, 0x06, 0x52, 0xc3, 0x8e, 0xde, + 0xe1, 0x39, 0xf8, 0x3f, 0xc7, 0x7c, 0x9f, 0xe6, 0x42, 0xc5, 0x32, 0x5e, 0x7e, 0x32, 0x3a, 0x83, + 0x52, 0xc3, 0xce, 0x48, 0xfd, 0x70, 0x27, 0x8f, 0x9f, 0x02, 0xd4, 0x2b, 0x31, 0x39, 0x20, 0x39, + 0xce, 0x5b, 0xaa, 0x6c, 0x56, 0x58, 0x36, 0x4b, 0x95, 0x5a, 0x97, 0xcd, 0xda, 0x25, 0x2e, 0xd5, + 0x81, 0x9d, 0x0b, 0x48, 0xf3, 0x07, 0x82, 0x64, 0x27, 0x9a, 0x5a, 0x8a, 0x0c, 0xe0, 0xa0, 0xf6, + 0x31, 0xa3, 0x93, 0x96, 0x9c, 0x13, 0xab, 0x4b, 0x5d, 0x64, 0x69, 0xf4, 0x58, 0xd1, 0xfa, 0x8c, + 0x07, 0xcd, 0x81, 0xf0, 0xb3, 0x86, 0x5c, 0xa2, 0x32, 0x97, 0x85, 0x9e, 0xb9, 0x28, 0x76, 0x0d, + 0xc9, 0x6c, 0xc0, 0xad, 0x36, 0xb9, 0x54, 0xaa, 0x82, 0x4f, 0xc1, 0x90, 0x74, 0x14, 0x6a, 0x1a, + 0x56, 0x35, 0xe6, 0x0c, 0xca, 0xfd, 0x4e, 0xde, 0x2c, 0xc3, 0x74, 0x7b, 0xa4, 0xd6, 0x60, 0x1f, + 0xc6, 0x9a, 0x34, 0xa8, 0xe8, 0xc6, 0xe8, 0x43, 0x01, 0x67, 0xb4, 0x31, 0xf7, 0x8a, 0xb9, 0x05, + 0xb3, 0x1d, 0xc2, 0x96, 0x0f, 0xc4, 0x25, 0x68, 0xe7, 0xc1, 0xec, 0x86, 0xd7, 0xe4, 0xb7, 0x20, + 0x1e, 0xc8, 0x13, 0x4d, 0x79, 0xbe, 0x0b, 0xe5, 0x8b, 0x78, 0x8d, 0x32, 0x77, 0x20, 0xf1, 0x2a, + 0x20, 0x3e, 0x27, 0xb2, 0xf9, 0xf0, 0x35, 0x88, 0xd6, 0x98, 0x44, 0xbd, 0x7c, 0xd8, 0xc7, 0x05, + 0xea, 0xb9, 0x05, 0x21, 0x4b, 0x17, 0x73, 0xf4, 0x0e, 0x63, 0x88, 0xe5, 0x89, 0x20, 0xb2, 0x39, + 0x47, 0x1c, 0xb9, 0x36, 0x37, 0xe1, 0x86, 0x8c, 0xf0, 0x82, 0x70, 0xe1, 0xd0, 0x22, 0x13, 0xf4, + 0xb9, 0x32, 0x6e, 0x69, 0x7a, 0xd4, 0xda, 0xf4, 0xe6, 0x4b, 0x3d, 0x52, 0xcd, 0xe8, 0x5a, 0xa6, + 0x75, 0x2a, 0xa8, 0x81, 0x8a, 0x01, 0x43, 0x01, 0x3d, 0xf2, 0x78, 0xb5, 0xbf, 0x62, 0x4e, 0x6d, + 0xbf, 0xfa, 0x7e, 0x10, 0xfe, 0x93, 0x5e, 0xf1, 0x47, 0x04, 0x71, 0x35, 0xcb, 0x38, 0xdd, 0x4b, + 0xa2, 0x86, 0x4b, 0xc4, 0xb0, 0x2e, 0x6b, 0xae, 0x78, 0x9a, 0x8b, 0xef, 0x7e, 0xfe, 0xfd, 0x14, + 0x9d, 0xc3, 0xb3, 0x76, 0xaf, 0xfb, 0x0d, 0x7f, 0x47, 0x30, 0xde, 0x32, 0x9b, 0x78, 0xa3, 0x77, + 0x09, 0xdb, 0xdf, 0x3a, 0xc6, 0xc3, 0x2b, 0x20, 0x35, 0xeb, 0x75, 0xc9, 0xda, 0xc6, 0xe9, 0x2e, + 0xac, 0x5b, 0x6f, 0x0a, 0xfc, 0x15, 0xc1, 0x68, 0x53, 0x83, 0xe2, 0xfb, 0xfd, 0xb1, 0xa8, 0x8e, + 0xb0, 0xf1, 0xa0, 0x6f, 0x9c, 0xe6, 0xbe, 0x26, 0xb9, 0xa7, 0xf1, 0xbd, 0xcb, 0x73, 0xaf, 0xe0, + 0x6f, 0x08, 0x12, 0x17, 0x06, 0x02, 0x6f, 0xf6, 0x1f, 0xbd, 0x3e, 0xc7, 0xc6, 0xe3, 0x2b, 0xa2, + 0x75, 0x06, 0xb6, 0xcc, 0x60, 0x11, 0x2f, 0xd8, 0x3d, 0x9e, 0xf7, 0x8c, 0x1a, 0x5b, 0xfc, 0x05, + 0xc1, 0x58, 0xcb, 0x9c, 0x2d, 0xf7, 0x22, 0xd1, 0x8c, 0x30, 0x36, 0xfa, 0x45, 0xd4, 0x18, 0x2f, + 0x4b, 0xc6, 0x4b, 0x38, 0xd5, 0x55, 0xf3, 0x10, 0x98, 0x51, 0x73, 0xba, 0xbd, 0x7f, 0x72, 0x96, + 0x44, 0xa7, 0x67, 0x49, 0xf4, 0xe7, 0x2c, 0x89, 0x3e, 0x9c, 0x27, 0x23, 0xa7, 0xe7, 0xc9, 0xc8, + 0xaf, 0xf3, 0x64, 0xe4, 0xcd, 0x23, 0xd7, 0x13, 0x85, 0x72, 0xd6, 0xca, 0xb1, 0x62, 0xd5, 0x5b, + 0x9a, 0x05, 0x6e, 0xcd, 0xf3, 0xd1, 0xba, 0x7d, 0xdc, 0xee, 0xf1, 0xaf, 0x94, 0x28, 0xcf, 0xc6, + 0xe5, 0x1f, 0x80, 0xb5, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xb6, 0x0a, 0x1f, 0x19, 0x09, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -668,16 +667,18 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { - // Queries the current parameters of the module. + // Fetches the current parameters of the interchainqueries module. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) - // Queries all the registered Interchain Queries in the module with filtration by owner and/or - // connection ID. + // Retrieves all registered Interchain Queries in the module, with optional filtering by owner + // and/or connection ID. RegisteredQueries(ctx context.Context, in *QueryRegisteredQueriesRequest, opts ...grpc.CallOption) (*QueryRegisteredQueriesResponse, error) - // Queries a registered Interchain Query by ID. + // Fetches details of a registered Interchain Query using its ID. RegisteredQuery(ctx context.Context, in *QueryRegisteredQueryRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResponse, error) - // Queries the last successfully submitted result of an Interchain Query. + // Retrieves the most recent successfully submitted result of an Interchain Query. This is only + // applicable for KV Interchain Queries. QueryResult(ctx context.Context, in *QueryRegisteredQueryResultRequest, opts ...grpc.CallOption) (*QueryRegisteredQueryResultResponse, error) - // Queries the last height of a remote chain known to the IBC client behind a given connection ID. + // Retrieves the most recent height of a remote chain as known by the IBC client associated with + // a given connection ID. LastRemoteHeight(ctx context.Context, in *QueryLastRemoteHeight, opts ...grpc.CallOption) (*QueryLastRemoteHeightResponse, error) } @@ -736,16 +737,18 @@ func (c *queryClient) LastRemoteHeight(ctx context.Context, in *QueryLastRemoteH // QueryServer is the server API for Query service. type QueryServer interface { - // Queries the current parameters of the module. + // Fetches the current parameters of the interchainqueries module. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) - // Queries all the registered Interchain Queries in the module with filtration by owner and/or - // connection ID. + // Retrieves all registered Interchain Queries in the module, with optional filtering by owner + // and/or connection ID. RegisteredQueries(context.Context, *QueryRegisteredQueriesRequest) (*QueryRegisteredQueriesResponse, error) - // Queries a registered Interchain Query by ID. + // Fetches details of a registered Interchain Query using its ID. RegisteredQuery(context.Context, *QueryRegisteredQueryRequest) (*QueryRegisteredQueryResponse, error) - // Queries the last successfully submitted result of an Interchain Query. + // Retrieves the most recent successfully submitted result of an Interchain Query. This is only + // applicable for KV Interchain Queries. QueryResult(context.Context, *QueryRegisteredQueryResultRequest) (*QueryRegisteredQueryResultResponse, error) - // Queries the last height of a remote chain known to the IBC client behind a given connection ID. + // Retrieves the most recent height of a remote chain as known by the IBC client associated with + // a given connection ID. LastRemoteHeight(context.Context, *QueryLastRemoteHeight) (*QueryLastRemoteHeightResponse, error) } diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 266884af2..49e731566 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -1018,26 +1018,28 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MsgClient interface { - // Registers a new Interchain Query in the interchainqueries module. This message is supposed to - // be issued only by a smart contract. The caller contract is charged a query registration deposit - // automatically in the amount defined as the module's query deposit parameter. The deposit is - // paid back on the query removal. Make sure to have enough assets on the contract's account - // at the time of the message execution. + // Registers a new Interchain Query in the `interchainqueries` module. This message should only + // be issued by a smart contract. The calling contract is automatically charged a query + // registration deposit, based on the module's query deposit parameter. The deposit is refunded + // when the query is removed. Ensure the contract's account has sufficient assets at the time of + // message execution. // - // Returns an ID assigned to the registered query. Handle this message response via a reply - // handler in order to make use of the ID. + // The response includes the ID assigned to the registered query. Use a reply handler to process + // this response and utilize the query ID. RegisterInterchainQuery(ctx context.Context, in *MsgRegisterInterchainQuery, opts ...grpc.CallOption) (*MsgRegisterInterchainQueryResponse, error) - // Submits a result of an Interchain Query execution to the chain. This message handling may - // include passing of the result to the query's owner smart contract for processing which might - // be a pretty gas-consumable operation. + // Submits the result of an Interchain Query execution to the chain. Handling this message may + // involve forwarding the result to the smart contract that owns the query for processing, which + // could require significant gas usage. SubmitQueryResult(ctx context.Context, in *MsgSubmitQueryResult, opts ...grpc.CallOption) (*MsgSubmitQueryResultResponse, error) - // Removes a given Interchain Query and its results from the module. Can be removed only by the - // owner of the query during the query's submit timeout, and by anyone after the query has been - // timed out. The query deposit is returned to the caller on a success call. + // Removes a specific Interchain Query and its results from the module. The query can only be + // removed by its owner during the query's submit timeout. After the timeout, anyone can remove + // it. Upon successful removal, the query deposit is refunded to the caller. RemoveInterchainQuery(ctx context.Context, in *MsgRemoveInterchainQueryRequest, opts ...grpc.CallOption) (*MsgRemoveInterchainQueryResponse, error) - // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. + // Updates the parameters of a registered Interchain Query. This action can only be performed by + // the query's owner. UpdateInterchainQuery(ctx context.Context, in *MsgUpdateInterchainQueryRequest, opts ...grpc.CallOption) (*MsgUpdateInterchainQueryResponse, error) - // Updates params of the interchainqueries module. Only callable by the module's authority. + // Updates the parameters of the `interchainqueries` module. This action can only be performed + // by the module's authority. UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) } @@ -1096,26 +1098,28 @@ func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts // MsgServer is the server API for Msg service. type MsgServer interface { - // Registers a new Interchain Query in the interchainqueries module. This message is supposed to - // be issued only by a smart contract. The caller contract is charged a query registration deposit - // automatically in the amount defined as the module's query deposit parameter. The deposit is - // paid back on the query removal. Make sure to have enough assets on the contract's account - // at the time of the message execution. + // Registers a new Interchain Query in the `interchainqueries` module. This message should only + // be issued by a smart contract. The calling contract is automatically charged a query + // registration deposit, based on the module's query deposit parameter. The deposit is refunded + // when the query is removed. Ensure the contract's account has sufficient assets at the time of + // message execution. // - // Returns an ID assigned to the registered query. Handle this message response via a reply - // handler in order to make use of the ID. + // The response includes the ID assigned to the registered query. Use a reply handler to process + // this response and utilize the query ID. RegisterInterchainQuery(context.Context, *MsgRegisterInterchainQuery) (*MsgRegisterInterchainQueryResponse, error) - // Submits a result of an Interchain Query execution to the chain. This message handling may - // include passing of the result to the query's owner smart contract for processing which might - // be a pretty gas-consumable operation. + // Submits the result of an Interchain Query execution to the chain. Handling this message may + // involve forwarding the result to the smart contract that owns the query for processing, which + // could require significant gas usage. SubmitQueryResult(context.Context, *MsgSubmitQueryResult) (*MsgSubmitQueryResultResponse, error) - // Removes a given Interchain Query and its results from the module. Can be removed only by the - // owner of the query during the query's submit timeout, and by anyone after the query has been - // timed out. The query deposit is returned to the caller on a success call. + // Removes a specific Interchain Query and its results from the module. The query can only be + // removed by its owner during the query's submit timeout. After the timeout, anyone can remove + // it. Upon successful removal, the query deposit is refunded to the caller. RemoveInterchainQuery(context.Context, *MsgRemoveInterchainQueryRequest) (*MsgRemoveInterchainQueryResponse, error) - // Updates parameters of a registered Interchain Query. Only callable by the owner of the query. + // Updates the parameters of a registered Interchain Query. This action can only be performed by + // the query's owner. UpdateInterchainQuery(context.Context, *MsgUpdateInterchainQueryRequest) (*MsgUpdateInterchainQueryResponse, error) - // Updates params of the interchainqueries module. Only callable by the module's authority. + // Updates the parameters of the `interchainqueries` module. This action can only be performed + // by the module's authority. UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) } From 95ce534184af8cc0cbae9a0a84ec0e18616745ca Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Wed, 27 Nov 2024 16:46:48 +0300 Subject: [PATCH 10/18] improve wording in ICQ module doc comments --- proto/neutron/interchainqueries/genesis.proto | 4 ++-- proto/neutron/interchainqueries/params.proto | 5 +++-- proto/neutron/interchainqueries/query.proto | 2 +- proto/neutron/interchainqueries/tx.proto | 3 ++- x/interchainqueries/types/genesis.pb.go | 4 ++-- x/interchainqueries/types/params.pb.go | 5 +++-- x/interchainqueries/types/query.pb.go | 2 +- x/interchainqueries/types/tx.pb.go | 3 ++- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/proto/neutron/interchainqueries/genesis.proto b/proto/neutron/interchainqueries/genesis.proto index e9e882655..49e083370 100644 --- a/proto/neutron/interchainqueries/genesis.proto +++ b/proto/neutron/interchainqueries/genesis.proto @@ -41,8 +41,8 @@ message RegisteredQuery { (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.nullable) = false ]; - // Duration in blocks that is required to pass since the query registration/update for the - // query to become available for anybody to be removed. + // The duration, measured in blocks, that must pass since the query's registration or its last + // result submission before the query becomes eligible for removal by anyone. uint64 submit_timeout = 11; // The local chain block height of the Interchain Query registration. uint64 registered_at_height = 12; diff --git a/proto/neutron/interchainqueries/params.proto b/proto/neutron/interchainqueries/params.proto index f6bdfe544..e3e4768a9 100644 --- a/proto/neutron/interchainqueries/params.proto +++ b/proto/neutron/interchainqueries/params.proto @@ -9,8 +9,9 @@ option go_package = "github.com/neutron-org/neutron/v5/x/interchainqueries/types // The parameters for the module. message Params { option (gogoproto.goproto_stringer) = false; - // The amount of blocks required to pass since an Interchain Query registration/update for the - // query to become available for removal by anybody. + // The duration, measured in blocks, that must pass since the query's registration or its last + // result submission before the query becomes eligible for removal by anyone. Is used to set + // `submit_timeout` on Interchain Query registration. uint64 query_submit_timeout = 1; // Amount of coins required to be provided as deposit on Interchain Query registration. repeated cosmos.base.v1beta1.Coin query_deposit = 2 [ diff --git a/proto/neutron/interchainqueries/query.proto b/proto/neutron/interchainqueries/query.proto index 31558f28e..dab826d44 100644 --- a/proto/neutron/interchainqueries/query.proto +++ b/proto/neutron/interchainqueries/query.proto @@ -42,7 +42,7 @@ message QueryParamsRequest {} // Response type for the Query/Params RPC method. message QueryParamsResponse { - // Stores all parameters of the module. + // Contains all parameters of the module. Params params = 1 [(gogoproto.nullable) = false]; } diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 7361a56cd..175ee3736 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -119,7 +119,8 @@ message StorageValue { bytes key = 2; // A base64-encoded value read from the given storage path. bytes value = 3; - // The Merkle Proof which proves existence of key-value pair in IAVL storage. Is used to verify + // The Merkle Proof which proves existence/nonexistence of key-value pair in IAVL storage. Is + // used to verify // the pair against the respective remote chain's header. tendermint.crypto.ProofOps Proof = 4; } diff --git a/x/interchainqueries/types/genesis.pb.go b/x/interchainqueries/types/genesis.pb.go index b004a6786..b97fa175e 100644 --- a/x/interchainqueries/types/genesis.pb.go +++ b/x/interchainqueries/types/genesis.pb.go @@ -56,8 +56,8 @@ type RegisteredQuery struct { // Amount of coins paid for the Interchain Query registration. The deposit is paid back to the // remover. The remover can be either the query owner (during the submit timeout) or anybody. Deposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,10,rep,name=deposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"deposit"` - // Duration in blocks that is required to pass since the query registration/update for the - // query to become available for anybody to be removed. + // The duration, measured in blocks, that must pass since the query's registration or its last + // result submission before the query becomes eligible for removal by anyone. SubmitTimeout uint64 `protobuf:"varint,11,opt,name=submit_timeout,json=submitTimeout,proto3" json:"submit_timeout,omitempty"` // The local chain block height of the Interchain Query registration. RegisteredAtHeight uint64 `protobuf:"varint,12,opt,name=registered_at_height,json=registeredAtHeight,proto3" json:"registered_at_height,omitempty"` diff --git a/x/interchainqueries/types/params.pb.go b/x/interchainqueries/types/params.pb.go index 4c8a9a5cd..cb97993ae 100644 --- a/x/interchainqueries/types/params.pb.go +++ b/x/interchainqueries/types/params.pb.go @@ -27,8 +27,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // The parameters for the module. type Params struct { - // The amount of blocks required to pass since an Interchain Query registration/update for the - // query to become available for removal by anybody. + // The duration, measured in blocks, that must pass since the query's registration or its last + // result submission before the query becomes eligible for removal by anyone. Is used to set + // `submit_timeout` on Interchain Query registration. QuerySubmitTimeout uint64 `protobuf:"varint,1,opt,name=query_submit_timeout,json=querySubmitTimeout,proto3" json:"query_submit_timeout,omitempty"` // Amount of coins required to be provided as deposit on Interchain Query registration. QueryDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=query_deposit,json=queryDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"query_deposit"` diff --git a/x/interchainqueries/types/query.pb.go b/x/interchainqueries/types/query.pb.go index c2222f9c5..c8a5180de 100644 --- a/x/interchainqueries/types/query.pb.go +++ b/x/interchainqueries/types/query.pb.go @@ -69,7 +69,7 @@ var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo // Response type for the Query/Params RPC method. type QueryParamsResponse struct { - // Stores all parameters of the module. + // Contains all parameters of the module. Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` } diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 49e731566..3dd981da0 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -355,7 +355,8 @@ type StorageValue struct { Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` // A base64-encoded value read from the given storage path. Value []byte `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` - // The Merkle Proof which proves existence of key-value pair in IAVL storage. Is used to verify + // The Merkle Proof which proves existence/nonexistence of key-value pair in IAVL storage. Is + // used to verify // the pair against the respective remote chain's header. Proof *crypto.ProofOps `protobuf:"bytes,4,opt,name=Proof,proto3" json:"Proof,omitempty"` } From 3f69fac6871a690af414cd7e09e5d26d5564e567 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 28 Nov 2024 16:18:50 +0300 Subject: [PATCH 11/18] improve ambiguous wording in KVKey and StorageValue --- proto/neutron/interchainqueries/genesis.proto | 8 ++++---- proto/neutron/interchainqueries/tx.proto | 8 ++++---- x/interchainqueries/types/genesis.pb.go | 8 ++++---- x/interchainqueries/types/tx.pb.go | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/proto/neutron/interchainqueries/genesis.proto b/proto/neutron/interchainqueries/genesis.proto index 49e083370..fc01fc66c 100644 --- a/proto/neutron/interchainqueries/genesis.proto +++ b/proto/neutron/interchainqueries/genesis.proto @@ -48,12 +48,12 @@ message RegisteredQuery { uint64 registered_at_height = 12; } -// A path to an IAVL storage node. +// Represents a path to an IAVL storage node. message KVKey { - // The first half of the storage path. It is supposed to be a substore name for the query - // (e.g. bank, staking, etc.). + // The substore name used in an Interchain Query. Typically, this corresponds to the keeper's + // storeKey, usually the module's name, such as "bank", "staking", etc. string path = 1; - // The second half of the storage path. The remaining part of the full path to an IAVL storage node. + // A hexadecimal-encoded byte array representing the key for specific data in the module's storage. bytes key = 2; } diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 175ee3736..3c70f44fc 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -112,12 +112,12 @@ message QueryResult { // A verifiable result of performing a single KVKey read. message StorageValue { - // The first half of the storage path. It is supposed to be a substore name for the query - // (e.g. bank, staking, etc.). + // The substore name used in the read operation. Typically, this corresponds to the keeper's + // storeKey, usually the module's name, such as "bank", "staking", etc. string storage_prefix = 1; - // The second half of the storage path. The remaining part of the full path to an IAVL storage node. + // Hexadecimal-encoded bytes representing the key of the data read from the module's storage. bytes key = 2; - // A base64-encoded value read from the given storage path. + // A bytes field containing the value associated with the key in the store. bytes value = 3; // The Merkle Proof which proves existence/nonexistence of key-value pair in IAVL storage. Is // used to verify diff --git a/x/interchainqueries/types/genesis.pb.go b/x/interchainqueries/types/genesis.pb.go index b97fa175e..684aa0297 100644 --- a/x/interchainqueries/types/genesis.pb.go +++ b/x/interchainqueries/types/genesis.pb.go @@ -180,12 +180,12 @@ func (m *RegisteredQuery) GetRegisteredAtHeight() uint64 { return 0 } -// A path to an IAVL storage node. +// Represents a path to an IAVL storage node. type KVKey struct { - // The first half of the storage path. It is supposed to be a substore name for the query - // (e.g. bank, staking, etc.). + // The substore name used in an Interchain Query. Typically, this corresponds to the keeper's + // storeKey, usually the module's name, such as "bank", "staking", etc. Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - // The second half of the storage path. The remaining part of the full path to an IAVL storage node. + // A hexadecimal-encoded byte array representing the key for specific data in the module's storage. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` } diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 3dd981da0..c11339f80 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -348,12 +348,12 @@ func (m *QueryResult) GetAllowKvCallbacks() bool { // A verifiable result of performing a single KVKey read. type StorageValue struct { - // The first half of the storage path. It is supposed to be a substore name for the query - // (e.g. bank, staking, etc.). + // The substore name used in the read operation. Typically, this corresponds to the keeper's + // storeKey, usually the module's name, such as "bank", "staking", etc. StoragePrefix string `protobuf:"bytes,1,opt,name=storage_prefix,json=storagePrefix,proto3" json:"storage_prefix,omitempty"` - // The second half of the storage path. The remaining part of the full path to an IAVL storage node. + // Hexadecimal-encoded bytes representing the key of the data read from the module's storage. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` - // A base64-encoded value read from the given storage path. + // A bytes field containing the value associated with the key in the store. Value []byte `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` // The Merkle Proof which proves existence/nonexistence of key-value pair in IAVL storage. Is // used to verify From 51627bed0e459127c3b0dfd66b335eb604cc4709 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 28 Nov 2024 13:28:55 +0000 Subject: [PATCH 12/18] regenerate swagger --- docs/static/swagger.yaml | 1006 ++++++++++++++++++++++++++------------ 1 file changed, 702 insertions(+), 304 deletions(-) diff --git a/docs/static/swagger.yaml b/docs/static/swagger.yaml index c1c094a97..f95670a26 100644 --- a/docs/static/swagger.yaml +++ b/docs/static/swagger.yaml @@ -18474,6 +18474,7 @@ definitions: type: object type: object neutron.interchainqueries.Block: + description: A single verifiable result of an Interchain Query of TX type. properties: header: properties: @@ -18483,7 +18484,11 @@ definitions: format: byte type: string type: object - title: We need to know block X to verify inclusion of transaction for block X + description: >- + The header of the block the transaction is included in. It is needed + to know block header to + + verify inclusion of the transaction. next_block_header: properties: type_url: @@ -18492,26 +18497,27 @@ definitions: format: byte type: string type: object - title: >- - We need to know block X+1 to verify response of transaction for block - X + description: >- + The header of the block next to the block the transaction is included + in. It is needed to know - since LastResultsHash is root hash of all results from the txs from - the + block X+1 header to verify response of transaction for block X since + LastResultsHash is root - previous block + hash of all results of the txs from the previous block. tx: + description: The transaction matched by the Interchain Query's transaction filter. properties: data: + description: The arbitrary data typed body of the transaction. format: byte - title: is body of the transaction type: string delivery_proof: - title: >- - is the Merkle Proof which proves existence of response in block - with height + description: >- + The Merkle Proof which proves existence of response in the block + next to the block the - next_block_header.Height + transaction is included in. properties: aunts: items: @@ -18529,11 +18535,9 @@ definitions: type: string type: object inclusion_proof: - title: >- - is the Merkle Proof which proves existence of data in block with - height - - header.Height + description: >- + The Merkle Proof which proves inclusion of the transaction in the + block. properties: aunts: items: @@ -18551,13 +18555,7 @@ definitions: type: string type: object response: - description: >- - ExecTxResult contains results of executing one individual - transaction. - - - * Its structure is equivalent to #ResponseDeliverTx which will be - deprecated/deleted + description: The result of the transaction execution. properties: code: format: int64 @@ -18609,21 +18607,24 @@ definitions: type: object type: object neutron.interchainqueries.KVKey: + description: Represents a path to an IAVL storage node. properties: key: + description: >- + A hexadecimal-encoded byte array representing the key for specific + data in the module's storage. format: byte - title: Key you want to read from the storage type: string path: - title: >- - Path (storage prefix) to the storage where you want to read value by - key + description: >- + The substore name used in an Interchain Query. Typically, this + corresponds to the keeper's - (usually name of cosmos-sdk module: 'staking', 'bank', etc.) + storeKey, usually the module's name, such as "bank", "staking", etc. type: string type: object neutron.interchainqueries.Params: - description: Params defines the parameters for the module. + description: The parameters for the module. properties: max_kv_query_keys_count: format: uint64 @@ -18636,7 +18637,9 @@ definitions: in msgRegisterInterchainQuery type: string query_deposit: - description: Amount of coins deposited for the query. + description: >- + Amount of coins required to be provided as deposit on Interchain Query + registration. items: description: |- Coin defines a token with a denomination and an amount. @@ -18651,34 +18654,43 @@ definitions: type: object type: array query_submit_timeout: + description: >- + The duration, measured in blocks, that must pass since the query's + registration or its last + + result submission before the query becomes eligible for removal by + anyone. Is used to set + + `submit_timeout` on Interchain Query registration. format: uint64 - title: |- - Defines amount of blocks required before query becomes available for - removal by anybody type: string tx_query_removal_limit: description: >- Amount of tx hashes to be removed during a single EndBlock. Can vary - to - - balance between network cleaning speed and EndBlock duration. A zero - value + to balance between - means no limit. + network cleaning speed and EndBlock duration. A zero value means no + limit. format: uint64 type: string type: object neutron.interchainqueries.QueryLastRemoteHeightResponse: + description: Response type for the Query/LastRemoteHeight RPC method. properties: height: + description: The height of the chain that the IBC client is currently on. + format: uint64 + type: string + revision: + description: The revision of the chain that the IBC client is currently on. format: uint64 type: string type: object neutron.interchainqueries.QueryParamsResponse: - description: QueryParamsResponse is response type for the Query/Params RPC method. + description: Response type for the Query/Params RPC method. properties: params: - description: params holds all the parameters of this module. + description: Contains all parameters of the module. properties: max_kv_query_keys_count: format: uint64 @@ -18691,7 +18703,9 @@ definitions: filters in msgRegisterInterchainQuery type: string query_deposit: - description: Amount of coins deposited for the query. + description: >- + Amount of coins required to be provided as deposit on Interchain + Query registration. items: description: >- Coin defines a token with a denomination and an amount. @@ -18709,27 +18723,29 @@ definitions: type: object type: array query_submit_timeout: - format: uint64 - title: >- - Defines amount of blocks required before query becomes available - for + description: >- + The duration, measured in blocks, that must pass since the query's + registration or its last - removal by anybody + result submission before the query becomes eligible for removal by + anyone. Is used to set + + `submit_timeout` on Interchain Query registration. + format: uint64 type: string tx_query_removal_limit: description: >- Amount of tx hashes to be removed during a single EndBlock. Can - vary to + vary to balance between - balance between network cleaning speed and EndBlock duration. A - zero value - - means no limit. + network cleaning speed and EndBlock duration. A zero value means + no limit. format: uint64 type: string type: object type: object neutron.interchainqueries.QueryRegisteredQueriesResponse: + description: Response type for the Query/RegisteredQueries RPC method. properties: pagination: description: |- @@ -18758,15 +18774,27 @@ definitions: type: string type: object registered_queries: + description: A list of registered Interchain Queries. items: + description: >- + Information about an Interchain Query registered in the + interchainqueries module. properties: connection_id: - title: >- - The IBC connection ID for getting ConsensusState to verify - proofs + description: >- + The IBC connection ID to the remote chain (the source of + querying data). Is used for getting + + ConsensusState from the respective IBC client to verify query + result proofs. type: string deposit: - description: Amount of coins deposited for the query. + description: >- + Amount of coins paid for the Interchain Query registration. The + deposit is paid back to the + + remover. The remover can be either the query owner (during the + submit timeout) or anybody. items: description: >- Coin defines a token with a denomination and an amount. @@ -18788,35 +18816,41 @@ definitions: format: uint64 type: string keys: + description: >- + The KV-storage keys for which to get values from the remote + chain. Only applicable for the + + KV Interchain Queries. Max amount of keys is limited by the + module's `max_kv_query_keys_count` + + parameters. items: + description: Represents a path to an IAVL storage node. properties: key: + description: >- + A hexadecimal-encoded byte array representing the key for + specific data in the module's storage. format: byte - title: Key you want to read from the storage type: string path: - title: >- - Path (storage prefix) to the storage where you want to - read value by key + description: >- + The substore name used in an Interchain Query. Typically, + this corresponds to the keeper's - (usually name of cosmos-sdk module: 'staking', 'bank', - etc.) + storeKey, usually the module's name, such as "bank", + "staking", etc. type: string type: object - title: >- - The KV-storage keys for which we want to get values from remote - chain type: array last_submitted_result_local_height: - description: >- - The local chain last block height when the query result was - updated. + description: The local chain block height of the last query results update. format: uint64 type: string last_submitted_result_remote_height: description: >- - The remote chain last block height when the query result was - updated. + The remote chain block height that corresponds to the last query + result update. properties: revision_height: format: uint64 @@ -18835,38 +18869,73 @@ definitions: freezing clients type: object owner: - description: The address that registered the query. + description: The address of the contract that registered the query. type: string query_type: - title: 'The query type identifier: `kv` or `tx` now' + description: 'The query type identifier: `kv` or `tx`.' type: string registered_at_height: - description: The local chain height when the query was registered. + description: >- + The local chain block height of the Interchain Query + registration. format: uint64 type: string submit_timeout: - description: Timeout before query becomes available for everybody to remove. + description: >- + The duration, measured in blocks, that must pass since the + query's registration or its last + + result submission before the query becomes eligible for removal + by anyone. format: uint64 type: string transactions_filter: - title: The filter for transaction search ICQ + description: >- + A stringified list of filters for remote transactions search. + Only applicable for the TX + + Interchain Queries. Example: + "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + + Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount + of filter conditions is limited + + by the module's `max_transactions_filters` parameters. type: string update_period: - description: Parameter that defines how often the query must be updated. + description: >- + Parameter that defines the minimal delay between consecutive + query executions (i.e. the + + minimal delay between query results update). format: uint64 type: string type: object type: array type: object neutron.interchainqueries.QueryRegisteredQueryResponse: + description: Response type for the Query/RegisteredQuery RPC method. properties: registered_query: + description: >- + Information about an Interchain Query registered in the + interchainqueries module. properties: connection_id: - title: The IBC connection ID for getting ConsensusState to verify proofs + description: >- + The IBC connection ID to the remote chain (the source of querying + data). Is used for getting + + ConsensusState from the respective IBC client to verify query + result proofs. type: string deposit: - description: Amount of coins deposited for the query. + description: >- + Amount of coins paid for the Interchain Query registration. The + deposit is paid back to the + + remover. The remover can be either the query owner (during the + submit timeout) or anybody. items: description: >- Coin defines a token with a denomination and an amount. @@ -18888,34 +18957,41 @@ definitions: format: uint64 type: string keys: + description: >- + The KV-storage keys for which to get values from the remote chain. + Only applicable for the + + KV Interchain Queries. Max amount of keys is limited by the + module's `max_kv_query_keys_count` + + parameters. items: + description: Represents a path to an IAVL storage node. properties: key: + description: >- + A hexadecimal-encoded byte array representing the key for + specific data in the module's storage. format: byte - title: Key you want to read from the storage type: string path: - title: >- - Path (storage prefix) to the storage where you want to read - value by key + description: >- + The substore name used in an Interchain Query. Typically, + this corresponds to the keeper's - (usually name of cosmos-sdk module: 'staking', 'bank', etc.) + storeKey, usually the module's name, such as "bank", + "staking", etc. type: string type: object - title: >- - The KV-storage keys for which we want to get values from remote - chain type: array last_submitted_result_local_height: - description: >- - The local chain last block height when the query result was - updated. + description: The local chain block height of the last query results update. format: uint64 type: string last_submitted_result_remote_height: description: >- - The remote chain last block height when the query result was - updated. + The remote chain block height that corresponds to the last query + result update. properties: revision_height: format: uint64 @@ -18934,35 +19010,69 @@ definitions: freezing clients type: object owner: - description: The address that registered the query. + description: The address of the contract that registered the query. type: string query_type: - title: 'The query type identifier: `kv` or `tx` now' + description: 'The query type identifier: `kv` or `tx`.' type: string registered_at_height: - description: The local chain height when the query was registered. + description: The local chain block height of the Interchain Query registration. format: uint64 type: string submit_timeout: - description: Timeout before query becomes available for everybody to remove. + description: >- + The duration, measured in blocks, that must pass since the query's + registration or its last + + result submission before the query becomes eligible for removal by + anyone. format: uint64 type: string transactions_filter: - title: The filter for transaction search ICQ + description: >- + A stringified list of filters for remote transactions search. Only + applicable for the TX + + Interchain Queries. Example: + "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + + Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount of + filter conditions is limited + + by the module's `max_transactions_filters` parameters. type: string update_period: - description: Parameter that defines how often the query must be updated. + description: >- + Parameter that defines the minimal delay between consecutive query + executions (i.e. the + + minimal delay between query results update). format: uint64 type: string type: object type: object neutron.interchainqueries.QueryRegisteredQueryResultResponse: + description: Response type for the Query/QueryResult RPC method. properties: result: + description: The last successfully submitted result of an Interchain Query. properties: allow_kv_callbacks: + description: >- + Whether to send the query result to the owner contract as a sudo + message. Only applicable for + + KV type of Interchain Queries. type: boolean block: + description: >- + A TX Interchain Query execution result. Contains metainformation + about the blocks of the query + + execution height. Only populated when submitting an Interchain + Query result for verification + + and emptied when saving the result on chain. properties: header: properties: @@ -18972,9 +19082,11 @@ definitions: format: byte type: string type: object - title: >- - We need to know block X to verify inclusion of transaction for - block X + description: >- + The header of the block the transaction is included in. It is + needed to know block header to + + verify inclusion of the transaction. next_block_header: properties: type_url: @@ -18983,26 +19095,29 @@ definitions: format: byte type: string type: object - title: >- - We need to know block X+1 to verify response of transaction - for block X + description: >- + The header of the block next to the block the transaction is + included in. It is needed to know - since LastResultsHash is root hash of all results from the txs - from the + block X+1 header to verify response of transaction for block X + since LastResultsHash is root - previous block + hash of all results of the txs from the previous block. tx: + description: >- + The transaction matched by the Interchain Query's transaction + filter. properties: data: + description: The arbitrary data typed body of the transaction. format: byte - title: is body of the transaction type: string delivery_proof: - title: >- - is the Merkle Proof which proves existence of response in - block with height + description: >- + The Merkle Proof which proves existence of response in the + block next to the block the - next_block_header.Height + transaction is included in. properties: aunts: items: @@ -19020,11 +19135,9 @@ definitions: type: string type: object inclusion_proof: - title: >- - is the Merkle Proof which proves existence of data in - block with height - - header.Height + description: >- + The Merkle Proof which proves inclusion of the transaction + in the block. properties: aunts: items: @@ -19042,13 +19155,7 @@ definitions: type: string type: object response: - description: >- - ExecTxResult contains results of executing one individual - transaction. - - - * Its structure is equivalent to #ResponseDeliverTx which - will be deprecated/deleted + description: The result of the transaction execution. properties: code: format: int64 @@ -19101,17 +19208,28 @@ definitions: type: object type: object height: + description: >- + The height of the chain at the moment of the Interchain Query + execution. format: uint64 type: string kv_results: + description: >- + A list of a KV Interchain Query execution results. Each result + contains query parameters, a + + response value and a proof. items: + description: A verifiable result of performing a single KVKey read. properties: Proof: - title: >- - is the Merkle Proof which proves existence of key-value pair - in IAVL + description: >- + The Merkle Proof which proves existence/nonexistence of + key-value pair in IAVL storage. Is + + used to verify - storage + the pair against the respective remote chain's header. properties: ops: items: @@ -19134,30 +19252,76 @@ definitions: for example neighbouring node hash type: object type: array + title: ProofOps is Merkle proof defined by the list of ProofOps type: object key: + description: >- + Hexadecimal-encoded bytes representing the key of the data + read from the module's storage. format: byte - title: is the key in IAVL store type: string storage_prefix: - title: is the substore name (acc, staking, etc.) + description: >- + The substore name used in the read operation. Typically, + this corresponds to the keeper's + + storeKey, usually the module's name, such as "bank", + "staking", etc. type: string value: + description: >- + A bytes field containing the value associated with the key + in the store. format: byte - title: is the value in IAVL store type: string type: object type: array revision: + description: >- + The revision number of the chain at the moment of the Interchain + Query execution. format: uint64 type: string type: object type: object neutron.interchainqueries.QueryResult: + description: >- + Contains different information about a single Interchain Query execution + result. Currently, + + this structure is used both in query result submission via an ICQ Relayer + and as a query result + + storage for read/write operations to interchainqueries module, but the + structure fields are + + populated in a bit different ways. When submitting a query result, all + fields are populated and + + provided to the interchainqueries module in order to verify the result + against the IBC client's + + state. But in order to lighten the chain state, the interchainqueries + module removes the block + + field and proofs from the kv_results. properties: allow_kv_callbacks: + description: >- + Whether to send the query result to the owner contract as a sudo + message. Only applicable for + + KV type of Interchain Queries. type: boolean block: + description: >- + A TX Interchain Query execution result. Contains metainformation about + the blocks of the query + + execution height. Only populated when submitting an Interchain Query + result for verification + + and emptied when saving the result on chain. properties: header: properties: @@ -19167,9 +19331,11 @@ definitions: format: byte type: string type: object - title: >- - We need to know block X to verify inclusion of transaction for - block X + description: >- + The header of the block the transaction is included in. It is + needed to know block header to + + verify inclusion of the transaction. next_block_header: properties: type_url: @@ -19178,26 +19344,29 @@ definitions: format: byte type: string type: object - title: >- - We need to know block X+1 to verify response of transaction for - block X + description: >- + The header of the block next to the block the transaction is + included in. It is needed to know - since LastResultsHash is root hash of all results from the txs - from the + block X+1 header to verify response of transaction for block X + since LastResultsHash is root - previous block + hash of all results of the txs from the previous block. tx: + description: >- + The transaction matched by the Interchain Query's transaction + filter. properties: data: + description: The arbitrary data typed body of the transaction. format: byte - title: is body of the transaction type: string delivery_proof: - title: >- - is the Merkle Proof which proves existence of response in - block with height + description: >- + The Merkle Proof which proves existence of response in the + block next to the block the - next_block_header.Height + transaction is included in. properties: aunts: items: @@ -19215,11 +19384,9 @@ definitions: type: string type: object inclusion_proof: - title: >- - is the Merkle Proof which proves existence of data in block - with height - - header.Height + description: >- + The Merkle Proof which proves inclusion of the transaction in + the block. properties: aunts: items: @@ -19237,13 +19404,7 @@ definitions: type: string type: object response: - description: >- - ExecTxResult contains results of executing one individual - transaction. - - - * Its structure is equivalent to #ResponseDeliverTx which will - be deprecated/deleted + description: The result of the transaction execution. properties: code: format: int64 @@ -19295,17 +19456,28 @@ definitions: type: object type: object height: + description: >- + The height of the chain at the moment of the Interchain Query + execution. format: uint64 type: string kv_results: + description: >- + A list of a KV Interchain Query execution results. Each result + contains query parameters, a + + response value and a proof. items: + description: A verifiable result of performing a single KVKey read. properties: Proof: - title: >- - is the Merkle Proof which proves existence of key-value pair in - IAVL + description: >- + The Merkle Proof which proves existence/nonexistence of + key-value pair in IAVL storage. Is - storage + used to verify + + the pair against the respective remote chain's header. properties: ops: items: @@ -19328,31 +19500,57 @@ definitions: for example neighbouring node hash type: object type: array + title: ProofOps is Merkle proof defined by the list of ProofOps type: object key: + description: >- + Hexadecimal-encoded bytes representing the key of the data read + from the module's storage. format: byte - title: is the key in IAVL store type: string storage_prefix: - title: is the substore name (acc, staking, etc.) + description: >- + The substore name used in the read operation. Typically, this + corresponds to the keeper's + + storeKey, usually the module's name, such as "bank", "staking", + etc. type: string value: + description: >- + A bytes field containing the value associated with the key in + the store. format: byte - title: is the value in IAVL store type: string type: object type: array revision: + description: >- + The revision number of the chain at the moment of the Interchain Query + execution. format: uint64 type: string type: object neutron.interchainqueries.RegisteredQuery: + description: >- + Information about an Interchain Query registered in the interchainqueries + module. properties: connection_id: - title: The IBC connection ID for getting ConsensusState to verify proofs + description: >- + The IBC connection ID to the remote chain (the source of querying + data). Is used for getting + + ConsensusState from the respective IBC client to verify query result + proofs. type: string deposit: - description: Amount of coins deposited for the query. + description: >- + Amount of coins paid for the Interchain Query registration. The + deposit is paid back to the + + remover. The remover can be either the query owner (during the submit + timeout) or anybody. items: description: |- Coin defines a token with a denomination and an amount. @@ -19371,28 +19569,41 @@ definitions: format: uint64 type: string keys: + description: >- + The KV-storage keys for which to get values from the remote chain. + Only applicable for the + + KV Interchain Queries. Max amount of keys is limited by the module's + `max_kv_query_keys_count` + + parameters. items: + description: Represents a path to an IAVL storage node. properties: key: + description: >- + A hexadecimal-encoded byte array representing the key for + specific data in the module's storage. format: byte - title: Key you want to read from the storage type: string path: - title: >- - Path (storage prefix) to the storage where you want to read - value by key + description: >- + The substore name used in an Interchain Query. Typically, this + corresponds to the keeper's - (usually name of cosmos-sdk module: 'staking', 'bank', etc.) + storeKey, usually the module's name, such as "bank", "staking", + etc. type: string type: object - title: The KV-storage keys for which we want to get values from remote chain type: array last_submitted_result_local_height: - description: The local chain last block height when the query result was updated. + description: The local chain block height of the last query results update. format: uint64 type: string last_submitted_result_remote_height: - description: The remote chain last block height when the query result was updated. + description: >- + The remote chain block height that corresponds to the last query + result update. properties: revision_height: format: uint64 @@ -19411,33 +19622,57 @@ definitions: freezing clients type: object owner: - description: The address that registered the query. + description: The address of the contract that registered the query. type: string query_type: - title: 'The query type identifier: `kv` or `tx` now' + description: 'The query type identifier: `kv` or `tx`.' type: string registered_at_height: - description: The local chain height when the query was registered. + description: The local chain block height of the Interchain Query registration. format: uint64 type: string submit_timeout: - description: Timeout before query becomes available for everybody to remove. + description: >- + The duration, measured in blocks, that must pass since the query's + registration or its last + + result submission before the query becomes eligible for removal by + anyone. format: uint64 type: string transactions_filter: - title: The filter for transaction search ICQ + description: >- + A stringified list of filters for remote transactions search. Only + applicable for the TX + + Interchain Queries. Example: + "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + + Supported operators: "eq", "lt", "gt", "lte", "gte". Max amount of + filter conditions is limited + + by the module's `max_transactions_filters` parameters. type: string update_period: - description: Parameter that defines how often the query must be updated. + description: >- + Parameter that defines the minimal delay between consecutive query + executions (i.e. the + + minimal delay between query results update). format: uint64 type: string type: object neutron.interchainqueries.StorageValue: + description: A verifiable result of performing a single KVKey read. properties: Proof: - title: |- - is the Merkle Proof which proves existence of key-value pair in IAVL - storage + description: >- + The Merkle Proof which proves existence/nonexistence of key-value pair + in IAVL storage. Is + + used to verify + + the pair against the respective remote chain's header. properties: ops: items: @@ -19456,31 +19691,41 @@ definitions: for example neighbouring node hash type: object type: array + title: ProofOps is Merkle proof defined by the list of ProofOps type: object key: + description: >- + Hexadecimal-encoded bytes representing the key of the data read from + the module's storage. format: byte - title: is the key in IAVL store type: string storage_prefix: - title: is the substore name (acc, staking, etc.) + description: >- + The substore name used in the read operation. Typically, this + corresponds to the keeper's + + storeKey, usually the module's name, such as "bank", "staking", etc. type: string value: + description: >- + A bytes field containing the value associated with the key in the + store. format: byte - title: is the value in IAVL store type: string type: object neutron.interchainqueries.TxValue: + description: Contains transaction body, response, and proofs of inclusion and delivery. properties: data: + description: The arbitrary data typed body of the transaction. format: byte - title: is body of the transaction type: string delivery_proof: - title: >- - is the Merkle Proof which proves existence of response in block with - height + description: >- + The Merkle Proof which proves existence of response in the block next + to the block the - next_block_header.Height + transaction is included in. properties: aunts: items: @@ -19498,11 +19743,9 @@ definitions: type: string type: object inclusion_proof: - title: >- - is the Merkle Proof which proves existence of data in block with - height - - header.Height + description: >- + The Merkle Proof which proves inclusion of the transaction in the + block. properties: aunts: items: @@ -19520,12 +19763,7 @@ definitions: type: string type: object response: - description: >- - ExecTxResult contains results of executing one individual transaction. - - - * Its structure is equivalent to #ResponseDeliverTx which will be - deprecated/deleted + description: The result of the transaction execution. properties: code: format: int64 @@ -44580,12 +44818,10 @@ paths: '200': description: A successful response. schema: - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. + description: Response type for the Query/Params RPC method. properties: params: - description: params holds all the parameters of this module. + description: Contains all parameters of the module. properties: max_kv_query_keys_count: format: uint64 @@ -44598,7 +44834,9 @@ paths: tx filters in msgRegisterInterchainQuery type: string query_deposit: - description: Amount of coins deposited for the query. + description: >- + Amount of coins required to be provided as deposit on + Interchain Query registration. items: description: >- Coin defines a token with a denomination and an amount. @@ -44616,21 +44854,22 @@ paths: type: object type: array query_submit_timeout: - format: uint64 - title: >- - Defines amount of blocks required before query becomes - available for + description: >- + The duration, measured in blocks, that must pass since the + query's registration or its last - removal by anybody + result submission before the query becomes eligible for + removal by anyone. Is used to set + + `submit_timeout` on Interchain Query registration. + format: uint64 type: string tx_query_removal_limit: description: >- Amount of tx hashes to be removed during a single - EndBlock. Can vary to - - balance between network cleaning speed and EndBlock - duration. A zero value + EndBlock. Can vary to balance between + network cleaning speed and EndBlock duration. A zero value means no limit. format: uint64 type: string @@ -44658,14 +44897,15 @@ paths: message: type: string type: object - summary: Parameters queries the parameters of the module. + summary: Fetches the current parameters of the interchainqueries module. tags: - Query /neutron/interchainqueries/query_result: get: operationId: QueryResult parameters: - - format: uint64 + - description: ID of an Interchain Query. + format: uint64 in: query name: query_id required: false @@ -44674,12 +44914,27 @@ paths: '200': description: A successful response. schema: + description: Response type for the Query/QueryResult RPC method. properties: result: + description: The last successfully submitted result of an Interchain Query. properties: allow_kv_callbacks: + description: >- + Whether to send the query result to the owner contract as + a sudo message. Only applicable for + + KV type of Interchain Queries. type: boolean block: + description: >- + A TX Interchain Query execution result. Contains + metainformation about the blocks of the query + + execution height. Only populated when submitting an + Interchain Query result for verification + + and emptied when saving the result on chain. properties: header: properties: @@ -44689,9 +44944,11 @@ paths: format: byte type: string type: object - title: >- - We need to know block X to verify inclusion of - transaction for block X + description: >- + The header of the block the transaction is included + in. It is needed to know block header to + + verify inclusion of the transaction. next_block_header: properties: type_url: @@ -44700,26 +44957,30 @@ paths: format: byte type: string type: object - title: >- - We need to know block X+1 to verify response of - transaction for block X + description: >- + The header of the block next to the block the + transaction is included in. It is needed to know - since LastResultsHash is root hash of all results from - the txs from the + block X+1 header to verify response of transaction for + block X since LastResultsHash is root - previous block + hash of all results of the txs from the previous + block. tx: + description: >- + The transaction matched by the Interchain Query's + transaction filter. properties: data: + description: The arbitrary data typed body of the transaction. format: byte - title: is body of the transaction type: string delivery_proof: - title: >- - is the Merkle Proof which proves existence of - response in block with height + description: >- + The Merkle Proof which proves existence of + response in the block next to the block the - next_block_header.Height + transaction is included in. properties: aunts: items: @@ -44737,11 +44998,9 @@ paths: type: string type: object inclusion_proof: - title: >- - is the Merkle Proof which proves existence of data - in block with height - - header.Height + description: >- + The Merkle Proof which proves inclusion of the + transaction in the block. properties: aunts: items: @@ -44759,14 +45018,7 @@ paths: type: string type: object response: - description: >- - ExecTxResult contains results of executing one - individual transaction. - - - * Its structure is equivalent to - #ResponseDeliverTx which will be - deprecated/deleted + description: The result of the transaction execution. properties: code: format: int64 @@ -44819,17 +45071,29 @@ paths: type: object type: object height: + description: >- + The height of the chain at the moment of the Interchain + Query execution. format: uint64 type: string kv_results: + description: >- + A list of a KV Interchain Query execution results. Each + result contains query parameters, a + + response value and a proof. items: + description: A verifiable result of performing a single KVKey read. properties: Proof: - title: >- - is the Merkle Proof which proves existence of - key-value pair in IAVL + description: >- + The Merkle Proof which proves existence/nonexistence + of key-value pair in IAVL storage. Is + + used to verify - storage + the pair against the respective remote chain's + header. properties: ops: items: @@ -44852,21 +45116,36 @@ paths: for example neighbouring node hash type: object type: array + title: >- + ProofOps is Merkle proof defined by the list of + ProofOps type: object key: + description: >- + Hexadecimal-encoded bytes representing the key of + the data read from the module's storage. format: byte - title: is the key in IAVL store type: string storage_prefix: - title: is the substore name (acc, staking, etc.) + description: >- + The substore name used in the read operation. + Typically, this corresponds to the keeper's + + storeKey, usually the module's name, such as "bank", + "staking", etc. type: string value: + description: >- + A bytes field containing the value associated with + the key in the store. format: byte - title: is the value in IAVL store type: string type: object type: array revision: + description: >- + The revision number of the chain at the moment of the + Interchain Query execution. format: uint64 type: string type: object @@ -44893,6 +45172,11 @@ paths: message: type: string type: object + summary: >- + Retrieves the most recent successfully submitted result of an Interchain + Query. This is only + + applicable for KV Interchain Queries. tags: - Query /neutron/interchainqueries/registered_queries: @@ -44900,13 +45184,29 @@ paths: operationId: RegisteredQueries parameters: - collectionFormat: multi + description: >- + A list of owners of Interchain Queries. Query response will contain + only Interchain Queries + + that are owned by one of the owners in the list. If none, Interchain + Queries are not filtered + + out by the owner field. in: query items: type: string name: owners required: false type: array - - in: query + - description: >- + IBC connection ID. Query response will contain only Interchain + Queries that have the same IBC + + connection ID parameter. If none, Interchain Queries are not + filtered out by the connection ID + + field. + in: query name: connection_id required: false type: string @@ -44970,6 +45270,7 @@ paths: '200': description: A successful response. schema: + description: Response type for the Query/RegisteredQueries RPC method. properties: pagination: description: >- @@ -45000,15 +45301,27 @@ paths: type: string type: object registered_queries: + description: A list of registered Interchain Queries. items: + description: >- + Information about an Interchain Query registered in the + interchainqueries module. properties: connection_id: - title: >- - The IBC connection ID for getting ConsensusState to - verify proofs + description: >- + The IBC connection ID to the remote chain (the source of + querying data). Is used for getting + + ConsensusState from the respective IBC client to verify + query result proofs. type: string deposit: - description: Amount of coins deposited for the query. + description: >- + Amount of coins paid for the Interchain Query + registration. The deposit is paid back to the + + remover. The remover can be either the query owner + (during the submit timeout) or anybody. items: description: >- Coin defines a token with a denomination and an @@ -45031,35 +45344,43 @@ paths: format: uint64 type: string keys: + description: >- + The KV-storage keys for which to get values from the + remote chain. Only applicable for the + + KV Interchain Queries. Max amount of keys is limited by + the module's `max_kv_query_keys_count` + + parameters. items: + description: Represents a path to an IAVL storage node. properties: key: + description: >- + A hexadecimal-encoded byte array representing the + key for specific data in the module's storage. format: byte - title: Key you want to read from the storage type: string path: - title: >- - Path (storage prefix) to the storage where you - want to read value by key + description: >- + The substore name used in an Interchain Query. + Typically, this corresponds to the keeper's - (usually name of cosmos-sdk module: 'staking', - 'bank', etc.) + storeKey, usually the module's name, such as + "bank", "staking", etc. type: string type: object - title: >- - The KV-storage keys for which we want to get values from - remote chain type: array last_submitted_result_local_height: description: >- - The local chain last block height when the query result - was updated. + The local chain block height of the last query results + update. format: uint64 type: string last_submitted_result_remote_height: description: >- - The remote chain last block height when the query result - was updated. + The remote chain block height that corresponds to the + last query result update. properties: revision_height: format: uint64 @@ -45078,28 +45399,45 @@ paths: freezing clients type: object owner: - description: The address that registered the query. + description: The address of the contract that registered the query. type: string query_type: - title: 'The query type identifier: `kv` or `tx` now' + description: 'The query type identifier: `kv` or `tx`.' type: string registered_at_height: - description: The local chain height when the query was registered. + description: >- + The local chain block height of the Interchain Query + registration. format: uint64 type: string submit_timeout: description: >- - Timeout before query becomes available for everybody to - remove. + The duration, measured in blocks, that must pass since + the query's registration or its last + + result submission before the query becomes eligible for + removal by anyone. format: uint64 type: string transactions_filter: - title: The filter for transaction search ICQ + description: >- + A stringified list of filters for remote transactions + search. Only applicable for the TX + + Interchain Queries. Example: + "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + + Supported operators: "eq", "lt", "gt", "lte", "gte". Max + amount of filter conditions is limited + + by the module's `max_transactions_filters` parameters. type: string update_period: description: >- - Parameter that defines how often the query must be - updated. + Parameter that defines the minimal delay between + consecutive query executions (i.e. the + + minimal delay between query results update). format: uint64 type: string type: object @@ -45127,13 +45465,19 @@ paths: message: type: string type: object + summary: >- + Retrieves all registered Interchain Queries in the module, with optional + filtering by owner + + and/or connection ID. tags: - Query /neutron/interchainqueries/registered_query: get: operationId: RegisteredQuery parameters: - - format: uint64 + - description: ID of an Interchain Query. + format: uint64 in: query name: query_id required: false @@ -45142,16 +45486,28 @@ paths: '200': description: A successful response. schema: + description: Response type for the Query/RegisteredQuery RPC method. properties: registered_query: + description: >- + Information about an Interchain Query registered in the + interchainqueries module. properties: connection_id: - title: >- - The IBC connection ID for getting ConsensusState to verify - proofs + description: >- + The IBC connection ID to the remote chain (the source of + querying data). Is used for getting + + ConsensusState from the respective IBC client to verify + query result proofs. type: string deposit: - description: Amount of coins deposited for the query. + description: >- + Amount of coins paid for the Interchain Query + registration. The deposit is paid back to the + + remover. The remover can be either the query owner (during + the submit timeout) or anybody. items: description: >- Coin defines a token with a denomination and an amount. @@ -45173,35 +45529,43 @@ paths: format: uint64 type: string keys: + description: >- + The KV-storage keys for which to get values from the + remote chain. Only applicable for the + + KV Interchain Queries. Max amount of keys is limited by + the module's `max_kv_query_keys_count` + + parameters. items: + description: Represents a path to an IAVL storage node. properties: key: + description: >- + A hexadecimal-encoded byte array representing the + key for specific data in the module's storage. format: byte - title: Key you want to read from the storage type: string path: - title: >- - Path (storage prefix) to the storage where you want - to read value by key + description: >- + The substore name used in an Interchain Query. + Typically, this corresponds to the keeper's - (usually name of cosmos-sdk module: 'staking', - 'bank', etc.) + storeKey, usually the module's name, such as "bank", + "staking", etc. type: string type: object - title: >- - The KV-storage keys for which we want to get values from - remote chain type: array last_submitted_result_local_height: description: >- - The local chain last block height when the query result - was updated. + The local chain block height of the last query results + update. format: uint64 type: string last_submitted_result_remote_height: description: >- - The remote chain last block height when the query result - was updated. + The remote chain block height that corresponds to the last + query result update. properties: revision_height: format: uint64 @@ -45220,28 +45584,45 @@ paths: freezing clients type: object owner: - description: The address that registered the query. + description: The address of the contract that registered the query. type: string query_type: - title: 'The query type identifier: `kv` or `tx` now' + description: 'The query type identifier: `kv` or `tx`.' type: string registered_at_height: - description: The local chain height when the query was registered. + description: >- + The local chain block height of the Interchain Query + registration. format: uint64 type: string submit_timeout: description: >- - Timeout before query becomes available for everybody to - remove. + The duration, measured in blocks, that must pass since the + query's registration or its last + + result submission before the query becomes eligible for + removal by anyone. format: uint64 type: string transactions_filter: - title: The filter for transaction search ICQ + description: >- + A stringified list of filters for remote transactions + search. Only applicable for the TX + + Interchain Queries. Example: + "[{\"field\":\"tx.height\",\"op\":\"Gte\",\"value\":2644737}]". + + Supported operators: "eq", "lt", "gt", "lte", "gte". Max + amount of filter conditions is limited + + by the module's `max_transactions_filters` parameters. type: string update_period: description: >- - Parameter that defines how often the query must be - updated. + Parameter that defines the minimal delay between + consecutive query executions (i.e. the + + minimal delay between query results update). format: uint64 type: string type: object @@ -45268,13 +45649,19 @@ paths: message: type: string type: object + summary: Fetches details of a registered Interchain Query using its ID. tags: - Query /neutron/interchainqueries/remote_height: get: operationId: LastRemoteHeight parameters: - - in: query + - description: >- + Connection ID of an IBC connection to a remote chain. Determines the + IBC client used in query + + handling. + in: query name: connection_id required: false type: string @@ -45282,8 +45669,14 @@ paths: '200': description: A successful response. schema: + description: Response type for the Query/LastRemoteHeight RPC method. properties: height: + description: The height of the chain that the IBC client is currently on. + format: uint64 + type: string + revision: + description: The revision of the chain that the IBC client is currently on. format: uint64 type: string type: object @@ -45309,6 +45702,11 @@ paths: message: type: string type: object + summary: >- + Retrieves the most recent height of a remote chain as known by the IBC + client associated with + + a given connection ID. tags: - Query /neutron/interchaintxs/params: From a1e6904bf1fa1bf210b835cf8edaf5a190d7838e Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 28 Nov 2024 17:37:34 +0300 Subject: [PATCH 13/18] fix mistake in key field description in KVKey and StorageValue --- proto/neutron/interchainqueries/genesis.proto | 2 +- proto/neutron/interchainqueries/tx.proto | 2 +- x/interchainqueries/types/genesis.pb.go | 2 +- x/interchainqueries/types/tx.pb.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proto/neutron/interchainqueries/genesis.proto b/proto/neutron/interchainqueries/genesis.proto index fc01fc66c..fe1675c14 100644 --- a/proto/neutron/interchainqueries/genesis.proto +++ b/proto/neutron/interchainqueries/genesis.proto @@ -53,7 +53,7 @@ message KVKey { // The substore name used in an Interchain Query. Typically, this corresponds to the keeper's // storeKey, usually the module's name, such as "bank", "staking", etc. string path = 1; - // A hexadecimal-encoded byte array representing the key for specific data in the module's storage. + // A bytes field representing the key for specific data in the module's storage. bytes key = 2; } diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index 3c70f44fc..356bee544 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -115,7 +115,7 @@ message StorageValue { // The substore name used in the read operation. Typically, this corresponds to the keeper's // storeKey, usually the module's name, such as "bank", "staking", etc. string storage_prefix = 1; - // Hexadecimal-encoded bytes representing the key of the data read from the module's storage. + // A bytes field representing the key of the data read from the module's storage. bytes key = 2; // A bytes field containing the value associated with the key in the store. bytes value = 3; diff --git a/x/interchainqueries/types/genesis.pb.go b/x/interchainqueries/types/genesis.pb.go index 684aa0297..5ff024397 100644 --- a/x/interchainqueries/types/genesis.pb.go +++ b/x/interchainqueries/types/genesis.pb.go @@ -185,7 +185,7 @@ type KVKey struct { // The substore name used in an Interchain Query. Typically, this corresponds to the keeper's // storeKey, usually the module's name, such as "bank", "staking", etc. Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - // A hexadecimal-encoded byte array representing the key for specific data in the module's storage. + // A bytes field representing the key for specific data in the module's storage. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` } diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index c11339f80..623817022 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -351,7 +351,7 @@ type StorageValue struct { // The substore name used in the read operation. Typically, this corresponds to the keeper's // storeKey, usually the module's name, such as "bank", "staking", etc. StoragePrefix string `protobuf:"bytes,1,opt,name=storage_prefix,json=storagePrefix,proto3" json:"storage_prefix,omitempty"` - // Hexadecimal-encoded bytes representing the key of the data read from the module's storage. + // A bytes field representing the key of the data read from the module's storage. Key []byte `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` // A bytes field containing the value associated with the key in the store. Value []byte `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` From 2e2937520170ee0985cdebbc81aca00a91c96faf Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Thu, 28 Nov 2024 14:38:51 +0000 Subject: [PATCH 14/18] regenerate swagger --- docs/static/swagger.yaml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/static/swagger.yaml b/docs/static/swagger.yaml index f95670a26..a383e254c 100644 --- a/docs/static/swagger.yaml +++ b/docs/static/swagger.yaml @@ -18611,8 +18611,8 @@ definitions: properties: key: description: >- - A hexadecimal-encoded byte array representing the key for specific - data in the module's storage. + A bytes field representing the key for specific data in the module's + storage. format: byte type: string path: @@ -18829,8 +18829,8 @@ definitions: properties: key: description: >- - A hexadecimal-encoded byte array representing the key for - specific data in the module's storage. + A bytes field representing the key for specific data in + the module's storage. format: byte type: string path: @@ -18970,8 +18970,8 @@ definitions: properties: key: description: >- - A hexadecimal-encoded byte array representing the key for - specific data in the module's storage. + A bytes field representing the key for specific data in the + module's storage. format: byte type: string path: @@ -19256,8 +19256,8 @@ definitions: type: object key: description: >- - Hexadecimal-encoded bytes representing the key of the data - read from the module's storage. + A bytes field representing the key of the data read from the + module's storage. format: byte type: string storage_prefix: @@ -19504,8 +19504,8 @@ definitions: type: object key: description: >- - Hexadecimal-encoded bytes representing the key of the data read - from the module's storage. + A bytes field representing the key of the data read from the + module's storage. format: byte type: string storage_prefix: @@ -19582,8 +19582,8 @@ definitions: properties: key: description: >- - A hexadecimal-encoded byte array representing the key for - specific data in the module's storage. + A bytes field representing the key for specific data in the + module's storage. format: byte type: string path: @@ -19695,8 +19695,8 @@ definitions: type: object key: description: >- - Hexadecimal-encoded bytes representing the key of the data read from - the module's storage. + A bytes field representing the key of the data read from the module's + storage. format: byte type: string storage_prefix: @@ -45122,8 +45122,8 @@ paths: type: object key: description: >- - Hexadecimal-encoded bytes representing the key of - the data read from the module's storage. + A bytes field representing the key of the data read + from the module's storage. format: byte type: string storage_prefix: @@ -45357,8 +45357,8 @@ paths: properties: key: description: >- - A hexadecimal-encoded byte array representing the - key for specific data in the module's storage. + A bytes field representing the key for specific + data in the module's storage. format: byte type: string path: @@ -45542,8 +45542,8 @@ paths: properties: key: description: >- - A hexadecimal-encoded byte array representing the - key for specific data in the module's storage. + A bytes field representing the key for specific data + in the module's storage. format: byte type: string path: From dd24540bd7c9de3c1e2c8091f7e6dd5eb07c7a71 Mon Sep 17 00:00:00 2001 From: sotnikov-s Date: Fri, 29 Nov 2024 14:30:42 +0300 Subject: [PATCH 15/18] improve wording in MessageKVQueryResult --- x/contractmanager/types/sudo.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/x/contractmanager/types/sudo.go b/x/contractmanager/types/sudo.go index 893b710d2..660a83886 100644 --- a/x/contractmanager/types/sudo.go +++ b/x/contractmanager/types/sudo.go @@ -23,9 +23,10 @@ type MessageTxQueryResult struct { // MessageKvQueryResult is the model of the `sudo` message sent to a smart contract when a KV // Interchain Query result is submitted. If the owner of a KV Interchain Query wants to handle -// updates, they must implement a `sudo` entry point to process `kv_query_result` messages and -// include the necessary logic in it. The `kv_query_result` handler acts as a callback, triggered -// by the interchainqueries module whenever a KV query result is submitted. +// query updates as part of the result submission transaction, they must implement a `sudo` entry +// point to process `kv_query_result` messages and include the necessary logic in it. The +// `kv_query_result` handler acts as a callback, triggered by the interchainqueries module whenever +// a KV query result is submitted. // // Note that the message does not include the actual query result, only the query ID. To access the // result data, use the `Query/QueryResult` RPC of the `interchainqueries` module. From 5792f3153d63c68fa53173a47e47440c95d1249d Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 10 Dec 2024 14:35:27 +0200 Subject: [PATCH 16/18] wasmd path --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 26c73d337..9d2ba11d7 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( cosmossdk.io/x/tx v0.13.5 cosmossdk.io/x/upgrade v0.1.4 github.com/CosmWasm/wasmd v0.53.0 - github.com/CosmWasm/wasmvm/v2 v2.1.3 + github.com/CosmWasm/wasmvm/v2 v2.1.4 github.com/cometbft/cometbft v0.38.15 github.com/cosmos/admin-module/v2 v2.0.0-20240430142959-8b3328d1b1a2 github.com/cosmos/cosmos-db v1.1.0 @@ -226,7 +226,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.0-neutron + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210112813-b7ce9cf4f33d github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.2 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.10-neutron diff --git a/go.sum b/go.sum index 1561059cb..592a47b81 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,8 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CosmWasm/wasmvm/v2 v2.1.3 h1:CSJTauZqkHyb9yic6JVYCjiGUgxI2MJV2QzfSu8m49c= -github.com/CosmWasm/wasmvm/v2 v2.1.3/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg= +github.com/CosmWasm/wasmvm/v2 v2.1.4 h1:7EUVQjBxXHkVjL2AqqXD7hMEe0dmoNn2li9E4PWRAnA= +github.com/CosmWasm/wasmvm/v2 v2.1.4/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= @@ -842,8 +842,8 @@ github.com/neutron-org/admin-module/v2 v2.0.2 h1:XDDFWjvkVBKRf3lBFCazT1zAXZ3dHX8 github.com/neutron-org/admin-module/v2 v2.0.2/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= github.com/neutron-org/cosmos-sdk v0.50.10-neutron h1:1q8P0l29Mm22m8wUstKlCZpKScJOa5bFFqkO/RbHL5w= github.com/neutron-org/cosmos-sdk v0.50.10-neutron/go.mod h1:6Eesrx3ZE7vxBZWpK++30H+Uc7Q4ahQWCL7JKU/LEdU= -github.com/neutron-org/wasmd v0.53.0-neutron h1:Dv1VP1+QjYeb6RMo03sxw0Pe42JU0MPxefwNaG22KVs= -github.com/neutron-org/wasmd v0.53.0-neutron/go.mod h1:FJl/aWjdpGof3usAMFQpDe07Rkx77PUzp0cygFMOvtw= +github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210112813-b7ce9cf4f33d h1:ZyVr+jk+4ShGHKP19pTQvhoI8b26xruG3ghg3IUP7j4= +github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210112813-b7ce9cf4f33d/go.mod h1:gP10E56tuToU5rsZR7vZLBL5ssW2mie6KN/WrQLG7/I= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= From 23682cc7294ca8c9e7ae44f8cbbb64064c6d2e8e Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Tue, 10 Dec 2024 22:03:49 +0200 Subject: [PATCH 17/18] wasmd patch --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9d2ba11d7..4543454bc 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/tx v0.13.5 cosmossdk.io/x/upgrade v0.1.4 - github.com/CosmWasm/wasmd v0.53.0 + github.com/CosmWasm/wasmd v0.53.2 github.com/CosmWasm/wasmvm/v2 v2.1.4 github.com/cometbft/cometbft v0.38.15 github.com/cosmos/admin-module/v2 v2.0.0-20240430142959-8b3328d1b1a2 @@ -226,7 +226,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210112813-b7ce9cf4f33d + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210195637-d8d8c8914a8b github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.2 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.10-neutron diff --git a/go.sum b/go.sum index 592a47b81..3b7ec73f3 100644 --- a/go.sum +++ b/go.sum @@ -842,8 +842,8 @@ github.com/neutron-org/admin-module/v2 v2.0.2 h1:XDDFWjvkVBKRf3lBFCazT1zAXZ3dHX8 github.com/neutron-org/admin-module/v2 v2.0.2/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= github.com/neutron-org/cosmos-sdk v0.50.10-neutron h1:1q8P0l29Mm22m8wUstKlCZpKScJOa5bFFqkO/RbHL5w= github.com/neutron-org/cosmos-sdk v0.50.10-neutron/go.mod h1:6Eesrx3ZE7vxBZWpK++30H+Uc7Q4ahQWCL7JKU/LEdU= -github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210112813-b7ce9cf4f33d h1:ZyVr+jk+4ShGHKP19pTQvhoI8b26xruG3ghg3IUP7j4= -github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210112813-b7ce9cf4f33d/go.mod h1:gP10E56tuToU5rsZR7vZLBL5ssW2mie6KN/WrQLG7/I= +github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210195637-d8d8c8914a8b h1:ZtG4fvAlsYY38fSwCgLhzoyH94Jx4UrKL+4r92O0Rds= +github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210195637-d8d8c8914a8b/go.mod h1:gP10E56tuToU5rsZR7vZLBL5ssW2mie6KN/WrQLG7/I= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= From 5ff5272e0a920b6874036db292a0c8debba99102 Mon Sep 17 00:00:00 2001 From: pr0n00gler Date: Wed, 11 Dec 2024 16:39:54 +0200 Subject: [PATCH 18/18] wasmd patch --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4543454bc..cb7a932bc 100644 --- a/go.mod +++ b/go.mod @@ -226,7 +226,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210195637-d8d8c8914a8b + github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.2-neutron github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.2 github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.10-neutron diff --git a/go.sum b/go.sum index 3b7ec73f3..f3dc703ef 100644 --- a/go.sum +++ b/go.sum @@ -842,8 +842,8 @@ github.com/neutron-org/admin-module/v2 v2.0.2 h1:XDDFWjvkVBKRf3lBFCazT1zAXZ3dHX8 github.com/neutron-org/admin-module/v2 v2.0.2/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= github.com/neutron-org/cosmos-sdk v0.50.10-neutron h1:1q8P0l29Mm22m8wUstKlCZpKScJOa5bFFqkO/RbHL5w= github.com/neutron-org/cosmos-sdk v0.50.10-neutron/go.mod h1:6Eesrx3ZE7vxBZWpK++30H+Uc7Q4ahQWCL7JKU/LEdU= -github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210195637-d8d8c8914a8b h1:ZtG4fvAlsYY38fSwCgLhzoyH94Jx4UrKL+4r92O0Rds= -github.com/neutron-org/wasmd v0.53.0-neutron.0.20241210195637-d8d8c8914a8b/go.mod h1:gP10E56tuToU5rsZR7vZLBL5ssW2mie6KN/WrQLG7/I= +github.com/neutron-org/wasmd v0.53.2-neutron h1:+2QThKYBTbB1oYwkb+rzxfaMBuB+ZGySlS+7fmFEWIs= +github.com/neutron-org/wasmd v0.53.2-neutron/go.mod h1:gP10E56tuToU5rsZR7vZLBL5ssW2mie6KN/WrQLG7/I= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=