From ef8639d2299838365f7f04f1f66c95e98f7d1b67 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Mon, 18 Dec 2023 12:45:19 -0500 Subject: [PATCH] refactor: move pending nonces, chain nonces and nonce to cctx to observer (#97) --- changelog.md | 8 +- .../zetacored/zetacored_query_crosschain.md | 3 - .../cli/zetacored/zetacored_query_observer.md | 3 + ...cored_query_observer_list-chain-nonces.md} | 6 +- ...red_query_observer_list-pending-nonces.md} | 6 +- ...cored_query_observer_show-chain-nonces.md} | 6 +- docs/openapi/openapi.swagger.yaml | 684 ++-- proto/crosschain/genesis.proto | 4 - proto/crosschain/nonce_to_cctx.proto | 12 - proto/crosschain/pending_nonces.proto | 12 - proto/crosschain/query.proto | 54 - proto/crosschain/tx.proto | 1 - .../chain_nonces.proto | 5 +- proto/observer/genesis.proto | 6 + proto/observer/nonce_to_cctx.proto | 15 + proto/observer/pending_nonces.proto | 15 + proto/observer/query.proto | 62 +- proto/observer/tx.proto | 1 + testutil/keeper/mocks/crosschain/observer.go | 189 + testutil/network/genesis_state.go | 33 +- testutil/sample/crosschain.go | 28 - testutil/sample/observer.go | 48 + typescript/crosschain/genesis_pb.d.ts | 12 - typescript/crosschain/index.d.ts | 3 - typescript/crosschain/query_pb.d.ts | 204 -- .../chain_nonces_pb.d.ts | 6 +- typescript/observer/genesis_pb.d.ts | 18 + typescript/observer/index.d.ts | 3 + .../nonce_to_cctx_pb.d.ts | 6 +- .../pending_nonces_pb.d.ts | 6 +- typescript/observer/query_pb.d.ts | 206 +- x/crosschain/client/cli/query.go | 5 +- x/crosschain/client/integrationtests/suite.go | 2 +- x/crosschain/client/querytests/suite.go | 2 +- x/crosschain/genesis.go | 34 - x/crosschain/genesis_test.go | 6 - x/crosschain/keeper/cctx.go | 3 +- x/crosschain/keeper/cctx_utils.go | 8 +- x/crosschain/keeper/grpc_query_cctx.go | 8 +- x/crosschain/keeper/grpc_query_cctx_test.go | 13 +- .../keeper/msg_server_migrate_tss_funds.go | 2 +- .../msg_server_migrate_tss_funds_test.go | 16 +- x/crosschain/keeper/msg_server_tss_voter.go | 2 +- x/crosschain/keeper/msg_server_update_tss.go | 2 +- .../keeper/msg_server_vote_outbound_tx.go | 4 +- .../keeper/msg_server_whitelist_erc20_test.go | 4 +- x/crosschain/keeper/nonces_test.go | 46 - x/crosschain/migrations/v4/migrate.go | 68 +- x/crosschain/migrations/v4/migrate_test.go | 33 + x/crosschain/types/expected_keepers.go | 13 + x/crosschain/types/genesis.go | 10 - x/crosschain/types/genesis.pb.go | 189 +- x/crosschain/types/keys.go | 6 +- x/crosschain/types/query.pb.go | 3259 ++++------------- x/crosschain/types/query.pb.gw.go | 368 -- x/crosschain/types/tx.pb.go | 161 +- x/emissions/client/tests/suite.go | 2 +- x/observer/client/cli/cli_supported_chains.go | 75 - x/observer/client/cli/query.go | 3 + .../client/cli/query_chain_nonce.go} | 28 +- .../cli/{cli_keygen.go => query_keygen.go} | 0 ..._node_account.go => query_node_account.go} | 0 x/observer/client/cli/query_pending_nonces.go | 36 + .../client/cli/query_supported_chains.go | 36 + .../client/cli/{cli_tss.go => query_tss.go} | 2 - .../client/querytests/chain_nonces.go | 10 +- x/observer/client/querytests/suite.go | 2 +- x/observer/genesis.go | 43 +- x/observer/genesis_test.go | 7 + x/observer/keeper/chain_nonces.go | 52 + x/observer/keeper/chain_nonces_test.go | 42 + .../keeper/grpc_query_nonces.go | 10 +- .../keeper/grpc_query_nonces_test.go | 52 +- x/observer/keeper/nonce_to_cctx.go | 53 + x/observer/keeper/nonce_to_cctx_test.go | 42 + x/observer/keeper/nonces_test.go | 43 + .../keeper/pending_nonces.go | 80 +- .../keeper/pending_nonces_test.go | 6 +- .../types/chain_nonces.pb.go | 48 +- x/observer/types/genesis.go | 11 + x/observer/types/genesis.pb.go | 264 +- x/observer/types/keys.go | 4 + .../types/nonce_to_cctx.pb.go | 44 +- .../types/pending_nonces.pb.go | 44 +- x/observer/types/query.pb.go | 2162 +++++++++-- x/observer/types/query.pb.gw.go | 376 +- x/observer/types/tx.pb.go | 107 +- zetaclient/interfaces.go | 2 +- zetaclient/query.go | 22 +- 89 files changed, 5071 insertions(+), 4566 deletions(-) rename docs/cli/zetacored/{zetacored_query_crosschain_list-chain-nonces.md => zetacored_query_observer_list-chain-nonces.md} (87%) rename docs/cli/zetacored/{zetacored_query_crosschain_list-pending-nonces.md => zetacored_query_observer_list-pending-nonces.md} (81%) rename docs/cli/zetacored/{zetacored_query_crosschain_show-chain-nonces.md => zetacored_query_observer_show-chain-nonces.md} (81%) delete mode 100644 proto/crosschain/nonce_to_cctx.proto delete mode 100644 proto/crosschain/pending_nonces.proto rename proto/{crosschain => observer}/chain_nonces.proto (61%) create mode 100644 proto/observer/nonce_to_cctx.proto create mode 100644 proto/observer/pending_nonces.proto rename typescript/{crosschain => observer}/chain_nonces_pb.d.ts (84%) rename typescript/{crosschain => observer}/nonce_to_cctx_pb.d.ts (83%) rename typescript/{crosschain => observer}/pending_nonces_pb.d.ts (83%) delete mode 100644 x/crosschain/keeper/nonces_test.go delete mode 100644 x/observer/client/cli/cli_supported_chains.go rename x/{crosschain/client/cli/cli_chain_nonce.go => observer/client/cli/query_chain_nonce.go} (69%) rename x/observer/client/cli/{cli_keygen.go => query_keygen.go} (100%) rename x/observer/client/cli/{cli_node_account.go => query_node_account.go} (100%) create mode 100644 x/observer/client/cli/query_pending_nonces.go create mode 100644 x/observer/client/cli/query_supported_chains.go rename x/observer/client/cli/{cli_tss.go => query_tss.go} (96%) rename x/{crosschain => observer}/client/querytests/chain_nonces.go (93%) create mode 100644 x/observer/keeper/chain_nonces.go create mode 100644 x/observer/keeper/chain_nonces_test.go rename x/{crosschain => observer}/keeper/grpc_query_nonces.go (91%) rename x/{crosschain => observer}/keeper/grpc_query_nonces_test.go (54%) create mode 100644 x/observer/keeper/nonce_to_cctx.go create mode 100644 x/observer/keeper/nonce_to_cctx_test.go create mode 100644 x/observer/keeper/nonces_test.go rename x/{crosschain => observer}/keeper/pending_nonces.go (51%) rename x/{crosschain => observer}/keeper/pending_nonces_test.go (93%) rename x/{crosschain => observer}/types/chain_nonces.pb.go (84%) rename x/{crosschain => observer}/types/nonce_to_cctx.pb.go (83%) rename x/{crosschain => observer}/types/pending_nonces.pb.go (82%) diff --git a/changelog.md b/changelog.md index d9394a05ef..d307a07e74 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,11 @@ ## Unreleased +### Breaking Changes +- PendingNonces :Changed from `/zeta-chain/crosschain/pendingNonces/{chain_id}/{address}` to `/zeta-chain/observer/pendingNonces/{chain_id}/{address}` . It returns all the pending nonces for a chain id and address. This returns the current pending nonces for the chain. +- ChainNonces : Changed from `/zeta-chain/criosschain/chainNonces/{chain_id}` to`/zeta-chain/observer/chainNonces/{chain_id}` . It returns all the chain nonces for a chain id. This returns the current nonce oof the TSS address for the chain. +- ChainNoncesAll :Changed from `/zeta-chain/observer/chainNonces` to `/zeta-chain/observer/chainNonces` . It returns all the chain nonces for all chains. This returns the current nonce of the TSS address for all chains. + ### Features * [1395](https://github.com/zeta-chain/node/pull/1395) - Add state variable to track aborted zeta amount * [1387](https://github.com/zeta-chain/node/pull/1387) - Add HSM capability for zetaclient hot key @@ -30,7 +35,8 @@ * refactor cctx scheduler - decouple evm cctx scheduler from btc cctx scheduler * [1391](https://github.com/zeta-chain/node/pull/1391) - consolidate node builds * update `MsgUpdateContractBytecode` to use code hash instead of contract address -* move tss state date from crosschain to observer +* move tss state from crosschain to observer +* move pending nonces, chain nonces and nonce to cctx to observer * move tss related cli from crosschain to observer * reorganize smoke tests structure * Add pagination to queries which iterate over large data sets InTxTrackerAll ,PendingNoncesAll ,AllBlameRecord ,TssHistory diff --git a/docs/cli/zetacored/zetacored_query_crosschain.md b/docs/cli/zetacored/zetacored_query_crosschain.md index 5df4912f58..0f973fe712 100644 --- a/docs/cli/zetacored/zetacored_query_crosschain.md +++ b/docs/cli/zetacored/zetacored_query_crosschain.md @@ -30,16 +30,13 @@ zetacored query crosschain [flags] * [zetacored query crosschain last-zeta-height](zetacored_query_crosschain_last-zeta-height.md) - Query last Zeta Height * [zetacored query crosschain list-all-in-tx-trackers](zetacored_query_crosschain_list-all-in-tx-trackers.md) - shows all inTxTrackers * [zetacored query crosschain list-cctx](zetacored_query_crosschain_list-cctx.md) - list all CCTX -* [zetacored query crosschain list-chain-nonces](zetacored_query_crosschain_list-chain-nonces.md) - list all chainNonces * [zetacored query crosschain list-gas-price](zetacored_query_crosschain_list-gas-price.md) - list all gasPrice * [zetacored query crosschain list-in-tx-hash-to-cctx](zetacored_query_crosschain_list-in-tx-hash-to-cctx.md) - list all inTxHashToCctx * [zetacored query crosschain list-in-tx-tracker](zetacored_query_crosschain_list-in-tx-tracker.md) - shows a list of in tx tracker by chainId * [zetacored query crosschain list-out-tx-tracker](zetacored_query_crosschain_list-out-tx-tracker.md) - list all OutTxTracker * [zetacored query crosschain list-pending-cctx](zetacored_query_crosschain_list-pending-cctx.md) - shows pending CCTX -* [zetacored query crosschain list-pending-nonces](zetacored_query_crosschain_list-pending-nonces.md) - shows a chainNonces * [zetacored query crosschain params](zetacored_query_crosschain_params.md) - shows the parameters of the module * [zetacored query crosschain show-cctx](zetacored_query_crosschain_show-cctx.md) - shows a CCTX -* [zetacored query crosschain show-chain-nonces](zetacored_query_crosschain_show-chain-nonces.md) - shows a chainNonces * [zetacored query crosschain show-gas-price](zetacored_query_crosschain_show-gas-price.md) - shows a gasPrice * [zetacored query crosschain show-in-tx-hash-to-cctx](zetacored_query_crosschain_show-in-tx-hash-to-cctx.md) - shows a inTxHashToCctx * [zetacored query crosschain show-out-tx-tracker](zetacored_query_crosschain_show-out-tx-tracker.md) - shows a OutTxTracker diff --git a/docs/cli/zetacored/zetacored_query_observer.md b/docs/cli/zetacored/zetacored_query_observer.md index 0aa37121cc..73492a3bf1 100644 --- a/docs/cli/zetacored/zetacored_query_observer.md +++ b/docs/cli/zetacored/zetacored_query_observer.md @@ -29,14 +29,17 @@ zetacored query observer [flags] * [zetacored query observer get-tss-address](zetacored_query_observer_get-tss-address.md) - Query current tss address * [zetacored query observer list-blame](zetacored_query_observer_list-blame.md) - Query AllBlameRecords * [zetacored query observer list-blame-by-msg](zetacored_query_observer_list-blame-by-msg.md) - Query AllBlameRecords +* [zetacored query observer list-chain-nonces](zetacored_query_observer_list-chain-nonces.md) - list all chainNonces * [zetacored query observer list-chains](zetacored_query_observer_list-chains.md) - list all SupportedChains * [zetacored query observer list-core-params](zetacored_query_observer_list-core-params.md) - Query GetCoreParams * [zetacored query observer list-node-account](zetacored_query_observer_list-node-account.md) - list all NodeAccount * [zetacored query observer list-observer](zetacored_query_observer_list-observer.md) - Query All Observer Mappers +* [zetacored query observer list-pending-nonces](zetacored_query_observer_list-pending-nonces.md) - shows a chainNonces * [zetacored query observer list-tss-history](zetacored_query_observer_list-tss-history.md) - show historical list of TSS * [zetacored query observer params](zetacored_query_observer_params.md) - shows the parameters of the module * [zetacored query observer show-ballot](zetacored_query_observer_show-ballot.md) - Query BallotByIdentifier * [zetacored query observer show-blame](zetacored_query_observer_show-blame.md) - Query BlameByIdentifier +* [zetacored query observer show-chain-nonces](zetacored_query_observer_show-chain-nonces.md) - shows a chainNonces * [zetacored query observer show-core-params](zetacored_query_observer_show-core-params.md) - Query GetCoreParamsForChain * [zetacored query observer show-crosschain-flags](zetacored_query_observer_show-crosschain-flags.md) - shows the crosschain flags * [zetacored query observer show-keygen](zetacored_query_observer_show-keygen.md) - shows keygen diff --git a/docs/cli/zetacored/zetacored_query_crosschain_list-chain-nonces.md b/docs/cli/zetacored/zetacored_query_observer_list-chain-nonces.md similarity index 87% rename from docs/cli/zetacored/zetacored_query_crosschain_list-chain-nonces.md rename to docs/cli/zetacored/zetacored_query_observer_list-chain-nonces.md index 5fa031861b..b11ee00a5a 100644 --- a/docs/cli/zetacored/zetacored_query_crosschain_list-chain-nonces.md +++ b/docs/cli/zetacored/zetacored_query_observer_list-chain-nonces.md @@ -1,9 +1,9 @@ -# query crosschain list-chain-nonces +# query observer list-chain-nonces list all chainNonces ``` -zetacored query crosschain list-chain-nonces [flags] +zetacored query observer list-chain-nonces [flags] ``` ### Options @@ -35,5 +35,5 @@ zetacored query crosschain list-chain-nonces [flags] ### SEE ALSO -* [zetacored query crosschain](zetacored_query_crosschain.md) - Querying commands for the crosschain module +* [zetacored query observer](zetacored_query_observer.md) - Querying commands for the observer module diff --git a/docs/cli/zetacored/zetacored_query_crosschain_list-pending-nonces.md b/docs/cli/zetacored/zetacored_query_observer_list-pending-nonces.md similarity index 81% rename from docs/cli/zetacored/zetacored_query_crosschain_list-pending-nonces.md rename to docs/cli/zetacored/zetacored_query_observer_list-pending-nonces.md index 0e45b9d2c1..c4828f8b9e 100644 --- a/docs/cli/zetacored/zetacored_query_crosschain_list-pending-nonces.md +++ b/docs/cli/zetacored/zetacored_query_observer_list-pending-nonces.md @@ -1,9 +1,9 @@ -# query crosschain list-pending-nonces +# query observer list-pending-nonces shows a chainNonces ``` -zetacored query crosschain list-pending-nonces [flags] +zetacored query observer list-pending-nonces [flags] ``` ### Options @@ -29,5 +29,5 @@ zetacored query crosschain list-pending-nonces [flags] ### SEE ALSO -* [zetacored query crosschain](zetacored_query_crosschain.md) - Querying commands for the crosschain module +* [zetacored query observer](zetacored_query_observer.md) - Querying commands for the observer module diff --git a/docs/cli/zetacored/zetacored_query_crosschain_show-chain-nonces.md b/docs/cli/zetacored/zetacored_query_observer_show-chain-nonces.md similarity index 81% rename from docs/cli/zetacored/zetacored_query_crosschain_show-chain-nonces.md rename to docs/cli/zetacored/zetacored_query_observer_show-chain-nonces.md index cca85f76cf..682858735f 100644 --- a/docs/cli/zetacored/zetacored_query_crosschain_show-chain-nonces.md +++ b/docs/cli/zetacored/zetacored_query_observer_show-chain-nonces.md @@ -1,9 +1,9 @@ -# query crosschain show-chain-nonces +# query observer show-chain-nonces shows a chainNonces ``` -zetacored query crosschain show-chain-nonces [index] [flags] +zetacored query observer show-chain-nonces [index] [flags] ``` ### Options @@ -29,5 +29,5 @@ zetacored query crosschain show-chain-nonces [index] [flags] ### SEE ALSO -* [zetacored query crosschain](zetacored_query_crosschain.md) - Querying commands for the crosschain module +* [zetacored query observer](zetacored_query_observer.md) - Querying commands for the observer module diff --git a/docs/openapi/openapi.swagger.yaml b/docs/openapi/openapi.swagger.yaml index 7481bf33df..2ae06c6b6d 100644 --- a/docs/openapi/openapi.swagger.yaml +++ b/docs/openapi/openapi.swagger.yaml @@ -26462,21 +26462,6 @@ paths: type: boolean tags: - Query - /zeta-chain/crosschain/TSS: - get: - summary: Queries a tSS by index. - operationId: Query_TSS - responses: - "200": - description: A successful response. - schema: - $ref: '#/definitions/observerQueryGetTSSResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - tags: - - Query /zeta-chain/crosschain/cctx: get: summary: Queries a list of send items. @@ -26608,85 +26593,6 @@ paths: format: int64 tags: - Query - /zeta-chain/crosschain/chainNonces: - get: - summary: Queries a list of chainNonces items. - operationId: Query_ChainNoncesAll - responses: - "200": - description: A successful response. - schema: - $ref: '#/definitions/crosschainQueryAllChainNoncesResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - parameters: - - name: pagination.key - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: |- - offset is a numeric offset that can be used when key is unavailable. - It is less efficient than using key. Only one of offset or key should - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: |- - limit is the total number of results to be returned in the result page. - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: |- - count_total is set to true to indicate that the result set should include - a count of the total number of items available for pagination in UIs. - count_total is only respected when offset is used. It is ignored when key - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: |- - reverse is set to true if results are to be returned in the descending order. - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /zeta-chain/crosschain/chainNonces/{index}: - get: - summary: Queries a chainNonces by index. - operationId: Query_ChainNonces - responses: - "200": - description: A successful response. - schema: - $ref: '#/definitions/crosschainQueryGetChainNoncesResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - parameters: - - name: index - in: path - required: true - type: string - tags: - - Query /zeta-chain/crosschain/convertGasToZeta: get: operationId: Query_ConvertGasToZeta @@ -26790,52 +26696,6 @@ paths: type: string tags: - Query - /zeta-chain/crosschain/get_tss_address: - get: - summary: Queries a list of GetTssAddress items. - operationId: Query_GetTssAddress - responses: - "200": - description: A successful response. - schema: - $ref: '#/definitions/observerQueryGetTssAddressResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - parameters: - - name: bitcoin_chain_id - in: query - required: false - type: string - format: int64 - tags: - - Query - /zeta-chain/crosschain/get_tss_address_historical/{finalized_zeta_height}/{bitcoin_chain_id}: - get: - operationId: Query_GetTssAddressByFinalizedHeight - responses: - "200": - description: A successful response. - schema: - $ref: '#/definitions/observerQueryGetTssAddressByFinalizedHeightResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - parameters: - - name: finalized_zeta_height - in: path - required: true - type: string - format: int64 - - name: bitcoin_chain_id - in: path - required: true - type: string - format: int64 - tags: - - Query /zeta-chain/crosschain/in_tx_hash_to_cctx_data/{inTxHash}: get: summary: Queries a InTxHashToCctx data by index. @@ -27313,84 +27173,6 @@ paths: $ref: '#/definitions/googlerpcStatus' tags: - Query - /zeta-chain/crosschain/pendingNonces: - get: - operationId: Query_PendingNoncesAll - responses: - "200": - description: A successful response. - schema: - $ref: '#/definitions/crosschainQueryAllPendingNoncesResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - parameters: - - name: pagination.key - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: |- - offset is a numeric offset that can be used when key is unavailable. - It is less efficient than using key. Only one of offset or key should - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: |- - limit is the total number of results to be returned in the result page. - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: |- - count_total is set to true to indicate that the result set should include - a count of the total number of items available for pagination in UIs. - count_total is only respected when offset is used. It is ignored when key - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: |- - reverse is set to true if results are to be returned in the descending order. - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query - /zeta-chain/crosschain/pendingNonces/{chain_id}: - get: - operationId: Query_PendingNoncesByChain - responses: - "200": - description: A successful response. - schema: - $ref: '#/definitions/crosschainQueryPendingNoncesByChainResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - parameters: - - name: chain_id - in: path - required: true - type: string - format: int64 - tags: - - Query /zeta-chain/crosschain/protocolFee: get: operationId: Query_ProtocolFee @@ -27405,64 +27187,6 @@ paths: $ref: '#/definitions/googlerpcStatus' tags: - Query - /zeta-chain/crosschain/tssHistory: - get: - operationId: Query_TssHistory - responses: - "200": - description: A successful response. - schema: - $ref: '#/definitions/observerQueryTssHistoryResponse' - default: - description: An unexpected error response. - schema: - $ref: '#/definitions/googlerpcStatus' - parameters: - - name: pagination.key - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: |- - offset is a numeric offset that can be used when key is unavailable. - It is less efficient than using key. Only one of offset or key should - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: |- - limit is the total number of results to be returned in the result page. - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: |- - count_total is set to true to indicate that the result set should include - a count of the total number of items available for pagination in UIs. - count_total is only respected when offset is used. It is ignored when key - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: |- - reverse is set to true if results are to be returned in the descending order. - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean - tags: - - Query /zeta-chain/crosschain/zetaAccounting: get: operationId: Query_ZetaAccounting @@ -27707,6 +27431,21 @@ paths: $ref: '#/definitions/googlerpcStatus' tags: - Query + /zeta-chain/observer/TSS: + get: + summary: Queries a tSS by index. + operationId: Query_TSS + responses: + "200": + description: A successful response. + schema: + $ref: '#/definitions/observerQueryGetTSSResponse' + default: + description: An unexpected error response. + schema: + $ref: '#/definitions/googlerpcStatus' + tags: + - Query /zeta-chain/observer/all_observer_mappers: get: operationId: Query_AllObserverMappers @@ -27787,6 +27526,85 @@ paths: type: string tags: - Query + /zeta-chain/observer/chainNonces: + get: + summary: Queries a list of chainNonces items. + operationId: Query_ChainNoncesAll + responses: + "200": + description: A successful response. + schema: + $ref: '#/definitions/observerQueryAllChainNoncesResponse' + default: + description: An unexpected error response. + schema: + $ref: '#/definitions/googlerpcStatus' + parameters: + - name: pagination.key + description: |- + key is a value returned in PageResponse.next_key to begin + querying the next page most efficiently. Only one of offset or key + should be set. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: |- + offset is a numeric offset that can be used when key is unavailable. + It is less efficient than using key. Only one of offset or key should + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: |- + limit is the total number of results to be returned in the result page. + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: |- + count_total is set to true to indicate that the result set should include + a count of the total number of items available for pagination in UIs. + count_total is only respected when offset is used. It is ignored when key + is set. + in: query + required: false + type: boolean + - name: pagination.reverse + description: |- + reverse is set to true if results are to be returned in the descending order. + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /zeta-chain/observer/chainNonces/{index}: + get: + summary: Queries a chainNonces by index. + operationId: Query_ChainNonces + responses: + "200": + description: A successful response. + schema: + $ref: '#/definitions/observerQueryGetChainNoncesResponse' + default: + description: An unexpected error response. + schema: + $ref: '#/definitions/googlerpcStatus' + parameters: + - name: index + in: path + required: true + type: string + tags: + - Query /zeta-chain/observer/crosschain_flags: get: operationId: Query_CrosschainFlags @@ -27987,11 +27805,57 @@ paths: "200": description: A successful response. schema: - $ref: '#/definitions/observerQueryGetCoreParamsResponse' + $ref: '#/definitions/observerQueryGetCoreParamsResponse' + default: + description: An unexpected error response. + schema: + $ref: '#/definitions/googlerpcStatus' + tags: + - Query + /zeta-chain/observer/get_tss_address: + get: + summary: Queries a list of GetTssAddress items. + operationId: Query_GetTssAddress + responses: + "200": + description: A successful response. + schema: + $ref: '#/definitions/observerQueryGetTssAddressResponse' + default: + description: An unexpected error response. + schema: + $ref: '#/definitions/googlerpcStatus' + parameters: + - name: bitcoin_chain_id + in: query + required: false + type: string + format: int64 + tags: + - Query + /zeta-chain/observer/get_tss_address_historical/{finalized_zeta_height}/{bitcoin_chain_id}: + get: + operationId: Query_GetTssAddressByFinalizedHeight + responses: + "200": + description: A successful response. + schema: + $ref: '#/definitions/observerQueryGetTssAddressByFinalizedHeightResponse' default: description: An unexpected error response. schema: $ref: '#/definitions/googlerpcStatus' + parameters: + - name: finalized_zeta_height + in: path + required: true + type: string + format: int64 + - name: bitcoin_chain_id + in: path + required: true + type: string + format: int64 tags: - Query /zeta-chain/observer/has_voted/{ballot_identifier}/{voter_address}: @@ -28147,6 +28011,84 @@ paths: $ref: '#/definitions/googlerpcStatus' tags: - Query + /zeta-chain/observer/pendingNonces: + get: + operationId: Query_PendingNoncesAll + responses: + "200": + description: A successful response. + schema: + $ref: '#/definitions/observerQueryAllPendingNoncesResponse' + default: + description: An unexpected error response. + schema: + $ref: '#/definitions/googlerpcStatus' + parameters: + - name: pagination.key + description: |- + key is a value returned in PageResponse.next_key to begin + querying the next page most efficiently. Only one of offset or key + should be set. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: |- + offset is a numeric offset that can be used when key is unavailable. + It is less efficient than using key. Only one of offset or key should + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: |- + limit is the total number of results to be returned in the result page. + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: |- + count_total is set to true to indicate that the result set should include + a count of the total number of items available for pagination in UIs. + count_total is only respected when offset is used. It is ignored when key + is set. + in: query + required: false + type: boolean + - name: pagination.reverse + description: |- + reverse is set to true if results are to be returned in the descending order. + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query + /zeta-chain/observer/pendingNonces/{chain_id}: + get: + operationId: Query_PendingNoncesByChain + responses: + "200": + description: A successful response. + schema: + $ref: '#/definitions/observerQueryPendingNoncesByChainResponse' + default: + description: An unexpected error response. + schema: + $ref: '#/definitions/googlerpcStatus' + parameters: + - name: chain_id + in: path + required: true + type: string + format: int64 + tags: + - Query /zeta-chain/observer/prove: get: summary: merkle proof verification @@ -28226,6 +28168,64 @@ paths: $ref: '#/definitions/googlerpcStatus' tags: - Query + /zeta-chain/observer/tssHistory: + get: + operationId: Query_TssHistory + responses: + "200": + description: A successful response. + schema: + $ref: '#/definitions/observerQueryTssHistoryResponse' + default: + description: An unexpected error response. + schema: + $ref: '#/definitions/googlerpcStatus' + parameters: + - name: pagination.key + description: |- + key is a value returned in PageResponse.next_key to begin + querying the next page most efficiently. Only one of offset or key + should be set. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: |- + offset is a numeric offset that can be used when key is unavailable. + It is less efficient than using key. Only one of offset or key should + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: |- + limit is the total number of results to be returned in the result page. + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: |- + count_total is set to true to indicate that the result set should include + a count of the total number of items available for pagination in UIs. + count_total is only respected when offset is used. It is ignored when key + is set. + in: query + required: false + type: boolean + - name: pagination.reverse + description: |- + reverse is set to true if results are to be returned in the descending order. + + Since: cosmos-sdk 0.43 + in: query + required: false + type: boolean + tags: + - Query /zeta-chain/zetacore/fungible/gas_stability_pool_balance: get: summary: Queries all gas stability pool balances. @@ -50717,26 +50717,6 @@ definitions: - PendingRevert: outbound cannot succeed; should revert inbound - Reverted: inbound reverted. - Aborted: inbound tx error or invalid paramters and cannot revert; just abort - crosschainChainNonces: - type: object - properties: - creator: - type: string - index: - type: string - chain_id: - type: string - format: int64 - nonce: - type: string - format: uint64 - signers: - type: array - items: - type: string - finalizedHeight: - type: string - format: uint64 crosschainCrossChainTx: type: object properties: @@ -50934,21 +50914,6 @@ definitions: format: uint64 tss_pubkey: type: string - crosschainPendingNonces: - type: object - properties: - nonce_low: - type: string - format: int64 - nonce_high: - type: string - format: int64 - chain_id: - type: string - format: int64 - tss: - type: string - title: store key is tss+chainid crosschainQueryAllCctxResponse: type: object properties: @@ -50959,16 +50924,6 @@ definitions: $ref: '#/definitions/crosschainCrossChainTx' pagination: $ref: '#/definitions/v1beta1PageResponse' - crosschainQueryAllChainNoncesResponse: - type: object - properties: - ChainNonces: - type: array - items: - type: object - $ref: '#/definitions/crosschainChainNonces' - pagination: - $ref: '#/definitions/v1beta1PageResponse' crosschainQueryAllGasPriceResponse: type: object properties: @@ -51039,16 +50994,6 @@ definitions: $ref: '#/definitions/crosschainOutTxTracker' pagination: $ref: '#/definitions/v1beta1PageResponse' - crosschainQueryAllPendingNoncesResponse: - type: object - properties: - pending_nonces: - type: array - items: - type: object - $ref: '#/definitions/crosschainPendingNonces' - pagination: - $ref: '#/definitions/v1beta1PageResponse' crosschainQueryConvertGasToZetaResponse: type: object properties: @@ -51064,11 +51009,6 @@ definitions: properties: CrossChainTx: $ref: '#/definitions/crosschainCrossChainTx' - crosschainQueryGetChainNoncesResponse: - type: object - properties: - ChainNonces: - $ref: '#/definitions/crosschainChainNonces' crosschainQueryGetGasPriceResponse: type: object properties: @@ -51119,11 +51059,6 @@ definitions: properties: feeInZeta: type: string - crosschainQueryPendingNoncesByChainResponse: - type: object - properties: - pending_nonces: - $ref: '#/definitions/crosschainPendingNonces' crosschainQueryZetaAccountingResponse: type: object properties: @@ -51351,6 +51286,26 @@ definitions: type: boolean isBtcTypeChainEnabled: type: boolean + observerChainNonces: + type: object + properties: + creator: + type: string + index: + type: string + chain_id: + type: string + format: int64 + nonce: + type: string + format: uint64 + signers: + type: array + items: + type: string + finalizedHeight: + type: string + format: uint64 observerCoreParams: type: object properties: @@ -51538,6 +51493,21 @@ definitions: - Tombstoned - AdminUpdate default: Undefined + observerPendingNonces: + type: object + properties: + nonce_low: + type: string + format: int64 + nonce_high: + type: string + format: int64 + chain_id: + type: string + format: int64 + tss: + type: string + title: store key is tss+chainid observerPolicy_Type: type: string enum: @@ -51564,6 +51534,16 @@ definitions: $ref: '#/definitions/commonBlockHeader' pagination: $ref: '#/definitions/v1beta1PageResponse' + observerQueryAllChainNoncesResponse: + type: object + properties: + ChainNonces: + type: array + items: + type: object + $ref: '#/definitions/observerChainNonces' + pagination: + $ref: '#/definitions/v1beta1PageResponse' observerQueryAllNodeAccountResponse: type: object properties: @@ -51582,6 +51562,16 @@ definitions: items: type: object $ref: '#/definitions/observerObserverMapper' + observerQueryAllPendingNoncesResponse: + type: object + properties: + pending_nonces: + type: array + items: + type: object + $ref: '#/definitions/observerPendingNonces' + pagination: + $ref: '#/definitions/v1beta1PageResponse' observerQueryBallotByIdentifierResponse: type: object properties: @@ -51619,6 +51609,11 @@ definitions: properties: block_header_state: $ref: '#/definitions/observerBlockHeaderState' + observerQueryGetChainNoncesResponse: + type: object + properties: + ChainNonces: + $ref: '#/definitions/observerChainNonces' observerQueryGetCoreParamsForChainResponse: type: object properties: @@ -51675,6 +51670,11 @@ definitions: type: array items: type: string + observerQueryPendingNoncesByChainResponse: + type: object + properties: + pending_nonces: + $ref: '#/definitions/observerPendingNonces' observerQueryProveResponse: type: object properties: diff --git a/proto/crosschain/genesis.proto b/proto/crosschain/genesis.proto index 63fb28b7a4..46d1b18066 100644 --- a/proto/crosschain/genesis.proto +++ b/proto/crosschain/genesis.proto @@ -1,7 +1,6 @@ syntax = "proto3"; package zetachain.zetacore.crosschain; -import "crosschain/chain_nonces.proto"; import "crosschain/cross_chain_tx.proto"; import "crosschain/gas_price.proto"; import "crosschain/in_tx_hash_to_cctx.proto"; @@ -9,7 +8,6 @@ import "crosschain/in_tx_tracker.proto"; import "crosschain/last_block_height.proto"; import "crosschain/out_tx_tracker.proto"; import "crosschain/params.proto"; -import "crosschain/pending_nonces.proto"; import "gogoproto/gogo.proto"; option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; @@ -19,11 +17,9 @@ message GenesisState { Params params = 1 [(gogoproto.nullable) = false]; repeated OutTxTracker outTxTrackerList = 2 [(gogoproto.nullable) = false]; repeated GasPrice gasPriceList = 5; - repeated ChainNonces chainNoncesList = 6; repeated CrossChainTx CrossChainTxs = 7; repeated LastBlockHeight lastBlockHeightList = 8; repeated InTxHashToCctx inTxHashToCctxList = 9 [(gogoproto.nullable) = false]; repeated InTxTracker in_tx_tracker_list = 11 [(gogoproto.nullable) = false]; ZetaAccounting zeta_accounting = 12 [(gogoproto.nullable) = false]; - repeated PendingNonces pending_nonces = 13 [(gogoproto.nullable) = false]; } diff --git a/proto/crosschain/nonce_to_cctx.proto b/proto/crosschain/nonce_to_cctx.proto deleted file mode 100644 index cec6524419..0000000000 --- a/proto/crosschain/nonce_to_cctx.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; -package zetachain.zetacore.crosschain; - -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; - -// store key is tss+chainid+nonce -message NonceToCctx { - int64 chain_id = 1; - int64 nonce = 2; - string cctxIndex = 3; - string tss = 4; -} diff --git a/proto/crosschain/pending_nonces.proto b/proto/crosschain/pending_nonces.proto deleted file mode 100644 index 70a6e88d3b..0000000000 --- a/proto/crosschain/pending_nonces.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; -package zetachain.zetacore.crosschain; - -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; - -// store key is tss+chainid -message PendingNonces { - int64 nonce_low = 1; - int64 nonce_high = 2; - int64 chain_id = 3; - string tss = 4; -} diff --git a/proto/crosschain/query.proto b/proto/crosschain/query.proto index 648a87bdb1..c9eee26378 100644 --- a/proto/crosschain/query.proto +++ b/proto/crosschain/query.proto @@ -2,16 +2,13 @@ syntax = "proto3"; package zetachain.zetacore.crosschain; import "cosmos/base/query/v1beta1/pagination.proto"; -import "crosschain/chain_nonces.proto"; import "crosschain/cross_chain_tx.proto"; import "crosschain/gas_price.proto"; import "crosschain/in_tx_hash_to_cctx.proto"; import "crosschain/in_tx_tracker.proto"; import "crosschain/last_block_height.proto"; -import "crosschain/nonce_to_cctx.proto"; import "crosschain/out_tx_tracker.proto"; import "crosschain/params.proto"; -import "crosschain/pending_nonces.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; @@ -78,24 +75,6 @@ service Query { option (google.api.http).get = "/zeta-chain/crosschain/protocolFee"; } - // Queries a chainNonces by index. - rpc ChainNonces(QueryGetChainNoncesRequest) returns (QueryGetChainNoncesResponse) { - option (google.api.http).get = "/zeta-chain/crosschain/chainNonces/{index}"; - } - - // Queries a list of chainNonces items. - rpc ChainNoncesAll(QueryAllChainNoncesRequest) returns (QueryAllChainNoncesResponse) { - option (google.api.http).get = "/zeta-chain/crosschain/chainNonces"; - } - - rpc PendingNoncesAll(QueryAllPendingNoncesRequest) returns (QueryAllPendingNoncesResponse) { - option (google.api.http).get = "/zeta-chain/crosschain/pendingNonces"; - } - - rpc PendingNoncesByChain(QueryPendingNoncesByChainRequest) returns (QueryPendingNoncesByChainResponse) { - option (google.api.http).get = "/zeta-chain/crosschain/pendingNonces/{chain_id}"; - } - // Queries a lastBlockHeight by index. rpc LastBlockHeight(QueryGetLastBlockHeightRequest) returns (QueryGetLastBlockHeightResponse) { option (google.api.http).get = "/zeta-chain/crosschain/lastBlockHeight/{index}"; @@ -238,39 +217,6 @@ message QueryAllGasPriceResponse { repeated GasPrice GasPrice = 1; cosmos.base.query.v1beta1.PageResponse pagination = 2; } -message QueryGetChainNoncesRequest { - string index = 1; -} - -message QueryGetChainNoncesResponse { - ChainNonces ChainNonces = 1; -} - -message QueryAllChainNoncesRequest { - cosmos.base.query.v1beta1.PageRequest pagination = 1; -} - -message QueryAllChainNoncesResponse { - repeated ChainNonces ChainNonces = 1; - cosmos.base.query.v1beta1.PageResponse pagination = 2; -} - -message QueryAllPendingNoncesRequest { - cosmos.base.query.v1beta1.PageRequest pagination = 1; -} - -message QueryAllPendingNoncesResponse { - repeated PendingNonces pending_nonces = 1 [(gogoproto.nullable) = false]; - cosmos.base.query.v1beta1.PageResponse pagination = 2; -} - -message QueryPendingNoncesByChainRequest { - int64 chain_id = 1; -} - -message QueryPendingNoncesByChainResponse { - PendingNonces pending_nonces = 1 [(gogoproto.nullable) = false]; -} message QueryGetLastBlockHeightRequest { string index = 1; diff --git a/proto/crosschain/tx.proto b/proto/crosschain/tx.proto index 482ff64b95..b660c38968 100644 --- a/proto/crosschain/tx.proto +++ b/proto/crosschain/tx.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package zetachain.zetacore.crosschain; import "common/common.proto"; -import "crosschain/pending_nonces.proto"; import "gogoproto/gogo.proto"; option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; diff --git a/proto/crosschain/chain_nonces.proto b/proto/observer/chain_nonces.proto similarity index 61% rename from proto/crosschain/chain_nonces.proto rename to proto/observer/chain_nonces.proto index 7372b65807..2ca53ac4cb 100644 --- a/proto/crosschain/chain_nonces.proto +++ b/proto/observer/chain_nonces.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -package zetachain.zetacore.crosschain; +package zetachain.zetacore.observer; +import "common/common.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types"; +option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; message ChainNonces { string creator = 1; diff --git a/proto/observer/genesis.proto b/proto/observer/genesis.proto index 20cfa4e8c4..d8a7e306a8 100644 --- a/proto/observer/genesis.proto +++ b/proto/observer/genesis.proto @@ -4,11 +4,14 @@ package zetachain.zetacore.observer; import "gogoproto/gogo.proto"; import "observer/ballot.proto"; import "observer/blame.proto"; +import "observer/chain_nonces.proto"; import "observer/crosschain_flags.proto"; import "observer/keygen.proto"; import "observer/node_account.proto"; +import "observer/nonce_to_cctx.proto"; import "observer/observer.proto"; import "observer/params.proto"; +import "observer/pending_nonces.proto"; import "observer/tss.proto"; import "observer/tss_funds_migrator.proto"; @@ -27,4 +30,7 @@ message GenesisState { repeated TSS tss_history = 10 [(gogoproto.nullable) = false]; repeated TssFundMigratorInfo tss_fund_migrators = 11 [(gogoproto.nullable) = false]; repeated Blame blame_list = 12 [(gogoproto.nullable) = false]; + repeated PendingNonces pending_nonces = 13 [(gogoproto.nullable) = false]; + repeated ChainNonces chain_nonces = 14 [(gogoproto.nullable) = false]; + repeated NonceToCctx nonce_to_cctx = 15 [(gogoproto.nullable) = false]; } diff --git a/proto/observer/nonce_to_cctx.proto b/proto/observer/nonce_to_cctx.proto new file mode 100644 index 0000000000..0c26d3b34c --- /dev/null +++ b/proto/observer/nonce_to_cctx.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +package zetachain.zetacore.observer; + +import "common/common.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; + +// store key is tss+chainid+nonce +message NonceToCctx { + int64 chain_id = 1; + int64 nonce = 2; + string cctxIndex = 3; + string tss = 4; +} diff --git a/proto/observer/pending_nonces.proto b/proto/observer/pending_nonces.proto new file mode 100644 index 0000000000..d3aee10cf1 --- /dev/null +++ b/proto/observer/pending_nonces.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +package zetachain.zetacore.observer; + +import "common/common.proto"; +import "gogoproto/gogo.proto"; + +option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; + +// store key is tss+chainid +message PendingNonces { + int64 nonce_low = 1; + int64 nonce_high = 2; + int64 chain_id = 3; + string tss = 4; +} diff --git a/proto/observer/query.proto b/proto/observer/query.proto index bc0ed754bb..4060bbdbed 100644 --- a/proto/observer/query.proto +++ b/proto/observer/query.proto @@ -8,11 +8,13 @@ import "google/api/annotations.proto"; import "observer/ballot.proto"; import "observer/blame.proto"; import "observer/block_header.proto"; +import "observer/chain_nonces.proto"; import "observer/crosschain_flags.proto"; import "observer/keygen.proto"; import "observer/node_account.proto"; import "observer/observer.proto"; import "observer/params.proto"; +import "observer/pending_nonces.proto"; import "observer/tss.proto"; option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; @@ -112,21 +114,73 @@ service Query { // Queries a list of GetTssAddress items. rpc GetTssAddress(QueryGetTssAddressRequest) returns (QueryGetTssAddressResponse) { - option (google.api.http).get = "/zeta-chain/crosschain/get_tss_address"; + option (google.api.http).get = "/zeta-chain/observer/get_tss_address"; } rpc GetTssAddressByFinalizedHeight(QueryGetTssAddressByFinalizedHeightRequest) returns (QueryGetTssAddressByFinalizedHeightResponse) { - option (google.api.http).get = "/zeta-chain/crosschain/get_tss_address_historical/{finalized_zeta_height}/{bitcoin_chain_id}"; + option (google.api.http).get = "/zeta-chain/observer/get_tss_address_historical/{finalized_zeta_height}/{bitcoin_chain_id}"; } // Queries a tSS by index. rpc TSS(QueryGetTSSRequest) returns (QueryGetTSSResponse) { - option (google.api.http).get = "/zeta-chain/crosschain/TSS"; + option (google.api.http).get = "/zeta-chain/observer/TSS"; } rpc TssHistory(QueryTssHistoryRequest) returns (QueryTssHistoryResponse) { - option (google.api.http).get = "/zeta-chain/crosschain/tssHistory"; + option (google.api.http).get = "/zeta-chain/observer/tssHistory"; } + + rpc PendingNoncesAll(QueryAllPendingNoncesRequest) returns (QueryAllPendingNoncesResponse) { + option (google.api.http).get = "/zeta-chain/observer/pendingNonces"; + } + + rpc PendingNoncesByChain(QueryPendingNoncesByChainRequest) returns (QueryPendingNoncesByChainResponse) { + option (google.api.http).get = "/zeta-chain/observer/pendingNonces/{chain_id}"; + } + + // Queries a chainNonces by index. + rpc ChainNonces(QueryGetChainNoncesRequest) returns (QueryGetChainNoncesResponse) { + option (google.api.http).get = "/zeta-chain/observer/chainNonces/{index}"; + } + + // Queries a list of chainNonces items. + rpc ChainNoncesAll(QueryAllChainNoncesRequest) returns (QueryAllChainNoncesResponse) { + option (google.api.http).get = "/zeta-chain/observer/chainNonces"; + } +} + +message QueryGetChainNoncesRequest { + string index = 1; +} + +message QueryGetChainNoncesResponse { + ChainNonces ChainNonces = 1 [(gogoproto.nullable) = false]; +} + +message QueryAllChainNoncesRequest { + cosmos.base.query.v1beta1.PageRequest pagination = 1; +} + +message QueryAllChainNoncesResponse { + repeated ChainNonces ChainNonces = 1 [(gogoproto.nullable) = false]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryAllPendingNoncesRequest { + cosmos.base.query.v1beta1.PageRequest pagination = 1; +} + +message QueryAllPendingNoncesResponse { + repeated PendingNonces pending_nonces = 1 [(gogoproto.nullable) = false]; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} + +message QueryPendingNoncesByChainRequest { + int64 chain_id = 1; +} + +message QueryPendingNoncesByChainResponse { + PendingNonces pending_nonces = 1 [(gogoproto.nullable) = false]; } message QueryGetTSSRequest {} diff --git a/proto/observer/tx.proto b/proto/observer/tx.proto index c7a33f6153..8198d12924 100644 --- a/proto/observer/tx.proto +++ b/proto/observer/tx.proto @@ -7,6 +7,7 @@ import "observer/blame.proto"; import "observer/crosschain_flags.proto"; import "observer/observer.proto"; import "observer/params.proto"; +import "observer/pending_nonces.proto"; import "observer/tss.proto"; option go_package = "github.com/zeta-chain/zetacore/x/observer/types"; diff --git a/testutil/keeper/mocks/crosschain/observer.go b/testutil/keeper/mocks/crosschain/observer.go index 3e405070cf..2f3bfb7669 100644 --- a/testutil/keeper/mocks/crosschain/observer.go +++ b/testutil/keeper/mocks/crosschain/observer.go @@ -163,6 +163,26 @@ func (_m *CrosschainObserverKeeper) GetAllBallots(ctx types.Context) []*observer return r0 } +// GetAllChainNonces provides a mock function with given fields: ctx +func (_m *CrosschainObserverKeeper) GetAllChainNonces(ctx types.Context) []observertypes.ChainNonces { + ret := _m.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for GetAllChainNonces") + } + + var r0 []observertypes.ChainNonces + if rf, ok := ret.Get(0).(func(types.Context) []observertypes.ChainNonces); ok { + r0 = rf(ctx) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]observertypes.ChainNonces) + } + } + + return r0 +} + // GetAllNodeAccount provides a mock function with given fields: ctx func (_m *CrosschainObserverKeeper) GetAllNodeAccount(ctx types.Context) []observertypes.NodeAccount { ret := _m.Called(ctx) @@ -183,6 +203,26 @@ func (_m *CrosschainObserverKeeper) GetAllNodeAccount(ctx types.Context) []obser return r0 } +// GetAllNonceToCctx provides a mock function with given fields: ctx +func (_m *CrosschainObserverKeeper) GetAllNonceToCctx(ctx types.Context) []observertypes.NonceToCctx { + ret := _m.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for GetAllNonceToCctx") + } + + var r0 []observertypes.NonceToCctx + if rf, ok := ret.Get(0).(func(types.Context) []observertypes.NonceToCctx); ok { + r0 = rf(ctx) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]observertypes.NonceToCctx) + } + } + + return r0 +} + // GetAllObserverMappers provides a mock function with given fields: ctx func (_m *CrosschainObserverKeeper) GetAllObserverMappers(ctx types.Context) []*observertypes.ObserverMapper { ret := _m.Called(ctx) @@ -203,6 +243,36 @@ func (_m *CrosschainObserverKeeper) GetAllObserverMappers(ctx types.Context) []* return r0 } +// GetAllPendingNonces provides a mock function with given fields: ctx +func (_m *CrosschainObserverKeeper) GetAllPendingNonces(ctx types.Context) ([]observertypes.PendingNonces, error) { + ret := _m.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for GetAllPendingNonces") + } + + var r0 []observertypes.PendingNonces + var r1 error + if rf, ok := ret.Get(0).(func(types.Context) ([]observertypes.PendingNonces, error)); ok { + return rf(ctx) + } + if rf, ok := ret.Get(0).(func(types.Context) []observertypes.PendingNonces); ok { + r0 = rf(ctx) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]observertypes.PendingNonces) + } + } + + if rf, ok := ret.Get(1).(func(types.Context) error); ok { + r1 = rf(ctx) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // GetAllTSS provides a mock function with given fields: ctx func (_m *CrosschainObserverKeeper) GetAllTSS(ctx types.Context) []observertypes.TSS { ret := _m.Called(ctx) @@ -299,6 +369,34 @@ func (_m *CrosschainObserverKeeper) GetBlockHeader(ctx types.Context, hash []byt return r0, r1 } +// GetChainNonces provides a mock function with given fields: ctx, index +func (_m *CrosschainObserverKeeper) GetChainNonces(ctx types.Context, index string) (observertypes.ChainNonces, bool) { + ret := _m.Called(ctx, index) + + if len(ret) == 0 { + panic("no return value specified for GetChainNonces") + } + + var r0 observertypes.ChainNonces + var r1 bool + if rf, ok := ret.Get(0).(func(types.Context, string) (observertypes.ChainNonces, bool)); ok { + return rf(ctx, index) + } + if rf, ok := ret.Get(0).(func(types.Context, string) observertypes.ChainNonces); ok { + r0 = rf(ctx, index) + } else { + r0 = ret.Get(0).(observertypes.ChainNonces) + } + + if rf, ok := ret.Get(1).(func(types.Context, string) bool); ok { + r1 = rf(ctx, index) + } else { + r1 = ret.Get(1).(bool) + } + + return r0, r1 +} + // GetCoreParamsByChainID provides a mock function with given fields: ctx, chainID func (_m *CrosschainObserverKeeper) GetCoreParamsByChainID(ctx types.Context, chainID int64) (*observertypes.CoreParams, bool) { ret := _m.Called(ctx, chainID) @@ -441,6 +539,34 @@ func (_m *CrosschainObserverKeeper) GetNodeAccount(ctx types.Context, address st return r0, r1 } +// GetNonceToCctx provides a mock function with given fields: ctx, tss, chainID, nonce +func (_m *CrosschainObserverKeeper) GetNonceToCctx(ctx types.Context, tss string, chainID int64, nonce int64) (observertypes.NonceToCctx, bool) { + ret := _m.Called(ctx, tss, chainID, nonce) + + if len(ret) == 0 { + panic("no return value specified for GetNonceToCctx") + } + + var r0 observertypes.NonceToCctx + var r1 bool + if rf, ok := ret.Get(0).(func(types.Context, string, int64, int64) (observertypes.NonceToCctx, bool)); ok { + return rf(ctx, tss, chainID, nonce) + } + if rf, ok := ret.Get(0).(func(types.Context, string, int64, int64) observertypes.NonceToCctx); ok { + r0 = rf(ctx, tss, chainID, nonce) + } else { + r0 = ret.Get(0).(observertypes.NonceToCctx) + } + + if rf, ok := ret.Get(1).(func(types.Context, string, int64, int64) bool); ok { + r1 = rf(ctx, tss, chainID, nonce) + } else { + r1 = ret.Get(1).(bool) + } + + return r0, r1 +} + // GetObserverMapper provides a mock function with given fields: ctx, chain func (_m *CrosschainObserverKeeper) GetObserverMapper(ctx types.Context, chain *common.Chain) (observertypes.ObserverMapper, bool) { ret := _m.Called(ctx, chain) @@ -487,6 +613,34 @@ func (_m *CrosschainObserverKeeper) GetParams(ctx types.Context) observertypes.P return r0 } +// GetPendingNonces provides a mock function with given fields: ctx, tss, chainID +func (_m *CrosschainObserverKeeper) GetPendingNonces(ctx types.Context, tss string, chainID int64) (observertypes.PendingNonces, bool) { + ret := _m.Called(ctx, tss, chainID) + + if len(ret) == 0 { + panic("no return value specified for GetPendingNonces") + } + + var r0 observertypes.PendingNonces + var r1 bool + if rf, ok := ret.Get(0).(func(types.Context, string, int64) (observertypes.PendingNonces, bool)); ok { + return rf(ctx, tss, chainID) + } + if rf, ok := ret.Get(0).(func(types.Context, string, int64) observertypes.PendingNonces); ok { + r0 = rf(ctx, tss, chainID) + } else { + r0 = ret.Get(0).(observertypes.PendingNonces) + } + + if rf, ok := ret.Get(1).(func(types.Context, string, int64) bool); ok { + r1 = rf(ctx, tss, chainID) + } else { + r1 = ret.Get(1).(bool) + } + + return r0, r1 +} + // GetPreviousTSS provides a mock function with given fields: ctx func (_m *CrosschainObserverKeeper) GetPreviousTSS(ctx types.Context) (observertypes.TSS, bool) { ret := _m.Called(ctx) @@ -614,11 +768,31 @@ func (_m *CrosschainObserverKeeper) RemoveAllExistingMigrators(ctx types.Context _m.Called(ctx) } +// RemoveChainNonces provides a mock function with given fields: ctx, index +func (_m *CrosschainObserverKeeper) RemoveChainNonces(ctx types.Context, index string) { + _m.Called(ctx, index) +} + +// RemoveFromPendingNonces provides a mock function with given fields: ctx, tss, chainID, nonce +func (_m *CrosschainObserverKeeper) RemoveFromPendingNonces(ctx types.Context, tss string, chainID int64, nonce int64) { + _m.Called(ctx, tss, chainID, nonce) +} + +// RemoveNonceToCctx provides a mock function with given fields: ctx, cctx +func (_m *CrosschainObserverKeeper) RemoveNonceToCctx(ctx types.Context, cctx observertypes.NonceToCctx) { + _m.Called(ctx, cctx) +} + // SetBallot provides a mock function with given fields: ctx, ballot func (_m *CrosschainObserverKeeper) SetBallot(ctx types.Context, ballot *observertypes.Ballot) { _m.Called(ctx, ballot) } +// SetChainNonces provides a mock function with given fields: ctx, chainNonces +func (_m *CrosschainObserverKeeper) SetChainNonces(ctx types.Context, chainNonces observertypes.ChainNonces) { + _m.Called(ctx, chainNonces) +} + // SetCrosschainFlags provides a mock function with given fields: ctx, crosschainFlags func (_m *CrosschainObserverKeeper) SetCrosschainFlags(ctx types.Context, crosschainFlags observertypes.CrosschainFlags) { _m.Called(ctx, crosschainFlags) @@ -644,11 +818,21 @@ func (_m *CrosschainObserverKeeper) SetNodeAccount(ctx types.Context, nodeAccoun _m.Called(ctx, nodeAccount) } +// SetNonceToCctx provides a mock function with given fields: ctx, nonceToCctx +func (_m *CrosschainObserverKeeper) SetNonceToCctx(ctx types.Context, nonceToCctx observertypes.NonceToCctx) { + _m.Called(ctx, nonceToCctx) +} + // SetObserverMapper provides a mock function with given fields: ctx, om func (_m *CrosschainObserverKeeper) SetObserverMapper(ctx types.Context, om *observertypes.ObserverMapper) { _m.Called(ctx, om) } +// SetPendingNonces provides a mock function with given fields: ctx, pendingNonces +func (_m *CrosschainObserverKeeper) SetPendingNonces(ctx types.Context, pendingNonces observertypes.PendingNonces) { + _m.Called(ctx, pendingNonces) +} + // SetTSS provides a mock function with given fields: ctx, tss func (_m *CrosschainObserverKeeper) SetTSS(ctx types.Context, tss observertypes.TSS) { _m.Called(ctx, tss) @@ -659,6 +843,11 @@ func (_m *CrosschainObserverKeeper) SetTSSHistory(ctx types.Context, tss observe _m.Called(ctx, tss) } +// SetTssAndUpdateNonce provides a mock function with given fields: ctx, tss +func (_m *CrosschainObserverKeeper) SetTssAndUpdateNonce(ctx types.Context, tss observertypes.TSS) { + _m.Called(ctx, tss) +} + // NewCrosschainObserverKeeper creates a new instance of CrosschainObserverKeeper. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewCrosschainObserverKeeper(t interface { diff --git a/testutil/network/genesis_state.go b/testutil/network/genesis_state.go index d2b1357c8e..623115330d 100644 --- a/testutil/network/genesis_state.go +++ b/testutil/network/genesis_state.go @@ -30,17 +30,6 @@ func SetupZetaGenesisState(t *testing.T, genesisState map[string]json.RawMessage NodeStatus: observertypes.NodeStatus_Active, } } - if setupChainNonces { - chainNonceList := make([]*types.ChainNonces, len(common.PrivnetChainList())) - for i, chain := range common.PrivnetChainList() { - chainNonceList[i] = &types.ChainNonces{ - Index: chain.ChainName.String(), - ChainId: chain.ChainId, - Nonce: 0, - } - } - crossChainGenesis.ChainNoncesList = chainNonceList - } crossChainGenesis.Params.Enabled = true assert.NoError(t, crossChainGenesis.Validate()) @@ -73,6 +62,18 @@ func SetupZetaGenesisState(t *testing.T, genesisState map[string]json.RawMessage ObserverList: observerList, } } + if setupChainNonces { + chainNonceList := make([]observertypes.ChainNonces, len(common.PrivnetChainList())) + for i, chain := range common.PrivnetChainList() { + chainNonceList[i] = observertypes.ChainNonces{ + Index: chain.ChainName.String(), + ChainId: chain.ChainId, + Nonce: 0, + } + } + observerGenesis.ChainNonces = chainNonceList + } + observerGenesis.Observers = observerMapper observerGenesis.NodeAccountList = nodeAccountList observerGenesis.Keygen = &observertypes.Keygen{ @@ -105,7 +106,7 @@ func SetupZetaGenesisState(t *testing.T, genesisState map[string]json.RawMessage genesisState[evmtypes.ModuleName] = evmGenesisBz } -func AddObserverData(t *testing.T, genesisState map[string]json.RawMessage, codec codec.Codec, ballots []*observertypes.Ballot) *observertypes.GenesisState { +func AddObserverData(t *testing.T, n int, genesisState map[string]json.RawMessage, codec codec.Codec, ballots []*observertypes.Ballot) *observertypes.GenesisState { state := observertypes.GenesisState{} assert.NoError(t, codec.UnmarshalJSON(genesisState[observertypes.ModuleName], &state)) if len(ballots) > 0 { @@ -135,6 +136,10 @@ func AddObserverData(t *testing.T, genesisState map[string]json.RawMessage, code nullify.Fill(&crosschainFlags) state.CrosschainFlags = crosschainFlags + for i := 0; i < n; i++ { + state.ChainNonces = append(state.ChainNonces, observertypes.ChainNonces{Creator: "ANY", Index: strconv.Itoa(i), Signers: []string{}}) + } + assert.NoError(t, state.Validate()) buf, err := codec.MarshalJSON(&state) @@ -160,9 +165,7 @@ func AddCrosschainData(t *testing.T, n int, genesisState map[string]json.RawMess ZetaFees: math.OneUint()}, ) } - for i := 0; i < n; i++ { - state.ChainNoncesList = append(state.ChainNoncesList, &types.ChainNonces{Creator: "ANY", Index: strconv.Itoa(i), Signers: []string{}}) - } + for i := 0; i < n; i++ { state.GasPriceList = append(state.GasPriceList, &types.GasPrice{Creator: "ANY", ChainId: int64(i), Index: strconv.Itoa(i), Prices: []uint64{}, BlockNums: []uint64{}, Signers: []string{}}) } diff --git a/testutil/sample/crosschain.go b/testutil/sample/crosschain.go index 3b8690e03b..a2e1e18846 100644 --- a/testutil/sample/crosschain.go +++ b/testutil/sample/crosschain.go @@ -33,19 +33,6 @@ func GasPrice(t *testing.T, index string) *types.GasPrice { } } -func ChainNonces(t *testing.T, index string) *types.ChainNonces { - r := newRandFromStringSeed(t, index) - - return &types.ChainNonces{ - Creator: AccAddress(), - Index: index, - ChainId: r.Int63(), - Nonce: r.Uint64(), - Signers: []string{AccAddress(), AccAddress()}, - FinalizedHeight: r.Uint64(), - } -} - func InboundTxParams(r *rand.Rand) *types.InboundTxParams { return &types.InboundTxParams{ Sender: EthAddress().String(), @@ -129,18 +116,3 @@ func ZetaAccounting(t *testing.T, index string) types.ZetaAccounting { AbortedZetaAmount: math.NewUint(uint64(r.Int63())), } } - -func PendingNoncesList(t *testing.T, index string, count int) []types.PendingNonces { - r := newRandFromStringSeed(t, index) - nonceLow := r.Int63() - list := make([]types.PendingNonces, count) - for i := 0; i < count; i++ { - list[i] = types.PendingNonces{ - ChainId: int64(i), - NonceLow: nonceLow, - NonceHigh: nonceLow + r.Int63(), - Tss: StringRandom(r, 32), - } - } - return list -} diff --git a/testutil/sample/observer.go b/testutil/sample/observer.go index 31eddb92f1..ac1395411e 100644 --- a/testutil/sample/observer.go +++ b/testutil/sample/observer.go @@ -152,3 +152,51 @@ func BlameRecordsList(t *testing.T, n int) []types.Blame { } return blameList } + +func ChainNonces(t *testing.T, index string) types.ChainNonces { + r := newRandFromStringSeed(t, index) + return types.ChainNonces{ + Creator: AccAddress(), + Index: index, + ChainId: r.Int63(), + Nonce: r.Uint64(), + Signers: []string{AccAddress(), AccAddress()}, + FinalizedHeight: r.Uint64(), + } +} + +func ChainNoncesList(t *testing.T, n int) []types.ChainNonces { + chainNoncesList := make([]types.ChainNonces, n) + for i := 0; i < n; i++ { + chainNoncesList[i] = ChainNonces(t, fmt.Sprintf("%d", i)) + } + return chainNoncesList +} + +func PendingNoncesList(t *testing.T, index string, count int) []types.PendingNonces { + r := newRandFromStringSeed(t, index) + nonceLow := r.Int63() + list := make([]types.PendingNonces, count) + for i := 0; i < count; i++ { + list[i] = types.PendingNonces{ + ChainId: int64(i), + NonceLow: nonceLow, + NonceHigh: nonceLow + r.Int63(), + Tss: StringRandom(r, 32), + } + } + return list +} + +func NonceToCctxList(t *testing.T, index string, count int) []types.NonceToCctx { + r := newRandFromStringSeed(t, index) + list := make([]types.NonceToCctx, count) + for i := 0; i < count; i++ { + list[i] = types.NonceToCctx{ + ChainId: int64(i), + Nonce: r.Int63(), + CctxIndex: StringRandom(r, 32), + } + } + return list +} diff --git a/typescript/crosschain/genesis_pb.d.ts b/typescript/crosschain/genesis_pb.d.ts index 87d8448bd5..7d4741170a 100644 --- a/typescript/crosschain/genesis_pb.d.ts +++ b/typescript/crosschain/genesis_pb.d.ts @@ -8,12 +8,10 @@ import { Message, proto3 } from "@bufbuild/protobuf"; import type { Params } from "./params_pb.js"; import type { OutTxTracker } from "./out_tx_tracker_pb.js"; import type { GasPrice } from "./gas_price_pb.js"; -import type { ChainNonces } from "./chain_nonces_pb.js"; import type { CrossChainTx, ZetaAccounting } from "./cross_chain_tx_pb.js"; import type { LastBlockHeight } from "./last_block_height_pb.js"; import type { InTxHashToCctx } from "./in_tx_hash_to_cctx_pb.js"; import type { InTxTracker } from "./in_tx_tracker_pb.js"; -import type { PendingNonces } from "./pending_nonces_pb.js"; /** * GenesisState defines the metacore module's genesis state. @@ -36,11 +34,6 @@ export declare class GenesisState extends Message { */ gasPriceList: GasPrice[]; - /** - * @generated from field: repeated zetachain.zetacore.crosschain.ChainNonces chainNoncesList = 6; - */ - chainNoncesList: ChainNonces[]; - /** * @generated from field: repeated zetachain.zetacore.crosschain.CrossChainTx CrossChainTxs = 7; */ @@ -66,11 +59,6 @@ export declare class GenesisState extends Message { */ zetaAccounting?: ZetaAccounting; - /** - * @generated from field: repeated zetachain.zetacore.crosschain.PendingNonces pending_nonces = 13; - */ - pendingNonces: PendingNonces[]; - constructor(data?: PartialMessage); static readonly runtime: typeof proto3; diff --git a/typescript/crosschain/index.d.ts b/typescript/crosschain/index.d.ts index 96eaa4f31e..4c073541bc 100644 --- a/typescript/crosschain/index.d.ts +++ b/typescript/crosschain/index.d.ts @@ -1,4 +1,3 @@ -export * from "./chain_nonces_pb"; export * from "./cross_chain_tx_pb"; export * from "./events_pb"; export * from "./gas_price_pb"; @@ -6,9 +5,7 @@ export * from "./genesis_pb"; export * from "./in_tx_hash_to_cctx_pb"; export * from "./in_tx_tracker_pb"; export * from "./last_block_height_pb"; -export * from "./nonce_to_cctx_pb"; export * from "./out_tx_tracker_pb"; export * from "./params_pb"; -export * from "./pending_nonces_pb"; export * from "./query_pb"; export * from "./tx_pb"; diff --git a/typescript/crosschain/query_pb.d.ts b/typescript/crosschain/query_pb.d.ts index e9bddc5e18..17bb54ef27 100644 --- a/typescript/crosschain/query_pb.d.ts +++ b/typescript/crosschain/query_pb.d.ts @@ -12,8 +12,6 @@ import type { InTxTracker } from "./in_tx_tracker_pb.js"; import type { InTxHashToCctx } from "./in_tx_hash_to_cctx_pb.js"; import type { CrossChainTx } from "./cross_chain_tx_pb.js"; import type { GasPrice } from "./gas_price_pb.js"; -import type { ChainNonces } from "./chain_nonces_pb.js"; -import type { PendingNonces } from "./pending_nonces_pb.js"; import type { LastBlockHeight } from "./last_block_height_pb.js"; /** @@ -633,208 +631,6 @@ export declare class QueryAllGasPriceResponse extends Message | undefined, b: QueryAllGasPriceResponse | PlainMessage | undefined): boolean; } -/** - * @generated from message zetachain.zetacore.crosschain.QueryGetChainNoncesRequest - */ -export declare class QueryGetChainNoncesRequest extends Message { - /** - * @generated from field: string index = 1; - */ - index: string; - - constructor(data?: PartialMessage); - - static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.QueryGetChainNoncesRequest"; - static readonly fields: FieldList; - - static fromBinary(bytes: Uint8Array, options?: Partial): QueryGetChainNoncesRequest; - - static fromJson(jsonValue: JsonValue, options?: Partial): QueryGetChainNoncesRequest; - - static fromJsonString(jsonString: string, options?: Partial): QueryGetChainNoncesRequest; - - static equals(a: QueryGetChainNoncesRequest | PlainMessage | undefined, b: QueryGetChainNoncesRequest | PlainMessage | undefined): boolean; -} - -/** - * @generated from message zetachain.zetacore.crosschain.QueryGetChainNoncesResponse - */ -export declare class QueryGetChainNoncesResponse extends Message { - /** - * @generated from field: zetachain.zetacore.crosschain.ChainNonces ChainNonces = 1; - */ - ChainNonces?: ChainNonces; - - constructor(data?: PartialMessage); - - static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.QueryGetChainNoncesResponse"; - static readonly fields: FieldList; - - static fromBinary(bytes: Uint8Array, options?: Partial): QueryGetChainNoncesResponse; - - static fromJson(jsonValue: JsonValue, options?: Partial): QueryGetChainNoncesResponse; - - static fromJsonString(jsonString: string, options?: Partial): QueryGetChainNoncesResponse; - - static equals(a: QueryGetChainNoncesResponse | PlainMessage | undefined, b: QueryGetChainNoncesResponse | PlainMessage | undefined): boolean; -} - -/** - * @generated from message zetachain.zetacore.crosschain.QueryAllChainNoncesRequest - */ -export declare class QueryAllChainNoncesRequest extends Message { - /** - * @generated from field: cosmos.base.query.v1beta1.PageRequest pagination = 1; - */ - pagination?: PageRequest; - - constructor(data?: PartialMessage); - - static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.QueryAllChainNoncesRequest"; - static readonly fields: FieldList; - - static fromBinary(bytes: Uint8Array, options?: Partial): QueryAllChainNoncesRequest; - - static fromJson(jsonValue: JsonValue, options?: Partial): QueryAllChainNoncesRequest; - - static fromJsonString(jsonString: string, options?: Partial): QueryAllChainNoncesRequest; - - static equals(a: QueryAllChainNoncesRequest | PlainMessage | undefined, b: QueryAllChainNoncesRequest | PlainMessage | undefined): boolean; -} - -/** - * @generated from message zetachain.zetacore.crosschain.QueryAllChainNoncesResponse - */ -export declare class QueryAllChainNoncesResponse extends Message { - /** - * @generated from field: repeated zetachain.zetacore.crosschain.ChainNonces ChainNonces = 1; - */ - ChainNonces: ChainNonces[]; - - /** - * @generated from field: cosmos.base.query.v1beta1.PageResponse pagination = 2; - */ - pagination?: PageResponse; - - constructor(data?: PartialMessage); - - static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.QueryAllChainNoncesResponse"; - static readonly fields: FieldList; - - static fromBinary(bytes: Uint8Array, options?: Partial): QueryAllChainNoncesResponse; - - static fromJson(jsonValue: JsonValue, options?: Partial): QueryAllChainNoncesResponse; - - static fromJsonString(jsonString: string, options?: Partial): QueryAllChainNoncesResponse; - - static equals(a: QueryAllChainNoncesResponse | PlainMessage | undefined, b: QueryAllChainNoncesResponse | PlainMessage | undefined): boolean; -} - -/** - * @generated from message zetachain.zetacore.crosschain.QueryAllPendingNoncesRequest - */ -export declare class QueryAllPendingNoncesRequest extends Message { - /** - * @generated from field: cosmos.base.query.v1beta1.PageRequest pagination = 1; - */ - pagination?: PageRequest; - - constructor(data?: PartialMessage); - - static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.QueryAllPendingNoncesRequest"; - static readonly fields: FieldList; - - static fromBinary(bytes: Uint8Array, options?: Partial): QueryAllPendingNoncesRequest; - - static fromJson(jsonValue: JsonValue, options?: Partial): QueryAllPendingNoncesRequest; - - static fromJsonString(jsonString: string, options?: Partial): QueryAllPendingNoncesRequest; - - static equals(a: QueryAllPendingNoncesRequest | PlainMessage | undefined, b: QueryAllPendingNoncesRequest | PlainMessage | undefined): boolean; -} - -/** - * @generated from message zetachain.zetacore.crosschain.QueryAllPendingNoncesResponse - */ -export declare class QueryAllPendingNoncesResponse extends Message { - /** - * @generated from field: repeated zetachain.zetacore.crosschain.PendingNonces pending_nonces = 1; - */ - pendingNonces: PendingNonces[]; - - /** - * @generated from field: cosmos.base.query.v1beta1.PageResponse pagination = 2; - */ - pagination?: PageResponse; - - constructor(data?: PartialMessage); - - static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.QueryAllPendingNoncesResponse"; - static readonly fields: FieldList; - - static fromBinary(bytes: Uint8Array, options?: Partial): QueryAllPendingNoncesResponse; - - static fromJson(jsonValue: JsonValue, options?: Partial): QueryAllPendingNoncesResponse; - - static fromJsonString(jsonString: string, options?: Partial): QueryAllPendingNoncesResponse; - - static equals(a: QueryAllPendingNoncesResponse | PlainMessage | undefined, b: QueryAllPendingNoncesResponse | PlainMessage | undefined): boolean; -} - -/** - * @generated from message zetachain.zetacore.crosschain.QueryPendingNoncesByChainRequest - */ -export declare class QueryPendingNoncesByChainRequest extends Message { - /** - * @generated from field: int64 chain_id = 1; - */ - chainId: bigint; - - constructor(data?: PartialMessage); - - static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.QueryPendingNoncesByChainRequest"; - static readonly fields: FieldList; - - static fromBinary(bytes: Uint8Array, options?: Partial): QueryPendingNoncesByChainRequest; - - static fromJson(jsonValue: JsonValue, options?: Partial): QueryPendingNoncesByChainRequest; - - static fromJsonString(jsonString: string, options?: Partial): QueryPendingNoncesByChainRequest; - - static equals(a: QueryPendingNoncesByChainRequest | PlainMessage | undefined, b: QueryPendingNoncesByChainRequest | PlainMessage | undefined): boolean; -} - -/** - * @generated from message zetachain.zetacore.crosschain.QueryPendingNoncesByChainResponse - */ -export declare class QueryPendingNoncesByChainResponse extends Message { - /** - * @generated from field: zetachain.zetacore.crosschain.PendingNonces pending_nonces = 1; - */ - pendingNonces?: PendingNonces; - - constructor(data?: PartialMessage); - - static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.QueryPendingNoncesByChainResponse"; - static readonly fields: FieldList; - - static fromBinary(bytes: Uint8Array, options?: Partial): QueryPendingNoncesByChainResponse; - - static fromJson(jsonValue: JsonValue, options?: Partial): QueryPendingNoncesByChainResponse; - - static fromJsonString(jsonString: string, options?: Partial): QueryPendingNoncesByChainResponse; - - static equals(a: QueryPendingNoncesByChainResponse | PlainMessage | undefined, b: QueryPendingNoncesByChainResponse | PlainMessage | undefined): boolean; -} - /** * @generated from message zetachain.zetacore.crosschain.QueryGetLastBlockHeightRequest */ diff --git a/typescript/crosschain/chain_nonces_pb.d.ts b/typescript/observer/chain_nonces_pb.d.ts similarity index 84% rename from typescript/crosschain/chain_nonces_pb.d.ts rename to typescript/observer/chain_nonces_pb.d.ts index 2f629ad9d9..1ae0c34cfe 100644 --- a/typescript/crosschain/chain_nonces_pb.d.ts +++ b/typescript/observer/chain_nonces_pb.d.ts @@ -1,5 +1,5 @@ // @generated by protoc-gen-es v1.3.0 with parameter "target=dts" -// @generated from file crosschain/chain_nonces.proto (package zetachain.zetacore.crosschain, syntax proto3) +// @generated from file observer/chain_nonces.proto (package zetachain.zetacore.observer, syntax proto3) /* eslint-disable */ // @ts-nocheck @@ -7,7 +7,7 @@ import type { BinaryReadOptions, FieldList, JsonReadOptions, JsonValue, PartialM import { Message, proto3 } from "@bufbuild/protobuf"; /** - * @generated from message zetachain.zetacore.crosschain.ChainNonces + * @generated from message zetachain.zetacore.observer.ChainNonces */ export declare class ChainNonces extends Message { /** @@ -43,7 +43,7 @@ export declare class ChainNonces extends Message { constructor(data?: PartialMessage); static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.ChainNonces"; + static readonly typeName = "zetachain.zetacore.observer.ChainNonces"; static readonly fields: FieldList; static fromBinary(bytes: Uint8Array, options?: Partial): ChainNonces; diff --git a/typescript/observer/genesis_pb.d.ts b/typescript/observer/genesis_pb.d.ts index 01e087b81b..6c6c1dc2b5 100644 --- a/typescript/observer/genesis_pb.d.ts +++ b/typescript/observer/genesis_pb.d.ts @@ -14,6 +14,9 @@ import type { Keygen } from "./keygen_pb.js"; import type { TSS } from "./tss_pb.js"; import type { TssFundMigratorInfo } from "./tss_funds_migrator_pb.js"; import type { Blame } from "./blame_pb.js"; +import type { PendingNonces } from "./pending_nonces_pb.js"; +import type { ChainNonces } from "./chain_nonces_pb.js"; +import type { NonceToCctx } from "./nonce_to_cctx_pb.js"; /** * @generated from message zetachain.zetacore.observer.GenesisState @@ -79,6 +82,21 @@ export declare class GenesisState extends Message { */ blameList: Blame[]; + /** + * @generated from field: repeated zetachain.zetacore.observer.PendingNonces pending_nonces = 13; + */ + pendingNonces: PendingNonces[]; + + /** + * @generated from field: repeated zetachain.zetacore.observer.ChainNonces chain_nonces = 14; + */ + chainNonces: ChainNonces[]; + + /** + * @generated from field: repeated zetachain.zetacore.observer.NonceToCctx nonce_to_cctx = 15; + */ + nonceToCctx: NonceToCctx[]; + constructor(data?: PartialMessage); static readonly runtime: typeof proto3; diff --git a/typescript/observer/index.d.ts b/typescript/observer/index.d.ts index 33e7ff71b2..d6e795bd79 100644 --- a/typescript/observer/index.d.ts +++ b/typescript/observer/index.d.ts @@ -1,13 +1,16 @@ export * from "./ballot_pb"; export * from "./blame_pb"; export * from "./block_header_pb"; +export * from "./chain_nonces_pb"; export * from "./crosschain_flags_pb"; export * from "./events_pb"; export * from "./genesis_pb"; export * from "./keygen_pb"; export * from "./node_account_pb"; +export * from "./nonce_to_cctx_pb"; export * from "./observer_pb"; export * from "./params_pb"; +export * from "./pending_nonces_pb"; export * from "./query_pb"; export * from "./tss_funds_migrator_pb"; export * from "./tss_pb"; diff --git a/typescript/crosschain/nonce_to_cctx_pb.d.ts b/typescript/observer/nonce_to_cctx_pb.d.ts similarity index 83% rename from typescript/crosschain/nonce_to_cctx_pb.d.ts rename to typescript/observer/nonce_to_cctx_pb.d.ts index bb0bdfa1b3..1ddd89882c 100644 --- a/typescript/crosschain/nonce_to_cctx_pb.d.ts +++ b/typescript/observer/nonce_to_cctx_pb.d.ts @@ -1,5 +1,5 @@ // @generated by protoc-gen-es v1.3.0 with parameter "target=dts" -// @generated from file crosschain/nonce_to_cctx.proto (package zetachain.zetacore.crosschain, syntax proto3) +// @generated from file observer/nonce_to_cctx.proto (package zetachain.zetacore.observer, syntax proto3) /* eslint-disable */ // @ts-nocheck @@ -9,7 +9,7 @@ import { Message, proto3 } from "@bufbuild/protobuf"; /** * store key is tss+chainid+nonce * - * @generated from message zetachain.zetacore.crosschain.NonceToCctx + * @generated from message zetachain.zetacore.observer.NonceToCctx */ export declare class NonceToCctx extends Message { /** @@ -35,7 +35,7 @@ export declare class NonceToCctx extends Message { constructor(data?: PartialMessage); static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.NonceToCctx"; + static readonly typeName = "zetachain.zetacore.observer.NonceToCctx"; static readonly fields: FieldList; static fromBinary(bytes: Uint8Array, options?: Partial): NonceToCctx; diff --git a/typescript/crosschain/pending_nonces_pb.d.ts b/typescript/observer/pending_nonces_pb.d.ts similarity index 83% rename from typescript/crosschain/pending_nonces_pb.d.ts rename to typescript/observer/pending_nonces_pb.d.ts index e08fc12749..41b7d27d93 100644 --- a/typescript/crosschain/pending_nonces_pb.d.ts +++ b/typescript/observer/pending_nonces_pb.d.ts @@ -1,5 +1,5 @@ // @generated by protoc-gen-es v1.3.0 with parameter "target=dts" -// @generated from file crosschain/pending_nonces.proto (package zetachain.zetacore.crosschain, syntax proto3) +// @generated from file observer/pending_nonces.proto (package zetachain.zetacore.observer, syntax proto3) /* eslint-disable */ // @ts-nocheck @@ -9,7 +9,7 @@ import { Message, proto3 } from "@bufbuild/protobuf"; /** * store key is tss+chainid * - * @generated from message zetachain.zetacore.crosschain.PendingNonces + * @generated from message zetachain.zetacore.observer.PendingNonces */ export declare class PendingNonces extends Message { /** @@ -35,7 +35,7 @@ export declare class PendingNonces extends Message { constructor(data?: PartialMessage); static readonly runtime: typeof proto3; - static readonly typeName = "zetachain.zetacore.crosschain.PendingNonces"; + static readonly typeName = "zetachain.zetacore.observer.PendingNonces"; static readonly fields: FieldList; static fromBinary(bytes: Uint8Array, options?: Partial): PendingNonces; diff --git a/typescript/observer/query_pb.d.ts b/typescript/observer/query_pb.d.ts index b609e62ebe..6b3f4ad055 100644 --- a/typescript/observer/query_pb.d.ts +++ b/typescript/observer/query_pb.d.ts @@ -5,8 +5,10 @@ import type { BinaryReadOptions, FieldList, JsonReadOptions, JsonValue, PartialMessage, PlainMessage } from "@bufbuild/protobuf"; import { Message, proto3 } from "@bufbuild/protobuf"; -import type { TSS } from "./tss_pb.js"; +import type { ChainNonces } from "./chain_nonces_pb.js"; import type { PageRequest, PageResponse } from "../cosmos/base/query/v1beta1/pagination_pb.js"; +import type { PendingNonces } from "./pending_nonces_pb.js"; +import type { TSS } from "./tss_pb.js"; import type { BlockHeader, Chain, Proof } from "../common/common_pb.js"; import type { CoreParams, CoreParamsList, Params } from "./params_pb.js"; import type { BallotStatus, VoteType } from "./ballot_pb.js"; @@ -17,6 +19,208 @@ import type { Keygen } from "./keygen_pb.js"; import type { Blame } from "./blame_pb.js"; import type { BlockHeaderState } from "./block_header_pb.js"; +/** + * @generated from message zetachain.zetacore.observer.QueryGetChainNoncesRequest + */ +export declare class QueryGetChainNoncesRequest extends Message { + /** + * @generated from field: string index = 1; + */ + index: string; + + constructor(data?: PartialMessage); + + static readonly runtime: typeof proto3; + static readonly typeName = "zetachain.zetacore.observer.QueryGetChainNoncesRequest"; + static readonly fields: FieldList; + + static fromBinary(bytes: Uint8Array, options?: Partial): QueryGetChainNoncesRequest; + + static fromJson(jsonValue: JsonValue, options?: Partial): QueryGetChainNoncesRequest; + + static fromJsonString(jsonString: string, options?: Partial): QueryGetChainNoncesRequest; + + static equals(a: QueryGetChainNoncesRequest | PlainMessage | undefined, b: QueryGetChainNoncesRequest | PlainMessage | undefined): boolean; +} + +/** + * @generated from message zetachain.zetacore.observer.QueryGetChainNoncesResponse + */ +export declare class QueryGetChainNoncesResponse extends Message { + /** + * @generated from field: zetachain.zetacore.observer.ChainNonces ChainNonces = 1; + */ + ChainNonces?: ChainNonces; + + constructor(data?: PartialMessage); + + static readonly runtime: typeof proto3; + static readonly typeName = "zetachain.zetacore.observer.QueryGetChainNoncesResponse"; + static readonly fields: FieldList; + + static fromBinary(bytes: Uint8Array, options?: Partial): QueryGetChainNoncesResponse; + + static fromJson(jsonValue: JsonValue, options?: Partial): QueryGetChainNoncesResponse; + + static fromJsonString(jsonString: string, options?: Partial): QueryGetChainNoncesResponse; + + static equals(a: QueryGetChainNoncesResponse | PlainMessage | undefined, b: QueryGetChainNoncesResponse | PlainMessage | undefined): boolean; +} + +/** + * @generated from message zetachain.zetacore.observer.QueryAllChainNoncesRequest + */ +export declare class QueryAllChainNoncesRequest extends Message { + /** + * @generated from field: cosmos.base.query.v1beta1.PageRequest pagination = 1; + */ + pagination?: PageRequest; + + constructor(data?: PartialMessage); + + static readonly runtime: typeof proto3; + static readonly typeName = "zetachain.zetacore.observer.QueryAllChainNoncesRequest"; + static readonly fields: FieldList; + + static fromBinary(bytes: Uint8Array, options?: Partial): QueryAllChainNoncesRequest; + + static fromJson(jsonValue: JsonValue, options?: Partial): QueryAllChainNoncesRequest; + + static fromJsonString(jsonString: string, options?: Partial): QueryAllChainNoncesRequest; + + static equals(a: QueryAllChainNoncesRequest | PlainMessage | undefined, b: QueryAllChainNoncesRequest | PlainMessage | undefined): boolean; +} + +/** + * @generated from message zetachain.zetacore.observer.QueryAllChainNoncesResponse + */ +export declare class QueryAllChainNoncesResponse extends Message { + /** + * @generated from field: repeated zetachain.zetacore.observer.ChainNonces ChainNonces = 1; + */ + ChainNonces: ChainNonces[]; + + /** + * @generated from field: cosmos.base.query.v1beta1.PageResponse pagination = 2; + */ + pagination?: PageResponse; + + constructor(data?: PartialMessage); + + static readonly runtime: typeof proto3; + static readonly typeName = "zetachain.zetacore.observer.QueryAllChainNoncesResponse"; + static readonly fields: FieldList; + + static fromBinary(bytes: Uint8Array, options?: Partial): QueryAllChainNoncesResponse; + + static fromJson(jsonValue: JsonValue, options?: Partial): QueryAllChainNoncesResponse; + + static fromJsonString(jsonString: string, options?: Partial): QueryAllChainNoncesResponse; + + static equals(a: QueryAllChainNoncesResponse | PlainMessage | undefined, b: QueryAllChainNoncesResponse | PlainMessage | undefined): boolean; +} + +/** + * @generated from message zetachain.zetacore.observer.QueryAllPendingNoncesRequest + */ +export declare class QueryAllPendingNoncesRequest extends Message { + /** + * @generated from field: cosmos.base.query.v1beta1.PageRequest pagination = 1; + */ + pagination?: PageRequest; + + constructor(data?: PartialMessage); + + static readonly runtime: typeof proto3; + static readonly typeName = "zetachain.zetacore.observer.QueryAllPendingNoncesRequest"; + static readonly fields: FieldList; + + static fromBinary(bytes: Uint8Array, options?: Partial): QueryAllPendingNoncesRequest; + + static fromJson(jsonValue: JsonValue, options?: Partial): QueryAllPendingNoncesRequest; + + static fromJsonString(jsonString: string, options?: Partial): QueryAllPendingNoncesRequest; + + static equals(a: QueryAllPendingNoncesRequest | PlainMessage | undefined, b: QueryAllPendingNoncesRequest | PlainMessage | undefined): boolean; +} + +/** + * @generated from message zetachain.zetacore.observer.QueryAllPendingNoncesResponse + */ +export declare class QueryAllPendingNoncesResponse extends Message { + /** + * @generated from field: repeated zetachain.zetacore.observer.PendingNonces pending_nonces = 1; + */ + pendingNonces: PendingNonces[]; + + /** + * @generated from field: cosmos.base.query.v1beta1.PageResponse pagination = 2; + */ + pagination?: PageResponse; + + constructor(data?: PartialMessage); + + static readonly runtime: typeof proto3; + static readonly typeName = "zetachain.zetacore.observer.QueryAllPendingNoncesResponse"; + static readonly fields: FieldList; + + static fromBinary(bytes: Uint8Array, options?: Partial): QueryAllPendingNoncesResponse; + + static fromJson(jsonValue: JsonValue, options?: Partial): QueryAllPendingNoncesResponse; + + static fromJsonString(jsonString: string, options?: Partial): QueryAllPendingNoncesResponse; + + static equals(a: QueryAllPendingNoncesResponse | PlainMessage | undefined, b: QueryAllPendingNoncesResponse | PlainMessage | undefined): boolean; +} + +/** + * @generated from message zetachain.zetacore.observer.QueryPendingNoncesByChainRequest + */ +export declare class QueryPendingNoncesByChainRequest extends Message { + /** + * @generated from field: int64 chain_id = 1; + */ + chainId: bigint; + + constructor(data?: PartialMessage); + + static readonly runtime: typeof proto3; + static readonly typeName = "zetachain.zetacore.observer.QueryPendingNoncesByChainRequest"; + static readonly fields: FieldList; + + static fromBinary(bytes: Uint8Array, options?: Partial): QueryPendingNoncesByChainRequest; + + static fromJson(jsonValue: JsonValue, options?: Partial): QueryPendingNoncesByChainRequest; + + static fromJsonString(jsonString: string, options?: Partial): QueryPendingNoncesByChainRequest; + + static equals(a: QueryPendingNoncesByChainRequest | PlainMessage | undefined, b: QueryPendingNoncesByChainRequest | PlainMessage | undefined): boolean; +} + +/** + * @generated from message zetachain.zetacore.observer.QueryPendingNoncesByChainResponse + */ +export declare class QueryPendingNoncesByChainResponse extends Message { + /** + * @generated from field: zetachain.zetacore.observer.PendingNonces pending_nonces = 1; + */ + pendingNonces?: PendingNonces; + + constructor(data?: PartialMessage); + + static readonly runtime: typeof proto3; + static readonly typeName = "zetachain.zetacore.observer.QueryPendingNoncesByChainResponse"; + static readonly fields: FieldList; + + static fromBinary(bytes: Uint8Array, options?: Partial): QueryPendingNoncesByChainResponse; + + static fromJson(jsonValue: JsonValue, options?: Partial): QueryPendingNoncesByChainResponse; + + static fromJsonString(jsonString: string, options?: Partial): QueryPendingNoncesByChainResponse; + + static equals(a: QueryPendingNoncesByChainResponse | PlainMessage | undefined, b: QueryPendingNoncesByChainResponse | PlainMessage | undefined): boolean; +} + /** * @generated from message zetachain.zetacore.observer.QueryGetTSSRequest */ diff --git a/x/crosschain/client/cli/query.go b/x/crosschain/client/cli/query.go index caed807842..633e76e143 100644 --- a/x/crosschain/client/cli/query.go +++ b/x/crosschain/client/cli/query.go @@ -30,8 +30,7 @@ func GetQueryCmd(_ string) *cobra.Command { CmdShowOutTxTracker(), CmdListGasPrice(), CmdShowGasPrice(), - CmdListChainNonces(), - CmdShowChainNonces(), + CmdListSend(), CmdShowSend(), CmdLastZetaHeight(), @@ -39,7 +38,7 @@ func GetQueryCmd(_ string) *cobra.Command { CmdListInTxHashToCctx(), CmdShowInTxHashToCctx(), CmdQueryParams(), - CmdListPendingNonces(), + CmdPendingCctx(), CmdListInTxTrackerByChain(), CmdListInTxTrackers(), diff --git a/x/crosschain/client/integrationtests/suite.go b/x/crosschain/client/integrationtests/suite.go index d2b45b4325..65a45bc4b3 100644 --- a/x/crosschain/client/integrationtests/suite.go +++ b/x/crosschain/client/integrationtests/suite.go @@ -50,7 +50,7 @@ func (s *IntegrationTestSuite) SetupSuite() { } network.SetupZetaGenesisState(s.T(), s.cfg.GenesisState, s.cfg.Codec, observerList, true) network.AddCrosschainData(s.T(), 0, s.cfg.GenesisState, s.cfg.Codec) - network.AddObserverData(s.T(), s.cfg.GenesisState, s.cfg.Codec, nil) + network.AddObserverData(s.T(), 0, s.cfg.GenesisState, s.cfg.Codec, nil) net, err := network.New(s.T(), app.NodeDir, s.cfg) s.Assert().NoError(err) s.network = net diff --git a/x/crosschain/client/querytests/suite.go b/x/crosschain/client/querytests/suite.go index 4d3fc20a40..156d2772cf 100644 --- a/x/crosschain/client/querytests/suite.go +++ b/x/crosschain/client/querytests/suite.go @@ -44,7 +44,7 @@ func (s *CliTestSuite) SetupSuite() { } network.SetupZetaGenesisState(s.T(), s.cfg.GenesisState, s.cfg.Codec, observerList, false) s.crosschainState = network.AddCrosschainData(s.T(), 2, s.cfg.GenesisState, s.cfg.Codec) - s.observerState = network.AddObserverData(s.T(), s.cfg.GenesisState, s.cfg.Codec, nil) + s.observerState = network.AddObserverData(s.T(), 2, s.cfg.GenesisState, s.cfg.Codec, nil) net, err := network.New(s.T(), app.NodeDir, s.cfg) s.Assert().NoError(err) s.network = net diff --git a/x/crosschain/genesis.go b/x/crosschain/genesis.go index 951061345f..06ec239962 100644 --- a/x/crosschain/genesis.go +++ b/x/crosschain/genesis.go @@ -2,7 +2,6 @@ package crosschain import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/zeta-chain/zetacore/common" "github.com/zeta-chain/zetacore/x/crosschain/keeper" "github.com/zeta-chain/zetacore/x/crosschain/types" ) @@ -37,11 +36,6 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) } // Set all the chain nonces - for _, elem := range genState.ChainNoncesList { - if elem != nil { - k.SetChainNonces(ctx, *elem) - } - } // Set all the last block heights for _, elem := range genState.LastBlockHeightList { @@ -56,23 +50,6 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) k.SetCctxAndNonceToCctxAndInTxHashToCctx(ctx, *elem) } } - // InitGenesis for observer module needs to be executed before crosschain module - tss, found := k.GetObserverKeeper().GetTSS(ctx) - if found { - for _, chain := range common.DefaultChainsList() { - k.SetPendingNonces(ctx, types.PendingNonces{ - NonceLow: 0, - NonceHigh: 0, - ChainId: chain.ChainId, - Tss: tss.TssPubkey, - }) - } - } - - // Set all the pending nonces - for _, pendingNonce := range genState.PendingNonces { - k.SetPendingNonces(ctx, pendingNonce) - } } @@ -92,13 +69,6 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState { genesis.GasPriceList = append(genesis.GasPriceList, &elem) } - // Get all chain nonces - chainNoncesList := k.GetAllChainNonces(ctx) - for _, elem := range chainNoncesList { - elem := elem - genesis.ChainNoncesList = append(genesis.ChainNoncesList, &elem) - } - // Get all last block heights lastBlockHeightList := k.GetAllLastBlockHeight(ctx) for _, elem := range lastBlockHeightList { @@ -117,10 +87,6 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState { if found { genesis.ZetaAccounting = amount } - pendingNonces, err := k.GetAllPendingNonces(ctx) - if err == nil { - genesis.PendingNonces = pendingNonces - } return &genesis } diff --git a/x/crosschain/genesis_test.go b/x/crosschain/genesis_test.go index 509627d0ca..3ce6a94875 100644 --- a/x/crosschain/genesis_test.go +++ b/x/crosschain/genesis_test.go @@ -25,11 +25,6 @@ func TestGenesis(t *testing.T) { sample.GasPrice(t, "1"), sample.GasPrice(t, "2"), }, - ChainNoncesList: []*types.ChainNonces{ - sample.ChainNonces(t, "0"), - sample.ChainNonces(t, "1"), - sample.ChainNonces(t, "2"), - }, CrossChainTxs: []*types.CrossChainTx{ sample.CrossChainTx(t, "0"), sample.CrossChainTx(t, "1"), @@ -45,7 +40,6 @@ func TestGenesis(t *testing.T) { sample.InTxHashToCctx(t, "0x1"), sample.InTxHashToCctx(t, "0x2"), }, - PendingNonces: sample.PendingNoncesList(t, "sample", 20), } // Init and export diff --git a/x/crosschain/keeper/cctx.go b/x/crosschain/keeper/cctx.go index b0723a6e79..e3a2a06f71 100644 --- a/x/crosschain/keeper/cctx.go +++ b/x/crosschain/keeper/cctx.go @@ -8,6 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/zeta-chain/zetacore/common" "github.com/zeta-chain/zetacore/x/crosschain/types" + observerTypes "github.com/zeta-chain/zetacore/x/observer/types" ) // SetCctxAndNonceToCctxAndInTxHashToCctx does the following things in one function: @@ -39,7 +40,7 @@ func (k Keeper) SetCctxAndNonceToCctxAndInTxHashToCctx(ctx sdk.Context, cctx typ } // set mapping nonce => cctxIndex if cctx.CctxStatus.Status == types.CctxStatus_PendingOutbound || cctx.CctxStatus.Status == types.CctxStatus_PendingRevert { - k.SetNonceToCctx(ctx, types.NonceToCctx{ + k.GetObserverKeeper().SetNonceToCctx(ctx, observerTypes.NonceToCctx{ ChainId: cctx.GetCurrentOutTxParam().ReceiverChainId, // #nosec G701 always in range Nonce: int64(cctx.GetCurrentOutTxParam().OutboundTxTssNonce), diff --git a/x/crosschain/keeper/cctx_utils.go b/x/crosschain/keeper/cctx_utils.go index 30c984ce15..d257b7f18a 100644 --- a/x/crosschain/keeper/cctx_utils.go +++ b/x/crosschain/keeper/cctx_utils.go @@ -23,7 +23,7 @@ func (k Keeper) UpdateNonce(ctx sdk.Context, receiveChainID int64, cctx *types.C return zetaObserverTypes.ErrSupportedChains } - nonce, found := k.GetChainNonces(ctx, chain.ChainName.String()) + nonce, found := k.GetObserverKeeper().GetChainNonces(ctx, chain.ChainName.String()) if !found { return cosmoserrors.Wrap(types.ErrCannotFindReceiverNonce, fmt.Sprintf("Chain(%s) | Identifiers : %s ", chain.ChainName.String(), cctx.LogIdentifierForCCTX())) } @@ -35,7 +35,7 @@ func (k Keeper) UpdateNonce(ctx sdk.Context, receiveChainID int64, cctx *types.C return cosmoserrors.Wrap(types.ErrCannotFindTSSKeys, fmt.Sprintf("Chain(%s) | Identifiers : %s ", chain.ChainName.String(), cctx.LogIdentifierForCCTX())) } - p, found := k.GetPendingNonces(ctx, tss.TssPubkey, receiveChainID) + p, found := k.GetObserverKeeper().GetPendingNonces(ctx, tss.TssPubkey, receiveChainID) if !found { return cosmoserrors.Wrap(types.ErrCannotFindPendingNonces, fmt.Sprintf("chain_id %d, nonce %d", receiveChainID, nonce.Nonce)) } @@ -47,8 +47,8 @@ func (k Keeper) UpdateNonce(ctx sdk.Context, receiveChainID int64, cctx *types.C nonce.Nonce++ p.NonceHigh++ - k.SetChainNonces(ctx, nonce) - k.SetPendingNonces(ctx, p) + k.GetObserverKeeper().SetChainNonces(ctx, nonce) + k.GetObserverKeeper().SetPendingNonces(ctx, p) return nil } diff --git a/x/crosschain/keeper/grpc_query_cctx.go b/x/crosschain/keeper/grpc_query_cctx.go index fd4b1b77d1..74bdc49293 100644 --- a/x/crosschain/keeper/grpc_query_cctx.go +++ b/x/crosschain/keeper/grpc_query_cctx.go @@ -78,7 +78,7 @@ func (k Keeper) CctxByNonce(c context.Context, req *types.QueryGetCctxByNonceReq return nil, status.Error(codes.Internal, "tss not found") } // #nosec G701 always in range - res, found := k.GetNonceToCctx(ctx, tss.TssPubkey, req.ChainID, int64(req.Nonce)) + res, found := k.GetObserverKeeper().GetNonceToCctx(ctx, tss.TssPubkey, req.ChainID, int64(req.Nonce)) if !found { return nil, status.Error(codes.Internal, fmt.Sprintf("nonceToCctx not found: nonce %d, chainid %d", req.Nonce, req.ChainID)) } @@ -115,7 +115,7 @@ func (k Keeper) CctxListPending(c context.Context, req *types.QueryListCctxPendi if !found { return nil, status.Error(codes.Internal, "tss not found") } - pendingNonces, found := k.GetPendingNonces(ctx, tss.TssPubkey, req.ChainId) + pendingNonces, found := k.GetObserverKeeper().GetPendingNonces(ctx, tss.TssPubkey, req.ChainId) if !found { return nil, status.Error(codes.Internal, "pending nonces not found") } @@ -136,7 +136,7 @@ func (k Keeper) CctxListPending(c context.Context, req *types.QueryListCctxPendi startNonce = 0 } for i := startNonce; i < pendingNonces.NonceLow; i++ { - nonceToCctx, found := k.GetNonceToCctx(ctx, tss.TssPubkey, req.ChainId, i) + nonceToCctx, found := k.GetObserverKeeper().GetNonceToCctx(ctx, tss.TssPubkey, req.ChainId, i) if !found { return nil, status.Error(codes.Internal, fmt.Sprintf("nonceToCctx not found: nonce %d, chainid %d", i, req.ChainId)) } @@ -161,7 +161,7 @@ func (k Keeper) CctxListPending(c context.Context, req *types.QueryListCctxPendi // now query the pending nonces that we know are pending for i := pendingNonces.NonceLow; i < pendingNonces.NonceHigh && !maxCCTXsReached(); i++ { - nonceToCctx, found := k.GetNonceToCctx(ctx, tss.TssPubkey, req.ChainId, i) + nonceToCctx, found := k.GetObserverKeeper().GetNonceToCctx(ctx, tss.TssPubkey, req.ChainId, i) if !found { return nil, status.Error(codes.Internal, "nonceToCctx not found") } diff --git a/x/crosschain/keeper/grpc_query_cctx_test.go b/x/crosschain/keeper/grpc_query_cctx_test.go index f889296bba..cd5d1e3c14 100644 --- a/x/crosschain/keeper/grpc_query_cctx_test.go +++ b/x/crosschain/keeper/grpc_query_cctx_test.go @@ -26,13 +26,14 @@ func createCctxWithNonceRange( high int, chainID int64, tss observertypes.TSS, + zk keepertest.ZetaKeepers, ) (cctxs []*types.CrossChainTx) { for i := 0; i < low; i++ { cctx := sample.CrossChainTx(t, fmt.Sprintf("%d", i)) cctx.CctxStatus.Status = types.CctxStatus_OutboundMined cctx.InboundTxParams.SenderChainId = chainID k.SetCrossChainTx(ctx, *cctx) - k.SetNonceToCctx(ctx, types.NonceToCctx{ + zk.ObserverKeeper.SetNonceToCctx(ctx, observertypes.NonceToCctx{ ChainId: chainID, Nonce: int64(i), CctxIndex: cctx.Index, @@ -44,7 +45,7 @@ func createCctxWithNonceRange( cctx.CctxStatus.Status = types.CctxStatus_PendingOutbound cctx.InboundTxParams.SenderChainId = chainID k.SetCrossChainTx(ctx, *cctx) - k.SetNonceToCctx(ctx, types.NonceToCctx{ + zk.ObserverKeeper.SetNonceToCctx(ctx, observertypes.NonceToCctx{ ChainId: chainID, Nonce: int64(i), CctxIndex: cctx.Index, @@ -52,7 +53,7 @@ func createCctxWithNonceRange( }) cctxs = append(cctxs, cctx) } - k.SetPendingNonces(ctx, types.PendingNonces{ + zk.ObserverKeeper.SetPendingNonces(ctx, observertypes.PendingNonces{ ChainId: chainID, NonceLow: int64(low), NonceHigh: int64(high), @@ -97,7 +98,7 @@ func TestKeeper_CctxListPending(t *testing.T) { chainID := getValidEthChainID(t) tss := sample.Tss() zk.ObserverKeeper.SetTSS(ctx, tss) - cctxs := createCctxWithNonceRange(t, ctx, *k, 1000, 2000, chainID, tss) + cctxs := createCctxWithNonceRange(t, ctx, *k, 1000, 2000, chainID, tss, zk) res, err := k.CctxListPending(ctx, &types.QueryListCctxPendingRequest{ChainId: chainID, Limit: 100}) require.NoError(t, err) @@ -117,7 +118,7 @@ func TestKeeper_CctxListPending(t *testing.T) { chainID := getValidEthChainID(t) tss := sample.Tss() zk.ObserverKeeper.SetTSS(ctx, tss) - cctxs := createCctxWithNonceRange(t, ctx, *k, 1000, 1100, chainID, tss) + cctxs := createCctxWithNonceRange(t, ctx, *k, 1000, 1100, chainID, tss, zk) res, err := k.CctxListPending(ctx, &types.QueryListCctxPendingRequest{ChainId: chainID}) require.NoError(t, err) @@ -131,7 +132,7 @@ func TestKeeper_CctxListPending(t *testing.T) { chainID := getValidEthChainID(t) tss := sample.Tss() zk.ObserverKeeper.SetTSS(ctx, tss) - cctxs := createCctxWithNonceRange(t, ctx, *k, 1000, 2000, chainID, tss) + cctxs := createCctxWithNonceRange(t, ctx, *k, 1000, 2000, chainID, tss, zk) // set some cctxs as pending below nonce cctx1, found := k.GetCrossChainTx(ctx, "940") diff --git a/x/crosschain/keeper/msg_server_migrate_tss_funds.go b/x/crosschain/keeper/msg_server_migrate_tss_funds.go index 3bd8bbdd3d..c922d6f5f1 100644 --- a/x/crosschain/keeper/msg_server_migrate_tss_funds.go +++ b/x/crosschain/keeper/msg_server_migrate_tss_funds.go @@ -40,7 +40,7 @@ func (k msgServer) MigrateTssFunds(goCtx context.Context, msg *types.MsgMigrateT if tss.FinalizedZetaHeight >= tssHistory[len(tssHistory)-1].FinalizedZetaHeight { return nil, errorsmod.Wrap(types.ErrCannotMigrateTssFunds, "current tss is the latest") } - pendingNonces, found := k.GetPendingNonces(ctx, tss.TssPubkey, msg.ChainId) + pendingNonces, found := k.GetObserverKeeper().GetPendingNonces(ctx, tss.TssPubkey, msg.ChainId) if !found { return nil, errorsmod.Wrap(types.ErrCannotMigrateTssFunds, "cannot find pending nonces for chain") } diff --git a/x/crosschain/keeper/msg_server_migrate_tss_funds_test.go b/x/crosschain/keeper/msg_server_migrate_tss_funds_test.go index 1dac33bcf7..ea272efba6 100644 --- a/x/crosschain/keeper/msg_server_migrate_tss_funds_test.go +++ b/x/crosschain/keeper/msg_server_migrate_tss_funds_test.go @@ -12,7 +12,7 @@ import ( "github.com/zeta-chain/zetacore/testutil/sample" "github.com/zeta-chain/zetacore/x/crosschain/keeper" crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types" - observerTypes "github.com/zeta-chain/zetacore/x/observer/types" + observertypes "github.com/zeta-chain/zetacore/x/observer/types" ) func TestMsgServer_MigrateTssFunds(t *testing.T) { @@ -63,7 +63,7 @@ func TestMsgServer_MigrateTssFunds(t *testing.T) { chain := getValidEthChain(t) amount := sdkmath.NewUint(100) indexString, tssPubkey := setupTssMigrationParams(zk, k, ctx, *chain, amount, true, true) - k.SetPendingNonces(ctx, crosschaintypes.PendingNonces{ + k.GetObserverKeeper().SetPendingNonces(ctx, observertypes.PendingNonces{ NonceLow: 1, NonceHigh: 10, ChainId: chain.ChainId, @@ -89,7 +89,7 @@ func TestMsgServer_MigrateTssFunds(t *testing.T) { chain := getValidEthChain(t) amount := sdkmath.NewUint(100) indexString, tssPubkey := setupTssMigrationParams(zk, k, ctx, *chain, amount, true, true) - k.SetPendingNonces(ctx, crosschaintypes.PendingNonces{ + k.GetObserverKeeper().SetPendingNonces(ctx, observertypes.PendingNonces{ NonceLow: 1, NonceHigh: 1, ChainId: chain.ChainId, @@ -98,7 +98,7 @@ func TestMsgServer_MigrateTssFunds(t *testing.T) { existingCctx := sample.CrossChainTx(t, "sample_index") existingCctx.CctxStatus.Status = crosschaintypes.CctxStatus_PendingOutbound k.SetCrossChainTx(ctx, *existingCctx) - k.GetObserverKeeper().SetFundMigrator(ctx, observerTypes.TssFundMigratorInfo{ + k.GetObserverKeeper().SetFundMigrator(ctx, observertypes.TssFundMigratorInfo{ ChainId: chain.ChainId, MigrationCctxIndex: existingCctx.Index, }) @@ -153,12 +153,12 @@ func setupTssMigrationParams( setNewTss bool, setCurrentTSS bool, ) (string, string) { - zk.ObserverKeeper.SetCrosschainFlags(ctx, observerTypes.CrosschainFlags{ + zk.ObserverKeeper.SetCrosschainFlags(ctx, observertypes.CrosschainFlags{ IsInboundEnabled: false, IsOutboundEnabled: true, }) params := zk.ObserverKeeper.GetParamsIfExists(ctx) - params.ObserverParams = append(params.ObserverParams, &observerTypes.ObserverParams{ + params.ObserverParams = append(params.ObserverParams, &observertypes.ObserverParams{ Chain: &chain, BallotThreshold: sdk.NewDec(0), MinObserverDelegation: sdk.OneDec(), @@ -176,7 +176,7 @@ func setupTssMigrationParams( if setNewTss { k.GetObserverKeeper().SetTSSHistory(ctx, newTss) } - k.SetPendingNonces(ctx, crosschaintypes.PendingNonces{ + k.GetObserverKeeper().SetPendingNonces(ctx, observertypes.PendingNonces{ NonceLow: 1, NonceHigh: 1, ChainId: chain.ChainId, @@ -191,7 +191,7 @@ func setupTssMigrationParams( Prices: []uint64{1, 1, 1}, MedianIndex: 1, }) - k.SetChainNonces(ctx, crosschaintypes.ChainNonces{ + k.GetObserverKeeper().SetChainNonces(ctx, observertypes.ChainNonces{ Index: chain.ChainName.String(), ChainId: chain.ChainId, Nonce: 1, diff --git a/x/crosschain/keeper/msg_server_tss_voter.go b/x/crosschain/keeper/msg_server_tss_voter.go index ba57f5aa1b..b15dfcabc9 100644 --- a/x/crosschain/keeper/msg_server_tss_voter.go +++ b/x/crosschain/keeper/msg_server_tss_voter.go @@ -100,7 +100,7 @@ func (k msgServer) CreateTSSVoter(goCtx context.Context, msg *types.MsgCreateTSS tssList := k.zetaObserverKeeper.GetAllTSS(ctx) if len(tssList) == 0 { - k.SetTssAndUpdateNonce(ctx, tss) + k.GetObserverKeeper().SetTssAndUpdateNonce(ctx, tss) } k.zetaObserverKeeper.SetTSSHistory(ctx, tss) keygen.Status = observertypes.KeygenStatus_KeyGenSuccess diff --git a/x/crosschain/keeper/msg_server_update_tss.go b/x/crosschain/keeper/msg_server_update_tss.go index 284fcd4ebe..31131be47c 100644 --- a/x/crosschain/keeper/msg_server_update_tss.go +++ b/x/crosschain/keeper/msg_server_update_tss.go @@ -48,7 +48,7 @@ func (k msgServer) UpdateTssAddress(goCtx context.Context, msg *types.MsgUpdateT } - k.SetTssAndUpdateNonce(ctx, tss) + k.GetObserverKeeper().SetTssAndUpdateNonce(ctx, tss) // Remove all migrators once the tss address has been updated successfully, // A new set of migrators will be created when the next migration is triggered k.zetaObserverKeeper.RemoveAllExistingMigrators(ctx) diff --git a/x/crosschain/keeper/msg_server_vote_outbound_tx.go b/x/crosschain/keeper/msg_server_vote_outbound_tx.go index 112426af30..e954c25967 100644 --- a/x/crosschain/keeper/msg_server_vote_outbound_tx.go +++ b/x/crosschain/keeper/msg_server_vote_outbound_tx.go @@ -213,7 +213,7 @@ func (k msgServer) VoteOnObservedOutboundTx(goCtx context.Context, msg *types.Ms cctx.CctxStatus.ChangeStatus(types.CctxStatus_Aborted, err.Error()) ctx.Logger().Error(err.Error()) // #nosec G701 always in range - k.RemoveFromPendingNonces(ctx, tss.TssPubkey, msg.OutTxChain, int64(msg.OutTxTssNonce)) + k.GetObserverKeeper().RemoveFromPendingNonces(ctx, tss.TssPubkey, msg.OutTxChain, int64(msg.OutTxTssNonce)) k.RemoveOutTxTracker(ctx, msg.OutTxChain, msg.OutTxTssNonce) k.SetCctxAndNonceToCctxAndInTxHashToCctx(ctx, cctx) return &types.MsgVoteOnObservedOutboundTxResponse{}, nil @@ -222,7 +222,7 @@ func (k msgServer) VoteOnObservedOutboundTx(goCtx context.Context, msg *types.Ms // Set the ballot index to the finalized ballot cctx.GetCurrentOutTxParam().OutboundTxBallotIndex = ballotIndex // #nosec G701 always in range - k.RemoveFromPendingNonces(ctx, tss.TssPubkey, msg.OutTxChain, int64(msg.OutTxTssNonce)) + k.GetObserverKeeper().RemoveFromPendingNonces(ctx, tss.TssPubkey, msg.OutTxChain, int64(msg.OutTxTssNonce)) k.RemoveOutTxTracker(ctx, msg.OutTxChain, msg.OutTxTssNonce) ctx.Logger().Info(fmt.Sprintf("Remove tracker %s: , Block Height : %d ", getOutTrackerIndex(msg.OutTxChain, msg.OutTxTssNonce), ctx.BlockHeight())) k.SetCctxAndNonceToCctxAndInTxHashToCctx(ctx, cctx) diff --git a/x/crosschain/keeper/msg_server_whitelist_erc20_test.go b/x/crosschain/keeper/msg_server_whitelist_erc20_test.go index 5866d7b887..93b1e3d1b6 100644 --- a/x/crosschain/keeper/msg_server_whitelist_erc20_test.go +++ b/x/crosschain/keeper/msg_server_whitelist_erc20_test.go @@ -27,7 +27,7 @@ func TestKeeper_WhitelistERC20(t *testing.T) { deploySystemContracts(t, ctx, zk.FungibleKeeper, sdkk.EvmKeeper) setupGasCoin(t, ctx, zk.FungibleKeeper, sdkk.EvmKeeper, chainID, "foobar", "FOOBAR") - k.SetTssAndUpdateNonce(ctx, sample.Tss()) + k.GetObserverKeeper().SetTssAndUpdateNonce(ctx, sample.Tss()) k.SetGasPrice(ctx, types.GasPrice{ ChainId: chainID, MedianIndex: 0, @@ -172,7 +172,7 @@ func TestKeeper_WhitelistERC20(t *testing.T) { admin := sample.AccAddress() setAdminPolicies(ctx, zk, admin) - k.SetTssAndUpdateNonce(ctx, sample.Tss()) + k.GetObserverKeeper().SetTssAndUpdateNonce(ctx, sample.Tss()) erc20Address := sample.EthAddress().Hex() _, err := msgServer.WhitelistERC20(ctx, &types.MsgWhitelistERC20{ diff --git a/x/crosschain/keeper/nonces_test.go b/x/crosschain/keeper/nonces_test.go deleted file mode 100644 index aff5658db1..0000000000 --- a/x/crosschain/keeper/nonces_test.go +++ /dev/null @@ -1,46 +0,0 @@ -package keeper - -import ( - "fmt" - "testing" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/assert" - "github.com/zeta-chain/zetacore/x/crosschain/types" -) - -// Keeper Tests -func createNChainNonces(keeper *Keeper, ctx sdk.Context, n int) []types.ChainNonces { - items := make([]types.ChainNonces, n) - for i := range items { - items[i].Creator = "any" - items[i].Index = fmt.Sprintf("%d", i) - keeper.SetChainNonces(ctx, items[i]) - } - return items -} - -func TestChainNoncesGet(t *testing.T) { - keeper, ctx := setupKeeper(t) - items := createNChainNonces(keeper, ctx, 10) - for _, item := range items { - rst, found := keeper.GetChainNonces(ctx, item.Index) - assert.True(t, found) - assert.Equal(t, item, rst) - } -} -func TestChainNoncesRemove(t *testing.T) { - keeper, ctx := setupKeeper(t) - items := createNChainNonces(keeper, ctx, 10) - for _, item := range items { - keeper.RemoveChainNonces(ctx, item.Index) - _, found := keeper.GetChainNonces(ctx, item.Index) - assert.False(t, found) - } -} - -func TestChainNoncesGetAll(t *testing.T) { - keeper, ctx := setupKeeper(t) - items := createNChainNonces(keeper, ctx, 10) - assert.Equal(t, items, keeper.GetAllChainNonces(ctx)) -} diff --git a/x/crosschain/migrations/v4/migrate.go b/x/crosschain/migrations/v4/migrate.go index a59ea5b72e..90ba70ddb0 100644 --- a/x/crosschain/migrations/v4/migrate.go +++ b/x/crosschain/migrations/v4/migrate.go @@ -23,6 +23,7 @@ func MigrateStore( ) error { SetZetaAccounting(ctx, crossChainStoreKey, cdc) MoveTssToObserverModule(ctx, observerKeeper, crossChainStoreKey, cdc) + MoveNonceToObserverModule(ctx, observerKeeper, crossChainStoreKey, cdc) return nil } @@ -54,6 +55,72 @@ func SetZetaAccounting( store.Set([]byte(types.ZetaAccountingKey), b) } +func MoveNonceToObserverModule( + ctx sdk.Context, + observerKeeper types.ZetaObserverKeeper, + crossChainStoreKey storetypes.StoreKey, + cdc codec.BinaryCodec, +) { + var chainNonces []observertypes.ChainNonces + var pendingNonces []observertypes.PendingNonces + var nonceToCcTx []observertypes.NonceToCctx + store := prefix.NewStore(ctx.KVStore(crossChainStoreKey), types.KeyPrefix(observertypes.ChainNoncesKey)) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + defer func(iterator sdk.Iterator) { + err := iterator.Close() + if err != nil { + return + } + }(iterator) + for ; iterator.Valid(); iterator.Next() { + var val observertypes.ChainNonces + err := cdc.Unmarshal(iterator.Value(), &val) + if err == nil { + chainNonces = append(chainNonces, val) + } + } + store = prefix.NewStore(ctx.KVStore(crossChainStoreKey), types.KeyPrefix(observertypes.PendingNoncesKeyPrefix)) + iterator = sdk.KVStorePrefixIterator(store, []byte{}) + defer func(iterator sdk.Iterator) { + err := iterator.Close() + if err != nil { + return + } + }(iterator) + for ; iterator.Valid(); iterator.Next() { + var val observertypes.PendingNonces + err := cdc.Unmarshal(iterator.Value(), &val) + if err == nil { + pendingNonces = append(pendingNonces, val) + } + } + store = prefix.NewStore(ctx.KVStore(crossChainStoreKey), types.KeyPrefix(observertypes.NonceToCctxKeyPrefix)) + iterator = sdk.KVStorePrefixIterator(store, []byte{}) + defer func(iterator sdk.Iterator) { + err := iterator.Close() + if err != nil { + return + } + }(iterator) + for ; iterator.Valid(); iterator.Next() { + var val observertypes.NonceToCctx + err := cdc.Unmarshal(iterator.Value(), &val) + if err == nil { + nonceToCcTx = append(nonceToCcTx, val) + } + } + for _, c := range chainNonces { + observerKeeper.SetChainNonces(ctx, c) + } + for _, p := range pendingNonces { + observerKeeper.SetPendingNonces(ctx, p) + } + for _, n := range nonceToCcTx { + observerKeeper.SetNonceToCctx(ctx, n) + } + +} + func MoveTssToObserverModule(ctx sdk.Context, observerKeeper types.ZetaObserverKeeper, crossChainStoreKey storetypes.StoreKey, @@ -91,5 +158,4 @@ func MoveTssToObserverModule(ctx sdk.Context, if writeTss { observerKeeper.SetTSS(ctx, tss) } - } diff --git a/x/crosschain/migrations/v4/migrate_test.go b/x/crosschain/migrations/v4/migrate_test.go index 2467318893..eb119873e1 100644 --- a/x/crosschain/migrations/v4/migrate_test.go +++ b/x/crosschain/migrations/v4/migrate_test.go @@ -3,6 +3,7 @@ package v4_test import ( "fmt" "math/rand" + "sort" "testing" sdkmath "cosmossdk.io/math" @@ -54,6 +55,38 @@ func TestMigrateStore(t *testing.T) { assert.Equal(t, tss1, tssHistory[0]) assert.Equal(t, tss2, tssHistory[1]) }) + t.Run("test migrate store move nonce from cross chain to observer", func(t *testing.T) { + k, ctx, _, _ := keepertest.CrosschainKeeper(t) + chainNonces := sample.ChainNoncesList(t, 10) + pendingNonces := sample.PendingNoncesList(t, "sample", 10) + nonceToCctxList := sample.NonceToCctxList(t, "sample", 10) + store := prefix.NewStore(ctx.KVStore(k.GetStoreKey()), types.KeyPrefix(observertypes.ChainNoncesKey)) + for _, nonce := range chainNonces { + store.Set([]byte(nonce.Index), k.GetCodec().MustMarshal(&nonce)) + } + store = prefix.NewStore(ctx.KVStore(k.GetStoreKey()), types.KeyPrefix(observertypes.PendingNoncesKeyPrefix)) + for _, nonce := range pendingNonces { + store.Set(types.KeyPrefix(fmt.Sprintf("%s-%d", nonce.Tss, nonce.ChainId)), k.GetCodec().MustMarshal(&nonce)) + } + store = prefix.NewStore(ctx.KVStore(k.GetStoreKey()), types.KeyPrefix(observertypes.NonceToCctxKeyPrefix)) + for _, nonce := range nonceToCctxList { + store.Set(types.KeyPrefix(fmt.Sprintf("%s-%d-%d", nonce.Tss, nonce.ChainId, nonce.Nonce)), k.GetCodec().MustMarshal(&nonce)) + } + err := v4.MigrateStore(ctx, k.GetObserverKeeper(), k.GetStoreKey(), k.GetCodec()) + assert.NoError(t, err) + pn, err := k.GetObserverKeeper().GetAllPendingNonces(ctx) + assert.NoError(t, err) + sort.Slice(pn, func(i, j int) bool { + return pn[i].ChainId < pn[j].ChainId + }) + sort.Slice(pendingNonces, func(i, j int) bool { + return pendingNonces[i].ChainId < pendingNonces[j].ChainId + }) + assert.Equal(t, pendingNonces, pn) + assert.Equal(t, chainNonces, k.GetObserverKeeper().GetAllChainNonces(ctx)) + assert.Equal(t, nonceToCctxList, k.GetObserverKeeper().GetAllNonceToCctx(ctx)) + + }) } func SetRandomCctx(ctx sdk.Context, k keeper.Keeper) sdkmath.Uint { diff --git a/x/crosschain/types/expected_keepers.go b/x/crosschain/types/expected_keepers.go index 41bd0de9f3..d4747e68c2 100644 --- a/x/crosschain/types/expected_keepers.go +++ b/x/crosschain/types/expected_keepers.go @@ -80,6 +80,19 @@ type ZetaObserverKeeper interface { GetFundMigrator(ctx sdk.Context, chainID int64) (val observertypes.TssFundMigratorInfo, found bool) GetAllTssFundMigrators(ctx sdk.Context) (fms []observertypes.TssFundMigratorInfo) RemoveAllExistingMigrators(ctx sdk.Context) + SetChainNonces(ctx sdk.Context, chainNonces observertypes.ChainNonces) + GetChainNonces(ctx sdk.Context, index string) (val observertypes.ChainNonces, found bool) + RemoveChainNonces(ctx sdk.Context, index string) + GetAllChainNonces(ctx sdk.Context) (list []observertypes.ChainNonces) + SetNonceToCctx(ctx sdk.Context, nonceToCctx observertypes.NonceToCctx) + GetNonceToCctx(ctx sdk.Context, tss string, chainID int64, nonce int64) (val observertypes.NonceToCctx, found bool) + RemoveNonceToCctx(ctx sdk.Context, cctx observertypes.NonceToCctx) + GetAllPendingNonces(ctx sdk.Context) (list []observertypes.PendingNonces, err error) + GetPendingNonces(ctx sdk.Context, tss string, chainID int64) (val observertypes.PendingNonces, found bool) + SetPendingNonces(ctx sdk.Context, pendingNonces observertypes.PendingNonces) + SetTssAndUpdateNonce(ctx sdk.Context, tss observertypes.TSS) + RemoveFromPendingNonces(ctx sdk.Context, tss string, chainID int64, nonce int64) + GetAllNonceToCctx(ctx sdk.Context) (list []observertypes.NonceToCctx) } type FungibleKeeper interface { diff --git a/x/crosschain/types/genesis.go b/x/crosschain/types/genesis.go index 935ba7e651..23343133c8 100644 --- a/x/crosschain/types/genesis.go +++ b/x/crosschain/types/genesis.go @@ -16,7 +16,6 @@ func DefaultGenesis() *GenesisState { OutTxTrackerList: []OutTxTracker{}, InTxHashToCctxList: []InTxHashToCctx{}, GasPriceList: []*GasPrice{}, - ChainNoncesList: []*ChainNonces{}, //CCTX: []*Send{}, } @@ -56,15 +55,6 @@ func (gs GenesisState) Validate() error { } gasPriceIndexMap[elem.Index] = true } - // Check for duplicated index in chainNonces - chainNoncesIndexMap := make(map[string]bool) - - for _, elem := range gs.ChainNoncesList { - if _, ok := chainNoncesIndexMap[elem.Index]; ok { - return fmt.Errorf("duplicated index for chainNonces") - } - chainNoncesIndexMap[elem.Index] = true - } // Check for duplicated index in send //sendIndexMap := make(map[string]bool) diff --git a/x/crosschain/types/genesis.pb.go b/x/crosschain/types/genesis.pb.go index 6acec63a08..250dc7128d 100644 --- a/x/crosschain/types/genesis.pb.go +++ b/x/crosschain/types/genesis.pb.go @@ -29,13 +29,11 @@ type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` OutTxTrackerList []OutTxTracker `protobuf:"bytes,2,rep,name=outTxTrackerList,proto3" json:"outTxTrackerList"` GasPriceList []*GasPrice `protobuf:"bytes,5,rep,name=gasPriceList,proto3" json:"gasPriceList,omitempty"` - ChainNoncesList []*ChainNonces `protobuf:"bytes,6,rep,name=chainNoncesList,proto3" json:"chainNoncesList,omitempty"` CrossChainTxs []*CrossChainTx `protobuf:"bytes,7,rep,name=CrossChainTxs,proto3" json:"CrossChainTxs,omitempty"` LastBlockHeightList []*LastBlockHeight `protobuf:"bytes,8,rep,name=lastBlockHeightList,proto3" json:"lastBlockHeightList,omitempty"` InTxHashToCctxList []InTxHashToCctx `protobuf:"bytes,9,rep,name=inTxHashToCctxList,proto3" json:"inTxHashToCctxList"` InTxTrackerList []InTxTracker `protobuf:"bytes,11,rep,name=in_tx_tracker_list,json=inTxTrackerList,proto3" json:"in_tx_tracker_list"` ZetaAccounting ZetaAccounting `protobuf:"bytes,12,opt,name=zeta_accounting,json=zetaAccounting,proto3" json:"zeta_accounting"` - PendingNonces []PendingNonces `protobuf:"bytes,13,rep,name=pending_nonces,json=pendingNonces,proto3" json:"pending_nonces"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -92,13 +90,6 @@ func (m *GenesisState) GetGasPriceList() []*GasPrice { return nil } -func (m *GenesisState) GetChainNoncesList() []*ChainNonces { - if m != nil { - return m.ChainNoncesList - } - return nil -} - func (m *GenesisState) GetCrossChainTxs() []*CrossChainTx { if m != nil { return m.CrossChainTxs @@ -134,13 +125,6 @@ func (m *GenesisState) GetZetaAccounting() ZetaAccounting { return ZetaAccounting{} } -func (m *GenesisState) GetPendingNonces() []PendingNonces { - if m != nil { - return m.PendingNonces - } - return nil -} - func init() { proto.RegisterType((*GenesisState)(nil), "zetachain.zetacore.crosschain.GenesisState") } @@ -148,40 +132,37 @@ func init() { func init() { proto.RegisterFile("crosschain/genesis.proto", fileDescriptor_dd51403692d571f4) } var fileDescriptor_dd51403692d571f4 = []byte{ - // 528 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdf, 0x6e, 0xd3, 0x30, - 0x14, 0xc6, 0x5b, 0xfe, 0x74, 0xe0, 0xb6, 0x2b, 0x32, 0x48, 0x44, 0x95, 0x96, 0x4d, 0x43, 0x88, - 0x09, 0x58, 0x22, 0xc6, 0x13, 0xb0, 0x5e, 0x6c, 0x68, 0x13, 0x8c, 0x90, 0x1b, 0x26, 0x26, 0xe3, - 0x1a, 0x2b, 0x89, 0xd6, 0xc5, 0x51, 0xec, 0x4a, 0x61, 0x2f, 0xc0, 0x2d, 0x8f, 0xb5, 0xcb, 0x5d, - 0x72, 0x85, 0x50, 0xfb, 0x22, 0xc8, 0x27, 0x66, 0xb3, 0x69, 0x45, 0x76, 0x13, 0x59, 0x3e, 0xe7, - 0xfb, 0x7d, 0xc7, 0x27, 0xe7, 0x20, 0x8f, 0x95, 0x42, 0x4a, 0x96, 0xd2, 0x2c, 0x0f, 0x13, 0x9e, - 0x73, 0x99, 0xc9, 0xa0, 0x28, 0x85, 0x12, 0x78, 0xed, 0x9c, 0x2b, 0x0a, 0x81, 0x00, 0x4e, 0xa2, - 0xe4, 0xc1, 0x75, 0xf2, 0x70, 0xcd, 0x12, 0xc2, 0x97, 0xe4, 0x22, 0x67, 0xdc, 0xa8, 0x87, 0xeb, - 0x76, 0x58, 0x1f, 0x49, 0x9d, 0xa4, 0x2a, 0x93, 0x30, 0xb4, 0x8d, 0xa9, 0x24, 0x45, 0x99, 0x31, - 0x6e, 0x62, 0x4f, 0xac, 0x18, 0x68, 0x48, 0x4a, 0x65, 0x4a, 0x94, 0x20, 0x8c, 0x5d, 0x01, 0xfc, - 0x85, 0x24, 0x55, 0x52, 0x76, 0xca, 0x4b, 0x13, 0xdf, 0xb4, 0xe2, 0x13, 0x2a, 0x15, 0x19, 0x4f, - 0x04, 0x3b, 0x25, 0x29, 0xcf, 0x92, 0x54, 0x2d, 0xa9, 0x52, 0x4c, 0xd5, 0x22, 0xe4, 0xb1, 0x95, - 0x50, 0xd0, 0x92, 0x9e, 0x2d, 0x7b, 0x5f, 0xc1, 0xf3, 0xaf, 0x59, 0x9e, 0xb8, 0x0d, 0x78, 0x94, - 0x88, 0x44, 0xc0, 0x31, 0xd4, 0xa7, 0xfa, 0x76, 0xf3, 0xfb, 0x0a, 0xea, 0xed, 0xd5, 0x6d, 0xfe, - 0xa8, 0xa8, 0xe2, 0x78, 0x84, 0x3a, 0x35, 0xd7, 0x6b, 0x6f, 0xb4, 0xb7, 0xba, 0x3b, 0x4f, 0x83, - 0xff, 0xb6, 0x3d, 0x38, 0x82, 0xe4, 0xdd, 0x3b, 0x17, 0xbf, 0xd6, 0x5b, 0x91, 0x91, 0xe2, 0x13, - 0xf4, 0x40, 0x4c, 0x55, 0x5c, 0xc5, 0x75, 0xed, 0x87, 0x99, 0x54, 0xde, 0xad, 0x8d, 0xdb, 0x5b, - 0xdd, 0x9d, 0x17, 0x0d, 0xb8, 0xf7, 0x96, 0xcc, 0x40, 0x17, 0x50, 0xf8, 0x00, 0xf5, 0x12, 0x2a, - 0x8f, 0xf4, 0x0f, 0x02, 0xf4, 0x5d, 0x40, 0x3f, 0x6b, 0x40, 0xef, 0x19, 0x49, 0xe4, 0x88, 0x71, - 0x8c, 0x06, 0x10, 0x7f, 0x07, 0xcd, 0x02, 0x5e, 0x07, 0x78, 0xcf, 0x1b, 0x78, 0xa3, 0x6b, 0x55, - 0xf4, 0x2f, 0x02, 0x7f, 0x40, 0xfd, 0x91, 0x4e, 0x85, 0xa4, 0xb8, 0x92, 0xde, 0xca, 0x8d, 0x9e, - 0x6f, 0x6b, 0x22, 0x97, 0x80, 0xbf, 0xa0, 0x87, 0x7a, 0x6c, 0x76, 0xf5, 0xd4, 0xec, 0xc3, 0xd0, - 0x40, 0xb1, 0xf7, 0x00, 0x1c, 0x34, 0x80, 0x0f, 0x5d, 0x65, 0xb4, 0x0c, 0x85, 0x19, 0xc2, 0xda, - 0x6a, 0x9f, 0xca, 0x34, 0x16, 0x23, 0xa6, 0x2a, 0x30, 0xb8, 0x0f, 0x06, 0xdb, 0x0d, 0x06, 0x6f, - 0x1d, 0xa1, 0xf9, 0x75, 0x4b, 0x70, 0xf8, 0x44, 0x9b, 0x58, 0x83, 0x4d, 0x26, 0xda, 0xa4, 0x7b, - 0xa3, 0x96, 0x6b, 0x13, 0x77, 0x38, 0x06, 0x59, 0xee, 0xce, 0xc6, 0x67, 0x34, 0xd0, 0x4a, 0x42, - 0x19, 0x13, 0xd3, 0x5c, 0x65, 0x79, 0xe2, 0xf5, 0x60, 0x90, 0x9b, 0x1e, 0x70, 0xcc, 0x15, 0x7d, - 0x73, 0x25, 0x32, 0xf8, 0xd5, 0x73, 0xe7, 0x16, 0x7f, 0x42, 0xab, 0xee, 0x72, 0x79, 0x7d, 0x28, - 0xfc, 0x65, 0xd3, 0x96, 0xd4, 0xa2, 0x7a, 0x40, 0x0c, 0xbb, 0x5f, 0x38, 0x97, 0x07, 0x17, 0x33, - 0xbf, 0x7d, 0x39, 0xf3, 0xdb, 0xbf, 0x67, 0x7e, 0xfb, 0xc7, 0xdc, 0x6f, 0x5d, 0xce, 0xfd, 0xd6, - 0xcf, 0xb9, 0xdf, 0x3a, 0x7e, 0x95, 0x64, 0x2a, 0x9d, 0x8e, 0x03, 0x26, 0xce, 0x42, 0x0d, 0xdf, - 0xae, 0xb7, 0xfc, 0xaf, 0x4f, 0x58, 0x85, 0xd6, 0xee, 0xab, 0x6f, 0x05, 0x97, 0xe3, 0x0e, 0x6c, - 0xf7, 0xeb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x10, 0x27, 0xfb, 0x29, 0x4e, 0x05, 0x00, 0x00, + // 468 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x51, 0x6b, 0x14, 0x31, + 0x10, 0xc7, 0x6f, 0xd5, 0x56, 0xcd, 0x9d, 0x56, 0xa2, 0xe0, 0x72, 0xe0, 0xb6, 0x54, 0xc4, 0xa2, + 0x74, 0x17, 0xeb, 0x27, 0xb0, 0xf7, 0xd0, 0x4a, 0x0b, 0xd6, 0xf3, 0x9e, 0x8a, 0x25, 0xe6, 0x42, + 0xd8, 0x0d, 0xbd, 0x6e, 0x96, 0xcd, 0x2c, 0xac, 0xfd, 0x14, 0x7e, 0xac, 0x3e, 0xf6, 0x49, 0x7c, + 0x12, 0xb9, 0xfb, 0x22, 0x92, 0xd9, 0x58, 0xb3, 0x5c, 0xe9, 0xf6, 0x6d, 0xc8, 0xcc, 0xff, 0xf7, + 0x9f, 0xcc, 0x24, 0x24, 0x14, 0xa5, 0x36, 0x46, 0x64, 0x5c, 0xe5, 0x49, 0x2a, 0x73, 0x69, 0x94, + 0x89, 0x8b, 0x52, 0x83, 0xa6, 0x2f, 0xce, 0x25, 0x70, 0x4c, 0xc4, 0x18, 0xe9, 0x52, 0xc6, 0xff, + 0x8b, 0x87, 0xeb, 0x9e, 0x10, 0x43, 0x86, 0x31, 0x83, 0xba, 0xd1, 0x0f, 0x87, 0x3e, 0x99, 0x1b, + 0x56, 0x94, 0x4a, 0x48, 0x97, 0x7b, 0xe9, 0xe5, 0x50, 0xc3, 0x32, 0x6e, 0x32, 0x06, 0x9a, 0x09, + 0x71, 0x05, 0x88, 0x96, 0x8a, 0xa0, 0xe4, 0xe2, 0x54, 0x96, 0x2e, 0xbf, 0xe9, 0xe5, 0x67, 0xdc, + 0x00, 0x9b, 0xce, 0xb4, 0x38, 0x65, 0x99, 0x54, 0x69, 0x06, 0xae, 0xc6, 0xef, 0x52, 0x57, 0xb0, + 0x0c, 0x79, 0xee, 0x15, 0x14, 0xbc, 0xe4, 0x67, 0xee, 0xfa, 0xc3, 0x67, 0xa9, 0x4e, 0x35, 0x86, + 0x89, 0x8d, 0x9a, 0xd3, 0xcd, 0x9f, 0x2b, 0x64, 0xb0, 0xd7, 0x8c, 0xe9, 0x0b, 0x70, 0x90, 0x74, + 0x44, 0x56, 0x1b, 0x59, 0x18, 0x6c, 0x04, 0x5b, 0xfd, 0x9d, 0x57, 0xf1, 0x8d, 0x63, 0x8b, 0x8f, + 0xb0, 0x78, 0xf7, 0xde, 0xc5, 0xef, 0xf5, 0xde, 0xd8, 0x49, 0xe9, 0x09, 0x79, 0xa2, 0x2b, 0x98, + 0xd4, 0x93, 0xa6, 0xb5, 0x43, 0x65, 0x20, 0xbc, 0xb3, 0x71, 0x77, 0xab, 0xbf, 0xf3, 0xb6, 0x03, + 0xf7, 0xc9, 0x93, 0x39, 0xe8, 0x12, 0x8a, 0x1e, 0x90, 0x41, 0xca, 0xcd, 0x91, 0x9d, 0x3f, 0xa2, + 0x57, 0x10, 0xfd, 0xba, 0x03, 0xbd, 0xe7, 0x24, 0xe3, 0x96, 0x98, 0x7e, 0x26, 0x8f, 0x46, 0xb6, + 0x68, 0x64, 0x8b, 0x26, 0xb5, 0x09, 0xef, 0xdf, 0xaa, 0x51, 0x5f, 0x33, 0x6e, 0x13, 0xe8, 0x37, + 0xf2, 0xd4, 0xee, 0x6f, 0xd7, 0xae, 0x6f, 0x1f, 0xb7, 0x87, 0x6d, 0x3e, 0x40, 0x70, 0xdc, 0x01, + 0x3e, 0x6c, 0x2b, 0xc7, 0xd7, 0xa1, 0xa8, 0x20, 0xd4, 0x5a, 0xed, 0x73, 0x93, 0x4d, 0xf4, 0x48, + 0x40, 0x8d, 0x06, 0x0f, 0xd1, 0x60, 0xbb, 0xc3, 0xe0, 0x63, 0x4b, 0xe8, 0x86, 0x7c, 0x0d, 0x8e, + 0x9e, 0x58, 0x13, 0xef, 0x85, 0xb1, 0x99, 0x35, 0xe9, 0xa3, 0xc9, 0x9b, 0x5b, 0x98, 0xb4, 0xd7, + 0xb8, 0xa6, 0xf2, 0xf6, 0x16, 0xbf, 0x92, 0x35, 0xab, 0x64, 0x5c, 0x08, 0x5d, 0xe5, 0xa0, 0xf2, + 0x34, 0x1c, 0xe0, 0x93, 0xeb, 0xba, 0xc0, 0xb1, 0x04, 0xfe, 0xe1, 0x4a, 0xe4, 0xf0, 0x8f, 0xcf, + 0xdb, 0xa7, 0x07, 0x17, 0xf3, 0x28, 0xb8, 0x9c, 0x47, 0xc1, 0x9f, 0x79, 0x14, 0xfc, 0x58, 0x44, + 0xbd, 0xcb, 0x45, 0xd4, 0xfb, 0xb5, 0x88, 0x7a, 0xc7, 0xef, 0x52, 0x05, 0x59, 0x35, 0x8d, 0x85, + 0x3e, 0x4b, 0xac, 0x68, 0xbb, 0xf9, 0x2c, 0xff, 0x9c, 0x92, 0x3a, 0xf1, 0xbe, 0x10, 0x7c, 0x2f, + 0xa4, 0x99, 0xae, 0xe2, 0x67, 0x79, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0x06, 0xe1, 0xb6, 0x7c, + 0x5d, 0x04, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -204,20 +185,6 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.PendingNonces) > 0 { - for iNdEx := len(m.PendingNonces) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.PendingNonces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x6a - } - } { size, err := m.ZetaAccounting.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -284,20 +251,6 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x3a } } - if len(m.ChainNoncesList) > 0 { - for iNdEx := len(m.ChainNoncesList) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.ChainNoncesList[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } - } if len(m.GasPriceList) > 0 { for iNdEx := len(m.GasPriceList) - 1; iNdEx >= 0; iNdEx-- { { @@ -370,12 +323,6 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) } } - if len(m.ChainNoncesList) > 0 { - for _, e := range m.ChainNoncesList { - l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - } if len(m.CrossChainTxs) > 0 { for _, e := range m.CrossChainTxs { l = e.Size() @@ -402,12 +349,6 @@ func (m *GenesisState) Size() (n int) { } l = m.ZetaAccounting.Size() n += 1 + l + sovGenesis(uint64(l)) - if len(m.PendingNonces) > 0 { - for _, e := range m.PendingNonces { - l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - } return n } @@ -547,40 +488,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainNoncesList", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChainNoncesList = append(m.ChainNoncesList, &ChainNonces{}) - if err := m.ChainNoncesList[len(m.ChainNoncesList)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CrossChainTxs", wireType) @@ -750,40 +657,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 13: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PendingNonces", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PendingNonces = append(m.PendingNonces, PendingNonces{}) - if err := m.PendingNonces[len(m.PendingNonces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenesis(dAtA[iNdEx:]) diff --git a/x/crosschain/types/keys.go b/x/crosschain/types/keys.go index 4a322c09d3..7e710562a4 100644 --- a/x/crosschain/types/keys.go +++ b/x/crosschain/types/keys.go @@ -38,16 +38,14 @@ func KeyPrefix(p string) []byte { const ( SendKey = "Send-value-" LastBlockHeightKey = "LastBlockHeight-value-" - ChainNoncesKey = "ChainNonces-value-" - GasPriceKey = "GasPrice-value-" + + GasPriceKey = "GasPrice-value-" GasBalanceKey = "GasBalance-value-" OutTxTrackerKeyPrefix = "OutTxTracker-value-" InTxTrackerKeyPrefix = "InTxTracker-value-" - NonceToCctxKeyPrefix = "NonceToCctx-value-" - PendingNoncesKeyPrefix = "PendingNonces-value-" // #nosec G101: Potential hardcoded credentials (gosec) // ZetaAccountingKey value is used as prefix for storing ZetaAccountingKey ZetaAccountingKey = "ZetaAccounting-value-" diff --git a/x/crosschain/types/query.pb.go b/x/crosschain/types/query.pb.go index 8cc73277b2..7273180766 100644 --- a/x/crosschain/types/query.pb.go +++ b/x/crosschain/types/query.pb.go @@ -1146,374 +1146,6 @@ func (m *QueryAllGasPriceResponse) GetPagination() *query.PageResponse { return nil } -type QueryGetChainNoncesRequest struct { - Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` -} - -func (m *QueryGetChainNoncesRequest) Reset() { *m = QueryGetChainNoncesRequest{} } -func (m *QueryGetChainNoncesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryGetChainNoncesRequest) ProtoMessage() {} -func (*QueryGetChainNoncesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{24} -} -func (m *QueryGetChainNoncesRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryGetChainNoncesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryGetChainNoncesRequest.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 *QueryGetChainNoncesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryGetChainNoncesRequest.Merge(m, src) -} -func (m *QueryGetChainNoncesRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryGetChainNoncesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryGetChainNoncesRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryGetChainNoncesRequest proto.InternalMessageInfo - -func (m *QueryGetChainNoncesRequest) GetIndex() string { - if m != nil { - return m.Index - } - return "" -} - -type QueryGetChainNoncesResponse struct { - ChainNonces *ChainNonces `protobuf:"bytes,1,opt,name=ChainNonces,proto3" json:"ChainNonces,omitempty"` -} - -func (m *QueryGetChainNoncesResponse) Reset() { *m = QueryGetChainNoncesResponse{} } -func (m *QueryGetChainNoncesResponse) String() string { return proto.CompactTextString(m) } -func (*QueryGetChainNoncesResponse) ProtoMessage() {} -func (*QueryGetChainNoncesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{25} -} -func (m *QueryGetChainNoncesResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryGetChainNoncesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryGetChainNoncesResponse.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 *QueryGetChainNoncesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryGetChainNoncesResponse.Merge(m, src) -} -func (m *QueryGetChainNoncesResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryGetChainNoncesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryGetChainNoncesResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryGetChainNoncesResponse proto.InternalMessageInfo - -func (m *QueryGetChainNoncesResponse) GetChainNonces() *ChainNonces { - if m != nil { - return m.ChainNonces - } - return nil -} - -type QueryAllChainNoncesRequest struct { - Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` -} - -func (m *QueryAllChainNoncesRequest) Reset() { *m = QueryAllChainNoncesRequest{} } -func (m *QueryAllChainNoncesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllChainNoncesRequest) ProtoMessage() {} -func (*QueryAllChainNoncesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{26} -} -func (m *QueryAllChainNoncesRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryAllChainNoncesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryAllChainNoncesRequest.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 *QueryAllChainNoncesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllChainNoncesRequest.Merge(m, src) -} -func (m *QueryAllChainNoncesRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryAllChainNoncesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllChainNoncesRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryAllChainNoncesRequest proto.InternalMessageInfo - -func (m *QueryAllChainNoncesRequest) GetPagination() *query.PageRequest { - if m != nil { - return m.Pagination - } - return nil -} - -type QueryAllChainNoncesResponse struct { - ChainNonces []*ChainNonces `protobuf:"bytes,1,rep,name=ChainNonces,proto3" json:"ChainNonces,omitempty"` - Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` -} - -func (m *QueryAllChainNoncesResponse) Reset() { *m = QueryAllChainNoncesResponse{} } -func (m *QueryAllChainNoncesResponse) String() string { return proto.CompactTextString(m) } -func (*QueryAllChainNoncesResponse) ProtoMessage() {} -func (*QueryAllChainNoncesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{27} -} -func (m *QueryAllChainNoncesResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryAllChainNoncesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryAllChainNoncesResponse.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 *QueryAllChainNoncesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllChainNoncesResponse.Merge(m, src) -} -func (m *QueryAllChainNoncesResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryAllChainNoncesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllChainNoncesResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryAllChainNoncesResponse proto.InternalMessageInfo - -func (m *QueryAllChainNoncesResponse) GetChainNonces() []*ChainNonces { - if m != nil { - return m.ChainNonces - } - return nil -} - -func (m *QueryAllChainNoncesResponse) GetPagination() *query.PageResponse { - if m != nil { - return m.Pagination - } - return nil -} - -type QueryAllPendingNoncesRequest struct { - Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` -} - -func (m *QueryAllPendingNoncesRequest) Reset() { *m = QueryAllPendingNoncesRequest{} } -func (m *QueryAllPendingNoncesRequest) String() string { return proto.CompactTextString(m) } -func (*QueryAllPendingNoncesRequest) ProtoMessage() {} -func (*QueryAllPendingNoncesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{28} -} -func (m *QueryAllPendingNoncesRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryAllPendingNoncesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryAllPendingNoncesRequest.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 *QueryAllPendingNoncesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllPendingNoncesRequest.Merge(m, src) -} -func (m *QueryAllPendingNoncesRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryAllPendingNoncesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllPendingNoncesRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryAllPendingNoncesRequest proto.InternalMessageInfo - -func (m *QueryAllPendingNoncesRequest) GetPagination() *query.PageRequest { - if m != nil { - return m.Pagination - } - return nil -} - -type QueryAllPendingNoncesResponse struct { - PendingNonces []PendingNonces `protobuf:"bytes,1,rep,name=pending_nonces,json=pendingNonces,proto3" json:"pending_nonces"` - Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` -} - -func (m *QueryAllPendingNoncesResponse) Reset() { *m = QueryAllPendingNoncesResponse{} } -func (m *QueryAllPendingNoncesResponse) String() string { return proto.CompactTextString(m) } -func (*QueryAllPendingNoncesResponse) ProtoMessage() {} -func (*QueryAllPendingNoncesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{29} -} -func (m *QueryAllPendingNoncesResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryAllPendingNoncesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryAllPendingNoncesResponse.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 *QueryAllPendingNoncesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryAllPendingNoncesResponse.Merge(m, src) -} -func (m *QueryAllPendingNoncesResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryAllPendingNoncesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryAllPendingNoncesResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryAllPendingNoncesResponse proto.InternalMessageInfo - -func (m *QueryAllPendingNoncesResponse) GetPendingNonces() []PendingNonces { - if m != nil { - return m.PendingNonces - } - return nil -} - -func (m *QueryAllPendingNoncesResponse) GetPagination() *query.PageResponse { - if m != nil { - return m.Pagination - } - return nil -} - -type QueryPendingNoncesByChainRequest struct { - ChainId int64 `protobuf:"varint,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` -} - -func (m *QueryPendingNoncesByChainRequest) Reset() { *m = QueryPendingNoncesByChainRequest{} } -func (m *QueryPendingNoncesByChainRequest) String() string { return proto.CompactTextString(m) } -func (*QueryPendingNoncesByChainRequest) ProtoMessage() {} -func (*QueryPendingNoncesByChainRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{30} -} -func (m *QueryPendingNoncesByChainRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryPendingNoncesByChainRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryPendingNoncesByChainRequest.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 *QueryPendingNoncesByChainRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryPendingNoncesByChainRequest.Merge(m, src) -} -func (m *QueryPendingNoncesByChainRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryPendingNoncesByChainRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryPendingNoncesByChainRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryPendingNoncesByChainRequest proto.InternalMessageInfo - -func (m *QueryPendingNoncesByChainRequest) GetChainId() int64 { - if m != nil { - return m.ChainId - } - return 0 -} - -type QueryPendingNoncesByChainResponse struct { - PendingNonces PendingNonces `protobuf:"bytes,1,opt,name=pending_nonces,json=pendingNonces,proto3" json:"pending_nonces"` -} - -func (m *QueryPendingNoncesByChainResponse) Reset() { *m = QueryPendingNoncesByChainResponse{} } -func (m *QueryPendingNoncesByChainResponse) String() string { return proto.CompactTextString(m) } -func (*QueryPendingNoncesByChainResponse) ProtoMessage() {} -func (*QueryPendingNoncesByChainResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{31} -} -func (m *QueryPendingNoncesByChainResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryPendingNoncesByChainResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryPendingNoncesByChainResponse.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 *QueryPendingNoncesByChainResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryPendingNoncesByChainResponse.Merge(m, src) -} -func (m *QueryPendingNoncesByChainResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryPendingNoncesByChainResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryPendingNoncesByChainResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryPendingNoncesByChainResponse proto.InternalMessageInfo - -func (m *QueryPendingNoncesByChainResponse) GetPendingNonces() PendingNonces { - if m != nil { - return m.PendingNonces - } - return PendingNonces{} -} - type QueryGetLastBlockHeightRequest struct { Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` } @@ -1522,7 +1154,7 @@ func (m *QueryGetLastBlockHeightRequest) Reset() { *m = QueryGetLastBloc func (m *QueryGetLastBlockHeightRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetLastBlockHeightRequest) ProtoMessage() {} func (*QueryGetLastBlockHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{32} + return fileDescriptor_65a992045e92a606, []int{24} } func (m *QueryGetLastBlockHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1566,7 +1198,7 @@ func (m *QueryGetLastBlockHeightResponse) Reset() { *m = QueryGetLastBlo func (m *QueryGetLastBlockHeightResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetLastBlockHeightResponse) ProtoMessage() {} func (*QueryGetLastBlockHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{33} + return fileDescriptor_65a992045e92a606, []int{25} } func (m *QueryGetLastBlockHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1610,7 +1242,7 @@ func (m *QueryAllLastBlockHeightRequest) Reset() { *m = QueryAllLastBloc func (m *QueryAllLastBlockHeightRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllLastBlockHeightRequest) ProtoMessage() {} func (*QueryAllLastBlockHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{34} + return fileDescriptor_65a992045e92a606, []int{26} } func (m *QueryAllLastBlockHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1655,7 +1287,7 @@ func (m *QueryAllLastBlockHeightResponse) Reset() { *m = QueryAllLastBlo func (m *QueryAllLastBlockHeightResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllLastBlockHeightResponse) ProtoMessage() {} func (*QueryAllLastBlockHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{35} + return fileDescriptor_65a992045e92a606, []int{27} } func (m *QueryAllLastBlockHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1706,7 +1338,7 @@ func (m *QueryGetCctxRequest) Reset() { *m = QueryGetCctxRequest{} } func (m *QueryGetCctxRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetCctxRequest) ProtoMessage() {} func (*QueryGetCctxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{36} + return fileDescriptor_65a992045e92a606, []int{28} } func (m *QueryGetCctxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1751,7 +1383,7 @@ func (m *QueryGetCctxByNonceRequest) Reset() { *m = QueryGetCctxByNonceR func (m *QueryGetCctxByNonceRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetCctxByNonceRequest) ProtoMessage() {} func (*QueryGetCctxByNonceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{37} + return fileDescriptor_65a992045e92a606, []int{29} } func (m *QueryGetCctxByNonceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1802,7 +1434,7 @@ func (m *QueryGetCctxResponse) Reset() { *m = QueryGetCctxResponse{} } func (m *QueryGetCctxResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetCctxResponse) ProtoMessage() {} func (*QueryGetCctxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{38} + return fileDescriptor_65a992045e92a606, []int{30} } func (m *QueryGetCctxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1846,7 +1478,7 @@ func (m *QueryAllCctxRequest) Reset() { *m = QueryAllCctxRequest{} } func (m *QueryAllCctxRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllCctxRequest) ProtoMessage() {} func (*QueryAllCctxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{39} + return fileDescriptor_65a992045e92a606, []int{31} } func (m *QueryAllCctxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1891,7 +1523,7 @@ func (m *QueryAllCctxResponse) Reset() { *m = QueryAllCctxResponse{} } func (m *QueryAllCctxResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllCctxResponse) ProtoMessage() {} func (*QueryAllCctxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{40} + return fileDescriptor_65a992045e92a606, []int{32} } func (m *QueryAllCctxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1943,7 +1575,7 @@ func (m *QueryListCctxPendingRequest) Reset() { *m = QueryListCctxPendin func (m *QueryListCctxPendingRequest) String() string { return proto.CompactTextString(m) } func (*QueryListCctxPendingRequest) ProtoMessage() {} func (*QueryListCctxPendingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{41} + return fileDescriptor_65a992045e92a606, []int{33} } func (m *QueryListCctxPendingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1995,7 +1627,7 @@ func (m *QueryListCctxPendingResponse) Reset() { *m = QueryListCctxPendi func (m *QueryListCctxPendingResponse) String() string { return proto.CompactTextString(m) } func (*QueryListCctxPendingResponse) ProtoMessage() {} func (*QueryListCctxPendingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{42} + return fileDescriptor_65a992045e92a606, []int{34} } func (m *QueryListCctxPendingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2045,7 +1677,7 @@ func (m *QueryLastZetaHeightRequest) Reset() { *m = QueryLastZetaHeightR func (m *QueryLastZetaHeightRequest) String() string { return proto.CompactTextString(m) } func (*QueryLastZetaHeightRequest) ProtoMessage() {} func (*QueryLastZetaHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{43} + return fileDescriptor_65a992045e92a606, []int{35} } func (m *QueryLastZetaHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2082,7 +1714,7 @@ func (m *QueryLastZetaHeightResponse) Reset() { *m = QueryLastZetaHeight func (m *QueryLastZetaHeightResponse) String() string { return proto.CompactTextString(m) } func (*QueryLastZetaHeightResponse) ProtoMessage() {} func (*QueryLastZetaHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{44} + return fileDescriptor_65a992045e92a606, []int{36} } func (m *QueryLastZetaHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2127,7 +1759,7 @@ func (m *QueryConvertGasToZetaRequest) Reset() { *m = QueryConvertGasToZ func (m *QueryConvertGasToZetaRequest) String() string { return proto.CompactTextString(m) } func (*QueryConvertGasToZetaRequest) ProtoMessage() {} func (*QueryConvertGasToZetaRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{45} + return fileDescriptor_65a992045e92a606, []int{37} } func (m *QueryConvertGasToZetaRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2180,7 +1812,7 @@ func (m *QueryConvertGasToZetaResponse) Reset() { *m = QueryConvertGasTo func (m *QueryConvertGasToZetaResponse) String() string { return proto.CompactTextString(m) } func (*QueryConvertGasToZetaResponse) ProtoMessage() {} func (*QueryConvertGasToZetaResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{46} + return fileDescriptor_65a992045e92a606, []int{38} } func (m *QueryConvertGasToZetaResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2237,7 +1869,7 @@ func (m *QueryMessagePassingProtocolFeeRequest) Reset() { *m = QueryMess func (m *QueryMessagePassingProtocolFeeRequest) String() string { return proto.CompactTextString(m) } func (*QueryMessagePassingProtocolFeeRequest) ProtoMessage() {} func (*QueryMessagePassingProtocolFeeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{47} + return fileDescriptor_65a992045e92a606, []int{39} } func (m *QueryMessagePassingProtocolFeeRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2276,7 +1908,7 @@ func (m *QueryMessagePassingProtocolFeeResponse) Reset() { func (m *QueryMessagePassingProtocolFeeResponse) String() string { return proto.CompactTextString(m) } func (*QueryMessagePassingProtocolFeeResponse) ProtoMessage() {} func (*QueryMessagePassingProtocolFeeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65a992045e92a606, []int{48} + return fileDescriptor_65a992045e92a606, []int{40} } func (m *QueryMessagePassingProtocolFeeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2337,14 +1969,6 @@ func init() { proto.RegisterType((*QueryGetGasPriceResponse)(nil), "zetachain.zetacore.crosschain.QueryGetGasPriceResponse") proto.RegisterType((*QueryAllGasPriceRequest)(nil), "zetachain.zetacore.crosschain.QueryAllGasPriceRequest") proto.RegisterType((*QueryAllGasPriceResponse)(nil), "zetachain.zetacore.crosschain.QueryAllGasPriceResponse") - proto.RegisterType((*QueryGetChainNoncesRequest)(nil), "zetachain.zetacore.crosschain.QueryGetChainNoncesRequest") - proto.RegisterType((*QueryGetChainNoncesResponse)(nil), "zetachain.zetacore.crosschain.QueryGetChainNoncesResponse") - proto.RegisterType((*QueryAllChainNoncesRequest)(nil), "zetachain.zetacore.crosschain.QueryAllChainNoncesRequest") - proto.RegisterType((*QueryAllChainNoncesResponse)(nil), "zetachain.zetacore.crosschain.QueryAllChainNoncesResponse") - proto.RegisterType((*QueryAllPendingNoncesRequest)(nil), "zetachain.zetacore.crosschain.QueryAllPendingNoncesRequest") - proto.RegisterType((*QueryAllPendingNoncesResponse)(nil), "zetachain.zetacore.crosschain.QueryAllPendingNoncesResponse") - proto.RegisterType((*QueryPendingNoncesByChainRequest)(nil), "zetachain.zetacore.crosschain.QueryPendingNoncesByChainRequest") - proto.RegisterType((*QueryPendingNoncesByChainResponse)(nil), "zetachain.zetacore.crosschain.QueryPendingNoncesByChainResponse") proto.RegisterType((*QueryGetLastBlockHeightRequest)(nil), "zetachain.zetacore.crosschain.QueryGetLastBlockHeightRequest") proto.RegisterType((*QueryGetLastBlockHeightResponse)(nil), "zetachain.zetacore.crosschain.QueryGetLastBlockHeightResponse") proto.RegisterType((*QueryAllLastBlockHeightRequest)(nil), "zetachain.zetacore.crosschain.QueryAllLastBlockHeightRequest") @@ -2367,135 +1991,119 @@ func init() { func init() { proto.RegisterFile("crosschain/query.proto", fileDescriptor_65a992045e92a606) } var fileDescriptor_65a992045e92a606 = []byte{ - // 2046 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xdf, 0x6f, 0x1c, 0x57, - 0x15, 0xce, 0xcd, 0x26, 0x69, 0x72, 0x9d, 0xc6, 0xcd, 0xad, 0x49, 0xcd, 0xd4, 0x5e, 0xa7, 0xd7, - 0xf5, 0x0f, 0x1c, 0x7b, 0xa7, 0xde, 0x36, 0x0e, 0x49, 0x1c, 0xe8, 0xda, 0x21, 0x6e, 0x84, 0xdb, - 0x9a, 0x95, 0x11, 0x60, 0x84, 0x56, 0xd7, 0xb3, 0xd3, 0xd9, 0x51, 0xd6, 0x33, 0xdb, 0x9d, 0xd9, - 0xca, 0x8e, 0x65, 0x1e, 0xfa, 0xc0, 0x2b, 0x48, 0x95, 0xe0, 0x85, 0x57, 0x04, 0x0f, 0x3c, 0x20, - 0x51, 0x01, 0x52, 0xa5, 0x22, 0x54, 0x08, 0x79, 0xac, 0x40, 0x42, 0x08, 0x24, 0x84, 0x12, 0xfe, - 0x10, 0x34, 0x77, 0xce, 0xec, 0xdc, 0xf9, 0xb5, 0x73, 0xbd, 0x9e, 0x3c, 0xf4, 0xa5, 0xdd, 0x99, - 0x3b, 0xe7, 0x9c, 0xef, 0xfb, 0xee, 0xb9, 0xf7, 0x9e, 0x7b, 0x62, 0x7c, 0x45, 0xeb, 0xda, 0x8e, - 0xa3, 0xb5, 0x98, 0x69, 0xa9, 0xef, 0xf7, 0xf4, 0xee, 0x41, 0xa5, 0xd3, 0xb5, 0x5d, 0x9b, 0x4c, - 0x3e, 0xd4, 0x5d, 0xc6, 0x5f, 0x57, 0xf8, 0x2f, 0xbb, 0xab, 0x57, 0xc2, 0x4f, 0x95, 0x05, 0xcd, - 0x76, 0xf6, 0x6c, 0x47, 0xdd, 0x65, 0x8e, 0xee, 0xdb, 0xa9, 0x1f, 0x2c, 0xef, 0xea, 0x2e, 0x5b, - 0x56, 0x3b, 0xcc, 0x30, 0x2d, 0xe6, 0x9a, 0xb6, 0xe5, 0xbb, 0x52, 0x26, 0x85, 0x10, 0xfc, 0xbf, - 0x0d, 0xcb, 0xb6, 0x34, 0xdd, 0x81, 0xe1, 0x29, 0x71, 0xd8, 0xfb, 0xd9, 0xf0, 0x3f, 0x72, 0xf7, - 0xe1, 0x03, 0x45, 0xf8, 0xc0, 0x60, 0x4e, 0xa3, 0xd3, 0x35, 0x35, 0x1d, 0xc6, 0xa6, 0x85, 0x31, - 0x6e, 0xd3, 0x68, 0x31, 0xa7, 0xd5, 0x70, 0xed, 0x86, 0xa6, 0xf5, 0x1d, 0x94, 0x13, 0x1f, 0xb9, - 0x5d, 0xa6, 0x3d, 0xd0, 0xbb, 0x30, 0x4e, 0x85, 0xf1, 0x36, 0x73, 0xdc, 0xc6, 0x6e, 0xdb, 0xd6, - 0x1e, 0x34, 0x5a, 0xba, 0x69, 0xb4, 0xdc, 0x14, 0x1f, 0x1c, 0x7e, 0x2c, 0x86, 0xc8, 0xc2, 0xee, - 0xb9, 0xc9, 0x20, 0x2f, 0x09, 0x1f, 0x74, 0x58, 0x97, 0xed, 0xa5, 0xf1, 0xef, 0xe8, 0x56, 0xd3, - 0xb4, 0x8c, 0xa8, 0x40, 0x63, 0x86, 0x6d, 0xd8, 0xfc, 0xa7, 0xea, 0xfd, 0x82, 0xb7, 0x13, 0x86, - 0x6d, 0x1b, 0x6d, 0x5d, 0x65, 0x1d, 0x53, 0x65, 0x96, 0x65, 0xbb, 0x5c, 0x72, 0xb0, 0xa1, 0x13, - 0x58, 0xf9, 0x96, 0x37, 0x2b, 0x3b, 0xba, 0xcb, 0x6a, 0x9a, 0x66, 0xf7, 0x2c, 0xd7, 0xb4, 0x8c, - 0xba, 0xfe, 0x7e, 0x4f, 0x77, 0x5c, 0xfa, 0x36, 0x7e, 0x39, 0x75, 0xd4, 0xe9, 0xd8, 0x96, 0xa3, - 0x93, 0x0a, 0x7e, 0x91, 0xed, 0xda, 0x5d, 0x57, 0x6f, 0x36, 0xbc, 0xb9, 0x6f, 0xb0, 0x3d, 0xef, - 0x8b, 0x71, 0x74, 0x15, 0xcd, 0x5f, 0xa8, 0x5f, 0x86, 0x21, 0x6e, 0xcb, 0x07, 0xe8, 0x18, 0x26, - 0xdc, 0xdd, 0x16, 0xa7, 0x15, 0x04, 0xd9, 0xc1, 0x2f, 0x46, 0xde, 0x82, 0xf3, 0x75, 0x7c, 0xce, - 0xa7, 0xcf, 0xfd, 0x8d, 0x54, 0x67, 0x2a, 0x03, 0x33, 0xad, 0xe2, 0x9b, 0xaf, 0x9d, 0x79, 0xfc, - 0x9f, 0xa9, 0x53, 0x75, 0x30, 0xed, 0x13, 0xd8, 0xd0, 0xdd, 0x77, 0x7b, 0xee, 0xf6, 0xfe, 0xb6, - 0x2f, 0x35, 0x84, 0x26, 0xe3, 0xf8, 0x39, 0x6e, 0x7c, 0xff, 0x2e, 0x0f, 0x52, 0xaa, 0x07, 0x8f, - 0x64, 0x0c, 0x9f, 0xe5, 0xda, 0x8e, 0x9f, 0xbe, 0x8a, 0xe6, 0xcf, 0xd4, 0xfd, 0x07, 0xda, 0xc3, - 0x13, 0xe9, 0xee, 0x00, 0xf3, 0xb7, 0xf1, 0x45, 0x5b, 0x78, 0x0f, 0xc8, 0xaf, 0xe5, 0x20, 0x17, - 0x5d, 0x01, 0xfe, 0x88, 0x1b, 0xaa, 0x03, 0x8b, 0x5a, 0xbb, 0x9d, 0xc6, 0xe2, 0x1e, 0xc6, 0xe1, - 0x5a, 0x82, 0x98, 0xb3, 0x15, 0x7f, 0xe1, 0x55, 0xbc, 0x85, 0x57, 0xf1, 0x17, 0x2c, 0x2c, 0xbc, - 0xca, 0x16, 0x33, 0x74, 0xb0, 0xad, 0x0b, 0x96, 0xf4, 0x53, 0x04, 0xf4, 0x12, 0x71, 0x32, 0xe9, - 0x95, 0x0a, 0xa0, 0x47, 0x36, 0x22, 0xf8, 0x4f, 0x73, 0xfc, 0x73, 0xb9, 0xf8, 0x7d, 0x4c, 0x11, - 0x02, 0x1f, 0x22, 0x4c, 0xd3, 0x08, 0xac, 0x1d, 0xac, 0x7b, 0x48, 0x02, 0xbd, 0xc6, 0xf0, 0x59, - 0x8e, 0x0c, 0xe6, 0xdc, 0x7f, 0x88, 0xa9, 0x78, 0x7a, 0x68, 0x15, 0xff, 0x82, 0xf0, 0xf4, 0x40, - 0x10, 0x5f, 0x10, 0x31, 0x7f, 0x84, 0xf0, 0x2b, 0x01, 0x8f, 0xfb, 0x56, 0x96, 0x96, 0x5f, 0xc6, - 0xe7, 0xfd, 0x5d, 0xd8, 0x6c, 0x46, 0x97, 0x50, 0xb3, 0x30, 0x41, 0xff, 0x24, 0xcc, 0x6a, 0x1a, - 0x10, 0xd0, 0xb3, 0x8e, 0x47, 0x4c, 0x2b, 0x2e, 0xe7, 0x42, 0x8e, 0x9c, 0xa2, 0x3f, 0x5f, 0x4d, - 0xd1, 0x49, 0x71, 0x62, 0x0a, 0x2b, 0x58, 0x08, 0xe9, 0x14, 0xbd, 0x82, 0x3f, 0x11, 0x56, 0x70, - 0x34, 0xce, 0x17, 0x41, 0xa4, 0xdb, 0x78, 0x32, 0xd8, 0x5d, 0xbd, 0x90, 0x6f, 0x31, 0xa7, 0xb5, - 0x6d, 0xaf, 0x6b, 0xee, 0x7e, 0x20, 0x93, 0x82, 0xcf, 0x9b, 0x30, 0x00, 0x87, 0x4c, 0xff, 0x99, - 0x1e, 0xe1, 0x72, 0x96, 0x31, 0x70, 0xff, 0x3e, 0xbe, 0x64, 0x46, 0x46, 0x40, 0xe8, 0x25, 0x09, - 0xfa, 0xa1, 0x11, 0x28, 0x10, 0x73, 0x45, 0x57, 0x21, 0x7c, 0xf4, 0xe3, 0xbb, 0xcc, 0x65, 0x32, - 0xe0, 0x1f, 0xe2, 0xa9, 0x4c, 0x6b, 0x40, 0xff, 0x1d, 0xfc, 0xfc, 0xba, 0x87, 0x89, 0x27, 0xfd, - 0xf6, 0xbe, 0x23, 0xb9, 0x5f, 0x88, 0x36, 0x00, 0x3d, 0xea, 0x87, 0x1a, 0xa0, 0x3a, 0xa4, 0x4c, - 0x52, 0xf5, 0xa2, 0x92, 0xf3, 0x11, 0x02, 0x8d, 0x52, 0x22, 0x0d, 0x98, 0xa2, 0x52, 0x41, 0x53, - 0x54, 0x5c, 0x9e, 0xaa, 0xf8, 0xa5, 0x20, 0xd5, 0x36, 0x98, 0xb3, 0xe5, 0x55, 0x99, 0xc2, 0xd1, - 0x62, 0x5a, 0x4d, 0x7d, 0x1f, 0x66, 0xd8, 0x7f, 0xa0, 0x0d, 0x3c, 0x9e, 0x34, 0xe8, 0x97, 0x39, - 0xe7, 0x83, 0x77, 0xa0, 0xed, 0x5c, 0x0e, 0xd9, 0xbe, 0x8b, 0xbe, 0x21, 0x65, 0x80, 0xa8, 0xd6, - 0x6e, 0xc7, 0x11, 0x15, 0x35, 0x7b, 0xbf, 0x42, 0x40, 0x22, 0x12, 0x23, 0x95, 0x44, 0x69, 0x28, - 0x12, 0xc5, 0xcd, 0x4f, 0x15, 0x6a, 0xda, 0x0d, 0xdd, 0xe5, 0x59, 0xfe, 0x0e, 0x2f, 0x92, 0x07, - 0x4f, 0xd1, 0x83, 0xb0, 0x50, 0x8c, 0xd8, 0x00, 0xc1, 0x4d, 0x3c, 0x22, 0xbc, 0x06, 0x19, 0xf3, - 0xf6, 0x4d, 0xd1, 0x91, 0x68, 0x4e, 0x9b, 0x00, 0xb0, 0xd6, 0x6e, 0xa7, 0x00, 0x2c, 0x6a, 0xc6, - 0x3e, 0x46, 0xe1, 0xa1, 0x23, 0xc5, 0xa9, 0x74, 0x02, 0x4e, 0xc5, 0xcd, 0xde, 0x7b, 0xe1, 0x11, - 0xb6, 0xe5, 0xdf, 0x72, 0x9e, 0x8d, 0x3c, 0x9f, 0xa1, 0x70, 0xe3, 0x8b, 0x05, 0x02, 0x81, 0xbe, - 0x87, 0x2f, 0x45, 0xef, 0x59, 0xa0, 0xd1, 0x62, 0xde, 0x4d, 0x44, 0xf4, 0x16, 0x6c, 0xba, 0x1d, - 0xf1, 0x65, 0x71, 0x6a, 0xdd, 0xc1, 0x57, 0xfd, 0xcb, 0x53, 0x24, 0xa6, 0x6c, 0x8d, 0x46, 0x7f, - 0x08, 0x35, 0x5e, 0xba, 0xf9, 0x00, 0x1d, 0x50, 0x21, 0x3a, 0xd0, 0x95, 0xf0, 0xd4, 0xde, 0x64, - 0x8e, 0xbb, 0xe6, 0xdd, 0xa7, 0xdf, 0xe2, 0xd7, 0xe9, 0xc1, 0xcb, 0xf5, 0x10, 0x0e, 0xcc, 0x34, - 0x3b, 0x40, 0xfd, 0x5d, 0x3c, 0x1a, 0x1b, 0x02, 0xd8, 0x95, 0x1c, 0xd8, 0x71, 0x87, 0x71, 0x37, - 0xb4, 0x15, 0x9e, 0x63, 0x19, 0xa0, 0x8b, 0xca, 0xd1, 0x3f, 0x23, 0xe0, 0x99, 0x16, 0x6a, 0x10, - 0xcf, 0x52, 0x01, 0x3c, 0x8b, 0x4b, 0xd2, 0x6b, 0x70, 0xc3, 0xf7, 0x36, 0x57, 0xa1, 0xb0, 0x48, - 0x9f, 0xda, 0x4d, 0x61, 0xf7, 0xf6, 0x0e, 0xf3, 0x03, 0x9e, 0x2a, 0xc3, 0xde, 0xd8, 0x0d, 0x3c, - 0x16, 0x0d, 0x0d, 0xaa, 0xbd, 0x8b, 0x2f, 0x8a, 0x65, 0x90, 0xe4, 0x4d, 0x5d, 0x34, 0xa9, 0x47, - 0x1c, 0xd0, 0x1f, 0x00, 0x47, 0x6f, 0xb3, 0x7d, 0x06, 0xc5, 0xd3, 0x6f, 0x10, 0x10, 0xe9, 0xfb, - 0xcf, 0x24, 0x52, 0x3a, 0x11, 0x91, 0xe2, 0x66, 0xfd, 0x1d, 0x38, 0x7e, 0x36, 0x4d, 0x87, 0x6b, - 0x0f, 0xdb, 0x81, 0xc4, 0xcd, 0x71, 0x0c, 0x9f, 0x6d, 0x9b, 0x7b, 0xa6, 0xcb, 0xa3, 0x3f, 0x5f, - 0xf7, 0x1f, 0xe8, 0x47, 0xc1, 0xe5, 0x26, 0xe1, 0xf0, 0x59, 0x49, 0x41, 0xf1, 0x45, 0xd7, 0x76, - 0x59, 0x70, 0x3c, 0x40, 0x66, 0x45, 0xde, 0xf5, 0x1b, 0x68, 0xde, 0xe2, 0xd9, 0xd1, 0x5d, 0x16, - 0xd9, 0x08, 0xe8, 0xf5, 0x40, 0x83, 0xd8, 0x28, 0x20, 0xbe, 0x82, 0xcf, 0x09, 0x5b, 0x53, 0xa9, - 0x0e, 0x4f, 0x74, 0x1b, 0x98, 0xae, 0xdb, 0xd6, 0x07, 0x7a, 0xd7, 0x2b, 0x1a, 0xb7, 0x6d, 0xcf, - 0x3c, 0xb1, 0x0a, 0x12, 0xd2, 0x29, 0xf8, 0xbc, 0xc1, 0x9c, 0xcd, 0xbe, 0x7a, 0x17, 0xea, 0xfd, - 0x67, 0xfa, 0x8b, 0xe0, 0xc4, 0x4b, 0xba, 0x05, 0x3c, 0x8b, 0xf8, 0xb2, 0xdd, 0x73, 0x77, 0xed, - 0x9e, 0xd5, 0xdc, 0x60, 0xce, 0x7d, 0xcb, 0x1b, 0x0c, 0xda, 0x79, 0x89, 0x01, 0xef, 0x6b, 0xde, - 0x44, 0xd4, 0xec, 0xf6, 0x3d, 0x5d, 0x87, 0xaf, 0xfd, 0xa0, 0xc9, 0x01, 0x32, 0x8f, 0x47, 0xbd, - 0xff, 0x8b, 0xfb, 0x54, 0x89, 0xeb, 0x19, 0x7f, 0x4d, 0xe7, 0xf0, 0x0c, 0x87, 0xf9, 0xb6, 0xee, - 0x38, 0xcc, 0xd0, 0xb7, 0x98, 0xe3, 0x98, 0x96, 0xb1, 0x15, 0x7a, 0x0c, 0xd4, 0xbd, 0x87, 0x67, - 0xf3, 0x3e, 0x04, 0x62, 0x13, 0xf8, 0xc2, 0x7b, 0x7d, 0x88, 0x3e, 0xa1, 0xf0, 0x45, 0xf5, 0xc7, - 0x33, 0xf8, 0x2c, 0x77, 0x44, 0x7e, 0x8a, 0xf0, 0x39, 0xbf, 0x91, 0x48, 0x96, 0x73, 0xf2, 0x26, - 0xd9, 0xc9, 0x54, 0xaa, 0xc7, 0x31, 0xf1, 0x91, 0xd1, 0x99, 0x0f, 0xff, 0xfe, 0xbf, 0x8f, 0x4e, - 0x4f, 0x91, 0x49, 0xd5, 0xb3, 0x58, 0x12, 0xda, 0xdb, 0x62, 0x0b, 0x98, 0x3c, 0x42, 0xf8, 0xa2, - 0xd8, 0xfb, 0x21, 0xb7, 0x64, 0x62, 0xa5, 0xb7, 0x3d, 0x95, 0xdb, 0x43, 0xd9, 0x02, 0xe0, 0x3b, - 0x1c, 0xf0, 0x0d, 0x72, 0x3d, 0x03, 0xb0, 0xd8, 0x8d, 0x52, 0x0f, 0x61, 0x77, 0x3e, 0x52, 0x0f, - 0xf9, 0x7e, 0x7c, 0x44, 0x7e, 0x8f, 0xf0, 0xa8, 0xe8, 0xb7, 0xd6, 0x6e, 0xcb, 0x71, 0x49, 0x6f, - 0x7e, 0xca, 0x71, 0xc9, 0x68, 0x68, 0xd2, 0x6b, 0x9c, 0xcb, 0x0c, 0x99, 0x96, 0xe0, 0x42, 0xfe, - 0x8d, 0xf0, 0x95, 0x18, 0x72, 0xa8, 0x94, 0x48, 0x6d, 0x08, 0x10, 0xd1, 0x22, 0x4d, 0x59, 0x3b, - 0x89, 0x0b, 0xa0, 0x73, 0x8b, 0xd3, 0x79, 0x83, 0x54, 0x25, 0xe8, 0x80, 0x2d, 0xcc, 0xd0, 0x11, - 0xf9, 0x17, 0xc2, 0x5f, 0x12, 0x1a, 0x3d, 0x02, 0xb9, 0x37, 0x25, 0x91, 0x65, 0x36, 0x09, 0x95, - 0xda, 0x09, 0x3c, 0x00, 0xb5, 0x55, 0x4e, 0x6d, 0x85, 0xbc, 0x91, 0x41, 0xcd, 0xb4, 0x32, 0x98, - 0x35, 0xcc, 0xe6, 0x11, 0xf9, 0x1d, 0xc2, 0x97, 0xa2, 0xe4, 0xa4, 0x73, 0x2e, 0xa5, 0x5d, 0x27, - 0x9d, 0x73, 0x69, 0x2d, 0xb8, 0xdc, 0x9c, 0x13, 0x98, 0x38, 0xe4, 0xaf, 0x00, 0x5c, 0x68, 0x63, - 0xac, 0x4a, 0x2e, 0xde, 0xd4, 0x66, 0x8e, 0x72, 0x67, 0x48, 0x6b, 0x00, 0xff, 0x55, 0x0e, 0xbe, - 0x4a, 0x5e, 0x1b, 0x00, 0x3e, 0x34, 0x53, 0x0f, 0x83, 0xe7, 0x23, 0xf2, 0x0f, 0x84, 0x49, 0xb2, - 0xbd, 0x45, 0xa4, 0xf0, 0x64, 0x36, 0xd5, 0x94, 0xaf, 0x0d, 0x6b, 0x0e, 0x7c, 0x6a, 0x9c, 0xcf, - 0x6d, 0x72, 0x33, 0x93, 0x4f, 0xfc, 0x9f, 0x0a, 0x1b, 0x4d, 0xe6, 0x32, 0x91, 0xd8, 0x1f, 0x11, - 0xbe, 0x1c, 0x8d, 0xe0, 0xa5, 0xd7, 0xea, 0x31, 0x52, 0x64, 0xc8, 0x59, 0xca, 0x6c, 0xa3, 0xd1, - 0x25, 0xce, 0x6a, 0x8e, 0xcc, 0x48, 0xcd, 0x12, 0xf9, 0x35, 0x0a, 0xdb, 0x37, 0x64, 0x45, 0x32, - 0x41, 0x62, 0x7d, 0x26, 0xe5, 0xc6, 0xb1, 0xed, 0x00, 0xac, 0xca, 0xc1, 0x7e, 0x85, 0xcc, 0x65, - 0x80, 0x35, 0xc0, 0xc0, 0xd3, 0xbc, 0xa9, 0xef, 0x1f, 0x91, 0x5f, 0x22, 0x3c, 0x12, 0x78, 0xf1, - 0xa4, 0x5e, 0x91, 0x14, 0x6b, 0x28, 0xc4, 0x29, 0xdd, 0x2e, 0x3a, 0xc7, 0x11, 0xbf, 0x42, 0xa6, - 0x72, 0x10, 0x93, 0x4f, 0x11, 0x7e, 0x21, 0x5e, 0x6b, 0x11, 0xa9, 0xcd, 0x23, 0xa3, 0xf0, 0x53, - 0x56, 0x87, 0x33, 0x96, 0x94, 0x5a, 0x8b, 0x63, 0x7d, 0x84, 0xf0, 0x88, 0x50, 0x4e, 0x91, 0xbb, - 0x32, 0xe1, 0xf3, 0xca, 0x36, 0xe5, 0x1b, 0x27, 0xf4, 0x02, 0x6c, 0x16, 0x38, 0x9b, 0x57, 0x09, - 0xcd, 0xaa, 0x9c, 0x04, 0xe0, 0x7f, 0x40, 0x91, 0x66, 0x17, 0xb9, 0x29, 0x99, 0xad, 0xc9, 0xf6, - 0x9c, 0x72, 0x6b, 0x18, 0x53, 0x80, 0x5c, 0xe5, 0x90, 0x17, 0xc9, 0x42, 0xd6, 0x04, 0x84, 0x36, - 0xfd, 0x74, 0xff, 0x2d, 0xc2, 0x97, 0x04, 0x5f, 0x5e, 0xc6, 0xdf, 0x94, 0xcc, 0xdc, 0x61, 0xd1, - 0xa7, 0x37, 0x0c, 0x73, 0x05, 0x17, 0xd0, 0x93, 0x4f, 0x10, 0x7e, 0x21, 0xd2, 0xff, 0xf1, 0x70, - 0xcb, 0x9e, 0x9b, 0x69, 0x7d, 0x3f, 0x65, 0x75, 0x38, 0x63, 0xc0, 0xbe, 0xc8, 0xb1, 0xcf, 0x92, - 0x57, 0xb3, 0x92, 0x25, 0xd2, 0x9e, 0xfb, 0x1b, 0xc2, 0x63, 0x69, 0x2d, 0x31, 0xf2, 0x75, 0xa9, - 0x0a, 0x3f, 0xbb, 0x17, 0xa7, 0xbc, 0x39, 0xbc, 0x03, 0x60, 0x72, 0x83, 0x33, 0x59, 0x26, 0xaa, - 0x0c, 0x13, 0xb1, 0x08, 0x7a, 0x8c, 0x12, 0x9d, 0x22, 0x22, 0x5b, 0x0e, 0xa4, 0xf7, 0xb9, 0xe4, - 0x8e, 0xdf, 0xec, 0x1e, 0x1d, 0x5d, 0xe1, 0x5c, 0x5e, 0x23, 0x95, 0x0c, 0x2e, 0xed, 0xa8, 0x5d, - 0x7f, 0x4d, 0x7c, 0x86, 0x30, 0x89, 0xf9, 0xf4, 0xf2, 0x4b, 0xf6, 0xd8, 0x3c, 0x09, 0x9b, 0xec, - 0x4e, 0x1c, 0xad, 0x70, 0x36, 0xf3, 0x64, 0x56, 0x8e, 0x0d, 0xf9, 0x39, 0xc2, 0x67, 0xf8, 0x01, - 0x5c, 0x95, 0xdd, 0x52, 0x84, 0x12, 0xe1, 0xf5, 0x63, 0xd9, 0x48, 0xd6, 0x9e, 0x1a, 0x14, 0x6d, - 0x5c, 0xe4, 0x8f, 0xbd, 0x3d, 0x33, 0xec, 0xc0, 0xc9, 0xef, 0x99, 0x89, 0xae, 0xdd, 0x70, 0x60, - 0xaf, 0x73, 0xb0, 0x2a, 0x59, 0x1a, 0x08, 0x36, 0x71, 0xc1, 0xfc, 0x19, 0xc2, 0xcf, 0x05, 0x55, - 0x58, 0x55, 0x76, 0xb7, 0x3b, 0xae, 0xb0, 0xb1, 0x2e, 0x1c, 0x9d, 0xe6, 0x58, 0x27, 0xc9, 0xcb, - 0x03, 0xb0, 0x7a, 0xb7, 0x90, 0x51, 0xcf, 0x6a, 0xd3, 0x74, 0x5c, 0x58, 0xe2, 0x72, 0xd7, 0x90, - 0xf4, 0x0e, 0x9a, 0xdc, 0x35, 0x24, 0xa3, 0x59, 0x96, 0xbf, 0x99, 0x87, 0x36, 0xfc, 0xfa, 0x14, - 0xfd, 0x13, 0x30, 0xb9, 0x64, 0x48, 0xfd, 0xa3, 0x32, 0xb9, 0x23, 0x28, 0xfd, 0x2f, 0xce, 0x72, - 0x2b, 0xdb, 0x87, 0x51, 0x94, 0x1e, 0xf0, 0x68, 0xeb, 0x4d, 0x0e, 0x78, 0x6a, 0x33, 0x4f, 0x0e, - 0x78, 0x7a, 0xa7, 0x2f, 0x17, 0x78, 0x3b, 0x62, 0xb6, 0xf6, 0xcd, 0xc7, 0x4f, 0xca, 0xe8, 0xf3, - 0x27, 0x65, 0xf4, 0xdf, 0x27, 0x65, 0xf4, 0x93, 0xa7, 0xe5, 0x53, 0x9f, 0x3f, 0x2d, 0x9f, 0xfa, - 0xe7, 0xd3, 0xf2, 0xa9, 0x9d, 0x65, 0xc3, 0x74, 0x5b, 0xbd, 0xdd, 0x8a, 0x66, 0xef, 0x89, 0xae, - 0x02, 0x3c, 0xea, 0xbe, 0xe8, 0xd5, 0x3d, 0xe8, 0xe8, 0xce, 0xee, 0x39, 0x5e, 0x09, 0xbd, 0xfe, - 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x94, 0x5c, 0x9b, 0xc3, 0x29, 0x00, 0x00, + // 1782 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xdf, 0x6f, 0x14, 0x55, + 0x14, 0xee, 0xed, 0xd2, 0x52, 0x6e, 0x0b, 0x95, 0x4b, 0x85, 0x3a, 0xb4, 0x5b, 0x98, 0x5a, 0x5a, + 0xc1, 0xee, 0xd0, 0x02, 0x45, 0xa0, 0x18, 0xb7, 0x45, 0x0a, 0xb1, 0x40, 0xdd, 0xd4, 0x68, 0x30, + 0x66, 0x73, 0x3b, 0x3b, 0xce, 0x4e, 0x98, 0xce, 0x94, 0x9d, 0x59, 0xd2, 0xd2, 0xf4, 0x85, 0x07, + 0x5f, 0x7c, 0x31, 0x21, 0xd1, 0x17, 0x5f, 0x8d, 0x3e, 0xf8, 0xe0, 0x83, 0xd1, 0x07, 0x13, 0x8c, + 0x51, 0x91, 0x47, 0x12, 0x13, 0x63, 0x34, 0x31, 0x06, 0xfc, 0x43, 0xcc, 0xdc, 0x39, 0xb3, 0x7b, + 0xe7, 0xd7, 0xee, 0xed, 0x76, 0x79, 0xe0, 0xa9, 0x3b, 0x73, 0xef, 0x39, 0xe7, 0xfb, 0xbe, 0xfb, + 0x63, 0xce, 0x39, 0xc5, 0x07, 0xd5, 0x8a, 0xed, 0x38, 0x6a, 0x99, 0x1a, 0x96, 0x72, 0xbb, 0xaa, + 0x55, 0x36, 0x72, 0x6b, 0x15, 0xdb, 0xb5, 0xc9, 0xf0, 0x5d, 0xcd, 0xa5, 0xec, 0x75, 0x8e, 0xfd, + 0xb2, 0x2b, 0x5a, 0xae, 0x3e, 0x55, 0x3a, 0xae, 0xda, 0xce, 0xaa, 0xed, 0x28, 0x2b, 0xd4, 0xd1, + 0x7c, 0x3b, 0xe5, 0xce, 0xd4, 0x8a, 0xe6, 0xd2, 0x29, 0x65, 0x8d, 0xea, 0x86, 0x45, 0x5d, 0xc3, + 0xb6, 0x7c, 0x57, 0xd2, 0x08, 0x17, 0x82, 0xfd, 0x2c, 0xb2, 0xdf, 0x45, 0x77, 0x1d, 0x26, 0x48, + 0xdc, 0x04, 0x9d, 0x3a, 0xc5, 0xb5, 0x8a, 0xa1, 0x6a, 0x30, 0x36, 0xca, 0x8d, 0x31, 0x9b, 0x62, + 0x99, 0x3a, 0xe5, 0xa2, 0x6b, 0x17, 0x55, 0xb5, 0xe6, 0x20, 0x1b, 0x9b, 0xe4, 0x56, 0xa8, 0x7a, + 0x4b, 0xab, 0xc0, 0xb8, 0xcc, 0x8d, 0x9b, 0xd4, 0x71, 0x8b, 0x2b, 0xa6, 0xad, 0xde, 0x2a, 0x96, + 0x35, 0x43, 0x2f, 0xbb, 0x09, 0x28, 0xed, 0xaa, 0x1b, 0x77, 0x72, 0x88, 0x9b, 0xb0, 0x46, 0x2b, + 0x74, 0xd5, 0x81, 0x81, 0x01, 0xdd, 0xd6, 0x6d, 0xf6, 0x53, 0xf1, 0x7e, 0xc1, 0xdb, 0x21, 0xdd, + 0xb6, 0x75, 0x53, 0x53, 0xe8, 0x9a, 0xa1, 0x50, 0xcb, 0xb2, 0x5d, 0x26, 0x09, 0xd8, 0xc8, 0x43, + 0x58, 0x7a, 0xdb, 0x53, 0xed, 0xa6, 0xe6, 0xd2, 0xbc, 0xaa, 0xda, 0x55, 0xcb, 0x35, 0x2c, 0xbd, + 0xa0, 0xdd, 0xae, 0x6a, 0x8e, 0x2b, 0x5f, 0xc3, 0x87, 0x13, 0x47, 0x9d, 0x35, 0xdb, 0x72, 0x34, + 0x92, 0xc3, 0x07, 0xe8, 0x8a, 0x5d, 0x71, 0xb5, 0x52, 0xd1, 0x5b, 0x9b, 0x22, 0x5d, 0xf5, 0x66, + 0x0c, 0xa2, 0x23, 0x68, 0x62, 0x4f, 0x61, 0x3f, 0x0c, 0x31, 0x5b, 0x36, 0x20, 0x0f, 0x60, 0xc2, + 0xdc, 0x2d, 0x31, 0xd4, 0x41, 0x90, 0x9b, 0xf8, 0x40, 0xe8, 0x2d, 0x38, 0x9f, 0xc7, 0xdd, 0x3e, + 0x3b, 0xe6, 0xaf, 0x77, 0x7a, 0x2c, 0xd7, 0x70, 0x27, 0xe4, 0x7c, 0xf3, 0xb9, 0x5d, 0x8f, 0xfe, + 0x19, 0xe9, 0x28, 0x80, 0x69, 0x8d, 0xc0, 0x82, 0xe6, 0xde, 0xa8, 0xba, 0xcb, 0xeb, 0xcb, 0xbe, + 0x92, 0x10, 0x9a, 0x0c, 0xe2, 0xdd, 0xcc, 0xf8, 0xea, 0x25, 0x16, 0x24, 0x53, 0x08, 0x1e, 0xc9, + 0x00, 0xee, 0xb2, 0x6c, 0x4b, 0xd5, 0x06, 0x3b, 0x8f, 0xa0, 0x89, 0x5d, 0x05, 0xff, 0x41, 0xae, + 0xe2, 0xa1, 0x64, 0x77, 0x80, 0xf9, 0x1d, 0xdc, 0x67, 0x73, 0xef, 0x01, 0xf9, 0x89, 0x26, 0xc8, + 0x79, 0x57, 0x80, 0x3f, 0xe4, 0x46, 0xd6, 0x80, 0x45, 0xde, 0x34, 0x93, 0x58, 0x5c, 0xc6, 0xb8, + 0xbe, 0xd7, 0x21, 0xe6, 0xb1, 0x9c, 0x7f, 0x30, 0x72, 0xde, 0xc1, 0xc8, 0xf9, 0x07, 0x0a, 0x0e, + 0x46, 0x6e, 0x89, 0xea, 0x1a, 0xd8, 0x16, 0x38, 0x4b, 0xf9, 0x01, 0x02, 0x7a, 0xb1, 0x38, 0xa9, + 0xf4, 0x32, 0x6d, 0xa0, 0x47, 0x16, 0x42, 0xf8, 0x3b, 0x19, 0xfe, 0xf1, 0xa6, 0xf8, 0x7d, 0x4c, + 0x21, 0x02, 0xf7, 0x10, 0x96, 0x93, 0x08, 0xcc, 0x6d, 0xcc, 0x7b, 0x48, 0x02, 0xbd, 0x06, 0x70, + 0x17, 0x43, 0x06, 0x6b, 0xee, 0x3f, 0x44, 0x54, 0xec, 0x6c, 0x59, 0xc5, 0x5f, 0x11, 0x1e, 0x6d, + 0x08, 0xe2, 0x39, 0x11, 0xf3, 0x23, 0x84, 0x8f, 0x06, 0x3c, 0xae, 0x5a, 0x69, 0x5a, 0xbe, 0x84, + 0x7b, 0xfc, 0x4b, 0xd4, 0x28, 0x85, 0x8f, 0x50, 0xa9, 0x6d, 0x82, 0xfe, 0xc4, 0xad, 0x6a, 0x12, + 0x10, 0xd0, 0xb3, 0x80, 0x7b, 0x0d, 0x2b, 0x2a, 0xe7, 0xf1, 0x26, 0x72, 0xf2, 0xfe, 0x7c, 0x35, + 0x79, 0x27, 0xed, 0x13, 0x93, 0x3b, 0xc1, 0x5c, 0x48, 0xa7, 0xdd, 0x27, 0xf8, 0x07, 0xee, 0x04, + 0x87, 0xe3, 0x3c, 0x0f, 0x22, 0x5d, 0xc0, 0xc3, 0xc1, 0xed, 0xea, 0x85, 0xbc, 0x42, 0x9d, 0xf2, + 0xb2, 0x3d, 0xaf, 0xba, 0xeb, 0x81, 0x4c, 0x12, 0xee, 0x31, 0x60, 0x00, 0x3e, 0x32, 0xb5, 0x67, + 0x79, 0x0b, 0x67, 0xd3, 0x8c, 0x81, 0xfb, 0xfb, 0x78, 0x9f, 0x11, 0x1a, 0x01, 0xa1, 0x27, 0x05, + 0xe8, 0xd7, 0x8d, 0x40, 0x81, 0x88, 0x2b, 0x79, 0x16, 0xc2, 0x87, 0x27, 0x5f, 0xa2, 0x2e, 0x15, + 0x01, 0x7f, 0x17, 0x8f, 0xa4, 0x5a, 0x03, 0xfa, 0x77, 0xf1, 0xde, 0x79, 0x0f, 0x13, 0xdb, 0xf4, + 0xcb, 0xeb, 0x8e, 0xe0, 0x7d, 0xc1, 0xdb, 0x00, 0xf4, 0xb0, 0x1f, 0x59, 0x07, 0xd5, 0x61, 0xcb, + 0xc4, 0x55, 0x6f, 0xd7, 0xe6, 0x7c, 0x88, 0x40, 0xa3, 0x84, 0x48, 0x0d, 0x96, 0x28, 0xd3, 0xa6, + 0x25, 0x6a, 0xdf, 0x3e, 0x55, 0xf0, 0xa1, 0x60, 0xab, 0x2d, 0x50, 0x67, 0xc9, 0x4b, 0x12, 0xb9, + 0x4f, 0x8b, 0x61, 0x95, 0xb4, 0x75, 0x58, 0x61, 0xff, 0x41, 0x2e, 0xe2, 0xc1, 0xb8, 0x41, 0x2d, + 0xcd, 0xe9, 0x09, 0xde, 0x81, 0xb6, 0xe3, 0x4d, 0xc8, 0xd6, 0x5c, 0xd4, 0x0c, 0x65, 0x0a, 0x88, + 0xf2, 0xa6, 0x19, 0x45, 0xd4, 0xae, 0xd5, 0xfb, 0x0a, 0x01, 0x89, 0x50, 0x8c, 0x44, 0x12, 0x99, + 0x96, 0x48, 0xb4, 0x6f, 0x7d, 0x66, 0xea, 0x57, 0xc1, 0x22, 0x75, 0xdc, 0x39, 0x2f, 0xc7, 0xbe, + 0xc2, 0x52, 0xec, 0xc6, 0xcb, 0xb4, 0x09, 0xa7, 0x30, 0xc9, 0x0e, 0x88, 0xbe, 0x87, 0xfb, 0x23, + 0x43, 0x20, 0x69, 0xae, 0x09, 0xdf, 0xa8, 0xc3, 0xa8, 0x1b, 0xb9, 0x5c, 0x3f, 0x1c, 0x29, 0xa0, + 0xdb, 0xb5, 0x92, 0xbf, 0x20, 0xe0, 0x99, 0x14, 0xaa, 0x11, 0xcf, 0x4c, 0x1b, 0x78, 0xb6, 0x6f, + 0x95, 0x4f, 0x40, 0xd9, 0xb0, 0xa0, 0xb9, 0xfc, 0x6d, 0x95, 0xbc, 0xb4, 0x8b, 0x50, 0xe6, 0xc0, + 0xe4, 0xb9, 0x8d, 0xeb, 0x5e, 0x3e, 0xdf, 0x6a, 0x19, 0xa0, 0xe3, 0x81, 0x70, 0x68, 0x50, 0xed, + 0x06, 0xee, 0xe3, 0xef, 0x56, 0xc1, 0xf4, 0x9f, 0x37, 0x29, 0x84, 0x1c, 0xc8, 0x1f, 0x00, 0xc7, + 0xbc, 0x69, 0x3e, 0x8b, 0x1b, 0xf9, 0x1b, 0x04, 0x44, 0x6a, 0xfe, 0x53, 0x89, 0x64, 0x76, 0x44, + 0xa4, 0x7d, 0xab, 0x7e, 0x1d, 0x12, 0xa9, 0x45, 0xc3, 0x61, 0xda, 0x2f, 0x69, 0x56, 0xa9, 0x5e, + 0xb0, 0x36, 0x4a, 0x47, 0x07, 0x70, 0x97, 0x69, 0xac, 0x1a, 0x2e, 0x8b, 0xbe, 0xb7, 0xe0, 0x3f, + 0xc8, 0xf7, 0x83, 0x8c, 0x29, 0xe6, 0xf0, 0x59, 0x49, 0x21, 0xe3, 0x3e, 0xd7, 0x76, 0xa9, 0x09, + 0x81, 0x60, 0x67, 0x85, 0xde, 0xd5, 0xaa, 0x72, 0xef, 0xf0, 0x78, 0xf5, 0x73, 0xe8, 0x22, 0x90, + 0xcf, 0x04, 0x1a, 0x44, 0x46, 0x01, 0xf1, 0x41, 0xdc, 0xcd, 0x5d, 0x4d, 0x99, 0x02, 0x3c, 0xc9, + 0xcb, 0xc0, 0x74, 0xde, 0xb6, 0xee, 0x68, 0x15, 0xef, 0x4b, 0xb4, 0x6c, 0x7b, 0xe6, 0xb1, 0x53, + 0x10, 0x93, 0x4e, 0xc2, 0x3d, 0x3a, 0x75, 0x16, 0x6b, 0xea, 0xed, 0x29, 0xd4, 0x9e, 0xe5, 0x2f, + 0x10, 0xe4, 0x0f, 0x71, 0xb7, 0x80, 0xe7, 0x55, 0xbc, 0xdf, 0xae, 0xba, 0x2b, 0x76, 0xd5, 0x2a, + 0x2d, 0x50, 0xe7, 0xaa, 0xe5, 0x0d, 0x06, 0x3d, 0x82, 0xd8, 0x80, 0x37, 0x9b, 0x75, 0x26, 0x54, + 0xdb, 0xbc, 0xac, 0x69, 0x30, 0xdb, 0x0f, 0x1a, 0x1f, 0x20, 0x13, 0xb8, 0xdf, 0xfb, 0xcb, 0xdf, + 0x53, 0x19, 0xa6, 0x67, 0xf4, 0xb5, 0x3c, 0x8e, 0xc7, 0x18, 0xcc, 0x6b, 0x9a, 0xe3, 0x50, 0x5d, + 0x5b, 0xa2, 0x8e, 0x63, 0x58, 0xfa, 0x52, 0xdd, 0x63, 0xa0, 0xee, 0x65, 0x7c, 0xac, 0xd9, 0x44, + 0x20, 0x36, 0x84, 0xf7, 0x7c, 0x58, 0x83, 0xe8, 0x13, 0xaa, 0xbf, 0x98, 0xfe, 0x78, 0x04, 0x77, + 0x31, 0x47, 0xe4, 0x53, 0x84, 0xbb, 0xfd, 0xee, 0x04, 0x99, 0x6a, 0xb2, 0x6f, 0xe2, 0xed, 0x11, + 0x69, 0x7a, 0x3b, 0x26, 0x3e, 0x32, 0x79, 0xec, 0xde, 0xef, 0xff, 0xdd, 0xef, 0x1c, 0x21, 0xc3, + 0x8a, 0x67, 0x31, 0xc9, 0xb5, 0xbc, 0xf8, 0xb6, 0x11, 0x79, 0x88, 0x70, 0x1f, 0x5f, 0x50, 0x92, + 0xf3, 0x22, 0xb1, 0x92, 0x7b, 0x29, 0xd2, 0x85, 0x96, 0x6c, 0x01, 0xf0, 0x45, 0x06, 0xf8, 0x2c, + 0x39, 0x93, 0x02, 0x98, 0x2f, 0x71, 0x95, 0x4d, 0xb8, 0x9d, 0xb7, 0x94, 0x4d, 0x76, 0x1f, 0x6f, + 0x91, 0xef, 0x11, 0xee, 0xe7, 0xfd, 0xe6, 0x4d, 0x53, 0x8c, 0x4b, 0x72, 0x47, 0x45, 0x8c, 0x4b, + 0x4a, 0x97, 0x44, 0x3e, 0xc1, 0xb8, 0x8c, 0x91, 0x51, 0x01, 0x2e, 0xe4, 0x6f, 0x84, 0x0f, 0x46, + 0x90, 0x43, 0x61, 0x4b, 0xf2, 0x2d, 0x80, 0x08, 0x57, 0xe7, 0xd2, 0xdc, 0x4e, 0x5c, 0x00, 0x9d, + 0xf3, 0x8c, 0xce, 0x69, 0x32, 0x2d, 0x40, 0x07, 0x6c, 0x61, 0x85, 0xb6, 0xc8, 0x5f, 0x08, 0xbf, + 0xc8, 0x55, 0x8f, 0x1c, 0xb9, 0x37, 0x04, 0x91, 0xa5, 0x76, 0x1e, 0xa4, 0xfc, 0x0e, 0x3c, 0x00, + 0xb5, 0x59, 0x46, 0x6d, 0x86, 0x9c, 0x4e, 0xa1, 0x66, 0x58, 0x29, 0xcc, 0x8a, 0x46, 0x69, 0x8b, + 0x7c, 0x87, 0xf0, 0xbe, 0x30, 0x39, 0xe1, 0x3d, 0x97, 0xd0, 0x03, 0x10, 0xde, 0x73, 0x49, 0x75, + 0x7d, 0xd3, 0x3d, 0xc7, 0x31, 0x71, 0xc8, 0x6f, 0x00, 0x9c, 0xab, 0x8d, 0x66, 0x05, 0x0f, 0x6f, + 0x62, 0x85, 0x28, 0x5d, 0x6c, 0xd1, 0x1a, 0xc0, 0xbf, 0xc6, 0xc0, 0x4f, 0x93, 0x93, 0x0d, 0xc0, + 0xd7, 0xcd, 0x94, 0xcd, 0xe0, 0x79, 0x8b, 0xfc, 0x81, 0x30, 0x89, 0xd7, 0xcc, 0x44, 0x08, 0x4f, + 0x6a, 0xa5, 0x2e, 0xbd, 0xde, 0xaa, 0x39, 0xf0, 0xc9, 0x33, 0x3e, 0x17, 0xc8, 0xb9, 0x54, 0x3e, + 0xd1, 0x7f, 0x1f, 0x14, 0x4b, 0xd4, 0xa5, 0x3c, 0xb1, 0x1f, 0x11, 0xde, 0x1f, 0x8e, 0xe0, 0x6d, + 0xaf, 0xd9, 0x6d, 0x6c, 0x91, 0x16, 0x57, 0x29, 0xb5, 0x36, 0x97, 0x27, 0x19, 0xab, 0x71, 0x32, + 0x26, 0xb4, 0x4a, 0xe4, 0x6b, 0x54, 0xaf, 0x09, 0xc9, 0x8c, 0xe0, 0x06, 0x89, 0x14, 0xaf, 0xd2, + 0xd9, 0x6d, 0xdb, 0x01, 0x58, 0x85, 0x81, 0x7d, 0x85, 0x8c, 0xa7, 0x80, 0xd5, 0xc1, 0xc0, 0xd3, + 0xbc, 0xa4, 0xad, 0x6f, 0x91, 0x2f, 0x11, 0xee, 0x0d, 0xbc, 0x78, 0x52, 0xcf, 0x08, 0x8a, 0xd5, + 0x12, 0xe2, 0x84, 0x12, 0x5a, 0x1e, 0x67, 0x88, 0x8f, 0x92, 0x91, 0x26, 0x88, 0xc9, 0x03, 0x84, + 0x5f, 0x88, 0xe6, 0x5a, 0x44, 0xe8, 0xf2, 0x48, 0x49, 0xfc, 0xa4, 0xd9, 0xd6, 0x8c, 0x05, 0xa5, + 0x56, 0xa3, 0x58, 0x1f, 0x22, 0xdc, 0xcb, 0xa5, 0x53, 0xe4, 0x92, 0x48, 0xf8, 0x66, 0x69, 0x9b, + 0xf4, 0xe6, 0x0e, 0xbd, 0x00, 0x9b, 0xe3, 0x8c, 0xcd, 0xcb, 0x44, 0x4e, 0xcb, 0x9c, 0x38, 0xe0, + 0x8f, 0x50, 0xac, 0x4a, 0x26, 0xa2, 0x57, 0x61, 0x72, 0x8d, 0x2f, 0x76, 0xf5, 0xa4, 0xf7, 0x27, + 0xe4, 0x19, 0x06, 0xff, 0x24, 0xc9, 0xa5, 0xc0, 0x37, 0xc3, 0x76, 0xb5, 0xed, 0xff, 0x33, 0xc2, + 0x24, 0xe2, 0xd3, 0x3b, 0x05, 0xa2, 0x57, 0xc6, 0x4e, 0xd8, 0xa4, 0x77, 0x21, 0xe4, 0x1c, 0x63, + 0x33, 0x41, 0x8e, 0x89, 0xb1, 0x21, 0x9f, 0x23, 0xbc, 0x8b, 0x5d, 0x3e, 0xd3, 0x82, 0x32, 0xf2, + 0xd7, 0xe3, 0xa9, 0x6d, 0xd9, 0x08, 0x7e, 0x77, 0x55, 0xf8, 0x60, 0x31, 0x91, 0xbf, 0x45, 0xb8, + 0x97, 0xeb, 0x3e, 0x90, 0x73, 0xdb, 0x88, 0x18, 0xee, 0x58, 0xb4, 0x06, 0xf6, 0x0c, 0x03, 0xab, + 0x90, 0xc9, 0x86, 0x60, 0x63, 0xc9, 0xf5, 0x67, 0x08, 0xef, 0x0e, 0xbe, 0x40, 0xd3, 0x82, 0x2b, + 0xba, 0x6d, 0x61, 0x23, 0x1d, 0x08, 0x79, 0x94, 0x61, 0x1d, 0x26, 0x87, 0x1b, 0x60, 0xf5, 0x32, + 0xb0, 0x7e, 0xcf, 0xca, 0xab, 0xdd, 0xa1, 0x74, 0x16, 0x4b, 0xc1, 0x92, 0xbb, 0x07, 0x62, 0x29, + 0x58, 0x4a, 0xa3, 0xa0, 0xe9, 0xcd, 0xa1, 0xd6, 0x6d, 0x58, 0xea, 0x18, 0xfe, 0x9f, 0xba, 0xd8, + 0x66, 0x48, 0xfc, 0x2f, 0xbd, 0x74, 0xbe, 0x15, 0x53, 0xc1, 0xaf, 0xfa, 0xdd, 0x30, 0x4a, 0x0f, + 0x78, 0xb8, 0xed, 0x20, 0x06, 0x3c, 0xb1, 0x91, 0x21, 0x06, 0x3c, 0xb9, 0xcb, 0xd1, 0x14, 0xb8, + 0x19, 0x32, 0x9b, 0x7b, 0xeb, 0xd1, 0x93, 0x2c, 0x7a, 0xfc, 0x24, 0x8b, 0xfe, 0x7d, 0x92, 0x45, + 0x9f, 0x3c, 0xcd, 0x76, 0x3c, 0x7e, 0x9a, 0xed, 0xf8, 0xf3, 0x69, 0xb6, 0xe3, 0xe6, 0x94, 0x6e, + 0xb8, 0xe5, 0xea, 0x4a, 0x4e, 0xb5, 0x57, 0x79, 0x57, 0x01, 0x1e, 0x65, 0x9d, 0xf7, 0xea, 0x6e, + 0xac, 0x69, 0xce, 0x4a, 0x37, 0xfb, 0x0a, 0x9c, 0xfa, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x77, + 0x46, 0x98, 0xb4, 0x22, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2531,12 +2139,6 @@ type QueryClient interface { GasPriceAll(ctx context.Context, in *QueryAllGasPriceRequest, opts ...grpc.CallOption) (*QueryAllGasPriceResponse, error) ConvertGasToZeta(ctx context.Context, in *QueryConvertGasToZetaRequest, opts ...grpc.CallOption) (*QueryConvertGasToZetaResponse, error) ProtocolFee(ctx context.Context, in *QueryMessagePassingProtocolFeeRequest, opts ...grpc.CallOption) (*QueryMessagePassingProtocolFeeResponse, error) - // Queries a chainNonces by index. - ChainNonces(ctx context.Context, in *QueryGetChainNoncesRequest, opts ...grpc.CallOption) (*QueryGetChainNoncesResponse, error) - // Queries a list of chainNonces items. - ChainNoncesAll(ctx context.Context, in *QueryAllChainNoncesRequest, opts ...grpc.CallOption) (*QueryAllChainNoncesResponse, error) - PendingNoncesAll(ctx context.Context, in *QueryAllPendingNoncesRequest, opts ...grpc.CallOption) (*QueryAllPendingNoncesResponse, error) - PendingNoncesByChain(ctx context.Context, in *QueryPendingNoncesByChainRequest, opts ...grpc.CallOption) (*QueryPendingNoncesByChainResponse, error) // Queries a lastBlockHeight by index. LastBlockHeight(ctx context.Context, in *QueryGetLastBlockHeightRequest, opts ...grpc.CallOption) (*QueryGetLastBlockHeightResponse, error) // Queries a list of lastBlockHeight items. @@ -2679,42 +2281,6 @@ func (c *queryClient) ProtocolFee(ctx context.Context, in *QueryMessagePassingPr return out, nil } -func (c *queryClient) ChainNonces(ctx context.Context, in *QueryGetChainNoncesRequest, opts ...grpc.CallOption) (*QueryGetChainNoncesResponse, error) { - out := new(QueryGetChainNoncesResponse) - err := c.cc.Invoke(ctx, "/zetachain.zetacore.crosschain.Query/ChainNonces", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) ChainNoncesAll(ctx context.Context, in *QueryAllChainNoncesRequest, opts ...grpc.CallOption) (*QueryAllChainNoncesResponse, error) { - out := new(QueryAllChainNoncesResponse) - err := c.cc.Invoke(ctx, "/zetachain.zetacore.crosschain.Query/ChainNoncesAll", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) PendingNoncesAll(ctx context.Context, in *QueryAllPendingNoncesRequest, opts ...grpc.CallOption) (*QueryAllPendingNoncesResponse, error) { - out := new(QueryAllPendingNoncesResponse) - err := c.cc.Invoke(ctx, "/zetachain.zetacore.crosschain.Query/PendingNoncesAll", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) PendingNoncesByChain(ctx context.Context, in *QueryPendingNoncesByChainRequest, opts ...grpc.CallOption) (*QueryPendingNoncesByChainResponse, error) { - out := new(QueryPendingNoncesByChainResponse) - err := c.cc.Invoke(ctx, "/zetachain.zetacore.crosschain.Query/PendingNoncesByChain", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *queryClient) LastBlockHeight(ctx context.Context, in *QueryGetLastBlockHeightRequest, opts ...grpc.CallOption) (*QueryGetLastBlockHeightResponse, error) { out := new(QueryGetLastBlockHeightResponse) err := c.cc.Invoke(ctx, "/zetachain.zetacore.crosschain.Query/LastBlockHeight", in, out, opts...) @@ -2810,12 +2376,6 @@ type QueryServer interface { GasPriceAll(context.Context, *QueryAllGasPriceRequest) (*QueryAllGasPriceResponse, error) ConvertGasToZeta(context.Context, *QueryConvertGasToZetaRequest) (*QueryConvertGasToZetaResponse, error) ProtocolFee(context.Context, *QueryMessagePassingProtocolFeeRequest) (*QueryMessagePassingProtocolFeeResponse, error) - // Queries a chainNonces by index. - ChainNonces(context.Context, *QueryGetChainNoncesRequest) (*QueryGetChainNoncesResponse, error) - // Queries a list of chainNonces items. - ChainNoncesAll(context.Context, *QueryAllChainNoncesRequest) (*QueryAllChainNoncesResponse, error) - PendingNoncesAll(context.Context, *QueryAllPendingNoncesRequest) (*QueryAllPendingNoncesResponse, error) - PendingNoncesByChain(context.Context, *QueryPendingNoncesByChainRequest) (*QueryPendingNoncesByChainResponse, error) // Queries a lastBlockHeight by index. LastBlockHeight(context.Context, *QueryGetLastBlockHeightRequest) (*QueryGetLastBlockHeightResponse, error) // Queries a list of lastBlockHeight items. @@ -2876,18 +2436,6 @@ func (*UnimplementedQueryServer) ConvertGasToZeta(ctx context.Context, req *Quer func (*UnimplementedQueryServer) ProtocolFee(ctx context.Context, req *QueryMessagePassingProtocolFeeRequest) (*QueryMessagePassingProtocolFeeResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ProtocolFee not implemented") } -func (*UnimplementedQueryServer) ChainNonces(ctx context.Context, req *QueryGetChainNoncesRequest) (*QueryGetChainNoncesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ChainNonces not implemented") -} -func (*UnimplementedQueryServer) ChainNoncesAll(ctx context.Context, req *QueryAllChainNoncesRequest) (*QueryAllChainNoncesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ChainNoncesAll not implemented") -} -func (*UnimplementedQueryServer) PendingNoncesAll(ctx context.Context, req *QueryAllPendingNoncesRequest) (*QueryAllPendingNoncesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PendingNoncesAll not implemented") -} -func (*UnimplementedQueryServer) PendingNoncesByChain(ctx context.Context, req *QueryPendingNoncesByChainRequest) (*QueryPendingNoncesByChainResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PendingNoncesByChain not implemented") -} func (*UnimplementedQueryServer) LastBlockHeight(ctx context.Context, req *QueryGetLastBlockHeightRequest) (*QueryGetLastBlockHeightResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method LastBlockHeight not implemented") } @@ -3151,78 +2699,6 @@ func _Query_ProtocolFee_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -func _Query_ChainNonces_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryGetChainNoncesRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).ChainNonces(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/zetachain.zetacore.crosschain.Query/ChainNonces", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ChainNonces(ctx, req.(*QueryGetChainNoncesRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_ChainNoncesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllChainNoncesRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).ChainNoncesAll(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/zetachain.zetacore.crosschain.Query/ChainNoncesAll", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).ChainNoncesAll(ctx, req.(*QueryAllChainNoncesRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_PendingNoncesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllPendingNoncesRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).PendingNoncesAll(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/zetachain.zetacore.crosschain.Query/PendingNoncesAll", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PendingNoncesAll(ctx, req.(*QueryAllPendingNoncesRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_PendingNoncesByChain_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryPendingNoncesByChainRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).PendingNoncesByChain(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/zetachain.zetacore.crosschain.Query/PendingNoncesByChain", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PendingNoncesByChain(ctx, req.(*QueryPendingNoncesByChainRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Query_LastBlockHeight_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryGetLastBlockHeightRequest) if err := dec(in); err != nil { @@ -3423,22 +2899,6 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "ProtocolFee", Handler: _Query_ProtocolFee_Handler, }, - { - MethodName: "ChainNonces", - Handler: _Query_ChainNonces_Handler, - }, - { - MethodName: "ChainNoncesAll", - Handler: _Query_ChainNoncesAll_Handler, - }, - { - MethodName: "PendingNoncesAll", - Handler: _Query_PendingNoncesAll_Handler, - }, - { - MethodName: "PendingNoncesByChain", - Handler: _Query_PendingNoncesByChain_Handler, - }, { MethodName: "LastBlockHeight", Handler: _Query_LastBlockHeight_Handler, @@ -4360,7 +3820,7 @@ func (m *QueryAllGasPriceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *QueryGetChainNoncesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryGetLastBlockHeightRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4370,12 +3830,12 @@ func (m *QueryGetChainNoncesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetChainNoncesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetLastBlockHeightRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetChainNoncesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetLastBlockHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4390,7 +3850,7 @@ func (m *QueryGetChainNoncesRequest) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *QueryGetChainNoncesResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryGetLastBlockHeightResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4400,19 +3860,19 @@ func (m *QueryGetChainNoncesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetChainNoncesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetLastBlockHeightResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetChainNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetLastBlockHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.ChainNonces != nil { + if m.LastBlockHeight != nil { { - size, err := m.ChainNonces.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.LastBlockHeight.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4425,7 +3885,7 @@ func (m *QueryGetChainNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, er return len(dAtA) - i, nil } -func (m *QueryAllChainNoncesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllLastBlockHeightRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4435,12 +3895,12 @@ func (m *QueryAllChainNoncesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllChainNoncesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllLastBlockHeightRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllChainNoncesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllLastBlockHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4460,7 +3920,7 @@ func (m *QueryAllChainNoncesRequest) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *QueryAllChainNoncesResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllLastBlockHeightResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4470,12 +3930,12 @@ func (m *QueryAllChainNoncesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllChainNoncesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllLastBlockHeightResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllChainNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllLastBlockHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -4492,10 +3952,10 @@ func (m *QueryAllChainNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, er i-- dAtA[i] = 0x12 } - if len(m.ChainNonces) > 0 { - for iNdEx := len(m.ChainNonces) - 1; iNdEx >= 0; iNdEx-- { + if len(m.LastBlockHeight) > 0 { + for iNdEx := len(m.LastBlockHeight) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.ChainNonces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.LastBlockHeight[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4509,7 +3969,7 @@ func (m *QueryAllChainNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, er return len(dAtA) - i, nil } -func (m *QueryAllPendingNoncesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryGetCctxRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4519,32 +3979,27 @@ func (m *QueryAllPendingNoncesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPendingNoncesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetCctxRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPendingNoncesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetCctxRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } + if len(m.Index) > 0 { + i -= len(m.Index) + copy(dAtA[i:], m.Index) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Index))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryAllPendingNoncesResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryGetCctxByNonceRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4554,46 +4009,30 @@ func (m *QueryAllPendingNoncesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPendingNoncesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetCctxByNonceRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPendingNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetCctxByNonceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } + if m.Nonce != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Nonce)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x10 } - if len(m.PendingNonces) > 0 { - for iNdEx := len(m.PendingNonces) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.PendingNonces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } + if m.ChainID != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ChainID)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func (m *QueryPendingNoncesByChainRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryGetCctxResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4603,25 +4042,32 @@ func (m *QueryPendingNoncesByChainRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPendingNoncesByChainRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetCctxResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPendingNoncesByChainRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetCctxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.ChainId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.ChainId)) + if m.CrossChainTx != nil { + { + size, err := m.CrossChainTx.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryPendingNoncesByChainResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllCctxRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4631,30 +4077,32 @@ func (m *QueryPendingNoncesByChainResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPendingNoncesByChainResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllCctxRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPendingNoncesByChainResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllCctxRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - { - size, err := m.PendingNonces.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *QueryGetLastBlockHeightRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllCctxResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4664,27 +4112,46 @@ func (m *QueryGetLastBlockHeightRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetLastBlockHeightRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllCctxResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetLastBlockHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllCctxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Index) > 0 { - i -= len(m.Index) - copy(dAtA[i:], m.Index) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Index))) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 + } + if len(m.CrossChainTx) > 0 { + for iNdEx := len(m.CrossChainTx) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.CrossChainTx[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } return len(dAtA) - i, nil } -func (m *QueryGetLastBlockHeightResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryListCctxPendingRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4694,32 +4161,30 @@ func (m *QueryGetLastBlockHeightResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetLastBlockHeightResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryListCctxPendingRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetLastBlockHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryListCctxPendingRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.LastBlockHeight != nil { - { - size, err := m.LastBlockHeight.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } + if m.Limit != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Limit)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x10 + } + if m.ChainId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ChainId)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func (m *QueryAllLastBlockHeightRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryListCctxPendingResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4729,67 +4194,25 @@ func (m *QueryAllLastBlockHeightRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllLastBlockHeightRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryListCctxPendingResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllLastBlockHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryAllLastBlockHeightResponse) 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 *QueryAllLastBlockHeightResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryAllLastBlockHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryListCctxPendingResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } + if m.TotalPending != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.TotalPending)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x10 } - if len(m.LastBlockHeight) > 0 { - for iNdEx := len(m.LastBlockHeight) - 1; iNdEx >= 0; iNdEx-- { + if len(m.CrossChainTx) > 0 { + for iNdEx := len(m.CrossChainTx) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.LastBlockHeight[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.CrossChainTx[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4803,7 +4226,7 @@ func (m *QueryAllLastBlockHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int return len(dAtA) - i, nil } -func (m *QueryGetCctxRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryLastZetaHeightRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4813,27 +4236,20 @@ func (m *QueryGetCctxRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetCctxRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryLastZetaHeightRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetCctxRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryLastZetaHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Index) > 0 { - i -= len(m.Index) - copy(dAtA[i:], m.Index) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Index))) - i-- - dAtA[i] = 0xa - } return len(dAtA) - i, nil } -func (m *QueryGetCctxByNonceRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryLastZetaHeightResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4843,30 +4259,25 @@ func (m *QueryGetCctxByNonceRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetCctxByNonceRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryLastZetaHeightResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetCctxByNonceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryLastZetaHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Nonce != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Nonce)) - i-- - dAtA[i] = 0x10 - } - if m.ChainID != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.ChainID)) + if m.Height != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Height)) i-- dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func (m *QueryGetCctxResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryConvertGasToZetaRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4876,32 +4287,32 @@ func (m *QueryGetCctxResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetCctxResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryConvertGasToZetaRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetCctxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryConvertGasToZetaRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.CrossChainTx != nil { - { - size, err := m.CrossChainTx.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } + if len(m.GasLimit) > 0 { + i -= len(m.GasLimit) + copy(dAtA[i:], m.GasLimit) + i = encodeVarintQuery(dAtA, i, uint64(len(m.GasLimit))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 + } + if m.ChainId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ChainId)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func (m *QueryAllCctxRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryConvertGasToZetaResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4911,32 +4322,39 @@ func (m *QueryAllCctxRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllCctxRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryConvertGasToZetaResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllCctxRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryConvertGasToZetaResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } + if m.ZetaBlockHeight != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ZetaBlockHeight)) + i-- + dAtA[i] = 0x18 + } + if len(m.ProtocolFeeInZeta) > 0 { + i -= len(m.ProtocolFeeInZeta) + copy(dAtA[i:], m.ProtocolFeeInZeta) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ProtocolFeeInZeta))) + i-- + dAtA[i] = 0x12 + } + if len(m.OutboundGasInZeta) > 0 { + i -= len(m.OutboundGasInZeta) + copy(dAtA[i:], m.OutboundGasInZeta) + i = encodeVarintQuery(dAtA, i, uint64(len(m.OutboundGasInZeta))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryAllCctxResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryMessagePassingProtocolFeeRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4946,46 +4364,20 @@ func (m *QueryAllCctxResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllCctxResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryMessagePassingProtocolFeeRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllCctxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryMessagePassingProtocolFeeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if len(m.CrossChainTx) > 0 { - for iNdEx := len(m.CrossChainTx) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.CrossChainTx[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } return len(dAtA) - i, nil } -func (m *QueryListCctxPendingRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryMessagePassingProtocolFeeResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4995,292 +4387,66 @@ func (m *QueryListCctxPendingRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryListCctxPendingRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryMessagePassingProtocolFeeResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryListCctxPendingRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryMessagePassingProtocolFeeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Limit != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Limit)) - i-- - dAtA[i] = 0x10 - } - if m.ChainId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.ChainId)) + if len(m.FeeInZeta) > 0 { + i -= len(m.FeeInZeta) + copy(dAtA[i:], m.FeeInZeta) + i = encodeVarintQuery(dAtA, i, uint64(len(m.FeeInZeta))) i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryListCctxPendingResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err +func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { + offset -= sovQuery(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ } - return dAtA[:n], nil + dAtA[offset] = uint8(v) + return base } - -func (m *QueryListCctxPendingResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) +func (m *QueryZetaAccountingRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n } -func (m *QueryListCctxPendingResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i +func (m *QueryZetaAccountingResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l - if m.TotalPending != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.TotalPending)) - i-- - dAtA[i] = 0x10 + l = len(m.AbortedZetaAmount) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) } - if len(m.CrossChainTx) > 0 { - for iNdEx := len(m.CrossChainTx) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.CrossChainTx[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } + return n +} + +func (m *QueryParamsRequest) Size() (n int) { + if m == nil { + return 0 } - return len(dAtA) - i, nil -} - -func (m *QueryLastZetaHeightRequest) 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 *QueryLastZetaHeightRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryLastZetaHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *QueryLastZetaHeightResponse) 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 *QueryLastZetaHeightResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryLastZetaHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Height != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Height)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *QueryConvertGasToZetaRequest) 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 *QueryConvertGasToZetaRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryConvertGasToZetaRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.GasLimit) > 0 { - i -= len(m.GasLimit) - copy(dAtA[i:], m.GasLimit) - i = encodeVarintQuery(dAtA, i, uint64(len(m.GasLimit))) - i-- - dAtA[i] = 0x12 - } - if m.ChainId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.ChainId)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *QueryConvertGasToZetaResponse) 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 *QueryConvertGasToZetaResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryConvertGasToZetaResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ZetaBlockHeight != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.ZetaBlockHeight)) - i-- - dAtA[i] = 0x18 - } - if len(m.ProtocolFeeInZeta) > 0 { - i -= len(m.ProtocolFeeInZeta) - copy(dAtA[i:], m.ProtocolFeeInZeta) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ProtocolFeeInZeta))) - i-- - dAtA[i] = 0x12 - } - if len(m.OutboundGasInZeta) > 0 { - i -= len(m.OutboundGasInZeta) - copy(dAtA[i:], m.OutboundGasInZeta) - i = encodeVarintQuery(dAtA, i, uint64(len(m.OutboundGasInZeta))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryMessagePassingProtocolFeeRequest) 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 *QueryMessagePassingProtocolFeeRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryMessagePassingProtocolFeeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *QueryMessagePassingProtocolFeeResponse) 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 *QueryMessagePassingProtocolFeeResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryMessagePassingProtocolFeeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.FeeInZeta) > 0 { - i -= len(m.FeeInZeta) - copy(dAtA[i:], m.FeeInZeta) - i = encodeVarintQuery(dAtA, i, uint64(len(m.FeeInZeta))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { - offset -= sovQuery(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *QueryZetaAccountingRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *QueryZetaAccountingResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.AbortedZetaAmount) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryParamsRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n + var l int + _ = l + return n } func (m *QueryParamsResponse) Size() (n int) { @@ -5596,7 +4762,7 @@ func (m *QueryAllGasPriceResponse) Size() (n int) { return n } -func (m *QueryGetChainNoncesRequest) Size() (n int) { +func (m *QueryGetLastBlockHeightRequest) Size() (n int) { if m == nil { return 0 } @@ -5609,20 +4775,20 @@ func (m *QueryGetChainNoncesRequest) Size() (n int) { return n } -func (m *QueryGetChainNoncesResponse) Size() (n int) { +func (m *QueryGetLastBlockHeightResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.ChainNonces != nil { - l = m.ChainNonces.Size() + if m.LastBlockHeight != nil { + l = m.LastBlockHeight.Size() n += 1 + l + sovQuery(uint64(l)) } return n } -func (m *QueryAllChainNoncesRequest) Size() (n int) { +func (m *QueryAllLastBlockHeightRequest) Size() (n int) { if m == nil { return 0 } @@ -5635,14 +4801,14 @@ func (m *QueryAllChainNoncesRequest) Size() (n int) { return n } -func (m *QueryAllChainNoncesResponse) Size() (n int) { +func (m *QueryAllLastBlockHeightResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.ChainNonces) > 0 { - for _, e := range m.ChainNonces { + if len(m.LastBlockHeight) > 0 { + for _, e := range m.LastBlockHeight { l = e.Size() n += 1 + l + sovQuery(uint64(l)) } @@ -5654,161 +4820,48 @@ func (m *QueryAllChainNoncesResponse) Size() (n int) { return n } -func (m *QueryAllPendingNoncesRequest) Size() (n int) { +func (m *QueryGetCctxRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Pagination != nil { - l = m.Pagination.Size() + l = len(m.Index) + if l > 0 { n += 1 + l + sovQuery(uint64(l)) } return n } -func (m *QueryAllPendingNoncesResponse) Size() (n int) { +func (m *QueryGetCctxByNonceRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.PendingNonces) > 0 { - for _, e := range m.PendingNonces { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } + if m.ChainID != 0 { + n += 1 + sovQuery(uint64(m.ChainID)) } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.Nonce != 0 { + n += 1 + sovQuery(uint64(m.Nonce)) } return n } -func (m *QueryPendingNoncesByChainRequest) Size() (n int) { +func (m *QueryGetCctxResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.ChainId != 0 { - n += 1 + sovQuery(uint64(m.ChainId)) + if m.CrossChainTx != nil { + l = m.CrossChainTx.Size() + n += 1 + l + sovQuery(uint64(l)) } return n } -func (m *QueryPendingNoncesByChainResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.PendingNonces.Size() - n += 1 + l + sovQuery(uint64(l)) - return n -} - -func (m *QueryGetLastBlockHeightRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Index) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryGetLastBlockHeightResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.LastBlockHeight != nil { - l = m.LastBlockHeight.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryAllLastBlockHeightRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryAllLastBlockHeightResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.LastBlockHeight) > 0 { - for _, e := range m.LastBlockHeight { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryGetCctxRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Index) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryGetCctxByNonceRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ChainID != 0 { - n += 1 + sovQuery(uint64(m.ChainID)) - } - if m.Nonce != 0 { - n += 1 + sovQuery(uint64(m.Nonce)) - } - return n -} - -func (m *QueryGetCctxResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.CrossChainTx != nil { - l = m.CrossChainTx.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryAllCctxRequest) Size() (n int) { +func (m *QueryAllCctxRequest) Size() (n int) { if m == nil { return 0 } @@ -5971,839 +5024,22 @@ func (m *QueryZetaAccountingRequest) Unmarshal(dAtA []byte) error { 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: QueryZetaAccountingRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryZetaAccountingRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - 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 *QueryZetaAccountingResponse) 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: QueryZetaAccountingResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryZetaAccountingResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AbortedZetaAmount", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= 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.AbortedZetaAmount = 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 *QueryParamsRequest) 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: QueryParamsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - 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 *QueryParamsResponse) 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: QueryParamsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - 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 *QueryGetOutTxTrackerRequest) 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: QueryGetOutTxTrackerRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetOutTxTrackerRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainID", wireType) - } - m.ChainID = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ChainID |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Nonce", wireType) - } - m.Nonce = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Nonce |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - 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 *QueryGetOutTxTrackerResponse) 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: QueryGetOutTxTrackerResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetOutTxTrackerResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OutTxTracker", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.OutTxTracker.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - 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 *QueryAllOutTxTrackerRequest) 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: QueryAllOutTxTrackerRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllOutTxTrackerRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - 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 *QueryAllOutTxTrackerResponse) 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: QueryAllOutTxTrackerResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllOutTxTrackerResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OutTxTracker", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OutTxTracker = append(m.OutTxTracker, OutTxTracker{}) - if err := m.OutTxTracker[len(m.OutTxTracker)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - 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 *QueryAllOutTxTrackerByChainRequest) 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: QueryAllOutTxTrackerByChainRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllOutTxTrackerByChainRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) - } - m.Chain = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Chain |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - 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 *QueryAllOutTxTrackerByChainResponse) 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: QueryAllOutTxTrackerByChainResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllOutTxTrackerByChainResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OutTxTracker", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OutTxTracker = append(m.OutTxTracker, OutTxTracker{}) - if err := m.OutTxTracker[len(m.OutTxTracker)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break } - iNdEx = postIndex + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryZetaAccountingRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryZetaAccountingRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -6825,7 +5061,7 @@ func (m *QueryAllOutTxTrackerByChainResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllInTxTrackerByChainRequest) Unmarshal(dAtA []byte) error { +func (m *QueryZetaAccountingResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6848,36 +5084,17 @@ func (m *QueryAllInTxTrackerByChainRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllInTxTrackerByChainRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryZetaAccountingResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInTxTrackerByChainRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryZetaAccountingResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) - } - m.ChainId = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ChainId |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AbortedZetaAmount", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6887,27 +5104,23 @@ func (m *QueryAllInTxTrackerByChainRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.AbortedZetaAmount = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -6930,7 +5143,7 @@ func (m *QueryAllInTxTrackerByChainRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllInTxTrackerByChainResponse) Unmarshal(dAtA []byte) error { +func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6953,49 +5166,65 @@ func (m *QueryAllInTxTrackerByChainResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllInTxTrackerByChainResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInTxTrackerByChainResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InTxTracker", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err } - if msglen < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF } - if postIndex > l { + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryParamsResponse) 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 } - m.InTxTracker = append(m.InTxTracker, InTxTracker{}) - if err := m.InTxTracker[len(m.InTxTracker)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break } - iNdEx = postIndex - case 2: + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7022,10 +5251,7 @@ func (m *QueryAllInTxTrackerByChainResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7050,7 +5276,7 @@ func (m *QueryAllInTxTrackerByChainResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllInTxTrackersRequest) Unmarshal(dAtA []byte) error { +func (m *QueryGetOutTxTrackerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7073,17 +5299,17 @@ func (m *QueryAllInTxTrackersRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllInTxTrackersRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetOutTxTrackerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInTxTrackersRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetOutTxTrackerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainID", wireType) } - var msglen int + m.ChainID = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7093,28 +5319,30 @@ func (m *QueryAllInTxTrackersRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.ChainID |= int64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Nonce", wireType) } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Nonce = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Nonce |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -7136,7 +5364,7 @@ func (m *QueryAllInTxTrackersRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllInTxTrackersResponse) Unmarshal(dAtA []byte) error { +func (m *QueryGetOutTxTrackerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7159,49 +5387,15 @@ func (m *QueryAllInTxTrackersResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllInTxTrackersResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetOutTxTrackerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInTxTrackersResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetOutTxTrackerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InTxTracker", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.InTxTracker = append(m.InTxTracker, InTxTracker{}) - if err := m.InTxTracker[len(m.InTxTracker)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field OutTxTracker", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7228,10 +5422,7 @@ func (m *QueryAllInTxTrackersResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.OutTxTracker.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7256,7 +5447,7 @@ func (m *QueryAllInTxTrackersResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllOutTxTrackerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7279,17 +5470,17 @@ func (m *QueryGetInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetInTxHashToCctxRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllOutTxTrackerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetInTxHashToCctxRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllOutTxTrackerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InTxHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7299,23 +5490,27 @@ func (m *QueryGetInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.InTxHash = string(dAtA[iNdEx:postIndex]) + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -7338,7 +5533,7 @@ func (m *QueryGetInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllOutTxTrackerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7361,15 +5556,15 @@ func (m *QueryGetInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetInTxHashToCctxResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllOutTxTrackerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetInTxHashToCctxResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllOutTxTrackerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InTxHashToCctx", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field OutTxTracker", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7396,7 +5591,44 @@ func (m *QueryGetInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.InTxHashToCctx.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.OutTxTracker = append(m.OutTxTracker, OutTxTracker{}) + if err := m.OutTxTracker[len(m.OutTxTracker)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7421,7 +5653,7 @@ func (m *QueryGetInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryInTxHashToCctxDataRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllOutTxTrackerByChainRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7444,17 +5676,36 @@ func (m *QueryInTxHashToCctxDataRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryInTxHashToCctxDataRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllOutTxTrackerByChainRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryInTxHashToCctxDataRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllOutTxTrackerByChainRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) + } + m.Chain = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Chain |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InTxHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7464,23 +5715,27 @@ func (m *QueryInTxHashToCctxDataRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.InTxHash = string(dAtA[iNdEx:postIndex]) + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -7503,7 +5758,7 @@ func (m *QueryInTxHashToCctxDataRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryInTxHashToCctxDataResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllOutTxTrackerByChainResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7526,15 +5781,15 @@ func (m *QueryInTxHashToCctxDataResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryInTxHashToCctxDataResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllOutTxTrackerByChainResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryInTxHashToCctxDataResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllOutTxTrackerByChainResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CrossChainTxs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field OutTxTracker", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7561,8 +5816,44 @@ func (m *QueryInTxHashToCctxDataResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CrossChainTxs = append(m.CrossChainTxs, CrossChainTx{}) - if err := m.CrossChainTxs[len(m.CrossChainTxs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.OutTxTracker = append(m.OutTxTracker, OutTxTracker{}) + if err := m.OutTxTracker[len(m.OutTxTracker)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7587,7 +5878,7 @@ func (m *QueryInTxHashToCctxDataResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllInTxTrackerByChainRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7610,13 +5901,32 @@ func (m *QueryAllInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllInTxHashToCctxRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllInTxTrackerByChainRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInTxHashToCctxRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllInTxTrackerByChainRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + m.ChainId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ChainId |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } @@ -7673,7 +5983,7 @@ func (m *QueryAllInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllInTxTrackerByChainResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7696,15 +6006,15 @@ func (m *QueryAllInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllInTxHashToCctxResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllInTxTrackerByChainResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInTxHashToCctxResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllInTxTrackerByChainResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InTxHashToCctx", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field InTxTracker", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7731,8 +6041,8 @@ func (m *QueryAllInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.InTxHashToCctx = append(m.InTxHashToCctx, InTxHashToCctx{}) - if err := m.InTxHashToCctx[len(m.InTxHashToCctx)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.InTxTracker = append(m.InTxTracker, InTxTracker{}) + if err := m.InTxTracker[len(m.InTxTracker)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7793,7 +6103,7 @@ func (m *QueryAllInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetGasPriceRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllInTxTrackersRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7816,17 +6126,17 @@ func (m *QueryGetGasPriceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetGasPriceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllInTxTrackersRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetGasPriceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllInTxTrackersRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7836,23 +6146,27 @@ func (m *QueryGetGasPriceRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.Index = string(dAtA[iNdEx:postIndex]) + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -7875,7 +6189,7 @@ func (m *QueryGetGasPriceRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetGasPriceResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllInTxTrackersResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7888,25 +6202,59 @@ func (m *QueryGetGasPriceResponse) Unmarshal(dAtA []byte) error { if iNdEx >= l { return io.ErrUnexpectedEOF } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break + 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: QueryAllInTxTrackersResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllInTxTrackersResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field InTxTracker", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.InTxTracker = append(m.InTxTracker, InTxTracker{}) + if err := m.InTxTracker[len(m.InTxTracker)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryGetGasPriceResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetGasPriceResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + iNdEx = postIndex + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GasPrice", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7933,10 +6281,10 @@ func (m *QueryGetGasPriceResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.GasPrice == nil { - m.GasPrice = &GasPrice{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.GasPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7961,7 +6309,7 @@ func (m *QueryGetGasPriceResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllGasPriceRequest) Unmarshal(dAtA []byte) error { +func (m *QueryGetInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7984,17 +6332,17 @@ func (m *QueryAllGasPriceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllGasPriceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetInTxHashToCctxRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllGasPriceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetInTxHashToCctxRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field InTxHash", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8004,27 +6352,23 @@ func (m *QueryAllGasPriceRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.InTxHash = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -8047,7 +6391,7 @@ func (m *QueryAllGasPriceRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllGasPriceResponse) Unmarshal(dAtA []byte) error { +func (m *QueryGetInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8070,49 +6414,15 @@ func (m *QueryAllGasPriceResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllGasPriceResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetInTxHashToCctxResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllGasPriceResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetInTxHashToCctxResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GasPrice", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.GasPrice = append(m.GasPrice, &GasPrice{}) - if err := m.GasPrice[len(m.GasPrice)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field InTxHashToCctx", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8139,10 +6449,7 @@ func (m *QueryAllGasPriceResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.InTxHashToCctx.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -8167,7 +6474,7 @@ func (m *QueryAllGasPriceResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetChainNoncesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryInTxHashToCctxDataRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8190,15 +6497,15 @@ func (m *QueryGetChainNoncesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetChainNoncesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryInTxHashToCctxDataRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetChainNoncesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryInTxHashToCctxDataRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field InTxHash", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -8226,7 +6533,7 @@ func (m *QueryGetChainNoncesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Index = string(dAtA[iNdEx:postIndex]) + m.InTxHash = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -8249,7 +6556,7 @@ func (m *QueryGetChainNoncesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetChainNoncesResponse) Unmarshal(dAtA []byte) error { +func (m *QueryInTxHashToCctxDataResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8272,15 +6579,15 @@ func (m *QueryGetChainNoncesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetChainNoncesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryInTxHashToCctxDataResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetChainNoncesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryInTxHashToCctxDataResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainNonces", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CrossChainTxs", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8307,10 +6614,8 @@ func (m *QueryGetChainNoncesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.ChainNonces == nil { - m.ChainNonces = &ChainNonces{} - } - if err := m.ChainNonces.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.CrossChainTxs = append(m.CrossChainTxs, CrossChainTx{}) + if err := m.CrossChainTxs[len(m.CrossChainTxs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -8335,7 +6640,7 @@ func (m *QueryGetChainNoncesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllChainNoncesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllInTxHashToCctxRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8358,10 +6663,10 @@ func (m *QueryAllChainNoncesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllChainNoncesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllInTxHashToCctxRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllChainNoncesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllInTxHashToCctxRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8421,7 +6726,7 @@ func (m *QueryAllChainNoncesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllChainNoncesResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllInTxHashToCctxResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8444,15 +6749,15 @@ func (m *QueryAllChainNoncesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllChainNoncesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllInTxHashToCctxResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllChainNoncesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllInTxHashToCctxResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainNonces", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field InTxHashToCctx", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8479,8 +6784,8 @@ func (m *QueryAllChainNoncesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainNonces = append(m.ChainNonces, &ChainNonces{}) - if err := m.ChainNonces[len(m.ChainNonces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.InTxHashToCctx = append(m.InTxHashToCctx, InTxHashToCctx{}) + if err := m.InTxHashToCctx[len(m.InTxHashToCctx)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -8541,7 +6846,7 @@ func (m *QueryAllChainNoncesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPendingNoncesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryGetGasPriceRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8564,17 +6869,17 @@ func (m *QueryAllPendingNoncesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPendingNoncesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetGasPriceRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPendingNoncesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetGasPriceRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8584,27 +6889,23 @@ func (m *QueryAllPendingNoncesRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Index = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -8627,7 +6928,7 @@ func (m *QueryAllPendingNoncesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPendingNoncesResponse) Unmarshal(dAtA []byte) error { +func (m *QueryGetGasPriceResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8650,49 +6951,15 @@ func (m *QueryAllPendingNoncesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPendingNoncesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetGasPriceResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPendingNoncesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetGasPriceResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PendingNonces", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PendingNonces = append(m.PendingNonces, PendingNonces{}) - if err := m.PendingNonces[len(m.PendingNonces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field GasPrice", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8719,10 +6986,10 @@ func (m *QueryAllPendingNoncesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} + if m.GasPrice == nil { + m.GasPrice = &GasPrice{} } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.GasPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -8747,7 +7014,7 @@ func (m *QueryAllPendingNoncesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPendingNoncesByChainRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllGasPriceRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8770,17 +7037,17 @@ func (m *QueryPendingNoncesByChainRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPendingNoncesByChainRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllGasPriceRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPendingNoncesByChainRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllGasPriceRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - m.ChainId = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8790,11 +7057,28 @@ func (m *QueryPendingNoncesByChainRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ChainId |= int64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -8816,7 +7100,7 @@ func (m *QueryPendingNoncesByChainRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPendingNoncesByChainResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllGasPriceResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8839,15 +7123,49 @@ func (m *QueryPendingNoncesByChainResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPendingNoncesByChainResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllGasPriceResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPendingNoncesByChainResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllGasPriceResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PendingNonces", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field GasPrice", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.GasPrice = append(m.GasPrice, &GasPrice{}) + if err := m.GasPrice[len(m.GasPrice)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8874,7 +7192,10 @@ func (m *QueryPendingNoncesByChainResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.PendingNonces.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/crosschain/types/query.pb.gw.go b/x/crosschain/types/query.pb.gw.go index 467d0c8818..3e7f8b97c6 100644 --- a/x/crosschain/types/query.pb.gw.go +++ b/x/crosschain/types/query.pb.gw.go @@ -631,186 +631,6 @@ func local_request_Query_ProtocolFee_0(ctx context.Context, marshaler runtime.Ma } -func request_Query_ChainNonces_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryGetChainNoncesRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["index"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "index") - } - - protoReq.Index, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) - } - - msg, err := client.ChainNonces(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_ChainNonces_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryGetChainNoncesRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["index"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "index") - } - - protoReq.Index, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) - } - - msg, err := server.ChainNonces(ctx, &protoReq) - return msg, metadata, err - -} - -var ( - filter_Query_ChainNoncesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Query_ChainNoncesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllChainNoncesRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ChainNoncesAll_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.ChainNoncesAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_ChainNoncesAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllChainNoncesRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ChainNoncesAll_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.ChainNoncesAll(ctx, &protoReq) - return msg, metadata, err - -} - -var ( - filter_Query_PendingNoncesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Query_PendingNoncesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllPendingNoncesRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PendingNoncesAll_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.PendingNoncesAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_PendingNoncesAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryAllPendingNoncesRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PendingNoncesAll_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.PendingNoncesAll(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Query_PendingNoncesByChain_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPendingNoncesByChainRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["chain_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain_id") - } - - protoReq.ChainId, err = runtime.Int64(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) - } - - msg, err := client.PendingNoncesByChain(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_PendingNoncesByChain_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryPendingNoncesByChainRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["chain_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain_id") - } - - protoReq.ChainId, err = runtime.Int64(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) - } - - msg, err := server.PendingNoncesByChain(ctx, &protoReq) - return msg, metadata, err - -} - func request_Query_LastBlockHeight_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryGetLastBlockHeightRequest var metadata runtime.ServerMetadata @@ -1444,98 +1264,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_ChainNonces_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Query_ChainNonces_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_ChainNonces_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_ChainNoncesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Query_ChainNoncesAll_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_ChainNoncesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_PendingNoncesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Query_PendingNoncesAll_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_PendingNoncesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_PendingNoncesByChain_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Query_PendingNoncesByChain_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_PendingNoncesByChain_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("GET", pattern_Query_LastBlockHeight_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -2021,86 +1749,6 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_ChainNonces_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Query_ChainNonces_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_ChainNonces_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_ChainNoncesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Query_ChainNoncesAll_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_ChainNoncesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_PendingNoncesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Query_PendingNoncesAll_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_PendingNoncesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Query_PendingNoncesByChain_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Query_PendingNoncesByChain_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Query_PendingNoncesByChain_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("GET", pattern_Query_LastBlockHeight_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -2291,14 +1939,6 @@ var ( pattern_Query_ProtocolFee_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "crosschain", "protocolFee"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_ChainNonces_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"zeta-chain", "crosschain", "chainNonces", "index"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_ChainNoncesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "crosschain", "chainNonces"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_PendingNoncesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "crosschain", "pendingNonces"}, "", runtime.AssumeColonVerbOpt(false))) - - pattern_Query_PendingNoncesByChain_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"zeta-chain", "crosschain", "pendingNonces", "chain_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_LastBlockHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"zeta-chain", "crosschain", "lastBlockHeight", "index"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_LastBlockHeightAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "crosschain", "lastBlockHeight"}, "", runtime.AssumeColonVerbOpt(false))) @@ -2343,14 +1983,6 @@ var ( forward_Query_ProtocolFee_0 = runtime.ForwardResponseMessage - forward_Query_ChainNonces_0 = runtime.ForwardResponseMessage - - forward_Query_ChainNoncesAll_0 = runtime.ForwardResponseMessage - - forward_Query_PendingNoncesAll_0 = runtime.ForwardResponseMessage - - forward_Query_PendingNoncesByChain_0 = runtime.ForwardResponseMessage - forward_Query_LastBlockHeight_0 = runtime.ForwardResponseMessage forward_Query_LastBlockHeightAll_0 = runtime.ForwardResponseMessage diff --git a/x/crosschain/types/tx.pb.go b/x/crosschain/types/tx.pb.go index 2885c23b84..6745107685 100644 --- a/x/crosschain/types/tx.pb.go +++ b/x/crosschain/types/tx.pb.go @@ -1288,7 +1288,7 @@ func init() { func init() { proto.RegisterFile("crosschain/tx.proto", fileDescriptor_81d6d611190b7635) } var fileDescriptor_81d6d611190b7635 = []byte{ - // 1421 bytes of a gzipped FileDescriptorProto + // 1407 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x6d, 0x4f, 0x1b, 0xc7, 0x13, 0xe7, 0xfe, 0x80, 0xb1, 0x07, 0x0c, 0xe4, 0x20, 0x89, 0x73, 0x04, 0x43, 0x8e, 0x7f, 0x52, 0x54, 0x09, 0x3b, 0x21, 0xaa, 0x9a, 0xa4, 0xad, 0xd4, 0x80, 0x12, 0x42, 0x5b, 0x42, 0x74, 0x71, @@ -1298,86 +1298,85 @@ var fileDescriptor_81d6d611190b7635 = []byte{ 0x5e, 0xdd, 0xce, 0xec, 0xce, 0xec, 0xcc, 0x6f, 0x66, 0x76, 0xf6, 0x16, 0xe6, 0xdc, 0x88, 0x50, 0xea, 0xd6, 0x9c, 0x00, 0x97, 0x59, 0xab, 0xd4, 0x88, 0x08, 0x23, 0xfa, 0xe2, 0x21, 0x62, 0x8e, 0xe0, 0x95, 0xc4, 0x88, 0x44, 0xa8, 0x74, 0xbc, 0xce, 0x98, 0x73, 0x49, 0x18, 0x12, 0x5c, 0x96, - 0x1f, 0x29, 0x63, 0x2c, 0x75, 0x28, 0x6a, 0x20, 0xec, 0x05, 0xd8, 0xb7, 0x31, 0xc1, 0x2e, 0xa2, - 0x6a, 0xc1, 0xbc, 0x4f, 0x7c, 0x22, 0x86, 0x65, 0x3e, 0x92, 0x5c, 0xf3, 0x37, 0x0d, 0x2e, 0xec, - 0x50, 0x7f, 0x33, 0x42, 0x0e, 0x43, 0x95, 0xa7, 0x4f, 0xbf, 0x26, 0x0c, 0x45, 0x7a, 0x01, 0x26, - 0x5c, 0xce, 0x21, 0x51, 0x41, 0x5b, 0xd6, 0x56, 0x73, 0x56, 0x4c, 0xea, 0x8b, 0x00, 0x8c, 0x52, - 0xbb, 0xd1, 0xac, 0xee, 0xa3, 0x76, 0xe1, 0x7f, 0x62, 0x32, 0xc7, 0x28, 0x7d, 0x22, 0x18, 0xfa, - 0x87, 0x30, 0xbb, 0x8f, 0xda, 0x5b, 0x08, 0x3f, 0x47, 0xcc, 0x79, 0x84, 0x02, 0xbf, 0xc6, 0x0a, - 0xa3, 0xcb, 0xda, 0xea, 0xa8, 0x75, 0x82, 0xaf, 0xaf, 0x41, 0x86, 0x32, 0x87, 0x35, 0x69, 0x61, - 0x6c, 0x59, 0x5b, 0x9d, 0x5e, 0xbf, 0x58, 0x52, 0x0e, 0x59, 0xc8, 0x45, 0xc1, 0x01, 0x7a, 0x2a, - 0x26, 0x2d, 0xb5, 0xc8, 0x5c, 0x80, 0x2b, 0x27, 0x0c, 0xb5, 0x10, 0x6d, 0x10, 0x4c, 0x91, 0xf9, - 0xa3, 0x06, 0xfa, 0x0e, 0xf5, 0x77, 0x02, 0x3f, 0xe2, 0xd3, 0x94, 0x3e, 0x6c, 0x62, 0x8f, 0xf6, - 0xf1, 0xe3, 0x0a, 0x64, 0x05, 0x56, 0x76, 0xe0, 0x09, 0x2f, 0x46, 0xad, 0x09, 0x41, 0x6f, 0x7b, - 0xfa, 0x16, 0x64, 0x9c, 0x90, 0x34, 0xb1, 0xb4, 0x3c, 0xb7, 0x51, 0x7e, 0xf9, 0x66, 0x69, 0xe4, - 0xcf, 0x37, 0x4b, 0x1f, 0xf8, 0x01, 0xab, 0x35, 0xab, 0xdc, 0xca, 0xb2, 0x4b, 0x68, 0x48, 0xa8, - 0xfa, 0xac, 0x51, 0x6f, 0xbf, 0xcc, 0xda, 0x0d, 0x44, 0x4b, 0xcf, 0x02, 0xcc, 0x2c, 0x25, 0x6e, - 0x5e, 0x05, 0xe3, 0xa4, 0x4d, 0x89, 0xc9, 0x8f, 0x61, 0x6e, 0x87, 0xfa, 0xcf, 0x1a, 0x9e, 0x9c, - 0xbc, 0xef, 0x79, 0x11, 0xa2, 0xf4, 0xdc, 0xd0, 0x9b, 0x8b, 0xb0, 0x70, 0x8a, 0xbe, 0x64, 0xbb, - 0x7f, 0x34, 0xb1, 0xdf, 0x7d, 0xcf, 0xab, 0x90, 0x6d, 0x5c, 0x69, 0x55, 0x22, 0xc7, 0xdd, 0xef, - 0x1b, 0xea, 0x3e, 0x10, 0x5d, 0x86, 0x09, 0xd6, 0xb2, 0x6b, 0x0e, 0xad, 0x49, 0x8c, 0xac, 0x0c, - 0x6b, 0x3d, 0x72, 0x68, 0x4d, 0x5f, 0x83, 0x9c, 0x4b, 0x02, 0x6c, 0x73, 0x34, 0x54, 0x58, 0x67, - 0xe3, 0xb0, 0x6e, 0x92, 0x00, 0x57, 0xda, 0x0d, 0x64, 0x65, 0x5d, 0x35, 0xd2, 0x57, 0x60, 0xbc, - 0x11, 0x11, 0xb2, 0x57, 0x18, 0x5f, 0xd6, 0x56, 0x27, 0xd7, 0xf3, 0xf1, 0xd2, 0x27, 0x9c, 0x69, - 0xc9, 0x39, 0xee, 0x77, 0xb5, 0x4e, 0xdc, 0x7d, 0xb9, 0x5f, 0x46, 0xfa, 0x2d, 0x38, 0x62, 0xcb, - 0x2b, 0x90, 0x65, 0x2d, 0x3b, 0xc0, 0x1e, 0x6a, 0x15, 0x26, 0xa4, 0x99, 0xac, 0xb5, 0xcd, 0x49, - 0x05, 0x49, 0xb7, 0xcb, 0x09, 0x24, 0xbf, 0xcb, 0xdc, 0xff, 0xa6, 0x16, 0x30, 0x54, 0x0f, 0x28, - 0x7b, 0x60, 0x6d, 0xae, 0xdf, 0xec, 0x03, 0xc8, 0x0a, 0xe4, 0x51, 0xe4, 0xae, 0xdf, 0xb4, 0x1d, - 0x89, 0xad, 0x8a, 0xc1, 0x94, 0x60, 0xc6, 0xf1, 0xeb, 0x44, 0x6d, 0x34, 0x8d, 0x9a, 0x0e, 0x63, - 0xd8, 0x09, 0x25, 0x2e, 0x39, 0x4b, 0x8c, 0xf5, 0x4b, 0x90, 0xa1, 0xed, 0xb0, 0x4a, 0xea, 0x02, - 0x82, 0x9c, 0xa5, 0x28, 0xdd, 0x80, 0xac, 0x87, 0xdc, 0x20, 0x74, 0xea, 0x54, 0xb8, 0x9c, 0xb7, - 0x12, 0x5a, 0x5f, 0x80, 0x9c, 0xef, 0x50, 0xbb, 0x1e, 0x84, 0x01, 0x53, 0x2e, 0x67, 0x7d, 0x87, - 0x7e, 0xc5, 0x69, 0xd3, 0x16, 0x65, 0x92, 0xf6, 0x29, 0xf6, 0x98, 0x7b, 0x70, 0x98, 0xf2, 0x40, - 0x7a, 0x38, 0x75, 0xd8, 0xe9, 0xc1, 0x22, 0x80, 0xeb, 0x26, 0x90, 0xaa, 0x3c, 0xe3, 0x1c, 0x09, - 0xea, 0x6b, 0x0d, 0xe6, 0x63, 0x54, 0x77, 0x9b, 0xec, 0x1d, 0x33, 0x69, 0x1e, 0xc6, 0xc5, 0x29, - 0x25, 0xb0, 0x1a, 0xb3, 0x24, 0xd1, 0x99, 0x5f, 0x63, 0xa9, 0xfc, 0x7a, 0xcf, 0x09, 0xf3, 0x19, - 0x5c, 0x3d, 0xcd, 0xb5, 0x04, 0xbf, 0x45, 0x80, 0x80, 0xda, 0x11, 0x0a, 0xc9, 0x01, 0xf2, 0x84, - 0x97, 0x59, 0x2b, 0x17, 0x50, 0x4b, 0x32, 0xcc, 0x3d, 0x81, 0xbd, 0xa4, 0x1e, 0x46, 0x24, 0x7c, - 0x4f, 0xf0, 0x98, 0x2b, 0x70, 0xad, 0xe7, 0x3e, 0x49, 0x76, 0xff, 0xa2, 0xc1, 0xec, 0x0e, 0xf5, - 0xb7, 0x1c, 0xfa, 0x24, 0x0a, 0x5c, 0x34, 0xe8, 0x60, 0xef, 0x6f, 0x44, 0x83, 0xab, 0x88, 0x8d, - 0x10, 0x84, 0x7e, 0x0d, 0xa6, 0x24, 0xca, 0xb8, 0x19, 0x56, 0x51, 0x24, 0x02, 0x35, 0x66, 0x4d, - 0x0a, 0xde, 0x63, 0xc1, 0x12, 0xc9, 0xdd, 0x6c, 0x34, 0xea, 0xed, 0x24, 0xb9, 0x05, 0x65, 0x1a, - 0x50, 0xe8, 0xb6, 0x2c, 0x31, 0xfb, 0xf5, 0xb8, 0x28, 0x5a, 0xce, 0xdc, 0xc5, 0xbb, 0x55, 0x8a, - 0xa2, 0x03, 0xe4, 0xed, 0x36, 0x59, 0x95, 0x34, 0xb1, 0x57, 0x69, 0xf5, 0xf1, 0x60, 0x01, 0x44, - 0x96, 0xca, 0xa8, 0xcb, 0xb4, 0xcd, 0x72, 0x86, 0x08, 0x7a, 0x09, 0xe6, 0x88, 0x52, 0x66, 0x13, - 0x0e, 0x57, 0xe7, 0xe9, 0x75, 0x81, 0x1c, 0xef, 0x53, 0x91, 0xeb, 0x3f, 0x05, 0xa3, 0x6b, 0xbd, - 0x4c, 0x20, 0xd9, 0xd2, 0xa4, 0xaf, 0x85, 0x94, 0xd8, 0xc6, 0xf1, 0xbc, 0xfe, 0x11, 0x5c, 0xee, - 0x92, 0xe6, 0x05, 0xdb, 0xa4, 0xc8, 0x2b, 0x80, 0x10, 0x9d, 0x4f, 0x89, 0x6e, 0x39, 0xf4, 0x19, - 0x45, 0x9e, 0x7e, 0x08, 0x66, 0x97, 0x18, 0xda, 0xdb, 0x43, 0x2e, 0x0b, 0x0e, 0x90, 0x50, 0x20, - 0xa3, 0x30, 0x29, 0xba, 0x52, 0x49, 0x75, 0xa5, 0x1b, 0x43, 0x74, 0xa5, 0x6d, 0xcc, 0xac, 0x62, - 0x6a, 0xc7, 0x07, 0xb1, 0xde, 0x38, 0x08, 0xfa, 0x17, 0x03, 0xf6, 0x96, 0xa7, 0xcd, 0x94, 0xb0, - 0xbe, 0xb7, 0x2e, 0x71, 0x06, 0xe9, 0x04, 0xa6, 0x0f, 0x9c, 0x7a, 0x13, 0xd9, 0x91, 0xec, 0xe4, - 0x9e, 0x8c, 0xff, 0xc6, 0xa3, 0x33, 0x76, 0xd2, 0x7f, 0xdf, 0x2c, 0x5d, 0x6c, 0x3b, 0x61, 0xfd, - 0x9e, 0x99, 0x56, 0x67, 0x5a, 0x79, 0xc1, 0x50, 0x17, 0x05, 0xaf, 0xe3, 0x2a, 0x91, 0x19, 0xe2, - 0x2a, 0xa1, 0x2f, 0xc1, 0xa4, 0x74, 0x51, 0x64, 0xb8, 0x3a, 0x04, 0x40, 0xb0, 0x36, 0x39, 0x47, - 0xbf, 0x01, 0x33, 0x72, 0x01, 0x6f, 0xb8, 0xb2, 0x00, 0xb3, 0xc2, 0xf3, 0xbc, 0x60, 0x57, 0x28, - 0x7d, 0x2c, 0xce, 0xa9, 0x54, 0xbb, 0xcb, 0x0d, 0x6a, 0x77, 0xe6, 0x75, 0x58, 0xe9, 0x93, 0xda, - 0x49, 0x09, 0xbc, 0x18, 0x13, 0x17, 0x87, 0xf4, 0xba, 0x6d, 0x3c, 0xb8, 0x02, 0x78, 0xbd, 0x21, - 0xec, 0xa1, 0x48, 0xa5, 0xbf, 0xa2, 0xb8, 0x3b, 0x72, 0x64, 0x77, 0xb5, 0xa6, 0xbc, 0x64, 0x6f, - 0xaa, 0x42, 0x37, 0x20, 0xab, 0x20, 0x8e, 0xd4, 0xb9, 0x9b, 0xd0, 0xfa, 0x75, 0x98, 0x8e, 0xc7, - 0x0a, 0xb6, 0x71, 0xa9, 0x22, 0xe6, 0x4a, 0xe4, 0x8e, 0x2f, 0x4f, 0x99, 0x77, 0xba, 0x3c, 0x71, - 0x2f, 0x43, 0x44, 0xa9, 0xe3, 0x4b, 0xe8, 0x73, 0x56, 0x4c, 0xea, 0x57, 0x01, 0x38, 0xe4, 0xaa, - 0x82, 0x73, 0xd2, 0xce, 0x00, 0xab, 0xc2, 0xbd, 0x01, 0x33, 0x01, 0xb6, 0xd5, 0xf9, 0x2f, 0xab, - 0x55, 0x96, 0x5c, 0x3e, 0xc0, 0x9d, 0x25, 0x9a, 0x6a, 0xa2, 0x93, 0x62, 0x45, 0xd2, 0x44, 0xd3, - 0x71, 0x9d, 0x1a, 0x78, 0x8d, 0x59, 0x80, 0x1c, 0x6b, 0xd9, 0x24, 0x0a, 0xfc, 0x00, 0x17, 0xf2, - 0xd2, 0x20, 0xd6, 0xda, 0x15, 0x34, 0x3f, 0x3d, 0x1d, 0x4a, 0x11, 0x2b, 0x4c, 0x8b, 0x09, 0x49, - 0xf0, 0x14, 0x44, 0x07, 0x08, 0x33, 0xd5, 0x87, 0x66, 0x84, 0x01, 0x20, 0x58, 0xb2, 0x15, 0xfd, - 0x1f, 0xcc, 0xde, 0x39, 0x10, 0xa7, 0xca, 0xfa, 0x5f, 0x00, 0xa3, 0x3b, 0xd4, 0xd7, 0xbf, 0xd7, - 0xe0, 0xc2, 0xc9, 0x8e, 0x7c, 0xbb, 0xd4, 0xf7, 0x47, 0xa2, 0x74, 0x5a, 0xaf, 0x33, 0x3e, 0x39, - 0x87, 0x50, 0xd2, 0x20, 0x5f, 0x68, 0x30, 0x7b, 0xe2, 0x8a, 0xb9, 0x3e, 0xa4, 0xc6, 0x0e, 0x19, - 0xe3, 0xde, 0xd9, 0x65, 0x12, 0x23, 0x7e, 0xd2, 0xe0, 0x52, 0x8f, 0x26, 0x7c, 0x67, 0xb0, 0xda, - 0xd3, 0x25, 0x8d, 0xcf, 0xcf, 0x2b, 0x99, 0x98, 0xd5, 0x86, 0x7c, 0xba, 0x19, 0x97, 0x07, 0xab, - 0x4c, 0x09, 0x18, 0x1f, 0x9f, 0x51, 0x20, 0xd9, 0xfa, 0x57, 0x0d, 0x0a, 0x3d, 0x3b, 0xea, 0x10, - 0x50, 0xf7, 0x92, 0x35, 0x36, 0xce, 0x2f, 0x9b, 0x18, 0xf7, 0xb3, 0x06, 0x97, 0x7b, 0x9d, 0x75, - 0x77, 0xcf, 0xaa, 0x3f, 0x11, 0x35, 0xee, 0x9f, 0x5b, 0x34, 0xb1, 0xec, 0x5b, 0x98, 0xee, 0xfa, - 0x39, 0xb8, 0x39, 0x58, 0x69, 0x5a, 0xc2, 0xb8, 0x73, 0x56, 0x89, 0x54, 0x2d, 0x9d, 0xf8, 0x3d, - 0x1c, 0xa2, 0x96, 0xba, 0x65, 0x86, 0xa9, 0xa5, 0x5e, 0xbf, 0x8d, 0xfa, 0x77, 0x30, 0xd3, 0xfd, - 0x53, 0x7d, 0x6b, 0xb0, 0xba, 0x2e, 0x11, 0xe3, 0xee, 0x99, 0x45, 0x3a, 0x63, 0xd0, 0xf5, 0x38, - 0x31, 0x44, 0x0c, 0xd2, 0x12, 0xc3, 0xc4, 0xe0, 0xf4, 0x77, 0x85, 0x8d, 0x2f, 0x5f, 0xbe, 0x2d, - 0x6a, 0xaf, 0xde, 0x16, 0xb5, 0xbf, 0xdf, 0x16, 0xb5, 0x1f, 0x8e, 0x8a, 0x23, 0xaf, 0x8e, 0x8a, - 0x23, 0x7f, 0x1c, 0x15, 0x47, 0x9e, 0xdf, 0xea, 0x68, 0x68, 0x5c, 0xe7, 0x9a, 0x7c, 0x7a, 0x89, - 0xd5, 0x97, 0x5b, 0xe5, 0xce, 0x97, 0x1d, 0xde, 0xdf, 0xaa, 0x19, 0xf1, 0xe4, 0x72, 0xfb, 0xbf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x73, 0xcf, 0x1d, 0xf4, 0x11, 0x00, 0x00, + 0x1f, 0x29, 0x63, 0xcc, 0xfb, 0xc4, 0x27, 0x62, 0x58, 0xe6, 0x23, 0xc9, 0x35, 0x7f, 0xd3, 0xe0, + 0xc2, 0x0e, 0xf5, 0x37, 0x23, 0xe4, 0x30, 0x54, 0x79, 0xfa, 0xf4, 0x6b, 0xc2, 0x50, 0xa4, 0x17, + 0x60, 0xc2, 0xe5, 0x1c, 0x12, 0x15, 0xb4, 0x65, 0x6d, 0x35, 0x67, 0xc5, 0xa4, 0xbe, 0x08, 0xc0, + 0x28, 0xb5, 0x1b, 0xcd, 0xea, 0x3e, 0x6a, 0x17, 0xfe, 0x27, 0x26, 0x73, 0x8c, 0xd2, 0x27, 0x82, + 0xa1, 0x7f, 0x08, 0xb3, 0xfb, 0xa8, 0xbd, 0x85, 0xf0, 0x73, 0xc4, 0x9c, 0x47, 0x28, 0xf0, 0x6b, + 0xac, 0x30, 0xba, 0xac, 0xad, 0x8e, 0x5a, 0x27, 0xf8, 0xfa, 0x1a, 0x64, 0x28, 0x73, 0x58, 0x93, + 0x16, 0xc6, 0x96, 0xb5, 0xd5, 0xe9, 0xf5, 0x8b, 0x25, 0x65, 0xaf, 0x85, 0x5c, 0x14, 0x1c, 0xa0, + 0xa7, 0x62, 0xd2, 0x52, 0x8b, 0xcc, 0x05, 0xb8, 0x72, 0xc2, 0x50, 0x0b, 0xd1, 0x06, 0xc1, 0x14, + 0x99, 0x3f, 0x6a, 0xa0, 0xef, 0x50, 0x7f, 0x27, 0xf0, 0x23, 0x3e, 0x4d, 0xe9, 0xc3, 0x26, 0xf6, + 0x68, 0x1f, 0x3f, 0xae, 0x40, 0x56, 0x60, 0x65, 0x07, 0x9e, 0xf0, 0x62, 0xd4, 0x9a, 0x10, 0xf4, + 0xb6, 0xa7, 0x6f, 0x41, 0xc6, 0x09, 0x49, 0x13, 0x4b, 0xcb, 0x73, 0x1b, 0xe5, 0x97, 0x6f, 0x96, + 0x46, 0xfe, 0x7c, 0xb3, 0xf4, 0x81, 0x1f, 0xb0, 0x5a, 0xb3, 0xca, 0xad, 0x2c, 0xbb, 0x84, 0x86, + 0x84, 0xaa, 0xcf, 0x1a, 0xf5, 0xf6, 0xcb, 0xac, 0xdd, 0x40, 0xb4, 0xf4, 0x2c, 0xc0, 0xcc, 0x52, + 0xe2, 0xe6, 0x55, 0x30, 0x4e, 0xda, 0x94, 0x98, 0xfc, 0x18, 0xe6, 0x76, 0xa8, 0xff, 0xac, 0xe1, + 0xc9, 0xc9, 0xfb, 0x9e, 0x17, 0x21, 0x4a, 0xcf, 0x0d, 0xbd, 0xb9, 0x08, 0x0b, 0xa7, 0xe8, 0x4b, + 0xb6, 0xfb, 0x47, 0x13, 0xfb, 0xdd, 0xf7, 0xbc, 0x0a, 0xd9, 0xc6, 0x95, 0x56, 0x25, 0x72, 0xdc, + 0xfd, 0xbe, 0xa1, 0xee, 0x03, 0xd1, 0x65, 0x98, 0x60, 0x2d, 0xbb, 0xe6, 0xd0, 0x9a, 0xc4, 0xc8, + 0xca, 0xb0, 0xd6, 0x23, 0x87, 0xd6, 0xf4, 0x35, 0xc8, 0xb9, 0x24, 0xc0, 0x36, 0x47, 0x43, 0x85, + 0x75, 0x36, 0x0e, 0xeb, 0x26, 0x09, 0x70, 0xa5, 0xdd, 0x40, 0x56, 0xd6, 0x55, 0x23, 0x7d, 0x05, + 0xc6, 0x1b, 0x11, 0x21, 0x7b, 0x85, 0xf1, 0x65, 0x6d, 0x75, 0x72, 0x3d, 0x1f, 0x2f, 0x7d, 0xc2, + 0x99, 0x96, 0x9c, 0xe3, 0x7e, 0x57, 0xeb, 0xc4, 0xdd, 0x97, 0xfb, 0x65, 0xa4, 0xdf, 0x82, 0x23, + 0xb6, 0xbc, 0x02, 0x59, 0xd6, 0xb2, 0x03, 0xec, 0xa1, 0x56, 0x61, 0x42, 0x9a, 0xc9, 0x5a, 0xdb, + 0x9c, 0x54, 0x90, 0x74, 0xbb, 0x9c, 0x40, 0xf2, 0xbb, 0xcc, 0xfd, 0x6f, 0x6a, 0x01, 0x43, 0xf5, + 0x80, 0xb2, 0x07, 0xd6, 0xe6, 0xfa, 0xcd, 0x3e, 0x80, 0xac, 0x40, 0x1e, 0x45, 0xee, 0xfa, 0x4d, + 0xdb, 0x91, 0xd8, 0xaa, 0x18, 0x4c, 0x09, 0x66, 0x1c, 0xbf, 0x4e, 0xd4, 0x46, 0xd3, 0xa8, 0xe9, + 0x30, 0x86, 0x9d, 0x50, 0xe2, 0x92, 0xb3, 0xc4, 0x58, 0xbf, 0x04, 0x19, 0xda, 0x0e, 0xab, 0xa4, + 0x2e, 0x20, 0xc8, 0x59, 0x8a, 0xd2, 0x0d, 0xc8, 0x7a, 0xc8, 0x0d, 0x42, 0xa7, 0x4e, 0x85, 0xcb, + 0x79, 0x2b, 0xa1, 0xf5, 0x05, 0xc8, 0xf9, 0x0e, 0xb5, 0xeb, 0x41, 0x18, 0x30, 0xe5, 0x72, 0xd6, + 0x77, 0xe8, 0x57, 0x9c, 0x36, 0x6d, 0x51, 0x26, 0x69, 0x9f, 0x62, 0x8f, 0xb9, 0x07, 0x87, 0x29, + 0x0f, 0xa4, 0x87, 0x53, 0x87, 0x9d, 0x1e, 0x2c, 0x02, 0xb8, 0x6e, 0x02, 0xa9, 0xca, 0x33, 0xce, + 0x91, 0xa0, 0xbe, 0xd6, 0x60, 0x3e, 0x46, 0x75, 0xb7, 0xc9, 0xde, 0x31, 0x93, 0xe6, 0x61, 0x1c, + 0x13, 0xec, 0x22, 0x81, 0xd5, 0x98, 0x25, 0x89, 0xce, 0xfc, 0x1a, 0x4b, 0xe5, 0xd7, 0x7b, 0x4e, + 0x98, 0xcf, 0xe0, 0xea, 0x69, 0xae, 0x25, 0xf8, 0x2d, 0x02, 0x04, 0xd4, 0x8e, 0x50, 0x48, 0x0e, + 0x90, 0x27, 0xbc, 0xcc, 0x5a, 0xb9, 0x80, 0x5a, 0x92, 0x61, 0xee, 0x09, 0xec, 0x25, 0xf5, 0x30, + 0x22, 0xe1, 0x7b, 0x82, 0xc7, 0x5c, 0x81, 0x6b, 0x3d, 0xf7, 0x49, 0xb2, 0xfb, 0x17, 0x0d, 0x66, + 0x77, 0xa8, 0xbf, 0xe5, 0xd0, 0x27, 0x51, 0xe0, 0xa2, 0x41, 0x07, 0x7b, 0x7f, 0x23, 0x1a, 0x5c, + 0x45, 0x6c, 0x84, 0x20, 0xf4, 0x6b, 0x30, 0x25, 0x51, 0xc6, 0xcd, 0xb0, 0x8a, 0x22, 0x11, 0xa8, + 0x31, 0x6b, 0x52, 0xf0, 0x1e, 0x0b, 0x96, 0x48, 0xee, 0x66, 0xa3, 0x51, 0x6f, 0x27, 0xc9, 0x2d, + 0x28, 0xd3, 0x80, 0x42, 0xb7, 0x65, 0x89, 0xd9, 0xaf, 0xc7, 0x45, 0xd1, 0x72, 0xe6, 0x2e, 0xde, + 0xad, 0x52, 0x14, 0x1d, 0x20, 0x6f, 0xb7, 0xc9, 0xaa, 0xa4, 0x89, 0xbd, 0x4a, 0xab, 0x8f, 0x07, + 0x0b, 0x20, 0xb2, 0x54, 0x46, 0x5d, 0xa6, 0x6d, 0x96, 0x33, 0x44, 0xd0, 0x4b, 0x30, 0x47, 0x94, + 0x32, 0x9b, 0x70, 0xb8, 0x3a, 0x4f, 0xaf, 0x0b, 0xe4, 0x78, 0x9f, 0x8a, 0x5c, 0xff, 0x29, 0x18, + 0x5d, 0xeb, 0x65, 0x02, 0xc9, 0x96, 0x26, 0x7d, 0x2d, 0xa4, 0xc4, 0x36, 0x8e, 0xe7, 0xf5, 0x8f, + 0xe0, 0x72, 0x97, 0x34, 0x2f, 0xd8, 0x26, 0x45, 0x5e, 0x01, 0x84, 0xe8, 0x7c, 0x4a, 0x74, 0xcb, + 0xa1, 0xcf, 0x28, 0xf2, 0xf4, 0x43, 0x30, 0xbb, 0xc4, 0xd0, 0xde, 0x1e, 0x72, 0x59, 0x70, 0x80, + 0x84, 0x02, 0x19, 0x85, 0x49, 0xd1, 0x95, 0x4a, 0xaa, 0x2b, 0xdd, 0x18, 0xa2, 0x2b, 0x6d, 0x63, + 0x66, 0x15, 0x53, 0x3b, 0x3e, 0x88, 0xf5, 0xc6, 0x41, 0xd0, 0xbf, 0x18, 0xb0, 0xb7, 0x3c, 0x6d, + 0xa6, 0x84, 0xf5, 0xbd, 0x75, 0x89, 0x33, 0x48, 0x27, 0x30, 0x7d, 0xe0, 0xd4, 0x9b, 0xc8, 0x8e, + 0x64, 0x27, 0xf7, 0x64, 0xfc, 0x37, 0x1e, 0x9d, 0xb1, 0x93, 0xfe, 0xfb, 0x66, 0xe9, 0x62, 0xdb, + 0x09, 0xeb, 0xf7, 0xcc, 0xb4, 0x3a, 0xd3, 0xca, 0x0b, 0x86, 0xba, 0x28, 0x78, 0x1d, 0x57, 0x89, + 0xcc, 0x10, 0x57, 0x09, 0x7d, 0x09, 0x26, 0xa5, 0x8b, 0x22, 0xc3, 0xd5, 0x21, 0x00, 0x82, 0xb5, + 0xc9, 0x39, 0xfa, 0x0d, 0x98, 0x91, 0x0b, 0x78, 0xc3, 0x95, 0x05, 0x98, 0x15, 0x9e, 0xe7, 0x05, + 0xbb, 0x42, 0xe9, 0x63, 0x71, 0x4e, 0xa5, 0xda, 0x5d, 0x6e, 0x50, 0xbb, 0x33, 0xaf, 0xc3, 0x4a, + 0x9f, 0xd4, 0x4e, 0x4a, 0xe0, 0xc5, 0x98, 0xb8, 0x38, 0xa4, 0xd7, 0x6d, 0xe3, 0xc1, 0x15, 0xc0, + 0xeb, 0x0d, 0x61, 0x0f, 0x45, 0x2a, 0xfd, 0x15, 0xc5, 0xdd, 0x91, 0x23, 0xbb, 0xab, 0x35, 0xe5, + 0x25, 0x7b, 0x53, 0x15, 0xba, 0x01, 0x59, 0x05, 0x71, 0xa4, 0xce, 0xdd, 0x84, 0xd6, 0xaf, 0xc3, + 0x74, 0x3c, 0x56, 0xb0, 0x8d, 0x4b, 0x15, 0x31, 0x57, 0x22, 0x77, 0x7c, 0x79, 0xca, 0xbc, 0xd3, + 0xe5, 0x89, 0x7b, 0x19, 0x22, 0x4a, 0x1d, 0x5f, 0x42, 0x9f, 0xb3, 0x62, 0x52, 0xbf, 0x0a, 0xc0, + 0x21, 0x57, 0x15, 0x9c, 0x93, 0x76, 0x06, 0x58, 0x15, 0xee, 0x0d, 0x98, 0x09, 0xb0, 0xad, 0xce, + 0x7f, 0x59, 0xad, 0xb2, 0xe4, 0xf2, 0x01, 0xee, 0x2c, 0xd1, 0x54, 0x13, 0x9d, 0x14, 0x2b, 0x92, + 0x26, 0x9a, 0x8e, 0xeb, 0xd4, 0xc0, 0x6b, 0xcc, 0x02, 0xe4, 0x58, 0xcb, 0x26, 0x51, 0xe0, 0x07, + 0xb8, 0x90, 0x97, 0x06, 0xb1, 0xd6, 0xae, 0xa0, 0xf9, 0xe9, 0xe9, 0x50, 0x8a, 0x58, 0x61, 0x5a, + 0x4c, 0x48, 0x82, 0xa7, 0x20, 0x3a, 0x40, 0x98, 0xa9, 0x3e, 0x34, 0x23, 0x0c, 0x00, 0xc1, 0x92, + 0xad, 0xe8, 0xff, 0x60, 0xf6, 0xce, 0x81, 0x38, 0x55, 0xd6, 0xff, 0x02, 0x18, 0xdd, 0xa1, 0xbe, + 0xfe, 0xbd, 0x06, 0x17, 0x4e, 0x76, 0xe4, 0xdb, 0xa5, 0xbe, 0xff, 0x09, 0xa5, 0xd3, 0x7a, 0x9d, + 0xf1, 0xc9, 0x39, 0x84, 0x92, 0x06, 0xf9, 0x42, 0x83, 0xd9, 0x13, 0x57, 0xcc, 0xf5, 0x21, 0x35, + 0x76, 0xc8, 0x18, 0xf7, 0xce, 0x2e, 0x93, 0x18, 0xf1, 0x93, 0x06, 0x97, 0x7a, 0x34, 0xe1, 0x3b, + 0x83, 0xd5, 0x9e, 0x2e, 0x69, 0x7c, 0x7e, 0x5e, 0xc9, 0xc4, 0xac, 0x36, 0xe4, 0xd3, 0xcd, 0xb8, + 0x3c, 0x58, 0x65, 0x4a, 0xc0, 0xf8, 0xf8, 0x8c, 0x02, 0xc9, 0xd6, 0xbf, 0x6a, 0x50, 0xe8, 0xd9, + 0x51, 0x87, 0x80, 0xba, 0x97, 0xac, 0xb1, 0x71, 0x7e, 0xd9, 0xc4, 0xb8, 0x9f, 0x35, 0xb8, 0xdc, + 0xeb, 0xac, 0xbb, 0x7b, 0x56, 0xfd, 0x89, 0xa8, 0x71, 0xff, 0xdc, 0xa2, 0x89, 0x65, 0xdf, 0xc2, + 0x74, 0xd7, 0xcf, 0xc1, 0xcd, 0xc1, 0x4a, 0xd3, 0x12, 0xc6, 0x9d, 0xb3, 0x4a, 0xa4, 0x6a, 0xe9, + 0xc4, 0xef, 0xe1, 0x10, 0xb5, 0xd4, 0x2d, 0x33, 0x4c, 0x2d, 0xf5, 0xfa, 0x6d, 0xd4, 0xbf, 0x83, + 0x99, 0xee, 0x9f, 0xea, 0x5b, 0x83, 0xd5, 0x75, 0x89, 0x18, 0x77, 0xcf, 0x2c, 0xd2, 0x19, 0x83, + 0xae, 0xc7, 0x89, 0x21, 0x62, 0x90, 0x96, 0x18, 0x26, 0x06, 0xa7, 0xbf, 0x2b, 0x6c, 0x7c, 0xf9, + 0xf2, 0x6d, 0x51, 0x7b, 0xf5, 0xb6, 0xa8, 0xfd, 0xfd, 0xb6, 0xa8, 0xfd, 0x70, 0x54, 0x1c, 0x79, + 0x75, 0x54, 0x1c, 0xf9, 0xe3, 0xa8, 0x38, 0xf2, 0xfc, 0x56, 0x47, 0x43, 0xe3, 0x3a, 0xd7, 0xe4, + 0x13, 0x4d, 0xac, 0xbe, 0xdc, 0x2a, 0x77, 0x3e, 0xdc, 0xf0, 0xfe, 0x56, 0xcd, 0x88, 0x27, 0x97, + 0xdb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x47, 0x0c, 0x03, 0xae, 0xd3, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/emissions/client/tests/suite.go b/x/emissions/client/tests/suite.go index b59adf9483..2baea8a338 100644 --- a/x/emissions/client/tests/suite.go +++ b/x/emissions/client/tests/suite.go @@ -53,7 +53,7 @@ func (s *CliTestSuite) SetupSuite() { } network.SetupZetaGenesisState(s.T(), s.cfg.GenesisState, s.cfg.Codec, observerList, false) s.ballots = RandomBallotGenerator(20, observerList) - network.AddObserverData(s.T(), s.cfg.GenesisState, s.cfg.Codec, s.ballots) + network.AddObserverData(s.T(), 2, s.cfg.GenesisState, s.cfg.Codec, s.ballots) net, err := network.New(s.T(), app.NodeDir, s.cfg) s.Assert().NoError(err) diff --git a/x/observer/client/cli/cli_supported_chains.go b/x/observer/client/cli/cli_supported_chains.go deleted file mode 100644 index aeb870ec27..0000000000 --- a/x/observer/client/cli/cli_supported_chains.go +++ /dev/null @@ -1,75 +0,0 @@ -package cli - -import ( - "context" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/observer/types" -) - -func CmdGetSupportedChains() *cobra.Command { - cmd := &cobra.Command{ - Use: "list-chains", - Short: "list all SupportedChains", - RunE: func(cmd *cobra.Command, args []string) error { - clientCtx := client.GetClientContextFromCmd(cmd) - - queryClient := types.NewQueryClient(clientCtx) - - params := &types.QuerySupportedChains{} - - res, err := queryClient.SupportedChains(context.Background(), params) - if err != nil { - return err - } - - return clientCtx.PrintProto(res) - }, - } - - flags.AddPaginationFlagsToCmd(cmd, cmd.Use) - flags.AddQueryFlagsToCmd(cmd) - - return cmd -} - -// Transaction CLI ///////////////////////// - -//func CmdSetSupportedChains() *cobra.Command { -// cmd := &cobra.Command{ -// Use: "add-supported-chains chainID chainName ", -// Short: "Broadcast message set-supported-chains", -// Args: cobra.ExactArgs(2), -// RunE: func(cmd *cobra.Command, args []string) error { -// -// chainName := common.ParseStringToObserverChain(args[1]) -// if chainName == 0 { -// return errors.New("ChainName type not supported\"") -// } -// chainID, err := strconv.Atoi(args[0]) -// if err != nil { -// return err -// } -// clientCtx, err := client.GetClientTxContext(cmd) -// if err != nil { -// return err -// } -// -// msg := &types.MsgSetSupportedChains{ -// Creator: clientCtx.GetFromAddress().String(), -// ChainId: int64(chainID), -// ChainName: chainName, -// } -// if err := msg.ValidateBasic(); err != nil { -// return err -// } -// return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) -// }, -// } -// -// flags.AddTxFlagsToCmd(cmd) -// -// return cmd -//} diff --git a/x/observer/client/cli/query.go b/x/observer/client/cli/query.go index 360e2f8b08..768d37828e 100644 --- a/x/observer/client/cli/query.go +++ b/x/observer/client/cli/query.go @@ -44,6 +44,9 @@ func GetQueryCmd(_ string) *cobra.Command { CmdListTssHistory(), CmdShowTSS(), CmdGetTssAddressByFinalizedZetaHeight(), + CmdListChainNonces(), + CmdShowChainNonces(), + CmdListPendingNonces(), ) return cmd diff --git a/x/crosschain/client/cli/cli_chain_nonce.go b/x/observer/client/cli/query_chain_nonce.go similarity index 69% rename from x/crosschain/client/cli/cli_chain_nonce.go rename to x/observer/client/cli/query_chain_nonce.go index 2bb5b25664..8a0a443fca 100644 --- a/x/crosschain/client/cli/cli_chain_nonce.go +++ b/x/observer/client/cli/query_chain_nonce.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/zetacore/x/observer/types" ) func CmdListChainNonces() *cobra.Command { @@ -69,29 +69,3 @@ func CmdShowChainNonces() *cobra.Command { return cmd } - -func CmdListPendingNonces() *cobra.Command { - cmd := &cobra.Command{ - Use: "list-pending-nonces", - Short: "shows a chainNonces", - Args: cobra.NoArgs, - RunE: func(cmd *cobra.Command, args []string) error { - clientCtx := client.GetClientContextFromCmd(cmd) - - queryClient := types.NewQueryClient(clientCtx) - - params := &types.QueryAllPendingNoncesRequest{} - - res, err := queryClient.PendingNoncesAll(context.Background(), params) - if err != nil { - return err - } - - return clientCtx.PrintProto(res) - }, - } - - flags.AddQueryFlagsToCmd(cmd) - - return cmd -} diff --git a/x/observer/client/cli/cli_keygen.go b/x/observer/client/cli/query_keygen.go similarity index 100% rename from x/observer/client/cli/cli_keygen.go rename to x/observer/client/cli/query_keygen.go diff --git a/x/observer/client/cli/cli_node_account.go b/x/observer/client/cli/query_node_account.go similarity index 100% rename from x/observer/client/cli/cli_node_account.go rename to x/observer/client/cli/query_node_account.go diff --git a/x/observer/client/cli/query_pending_nonces.go b/x/observer/client/cli/query_pending_nonces.go new file mode 100644 index 0000000000..0afff149fd --- /dev/null +++ b/x/observer/client/cli/query_pending_nonces.go @@ -0,0 +1,36 @@ +package cli + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/spf13/cobra" + "github.com/zeta-chain/zetacore/x/observer/types" +) + +func CmdListPendingNonces() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-pending-nonces", + Short: "shows a chainNonces", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryAllPendingNoncesRequest{} + + res, err := queryClient.PendingNoncesAll(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/observer/client/cli/query_supported_chains.go b/x/observer/client/cli/query_supported_chains.go new file mode 100644 index 0000000000..b4c0181d8c --- /dev/null +++ b/x/observer/client/cli/query_supported_chains.go @@ -0,0 +1,36 @@ +package cli + +import ( + "context" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/spf13/cobra" + "github.com/zeta-chain/zetacore/x/observer/types" +) + +func CmdGetSupportedChains() *cobra.Command { + cmd := &cobra.Command{ + Use: "list-chains", + Short: "list all SupportedChains", + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx := client.GetClientContextFromCmd(cmd) + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QuerySupportedChains{} + + res, err := queryClient.SupportedChains(context.Background(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddPaginationFlagsToCmd(cmd, cmd.Use) + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/observer/client/cli/cli_tss.go b/x/observer/client/cli/query_tss.go similarity index 96% rename from x/observer/client/cli/cli_tss.go rename to x/observer/client/cli/query_tss.go index 84c251dbe7..865303d423 100644 --- a/x/observer/client/cli/cli_tss.go +++ b/x/observer/client/cli/query_tss.go @@ -60,5 +60,3 @@ func CmdListTssHistory() *cobra.Command { return cmd } - -// Transaction CLI ///////////////////////// diff --git a/x/crosschain/client/querytests/chain_nonces.go b/x/observer/client/querytests/chain_nonces.go similarity index 93% rename from x/crosschain/client/querytests/chain_nonces.go rename to x/observer/client/querytests/chain_nonces.go index 0e42078974..03175365a3 100644 --- a/x/crosschain/client/querytests/chain_nonces.go +++ b/x/observer/client/querytests/chain_nonces.go @@ -6,15 +6,15 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/zeta-chain/zetacore/x/crosschain/client/cli" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/zetacore/x/observer/client/cli" + "github.com/zeta-chain/zetacore/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) func (s *CliTestSuite) TestShowChainNonces() { ctx := s.network.Validators[0].ClientCtx - objs := s.crosschainState.ChainNoncesList + objs := s.observerState.ChainNonces common := []string{ fmt.Sprintf("--%s=json", tmcli.OutputFlag), } @@ -23,7 +23,7 @@ func (s *CliTestSuite) TestShowChainNonces() { id string args []string err error - obj *types.ChainNonces + obj types.ChainNonces }{ { desc: "found", @@ -60,7 +60,7 @@ func (s *CliTestSuite) TestShowChainNonces() { func (s *CliTestSuite) TestListChainNonces() { ctx := s.network.Validators[0].ClientCtx - objs := s.crosschainState.ChainNoncesList + objs := s.observerState.ChainNonces request := func(next []byte, offset, limit uint64, total bool) []string { args := []string{ fmt.Sprintf("--%s=json", tmcli.OutputFlag), diff --git a/x/observer/client/querytests/suite.go b/x/observer/client/querytests/suite.go index cbaa7a2a9e..344819c890 100644 --- a/x/observer/client/querytests/suite.go +++ b/x/observer/client/querytests/suite.go @@ -44,7 +44,7 @@ func (s *CliTestSuite) SetupSuite() { } network.SetupZetaGenesisState(s.T(), s.cfg.GenesisState, s.cfg.Codec, observerList, false) s.crosschainState = network.AddCrosschainData(s.T(), 2, s.cfg.GenesisState, s.cfg.Codec) - s.observerState = network.AddObserverData(s.T(), s.cfg.GenesisState, s.cfg.Codec, nil) + s.observerState = network.AddObserverData(s.T(), 2, s.cfg.GenesisState, s.cfg.Codec, nil) net, err := network.New(s.T(), app.NodeDir, s.cfg) s.Assert().NoError(err) s.network = net diff --git a/x/observer/genesis.go b/x/observer/genesis.go index 1cd3e97ecd..ce13a5e902 100644 --- a/x/observer/genesis.go +++ b/x/observer/genesis.go @@ -2,6 +2,7 @@ package observer import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/zetacore/common" "github.com/zeta-chain/zetacore/x/observer/keeper" "github.com/zeta-chain/zetacore/x/observer/types" ) @@ -84,8 +85,20 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) } if genState.Tss != nil { - k.SetTSS(ctx, *genState.Tss) + tss := *genState.Tss + k.SetTSS(ctx, tss) + for _, chain := range common.DefaultChainsList() { + k.SetPendingNonces(ctx, types.PendingNonces{ + NonceLow: 0, + NonceHigh: 0, + ChainId: chain.ChainId, + Tss: tss.TssPubkey, + }) + } } + + // Get all chain nonces + for _, elem := range genState.TssHistory { k.SetTSSHistory(ctx, elem) } @@ -98,6 +111,17 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) k.SetBlame(ctx, elem) } + // Set all the pending nonces + for _, pendingNonce := range genState.PendingNonces { + k.SetPendingNonces(ctx, pendingNonce) + } + for _, chainNonce := range genState.ChainNonces { + k.SetChainNonces(ctx, chainNonce) + } + for _, elem := range genState.NonceToCctx { + k.SetNonceToCctx(ctx, elem) + } + } // ExportGenesis returns the observer module's exported genesis. @@ -143,9 +167,11 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState { tss = &t } - tssHistory := k.GetAllTSS(ctx) - fundMigrators := k.GetAllTssFundMigrators(ctx) - blameRecords := k.GetAllBlame(ctx) + var pendingNonces []types.PendingNonces + p, err := k.GetAllPendingNonces(ctx) + if err == nil { + pendingNonces = p + } return &types.GenesisState{ Ballots: k.GetAllBallots(ctx), Observers: k.GetAllObserverMappers(ctx), @@ -156,8 +182,11 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState { Keygen: kn, LastObserverCount: oc, Tss: tss, - TssHistory: tssHistory, - TssFundMigrators: fundMigrators, - BlameList: blameRecords, + PendingNonces: pendingNonces, + TssHistory: k.GetAllTSS(ctx), + TssFundMigrators: k.GetAllTssFundMigrators(ctx), + BlameList: k.GetAllBlame(ctx), + ChainNonces: k.GetAllChainNonces(ctx), + NonceToCctx: k.GetAllNonceToCctx(ctx), } } diff --git a/x/observer/genesis_test.go b/x/observer/genesis_test.go index 575906ffe2..10b2cdbd1b 100644 --- a/x/observer/genesis_test.go +++ b/x/observer/genesis_test.go @@ -38,6 +38,13 @@ func TestGenesis(t *testing.T) { LastObserverCount: sample.LastObserverCount(1000), CoreParamsList: sample.CoreParamsList(), TssFundMigrators: []types.TssFundMigratorInfo{sample.TssFundsMigrator(1), sample.TssFundsMigrator(2)}, + ChainNonces: []types.ChainNonces{ + sample.ChainNonces(t, "0"), + sample.ChainNonces(t, "1"), + sample.ChainNonces(t, "2"), + }, + PendingNonces: sample.PendingNoncesList(t, "sample", 20), + NonceToCctx: sample.NonceToCctxList(t, "sample", 20), } // Init and export diff --git a/x/observer/keeper/chain_nonces.go b/x/observer/keeper/chain_nonces.go new file mode 100644 index 0000000000..cf386545d0 --- /dev/null +++ b/x/observer/keeper/chain_nonces.go @@ -0,0 +1,52 @@ +package keeper + +import ( + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/zetacore/x/observer/types" +) + +// ChainNonces methods +// The object stores the current nonce for the chain + +// SetChainNonces set a specific chainNonces in the store from its index +func (k Keeper) SetChainNonces(ctx sdk.Context, chainNonces types.ChainNonces) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.ChainNoncesKey)) + b := k.cdc.MustMarshal(&chainNonces) + store.Set(types.KeyPrefix(chainNonces.Index), b) +} + +// GetChainNonces returns a chainNonces from its index +func (k Keeper) GetChainNonces(ctx sdk.Context, index string) (val types.ChainNonces, found bool) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.ChainNoncesKey)) + + b := store.Get(types.KeyPrefix(index)) + if b == nil { + return val, false + } + + k.cdc.MustUnmarshal(b, &val) + return val, true +} + +// RemoveChainNonces removes a chainNonces from the store +func (k Keeper) RemoveChainNonces(ctx sdk.Context, index string) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.ChainNoncesKey)) + store.Delete(types.KeyPrefix(index)) +} + +// GetAllChainNonces returns all chainNonces +func (k Keeper) GetAllChainNonces(ctx sdk.Context) (list []types.ChainNonces) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.ChainNoncesKey)) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + + for ; iterator.Valid(); iterator.Next() { + var val types.ChainNonces + k.cdc.MustUnmarshal(iterator.Value(), &val) + list = append(list, val) + } + + return +} diff --git a/x/observer/keeper/chain_nonces_test.go b/x/observer/keeper/chain_nonces_test.go new file mode 100644 index 0000000000..0c511d3f79 --- /dev/null +++ b/x/observer/keeper/chain_nonces_test.go @@ -0,0 +1,42 @@ +package keeper_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + keepertest "github.com/zeta-chain/zetacore/testutil/keeper" + "github.com/zeta-chain/zetacore/testutil/sample" +) + +func TestKeeper_GetChainNonces(t *testing.T) { + t.Run("Get chain nonces", func(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + chainNoncesList := sample.ChainNoncesList(t, 10) + for _, n := range chainNoncesList { + k.SetChainNonces(ctx, n) + } + for _, n := range chainNoncesList { + rst, found := k.GetChainNonces(ctx, n.Index) + require.True(t, found) + require.Equal(t, n, rst) + } + }) + t.Run("Get chain nonces not found", func(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + chainNoncesList := sample.ChainNoncesList(t, 10) + for _, n := range chainNoncesList { + k.SetChainNonces(ctx, n) + } + _, found := k.GetChainNonces(ctx, "not_found") + require.False(t, found) + }) + t.Run("Get all chain nonces", func(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + chainNoncesList := sample.ChainNoncesList(t, 10) + for _, n := range chainNoncesList { + k.SetChainNonces(ctx, n) + } + rst := k.GetAllChainNonces(ctx) + require.Equal(t, chainNoncesList, rst) + }) +} diff --git a/x/crosschain/keeper/grpc_query_nonces.go b/x/observer/keeper/grpc_query_nonces.go similarity index 91% rename from x/crosschain/keeper/grpc_query_nonces.go rename to x/observer/keeper/grpc_query_nonces.go index de417f5e28..7c0b6d481a 100644 --- a/x/crosschain/keeper/grpc_query_nonces.go +++ b/x/observer/keeper/grpc_query_nonces.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/zeta-chain/zetacore/x/crosschain/types" + "github.com/zeta-chain/zetacore/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -19,7 +19,7 @@ func (k Keeper) ChainNoncesAll(c context.Context, req *types.QueryAllChainNonces return nil, status.Error(codes.InvalidArgument, "invalid request") } - var chainNoncess []*types.ChainNonces + var chainNoncess []types.ChainNonces ctx := sdk.UnwrapSDKContext(c) store := ctx.KVStore(k.storeKey) @@ -31,7 +31,7 @@ func (k Keeper) ChainNoncesAll(c context.Context, req *types.QueryAllChainNonces return err } - chainNoncess = append(chainNoncess, &chainNonces) + chainNoncess = append(chainNoncess, chainNonces) return nil }) @@ -53,7 +53,7 @@ func (k Keeper) ChainNonces(c context.Context, req *types.QueryGetChainNoncesReq return nil, status.Error(codes.InvalidArgument, "not found") } - return &types.QueryGetChainNoncesResponse{ChainNonces: &val}, nil + return &types.QueryGetChainNoncesResponse{ChainNonces: val}, nil } // Pending nonces queries @@ -80,7 +80,7 @@ func (k Keeper) PendingNoncesByChain(c context.Context, req *types.QueryPendingN } ctx := sdk.UnwrapSDKContext(c) - tss, found := k.zetaObserverKeeper.GetTSS(ctx) + tss, found := k.GetTSS(ctx) if !found { return nil, status.Error(codes.NotFound, "tss not found") } diff --git a/x/crosschain/keeper/grpc_query_nonces_test.go b/x/observer/keeper/grpc_query_nonces_test.go similarity index 54% rename from x/crosschain/keeper/grpc_query_nonces_test.go rename to x/observer/keeper/grpc_query_nonces_test.go index 1fa725639a..584f237e7b 100644 --- a/x/crosschain/keeper/grpc_query_nonces_test.go +++ b/x/observer/keeper/grpc_query_nonces_test.go @@ -1,4 +1,4 @@ -package keeper +package keeper_test import ( "testing" @@ -7,15 +7,20 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/zeta-chain/zetacore/x/crosschain/types" + keepertest "github.com/zeta-chain/zetacore/testutil/keeper" + "github.com/zeta-chain/zetacore/testutil/sample" + "github.com/zeta-chain/zetacore/x/observer/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) func TestChainNoncesQuerySingle(t *testing.T) { - keeper, ctx := setupKeeper(t) + k, ctx := keepertest.ObserverKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNChainNonces(keeper, ctx, 2) + chainNonces := sample.ChainNoncesList(t, 2) + for _, nonce := range chainNonces { + k.SetChainNonces(ctx, nonce) + } for _, tc := range []struct { desc string request *types.QueryGetChainNoncesRequest @@ -24,13 +29,13 @@ func TestChainNoncesQuerySingle(t *testing.T) { }{ { desc: "First", - request: &types.QueryGetChainNoncesRequest{Index: msgs[0].Index}, - response: &types.QueryGetChainNoncesResponse{ChainNonces: &msgs[0]}, + request: &types.QueryGetChainNoncesRequest{Index: chainNonces[0].Index}, + response: &types.QueryGetChainNoncesResponse{ChainNonces: chainNonces[0]}, }, { desc: "Second", - request: &types.QueryGetChainNoncesRequest{Index: msgs[1].Index}, - response: &types.QueryGetChainNoncesResponse{ChainNonces: &msgs[1]}, + request: &types.QueryGetChainNoncesRequest{Index: chainNonces[1].Index}, + response: &types.QueryGetChainNoncesResponse{ChainNonces: chainNonces[1]}, }, { desc: "KeyNotFound", @@ -44,7 +49,7 @@ func TestChainNoncesQuerySingle(t *testing.T) { } { tc := tc t.Run(tc.desc, func(t *testing.T) { - response, err := keeper.ChainNonces(wctx, tc.request) + response, err := k.ChainNonces(wctx, tc.request) if tc.err != nil { require.ErrorIs(t, err, tc.err) } else { @@ -55,9 +60,12 @@ func TestChainNoncesQuerySingle(t *testing.T) { } func TestChainNoncesQueryPaginated(t *testing.T) { - keeper, ctx := setupKeeper(t) + k, ctx := keepertest.ObserverKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNChainNonces(keeper, ctx, 5) + chainNonces := sample.ChainNoncesList(t, 5) + for _, nonce := range chainNonces { + k.SetChainNonces(ctx, nonce) + } request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllChainNoncesRequest { return &types.QueryAllChainNoncesRequest{ @@ -71,33 +79,33 @@ func TestChainNoncesQueryPaginated(t *testing.T) { } t.Run("ByOffset", func(t *testing.T) { step := 2 - for i := 0; i < len(msgs); i += step { - resp, err := keeper.ChainNoncesAll(wctx, request(nil, uint64(i), uint64(step), false)) + for i := 0; i < len(chainNonces); i += step { + resp, err := k.ChainNoncesAll(wctx, request(nil, uint64(i), uint64(step), false)) require.NoError(t, err) - for j := i; j < len(msgs) && j < i+step; j++ { - assert.Equal(t, &msgs[j], resp.ChainNonces[j-i]) + for j := i; j < len(chainNonces) && j < i+step; j++ { + assert.Equal(t, chainNonces[j], resp.ChainNonces[j-i]) } } }) t.Run("ByKey", func(t *testing.T) { step := 2 var next []byte - for i := 0; i < len(msgs); i += step { - resp, err := keeper.ChainNoncesAll(wctx, request(next, 0, uint64(step), false)) + for i := 0; i < len(chainNonces); i += step { + resp, err := k.ChainNoncesAll(wctx, request(next, 0, uint64(step), false)) require.NoError(t, err) - for j := i; j < len(msgs) && j < i+step; j++ { - assert.Equal(t, &msgs[j], resp.ChainNonces[j-i]) + for j := i; j < len(chainNonces) && j < i+step; j++ { + assert.Equal(t, chainNonces[j], resp.ChainNonces[j-i]) } next = resp.Pagination.NextKey } }) t.Run("Total", func(t *testing.T) { - resp, err := keeper.ChainNoncesAll(wctx, request(nil, 0, 0, true)) + resp, err := k.ChainNoncesAll(wctx, request(nil, 0, 0, true)) require.NoError(t, err) - require.Equal(t, len(msgs), int(resp.Pagination.Total)) + require.Equal(t, len(chainNonces), int(resp.Pagination.Total)) }) t.Run("InvalidRequest", func(t *testing.T) { - _, err := keeper.ChainNoncesAll(wctx, nil) + _, err := k.ChainNoncesAll(wctx, nil) require.ErrorIs(t, err, status.Error(codes.InvalidArgument, "invalid request")) }) } diff --git a/x/observer/keeper/nonce_to_cctx.go b/x/observer/keeper/nonce_to_cctx.go new file mode 100644 index 0000000000..6ecedd22ea --- /dev/null +++ b/x/observer/keeper/nonce_to_cctx.go @@ -0,0 +1,53 @@ +package keeper + +import ( + "fmt" + + "github.com/cosmos/cosmos-sdk/store/prefix" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/zeta-chain/zetacore/x/observer/types" +) + +// NonceToCctx methods +// The object stores the mapping from nonce to cross chain tx + +func (k Keeper) RemoveNonceToCctx(ctx sdk.Context, nonceToCctx types.NonceToCctx) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.NonceToCctxKeyPrefix)) + store.Delete(types.KeyPrefix(fmt.Sprintf("%s-%d-%d", nonceToCctx.Tss, nonceToCctx.ChainId, nonceToCctx.Nonce))) +} + +func (k Keeper) SetNonceToCctx(ctx sdk.Context, nonceToCctx types.NonceToCctx) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.NonceToCctxKeyPrefix)) + b := k.cdc.MustMarshal(&nonceToCctx) + store.Set(types.KeyPrefix(fmt.Sprintf("%s-%d-%d", nonceToCctx.Tss, nonceToCctx.ChainId, nonceToCctx.Nonce)), b) +} + +func (k Keeper) GetNonceToCctx(ctx sdk.Context, tss string, chainID int64, nonce int64) (val types.NonceToCctx, found bool) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.NonceToCctxKeyPrefix)) + + b := store.Get(types.KeyPrefix(fmt.Sprintf("%s-%d-%d", tss, chainID, nonce))) + if b == nil { + return val, false + } + + k.cdc.MustUnmarshal(b, &val) + return val, true +} + +func (k Keeper) GetAllNonceToCctx(ctx sdk.Context) (list []types.NonceToCctx) { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.NonceToCctxKeyPrefix)) + iterator := sdk.KVStorePrefixIterator(store, []byte{}) + + defer iterator.Close() + for ; iterator.Valid(); iterator.Next() { + var val types.NonceToCctx + err := k.cdc.Unmarshal(iterator.Value(), &val) + if err == nil { + list = append(list, val) + } + + } + + return + +} diff --git a/x/observer/keeper/nonce_to_cctx_test.go b/x/observer/keeper/nonce_to_cctx_test.go new file mode 100644 index 0000000000..1cbd023fbd --- /dev/null +++ b/x/observer/keeper/nonce_to_cctx_test.go @@ -0,0 +1,42 @@ +package keeper_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + keepertest "github.com/zeta-chain/zetacore/testutil/keeper" + "github.com/zeta-chain/zetacore/testutil/sample" +) + +func TestKeeper_GetNonceToCctx(t *testing.T) { + t.Run("Get nonce to cctx", func(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + nonceToCctxList := sample.NonceToCctxList(t, "sample", 1) + for _, n := range nonceToCctxList { + k.SetNonceToCctx(ctx, n) + } + for _, n := range nonceToCctxList { + rst, found := k.GetNonceToCctx(ctx, n.Tss, n.ChainId, n.Nonce) + require.True(t, found) + require.Equal(t, n, rst) + } + }) + t.Run("Get nonce to cctx not found", func(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + nonceToCctxList := sample.NonceToCctxList(t, "sample", 1) + for _, n := range nonceToCctxList { + k.SetNonceToCctx(ctx, n) + } + _, found := k.GetNonceToCctx(ctx, "not_found", 1, 1) + require.False(t, found) + }) + t.Run("Get all nonce to cctx", func(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + nonceToCctxList := sample.NonceToCctxList(t, "sample", 10) + for _, n := range nonceToCctxList { + k.SetNonceToCctx(ctx, n) + } + rst := k.GetAllNonceToCctx(ctx) + require.Equal(t, nonceToCctxList, rst) + }) +} diff --git a/x/observer/keeper/nonces_test.go b/x/observer/keeper/nonces_test.go new file mode 100644 index 0000000000..2e201ae67e --- /dev/null +++ b/x/observer/keeper/nonces_test.go @@ -0,0 +1,43 @@ +package keeper_test + +import ( + "testing" + + "github.com/stretchr/testify/assert" + keepertest "github.com/zeta-chain/zetacore/testutil/keeper" + "github.com/zeta-chain/zetacore/testutil/sample" +) + +func TestChainNoncesGet(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + items := sample.ChainNoncesList(t, 10) + for _, item := range items { + k.SetChainNonces(ctx, item) + } + for _, item := range items { + rst, found := k.GetChainNonces(ctx, item.Index) + assert.True(t, found) + assert.Equal(t, item, rst) + } +} +func TestChainNoncesRemove(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + items := sample.ChainNoncesList(t, 10) + for _, item := range items { + k.SetChainNonces(ctx, item) + } + for _, item := range items { + k.RemoveChainNonces(ctx, item.Index) + _, found := k.GetChainNonces(ctx, item.Index) + assert.False(t, found) + } +} + +func TestChainNoncesGetAll(t *testing.T) { + k, ctx := keepertest.ObserverKeeper(t) + items := sample.ChainNoncesList(t, 10) + for _, item := range items { + k.SetChainNonces(ctx, item) + } + assert.Equal(t, items, k.GetAllChainNonces(ctx)) +} diff --git a/x/crosschain/keeper/pending_nonces.go b/x/observer/keeper/pending_nonces.go similarity index 51% rename from x/crosschain/keeper/pending_nonces.go rename to x/observer/keeper/pending_nonces.go index e75a45fb73..6ab5b61ca4 100644 --- a/x/crosschain/keeper/pending_nonces.go +++ b/x/observer/keeper/pending_nonces.go @@ -6,81 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/zeta-chain/zetacore/x/crosschain/types" - observerTypes "github.com/zeta-chain/zetacore/x/observer/types" + "github.com/zeta-chain/zetacore/x/observer/types" ) -// ChainNonces methods -// The object stores the current nonce for the chain - -// SetChainNonces set a specific chainNonces in the store from its index -func (k Keeper) SetChainNonces(ctx sdk.Context, chainNonces types.ChainNonces) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.ChainNoncesKey)) - b := k.cdc.MustMarshal(&chainNonces) - store.Set(types.KeyPrefix(chainNonces.Index), b) -} - -// GetChainNonces returns a chainNonces from its index -func (k Keeper) GetChainNonces(ctx sdk.Context, index string) (val types.ChainNonces, found bool) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.ChainNoncesKey)) - - b := store.Get(types.KeyPrefix(index)) - if b == nil { - return val, false - } - - k.cdc.MustUnmarshal(b, &val) - return val, true -} - -// RemoveChainNonces removes a chainNonces from the store -func (k Keeper) RemoveChainNonces(ctx sdk.Context, index string) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.ChainNoncesKey)) - store.Delete(types.KeyPrefix(index)) -} - -// GetAllChainNonces returns all chainNonces -func (k Keeper) GetAllChainNonces(ctx sdk.Context) (list []types.ChainNonces) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.ChainNoncesKey)) - iterator := sdk.KVStorePrefixIterator(store, []byte{}) - - defer iterator.Close() - - for ; iterator.Valid(); iterator.Next() { - var val types.ChainNonces - k.cdc.MustUnmarshal(iterator.Value(), &val) - list = append(list, val) - } - - return -} - -// NonceToCctx methods -// The object stores the mapping from nonce to cross chain tx - -func (k Keeper) SetNonceToCctx(ctx sdk.Context, nonceToCctx types.NonceToCctx) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.NonceToCctxKeyPrefix)) - b := k.cdc.MustMarshal(&nonceToCctx) - store.Set(types.KeyPrefix(fmt.Sprintf("%s-%d-%d", nonceToCctx.Tss, nonceToCctx.ChainId, nonceToCctx.Nonce)), b) -} - -func (k Keeper) GetNonceToCctx(ctx sdk.Context, tss string, chainID int64, nonce int64) (val types.NonceToCctx, found bool) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.NonceToCctxKeyPrefix)) - - b := store.Get(types.KeyPrefix(fmt.Sprintf("%s-%d-%d", tss, chainID, nonce))) - if b == nil { - return val, false - } - - k.cdc.MustUnmarshal(b, &val) - return val, true -} - -func (k Keeper) RemoveNonceToCctx(ctx sdk.Context, nonceToCctx types.NonceToCctx) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.NonceToCctxKeyPrefix)) - store.Delete(types.KeyPrefix(fmt.Sprintf("%s-%d-%d", nonceToCctx.Tss, nonceToCctx.ChainId, nonceToCctx.Nonce))) -} - // PendingNonces methods // The object stores the pending nonces for the chain @@ -150,10 +78,10 @@ func (k Keeper) RemoveFromPendingNonces(ctx sdk.Context, tssPubkey string, chain } } -func (k Keeper) SetTssAndUpdateNonce(ctx sdk.Context, tss observerTypes.TSS) { - k.zetaObserverKeeper.SetTSS(ctx, tss) +func (k Keeper) SetTssAndUpdateNonce(ctx sdk.Context, tss types.TSS) { + k.SetTSS(ctx, tss) // initialize the nonces and pending nonces of all enabled chains - supportedChains := k.zetaObserverKeeper.GetParams(ctx).GetSupportedChains() + supportedChains := k.GetParams(ctx).GetSupportedChains() for _, chain := range supportedChains { chainNonce := types.ChainNonces{ Index: chain.ChainName.String(), diff --git a/x/crosschain/keeper/pending_nonces_test.go b/x/observer/keeper/pending_nonces_test.go similarity index 93% rename from x/crosschain/keeper/pending_nonces_test.go rename to x/observer/keeper/pending_nonces_test.go index 7425bfe5fa..0cb61f090d 100644 --- a/x/crosschain/keeper/pending_nonces_test.go +++ b/x/observer/keeper/pending_nonces_test.go @@ -12,7 +12,7 @@ import ( func TestKeeper_PendingNoncesAll(t *testing.T) { t.Run("Get all pending nonces paginated by limit", func(t *testing.T) { - k, ctx, _, _ := keepertest.CrosschainKeeper(t) + k, ctx := keepertest.ObserverKeeper(t) nonces := sample.PendingNoncesList(t, "sample", 10) sort.SliceStable(nonces, func(i, j int) bool { return nonces[i].ChainId < nonces[j].ChainId @@ -29,7 +29,7 @@ func TestKeeper_PendingNoncesAll(t *testing.T) { require.Equal(t, len(nonces), int(pageRes.Total)) }) t.Run("Get all pending nonces paginated by offset", func(t *testing.T) { - k, ctx, _, _ := keepertest.CrosschainKeeper(t) + k, ctx := keepertest.ObserverKeeper(t) nonces := sample.PendingNoncesList(t, "sample", 42) sort.SliceStable(nonces, func(i, j int) bool { return nonces[i].ChainId < nonces[j].ChainId @@ -48,7 +48,7 @@ func TestKeeper_PendingNoncesAll(t *testing.T) { require.Equal(t, len(nonces), int(pageRes.Total)) }) t.Run("Get all pending nonces ", func(t *testing.T) { - k, ctx, _, _ := keepertest.CrosschainKeeper(t) + k, ctx := keepertest.ObserverKeeper(t) nonces := sample.PendingNoncesList(t, "sample", 10) sort.SliceStable(nonces, func(i, j int) bool { return nonces[i].ChainId < nonces[j].ChainId diff --git a/x/crosschain/types/chain_nonces.pb.go b/x/observer/types/chain_nonces.pb.go similarity index 84% rename from x/crosschain/types/chain_nonces.pb.go rename to x/observer/types/chain_nonces.pb.go index 9fea4ec405..47ea34bda2 100644 --- a/x/crosschain/types/chain_nonces.pb.go +++ b/x/observer/types/chain_nonces.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: crosschain/chain_nonces.proto +// source: observer/chain_nonces.proto package types @@ -11,6 +11,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/gogo/protobuf/proto" + _ "github.com/zeta-chain/zetacore/common" ) // Reference imports to suppress errors if they are not otherwise used. @@ -37,7 +38,7 @@ func (m *ChainNonces) Reset() { *m = ChainNonces{} } func (m *ChainNonces) String() string { return proto.CompactTextString(m) } func (*ChainNonces) ProtoMessage() {} func (*ChainNonces) Descriptor() ([]byte, []int) { - return fileDescriptor_c2dddd7805d88f2e, []int{0} + return fileDescriptor_a4a180ef3ffea001, []int{0} } func (m *ChainNonces) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -109,30 +110,31 @@ func (m *ChainNonces) GetFinalizedHeight() uint64 { } func init() { - proto.RegisterType((*ChainNonces)(nil), "zetachain.zetacore.crosschain.ChainNonces") + proto.RegisterType((*ChainNonces)(nil), "zetachain.zetacore.observer.ChainNonces") } -func init() { proto.RegisterFile("crosschain/chain_nonces.proto", fileDescriptor_c2dddd7805d88f2e) } +func init() { proto.RegisterFile("observer/chain_nonces.proto", fileDescriptor_a4a180ef3ffea001) } -var fileDescriptor_c2dddd7805d88f2e = []byte{ - // 266 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4d, 0x2e, 0xca, 0x2f, - 0x2e, 0x4e, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0x93, 0xf1, 0x79, 0xf9, 0x79, 0xc9, 0xa9, 0xc5, - 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xb2, 0x55, 0xa9, 0x25, 0x89, 0x60, 0x71, 0x3d, 0x30, - 0x2b, 0xbf, 0x28, 0x55, 0x0f, 0xa1, 0x43, 0x4a, 0x24, 0x3d, 0x3f, 0x3d, 0x1f, 0xac, 0x52, 0x1f, - 0xc4, 0x82, 0x68, 0x52, 0xda, 0xc4, 0xc8, 0xc5, 0xed, 0x0c, 0x92, 0xf7, 0x03, 0x1b, 0x25, 0x24, - 0xc1, 0xc5, 0x9e, 0x5c, 0x94, 0x9a, 0x58, 0x92, 0x5f, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, - 0x04, 0xe3, 0x0a, 0x89, 0x70, 0xb1, 0x66, 0xe6, 0xa5, 0xa4, 0x56, 0x48, 0x30, 0x81, 0xc5, 0x21, - 0x1c, 0x21, 0x49, 0x2e, 0x0e, 0x88, 0x53, 0x32, 0x53, 0x24, 0x98, 0x15, 0x18, 0x35, 0x98, 0x83, - 0xd8, 0xc1, 0x7c, 0xcf, 0x14, 0x90, 0x06, 0xb0, 0xfb, 0x24, 0x58, 0x14, 0x18, 0x35, 0x58, 0x82, - 0x20, 0x1c, 0x90, 0x05, 0xc5, 0x99, 0xe9, 0x79, 0xa9, 0x45, 0xc5, 0x12, 0xac, 0x0a, 0xcc, 0x20, - 0x0b, 0xa0, 0x5c, 0x21, 0x0d, 0x2e, 0xfe, 0xb4, 0xcc, 0xbc, 0xc4, 0x9c, 0xcc, 0xaa, 0xd4, 0x14, - 0x8f, 0xd4, 0xcc, 0xf4, 0x8c, 0x12, 0x09, 0x36, 0xb0, 0x4e, 0x74, 0x61, 0x27, 0xef, 0x13, 0x8f, - 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, - 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, - 0x4b, 0xce, 0xcf, 0xd5, 0x07, 0x05, 0x82, 0x2e, 0x24, 0xb4, 0x60, 0xe1, 0xa1, 0x5f, 0xa1, 0x8f, - 0x14, 0x86, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x80, 0x30, 0x06, 0x04, 0x00, 0x00, - 0xff, 0xff, 0x69, 0x96, 0x2f, 0x81, 0x5e, 0x01, 0x00, 0x00, +var fileDescriptor_a4a180ef3ffea001 = []byte{ + // 276 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xbd, 0x4e, 0xc3, 0x30, + 0x14, 0x85, 0x6b, 0xd2, 0x1f, 0x30, 0x03, 0x52, 0xe8, 0x60, 0x5a, 0xc9, 0x8a, 0x98, 0xb2, 0x10, + 0x0f, 0xbc, 0x01, 0x2c, 0x74, 0x61, 0xc8, 0xc8, 0x82, 0xf2, 0x73, 0x49, 0x2c, 0x11, 0xdf, 0xca, + 0x36, 0xa8, 0xf4, 0x29, 0x78, 0x16, 0x9e, 0x82, 0xb1, 0x23, 0x23, 0x4a, 0x5e, 0x04, 0xd9, 0x26, + 0x0c, 0x4c, 0xbe, 0xdf, 0x91, 0xcf, 0xbd, 0x47, 0x87, 0xae, 0xb1, 0x34, 0xa0, 0x5f, 0x41, 0x8b, + 0xaa, 0x2d, 0xa4, 0x7a, 0x54, 0xa8, 0x2a, 0x30, 0xd9, 0x56, 0xa3, 0xc5, 0x78, 0xbd, 0x07, 0x5b, + 0x78, 0x3d, 0xf3, 0x13, 0x6a, 0xc8, 0xc6, 0xff, 0xab, 0xf3, 0x0a, 0xbb, 0x0e, 0x95, 0x08, 0x4f, + 0x70, 0xac, 0x96, 0x0d, 0x36, 0xe8, 0x47, 0xe1, 0xa6, 0xa0, 0x5e, 0x7e, 0x10, 0x7a, 0x7a, 0xeb, + 0xd6, 0xdc, 0xfb, 0xed, 0x31, 0xa3, 0x8b, 0x4a, 0x43, 0x61, 0x51, 0x33, 0x92, 0x90, 0xf4, 0x24, + 0x1f, 0x31, 0x5e, 0xd2, 0x99, 0x54, 0x35, 0xec, 0xd8, 0x91, 0xd7, 0x03, 0xc4, 0x17, 0xf4, 0x38, + 0xa4, 0x93, 0x35, 0x8b, 0x12, 0x92, 0x46, 0xf9, 0xc2, 0xf3, 0xa6, 0x76, 0x06, 0x1f, 0x99, 0x4d, + 0x13, 0x92, 0x4e, 0xf3, 0x00, 0xee, 0x80, 0x91, 0x8d, 0x02, 0x6d, 0xd8, 0x2c, 0x89, 0xdc, 0x81, + 0x5f, 0x8c, 0x53, 0x7a, 0xf6, 0x24, 0x55, 0xf1, 0x2c, 0xf7, 0x50, 0xdf, 0x81, 0x6c, 0x5a, 0xcb, + 0xe6, 0xde, 0xf9, 0x5f, 0xbe, 0xd9, 0x7c, 0xf6, 0x9c, 0x1c, 0x7a, 0x4e, 0xbe, 0x7b, 0x4e, 0xde, + 0x07, 0x3e, 0x39, 0x0c, 0x7c, 0xf2, 0x35, 0xf0, 0xc9, 0x83, 0x68, 0xa4, 0x6d, 0x5f, 0xca, 0xac, + 0xc2, 0x4e, 0xb8, 0x5e, 0xae, 0x7c, 0x18, 0x31, 0x56, 0x24, 0x76, 0xe2, 0xaf, 0x54, 0xfb, 0xb6, + 0x05, 0x53, 0xce, 0x7d, 0x0d, 0xd7, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x24, 0x62, 0xd5, + 0x6d, 0x01, 0x00, 0x00, } func (m *ChainNonces) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/genesis.go b/x/observer/types/genesis.go index f5b2106b54..918636794c 100644 --- a/x/observer/types/genesis.go +++ b/x/observer/types/genesis.go @@ -18,6 +18,7 @@ func DefaultGenesis() *GenesisState { CrosschainFlags: &CrosschainFlags{IsInboundEnabled: true, IsOutboundEnabled: true}, Keygen: nil, LastObserverCount: nil, + ChainNonces: []ChainNonces{}, } } @@ -44,6 +45,16 @@ func (gs GenesisState) Validate() error { return err } + // Check for duplicated index in chainNonces + chainNoncesIndexMap := make(map[string]bool) + + for _, elem := range gs.ChainNonces { + if _, ok := chainNoncesIndexMap[elem.Index]; ok { + return fmt.Errorf("duplicated index for chainNonces") + } + chainNoncesIndexMap[elem.Index] = true + } + return VerifyObserverMapper(gs.Observers) } diff --git a/x/observer/types/genesis.pb.go b/x/observer/types/genesis.pb.go index 10ca1db4a8..1f55b9fdb7 100644 --- a/x/observer/types/genesis.pb.go +++ b/x/observer/types/genesis.pb.go @@ -37,6 +37,9 @@ type GenesisState struct { TssHistory []TSS `protobuf:"bytes,10,rep,name=tss_history,json=tssHistory,proto3" json:"tss_history"` TssFundMigrators []TssFundMigratorInfo `protobuf:"bytes,11,rep,name=tss_fund_migrators,json=tssFundMigrators,proto3" json:"tss_fund_migrators"` BlameList []Blame `protobuf:"bytes,12,rep,name=blame_list,json=blameList,proto3" json:"blame_list"` + PendingNonces []PendingNonces `protobuf:"bytes,13,rep,name=pending_nonces,json=pendingNonces,proto3" json:"pending_nonces"` + ChainNonces []ChainNonces `protobuf:"bytes,14,rep,name=chain_nonces,json=chainNonces,proto3" json:"chain_nonces"` + NonceToCctx []NonceToCctx `protobuf:"bytes,15,rep,name=nonce_to_cctx,json=nonceToCctx,proto3" json:"nonce_to_cctx"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -156,6 +159,27 @@ func (m *GenesisState) GetBlameList() []Blame { return nil } +func (m *GenesisState) GetPendingNonces() []PendingNonces { + if m != nil { + return m.PendingNonces + } + return nil +} + +func (m *GenesisState) GetChainNonces() []ChainNonces { + if m != nil { + return m.ChainNonces + } + return nil +} + +func (m *GenesisState) GetNonceToCctx() []NonceToCctx { + if m != nil { + return m.NonceToCctx + } + return nil +} + func init() { proto.RegisterType((*GenesisState)(nil), "zetachain.zetacore.observer.GenesisState") } @@ -163,42 +187,48 @@ func init() { func init() { proto.RegisterFile("observer/genesis.proto", fileDescriptor_15ea8c9d44da7399) } var fileDescriptor_15ea8c9d44da7399 = []byte{ - // 550 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xd1, 0x6e, 0xd3, 0x30, - 0x14, 0x86, 0x5b, 0x36, 0x5a, 0xea, 0x4e, 0xac, 0x98, 0x01, 0xd1, 0x26, 0x65, 0x65, 0xdc, 0x54, - 0x02, 0x12, 0x54, 0x2e, 0x11, 0x17, 0xac, 0xd2, 0x46, 0xc5, 0x06, 0x28, 0x45, 0x42, 0x02, 0x89, - 0xc8, 0x4d, 0xdd, 0x34, 0x22, 0x8d, 0xa3, 0x1c, 0x17, 0x51, 0x9e, 0x82, 0xc7, 0xe0, 0x51, 0x76, - 0xb9, 0x4b, 0xae, 0x10, 0x6a, 0x5f, 0x04, 0xf9, 0xc4, 0x4e, 0x69, 0x27, 0x05, 0xee, 0xac, 0xdf, - 0xe7, 0xff, 0x6c, 0xff, 0xf6, 0x31, 0xb9, 0x2b, 0x86, 0xc0, 0xb3, 0x2f, 0x3c, 0x73, 0x43, 0x9e, - 0x70, 0x88, 0xc0, 0x49, 0x33, 0x21, 0x05, 0x3d, 0xf8, 0xc6, 0x25, 0x0b, 0x26, 0x2c, 0x4a, 0x1c, - 0x1c, 0x89, 0x8c, 0x3b, 0xa6, 0x74, 0x7f, 0x2f, 0x14, 0xa1, 0xc0, 0x3a, 0x57, 0x8d, 0x72, 0xcb, - 0xfe, 0x9d, 0x02, 0x35, 0x64, 0x71, 0x2c, 0xa4, 0x96, 0xf7, 0x56, 0x72, 0xcc, 0xa6, 0x5c, 0xab, - 0x87, 0x85, 0x1a, 0x64, 0x02, 0x00, 0x57, 0xf2, 0xc7, 0x31, 0x0b, 0xe1, 0x0a, 0xed, 0x33, 0x9f, - 0x87, 0x3c, 0xd1, 0xf2, 0x41, 0x21, 0x27, 0x62, 0xc4, 0x7d, 0x16, 0x04, 0x62, 0x96, 0x98, 0xa5, - 0xee, 0x15, 0x93, 0x66, 0x70, 0x05, 0x96, 0xb2, 0x8c, 0x4d, 0xcd, 0x1a, 0xb4, 0x90, 0x25, 0x18, - 0xed, 0xfe, 0xdf, 0x9a, 0x3f, 0x9e, 0x25, 0x23, 0xf0, 0xa7, 0x51, 0x98, 0x31, 0x29, 0x34, 0xed, - 0xe8, 0x47, 0x9d, 0xec, 0x9c, 0xe6, 0x69, 0x0d, 0x24, 0x93, 0x9c, 0x3e, 0x27, 0xf5, 0xfc, 0xc8, - 0x60, 0x55, 0xdb, 0x5b, 0x9d, 0x66, 0xf7, 0x81, 0x53, 0x12, 0x9f, 0x73, 0x8c, 0xb5, 0x9e, 0xf1, - 0xd0, 0x3e, 0x69, 0x98, 0x39, 0xb0, 0xae, 0x21, 0xe0, 0x61, 0x29, 0xe0, 0x8d, 0x1e, 0x9c, 0xb3, - 0x34, 0xe5, 0x99, 0xb7, 0x72, 0x53, 0x8f, 0xec, 0xaa, 0x5c, 0x5e, 0xe4, 0xb1, 0x9c, 0x45, 0x20, - 0xad, 0x2d, 0x04, 0x76, 0x4a, 0x81, 0xaf, 0x57, 0x1e, 0x6f, 0x13, 0x40, 0xdf, 0x93, 0xd6, 0xe6, - 0x1d, 0x59, 0xdb, 0xed, 0x6a, 0xa7, 0xd9, 0x7d, 0x54, 0x0a, 0xed, 0x15, 0xa6, 0x13, 0xe5, 0xf1, - 0x76, 0x83, 0x75, 0x81, 0x3e, 0x23, 0xb5, 0xfc, 0x3a, 0xac, 0xeb, 0x88, 0x2b, 0x4f, 0xed, 0x2d, - 0x96, 0x7a, 0xda, 0xa2, 0xcc, 0xf9, 0xc3, 0xb0, 0x6a, 0xff, 0x61, 0x7e, 0x85, 0xa5, 0x9e, 0xb6, - 0xd0, 0x4f, 0xe4, 0x76, 0xcc, 0x40, 0xfa, 0x66, 0xde, 0xc7, 0xd3, 0x5a, 0x75, 0x24, 0x39, 0xa5, - 0xa4, 0x33, 0x06, 0xd2, 0xe4, 0xdf, 0xc3, 0xc0, 0x6e, 0xc5, 0x9b, 0x12, 0xfd, 0x48, 0x5a, 0xca, - 0xe5, 0xe7, 0x7b, 0xf5, 0x63, 0x75, 0x0f, 0x37, 0x10, 0x5e, 0x7e, 0xb1, 0x3d, 0x91, 0xf1, 0xfc, - 0x9c, 0x2a, 0xf9, 0xe3, 0xed, 0x8b, 0x5f, 0x87, 0x15, 0xef, 0x66, 0xb0, 0xa6, 0xd2, 0x2e, 0xd9, - 0x92, 0x00, 0x56, 0x03, 0x79, 0xed, 0x52, 0xde, 0xbb, 0xc1, 0xc0, 0x53, 0xc5, 0xf4, 0x94, 0x34, - 0xd5, 0x73, 0x9e, 0x44, 0x20, 0x45, 0x36, 0xb7, 0x08, 0xbe, 0x89, 0x7f, 0x7a, 0xf5, 0x06, 0x88, - 0x04, 0x78, 0x99, 0x3b, 0xe9, 0x88, 0x50, 0xd3, 0x17, 0x45, 0x5b, 0x80, 0xd5, 0x44, 0xde, 0x93, - 0x72, 0x1e, 0xc0, 0xc9, 0x2c, 0x19, 0x9d, 0x6b, 0x53, 0x3f, 0x19, 0x0b, 0xcd, 0x6f, 0xc9, 0xf5, - 0x29, 0xb5, 0x5d, 0x82, 0x9f, 0x45, 0x9e, 0xdc, 0x0e, 0xd2, 0x8f, 0xca, 0x7b, 0x4a, 0x95, 0x6b, - 0x5e, 0x03, 0xbd, 0x98, 0x60, 0xff, 0x62, 0x61, 0x57, 0x2f, 0x17, 0x76, 0xf5, 0xf7, 0xc2, 0xae, - 0x7e, 0x5f, 0xda, 0x95, 0xcb, 0xa5, 0x5d, 0xf9, 0xb9, 0xb4, 0x2b, 0x1f, 0xdc, 0x30, 0x92, 0x93, - 0xd9, 0xd0, 0x09, 0xc4, 0xd4, 0x55, 0xb8, 0xc7, 0x48, 0x76, 0x0d, 0xd9, 0xfd, 0xea, 0xae, 0x3e, - 0x82, 0x79, 0xca, 0x61, 0x58, 0xc3, 0xe6, 0x7f, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0xef, 0x46, - 0xd2, 0xbf, 0x32, 0x05, 0x00, 0x00, + // 642 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdd, 0x4e, 0x14, 0x31, + 0x14, 0xc7, 0x77, 0x05, 0xc1, 0xed, 0xf2, 0x65, 0x45, 0x6d, 0x40, 0x07, 0xc4, 0x1b, 0xe2, 0xc7, + 0x8c, 0xc1, 0x4b, 0xe3, 0x85, 0x6c, 0x02, 0x12, 0x01, 0x75, 0x20, 0x31, 0xd1, 0xc4, 0x49, 0xb7, + 0x5b, 0x86, 0x89, 0xb3, 0xed, 0x64, 0xda, 0x35, 0xe0, 0x53, 0xf8, 0x18, 0x3e, 0x0a, 0x97, 0x5c, + 0x7a, 0x65, 0x0c, 0xbc, 0x88, 0xe9, 0xd7, 0xcc, 0xce, 0x6e, 0x32, 0xee, 0x5d, 0xf3, 0x3f, 0xe7, + 0xff, 0x3b, 0xed, 0x69, 0x4f, 0xc1, 0x3d, 0xde, 0x15, 0x34, 0xff, 0x4e, 0xf3, 0x20, 0xa6, 0x8c, + 0x8a, 0x44, 0xf8, 0x59, 0xce, 0x25, 0x87, 0xab, 0x3f, 0xa8, 0xc4, 0xe4, 0x14, 0x27, 0xcc, 0xd7, + 0x2b, 0x9e, 0x53, 0xdf, 0xa5, 0xae, 0x2c, 0xc7, 0x3c, 0xe6, 0x3a, 0x2f, 0x50, 0x2b, 0x63, 0x59, + 0xb9, 0x5b, 0xa0, 0xba, 0x38, 0x4d, 0xb9, 0xb4, 0xf2, 0x72, 0x29, 0xa7, 0xb8, 0x4f, 0xad, 0xba, + 0x5a, 0xa8, 0xba, 0x48, 0xc4, 0x38, 0x23, 0xd4, 0x16, 0x5f, 0x59, 0x2b, 0x83, 0x39, 0x17, 0xc2, + 0x64, 0x9c, 0xa4, 0x38, 0x16, 0x63, 0xa5, 0xbe, 0xd1, 0xf3, 0x98, 0xb2, 0x31, 0x28, 0xe3, 0x3d, + 0x1a, 0x61, 0x42, 0xf8, 0x80, 0xb9, 0x7d, 0x3c, 0x18, 0x0a, 0x32, 0x42, 0x23, 0xc9, 0x23, 0x42, + 0xe4, 0x99, 0x8d, 0xde, 0x2f, 0xa2, 0x6e, 0x31, 0x56, 0x2a, 0xc3, 0x39, 0xee, 0xbb, 0x1d, 0x3c, + 0x2c, 0x65, 0xca, 0x7a, 0x09, 0x8b, 0xab, 0x27, 0x80, 0x45, 0x58, 0x0a, 0xa7, 0x3d, 0x1a, 0xd6, + 0xa2, 0x93, 0x01, 0xeb, 0x89, 0xa8, 0x9f, 0xc4, 0x39, 0x96, 0xdc, 0x16, 0xdb, 0xf8, 0xd5, 0x02, + 0x73, 0xbb, 0xe6, 0x1e, 0x8e, 0x24, 0x96, 0x14, 0xbe, 0x06, 0xb3, 0xa6, 0x99, 0x02, 0x35, 0xd7, + 0xa7, 0x36, 0xdb, 0x5b, 0x8f, 0xfd, 0x9a, 0x8b, 0xf1, 0xb7, 0x75, 0x6e, 0xe8, 0x3c, 0x70, 0x0f, + 0xb4, 0x5c, 0x4c, 0xa0, 0x1b, 0x1a, 0xf0, 0xb4, 0x16, 0xf0, 0xde, 0x2e, 0x0e, 0x70, 0x96, 0xd1, + 0x3c, 0x2c, 0xdd, 0x30, 0x04, 0x8b, 0xaa, 0xa9, 0x6f, 0x4c, 0x4f, 0xf7, 0x13, 0x21, 0xd1, 0x94, + 0x06, 0x6e, 0xd6, 0x02, 0x0f, 0x4b, 0x4f, 0x38, 0x0a, 0x80, 0x9f, 0xc0, 0xd2, 0xe8, 0x05, 0xa3, + 0xe9, 0xf5, 0xe6, 0x66, 0x7b, 0xeb, 0x59, 0x2d, 0xb4, 0x53, 0x98, 0x76, 0x94, 0x27, 0x5c, 0x24, + 0x55, 0x01, 0xbe, 0x02, 0x33, 0xe6, 0xb6, 0xd0, 0x4d, 0x8d, 0xab, 0xef, 0xda, 0x07, 0x9d, 0x1a, + 0x5a, 0x8b, 0x32, 0x9b, 0x57, 0x85, 0x66, 0x26, 0x30, 0xbf, 0xd3, 0xa9, 0xa1, 0xb5, 0xc0, 0xaf, + 0xe0, 0x4e, 0x8a, 0x85, 0x8c, 0x5c, 0x3c, 0xd2, 0xa7, 0x45, 0xb3, 0x9a, 0xe4, 0xd7, 0x92, 0xf6, + 0xb1, 0x90, 0xae, 0xff, 0x1d, 0xdd, 0xb0, 0xdb, 0xe9, 0xa8, 0x04, 0xbf, 0x80, 0x25, 0xe5, 0x8a, + 0xcc, 0x5e, 0xa3, 0x54, 0xdd, 0xc3, 0x2d, 0x0d, 0xaf, 0xbf, 0xd8, 0x0e, 0xcf, 0xa9, 0x39, 0xa7, + 0xea, 0xfc, 0xf6, 0xf4, 0xc5, 0x9f, 0xb5, 0x46, 0xb8, 0x40, 0x2a, 0x2a, 0xdc, 0x02, 0x53, 0x52, + 0x08, 0xd4, 0xd2, 0xbc, 0xf5, 0x5a, 0xde, 0xf1, 0xd1, 0x51, 0xa8, 0x92, 0xe1, 0x2e, 0x68, 0xab, + 0xe7, 0x7c, 0x9a, 0x08, 0xc9, 0xf3, 0x73, 0x04, 0xf4, 0x9b, 0xf8, 0xaf, 0xd7, 0x6e, 0x00, 0x48, + 0x21, 0xde, 0x1a, 0x27, 0xec, 0x01, 0xe8, 0xe6, 0xa2, 0x18, 0x0b, 0x81, 0xda, 0x9a, 0xf7, 0xa2, + 0x9e, 0x27, 0xc4, 0xce, 0x80, 0xf5, 0x0e, 0xac, 0x69, 0x8f, 0x9d, 0x70, 0xcb, 0x5f, 0x92, 0xd5, + 0x90, 0xda, 0x2e, 0xd0, 0xdf, 0x90, 0xe9, 0xdc, 0x9c, 0xa6, 0x6f, 0xd4, 0xcf, 0x94, 0x4a, 0xb7, + 0xbc, 0x96, 0xf6, 0xda, 0xb7, 0xbb, 0x50, 0x9d, 0x7c, 0x34, 0xaf, 0x61, 0x4f, 0xea, 0x9f, 0x9a, + 0xb1, 0x1c, 0x6a, 0x87, 0x85, 0xce, 0x67, 0xc3, 0x22, 0xfc, 0x08, 0xe6, 0x86, 0xbf, 0x44, 0xb4, + 0x30, 0xc1, 0x94, 0x75, 0x94, 0x5e, 0x81, 0xb6, 0x49, 0x29, 0xc1, 0x10, 0xcc, 0x57, 0xfe, 0x3c, + 0xb4, 0x38, 0xd1, 0xe4, 0x32, 0x42, 0x8f, 0x79, 0x87, 0xc8, 0x33, 0xc7, 0x64, 0x43, 0xd2, 0xde, + 0xc5, 0x95, 0xd7, 0xbc, 0xbc, 0xf2, 0x9a, 0x7f, 0xaf, 0xbc, 0xe6, 0xcf, 0x6b, 0xaf, 0x71, 0x79, + 0xed, 0x35, 0x7e, 0x5f, 0x7b, 0x8d, 0xcf, 0x41, 0x9c, 0xc8, 0xd3, 0x41, 0xd7, 0x27, 0xbc, 0x1f, + 0x28, 0xec, 0x73, 0x5d, 0x21, 0x70, 0x15, 0x82, 0xb3, 0xa0, 0xfc, 0x08, 0xcf, 0x33, 0x2a, 0xba, + 0x33, 0xfa, 0xf3, 0x7b, 0xf9, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xee, 0x86, 0x37, 0x94, 0x8c, 0x06, + 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -221,6 +251,48 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.NonceToCctx) > 0 { + for iNdEx := len(m.NonceToCctx) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonceToCctx[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x7a + } + } + if len(m.ChainNonces) > 0 { + for iNdEx := len(m.ChainNonces) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.ChainNonces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x72 + } + } + if len(m.PendingNonces) > 0 { + for iNdEx := len(m.PendingNonces) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.PendingNonces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x6a + } + } if len(m.BlameList) > 0 { for iNdEx := len(m.BlameList) - 1; iNdEx >= 0; iNdEx-- { { @@ -453,6 +525,24 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) } } + if len(m.PendingNonces) > 0 { + for _, e := range m.PendingNonces { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if len(m.ChainNonces) > 0 { + for _, e := range m.ChainNonces { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } + if len(m.NonceToCctx) > 0 { + for _, e := range m.NonceToCctx { + l = e.Size() + n += 1 + l + sovGenesis(uint64(l)) + } + } return n } @@ -908,6 +998,108 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 13: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PendingNonces", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PendingNonces = append(m.PendingNonces, PendingNonces{}) + if err := m.PendingNonces[len(m.PendingNonces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainNonces", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainNonces = append(m.ChainNonces, ChainNonces{}) + if err := m.ChainNonces[len(m.ChainNonces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NonceToCctx", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NonceToCctx = append(m.NonceToCctx, NonceToCctx{}) + if err := m.NonceToCctx[len(m.NonceToCctx)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenesis(dAtA[iNdEx:]) diff --git a/x/observer/types/keys.go b/x/observer/types/keys.go index 2d21fc943b..21a8ff4489 100644 --- a/x/observer/types/keys.go +++ b/x/observer/types/keys.go @@ -53,6 +53,10 @@ const ( TSSKey = "TSS-value-" TSSHistoryKey = "TSS-History-value-" TssFundMigratorKey = "FundsMigrator-value-" + + PendingNoncesKeyPrefix = "PendingNonces-value-" + ChainNoncesKey = "ChainNonces-value-" + NonceToCctxKeyPrefix = "NonceToCctx-value-" ) func GetBlameIndex(chainID int64, nonce uint64, digest string, height uint64) string { diff --git a/x/crosschain/types/nonce_to_cctx.pb.go b/x/observer/types/nonce_to_cctx.pb.go similarity index 83% rename from x/crosschain/types/nonce_to_cctx.pb.go rename to x/observer/types/nonce_to_cctx.pb.go index 6e04adf1b0..b6c0a77386 100644 --- a/x/crosschain/types/nonce_to_cctx.pb.go +++ b/x/observer/types/nonce_to_cctx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: crosschain/nonce_to_cctx.proto +// source: observer/nonce_to_cctx.proto package types @@ -9,7 +9,9 @@ import ( math "math" math_bits "math/bits" + _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/gogo/protobuf/proto" + _ "github.com/zeta-chain/zetacore/common" ) // Reference imports to suppress errors if they are not otherwise used. @@ -35,7 +37,7 @@ func (m *NonceToCctx) Reset() { *m = NonceToCctx{} } func (m *NonceToCctx) String() string { return proto.CompactTextString(m) } func (*NonceToCctx) ProtoMessage() {} func (*NonceToCctx) Descriptor() ([]byte, []int) { - return fileDescriptor_cfa802a2474dc9c1, []int{0} + return fileDescriptor_6f9bbe8a689fa6e4, []int{0} } func (m *NonceToCctx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -93,27 +95,29 @@ func (m *NonceToCctx) GetTss() string { } func init() { - proto.RegisterType((*NonceToCctx)(nil), "zetachain.zetacore.crosschain.NonceToCctx") + proto.RegisterType((*NonceToCctx)(nil), "zetachain.zetacore.observer.NonceToCctx") } -func init() { proto.RegisterFile("crosschain/nonce_to_cctx.proto", fileDescriptor_cfa802a2474dc9c1) } +func init() { proto.RegisterFile("observer/nonce_to_cctx.proto", fileDescriptor_6f9bbe8a689fa6e4) } -var fileDescriptor_cfa802a2474dc9c1 = []byte{ - // 215 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0x2e, 0xca, 0x2f, - 0x2e, 0x4e, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0xcf, 0xcb, 0xcf, 0x4b, 0x4e, 0x8d, 0x2f, 0xc9, 0x8f, - 0x4f, 0x4e, 0x2e, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xad, 0x4a, 0x2d, 0x49, - 0x04, 0x4b, 0xeb, 0x81, 0x59, 0xf9, 0x45, 0xa9, 0x7a, 0x08, 0x2d, 0x4a, 0x79, 0x5c, 0xdc, 0x7e, - 0x20, 0x5d, 0x21, 0xf9, 0xce, 0xc9, 0x25, 0x15, 0x42, 0x92, 0x5c, 0x1c, 0x60, 0xf1, 0xf8, 0xcc, - 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xe6, 0x20, 0x76, 0x30, 0xdf, 0x33, 0x45, 0x48, 0x84, 0x8b, - 0x15, 0x6c, 0xbe, 0x04, 0x13, 0x58, 0x1c, 0xc2, 0x11, 0x92, 0xe1, 0xe2, 0x04, 0x59, 0xe6, 0x99, - 0x97, 0x92, 0x5a, 0x21, 0xc1, 0xac, 0xc0, 0xa8, 0xc1, 0x19, 0x84, 0x10, 0x10, 0x12, 0xe0, 0x62, - 0x2e, 0x29, 0x2e, 0x96, 0x60, 0x01, 0x8b, 0x83, 0x98, 0x4e, 0xde, 0x27, 0x1e, 0xc9, 0x31, 0x5e, - 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, - 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x98, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, - 0xab, 0x0f, 0x72, 0xa9, 0x2e, 0xc4, 0x4f, 0x30, 0x47, 0xeb, 0x57, 0xe8, 0x23, 0xf9, 0xb4, 0xa4, - 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x45, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9d, - 0x39, 0xb3, 0xd3, 0x04, 0x01, 0x00, 0x00, +var fileDescriptor_6f9bbe8a689fa6e4 = []byte{ + // 242 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc9, 0x4f, 0x2a, 0x4e, + 0x2d, 0x2a, 0x4b, 0x2d, 0xd2, 0xcf, 0xcb, 0xcf, 0x4b, 0x4e, 0x8d, 0x2f, 0xc9, 0x8f, 0x4f, 0x4e, + 0x2e, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xae, 0x4a, 0x2d, 0x49, 0x4c, 0xce, + 0x48, 0xcc, 0xcc, 0xd3, 0x03, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x60, 0x1a, 0xa4, 0x84, 0x93, 0xf3, + 0x73, 0x73, 0xf3, 0xf3, 0xf4, 0x21, 0x14, 0x44, 0x87, 0x94, 0x48, 0x7a, 0x7e, 0x7a, 0x3e, 0x98, + 0xa9, 0x0f, 0x62, 0x41, 0x44, 0x95, 0xf2, 0xb8, 0xb8, 0xfd, 0x40, 0xc6, 0x87, 0xe4, 0x3b, 0x27, + 0x97, 0x54, 0x08, 0x49, 0x72, 0x71, 0x80, 0x0d, 0x8d, 0xcf, 0x4c, 0x91, 0x60, 0x54, 0x60, 0xd4, + 0x60, 0x0e, 0x62, 0x07, 0xf3, 0x3d, 0x53, 0x84, 0x44, 0xb8, 0x58, 0xc1, 0x0e, 0x91, 0x60, 0x02, + 0x8b, 0x43, 0x38, 0x42, 0x32, 0x5c, 0x9c, 0x20, 0x57, 0x79, 0xe6, 0xa5, 0xa4, 0x56, 0x48, 0x30, + 0x2b, 0x30, 0x6a, 0x70, 0x06, 0x21, 0x04, 0x84, 0x04, 0xb8, 0x98, 0x4b, 0x8a, 0x8b, 0x25, 0x58, + 0xc0, 0xe2, 0x20, 0xa6, 0x93, 0xe7, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, + 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, + 0xe9, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x83, 0xbc, 0xa4, 0x0b, + 0xb6, 0x58, 0x1f, 0xe6, 0x3b, 0xfd, 0x0a, 0x7d, 0x78, 0x80, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x27, + 0xb1, 0x81, 0x7d, 0x60, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x18, 0xf1, 0x0b, 0xf9, 0x29, 0x01, + 0x00, 0x00, } func (m *NonceToCctx) Marshal() (dAtA []byte, err error) { diff --git a/x/crosschain/types/pending_nonces.pb.go b/x/observer/types/pending_nonces.pb.go similarity index 82% rename from x/crosschain/types/pending_nonces.pb.go rename to x/observer/types/pending_nonces.pb.go index c060c57750..dee38660f7 100644 --- a/x/crosschain/types/pending_nonces.pb.go +++ b/x/observer/types/pending_nonces.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: crosschain/pending_nonces.proto +// source: observer/pending_nonces.proto package types @@ -9,7 +9,9 @@ import ( math "math" math_bits "math/bits" + _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/gogo/protobuf/proto" + _ "github.com/zeta-chain/zetacore/common" ) // Reference imports to suppress errors if they are not otherwise used. @@ -35,7 +37,7 @@ func (m *PendingNonces) Reset() { *m = PendingNonces{} } func (m *PendingNonces) String() string { return proto.CompactTextString(m) } func (*PendingNonces) ProtoMessage() {} func (*PendingNonces) Descriptor() ([]byte, []int) { - return fileDescriptor_f25c211795403ec7, []int{0} + return fileDescriptor_dd001e4838750ecf, []int{0} } func (m *PendingNonces) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -93,27 +95,29 @@ func (m *PendingNonces) GetTss() string { } func init() { - proto.RegisterType((*PendingNonces)(nil), "zetachain.zetacore.crosschain.PendingNonces") + proto.RegisterType((*PendingNonces)(nil), "zetachain.zetacore.observer.PendingNonces") } -func init() { proto.RegisterFile("crosschain/pending_nonces.proto", fileDescriptor_f25c211795403ec7) } +func init() { proto.RegisterFile("observer/pending_nonces.proto", fileDescriptor_dd001e4838750ecf) } -var fileDescriptor_f25c211795403ec7 = []byte{ - // 224 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0x2e, 0xca, 0x2f, - 0x2e, 0x4e, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x2f, 0x48, 0xcd, 0x4b, 0xc9, 0xcc, 0x4b, 0x8f, 0xcf, - 0xcb, 0xcf, 0x4b, 0x4e, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xad, 0x4a, 0x2d, - 0x49, 0x04, 0xcb, 0xeb, 0x81, 0x59, 0xf9, 0x45, 0xa9, 0x7a, 0x08, 0x3d, 0x4a, 0x15, 0x5c, 0xbc, - 0x01, 0x10, 0x6d, 0x7e, 0x60, 0x5d, 0x42, 0xd2, 0x5c, 0x9c, 0x60, 0xfd, 0xf1, 0x39, 0xf9, 0xe5, - 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x1c, 0x60, 0x01, 0x9f, 0xfc, 0x72, 0x21, 0x59, 0x2e, - 0x2e, 0x88, 0x64, 0x46, 0x66, 0x7a, 0x86, 0x04, 0x13, 0x58, 0x16, 0xa2, 0xdc, 0x23, 0x33, 0x3d, - 0x43, 0x48, 0x92, 0x8b, 0x03, 0x6c, 0x6a, 0x7c, 0x66, 0x8a, 0x04, 0x33, 0x58, 0x92, 0x1d, 0xcc, - 0xf7, 0x4c, 0x11, 0x12, 0xe0, 0x62, 0x2e, 0x29, 0x2e, 0x96, 0x60, 0x51, 0x60, 0xd4, 0xe0, 0x0c, - 0x02, 0x31, 0x9d, 0xbc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, - 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x30, - 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xe4, 0x66, 0x5d, 0x88, 0xf7, - 0x60, 0xce, 0xd7, 0xaf, 0xd0, 0x47, 0xf2, 0x74, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, - 0xb3, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x49, 0xce, 0x9d, 0x0f, 0x01, 0x00, 0x00, +var fileDescriptor_dd001e4838750ecf = []byte{ + // 251 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcd, 0x4f, 0x2a, 0x4e, + 0x2d, 0x2a, 0x4b, 0x2d, 0xd2, 0x2f, 0x48, 0xcd, 0x4b, 0xc9, 0xcc, 0x4b, 0x8f, 0xcf, 0xcb, 0xcf, + 0x4b, 0x4e, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xae, 0x4a, 0x2d, 0x49, 0x4c, + 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x03, 0xb3, 0xf2, 0x8b, 0x52, 0xf5, 0x60, 0x3a, 0xa4, 0x84, 0x93, + 0xf3, 0x73, 0x73, 0xf3, 0xf3, 0xf4, 0x21, 0x14, 0x44, 0x87, 0x94, 0x48, 0x7a, 0x7e, 0x7a, 0x3e, + 0x98, 0xa9, 0x0f, 0x62, 0x41, 0x44, 0x95, 0x2a, 0xb8, 0x78, 0x03, 0x20, 0xe6, 0xfb, 0x81, 0x8d, + 0x17, 0x92, 0xe6, 0xe2, 0x04, 0x5b, 0x14, 0x9f, 0x93, 0x5f, 0x2e, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, + 0x1c, 0xc4, 0x01, 0x16, 0xf0, 0xc9, 0x2f, 0x17, 0x92, 0xe5, 0xe2, 0x82, 0x48, 0x66, 0x64, 0xa6, + 0x67, 0x48, 0x30, 0x81, 0x65, 0x21, 0xca, 0x3d, 0x32, 0xd3, 0x33, 0x84, 0x24, 0xb9, 0x38, 0xc0, + 0x4e, 0x8a, 0xcf, 0x4c, 0x91, 0x60, 0x06, 0x4b, 0xb2, 0x83, 0xf9, 0x9e, 0x29, 0x42, 0x02, 0x5c, + 0xcc, 0x25, 0xc5, 0xc5, 0x12, 0x2c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x20, 0xa6, 0x93, 0xe7, 0x89, + 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, + 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xe9, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, + 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x83, 0x3c, 0xa7, 0x0b, 0x36, 0x44, 0x1f, 0xe6, 0x4f, 0xfd, 0x0a, + 0x7d, 0x78, 0xd8, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xfd, 0x62, 0x0c, 0x08, 0x00, + 0x00, 0xff, 0xff, 0xd9, 0xc8, 0x8e, 0xf9, 0x34, 0x01, 0x00, 0x00, } func (m *PendingNonces) Marshal() (dAtA []byte, err error) { diff --git a/x/observer/types/query.pb.go b/x/observer/types/query.pb.go index 9e9f714208..cf78bf525a 100644 --- a/x/observer/types/query.pb.go +++ b/x/observer/types/query.pb.go @@ -32,6 +32,374 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +type QueryGetChainNoncesRequest struct { + Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` +} + +func (m *QueryGetChainNoncesRequest) Reset() { *m = QueryGetChainNoncesRequest{} } +func (m *QueryGetChainNoncesRequest) String() string { return proto.CompactTextString(m) } +func (*QueryGetChainNoncesRequest) ProtoMessage() {} +func (*QueryGetChainNoncesRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_dcb801e455adaee4, []int{0} +} +func (m *QueryGetChainNoncesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetChainNoncesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetChainNoncesRequest.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 *QueryGetChainNoncesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetChainNoncesRequest.Merge(m, src) +} +func (m *QueryGetChainNoncesRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryGetChainNoncesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetChainNoncesRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetChainNoncesRequest proto.InternalMessageInfo + +func (m *QueryGetChainNoncesRequest) GetIndex() string { + if m != nil { + return m.Index + } + return "" +} + +type QueryGetChainNoncesResponse struct { + ChainNonces ChainNonces `protobuf:"bytes,1,opt,name=ChainNonces,proto3" json:"ChainNonces"` +} + +func (m *QueryGetChainNoncesResponse) Reset() { *m = QueryGetChainNoncesResponse{} } +func (m *QueryGetChainNoncesResponse) String() string { return proto.CompactTextString(m) } +func (*QueryGetChainNoncesResponse) ProtoMessage() {} +func (*QueryGetChainNoncesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dcb801e455adaee4, []int{1} +} +func (m *QueryGetChainNoncesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetChainNoncesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetChainNoncesResponse.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 *QueryGetChainNoncesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetChainNoncesResponse.Merge(m, src) +} +func (m *QueryGetChainNoncesResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryGetChainNoncesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetChainNoncesResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetChainNoncesResponse proto.InternalMessageInfo + +func (m *QueryGetChainNoncesResponse) GetChainNonces() ChainNonces { + if m != nil { + return m.ChainNonces + } + return ChainNonces{} +} + +type QueryAllChainNoncesRequest struct { + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllChainNoncesRequest) Reset() { *m = QueryAllChainNoncesRequest{} } +func (m *QueryAllChainNoncesRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllChainNoncesRequest) ProtoMessage() {} +func (*QueryAllChainNoncesRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_dcb801e455adaee4, []int{2} +} +func (m *QueryAllChainNoncesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllChainNoncesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllChainNoncesRequest.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 *QueryAllChainNoncesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllChainNoncesRequest.Merge(m, src) +} +func (m *QueryAllChainNoncesRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllChainNoncesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllChainNoncesRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllChainNoncesRequest proto.InternalMessageInfo + +func (m *QueryAllChainNoncesRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllChainNoncesResponse struct { + ChainNonces []ChainNonces `protobuf:"bytes,1,rep,name=ChainNonces,proto3" json:"ChainNonces"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllChainNoncesResponse) Reset() { *m = QueryAllChainNoncesResponse{} } +func (m *QueryAllChainNoncesResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllChainNoncesResponse) ProtoMessage() {} +func (*QueryAllChainNoncesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dcb801e455adaee4, []int{3} +} +func (m *QueryAllChainNoncesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllChainNoncesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllChainNoncesResponse.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 *QueryAllChainNoncesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllChainNoncesResponse.Merge(m, src) +} +func (m *QueryAllChainNoncesResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllChainNoncesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllChainNoncesResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllChainNoncesResponse proto.InternalMessageInfo + +func (m *QueryAllChainNoncesResponse) GetChainNonces() []ChainNonces { + if m != nil { + return m.ChainNonces + } + return nil +} + +func (m *QueryAllChainNoncesResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllPendingNoncesRequest struct { + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllPendingNoncesRequest) Reset() { *m = QueryAllPendingNoncesRequest{} } +func (m *QueryAllPendingNoncesRequest) String() string { return proto.CompactTextString(m) } +func (*QueryAllPendingNoncesRequest) ProtoMessage() {} +func (*QueryAllPendingNoncesRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_dcb801e455adaee4, []int{4} +} +func (m *QueryAllPendingNoncesRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllPendingNoncesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllPendingNoncesRequest.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 *QueryAllPendingNoncesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPendingNoncesRequest.Merge(m, src) +} +func (m *QueryAllPendingNoncesRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllPendingNoncesRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPendingNoncesRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllPendingNoncesRequest proto.InternalMessageInfo + +func (m *QueryAllPendingNoncesRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryAllPendingNoncesResponse struct { + PendingNonces []PendingNonces `protobuf:"bytes,1,rep,name=pending_nonces,json=pendingNonces,proto3" json:"pending_nonces"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` +} + +func (m *QueryAllPendingNoncesResponse) Reset() { *m = QueryAllPendingNoncesResponse{} } +func (m *QueryAllPendingNoncesResponse) String() string { return proto.CompactTextString(m) } +func (*QueryAllPendingNoncesResponse) ProtoMessage() {} +func (*QueryAllPendingNoncesResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dcb801e455adaee4, []int{5} +} +func (m *QueryAllPendingNoncesResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllPendingNoncesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllPendingNoncesResponse.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 *QueryAllPendingNoncesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPendingNoncesResponse.Merge(m, src) +} +func (m *QueryAllPendingNoncesResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllPendingNoncesResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPendingNoncesResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllPendingNoncesResponse proto.InternalMessageInfo + +func (m *QueryAllPendingNoncesResponse) GetPendingNonces() []PendingNonces { + if m != nil { + return m.PendingNonces + } + return nil +} + +func (m *QueryAllPendingNoncesResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + +type QueryPendingNoncesByChainRequest struct { + ChainId int64 `protobuf:"varint,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` +} + +func (m *QueryPendingNoncesByChainRequest) Reset() { *m = QueryPendingNoncesByChainRequest{} } +func (m *QueryPendingNoncesByChainRequest) String() string { return proto.CompactTextString(m) } +func (*QueryPendingNoncesByChainRequest) ProtoMessage() {} +func (*QueryPendingNoncesByChainRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_dcb801e455adaee4, []int{6} +} +func (m *QueryPendingNoncesByChainRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryPendingNoncesByChainRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryPendingNoncesByChainRequest.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 *QueryPendingNoncesByChainRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPendingNoncesByChainRequest.Merge(m, src) +} +func (m *QueryPendingNoncesByChainRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryPendingNoncesByChainRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPendingNoncesByChainRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryPendingNoncesByChainRequest proto.InternalMessageInfo + +func (m *QueryPendingNoncesByChainRequest) GetChainId() int64 { + if m != nil { + return m.ChainId + } + return 0 +} + +type QueryPendingNoncesByChainResponse struct { + PendingNonces PendingNonces `protobuf:"bytes,1,opt,name=pending_nonces,json=pendingNonces,proto3" json:"pending_nonces"` +} + +func (m *QueryPendingNoncesByChainResponse) Reset() { *m = QueryPendingNoncesByChainResponse{} } +func (m *QueryPendingNoncesByChainResponse) String() string { return proto.CompactTextString(m) } +func (*QueryPendingNoncesByChainResponse) ProtoMessage() {} +func (*QueryPendingNoncesByChainResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_dcb801e455adaee4, []int{7} +} +func (m *QueryPendingNoncesByChainResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryPendingNoncesByChainResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryPendingNoncesByChainResponse.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 *QueryPendingNoncesByChainResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryPendingNoncesByChainResponse.Merge(m, src) +} +func (m *QueryPendingNoncesByChainResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryPendingNoncesByChainResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryPendingNoncesByChainResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryPendingNoncesByChainResponse proto.InternalMessageInfo + +func (m *QueryPendingNoncesByChainResponse) GetPendingNonces() PendingNonces { + if m != nil { + return m.PendingNonces + } + return PendingNonces{} +} + type QueryGetTSSRequest struct { } @@ -39,7 +407,7 @@ func (m *QueryGetTSSRequest) Reset() { *m = QueryGetTSSRequest{} } func (m *QueryGetTSSRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetTSSRequest) ProtoMessage() {} func (*QueryGetTSSRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{0} + return fileDescriptor_dcb801e455adaee4, []int{8} } func (m *QueryGetTSSRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -76,7 +444,7 @@ func (m *QueryGetTSSResponse) Reset() { *m = QueryGetTSSResponse{} } func (m *QueryGetTSSResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetTSSResponse) ProtoMessage() {} func (*QueryGetTSSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{1} + return fileDescriptor_dcb801e455adaee4, []int{9} } func (m *QueryGetTSSResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -120,7 +488,7 @@ func (m *QueryGetTssAddressRequest) Reset() { *m = QueryGetTssAddressReq func (m *QueryGetTssAddressRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetTssAddressRequest) ProtoMessage() {} func (*QueryGetTssAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{2} + return fileDescriptor_dcb801e455adaee4, []int{10} } func (m *QueryGetTssAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -165,7 +533,7 @@ func (m *QueryGetTssAddressResponse) Reset() { *m = QueryGetTssAddressRe func (m *QueryGetTssAddressResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetTssAddressResponse) ProtoMessage() {} func (*QueryGetTssAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{3} + return fileDescriptor_dcb801e455adaee4, []int{11} } func (m *QueryGetTssAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -221,7 +589,7 @@ func (m *QueryGetTssAddressByFinalizedHeightRequest) String() string { } func (*QueryGetTssAddressByFinalizedHeightRequest) ProtoMessage() {} func (*QueryGetTssAddressByFinalizedHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{4} + return fileDescriptor_dcb801e455adaee4, []int{12} } func (m *QueryGetTssAddressByFinalizedHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -277,7 +645,7 @@ func (m *QueryGetTssAddressByFinalizedHeightResponse) String() string { } func (*QueryGetTssAddressByFinalizedHeightResponse) ProtoMessage() {} func (*QueryGetTssAddressByFinalizedHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{5} + return fileDescriptor_dcb801e455adaee4, []int{13} } func (m *QueryGetTssAddressByFinalizedHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -328,7 +696,7 @@ func (m *QueryTssHistoryRequest) Reset() { *m = QueryTssHistoryRequest{} func (m *QueryTssHistoryRequest) String() string { return proto.CompactTextString(m) } func (*QueryTssHistoryRequest) ProtoMessage() {} func (*QueryTssHistoryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{6} + return fileDescriptor_dcb801e455adaee4, []int{14} } func (m *QueryTssHistoryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -373,7 +741,7 @@ func (m *QueryTssHistoryResponse) Reset() { *m = QueryTssHistoryResponse func (m *QueryTssHistoryResponse) String() string { return proto.CompactTextString(m) } func (*QueryTssHistoryResponse) ProtoMessage() {} func (*QueryTssHistoryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{7} + return fileDescriptor_dcb801e455adaee4, []int{15} } func (m *QueryTssHistoryResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -428,7 +796,7 @@ func (m *QueryProveRequest) Reset() { *m = QueryProveRequest{} } func (m *QueryProveRequest) String() string { return proto.CompactTextString(m) } func (*QueryProveRequest) ProtoMessage() {} func (*QueryProveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{8} + return fileDescriptor_dcb801e455adaee4, []int{16} } func (m *QueryProveRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -500,7 +868,7 @@ func (m *QueryProveResponse) Reset() { *m = QueryProveResponse{} } func (m *QueryProveResponse) String() string { return proto.CompactTextString(m) } func (*QueryProveResponse) ProtoMessage() {} func (*QueryProveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{9} + return fileDescriptor_dcb801e455adaee4, []int{17} } func (m *QueryProveResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -543,7 +911,7 @@ func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{10} + return fileDescriptor_dcb801e455adaee4, []int{18} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -582,7 +950,7 @@ func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) } func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{11} + return fileDescriptor_dcb801e455adaee4, []int{19} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -627,7 +995,7 @@ func (m *QueryHasVotedRequest) Reset() { *m = QueryHasVotedRequest{} } func (m *QueryHasVotedRequest) String() string { return proto.CompactTextString(m) } func (*QueryHasVotedRequest) ProtoMessage() {} func (*QueryHasVotedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{12} + return fileDescriptor_dcb801e455adaee4, []int{20} } func (m *QueryHasVotedRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -678,7 +1046,7 @@ func (m *QueryHasVotedResponse) Reset() { *m = QueryHasVotedResponse{} } func (m *QueryHasVotedResponse) String() string { return proto.CompactTextString(m) } func (*QueryHasVotedResponse) ProtoMessage() {} func (*QueryHasVotedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{13} + return fileDescriptor_dcb801e455adaee4, []int{21} } func (m *QueryHasVotedResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -722,7 +1090,7 @@ func (m *QueryBallotByIdentifierRequest) Reset() { *m = QueryBallotByIde func (m *QueryBallotByIdentifierRequest) String() string { return proto.CompactTextString(m) } func (*QueryBallotByIdentifierRequest) ProtoMessage() {} func (*QueryBallotByIdentifierRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{14} + return fileDescriptor_dcb801e455adaee4, []int{22} } func (m *QueryBallotByIdentifierRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -767,7 +1135,7 @@ func (m *VoterList) Reset() { *m = VoterList{} } func (m *VoterList) String() string { return proto.CompactTextString(m) } func (*VoterList) ProtoMessage() {} func (*VoterList) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{15} + return fileDescriptor_dcb801e455adaee4, []int{23} } func (m *VoterList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -821,7 +1189,7 @@ func (m *QueryBallotByIdentifierResponse) Reset() { *m = QueryBallotById func (m *QueryBallotByIdentifierResponse) String() string { return proto.CompactTextString(m) } func (*QueryBallotByIdentifierResponse) ProtoMessage() {} func (*QueryBallotByIdentifierResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{16} + return fileDescriptor_dcb801e455adaee4, []int{24} } func (m *QueryBallotByIdentifierResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -886,7 +1254,7 @@ func (m *QueryObserversByChainRequest) Reset() { *m = QueryObserversByCh func (m *QueryObserversByChainRequest) String() string { return proto.CompactTextString(m) } func (*QueryObserversByChainRequest) ProtoMessage() {} func (*QueryObserversByChainRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{17} + return fileDescriptor_dcb801e455adaee4, []int{25} } func (m *QueryObserversByChainRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -930,7 +1298,7 @@ func (m *QueryObserversByChainResponse) Reset() { *m = QueryObserversByC func (m *QueryObserversByChainResponse) String() string { return proto.CompactTextString(m) } func (*QueryObserversByChainResponse) ProtoMessage() {} func (*QueryObserversByChainResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{18} + return fileDescriptor_dcb801e455adaee4, []int{26} } func (m *QueryObserversByChainResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -973,7 +1341,7 @@ func (m *QueryAllObserverMappersRequest) Reset() { *m = QueryAllObserver func (m *QueryAllObserverMappersRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllObserverMappersRequest) ProtoMessage() {} func (*QueryAllObserverMappersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{19} + return fileDescriptor_dcb801e455adaee4, []int{27} } func (m *QueryAllObserverMappersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1010,7 +1378,7 @@ func (m *QueryAllObserverMappersResponse) Reset() { *m = QueryAllObserve func (m *QueryAllObserverMappersResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllObserverMappersResponse) ProtoMessage() {} func (*QueryAllObserverMappersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{20} + return fileDescriptor_dcb801e455adaee4, []int{28} } func (m *QueryAllObserverMappersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1053,7 +1421,7 @@ func (m *QuerySupportedChains) Reset() { *m = QuerySupportedChains{} } func (m *QuerySupportedChains) String() string { return proto.CompactTextString(m) } func (*QuerySupportedChains) ProtoMessage() {} func (*QuerySupportedChains) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{21} + return fileDescriptor_dcb801e455adaee4, []int{29} } func (m *QuerySupportedChains) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1090,7 +1458,7 @@ func (m *QuerySupportedChainsResponse) Reset() { *m = QuerySupportedChai func (m *QuerySupportedChainsResponse) String() string { return proto.CompactTextString(m) } func (*QuerySupportedChainsResponse) ProtoMessage() {} func (*QuerySupportedChainsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{22} + return fileDescriptor_dcb801e455adaee4, []int{30} } func (m *QuerySupportedChainsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1134,7 +1502,7 @@ func (m *QueryGetCoreParamsForChainRequest) Reset() { *m = QueryGetCoreP func (m *QueryGetCoreParamsForChainRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetCoreParamsForChainRequest) ProtoMessage() {} func (*QueryGetCoreParamsForChainRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{23} + return fileDescriptor_dcb801e455adaee4, []int{31} } func (m *QueryGetCoreParamsForChainRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1178,7 +1546,7 @@ func (m *QueryGetCoreParamsForChainResponse) Reset() { *m = QueryGetCore func (m *QueryGetCoreParamsForChainResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetCoreParamsForChainResponse) ProtoMessage() {} func (*QueryGetCoreParamsForChainResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{24} + return fileDescriptor_dcb801e455adaee4, []int{32} } func (m *QueryGetCoreParamsForChainResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1221,7 +1589,7 @@ func (m *QueryGetCoreParamsRequest) Reset() { *m = QueryGetCoreParamsReq func (m *QueryGetCoreParamsRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetCoreParamsRequest) ProtoMessage() {} func (*QueryGetCoreParamsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{25} + return fileDescriptor_dcb801e455adaee4, []int{33} } func (m *QueryGetCoreParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1258,7 +1626,7 @@ func (m *QueryGetCoreParamsResponse) Reset() { *m = QueryGetCoreParamsRe func (m *QueryGetCoreParamsResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetCoreParamsResponse) ProtoMessage() {} func (*QueryGetCoreParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{26} + return fileDescriptor_dcb801e455adaee4, []int{34} } func (m *QueryGetCoreParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1302,7 +1670,7 @@ func (m *QueryGetNodeAccountRequest) Reset() { *m = QueryGetNodeAccountR func (m *QueryGetNodeAccountRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetNodeAccountRequest) ProtoMessage() {} func (*QueryGetNodeAccountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{27} + return fileDescriptor_dcb801e455adaee4, []int{35} } func (m *QueryGetNodeAccountRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1346,7 +1714,7 @@ func (m *QueryGetNodeAccountResponse) Reset() { *m = QueryGetNodeAccount func (m *QueryGetNodeAccountResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetNodeAccountResponse) ProtoMessage() {} func (*QueryGetNodeAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{28} + return fileDescriptor_dcb801e455adaee4, []int{36} } func (m *QueryGetNodeAccountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1390,7 +1758,7 @@ func (m *QueryAllNodeAccountRequest) Reset() { *m = QueryAllNodeAccountR func (m *QueryAllNodeAccountRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllNodeAccountRequest) ProtoMessage() {} func (*QueryAllNodeAccountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{29} + return fileDescriptor_dcb801e455adaee4, []int{37} } func (m *QueryAllNodeAccountRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1435,7 +1803,7 @@ func (m *QueryAllNodeAccountResponse) Reset() { *m = QueryAllNodeAccount func (m *QueryAllNodeAccountResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllNodeAccountResponse) ProtoMessage() {} func (*QueryAllNodeAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{30} + return fileDescriptor_dcb801e455adaee4, []int{38} } func (m *QueryAllNodeAccountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1485,7 +1853,7 @@ func (m *QueryGetCrosschainFlagsRequest) Reset() { *m = QueryGetCrosscha func (m *QueryGetCrosschainFlagsRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetCrosschainFlagsRequest) ProtoMessage() {} func (*QueryGetCrosschainFlagsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{31} + return fileDescriptor_dcb801e455adaee4, []int{39} } func (m *QueryGetCrosschainFlagsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1522,7 +1890,7 @@ func (m *QueryGetCrosschainFlagsResponse) Reset() { *m = QueryGetCrossch func (m *QueryGetCrosschainFlagsResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetCrosschainFlagsResponse) ProtoMessage() {} func (*QueryGetCrosschainFlagsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{32} + return fileDescriptor_dcb801e455adaee4, []int{40} } func (m *QueryGetCrosschainFlagsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1565,7 +1933,7 @@ func (m *QueryGetKeygenRequest) Reset() { *m = QueryGetKeygenRequest{} } func (m *QueryGetKeygenRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetKeygenRequest) ProtoMessage() {} func (*QueryGetKeygenRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{33} + return fileDescriptor_dcb801e455adaee4, []int{41} } func (m *QueryGetKeygenRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1602,7 +1970,7 @@ func (m *QueryGetKeygenResponse) Reset() { *m = QueryGetKeygenResponse{} func (m *QueryGetKeygenResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetKeygenResponse) ProtoMessage() {} func (*QueryGetKeygenResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{34} + return fileDescriptor_dcb801e455adaee4, []int{42} } func (m *QueryGetKeygenResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1645,7 +2013,7 @@ func (m *QueryShowObserverCountRequest) Reset() { *m = QueryShowObserver func (m *QueryShowObserverCountRequest) String() string { return proto.CompactTextString(m) } func (*QueryShowObserverCountRequest) ProtoMessage() {} func (*QueryShowObserverCountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{35} + return fileDescriptor_dcb801e455adaee4, []int{43} } func (m *QueryShowObserverCountRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1682,7 +2050,7 @@ func (m *QueryShowObserverCountResponse) Reset() { *m = QueryShowObserve func (m *QueryShowObserverCountResponse) String() string { return proto.CompactTextString(m) } func (*QueryShowObserverCountResponse) ProtoMessage() {} func (*QueryShowObserverCountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{36} + return fileDescriptor_dcb801e455adaee4, []int{44} } func (m *QueryShowObserverCountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1726,7 +2094,7 @@ func (m *QueryBlameByIdentifierRequest) Reset() { *m = QueryBlameByIdent func (m *QueryBlameByIdentifierRequest) String() string { return proto.CompactTextString(m) } func (*QueryBlameByIdentifierRequest) ProtoMessage() {} func (*QueryBlameByIdentifierRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{37} + return fileDescriptor_dcb801e455adaee4, []int{45} } func (m *QueryBlameByIdentifierRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1770,7 +2138,7 @@ func (m *QueryBlameByIdentifierResponse) Reset() { *m = QueryBlameByIden func (m *QueryBlameByIdentifierResponse) String() string { return proto.CompactTextString(m) } func (*QueryBlameByIdentifierResponse) ProtoMessage() {} func (*QueryBlameByIdentifierResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{38} + return fileDescriptor_dcb801e455adaee4, []int{46} } func (m *QueryBlameByIdentifierResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1814,7 +2182,7 @@ func (m *QueryAllBlameRecordsRequest) Reset() { *m = QueryAllBlameRecord func (m *QueryAllBlameRecordsRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllBlameRecordsRequest) ProtoMessage() {} func (*QueryAllBlameRecordsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{39} + return fileDescriptor_dcb801e455adaee4, []int{47} } func (m *QueryAllBlameRecordsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1859,7 +2227,7 @@ func (m *QueryAllBlameRecordsResponse) Reset() { *m = QueryAllBlameRecor func (m *QueryAllBlameRecordsResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllBlameRecordsResponse) ProtoMessage() {} func (*QueryAllBlameRecordsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{40} + return fileDescriptor_dcb801e455adaee4, []int{48} } func (m *QueryAllBlameRecordsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1911,7 +2279,7 @@ func (m *QueryBlameByChainAndNonceRequest) Reset() { *m = QueryBlameByCh func (m *QueryBlameByChainAndNonceRequest) String() string { return proto.CompactTextString(m) } func (*QueryBlameByChainAndNonceRequest) ProtoMessage() {} func (*QueryBlameByChainAndNonceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{41} + return fileDescriptor_dcb801e455adaee4, []int{49} } func (m *QueryBlameByChainAndNonceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1962,7 +2330,7 @@ func (m *QueryBlameByChainAndNonceResponse) Reset() { *m = QueryBlameByC func (m *QueryBlameByChainAndNonceResponse) String() string { return proto.CompactTextString(m) } func (*QueryBlameByChainAndNonceResponse) ProtoMessage() {} func (*QueryBlameByChainAndNonceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{42} + return fileDescriptor_dcb801e455adaee4, []int{50} } func (m *QueryBlameByChainAndNonceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2006,7 +2374,7 @@ func (m *QueryAllBlockHeaderRequest) Reset() { *m = QueryAllBlockHeaderR func (m *QueryAllBlockHeaderRequest) String() string { return proto.CompactTextString(m) } func (*QueryAllBlockHeaderRequest) ProtoMessage() {} func (*QueryAllBlockHeaderRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{43} + return fileDescriptor_dcb801e455adaee4, []int{51} } func (m *QueryAllBlockHeaderRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2051,7 +2419,7 @@ func (m *QueryAllBlockHeaderResponse) Reset() { *m = QueryAllBlockHeader func (m *QueryAllBlockHeaderResponse) String() string { return proto.CompactTextString(m) } func (*QueryAllBlockHeaderResponse) ProtoMessage() {} func (*QueryAllBlockHeaderResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{44} + return fileDescriptor_dcb801e455adaee4, []int{52} } func (m *QueryAllBlockHeaderResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2102,7 +2470,7 @@ func (m *QueryGetBlockHeaderByHashRequest) Reset() { *m = QueryGetBlockH func (m *QueryGetBlockHeaderByHashRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetBlockHeaderByHashRequest) ProtoMessage() {} func (*QueryGetBlockHeaderByHashRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{45} + return fileDescriptor_dcb801e455adaee4, []int{53} } func (m *QueryGetBlockHeaderByHashRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2146,7 +2514,7 @@ func (m *QueryGetBlockHeaderByHashResponse) Reset() { *m = QueryGetBlock func (m *QueryGetBlockHeaderByHashResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetBlockHeaderByHashResponse) ProtoMessage() {} func (*QueryGetBlockHeaderByHashResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{46} + return fileDescriptor_dcb801e455adaee4, []int{54} } func (m *QueryGetBlockHeaderByHashResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2190,7 +2558,7 @@ func (m *QueryGetBlockHeaderStateRequest) Reset() { *m = QueryGetBlockHe func (m *QueryGetBlockHeaderStateRequest) String() string { return proto.CompactTextString(m) } func (*QueryGetBlockHeaderStateRequest) ProtoMessage() {} func (*QueryGetBlockHeaderStateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{47} + return fileDescriptor_dcb801e455adaee4, []int{55} } func (m *QueryGetBlockHeaderStateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2234,7 +2602,7 @@ func (m *QueryGetBlockHeaderStateResponse) Reset() { *m = QueryGetBlockH func (m *QueryGetBlockHeaderStateResponse) String() string { return proto.CompactTextString(m) } func (*QueryGetBlockHeaderStateResponse) ProtoMessage() {} func (*QueryGetBlockHeaderStateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_dcb801e455adaee4, []int{48} + return fileDescriptor_dcb801e455adaee4, []int{56} } func (m *QueryGetBlockHeaderStateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2271,6 +2639,14 @@ func (m *QueryGetBlockHeaderStateResponse) GetBlockHeaderState() *BlockHeaderSta } func init() { + proto.RegisterType((*QueryGetChainNoncesRequest)(nil), "zetachain.zetacore.observer.QueryGetChainNoncesRequest") + proto.RegisterType((*QueryGetChainNoncesResponse)(nil), "zetachain.zetacore.observer.QueryGetChainNoncesResponse") + proto.RegisterType((*QueryAllChainNoncesRequest)(nil), "zetachain.zetacore.observer.QueryAllChainNoncesRequest") + proto.RegisterType((*QueryAllChainNoncesResponse)(nil), "zetachain.zetacore.observer.QueryAllChainNoncesResponse") + proto.RegisterType((*QueryAllPendingNoncesRequest)(nil), "zetachain.zetacore.observer.QueryAllPendingNoncesRequest") + proto.RegisterType((*QueryAllPendingNoncesResponse)(nil), "zetachain.zetacore.observer.QueryAllPendingNoncesResponse") + proto.RegisterType((*QueryPendingNoncesByChainRequest)(nil), "zetachain.zetacore.observer.QueryPendingNoncesByChainRequest") + proto.RegisterType((*QueryPendingNoncesByChainResponse)(nil), "zetachain.zetacore.observer.QueryPendingNoncesByChainResponse") proto.RegisterType((*QueryGetTSSRequest)(nil), "zetachain.zetacore.observer.QueryGetTSSRequest") proto.RegisterType((*QueryGetTSSResponse)(nil), "zetachain.zetacore.observer.QueryGetTSSResponse") proto.RegisterType((*QueryGetTssAddressRequest)(nil), "zetachain.zetacore.observer.QueryGetTssAddressRequest") @@ -2325,156 +2701,170 @@ func init() { func init() { proto.RegisterFile("observer/query.proto", fileDescriptor_dcb801e455adaee4) } var fileDescriptor_dcb801e455adaee4 = []byte{ - // 2379 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x5a, 0xcf, 0x6f, 0xdc, 0xc6, - 0x15, 0x36, 0xbd, 0x91, 0x2c, 0x8d, 0x25, 0x4b, 0x1a, 0x49, 0xb1, 0x4d, 0xd9, 0xb2, 0x32, 0x8a, - 0x6d, 0x59, 0xb2, 0x77, 0x23, 0x39, 0x48, 0xec, 0xd8, 0x52, 0xa2, 0x75, 0x6d, 0xc9, 0x3f, 0x62, - 0x3b, 0xbb, 0x6a, 0x5a, 0x24, 0x6d, 0x58, 0xee, 0xee, 0x68, 0x97, 0x09, 0x45, 0x6e, 0x38, 0x23, - 0x45, 0x1b, 0x41, 0x68, 0xd1, 0x63, 0xd1, 0x43, 0x80, 0x02, 0x05, 0x8a, 0x5e, 0x8a, 0x02, 0xed, - 0xad, 0x45, 0x90, 0x4b, 0x0f, 0x45, 0x2f, 0xbd, 0x34, 0xa7, 0x22, 0x45, 0x81, 0xa2, 0x3d, 0xb4, - 0x08, 0xec, 0xf6, 0xff, 0x28, 0x38, 0xf3, 0x48, 0xce, 0x92, 0xdc, 0x15, 0x57, 0xd1, 0x49, 0xe4, - 0xcc, 0xbc, 0x37, 0xdf, 0xf7, 0x66, 0xde, 0xcc, 0xfb, 0x56, 0x44, 0x13, 0x6e, 0x85, 0x51, 0x6f, - 0x87, 0x7a, 0x85, 0x8f, 0xb7, 0xa9, 0xd7, 0xca, 0x37, 0x3d, 0x97, 0xbb, 0x78, 0xea, 0x53, 0xca, - 0xcd, 0x6a, 0xc3, 0xb4, 0x9c, 0xbc, 0x78, 0x72, 0x3d, 0x9a, 0x0f, 0x06, 0xea, 0xe3, 0x55, 0x77, - 0x6b, 0xcb, 0x75, 0x0a, 0xf2, 0x8f, 0xb4, 0xd0, 0xe7, 0xab, 0x2e, 0xdb, 0x72, 0x59, 0xa1, 0x62, - 0x32, 0x2a, 0x5d, 0x15, 0x76, 0x16, 0x2b, 0x94, 0x9b, 0x8b, 0x85, 0xa6, 0x59, 0xb7, 0x1c, 0x93, - 0x5b, 0xe1, 0xd8, 0x89, 0xba, 0x5b, 0x77, 0xc5, 0x63, 0xc1, 0x7f, 0x82, 0xd6, 0x73, 0x75, 0xd7, - 0xad, 0xdb, 0xb4, 0x60, 0x36, 0xad, 0x82, 0xe9, 0x38, 0x2e, 0x17, 0x26, 0x0c, 0x7a, 0x27, 0x43, - 0x9c, 0x15, 0xd3, 0xb6, 0x5d, 0x1e, 0xb8, 0x8a, 0x9a, 0x6d, 0x73, 0x8b, 0x42, 0xeb, 0x94, 0xd2, - 0xea, 0x56, 0x3f, 0x32, 0x1a, 0xd4, 0xac, 0x51, 0x0f, 0x3a, 0x2f, 0x84, 0x9d, 0x55, 0xcf, 0x65, - 0x4c, 0xb0, 0x34, 0x36, 0x6d, 0xb3, 0x9e, 0x9c, 0xea, 0x23, 0xda, 0xaa, 0x53, 0x27, 0xe1, 0xd4, - 0x71, 0x6b, 0xd4, 0x30, 0xab, 0x55, 0x77, 0xdb, 0x09, 0x70, 0x9c, 0x0e, 0x3b, 0x83, 0x87, 0x84, - 0xb3, 0xa6, 0xe9, 0x99, 0x5b, 0xc1, 0x1c, 0x38, 0x6c, 0xe6, 0x0c, 0xda, 0xc8, 0x04, 0xc2, 0xef, - 0xf8, 0x81, 0x5b, 0xa3, 0x7c, 0xa3, 0x5c, 0x2e, 0xd1, 0x8f, 0xb7, 0x29, 0xe3, 0xe4, 0x09, 0x1a, - 0x6f, 0x6b, 0x65, 0x4d, 0xd7, 0x61, 0x14, 0xdf, 0x40, 0xb9, 0x8d, 0x72, 0xf9, 0x8c, 0x36, 0xa3, - 0xcd, 0x9d, 0x5c, 0x9a, 0xc9, 0x77, 0x59, 0xaf, 0xfc, 0x46, 0xb9, 0x5c, 0x7c, 0xe1, 0xcb, 0xff, - 0x5c, 0x38, 0x56, 0xf2, 0x4d, 0xc8, 0x5d, 0x74, 0x36, 0x74, 0xc8, 0xd8, 0x6a, 0xad, 0xe6, 0x51, - 0xc6, 0x60, 0x36, 0x3c, 0x87, 0x46, 0x2b, 0x16, 0xaf, 0xba, 0x96, 0x63, 0xc8, 0xc0, 0x58, 0xb5, - 0x33, 0xc7, 0x67, 0xb4, 0xb9, 0x5c, 0xe9, 0x14, 0xb4, 0xdf, 0xf1, 0x9b, 0xef, 0xd7, 0xc8, 0x5b, - 0x48, 0x4f, 0x73, 0x03, 0xf0, 0x46, 0x51, 0x8e, 0xf2, 0x86, 0x80, 0x37, 0x58, 0xf2, 0x1f, 0xfd, - 0x96, 0x0a, 0xaf, 0x0a, 0x67, 0x83, 0x25, 0xff, 0x91, 0xfc, 0x44, 0x43, 0xf3, 0x49, 0x17, 0xc5, - 0xd6, 0x3d, 0xcb, 0x31, 0x6d, 0xeb, 0x53, 0x5a, 0x5b, 0xa7, 0x56, 0xbd, 0xc1, 0x03, 0x68, 0x4b, - 0x68, 0x72, 0x33, 0xe8, 0x31, 0x7c, 0x96, 0x46, 0x43, 0xf4, 0x8b, 0x49, 0x72, 0xa5, 0xf1, 0xb0, - 0xf3, 0x3d, 0xca, 0x4d, 0x69, 0xda, 0x03, 0x9d, 0x77, 0xd0, 0x42, 0x26, 0x2c, 0x3d, 0xf0, 0xfb, - 0x01, 0x7a, 0x51, 0xb8, 0xdc, 0x60, 0x6c, 0xdd, 0x62, 0xdc, 0xf5, 0x5a, 0x01, 0x95, 0x7b, 0x08, - 0x45, 0x49, 0x01, 0x6b, 0x78, 0x29, 0x2f, 0x33, 0x28, 0xef, 0x67, 0x50, 0x5e, 0x26, 0x23, 0x64, - 0x50, 0xfe, 0xa9, 0x59, 0xa7, 0x60, 0x5b, 0x52, 0x2c, 0xc9, 0x6f, 0x34, 0x74, 0x3a, 0x31, 0x05, - 0x20, 0x5c, 0x45, 0x03, 0x9c, 0x31, 0xc3, 0xb6, 0x98, 0x1f, 0xa1, 0x5c, 0x0f, 0xbb, 0xe4, 0x04, - 0x67, 0xec, 0x91, 0xc5, 0x38, 0x5e, 0x6b, 0x83, 0x79, 0x5c, 0xc0, 0xbc, 0x7c, 0x20, 0x4c, 0x39, - 0x7f, 0x1b, 0xce, 0xdf, 0x6a, 0x68, 0x4c, 0xe0, 0x7c, 0xea, 0xb9, 0x3b, 0x01, 0x13, 0x7c, 0x16, - 0x0d, 0x84, 0x8b, 0x22, 0xd7, 0xf0, 0x44, 0x55, 0xae, 0x06, 0x3e, 0x8d, 0x4e, 0xf0, 0x5d, 0xa3, - 0x61, 0xb2, 0x06, 0x04, 0xb4, 0x9f, 0xef, 0xae, 0x9b, 0xac, 0x81, 0x67, 0x51, 0x5f, 0xd3, 0x73, - 0xdd, 0xcd, 0x33, 0x39, 0x81, 0x66, 0x38, 0x0f, 0x87, 0xd0, 0x53, 0xbf, 0xb1, 0x24, 0xfb, 0xf0, - 0x79, 0x84, 0x20, 0xef, 0x7d, 0x07, 0x2f, 0x08, 0x07, 0x83, 0xa2, 0x45, 0xf8, 0x38, 0x8b, 0x06, - 0xf8, 0xae, 0x61, 0x39, 0x35, 0xba, 0x7b, 0xa6, 0x4f, 0xce, 0xcb, 0x77, 0xef, 0xfb, 0xaf, 0x64, - 0x1e, 0x52, 0x10, 0x70, 0x42, 0x28, 0x27, 0x50, 0xdf, 0x8e, 0x69, 0x03, 0xca, 0x81, 0x92, 0x7c, - 0x09, 0xd3, 0xf5, 0xa9, 0xc8, 0xeb, 0x20, 0x5d, 0xbf, 0x0b, 0xe9, 0x1a, 0xb4, 0x86, 0xab, 0xd1, - 0x2f, 0xf3, 0x1f, 0x56, 0x7b, 0xb6, 0xeb, 0x5a, 0x48, 0x63, 0x58, 0x0e, 0x30, 0x24, 0x0d, 0x34, - 0x21, 0x3c, 0xaf, 0x9b, 0xec, 0x5d, 0x97, 0xd3, 0x5a, 0x10, 0xc6, 0x05, 0x34, 0x26, 0x8f, 0x44, - 0xc3, 0xaa, 0x51, 0x87, 0x5b, 0x9b, 0x16, 0xf5, 0x60, 0x63, 0x8e, 0xca, 0x8e, 0xfb, 0x61, 0x3b, - 0x9e, 0x45, 0xc3, 0x3b, 0x2e, 0xa7, 0x9e, 0x61, 0xca, 0x1d, 0x0e, 0xe1, 0x1d, 0x12, 0x8d, 0xb0, - 0xeb, 0xc9, 0xab, 0x68, 0x32, 0x36, 0x13, 0xb0, 0x98, 0x42, 0x83, 0x0d, 0x93, 0x19, 0xfe, 0xe0, - 0x20, 0x18, 0x03, 0x0d, 0x18, 0x44, 0xde, 0x46, 0xd3, 0xc2, 0xaa, 0x28, 0xe6, 0x2c, 0xb6, 0xa2, - 0x59, 0x0f, 0x83, 0x94, 0x70, 0x34, 0xe8, 0xfb, 0xf5, 0xc4, 0x4e, 0x4c, 0xc0, 0xd6, 0x92, 0xb0, - 0x71, 0x11, 0x0d, 0xfa, 0xef, 0x06, 0x6f, 0x35, 0xa9, 0xe0, 0x75, 0x6a, 0xe9, 0x62, 0xd7, 0x30, - 0xfb, 0xfe, 0x37, 0x5a, 0x4d, 0x5a, 0x1a, 0xd8, 0x81, 0x27, 0xf2, 0x87, 0xe3, 0xe8, 0x42, 0x47, - 0x16, 0x10, 0x85, 0x9e, 0x02, 0xbe, 0x82, 0xfa, 0x05, 0x48, 0x3f, 0xd2, 0x39, 0x91, 0xe6, 0x07, - 0x21, 0x12, 0x8c, 0x4b, 0x60, 0x85, 0xbf, 0x83, 0x46, 0x65, 0xaf, 0xc8, 0x24, 0xc9, 0x2d, 0x27, - 0xb8, 0x5d, 0xed, 0xea, 0xe9, 0x49, 0x64, 0x24, 0x28, 0x8e, 0xb8, 0xed, 0x0d, 0xf8, 0x31, 0x1a, - 0x06, 0x16, 0x8c, 0x9b, 0x7c, 0x9b, 0x89, 0x3c, 0x39, 0xb5, 0x74, 0xa5, 0xab, 0x57, 0x19, 0x95, - 0xb2, 0x30, 0x28, 0x0d, 0x55, 0x94, 0x37, 0xf2, 0x10, 0x9d, 0x13, 0x81, 0x7b, 0x02, 0x63, 0x59, - 0xb1, 0x25, 0xce, 0x56, 0x65, 0xf1, 0x55, 0x22, 0x62, 0x86, 0x20, 0x6a, 0x4a, 0x87, 0xb0, 0x21, - 0xcb, 0xe8, 0x7c, 0x07, 0x67, 0xb0, 0x06, 0xe7, 0xd0, 0x60, 0x00, 0x8a, 0x89, 0xe3, 0x6d, 0xb0, - 0x14, 0x35, 0x90, 0x19, 0xd8, 0x8a, 0xab, 0xb6, 0x1d, 0x78, 0x78, 0xdb, 0x6c, 0x36, 0xa9, 0x17, - 0xa6, 0x69, 0x0b, 0x96, 0x39, 0x6d, 0x04, 0x4c, 0xf1, 0x6e, 0x10, 0x79, 0xea, 0x19, 0x5b, 0xb2, - 0x0f, 0x0e, 0xd2, 0x85, 0x0c, 0x91, 0x0f, 0xfc, 0x05, 0x81, 0x0f, 0xfd, 0x93, 0x17, 0x21, 0x8f, - 0xcb, 0xdb, 0xcd, 0xa6, 0xeb, 0x71, 0x5a, 0x13, 0xcc, 0x18, 0xb9, 0x0b, 0x01, 0x8c, 0xb5, 0x87, - 0x78, 0x2e, 0xa2, 0x7e, 0x31, 0x65, 0x80, 0x22, 0x3c, 0xfb, 0x64, 0x64, 0xa0, 0x93, 0xac, 0xa0, - 0x97, 0x82, 0x8b, 0xec, 0x8e, 0xeb, 0x51, 0x79, 0x94, 0xdc, 0x73, 0xbd, 0xb6, 0xc5, 0xe8, 0x7c, - 0xf4, 0x12, 0x07, 0x91, 0x6e, 0xf6, 0x00, 0x66, 0x1d, 0x9d, 0xf4, 0x59, 0x1b, 0x6d, 0x87, 0xda, - 0xe5, 0xae, 0x71, 0x89, 0xbc, 0x95, 0x50, 0x35, 0x7c, 0x26, 0x53, 0x51, 0x39, 0xa2, 0x8c, 0x80, - 0x65, 0xfa, 0x30, 0x2a, 0x32, 0xd4, 0x4e, 0x00, 0xf1, 0x28, 0x0d, 0xc4, 0x42, 0x46, 0x10, 0x22, - 0xcb, 0x54, 0x20, 0x4b, 0xd1, 0x5c, 0x8f, 0xdd, 0x1a, 0x5d, 0x95, 0xf5, 0x5d, 0x10, 0xb1, 0x09, - 0xd4, 0x27, 0x6f, 0x0c, 0xb9, 0x65, 0xe5, 0x0b, 0xf9, 0x10, 0x4d, 0xa5, 0xda, 0x00, 0xc0, 0x87, - 0x68, 0x48, 0xad, 0x15, 0x01, 0xe1, 0x5c, 0x57, 0x84, 0xaa, 0x9f, 0x93, 0x4e, 0xf4, 0x42, 0x6a, - 0x80, 0x6f, 0xd5, 0xb6, 0x53, 0xf0, 0x1d, 0x55, 0x49, 0xf1, 0x85, 0x06, 0x94, 0xe2, 0xd3, 0x00, - 0xa5, 0x07, 0xe8, 0xa4, 0xd2, 0x0c, 0x5b, 0xb1, 0x07, 0x46, 0xca, 0xcb, 0xd1, 0xd5, 0x17, 0x41, - 0xbe, 0xfb, 0xdb, 0x24, 0xac, 0xe9, 0xef, 0xf9, 0x25, 0x7d, 0xb0, 0x91, 0x7e, 0xa4, 0x41, 0xc2, - 0xa7, 0x0d, 0x01, 0x6a, 0xdf, 0x47, 0xa3, 0x71, 0x45, 0x00, 0x81, 0xec, 0x7e, 0xd4, 0xc6, 0xfc, - 0xc1, 0xb5, 0x3d, 0x52, 0x6d, 0x6f, 0x26, 0xa7, 0xe1, 0x56, 0x5d, 0xa3, 0xfc, 0xa1, 0xd0, 0x15, - 0x01, 0xb6, 0x6f, 0x43, 0x9d, 0xa8, 0x74, 0x00, 0xa2, 0x5b, 0xa8, 0x5f, 0x4a, 0x90, 0x4c, 0x55, - 0x03, 0x18, 0x83, 0x09, 0xb9, 0x00, 0x67, 0x68, 0xb9, 0xe1, 0x7e, 0x12, 0x9c, 0x49, 0x77, 0x94, - 0x2d, 0xe3, 0xc7, 0x64, 0xba, 0xd3, 0x08, 0x00, 0xf0, 0x01, 0x1a, 0xb7, 0x4d, 0xc6, 0x8d, 0xf0, - 0x20, 0x54, 0xf7, 0x71, 0xbe, 0x2b, 0x9a, 0x47, 0x26, 0xe3, 0xed, 0x4e, 0xc7, 0xec, 0x78, 0x13, - 0x79, 0x00, 0x18, 0x8b, 0xbe, 0x78, 0x4b, 0x2b, 0x19, 0xae, 0xa0, 0x51, 0x21, 0xec, 0x92, 0x57, - 0xed, 0x88, 0x68, 0x57, 0x0a, 0x86, 0x6a, 0x50, 0x7f, 0x24, 0x7d, 0x85, 0x45, 0x18, 0x02, 0x67, - 0xce, 0xa6, 0x0b, 0x24, 0x48, 0xf7, 0xfb, 0xce, 0x1f, 0xee, 0xd7, 0x8e, 0xfe, 0x54, 0xce, 0xa6, - 0x4b, 0x68, 0x94, 0x1d, 0xb2, 0x8f, 0x56, 0x5d, 0xaf, 0xc6, 0x8e, 0x3a, 0x0b, 0x3f, 0xd7, 0xe0, - 0x32, 0x48, 0xcc, 0x03, 0x54, 0xd6, 0x62, 0x54, 0x72, 0xd9, 0xa8, 0xc0, 0xde, 0x8c, 0x08, 0x1d, - 0x5d, 0x0e, 0x96, 0xd1, 0x8c, 0x1a, 0x7e, 0x71, 0x5d, 0xac, 0x3a, 0xb5, 0xc7, 0xae, 0x53, 0xcd, - 0x52, 0xf1, 0x4f, 0xa0, 0x3e, 0xc7, 0x1f, 0x0a, 0xf2, 0x4c, 0xbe, 0x90, 0x4d, 0xb8, 0xcc, 0xd2, - 0x9d, 0x76, 0x58, 0xd6, 0x5c, 0xef, 0xcb, 0xaa, 0x9c, 0xad, 0x45, 0xa1, 0x13, 0xc4, 0x0f, 0x06, - 0x47, 0xbd, 0xaa, 0xbf, 0xd2, 0xd4, 0xdd, 0xa3, 0x4c, 0x13, 0x6a, 0xfa, 0x61, 0xf5, 0xf7, 0x8a, - 0xe0, 0xa2, 0x1f, 0x0f, 0x2e, 0x7a, 0xd5, 0x66, 0xa8, 0x12, 0xbd, 0xb0, 0xa3, 0x5b, 0xc5, 0x55, - 0x58, 0xc5, 0x35, 0xca, 0x95, 0xd9, 0x8a, 0xbe, 0x14, 0x68, 0x04, 0xe1, 0x68, 0x97, 0x57, 0x7e, - 0x38, 0x86, 0x14, 0x79, 0x45, 0xde, 0x8f, 0x0a, 0x90, 0x14, 0x17, 0x40, 0xf5, 0x35, 0x34, 0xa4, - 0x52, 0x85, 0xa0, 0xa6, 0x32, 0x3d, 0xa9, 0x30, 0x25, 0xb7, 0xa3, 0x63, 0x5c, 0x19, 0xe3, 0x97, - 0xa0, 0x19, 0x36, 0x19, 0xf9, 0x61, 0x2a, 0x3b, 0xb0, 0x06, 0x64, 0xef, 0x23, 0xac, 0x22, 0x13, - 0xd5, 0x31, 0x05, 0x7c, 0xd7, 0x0e, 0xd8, 0x55, 0x31, 0x97, 0xa3, 0x95, 0x58, 0xcb, 0xd2, 0x2f, - 0x5f, 0x46, 0x7d, 0x02, 0x01, 0xfe, 0x4c, 0x43, 0xfd, 0xb2, 0xf0, 0xc0, 0x85, 0xae, 0x5e, 0x93, - 0x1a, 0x53, 0x7f, 0x25, 0xbb, 0x81, 0x24, 0x45, 0x66, 0x7f, 0xfc, 0xf7, 0xff, 0xfe, 0xec, 0xf8, - 0x79, 0x3c, 0x55, 0xf0, 0xc7, 0x5f, 0x13, 0xa6, 0x85, 0xd8, 0x2f, 0x53, 0xf8, 0x4f, 0x1a, 0x1a, - 0x08, 0x24, 0x1f, 0x5e, 0x3c, 0x78, 0x8e, 0x98, 0x10, 0xd5, 0x97, 0x7a, 0x31, 0x01, 0x60, 0x0f, - 0x04, 0xb0, 0x6f, 0xe1, 0x62, 0x2a, 0xb0, 0x50, 0x6c, 0x16, 0xf6, 0x12, 0x8a, 0x6b, 0xbf, 0xb0, - 0xd7, 0x26, 0x09, 0xf7, 0xf1, 0x3f, 0x34, 0x84, 0x93, 0xb2, 0x0d, 0xdf, 0x3a, 0x18, 0x56, 0x47, - 0xc9, 0xaa, 0xdf, 0x3e, 0x9c, 0x31, 0xb0, 0xbb, 0x2b, 0xd8, 0xbd, 0x89, 0x97, 0x53, 0xd9, 0x01, - 0xa5, 0x4a, 0x4b, 0x61, 0x95, 0x46, 0x14, 0xff, 0x55, 0x43, 0xa3, 0x71, 0x25, 0x84, 0x6f, 0x1e, - 0x8c, 0xac, 0x83, 0x14, 0xd3, 0xdf, 0x38, 0x8c, 0x29, 0x50, 0xba, 0x23, 0x28, 0x2d, 0xe3, 0x5b, - 0xa9, 0x94, 0x42, 0x09, 0xe6, 0xb3, 0x92, 0x7d, 0x7b, 0x09, 0xd5, 0xb7, 0x8f, 0xff, 0xac, 0x21, - 0x9c, 0x54, 0x5e, 0x59, 0x56, 0xaa, 0xa3, 0xa2, 0xcb, 0xb2, 0x52, 0x9d, 0xc5, 0x1e, 0x59, 0x14, - 0xb4, 0x16, 0xf0, 0x95, 0x54, 0x5a, 0xa6, 0x6d, 0x1b, 0x71, 0x2d, 0x88, 0x7f, 0xa7, 0xa1, 0x91, - 0x98, 0x56, 0xcb, 0x92, 0x35, 0x31, 0x13, 0xfd, 0x66, 0xcf, 0x26, 0x21, 0xe8, 0xab, 0x02, 0xf4, - 0x25, 0xfc, 0x72, 0x2a, 0x68, 0x16, 0xc3, 0xf6, 0x6f, 0x0d, 0x4d, 0xa6, 0x8a, 0x3a, 0xbc, 0x72, - 0x30, 0x84, 0x6e, 0x6a, 0x52, 0x7f, 0xf3, 0xd0, 0xf6, 0x99, 0x36, 0x55, 0x9d, 0x72, 0xa3, 0x6a, - 0x5b, 0xd4, 0xe1, 0xa0, 0xf4, 0x8c, 0x4d, 0xd7, 0x0b, 0x76, 0x57, 0x70, 0xd4, 0xef, 0xe3, 0xdf, - 0x6b, 0x68, 0xb8, 0x6d, 0x1a, 0xfc, 0x5a, 0x8f, 0xb8, 0x02, 0x3e, 0xaf, 0xf7, 0x6c, 0x97, 0x69, - 0x41, 0x04, 0x8f, 0x48, 0xaf, 0xe2, 0x2f, 0xb4, 0x36, 0x2d, 0x85, 0xb3, 0x4d, 0x9b, 0xd4, 0x7e, - 0xfa, 0x8d, 0xde, 0x0d, 0x01, 0xf0, 0x2b, 0x02, 0xf0, 0x3c, 0x9e, 0x4b, 0x05, 0xac, 0xa8, 0xcf, - 0xc2, 0x9e, 0x10, 0xbc, 0xfb, 0xfe, 0xae, 0x3f, 0xa5, 0x78, 0x5a, 0xb5, 0xed, 0x2c, 0xb8, 0x53, - 0x35, 0x6b, 0x16, 0xdc, 0xe9, 0x2a, 0x94, 0xcc, 0x09, 0xdc, 0x04, 0xcf, 0x1c, 0x84, 0x1b, 0xff, - 0x51, 0x43, 0x23, 0x31, 0x81, 0x96, 0xe5, 0x9c, 0xe9, 0xa8, 0x24, 0xb3, 0x9c, 0x33, 0x9d, 0x35, - 0x26, 0xb9, 0x26, 0x80, 0x5f, 0xc6, 0x17, 0x53, 0x81, 0xc7, 0xe5, 0x27, 0xfe, 0xb9, 0x86, 0xfa, - 0xa5, 0xac, 0xc3, 0x4b, 0x99, 0xe6, 0x6d, 0x53, 0x96, 0xfa, 0xf5, 0x9e, 0x6c, 0x32, 0xd5, 0x0a, - 0x52, 0x5c, 0xe2, 0xbf, 0x68, 0x68, 0x2c, 0x21, 0x1b, 0x71, 0x86, 0x8b, 0xa5, 0x93, 0x1a, 0xd5, - 0x6f, 0x1d, 0xca, 0x16, 0x30, 0xdf, 0x14, 0x98, 0xaf, 0xe3, 0x45, 0x15, 0x73, 0xe0, 0x45, 0x39, - 0x12, 0x1b, 0xee, 0x27, 0x31, 0x2d, 0x8b, 0xff, 0xa6, 0xa1, 0xb1, 0x84, 0x64, 0xcc, 0xc2, 0xa4, - 0x93, 0x66, 0xcd, 0xc2, 0xa4, 0xa3, 0x46, 0x3d, 0xe0, 0x28, 0x94, 0x3a, 0x27, 0x5e, 0x31, 0xc4, - 0x04, 0xf2, 0xbe, 0x5f, 0xc9, 0xe1, 0x35, 0xca, 0x63, 0xe2, 0x11, 0x67, 0xcb, 0xb7, 0x14, 0x5d, - 0x9b, 0xe5, 0x92, 0xea, 0xa0, 0x54, 0xc9, 0x92, 0x20, 0x74, 0x15, 0xcf, 0x77, 0x3c, 0x13, 0xfd, - 0xdb, 0x55, 0x72, 0xf0, 0x00, 0xe8, 0xd7, 0x1a, 0x9a, 0x14, 0xce, 0x58, 0x4c, 0xf3, 0xe1, 0xe5, - 0xcc, 0xb1, 0x4d, 0x13, 0xa0, 0xfa, 0xca, 0x61, 0xcd, 0x81, 0xcc, 0xba, 0x20, 0x53, 0xc4, 0x6f, - 0x75, 0x5f, 0x1d, 0x99, 0xc2, 0xa6, 0x53, 0x33, 0x84, 0x8c, 0x55, 0x6e, 0xa9, 0xc2, 0x9e, 0x68, - 0xd9, 0xf7, 0xcf, 0xa5, 0x70, 0x89, 0x14, 0x21, 0xf7, 0x7a, 0xc6, 0x40, 0xc7, 0x35, 0xaa, 0x7e, - 0xa3, 0x77, 0xc3, 0x1e, 0x17, 0x48, 0x11, 0xa6, 0xf8, 0x5f, 0x1a, 0x9a, 0x48, 0xd3, 0x77, 0x59, - 0xd6, 0xa7, 0x8b, 0xb4, 0xd4, 0x57, 0x0e, 0x6b, 0x0e, 0x5c, 0x8a, 0x82, 0xcb, 0x6d, 0xfc, 0x46, - 0x47, 0x2e, 0x6d, 0xda, 0xae, 0xd2, 0x12, 0x1a, 0xd6, 0x4f, 0xa1, 0x40, 0xcf, 0xee, 0xe3, 0xff, - 0x69, 0x48, 0x4f, 0x11, 0x88, 0x41, 0xdd, 0x7d, 0xbb, 0x57, 0x88, 0xaa, 0x38, 0xd5, 0x97, 0x0f, - 0x69, 0x9d, 0x49, 0x2e, 0x25, 0xf8, 0x09, 0xed, 0x1a, 0x6d, 0x48, 0xab, 0xa6, 0xd6, 0x4b, 0x3f, - 0xd5, 0x50, 0x9f, 0xf8, 0x3f, 0x27, 0xce, 0x67, 0xd0, 0x93, 0xca, 0x3f, 0x6e, 0xf5, 0x42, 0xe6, - 0xf1, 0x00, 0x9b, 0x08, 0xd8, 0xe7, 0xb0, 0x9e, 0x2e, 0x3f, 0x05, 0x88, 0xcf, 0x65, 0xf9, 0x16, - 0xfd, 0xf3, 0x3d, 0x63, 0xf9, 0x96, 0xf8, 0x86, 0x21, 0x63, 0xf9, 0x96, 0xfc, 0x68, 0x81, 0xe4, - 0x05, 0xcc, 0x39, 0x7c, 0x49, 0x85, 0x19, 0xdd, 0xc9, 0x22, 0xbe, 0x9c, 0xb1, 0x40, 0x71, 0xe2, - 0x5f, 0x1c, 0x47, 0xd3, 0xdd, 0xbf, 0x17, 0xc0, 0x6b, 0x3d, 0x62, 0xe9, 0xf4, 0xf5, 0x83, 0xbe, - 0xfe, 0xcd, 0x1d, 0x01, 0xcb, 0x9a, 0x60, 0xf9, 0x01, 0xfe, 0x5e, 0x36, 0x96, 0x46, 0x43, 0x7c, - 0x58, 0x60, 0x55, 0x4d, 0xbb, 0xb0, 0x97, 0xfa, 0x01, 0xc6, 0x7e, 0x61, 0x2f, 0xfe, 0x91, 0x85, - 0xd8, 0x5d, 0xb9, 0x8d, 0x72, 0x39, 0xcb, 0x8f, 0x1b, 0x6d, 0xdf, 0xbb, 0x64, 0xf9, 0x71, 0xa3, - 0xfd, 0x53, 0x98, 0xf4, 0xdd, 0xa5, 0x10, 0xf2, 0x61, 0xfc, 0x5a, 0x43, 0x28, 0xfa, 0x48, 0x02, - 0x67, 0x28, 0x8c, 0x12, 0x5f, 0x6d, 0xe8, 0xaf, 0xf6, 0x66, 0x04, 0xe8, 0xae, 0x08, 0x74, 0xb3, - 0xf8, 0xa5, 0x0e, 0xe8, 0x78, 0x68, 0x52, 0xbc, 0xff, 0xe5, 0xb3, 0x69, 0xed, 0xab, 0x67, 0xd3, - 0xda, 0xd7, 0xcf, 0xa6, 0xb5, 0xcf, 0x9e, 0x4f, 0x1f, 0xfb, 0xea, 0xf9, 0xf4, 0xb1, 0x7f, 0x3e, - 0x9f, 0x3e, 0xf6, 0x5e, 0xa1, 0x6e, 0xf1, 0xc6, 0x76, 0x25, 0x5f, 0x75, 0xb7, 0x52, 0x2b, 0x9c, - 0xdd, 0x28, 0x9b, 0x78, 0xab, 0x49, 0x59, 0xa5, 0x5f, 0x7c, 0x52, 0x74, 0xfd, 0xff, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xf0, 0xbc, 0x9e, 0xdb, 0xdf, 0x25, 0x00, 0x00, + // 2593 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xdd, 0x6f, 0x1c, 0x57, + 0x15, 0xcf, 0xc4, 0xb5, 0x63, 0x1f, 0xdb, 0x89, 0x7d, 0xe3, 0x34, 0xc9, 0x38, 0x71, 0xdc, 0x9b, + 0xa6, 0x49, 0xec, 0x64, 0xb7, 0x71, 0x4a, 0x9b, 0x34, 0x71, 0x5a, 0x6f, 0x48, 0xec, 0x7c, 0x34, + 0x49, 0xd7, 0xa6, 0x45, 0x29, 0xb0, 0xcc, 0xee, 0x5e, 0xef, 0x4e, 0x3b, 0x9e, 0xd9, 0xce, 0x8c, + 0x5d, 0x6f, 0x8d, 0x05, 0xe2, 0xb1, 0xe2, 0xa1, 0x12, 0x12, 0xbc, 0xf6, 0x05, 0xde, 0x40, 0xa8, + 0x12, 0x02, 0x09, 0xf1, 0x00, 0x2f, 0xf4, 0x01, 0xa1, 0x22, 0x24, 0x04, 0x0f, 0xa0, 0x2a, 0x81, + 0xbf, 0x03, 0x34, 0x77, 0xce, 0xcc, 0xdc, 0xf9, 0xd8, 0xd9, 0xbb, 0xee, 0xf6, 0x69, 0x67, 0xee, + 0xbd, 0xe7, 0xdc, 0xdf, 0xef, 0xdc, 0xaf, 0xf3, 0x9b, 0xbd, 0x30, 0x65, 0x55, 0x1d, 0x66, 0x6f, + 0x31, 0xbb, 0xf8, 0xfe, 0x26, 0xb3, 0xdb, 0x85, 0x96, 0x6d, 0xb9, 0x16, 0x99, 0xfe, 0x90, 0xb9, + 0x5a, 0xad, 0xa9, 0xe9, 0x66, 0x81, 0x3f, 0x59, 0x36, 0x2b, 0x04, 0x0d, 0xd5, 0xc3, 0x35, 0x6b, + 0x63, 0xc3, 0x32, 0x8b, 0xfe, 0x8f, 0x6f, 0xa1, 0xce, 0xd5, 0x2c, 0x67, 0xc3, 0x72, 0x8a, 0x55, + 0xcd, 0x61, 0xbe, 0xab, 0xe2, 0xd6, 0xa5, 0x2a, 0x73, 0xb5, 0x4b, 0xc5, 0x96, 0xd6, 0xd0, 0x4d, + 0xcd, 0xd5, 0xc3, 0xb6, 0x53, 0x0d, 0xab, 0x61, 0xf1, 0xc7, 0xa2, 0xf7, 0x84, 0xa5, 0x27, 0x1a, + 0x96, 0xd5, 0x30, 0x58, 0x51, 0x6b, 0xe9, 0x45, 0xcd, 0x34, 0x2d, 0x97, 0x9b, 0x38, 0x58, 0x7b, + 0x24, 0xc4, 0x59, 0xd5, 0x0c, 0xc3, 0x72, 0x03, 0x57, 0x51, 0xb1, 0xa1, 0x6d, 0x30, 0x2c, 0x9d, + 0x16, 0x4a, 0xad, 0xda, 0x7b, 0x95, 0x26, 0xd3, 0xea, 0xcc, 0x4e, 0x55, 0x72, 0x82, 0x15, 0xd3, + 0x32, 0x6b, 0x2c, 0xe8, 0xe6, 0x54, 0x54, 0x69, 0x5b, 0x8e, 0xe3, 0xb7, 0x58, 0x37, 0xb4, 0x46, + 0x1a, 0xc7, 0x7b, 0xac, 0xdd, 0x60, 0x66, 0xca, 0xa9, 0x69, 0xd5, 0x59, 0x45, 0xab, 0xd5, 0xac, + 0x4d, 0x33, 0x00, 0x79, 0x34, 0xac, 0x0c, 0x1e, 0x52, 0xce, 0x5a, 0x9a, 0xad, 0x6d, 0x04, 0x7d, + 0x9c, 0x8c, 0x8a, 0x99, 0x59, 0xd7, 0xcd, 0x46, 0x1c, 0x23, 0x09, 0xab, 0x5d, 0x07, 0xcb, 0xe8, + 0x02, 0xa8, 0x6f, 0x7a, 0x41, 0x5f, 0x66, 0xee, 0x4d, 0x0f, 0xf3, 0x03, 0x6e, 0x50, 0x66, 0xef, + 0x6f, 0x32, 0xc7, 0x25, 0x53, 0x30, 0xa8, 0x9b, 0x75, 0xb6, 0x7d, 0x4c, 0x99, 0x55, 0xce, 0x8d, + 0x94, 0xfd, 0x17, 0x6a, 0xc1, 0x74, 0xa6, 0x8d, 0xd3, 0xb2, 0x4c, 0x87, 0x91, 0x47, 0x30, 0x2a, + 0x14, 0x73, 0xd3, 0xd1, 0x85, 0x73, 0x85, 0x9c, 0x99, 0x51, 0x10, 0xda, 0x97, 0x9e, 0xf9, 0xec, + 0xdf, 0xa7, 0xf6, 0x95, 0x45, 0x17, 0xb4, 0x8e, 0x20, 0x97, 0x0c, 0x23, 0x03, 0xe4, 0x6d, 0x80, + 0x68, 0xa6, 0x60, 0x77, 0x2f, 0x14, 0xfc, 0x69, 0x55, 0xf0, 0xa6, 0x55, 0xc1, 0x9f, 0xa1, 0x38, + 0xad, 0x0a, 0x8f, 0xb4, 0x06, 0x43, 0xdb, 0xb2, 0x60, 0x49, 0x7f, 0xab, 0x20, 0xaf, 0x64, 0x37, + 0x9d, 0x78, 0x0d, 0x7c, 0x49, 0x5e, 0x64, 0x39, 0x86, 0x7c, 0x3f, 0x47, 0x7e, 0xb6, 0x2b, 0x72, + 0x1f, 0x4e, 0x0c, 0xfa, 0x3a, 0x9c, 0x08, 0x90, 0x3f, 0xf2, 0x47, 0xfe, 0xab, 0x09, 0xd1, 0x1f, + 0x14, 0x38, 0xd9, 0xa1, 0x23, 0x0c, 0xd2, 0xdb, 0x70, 0x30, 0x3e, 0xf7, 0x30, 0x4e, 0x73, 0xb9, + 0x71, 0x8a, 0xf9, 0xc2, 0x48, 0x8d, 0xb7, 0xc4, 0xc2, 0xfe, 0xc5, 0x6a, 0x11, 0x66, 0x39, 0x85, + 0x78, 0x9f, 0x6d, 0x3e, 0x2e, 0x41, 0xbc, 0x8e, 0xc3, 0xb0, 0xbf, 0x82, 0xf5, 0x3a, 0x8f, 0xd6, + 0x40, 0xf9, 0x00, 0x7f, 0xbf, 0x53, 0xa7, 0xdf, 0x83, 0xe7, 0x72, 0xcc, 0x73, 0xa2, 0xa0, 0xf4, + 0x21, 0x0a, 0x74, 0x0a, 0x48, 0xb0, 0xf4, 0xd6, 0x56, 0x57, 0x11, 0x2e, 0x7d, 0x08, 0x87, 0x63, + 0xa5, 0x88, 0xe2, 0x0a, 0x0c, 0xac, 0xad, 0xae, 0x62, 0xd7, 0xb3, 0xb9, 0x5d, 0xaf, 0xad, 0xae, + 0x62, 0x87, 0x9e, 0x09, 0xbd, 0x05, 0xc7, 0x43, 0x87, 0x8e, 0xb3, 0x54, 0xaf, 0xdb, 0xcc, 0x09, + 0x27, 0xd3, 0x39, 0x98, 0xa8, 0xea, 0x6e, 0xcd, 0xd2, 0xcd, 0x4a, 0x18, 0xa4, 0xfd, 0x3c, 0x48, + 0x07, 0xb1, 0xfc, 0x26, 0xc6, 0xea, 0xf5, 0x68, 0x73, 0x11, 0xdd, 0x20, 0xbc, 0x09, 0x18, 0x60, + 0x6e, 0x13, 0xb7, 0x16, 0xef, 0xd1, 0x2b, 0xa9, 0xba, 0x35, 0xee, 0x6c, 0xa4, 0xec, 0x3d, 0xd2, + 0x8f, 0x14, 0x98, 0x4b, 0xbb, 0x28, 0xb5, 0x6f, 0xeb, 0xa6, 0x66, 0xe8, 0x1f, 0xb2, 0xfa, 0x0a, + 0xd3, 0x1b, 0x4d, 0x37, 0x80, 0xb6, 0x00, 0x47, 0xd6, 0x83, 0x9a, 0x8a, 0xc7, 0xb2, 0xd2, 0xe4, + 0xf5, 0x38, 0x88, 0x87, 0xc3, 0xca, 0xc7, 0xcc, 0xd5, 0x7c, 0xd3, 0x1e, 0xe8, 0xbc, 0x09, 0xf3, + 0x52, 0x58, 0x7a, 0xe0, 0xf7, 0x5d, 0x78, 0x96, 0xbb, 0x5c, 0x73, 0x9c, 0x15, 0xdd, 0x71, 0x2d, + 0xbb, 0xdd, 0xef, 0x25, 0xfb, 0x33, 0x05, 0x8e, 0xa6, 0xba, 0x40, 0x84, 0x4b, 0x30, 0xec, 0x3a, + 0x4e, 0xc5, 0xd0, 0x1d, 0x17, 0x97, 0xa9, 0xec, 0x2c, 0x39, 0xe0, 0x3a, 0xce, 0x7d, 0xdd, 0x71, + 0xfb, 0xb7, 0x2c, 0x7f, 0xae, 0xc0, 0xa4, 0xbf, 0xb0, 0x6c, 0x6b, 0x8b, 0x75, 0x5f, 0x88, 0xe4, + 0x28, 0x1c, 0x70, 0xb7, 0x2b, 0x4d, 0xcd, 0x69, 0x62, 0x40, 0x87, 0xdc, 0xed, 0x15, 0xcd, 0x69, + 0x92, 0xd3, 0x30, 0xd8, 0xb2, 0x2d, 0x6b, 0xfd, 0xd8, 0x00, 0x47, 0x33, 0x5e, 0xc0, 0x7c, 0xe3, + 0x91, 0x57, 0x58, 0xf6, 0xeb, 0xc8, 0x49, 0x00, 0x3c, 0xe2, 0x3d, 0x07, 0xcf, 0x70, 0x07, 0x23, + 0xbc, 0x84, 0xfb, 0x38, 0x0e, 0xc3, 0xee, 0x76, 0xc5, 0x3f, 0xfb, 0x06, 0xfd, 0x7e, 0xdd, 0xed, + 0x3b, 0xfc, 0xf4, 0x9b, 0xc3, 0x25, 0x88, 0x38, 0x31, 0x94, 0x53, 0x30, 0xb8, 0xa5, 0x19, 0x88, + 0x72, 0xb8, 0xec, 0xbf, 0x84, 0xcb, 0xf5, 0x11, 0x3f, 0xa5, 0x83, 0xe5, 0xfa, 0x4d, 0x5c, 0xae, + 0x41, 0x69, 0x38, 0x1a, 0x43, 0xfe, 0x69, 0x8e, 0xa3, 0x7d, 0x3a, 0x7f, 0xb3, 0xe0, 0x4d, 0x71, + 0x38, 0xd0, 0x90, 0x36, 0x61, 0x8a, 0x7b, 0x5e, 0xd1, 0x9c, 0xb7, 0x2c, 0x97, 0xd5, 0x83, 0x30, + 0xce, 0xc3, 0xa4, 0x9f, 0xfd, 0x54, 0xf4, 0x3a, 0x33, 0x5d, 0x7d, 0x5d, 0x67, 0x36, 0x4e, 0xcc, + 0x09, 0xbf, 0xe2, 0x4e, 0x58, 0x4e, 0x4e, 0xc3, 0xf8, 0x96, 0xe5, 0x32, 0xbb, 0xa2, 0xf9, 0x33, + 0x1c, 0xc3, 0x3b, 0xc6, 0x0b, 0x71, 0xd6, 0xd3, 0x97, 0xe0, 0x48, 0xa2, 0x27, 0x64, 0x31, 0x0d, + 0x23, 0x4d, 0xcd, 0xa9, 0x78, 0x8d, 0x83, 0x60, 0x0c, 0x37, 0xb1, 0x11, 0x7d, 0x03, 0x66, 0xb8, + 0x55, 0x89, 0xf7, 0x59, 0x6a, 0x47, 0xbd, 0xee, 0x05, 0x29, 0x75, 0x61, 0xc4, 0xf3, 0x6b, 0xf3, + 0x99, 0x98, 0x82, 0xad, 0xa4, 0x61, 0x93, 0x12, 0x8c, 0x78, 0xef, 0x15, 0xb7, 0xdd, 0x62, 0x9c, + 0xd7, 0xc1, 0x85, 0x33, 0xb9, 0x61, 0xf6, 0xfc, 0xaf, 0xb5, 0x5b, 0xac, 0x3c, 0xbc, 0x85, 0x4f, + 0xf4, 0x37, 0xfb, 0xe1, 0x54, 0x47, 0x16, 0x18, 0x85, 0x9e, 0x02, 0x7e, 0x03, 0x86, 0x38, 0x48, + 0x2f, 0xd2, 0x03, 0x7c, 0x99, 0x77, 0x43, 0xc4, 0x19, 0x97, 0xd1, 0x8a, 0xbc, 0x0d, 0x13, 0x7e, + 0x2d, 0x5f, 0x49, 0x3e, 0xb7, 0x01, 0xce, 0xed, 0x42, 0xae, 0xa7, 0x87, 0x91, 0x11, 0xa7, 0x78, + 0xc8, 0x8a, 0x17, 0x90, 0x07, 0x30, 0x8e, 0x2c, 0x1c, 0x57, 0x73, 0x37, 0x1d, 0xbe, 0x4e, 0x0e, + 0x2e, 0x9c, 0xcf, 0xf5, 0xea, 0x47, 0x65, 0x95, 0x1b, 0x94, 0xc7, 0xaa, 0xc2, 0x1b, 0xbd, 0x87, + 0x69, 0xca, 0x43, 0x6c, 0x9b, 0x3c, 0x76, 0xe7, 0x61, 0x52, 0x24, 0xc2, 0x7b, 0x08, 0xa2, 0x26, + 0x54, 0x70, 0x1b, 0xba, 0x88, 0xa9, 0x48, 0xda, 0x19, 0x8e, 0xc1, 0x09, 0x18, 0x09, 0x40, 0xf9, + 0x59, 0xc8, 0x48, 0x39, 0x2a, 0xa0, 0xb3, 0x38, 0x15, 0x97, 0x0c, 0x23, 0xf0, 0xf0, 0x86, 0xd6, + 0x6a, 0x31, 0x3b, 0x5c, 0xa6, 0x6d, 0x1c, 0xe6, 0xac, 0x16, 0xd8, 0xc5, 0x5b, 0x41, 0xe4, 0x99, + 0x5d, 0xd9, 0xf0, 0xeb, 0x70, 0x23, 0x9d, 0x97, 0x88, 0x7c, 0xe0, 0x2f, 0x08, 0x7c, 0xe8, 0x9f, + 0x3e, 0x8b, 0xeb, 0x78, 0x75, 0xb3, 0xd5, 0xb2, 0x6c, 0x97, 0xd5, 0x39, 0x33, 0x87, 0xde, 0xc2, + 0x00, 0x26, 0xca, 0x43, 0x3c, 0x67, 0x60, 0x88, 0x77, 0x19, 0xa0, 0x08, 0xf7, 0x3e, 0x3f, 0x32, + 0x58, 0x49, 0x6f, 0x60, 0x0e, 0xe3, 0x25, 0xf0, 0x96, 0xcd, 0xfc, 0xad, 0xe4, 0xb6, 0x65, 0xcb, + 0xe6, 0x40, 0x26, 0xd0, 0x3c, 0x7b, 0x04, 0xb3, 0x02, 0xa3, 0x1e, 0xeb, 0x4a, 0x6c, 0x53, 0x3b, + 0x9b, 0x9f, 0x2f, 0x87, 0xde, 0xca, 0x50, 0x0b, 0x9f, 0xe9, 0x74, 0x94, 0x8e, 0x08, 0x2d, 0x70, + 0x98, 0xde, 0x15, 0x14, 0x8c, 0x50, 0x89, 0x20, 0xee, 0x67, 0x81, 0x98, 0x97, 0x04, 0xc1, 0x57, + 0x99, 0x08, 0x44, 0x50, 0x4b, 0x0f, 0xac, 0x3a, 0x5b, 0xf2, 0xd5, 0x5a, 0xbe, 0x5a, 0x7a, 0x37, + 0x52, 0x4b, 0x31, 0x1b, 0x04, 0x78, 0x0f, 0xc6, 0x44, 0xe5, 0x27, 0x25, 0x97, 0x44, 0x3f, 0xa3, + 0x66, 0xf4, 0x22, 0x0a, 0xa5, 0x0c, 0x7c, 0xfd, 0x4a, 0x29, 0x3e, 0x15, 0x84, 0x52, 0x16, 0xa5, + 0xbb, 0x30, 0x2a, 0x14, 0x4b, 0x09, 0xa5, 0x18, 0x23, 0xe1, 0xa5, 0x7f, 0xf9, 0x45, 0xb0, 0xde, + 0xbd, 0x69, 0x12, 0x2a, 0xf4, 0xdb, 0x9e, 0x40, 0x0f, 0x26, 0xd2, 0x0f, 0x14, 0x5c, 0xf0, 0x59, + 0x4d, 0x90, 0xda, 0xb7, 0x61, 0x22, 0xa9, 0xef, 0x31, 0x90, 0xf9, 0x5b, 0x6d, 0xc2, 0x1f, 0x1e, + 0xdb, 0x87, 0x6a, 0xf1, 0x62, 0x7a, 0x14, 0x4f, 0xd5, 0x65, 0xe6, 0xde, 0xe3, 0x5f, 0x09, 0x02, + 0x6c, 0xdf, 0xc0, 0x3c, 0x51, 0xa8, 0x40, 0x44, 0xd7, 0x60, 0xc8, 0xff, 0xa0, 0x20, 0x95, 0x35, + 0xa0, 0x31, 0x9a, 0xd0, 0x53, 0xb8, 0x87, 0xae, 0x36, 0xad, 0x0f, 0x82, 0x3d, 0xe9, 0xa6, 0x30, + 0x65, 0xbc, 0x98, 0xcc, 0x74, 0x6a, 0x81, 0x00, 0xbe, 0x03, 0x87, 0x0d, 0xcd, 0x71, 0x2b, 0xe1, + 0x46, 0x28, 0xce, 0xe3, 0x42, 0x2e, 0x9a, 0xfb, 0x9a, 0xe3, 0xc6, 0x9d, 0x4e, 0x1a, 0xc9, 0x22, + 0x7a, 0x17, 0x31, 0x96, 0x0c, 0x6d, 0x83, 0x65, 0xa5, 0x0c, 0xe7, 0x61, 0x82, 0x7f, 0xc3, 0x49, + 0x1f, 0xb5, 0x87, 0x78, 0xb9, 0x90, 0x30, 0xd4, 0x82, 0xfc, 0x23, 0xed, 0x2b, 0x4c, 0xc2, 0x00, + 0x9d, 0x99, 0xeb, 0x16, 0x92, 0xa0, 0xf9, 0xe7, 0x9d, 0xd7, 0xdc, 0xcb, 0x1d, 0xbd, 0xae, 0xcc, + 0x75, 0x8b, 0xb2, 0x68, 0x75, 0xf8, 0x75, 0xac, 0x66, 0xd9, 0xf5, 0xbe, 0x6b, 0xf1, 0x5f, 0x29, + 0x91, 0xe8, 0x8f, 0xf7, 0x83, 0x54, 0x96, 0x13, 0x54, 0x06, 0xe4, 0xa8, 0xe0, 0xdc, 0x8c, 0x08, + 0xf5, 0x6f, 0x0d, 0xae, 0xa2, 0xf4, 0xc6, 0xf0, 0xf3, 0xe3, 0x62, 0xc9, 0xac, 0x73, 0x6d, 0x2b, + 0x91, 0xf1, 0x4f, 0xc1, 0x20, 0x57, 0xd3, 0x28, 0xcf, 0xfc, 0x17, 0xba, 0x8e, 0x87, 0x59, 0xb6, + 0xd3, 0x0e, 0xc3, 0x3a, 0xd0, 0xfb, 0xb0, 0x0a, 0x7b, 0x6b, 0x89, 0xeb, 0x04, 0xfe, 0x6d, 0xb0, + 0xdf, 0xa3, 0xfa, 0x89, 0x22, 0xce, 0x1e, 0xa1, 0x9b, 0x50, 0xd3, 0x8f, 0x8b, 0x9f, 0x26, 0x83, + 0x83, 0xfe, 0x70, 0x70, 0xd0, 0x8b, 0x36, 0x63, 0xd5, 0xe8, 0xa5, 0x8f, 0x1f, 0x50, 0x96, 0x70, + 0x14, 0x97, 0x99, 0x2b, 0xf4, 0x56, 0xf2, 0xa4, 0x40, 0x33, 0x08, 0x47, 0x5c, 0x5e, 0x79, 0xe1, + 0x18, 0x13, 0xe4, 0x15, 0x7d, 0x27, 0x4a, 0x40, 0x32, 0x5c, 0x20, 0xd5, 0x97, 0x61, 0x4c, 0xa4, + 0x8a, 0x41, 0xcd, 0x64, 0x3a, 0x2a, 0x30, 0xa5, 0xd7, 0xa3, 0x6d, 0x5c, 0x68, 0xe3, 0xa5, 0xa0, + 0x12, 0x93, 0x8c, 0x7e, 0x3f, 0x93, 0x1d, 0x5a, 0x23, 0xb2, 0x77, 0x80, 0x88, 0xc8, 0x78, 0x76, + 0xcc, 0x10, 0xdf, 0xc5, 0x2e, 0xb3, 0x2a, 0xe1, 0x72, 0xa2, 0x9a, 0x28, 0x59, 0xf8, 0xdf, 0x79, + 0x18, 0xe4, 0x08, 0xc8, 0xc7, 0x0a, 0x0c, 0xf9, 0x89, 0x07, 0x29, 0xe6, 0x7a, 0x4d, 0x6b, 0x4c, + 0xf5, 0x45, 0x79, 0x03, 0x9f, 0x14, 0x3d, 0xfd, 0xc3, 0xbf, 0xfd, 0xe7, 0xc7, 0xfb, 0x4f, 0x92, + 0xe9, 0xa2, 0xd7, 0xfe, 0x22, 0x37, 0x2d, 0x26, 0xbe, 0x33, 0x93, 0xdf, 0x2b, 0x30, 0x1c, 0x48, + 0x3e, 0x72, 0xa9, 0x7b, 0x1f, 0x09, 0x21, 0xaa, 0x2e, 0xf4, 0x62, 0x82, 0xc0, 0xee, 0x72, 0x60, + 0x5f, 0x27, 0xa5, 0x4c, 0x60, 0xa1, 0xd8, 0x2c, 0xee, 0xa4, 0x14, 0xd7, 0x6e, 0x71, 0x27, 0x26, + 0x09, 0x77, 0xc9, 0xdf, 0x15, 0x20, 0x69, 0xd9, 0x46, 0xae, 0x75, 0x87, 0xd5, 0x51, 0xb2, 0xaa, + 0xd7, 0xf7, 0x66, 0x8c, 0xec, 0x6e, 0x71, 0x76, 0xaf, 0x91, 0xc5, 0x4c, 0x76, 0x48, 0xa9, 0xda, + 0x16, 0x58, 0x65, 0x11, 0x25, 0x7f, 0x51, 0x60, 0x22, 0xa9, 0x84, 0xc8, 0xd5, 0xee, 0xc8, 0x3a, + 0x48, 0x31, 0xf5, 0xd5, 0xbd, 0x98, 0x22, 0xa5, 0x9b, 0x9c, 0xd2, 0x22, 0xb9, 0x96, 0x49, 0x29, + 0x94, 0x60, 0x1e, 0x2b, 0xbf, 0x6e, 0x27, 0xa5, 0xfa, 0x76, 0xc9, 0x1f, 0x15, 0x20, 0x69, 0xe5, + 0x25, 0x33, 0x52, 0x1d, 0x15, 0x9d, 0xcc, 0x48, 0x75, 0x16, 0x7b, 0xf4, 0x12, 0xa7, 0x35, 0x4f, + 0xce, 0x67, 0xd2, 0xd2, 0x0c, 0xa3, 0x92, 0xd4, 0x82, 0xe4, 0x17, 0x0a, 0x1c, 0x4a, 0x68, 0x35, + 0x99, 0x55, 0x93, 0x30, 0x51, 0xaf, 0xf6, 0x6c, 0x12, 0x82, 0xbe, 0xc0, 0x41, 0xbf, 0x40, 0x9e, + 0xcf, 0x04, 0xed, 0x24, 0xb0, 0xfd, 0x4b, 0x81, 0x23, 0x99, 0xa2, 0x8e, 0xdc, 0xe8, 0x0e, 0x21, + 0x4f, 0x4d, 0xaa, 0xaf, 0xed, 0xd9, 0x5e, 0x6a, 0x52, 0x35, 0x98, 0x5b, 0xa9, 0x19, 0x3a, 0x33, + 0x5d, 0x54, 0x7a, 0x95, 0x75, 0xcb, 0x0e, 0x66, 0x57, 0xb0, 0xd5, 0xef, 0x92, 0x5f, 0x2a, 0x30, + 0x1e, 0xeb, 0x86, 0xbc, 0xdc, 0x23, 0xae, 0x80, 0xcf, 0x2b, 0x3d, 0xdb, 0x49, 0x0d, 0x08, 0xe7, + 0x11, 0xe9, 0x55, 0xf2, 0xa9, 0x12, 0xd3, 0x52, 0x44, 0xae, 0xdb, 0xb4, 0xf6, 0x53, 0xaf, 0xf4, + 0x6e, 0x88, 0x80, 0x5f, 0xe4, 0x80, 0xe7, 0xc8, 0xb9, 0x4c, 0xc0, 0x82, 0xfa, 0x2c, 0xee, 0x70, + 0xc1, 0xbb, 0xeb, 0xcd, 0xfa, 0x83, 0x82, 0xa7, 0x25, 0xc3, 0x90, 0xc1, 0x9d, 0xa9, 0x59, 0x65, + 0x70, 0x67, 0xab, 0x50, 0x7a, 0x8e, 0xe3, 0xa6, 0x64, 0xb6, 0x1b, 0x6e, 0xf2, 0x3b, 0x05, 0x0e, + 0x25, 0x04, 0x9a, 0xcc, 0x3e, 0xd3, 0x51, 0x49, 0xca, 0xec, 0x33, 0x9d, 0x35, 0x26, 0xbd, 0xc8, + 0x81, 0x9f, 0x25, 0x67, 0x32, 0x81, 0x27, 0xe5, 0x27, 0xf9, 0x89, 0x02, 0x43, 0xbe, 0xac, 0x23, + 0x0b, 0x52, 0xfd, 0xc6, 0x94, 0xa5, 0x7a, 0xb9, 0x27, 0x1b, 0xa9, 0x5c, 0xc1, 0x17, 0x97, 0xe4, + 0x4f, 0x0a, 0x4c, 0xa6, 0x64, 0x23, 0x91, 0x38, 0x58, 0x3a, 0xa9, 0x51, 0xf5, 0xda, 0x9e, 0x6c, + 0x11, 0xf3, 0x55, 0x8e, 0xf9, 0x32, 0xb9, 0x24, 0x62, 0x0e, 0xbc, 0x08, 0x5b, 0x62, 0xd3, 0xfa, + 0x20, 0xa1, 0x65, 0xc9, 0x5f, 0x15, 0x98, 0x4c, 0x49, 0x46, 0x19, 0x26, 0x9d, 0x34, 0xab, 0x0c, + 0x93, 0x8e, 0x1a, 0xb5, 0xcb, 0x56, 0xe8, 0xeb, 0x9c, 0x64, 0xc6, 0x90, 0x10, 0xc8, 0xbb, 0x5e, + 0x26, 0x47, 0x96, 0x99, 0x9b, 0x10, 0x8f, 0x44, 0x6e, 0xbd, 0x65, 0xe8, 0x5a, 0x99, 0x43, 0xaa, + 0x83, 0x52, 0xa5, 0x0b, 0x9c, 0xd0, 0x05, 0x32, 0xd7, 0x71, 0x4f, 0xf4, 0x4e, 0x57, 0x9f, 0x83, + 0x8d, 0x40, 0xbf, 0x50, 0xe0, 0x08, 0x77, 0xe6, 0x24, 0x34, 0x1f, 0x59, 0x94, 0x8e, 0x6d, 0x96, + 0x00, 0x55, 0x6f, 0xec, 0xd5, 0x1c, 0xc9, 0xac, 0x70, 0x32, 0x25, 0xf2, 0x7a, 0xfe, 0xe8, 0xf8, + 0x4b, 0x58, 0x33, 0xeb, 0xfe, 0x3f, 0xc4, 0xc2, 0x29, 0x55, 0xdc, 0xe1, 0x25, 0xbb, 0xde, 0xbe, + 0x14, 0x0e, 0x91, 0x20, 0xe4, 0x5e, 0x91, 0x0c, 0x74, 0x52, 0xa3, 0xaa, 0x57, 0x7a, 0x37, 0xec, + 0x71, 0x80, 0x04, 0x61, 0x4a, 0xfe, 0xa9, 0xc0, 0x54, 0x96, 0xbe, 0x93, 0x19, 0x9f, 0x1c, 0x69, + 0xa9, 0xde, 0xd8, 0xab, 0x39, 0x72, 0x29, 0x71, 0x2e, 0xd7, 0xc9, 0xab, 0x1d, 0xb9, 0xc4, 0xb4, + 0x5d, 0xb5, 0xcd, 0x35, 0xac, 0xb7, 0x84, 0x02, 0x3d, 0xbb, 0x4b, 0xfe, 0xab, 0x80, 0x9a, 0x21, + 0x10, 0x83, 0xbc, 0xfb, 0x7a, 0xaf, 0x10, 0x45, 0x71, 0xaa, 0x2e, 0xee, 0xd1, 0x5a, 0x4a, 0x2e, + 0xa5, 0xf8, 0x71, 0xed, 0x1a, 0x4d, 0x48, 0xbd, 0x2e, 0xe6, 0x4b, 0x3f, 0x52, 0x60, 0x90, 0xff, + 0xcf, 0x49, 0x0a, 0x12, 0x7a, 0x52, 0xf8, 0xe3, 0x56, 0x2d, 0x4a, 0xb7, 0x47, 0xd8, 0x94, 0xc3, + 0x3e, 0x41, 0xd4, 0x6c, 0xf9, 0xc9, 0x41, 0x60, 0xfa, 0x16, 0xfd, 0xf9, 0x2e, 0x99, 0xbe, 0xa5, + 0xee, 0x30, 0x48, 0xa6, 0x6f, 0xe9, 0x4b, 0x0b, 0x12, 0xe9, 0x9b, 0xeb, 0x38, 0x81, 0xde, 0x24, + 0x3f, 0xdd, 0x0f, 0x33, 0xf9, 0xb7, 0x05, 0xc8, 0x72, 0x8f, 0x48, 0x3a, 0xdd, 0x7d, 0x50, 0x57, + 0xbe, 0xbc, 0x23, 0xe4, 0x58, 0xe5, 0x1c, 0xbf, 0x45, 0x1e, 0xcb, 0x70, 0xac, 0x34, 0xf9, 0xa5, + 0x02, 0xbd, 0xa6, 0x19, 0xc5, 0x9d, 0xcc, 0xcb, 0x17, 0xbb, 0xc5, 0x9d, 0xe4, 0x05, 0x8b, 0x5d, + 0xf2, 0x91, 0xc2, 0x2f, 0xa7, 0xc8, 0x7c, 0xd8, 0x88, 0xdd, 0x75, 0x91, 0xf9, 0xb0, 0x11, 0xbf, + 0x06, 0x43, 0x67, 0x39, 0x1d, 0x95, 0x1c, 0xcb, 0xa4, 0xe3, 0x81, 0xf8, 0x44, 0x01, 0x88, 0xae, + 0x47, 0x10, 0x89, 0x94, 0x28, 0x75, 0x5f, 0x43, 0x7d, 0xa9, 0x37, 0x23, 0xc4, 0x76, 0x96, 0x63, + 0x7b, 0x8e, 0x9c, 0xca, 0xc4, 0xe6, 0x46, 0x98, 0x7e, 0xad, 0xc0, 0x44, 0xec, 0x7e, 0x90, 0x97, + 0x55, 0xcb, 0x1d, 0xb9, 0x59, 0x37, 0xc2, 0x64, 0xf4, 0x7d, 0xa7, 0x3b, 0x5e, 0x74, 0x8e, 0x83, + 0x7e, 0x9e, 0xd0, 0xec, 0xa5, 0x1a, 0xbb, 0xb6, 0xf5, 0x67, 0x05, 0xa6, 0xb2, 0xae, 0x4a, 0xc9, + 0x9c, 0x02, 0x39, 0x37, 0xb4, 0x64, 0x4e, 0x81, 0xbc, 0x1b, 0x5a, 0xf4, 0x6b, 0x9c, 0x43, 0x91, + 0x5c, 0xec, 0xce, 0x41, 0xdc, 0x10, 0x3d, 0x3d, 0x26, 0xde, 0xe0, 0x93, 0x94, 0x81, 0xa9, 0x4b, + 0x8b, 0x92, 0x7a, 0x2c, 0xe3, 0x1a, 0x62, 0x17, 0x3d, 0x56, 0x8b, 0x2c, 0x62, 0x7a, 0x4c, 0xf0, + 0x24, 0xaf, 0xc7, 0xf6, 0x86, 0x3b, 0xfb, 0xfa, 0x64, 0x17, 0x3d, 0x26, 0xe0, 0x2e, 0xdd, 0xf9, + 0xec, 0xc9, 0x8c, 0xf2, 0xf9, 0x93, 0x19, 0xe5, 0x8b, 0x27, 0x33, 0xca, 0xc7, 0x4f, 0x67, 0xf6, + 0x7d, 0xfe, 0x74, 0x66, 0xdf, 0x3f, 0x9e, 0xce, 0xec, 0x7b, 0x5c, 0x6c, 0xe8, 0x6e, 0x73, 0xb3, + 0x5a, 0xa8, 0x59, 0x1b, 0x99, 0x59, 0xfc, 0xb6, 0xb0, 0x76, 0xda, 0x2d, 0xe6, 0x54, 0x87, 0xf8, + 0x2d, 0xd7, 0xcb, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x98, 0x37, 0x26, 0xae, 0x2c, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2529,6 +2919,12 @@ type QueryClient interface { // Queries a tSS by index. TSS(ctx context.Context, in *QueryGetTSSRequest, opts ...grpc.CallOption) (*QueryGetTSSResponse, error) TssHistory(ctx context.Context, in *QueryTssHistoryRequest, opts ...grpc.CallOption) (*QueryTssHistoryResponse, error) + PendingNoncesAll(ctx context.Context, in *QueryAllPendingNoncesRequest, opts ...grpc.CallOption) (*QueryAllPendingNoncesResponse, error) + PendingNoncesByChain(ctx context.Context, in *QueryPendingNoncesByChainRequest, opts ...grpc.CallOption) (*QueryPendingNoncesByChainResponse, error) + // Queries a chainNonces by index. + ChainNonces(ctx context.Context, in *QueryGetChainNoncesRequest, opts ...grpc.CallOption) (*QueryGetChainNoncesResponse, error) + // Queries a list of chainNonces items. + ChainNoncesAll(ctx context.Context, in *QueryAllChainNoncesRequest, opts ...grpc.CallOption) (*QueryAllChainNoncesResponse, error) } type queryClient struct { @@ -2755,6 +3151,42 @@ func (c *queryClient) TssHistory(ctx context.Context, in *QueryTssHistoryRequest return out, nil } +func (c *queryClient) PendingNoncesAll(ctx context.Context, in *QueryAllPendingNoncesRequest, opts ...grpc.CallOption) (*QueryAllPendingNoncesResponse, error) { + out := new(QueryAllPendingNoncesResponse) + err := c.cc.Invoke(ctx, "/zetachain.zetacore.observer.Query/PendingNoncesAll", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) PendingNoncesByChain(ctx context.Context, in *QueryPendingNoncesByChainRequest, opts ...grpc.CallOption) (*QueryPendingNoncesByChainResponse, error) { + out := new(QueryPendingNoncesByChainResponse) + err := c.cc.Invoke(ctx, "/zetachain.zetacore.observer.Query/PendingNoncesByChain", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) ChainNonces(ctx context.Context, in *QueryGetChainNoncesRequest, opts ...grpc.CallOption) (*QueryGetChainNoncesResponse, error) { + out := new(QueryGetChainNoncesResponse) + err := c.cc.Invoke(ctx, "/zetachain.zetacore.observer.Query/ChainNonces", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) ChainNoncesAll(ctx context.Context, in *QueryAllChainNoncesRequest, opts ...grpc.CallOption) (*QueryAllChainNoncesResponse, error) { + out := new(QueryAllChainNoncesResponse) + err := c.cc.Invoke(ctx, "/zetachain.zetacore.observer.Query/ChainNoncesAll", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { // Parameters queries the parameters of the module. @@ -2797,6 +3229,12 @@ type QueryServer interface { // Queries a tSS by index. TSS(context.Context, *QueryGetTSSRequest) (*QueryGetTSSResponse, error) TssHistory(context.Context, *QueryTssHistoryRequest) (*QueryTssHistoryResponse, error) + PendingNoncesAll(context.Context, *QueryAllPendingNoncesRequest) (*QueryAllPendingNoncesResponse, error) + PendingNoncesByChain(context.Context, *QueryPendingNoncesByChainRequest) (*QueryPendingNoncesByChainResponse, error) + // Queries a chainNonces by index. + ChainNonces(context.Context, *QueryGetChainNoncesRequest) (*QueryGetChainNoncesResponse, error) + // Queries a list of chainNonces items. + ChainNoncesAll(context.Context, *QueryAllChainNoncesRequest) (*QueryAllChainNoncesResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -2875,6 +3313,18 @@ func (*UnimplementedQueryServer) TSS(ctx context.Context, req *QueryGetTSSReques func (*UnimplementedQueryServer) TssHistory(ctx context.Context, req *QueryTssHistoryRequest) (*QueryTssHistoryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TssHistory not implemented") } +func (*UnimplementedQueryServer) PendingNoncesAll(ctx context.Context, req *QueryAllPendingNoncesRequest) (*QueryAllPendingNoncesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PendingNoncesAll not implemented") +} +func (*UnimplementedQueryServer) PendingNoncesByChain(ctx context.Context, req *QueryPendingNoncesByChainRequest) (*QueryPendingNoncesByChainResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PendingNoncesByChain not implemented") +} +func (*UnimplementedQueryServer) ChainNonces(ctx context.Context, req *QueryGetChainNoncesRequest) (*QueryGetChainNoncesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ChainNonces not implemented") +} +func (*UnimplementedQueryServer) ChainNoncesAll(ctx context.Context, req *QueryAllChainNoncesRequest) (*QueryAllChainNoncesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ChainNoncesAll not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -3312,6 +3762,78 @@ func _Query_TssHistory_Handler(srv interface{}, ctx context.Context, dec func(in return interceptor(ctx, in, info, handler) } +func _Query_PendingNoncesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllPendingNoncesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).PendingNoncesAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/zetachain.zetacore.observer.Query/PendingNoncesAll", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).PendingNoncesAll(ctx, req.(*QueryAllPendingNoncesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_PendingNoncesByChain_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryPendingNoncesByChainRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).PendingNoncesByChain(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/zetachain.zetacore.observer.Query/PendingNoncesByChain", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).PendingNoncesByChain(ctx, req.(*QueryPendingNoncesByChainRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_ChainNonces_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryGetChainNoncesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).ChainNonces(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/zetachain.zetacore.observer.Query/ChainNonces", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).ChainNonces(ctx, req.(*QueryGetChainNoncesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_ChainNoncesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllChainNoncesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).ChainNoncesAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/zetachain.zetacore.observer.Query/ChainNoncesAll", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).ChainNoncesAll(ctx, req.(*QueryAllChainNoncesRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "zetachain.zetacore.observer.Query", HandlerType: (*QueryServer)(nil), @@ -3412,12 +3934,28 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "TssHistory", Handler: _Query_TssHistory_Handler, }, + { + MethodName: "PendingNoncesAll", + Handler: _Query_PendingNoncesAll_Handler, + }, + { + MethodName: "PendingNoncesByChain", + Handler: _Query_PendingNoncesByChain_Handler, + }, + { + MethodName: "ChainNonces", + Handler: _Query_ChainNonces_Handler, + }, + { + MethodName: "ChainNoncesAll", + Handler: _Query_ChainNoncesAll_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "observer/query.proto", } -func (m *QueryGetTSSRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryGetChainNoncesRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3427,20 +3965,27 @@ func (m *QueryGetTSSRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetTSSRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetChainNoncesRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetTSSRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetChainNoncesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l + if len(m.Index) > 0 { + i -= len(m.Index) + copy(dAtA[i:], m.Index) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Index))) + i-- + dAtA[i] = 0xa + } return len(dAtA) - i, nil } -func (m *QueryGetTSSResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryGetChainNoncesResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3450,18 +3995,18 @@ func (m *QueryGetTSSResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetTSSResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetChainNoncesResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetTSSResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetChainNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size, err := m.TSS.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ChainNonces.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3473,7 +4018,7 @@ func (m *QueryGetTSSResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryGetTssAddressRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllChainNoncesRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3483,25 +4028,32 @@ func (m *QueryGetTssAddressRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetTssAddressRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllChainNoncesRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetTssAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllChainNoncesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.BitcoinChainId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.BitcoinChainId)) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x10 + dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryGetTssAddressResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllChainNoncesResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3511,34 +4063,46 @@ func (m *QueryGetTssAddressResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetTssAddressResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllChainNoncesResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetTssAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllChainNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Btc) > 0 { - i -= len(m.Btc) - copy(dAtA[i:], m.Btc) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Btc))) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x12 } - if len(m.Eth) > 0 { - i -= len(m.Eth) - copy(dAtA[i:], m.Eth) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Eth))) - i-- - dAtA[i] = 0xa + if len(m.ChainNonces) > 0 { + for iNdEx := len(m.ChainNonces) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.ChainNonces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } return len(dAtA) - i, nil } -func (m *QueryGetTssAddressByFinalizedHeightRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllPendingNoncesRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3548,30 +4112,32 @@ func (m *QueryGetTssAddressByFinalizedHeightRequest) Marshal() (dAtA []byte, err return dAtA[:n], nil } -func (m *QueryGetTssAddressByFinalizedHeightRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllPendingNoncesRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetTssAddressByFinalizedHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllPendingNoncesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.BitcoinChainId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.BitcoinChainId)) - i-- - dAtA[i] = 0x10 - } - if m.FinalizedZetaHeight != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.FinalizedZetaHeight)) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryGetTssAddressByFinalizedHeightResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllPendingNoncesResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3581,20 +4147,284 @@ func (m *QueryGetTssAddressByFinalizedHeightResponse) Marshal() (dAtA []byte, er return dAtA[:n], nil } -func (m *QueryGetTssAddressByFinalizedHeightResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllPendingNoncesResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetTssAddressByFinalizedHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllPendingNoncesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Btc) > 0 { - i -= len(m.Btc) - copy(dAtA[i:], m.Btc) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Btc))) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.PendingNonces) > 0 { + for iNdEx := len(m.PendingNonces) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.PendingNonces[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *QueryPendingNoncesByChainRequest) 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 *QueryPendingNoncesByChainRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryPendingNoncesByChainRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.ChainId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ChainId)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *QueryPendingNoncesByChainResponse) 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 *QueryPendingNoncesByChainResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryPendingNoncesByChainResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.PendingNonces.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func (m *QueryGetTSSRequest) 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 *QueryGetTSSRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetTSSRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *QueryGetTSSResponse) 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 *QueryGetTSSResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetTSSResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.TSS.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func (m *QueryGetTssAddressRequest) 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 *QueryGetTssAddressRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetTssAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.BitcoinChainId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.BitcoinChainId)) + i-- + dAtA[i] = 0x10 + } + return len(dAtA) - i, nil +} + +func (m *QueryGetTssAddressResponse) 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 *QueryGetTssAddressResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetTssAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Btc) > 0 { + i -= len(m.Btc) + copy(dAtA[i:], m.Btc) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Btc))) + i-- + dAtA[i] = 0x12 + } + if len(m.Eth) > 0 { + i -= len(m.Eth) + copy(dAtA[i:], m.Eth) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Eth))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryGetTssAddressByFinalizedHeightRequest) 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 *QueryGetTssAddressByFinalizedHeightRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetTssAddressByFinalizedHeightRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.BitcoinChainId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.BitcoinChainId)) + i-- + dAtA[i] = 0x10 + } + if m.FinalizedZetaHeight != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.FinalizedZetaHeight)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *QueryGetTssAddressByFinalizedHeightResponse) 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 *QueryGetTssAddressByFinalizedHeightResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetTssAddressByFinalizedHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Btc) > 0 { + i -= len(m.Btc) + copy(dAtA[i:], m.Btc) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Btc))) i-- dAtA[i] = 0x12 } @@ -5095,22 +5925,133 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *QueryGetTSSRequest) Size() (n int) { +func (m *QueryGetChainNoncesRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l + l = len(m.Index) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } return n } -func (m *QueryGetTSSResponse) Size() (n int) { +func (m *QueryGetChainNoncesResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.TSS.Size() + l = m.ChainNonces.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + +func (m *QueryAllChainNoncesRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllChainNoncesResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.ChainNonces) > 0 { + for _, e := range m.ChainNonces { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllPendingNoncesRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllPendingNoncesResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.PendingNonces) > 0 { + for _, e := range m.PendingNonces { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryPendingNoncesByChainRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ChainId != 0 { + n += 1 + sovQuery(uint64(m.ChainId)) + } + return n +} + +func (m *QueryPendingNoncesByChainResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.PendingNonces.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + +func (m *QueryGetTSSRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *QueryGetTSSResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.TSS.Size() n += 1 + l + sovQuery(uint64(l)) return n } @@ -5772,6 +6713,735 @@ func sovQuery(x uint64) (n int) { func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +func (m *QueryGetChainNoncesRequest) 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: QueryGetChainNoncesRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetChainNoncesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= 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.Index = 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 *QueryGetChainNoncesResponse) 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: QueryGetChainNoncesResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetChainNoncesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainNonces", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ChainNonces.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *QueryAllChainNoncesRequest) 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: QueryAllChainNoncesRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllChainNoncesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *QueryAllChainNoncesResponse) 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: QueryAllChainNoncesResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllChainNoncesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainNonces", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainNonces = append(m.ChainNonces, ChainNonces{}) + if err := m.ChainNonces[len(m.ChainNonces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *QueryAllPendingNoncesRequest) 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: QueryAllPendingNoncesRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllPendingNoncesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *QueryAllPendingNoncesResponse) 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: QueryAllPendingNoncesResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllPendingNoncesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PendingNonces", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PendingNonces = append(m.PendingNonces, PendingNonces{}) + if err := m.PendingNonces[len(m.PendingNonces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *QueryPendingNoncesByChainRequest) 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: QueryPendingNoncesByChainRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryPendingNoncesByChainRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + m.ChainId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ChainId |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *QueryPendingNoncesByChainResponse) 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: QueryPendingNoncesByChainResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryPendingNoncesByChainResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PendingNonces", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.PendingNonces.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 *QueryGetTSSRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/observer/types/query.pb.gw.go b/x/observer/types/query.pb.gw.go index 6a99c64128..91f2afabd8 100644 --- a/x/observer/types/query.pb.gw.go +++ b/x/observer/types/query.pb.gw.go @@ -999,6 +999,186 @@ func local_request_Query_TssHistory_0(ctx context.Context, marshaler runtime.Mar } +var ( + filter_Query_PendingNoncesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_PendingNoncesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPendingNoncesRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PendingNoncesAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.PendingNoncesAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_PendingNoncesAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPendingNoncesRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_PendingNoncesAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.PendingNoncesAll(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_PendingNoncesByChain_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryPendingNoncesByChainRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["chain_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain_id") + } + + protoReq.ChainId, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) + } + + msg, err := client.PendingNoncesByChain(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_PendingNoncesByChain_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryPendingNoncesByChainRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["chain_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "chain_id") + } + + protoReq.ChainId, err = runtime.Int64(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "chain_id", err) + } + + msg, err := server.PendingNoncesByChain(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_ChainNonces_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetChainNoncesRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["index"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "index") + } + + protoReq.Index, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) + } + + msg, err := client.ChainNonces(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_ChainNonces_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetChainNoncesRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["index"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "index") + } + + protoReq.Index, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "index", err) + } + + msg, err := server.ChainNonces(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_ChainNoncesAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_ChainNoncesAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllChainNoncesRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ChainNoncesAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.ChainNoncesAll(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_ChainNoncesAll_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllChainNoncesRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ChainNoncesAll_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.ChainNoncesAll(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -1557,6 +1737,98 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_PendingNoncesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_PendingNoncesAll_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_PendingNoncesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PendingNoncesByChain_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_PendingNoncesByChain_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_PendingNoncesByChain_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_ChainNonces_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_ChainNonces_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_ChainNonces_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_ChainNoncesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_ChainNoncesAll_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_ChainNoncesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -2078,6 +2350,86 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_PendingNoncesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_PendingNoncesAll_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_PendingNoncesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_PendingNoncesByChain_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_PendingNoncesByChain_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_PendingNoncesByChain_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_ChainNonces_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_ChainNonces_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_ChainNonces_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_ChainNoncesAll_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_ChainNoncesAll_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_ChainNoncesAll_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -2122,13 +2474,21 @@ var ( pattern_Query_Prove_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "observer", "prove"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetTssAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "crosschain", "get_tss_address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_GetTssAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "observer", "get_tss_address"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_GetTssAddressByFinalizedHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"zeta-chain", "observer", "get_tss_address_historical", "finalized_zeta_height", "bitcoin_chain_id"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_TSS_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "observer", "TSS"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_TssHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "observer", "tssHistory"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_PendingNoncesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "observer", "pendingNonces"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_GetTssAddressByFinalizedHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"zeta-chain", "crosschain", "get_tss_address_historical", "finalized_zeta_height", "bitcoin_chain_id"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_PendingNoncesByChain_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"zeta-chain", "observer", "pendingNonces", "chain_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_TSS_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "crosschain", "TSS"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_ChainNonces_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"zeta-chain", "observer", "chainNonces", "index"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_TssHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "crosschain", "tssHistory"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_ChainNoncesAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"zeta-chain", "observer", "chainNonces"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -2179,4 +2539,12 @@ var ( forward_Query_TSS_0 = runtime.ForwardResponseMessage forward_Query_TssHistory_0 = runtime.ForwardResponseMessage + + forward_Query_PendingNoncesAll_0 = runtime.ForwardResponseMessage + + forward_Query_PendingNoncesByChain_0 = runtime.ForwardResponseMessage + + forward_Query_ChainNonces_0 = runtime.ForwardResponseMessage + + forward_Query_ChainNoncesAll_0 = runtime.ForwardResponseMessage ) diff --git a/x/observer/types/tx.pb.go b/x/observer/types/tx.pb.go index 12f0cf6231..43d63bdabe 100644 --- a/x/observer/types/tx.pb.go +++ b/x/observer/types/tx.pb.go @@ -754,63 +754,64 @@ func init() { func init() { proto.RegisterFile("observer/tx.proto", fileDescriptor_1bcd40fa296a2b1d) } var fileDescriptor_1bcd40fa296a2b1d = []byte{ - // 891 bytes of a gzipped FileDescriptorProto + // 903 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x36, 0xe3, 0xc4, 0xb1, 0xc7, 0xae, 0x63, 0x6f, 0xec, 0x58, 0x96, 0x1b, 0xc5, 0xe0, 0xa5, + 0x10, 0x36, 0xe3, 0xc4, 0xb1, 0xc7, 0xae, 0x63, 0x6f, 0xec, 0x58, 0x96, 0x6b, 0xc5, 0xe0, 0xa5, 0x6e, 0xeb, 0x4a, 0x8e, 0xd2, 0x16, 0x6d, 0x81, 0x1e, 0xec, 0xfe, 0x38, 0x42, 0x91, 0xda, 0x20, 0x50, 0x1f, 0x7a, 0x21, 0x96, 0xdc, 0x31, 0x45, 0x84, 0xda, 0x15, 0xb8, 0x54, 0x63, 0x15, 0x68, 0xdf, 0xa0, 0x68, 0x5f, 0xa5, 0xef, 0xd0, 0x43, 0x8e, 0x39, 0xf6, 0x54, 0x14, 0xf6, 0xa9, 0x4f, - 0xd0, 0x6b, 0xc0, 0x5d, 0x72, 0x25, 0x4a, 0x32, 0x2d, 0xf9, 0x24, 0xee, 0xee, 0x37, 0xdf, 0xcc, - 0x37, 0xf3, 0x91, 0x2b, 0x58, 0x17, 0x9e, 0xc4, 0xf8, 0x27, 0x8c, 0x1b, 0xc9, 0x45, 0xbd, 0x1b, - 0x8b, 0x44, 0x90, 0x9d, 0x9f, 0x31, 0xa1, 0x7e, 0x9b, 0x86, 0xbc, 0xae, 0x9e, 0x44, 0x8c, 0xf5, - 0x1c, 0x55, 0x7d, 0xe8, 0x8b, 0x4e, 0x47, 0xf0, 0x86, 0xfe, 0xd1, 0x11, 0xd5, 0x8d, 0x40, 0x04, - 0x42, 0x3d, 0x36, 0xd2, 0xa7, 0x7c, 0xd7, 0x50, 0x7b, 0x11, 0xed, 0x60, 0xb6, 0xfb, 0xc4, 0xec, - 0xfa, 0xb1, 0x90, 0x52, 0xe5, 0x71, 0xcf, 0x23, 0x1a, 0xc8, 0x0c, 0xb0, 0x65, 0x00, 0xf9, 0x43, - 0x76, 0xb0, 0x69, 0x0e, 0xba, 0x34, 0xa6, 0x9d, 0x1c, 0x4f, 0x06, 0x0a, 0x64, 0xb6, 0x67, 0xff, - 0x67, 0xc1, 0xfa, 0x0b, 0x19, 0xfc, 0xd0, 0x65, 0x34, 0xc1, 0x93, 0xec, 0x9c, 0x54, 0xe0, 0xbe, - 0x1f, 0x23, 0x4d, 0x44, 0x5c, 0xb1, 0x76, 0xad, 0xbd, 0x25, 0x27, 0x5f, 0x92, 0x03, 0xd8, 0x10, - 0x11, 0x73, 0x73, 0x26, 0x97, 0x32, 0x16, 0xa3, 0x94, 0x95, 0x3b, 0x0a, 0x46, 0x44, 0xc4, 0x72, - 0x92, 0x43, 0x7d, 0x92, 0x46, 0x70, 0x7c, 0x35, 0x1e, 0x31, 0xaf, 0x23, 0x38, 0xbe, 0x1a, 0x8d, - 0x38, 0x83, 0x77, 0x7a, 0xaa, 0x1e, 0x37, 0x46, 0x2a, 0x05, 0xaf, 0xdc, 0xdd, 0xb5, 0xf6, 0x56, - 0x9b, 0x4f, 0xeb, 0x25, 0xed, 0xae, 0xe7, 0x24, 0x5a, 0x89, 0xa3, 0x02, 0x9d, 0x95, 0xde, 0xd0, - 0xca, 0xde, 0x81, 0xed, 0x31, 0xa9, 0x0e, 0xca, 0xae, 0xe0, 0x12, 0xed, 0x3f, 0x75, 0x23, 0x0e, - 0x19, 0x3b, 0x8a, 0x84, 0xff, 0xf2, 0x39, 0x52, 0x56, 0xda, 0x88, 0x6d, 0x58, 0xd4, 0x13, 0x09, - 0x99, 0x12, 0x3f, 0xef, 0xdc, 0x57, 0xeb, 0x16, 0x23, 0x8f, 0x01, 0xbc, 0x94, 0xc3, 0x6d, 0x53, - 0xd9, 0x56, 0x3a, 0x57, 0x9c, 0x25, 0xb5, 0xf3, 0x9c, 0xca, 0x36, 0x79, 0x04, 0x0b, 0x6d, 0x0c, - 0x83, 0x76, 0xa2, 0x74, 0xcd, 0x3b, 0xd9, 0x8a, 0x1c, 0xa4, 0xfb, 0x69, 0xd6, 0xca, 0xbd, 0x5d, - 0x6b, 0x6f, 0xb9, 0x49, 0xea, 0x99, 0x75, 0x74, 0x2d, 0x5f, 0xd3, 0x84, 0x1e, 0xdd, 0x7d, 0xfd, - 0xcf, 0x93, 0x39, 0x27, 0xc3, 0x65, 0x82, 0x8a, 0x25, 0x1b, 0x41, 0x17, 0xf0, 0xd0, 0xa8, 0xfd, - 0x4a, 0xc4, 0x78, 0xaa, 0xac, 0x50, 0xa2, 0xe8, 0x18, 0xc0, 0x37, 0x38, 0xa5, 0x69, 0xb9, 0xf9, - 0x5e, 0x69, 0xcf, 0x07, 0xb4, 0xce, 0x50, 0xa8, 0xfd, 0x18, 0x76, 0x26, 0x64, 0x36, 0x85, 0xfd, - 0x65, 0xc1, 0xaa, 0x2e, 0x7b, 0x0a, 0xbf, 0xbd, 0x0f, 0x6b, 0xd7, 0x78, 0xed, 0x81, 0x18, 0xb1, - 0xcd, 0x17, 0xb0, 0xad, 0x4a, 0x8c, 0x42, 0xe4, 0x89, 0x1b, 0xc4, 0x94, 0x27, 0x88, 0x6e, 0xb7, - 0xe7, 0xbd, 0xc4, 0x7e, 0xe6, 0xb6, 0xad, 0x01, 0xe0, 0x58, 0x9f, 0x9f, 0xaa, 0x63, 0xf2, 0x14, - 0x36, 0x29, 0x63, 0x2e, 0x17, 0x0c, 0x5d, 0xea, 0xfb, 0xa2, 0xc7, 0x13, 0x57, 0xf0, 0xa8, 0xaf, - 0x46, 0xb4, 0xe8, 0x10, 0xca, 0xd8, 0xf7, 0x82, 0xe1, 0xa1, 0x3e, 0x3a, 0xe1, 0x51, 0xdf, 0xae, - 0xc0, 0xa3, 0xa2, 0x0a, 0x23, 0xf0, 0x77, 0x0b, 0x1e, 0xe4, 0x73, 0xa1, 0x1d, 0x3c, 0x13, 0x09, - 0xde, 0xce, 0x48, 0xc7, 0xa9, 0x91, 0x68, 0x07, 0xdd, 0x90, 0x9f, 0x0b, 0x25, 0x61, 0xb9, 0x69, - 0x97, 0x4e, 0x44, 0x25, 0xcc, 0x5c, 0xb2, 0xa4, 0x62, 0x5b, 0xfc, 0x5c, 0xd8, 0xdb, 0xb0, 0x35, - 0x52, 0x90, 0x29, 0xf6, 0xff, 0x3b, 0x50, 0x19, 0x4c, 0xcb, 0x7c, 0x68, 0xbe, 0x4d, 0xbf, 0x33, - 0x25, 0x55, 0x7f, 0x00, 0x6b, 0xa1, 0x6c, 0x71, 0x4f, 0xf4, 0x38, 0xfb, 0x86, 0x53, 0x2f, 0x42, - 0xa6, 0x0a, 0x5c, 0x74, 0xc6, 0xf6, 0xc9, 0x3e, 0xac, 0x87, 0xf2, 0xa4, 0x97, 0x14, 0xc0, 0xba, - 0xb1, 0xe3, 0x07, 0xa4, 0x0d, 0x9b, 0x01, 0x95, 0xa7, 0x71, 0xe8, 0x63, 0x8b, 0xa7, 0xe9, 0x24, - 0xaa, 0x62, 0xb2, 0xb7, 0xa2, 0x59, 0xaa, 0xff, 0x78, 0x52, 0xa4, 0x33, 0x99, 0x90, 0xfc, 0x02, - 0xef, 0x7a, 0x83, 0x17, 0xe7, 0x0c, 0xe3, 0xf0, 0x3c, 0xf4, 0x69, 0x12, 0x0a, 0xad, 0xbe, 0xb2, - 0xa0, 0x12, 0x7e, 0x7e, 0x43, 0xc3, 0xaf, 0x27, 0x70, 0x4a, 0xe9, 0x6d, 0x1b, 0x76, 0xaf, 0x6b, - 0xbc, 0x99, 0xce, 0xa1, 0x72, 0x92, 0xc6, 0x7c, 0x87, 0xfd, 0x00, 0x79, 0xc9, 0x4c, 0x36, 0xe0, - 0x9e, 0x4a, 0x98, 0xd9, 0x48, 0x2f, 0xb2, 0xd9, 0x0f, 0x53, 0xe4, 0xec, 0xcd, 0xcb, 0x05, 0x98, - 0x7f, 0x21, 0x03, 0x22, 0x60, 0x79, 0xf8, 0x6d, 0xfc, 0xb0, 0x54, 0x71, 0xd1, 0xf4, 0xd5, 0x67, - 0x33, 0x80, 0xf3, 0xc4, 0xe4, 0x02, 0x56, 0x47, 0x6e, 0x9c, 0xfa, 0x4d, 0x34, 0x45, 0x7c, 0xf5, - 0xd3, 0xd9, 0xf0, 0x26, 0xf3, 0xaf, 0xb0, 0x36, 0xf6, 0x49, 0x3c, 0x98, 0x8e, 0x6b, 0x10, 0x51, - 0xfd, 0x6c, 0xd6, 0x08, 0x93, 0x3f, 0x86, 0x95, 0xc2, 0x77, 0x61, 0x7f, 0x8a, 0xf6, 0x19, 0x74, - 0xf5, 0xe3, 0x59, 0xd0, 0x26, 0xe7, 0x6f, 0x16, 0x6c, 0x4e, 0x7e, 0xbf, 0x3f, 0x99, 0x52, 0x47, - 0x31, 0xac, 0xfa, 0xe5, 0xad, 0xc2, 0x86, 0x7b, 0x50, 0x70, 0xf4, 0xfe, 0x74, 0x74, 0x1a, 0x7d, - 0x73, 0x0f, 0x26, 0x59, 0x3d, 0x75, 0xdc, 0xc8, 0xd5, 0x5e, 0x9f, 0xaa, 0x97, 0x06, 0x7f, 0xb3, - 0xe3, 0x26, 0xdf, 0xc3, 0x47, 0xad, 0xd7, 0x97, 0x35, 0xeb, 0xcd, 0x65, 0xcd, 0xfa, 0xf7, 0xb2, - 0x66, 0xfd, 0x71, 0x55, 0x9b, 0x7b, 0x73, 0x55, 0x9b, 0xfb, 0xfb, 0xaa, 0x36, 0xf7, 0x63, 0x23, - 0x08, 0x93, 0x76, 0xcf, 0x4b, 0xaf, 0xf9, 0x46, 0xca, 0xf8, 0x91, 0x22, 0x6f, 0xe4, 0xe4, 0x8d, - 0x8b, 0xc6, 0xe0, 0x0f, 0x5b, 0xbf, 0x8b, 0xd2, 0x5b, 0x50, 0xff, 0xd9, 0x9e, 0xbd, 0x0d, 0x00, - 0x00, 0xff, 0xff, 0xc8, 0xbb, 0x02, 0xd5, 0x8b, 0x0a, 0x00, 0x00, + 0xd0, 0x6b, 0xc0, 0x5d, 0x72, 0x25, 0x4a, 0x32, 0x2d, 0xe5, 0x24, 0xee, 0xcc, 0x37, 0xdf, 0xcc, + 0x37, 0x33, 0xe4, 0x0a, 0xd6, 0x85, 0x27, 0x31, 0xfe, 0x09, 0xe3, 0x46, 0x72, 0x59, 0xef, 0xc6, + 0x22, 0x11, 0x64, 0xe7, 0x67, 0x4c, 0xa8, 0xdf, 0xa6, 0x21, 0xaf, 0xab, 0x27, 0x11, 0x63, 0x3d, + 0x47, 0x55, 0x1f, 0xfa, 0xa2, 0xd3, 0x11, 0xbc, 0xa1, 0x7f, 0x74, 0x44, 0x75, 0x23, 0x10, 0x81, + 0x50, 0x8f, 0x8d, 0xf4, 0x29, 0xb7, 0x1a, 0x6a, 0x2f, 0xa2, 0x1d, 0xcc, 0xac, 0x8f, 0x8d, 0xd5, + 0x8f, 0x85, 0x94, 0x2a, 0x8f, 0x7b, 0x11, 0xd1, 0x40, 0x66, 0x80, 0x2d, 0x03, 0xc8, 0x1f, 0x32, + 0xc7, 0xa6, 0x71, 0x74, 0x69, 0x4c, 0x3b, 0x39, 0x7e, 0x77, 0x60, 0x46, 0xce, 0x42, 0x1e, 0xb8, + 0x5c, 0x70, 0x1f, 0x73, 0x37, 0x19, 0x08, 0x94, 0x99, 0xcd, 0xfe, 0xcf, 0x82, 0xf5, 0xe7, 0x32, + 0xf8, 0xa1, 0xcb, 0x68, 0x82, 0xa7, 0x99, 0x9f, 0x54, 0xe0, 0xbe, 0x1f, 0x23, 0x4d, 0x44, 0x5c, + 0xb1, 0xf6, 0xac, 0xfd, 0x25, 0x27, 0x3f, 0x92, 0x43, 0xd8, 0x10, 0x11, 0x73, 0x73, 0x26, 0x97, + 0x32, 0x16, 0xa3, 0x94, 0x95, 0x3b, 0x0a, 0x46, 0x44, 0xc4, 0x72, 0x92, 0x23, 0xed, 0x49, 0x23, + 0x38, 0xbe, 0x1c, 0x8f, 0x98, 0xd7, 0x11, 0x1c, 0x5f, 0x8e, 0x46, 0x9c, 0xc3, 0x3b, 0x3d, 0x55, + 0x8f, 0x1b, 0x23, 0x95, 0x82, 0x57, 0xee, 0xee, 0x59, 0xfb, 0xab, 0xcd, 0x27, 0xf5, 0x92, 0x69, + 0xd4, 0x73, 0x12, 0xad, 0xc4, 0x51, 0x81, 0xce, 0x4a, 0x6f, 0xe8, 0x64, 0xef, 0xc0, 0xf6, 0x98, + 0x54, 0x07, 0x65, 0x57, 0x70, 0x89, 0xf6, 0x9f, 0xba, 0x11, 0x47, 0x8c, 0x1d, 0x47, 0xc2, 0x7f, + 0xf1, 0x0c, 0x29, 0x2b, 0x6d, 0xc4, 0x36, 0x2c, 0xea, 0x81, 0x85, 0x4c, 0x89, 0x9f, 0x77, 0xee, + 0xab, 0x73, 0x8b, 0x91, 0x5d, 0x00, 0x2f, 0xe5, 0x70, 0xdb, 0x54, 0xb6, 0x95, 0xce, 0x15, 0x67, + 0x49, 0x59, 0x9e, 0x51, 0xd9, 0x26, 0x8f, 0x60, 0xa1, 0x8d, 0x61, 0xd0, 0x4e, 0x94, 0xae, 0x79, + 0x27, 0x3b, 0x91, 0xc3, 0xd4, 0x9e, 0x66, 0xad, 0xdc, 0xdb, 0xb3, 0xf6, 0x97, 0x9b, 0xa4, 0x9e, + 0x6d, 0x96, 0xae, 0xe5, 0x6b, 0x9a, 0xd0, 0xe3, 0xbb, 0xaf, 0xfe, 0x79, 0x3c, 0xe7, 0x64, 0xb8, + 0x4c, 0x50, 0xb1, 0x64, 0x23, 0xe8, 0x12, 0x1e, 0x1a, 0xb5, 0x5f, 0x89, 0x18, 0xcf, 0xd4, 0xa6, + 0x94, 0x28, 0x3a, 0x01, 0xf0, 0x0d, 0x4e, 0x69, 0x5a, 0x6e, 0xbe, 0x57, 0xda, 0xf3, 0x01, 0xad, + 0x33, 0x14, 0x6a, 0xef, 0xc2, 0xce, 0x84, 0xcc, 0xa6, 0xb0, 0xbf, 0x2c, 0x58, 0xd5, 0x65, 0x4f, + 0xb1, 0x6f, 0xef, 0xc3, 0xda, 0x0d, 0xbb, 0xf6, 0x40, 0x8c, 0xac, 0xcd, 0x17, 0xb0, 0xad, 0x4a, + 0x8c, 0x42, 0xe4, 0x89, 0x1b, 0xc4, 0x94, 0x27, 0x88, 0x6e, 0xb7, 0xe7, 0xbd, 0xc0, 0x7e, 0xb6, + 0x6d, 0x5b, 0x03, 0xc0, 0x89, 0xf6, 0x9f, 0x29, 0x37, 0x79, 0x02, 0x9b, 0x94, 0x31, 0x97, 0x0b, + 0x86, 0x2e, 0xf5, 0x7d, 0xd1, 0xe3, 0x89, 0x2b, 0x78, 0xd4, 0x57, 0x23, 0x5a, 0x74, 0x08, 0x65, + 0xec, 0x7b, 0xc1, 0xf0, 0x48, 0xbb, 0x4e, 0x79, 0xd4, 0xb7, 0x2b, 0xf0, 0xa8, 0xa8, 0xc2, 0x08, + 0xfc, 0xdd, 0x82, 0x07, 0xf9, 0x5c, 0x68, 0x07, 0xcf, 0x45, 0x82, 0x6f, 0xb7, 0x48, 0x27, 0xe9, + 0x22, 0xd1, 0x0e, 0xba, 0x21, 0xbf, 0x10, 0x4a, 0xc2, 0x72, 0xd3, 0x2e, 0x9d, 0x88, 0x4a, 0x98, + 0x6d, 0xc9, 0x92, 0x8a, 0x6d, 0xf1, 0x0b, 0x61, 0x6f, 0xc3, 0xd6, 0x48, 0x41, 0xa6, 0xd8, 0xff, + 0xef, 0x40, 0x65, 0x30, 0x2d, 0xf3, 0x1d, 0xfa, 0x36, 0xfd, 0x0c, 0x95, 0x54, 0xfd, 0x01, 0xac, + 0x85, 0xb2, 0xc5, 0x3d, 0xd1, 0xe3, 0xec, 0x1b, 0x4e, 0xbd, 0x08, 0x99, 0x2a, 0x70, 0xd1, 0x19, + 0xb3, 0x93, 0x03, 0x58, 0x0f, 0xe5, 0x69, 0x2f, 0x29, 0x80, 0x75, 0x63, 0xc7, 0x1d, 0xa4, 0x0d, + 0x9b, 0x01, 0x95, 0x67, 0x71, 0xe8, 0x63, 0x8b, 0xa7, 0xe9, 0x24, 0xaa, 0x62, 0xb2, 0xb7, 0xa2, + 0x59, 0xaa, 0xff, 0x64, 0x52, 0xa4, 0x33, 0x99, 0x90, 0xfc, 0x02, 0xef, 0x7a, 0x83, 0x17, 0xe7, + 0x1c, 0xe3, 0xf0, 0x22, 0xf4, 0x69, 0x12, 0x0a, 0xad, 0xbe, 0xb2, 0xa0, 0x12, 0x7e, 0x7e, 0x4b, + 0xc3, 0x6f, 0x26, 0x70, 0x4a, 0xe9, 0x6d, 0x1b, 0xf6, 0x6e, 0x6a, 0xbc, 0x99, 0xce, 0x91, 0xda, + 0x24, 0x8d, 0xf9, 0x0e, 0xfb, 0x01, 0xf2, 0x92, 0x99, 0x6c, 0xc0, 0x3d, 0x95, 0x30, 0x5b, 0x23, + 0x7d, 0xc8, 0x66, 0x3f, 0x4c, 0x91, 0xb3, 0x37, 0xaf, 0x16, 0x60, 0xfe, 0xb9, 0x0c, 0x88, 0x80, + 0xe5, 0xe1, 0xb7, 0xf1, 0xc3, 0x52, 0xc5, 0xc5, 0xa5, 0xaf, 0x3e, 0x9d, 0x01, 0x9c, 0x27, 0x26, + 0x97, 0xb0, 0x3a, 0x72, 0xe3, 0xd4, 0x6f, 0xa3, 0x29, 0xe2, 0xab, 0x9f, 0xce, 0x86, 0x37, 0x99, + 0x7f, 0x85, 0xb5, 0xb1, 0x4f, 0xe2, 0xe1, 0x74, 0x5c, 0x83, 0x88, 0xea, 0x67, 0xb3, 0x46, 0x98, + 0xfc, 0x31, 0xac, 0x14, 0xbe, 0x0b, 0x07, 0x53, 0xb4, 0xcf, 0xa0, 0xab, 0x1f, 0xcf, 0x82, 0x36, + 0x39, 0x7f, 0xb3, 0x60, 0x73, 0xf2, 0xfb, 0xfd, 0xc9, 0x94, 0x3a, 0x8a, 0x61, 0xd5, 0x2f, 0xdf, + 0x2a, 0x6c, 0xb8, 0x07, 0x85, 0x8d, 0x3e, 0x98, 0x8e, 0x4e, 0xa3, 0x6f, 0xef, 0xc1, 0xa4, 0x55, + 0x4f, 0x37, 0x6e, 0xe4, 0x6a, 0xaf, 0x4f, 0xd5, 0x4b, 0x83, 0xbf, 0x7d, 0xe3, 0x26, 0xdf, 0xc3, + 0xc7, 0xad, 0x57, 0x57, 0x35, 0xeb, 0xf5, 0x55, 0xcd, 0xfa, 0xf7, 0xaa, 0x66, 0xfd, 0x71, 0x5d, + 0x9b, 0x7b, 0x7d, 0x5d, 0x9b, 0xfb, 0xfb, 0xba, 0x36, 0xf7, 0x63, 0x23, 0x08, 0x93, 0x76, 0xcf, + 0x4b, 0xaf, 0xf9, 0x46, 0xca, 0xf8, 0x91, 0x22, 0x6f, 0xe4, 0xe4, 0x8d, 0xcb, 0xc6, 0xe0, 0x0f, + 0x5b, 0xbf, 0x8b, 0xd2, 0x5b, 0x50, 0xff, 0xd9, 0x9e, 0xbe, 0x09, 0x00, 0x00, 0xff, 0xff, 0xb7, + 0xd1, 0x06, 0xc3, 0xaa, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/zetaclient/interfaces.go b/zetaclient/interfaces.go index e6a47009a5..39357435bf 100644 --- a/zetaclient/interfaces.go +++ b/zetaclient/interfaces.go @@ -80,7 +80,7 @@ type ZetaCoreBridger interface { GetZetaBlockHeight() (int64, error) GetLastBlockHeightByChain(chain common.Chain) (*crosschaintypes.LastBlockHeight, error) ListPendingCctx(chainID int64) ([]*crosschaintypes.CrossChainTx, uint64, error) - GetPendingNoncesByChain(chainID int64) (crosschaintypes.PendingNonces, error) + GetPendingNoncesByChain(chainID int64) (observertypes.PendingNonces, error) GetCctxByNonce(chainID int64, nonce uint64) (*crosschaintypes.CrossChainTx, error) GetAllOutTxTrackerByChain(chainID int64, order Order) ([]crosschaintypes.OutTxTracker, error) GetCrosschainFlags() (observertypes.CrosschainFlags, error) diff --git a/zetaclient/query.go b/zetaclient/query.go index fc3bac62b6..0a786bba6e 100644 --- a/zetaclient/query.go +++ b/zetaclient/query.go @@ -245,11 +245,11 @@ func (b *ZetaCoreBridge) GetBallotByID(id string) (*observertypes.QueryBallotByI }) } -func (b *ZetaCoreBridge) GetNonceByChain(chain common.Chain) (*types.ChainNonces, error) { - client := types.NewQueryClient(b.grpcConn) - resp, err := client.ChainNonces(context.Background(), &types.QueryGetChainNoncesRequest{Index: chain.ChainName.String()}) +func (b *ZetaCoreBridge) GetNonceByChain(chain common.Chain) (observertypes.ChainNonces, error) { + client := observertypes.NewQueryClient(b.grpcConn) + resp, err := client.ChainNonces(context.Background(), &observertypes.QueryGetChainNoncesRequest{Index: chain.ChainName.String()}) if err != nil { - return nil, err + return observertypes.ChainNonces{}, err } return resp.ChainNonces, nil } @@ -384,11 +384,11 @@ func (b *ZetaCoreBridge) GetClientParams(chainID int64) (observertypes.QueryGetC return *resp, nil } -func (b *ZetaCoreBridge) GetPendingNoncesByChain(chainID int64) (types.PendingNonces, error) { - client := types.NewQueryClient(b.grpcConn) - resp, err := client.PendingNoncesByChain(context.Background(), &types.QueryPendingNoncesByChainRequest{ChainId: chainID}) +func (b *ZetaCoreBridge) GetPendingNoncesByChain(chainID int64) (observertypes.PendingNonces, error) { + client := observertypes.NewQueryClient(b.grpcConn) + resp, err := client.PendingNoncesByChain(context.Background(), &observertypes.QueryPendingNoncesByChainRequest{ChainId: chainID}) if err != nil { - return types.PendingNonces{}, err + return observertypes.PendingNonces{}, err } return resp.PendingNonces, nil } @@ -411,9 +411,9 @@ func (b *ZetaCoreBridge) GetSupportedChains() ([]*common.Chain, error) { return resp.GetChains(), nil } -func (b *ZetaCoreBridge) GetPendingNonces() (*types.QueryAllPendingNoncesResponse, error) { - client := types.NewQueryClient(b.grpcConn) - resp, err := client.PendingNoncesAll(context.Background(), &types.QueryAllPendingNoncesRequest{}) +func (b *ZetaCoreBridge) GetPendingNonces() (*observertypes.QueryAllPendingNoncesResponse, error) { + client := observertypes.NewQueryClient(b.grpcConn) + resp, err := client.PendingNoncesAll(context.Background(), &observertypes.QueryAllPendingNoncesRequest{}) if err != nil { return nil, err }