From fd170b51404b49bda767cf74727cd26329bfd115 Mon Sep 17 00:00:00 2001 From: Zachary Becker Date: Wed, 4 Jun 2025 13:34:20 -0400 Subject: [PATCH] feat: Update Cosmos SDK to CometBFT v2 (#24837) Co-authored-by: aljo242 --- CHANGELOG.md | 5 + Makefile | 4 +- UPGRADING.md | 226 +- .../abci/{v1 => v2}/service.pulsar.go | 244 +- .../abci/{v1 => v2}/service_grpc.pb.go | 40 +- api/cometbft/abci/{v1 => v2}/types.pulsar.go | 6459 ++++++++++------- api/cometbft/types/{v1 => v2}/block.pulsar.go | 186 +- .../types/{v1 => v2}/canonical.pulsar.go | 584 +- .../types/{v1 => v2}/events.pulsar.go | 148 +- .../types/{v1 => v2}/evidence.pulsar.go | 440 +- .../types/{v1 => v2}/params.pulsar.go | 732 +- api/cometbft/types/{v1 => v2}/types.pulsar.go | 2281 +++--- .../types/{v1 => v2}/validator.pulsar.go | 354 +- api/cosmos/base/abci/v1beta1/abci.pulsar.go | 84 +- .../base/tendermint/v1beta1/query.pulsar.go | 92 +- .../base/tendermint/v1beta1/types.pulsar.go | 94 +- api/cosmos/consensus/v1/query.pulsar.go | 22 +- api/cosmos/consensus/v1/tx.pulsar.go | 112 +- api/cosmos/staking/v1beta1/staking.pulsar.go | 52 +- .../store/streaming/abci/grpc.pulsar.go | 58 +- api/cosmos/store/v1beta1/listening.pulsar.go | 58 +- api/cosmos/tx/v1beta1/service.pulsar.go | 42 +- baseapp/abci.go | 17 +- baseapp/abci_test.go | 6 +- baseapp/abci_utils.go | 10 +- baseapp/abci_utils_test.go | 8 +- baseapp/baseapp.go | 18 +- baseapp/baseapp_test.go | 4 +- baseapp/block_gas_test.go | 4 +- baseapp/genesis.go | 2 +- baseapp/grpcrouter.go | 2 +- baseapp/grpcrouter_helpers.go | 2 +- baseapp/info.go | 2 +- baseapp/msg_service_router_test.go | 2 +- baseapp/oe/optimistic_execution.go | 2 +- baseapp/oe/optimistic_execution_test.go | 2 +- baseapp/options.go | 15 + baseapp/params.go | 2 +- baseapp/params_legacy.go | 2 +- baseapp/snapshot_test.go | 2 +- baseapp/state/manager.go | 2 +- baseapp/streaming_test.go | 4 +- baseapp/test_helpers.go | 2 +- baseapp/utils_test.go | 4 +- client/broadcast.go | 4 +- client/broadcast_test.go | 4 +- client/cometbft.go | 4 +- client/grpc/cmtservice/block.go | 4 +- client/grpc/cmtservice/query.pb.go | 219 +- client/grpc/cmtservice/service.go | 2 +- client/grpc/cmtservice/status.go | 2 +- client/grpc/cmtservice/types.go | 2 +- client/grpc/cmtservice/types.pb.go | 125 +- client/grpc/cmtservice/util.go | 2 +- client/grpc/cmtservice/validator.go | 2 +- client/grpc_query.go | 2 +- client/grpc_query_test.go | 4 +- client/query.go | 4 +- client/query_test.go | 2 +- client/rpc/block.go | 4 +- client/rpc/rpc_test.go | 2 +- client/rpc/tx.go | 6 +- client/test_helpers.go | 10 +- client/utils.go | 2 +- client/v2/go.mod | 25 +- client/v2/go.sum | 47 +- client/v2/internal/testpbgogo/msg.proto | 8 +- client/v2/internal/testpbpulsar/msg.proto | 8 +- codec/amino.go | 2 +- crypto/armor.go | 2 +- crypto/armor_test.go | 2 +- crypto/codec/cmt.go | 4 +- crypto/hd/fundraiser_test.go | 2 +- crypto/keyring/keyring_test.go | 2 +- crypto/keys/ed25519/doc.go | 2 +- crypto/keys/ed25519/ed25519.go | 4 +- crypto/keys/ed25519/ed25519_test.go | 4 +- .../internal/ecdsa/privkey_internal_test.go | 2 +- crypto/keys/internal/ecdsa/pubkey.go | 2 +- crypto/keys/multisig/multisig.go | 2 +- crypto/keys/secp256k1/secp256k1.go | 2 +- crypto/keys/secp256k1/secp256k1_cgo.go | 2 +- crypto/keys/secp256k1/secp256k1_nocgo.go | 2 +- crypto/keys/secp256k1/secp256k1_test.go | 4 +- .../keys/secp256r1/privkey_internal_test.go | 2 +- crypto/keys/secp256r1/pubkey.go | 2 +- crypto/ledger/ledger_mock.go | 2 +- crypto/types/types.go | 2 +- go.mod | 19 +- go.sum | 37 +- math/unsafe/rand.go | 2 +- proto/cometbft/abci/{v1 => v2}/service.proto | 6 +- proto/cometbft/abci/{v1 => v2}/types.proto | 43 +- proto/cometbft/types/{v1 => v2}/block.proto | 8 +- .../cometbft/types/{v1 => v2}/canonical.proto | 6 +- proto/cometbft/types/{v1 => v2}/events.proto | 4 +- .../cometbft/types/{v1 => v2}/evidence.proto | 8 +- proto/cometbft/types/{v1 => v2}/params.proto | 4 +- proto/cometbft/types/{v1 => v2}/types.proto | 24 +- .../cometbft/types/{v1 => v2}/validator.proto | 4 +- proto/cosmos/base/abci/v1beta1/abci.proto | 10 +- .../base/tendermint/v1beta1/query.proto | 12 +- .../base/tendermint/v1beta1/types.proto | 12 +- proto/cosmos/consensus/v1/query.proto | 4 +- proto/cosmos/consensus/v1/tx.proto | 14 +- proto/cosmos/staking/v1beta1/staking.proto | 8 +- proto/cosmos/store/streaming/abci/grpc.proto | 8 +- proto/cosmos/store/v1beta1/listening.proto | 8 +- proto/cosmos/tx/v1beta1/service.proto | 8 +- runtime/app.go | 2 +- runtime/types.go | 2 +- server/api/server.go | 2 +- server/cmd/execute.go | 2 +- server/cmt_abci.go | 2 +- server/cmt_cmds.go | 12 +- server/export_test.go | 6 +- server/log/cmt_logger.go | 2 +- server/mock/app.go | 2 +- server/mock/app_test.go | 2 +- server/rollback.go | 2 +- server/start.go | 34 +- server/types/abci.go | 2 +- server/types/app.go | 4 +- server/util.go | 10 +- server/util_test.go | 2 +- simapp/abci.go | 2 +- simapp/app.go | 2 +- simapp/app_test.go | 4 +- simapp/export.go | 2 +- simapp/genesis_account_test.go | 2 +- simapp/go.mod | 28 +- simapp/go.sum | 40 +- simapp/sim_test.go | 4 +- simapp/simd/cmd/commands.go | 2 +- simapp/simd/cmd/testnet.go | 13 +- simapp/test_helpers.go | 6 +- store/go.mod | 6 +- store/go.sum | 8 +- store/internal/maps/maps.go | 4 +- store/prefix/store.go | 6 +- store/prefix/store_test.go | 2 +- store/rootmulti/proof.go | 2 +- store/rootmulti/store.go | 2 +- store/snapshots/types/convert.go | 2 +- store/streaming/abci/examples/file/file.go | 2 +- .../streaming/abci/examples/stdout/stdout.go | 2 +- store/streaming/abci/grpc.go | 2 +- store/streaming/abci/grpc.pb.go | 72 +- store/streaming/streaming_test.go | 4 +- store/types/listening.pb.go | 58 +- store/types/proof.go | 2 +- store/types/streaming.go | 2 +- systemtests/go.mod | 25 +- systemtests/go.sum | 47 +- systemtests/node_utils.go | 2 +- systemtests/rpc_client.go | 8 +- systemtests/system.go | 8 +- systemtests/testnet_init.go | 4 +- tests/e2e/auth/suite.go | 2 +- tests/e2e/server/export_test.go | 2 +- tests/e2e/staking/suite.go | 2 +- tests/go.mod | 15 +- tests/go.sum | 33 +- .../integration/auth/client/cli/suite_test.go | 4 +- .../bank/keeper/deterministic_test.go | 2 +- .../distribution/keeper/msg_server_test.go | 4 +- .../evidence/keeper/infraction_test.go | 4 +- tests/integration/gov/genesis_test.go | 2 +- tests/integration/gov/keeper/keeper_test.go | 2 +- .../slashing/keeper/keeper_test.go | 2 +- .../integration/staking/keeper/common_test.go | 2 +- .../staking/keeper/determinstic_test.go | 2 +- .../staking/keeper/genesis_test.go | 2 +- .../staking/keeper/grpc_query_test.go | 2 +- .../integration/staking/keeper/slash_test.go | 2 +- .../staking/keeper/validator_test.go | 2 +- .../staking/keeper/vote_extensions_test.go | 4 +- .../store/rootmulti/rollback_test.go | 4 +- tests/systemtests/go.mod | 18 +- tests/systemtests/go.sum | 42 +- tests/systemtests/upgrade_test.go | 10 +- testutil/cli/cmt_mocks.go | 12 +- testutil/context.go | 2 +- testutil/integration/example_test.go | 2 +- testutil/integration/router.go | 4 +- testutil/mock/privval.go | 8 +- testutil/mock/privval_test.go | 2 +- testutil/mock/types_mock_appmodule.go | 2 +- testutil/mock/types_module_module.go | 2 +- testutil/network/network.go | 5 +- testutil/network/util.go | 33 +- testutil/sims/app_helpers.go | 8 +- testutil/sims/tx_helpers.go | 4 +- tools/benchmark/go.mod | 25 +- tools/benchmark/go.sum | 39 +- tools/confix/go.mod | 36 +- tools/confix/go.sum | 51 +- tools/cosmovisor/go.mod | 19 +- tools/cosmovisor/go.sum | 30 +- tools/cosmovisor/scanner.go | 2 +- types/abci.go | 2 +- types/abci.pb.go | 146 +- types/address/hash.go | 2 +- types/address/hash_test.go | 2 +- types/context.go | 4 +- types/context_test.go | 6 +- types/errors/abci.go | 2 +- types/events.go | 2 +- types/events_test.go | 2 +- types/mempool/mempool_test.go | 2 +- types/mempool/priority_nonce_test.go | 2 +- types/mempool/sender_nonce_property_test.go | 2 +- types/mempool/sender_nonce_test.go | 2 +- types/module/core_module.go | 2 +- types/module/module.go | 2 +- types/module/module_test.go | 4 +- types/query/pagination_test.go | 2 +- types/result.go | 6 +- types/result_test.go | 8 +- types/staking.go | 2 +- types/tx/service.pb.go | 182 +- x/auth/ante/feegrant_test.go | 2 +- x/auth/ante/setup_test.go | 2 +- x/auth/ante/sigverify_benchmark_test.go | 2 +- x/auth/ante/testutil_test.go | 2 +- x/auth/keeper/keeper_test.go | 4 +- x/auth/migrations/v2/store.go | 2 +- x/auth/migrations/v2/store_test.go | 2 +- x/auth/migrations/v3/store_test.go | 2 +- x/auth/simulation/proposals_test.go | 2 +- x/auth/tx/query.go | 2 +- x/auth/types/account.go | 2 +- x/auth/vesting/client/cli/tx_test.go | 2 +- x/auth/vesting/module.go | 2 +- x/auth/vesting/msg_server_test.go | 4 +- x/auth/vesting/types/vesting_account_test.go | 2 +- x/authz/client/cli/tx_test.go | 4 +- x/authz/keeper/genesis_test.go | 2 +- x/authz/keeper/keeper.go | 2 +- x/authz/keeper/keeper_test.go | 4 +- x/authz/module/abci_test.go | 2 +- x/authz/simulation/operations_test.go | 2 +- x/bank/app_test.go | 4 +- x/bank/bench_test.go | 2 +- x/bank/client/cli/tx_test.go | 2 +- x/bank/keeper/collections_test.go | 4 +- x/bank/keeper/keeper_test.go | 6 +- x/bank/simulation/operations_test.go | 2 +- x/bank/simulation/proposals_test.go | 2 +- x/circuit/ante/circuit_test.go | 4 +- x/circuit/keeper/keeper_test.go | 2 +- x/consensus/exported/exported.go | 2 +- x/consensus/keeper/keeper.go | 4 +- x/consensus/keeper/keeper_test.go | 4 +- x/consensus/types/msgs.go | 4 +- x/consensus/types/query.pb.go | 39 +- x/consensus/types/tx.pb.go | 96 +- x/distribution/client/cli/tx_test.go | 4 +- x/distribution/keeper/abci_test.go | 4 +- x/distribution/keeper/allocation.go | 2 +- x/distribution/keeper/allocation_test.go | 4 +- x/distribution/keeper/delegation_test.go | 2 +- x/distribution/keeper/keeper_test.go | 2 +- x/distribution/simulation/operations_test.go | 2 +- x/distribution/simulation/proposals_test.go | 2 +- x/evidence/genesis_test.go | 2 +- x/evidence/keeper/keeper_test.go | 2 +- x/evidence/types/evidence.go | 2 +- x/feegrant/basic_fee_test.go | 2 +- x/feegrant/client/cli/tx_test.go | 4 +- x/feegrant/filtered_fee_test.go | 2 +- x/feegrant/grant_test.go | 2 +- x/feegrant/periodic_fee_test.go | 2 +- x/feegrant/simulation/operations_test.go | 4 +- x/genutil/client/cli/gentx_test.go | 4 +- x/genutil/client/cli/init.go | 4 +- x/genutil/client/cli/init_test.go | 2 +- x/genutil/client/testutil/helpers.go | 2 +- x/genutil/collect.go | 2 +- x/genutil/genesis.go | 2 +- x/genutil/gentx.go | 2 +- x/genutil/module.go | 2 +- x/genutil/testutil/expected_keepers_mocks.go | 2 +- x/genutil/types/chain_id.go | 2 +- x/genutil/types/expected_keepers.go | 2 +- x/genutil/types/genesis.go | 8 +- x/genutil/types/genesis_test.go | 2 +- x/genutil/utils.go | 12 +- x/genutil/utils_test.go | 6 +- x/gov/abci_test.go | 2 +- x/gov/client/cli/tx_test.go | 4 +- x/gov/client/utils/query.go | 2 +- x/gov/client/utils/query_test.go | 6 +- x/gov/keeper/common_test.go | 4 +- x/gov/simulation/operations_test.go | 2 +- x/gov/simulation/proposals_test.go | 2 +- x/group/client/cli/tx_test.go | 4 +- x/group/keeper/genesis.go | 2 +- x/group/keeper/keeper_test.go | 2 +- x/group/keeper/msg_server_test.go | 2 +- x/group/module/abci_test.go | 4 +- x/group/simulation/operations_test.go | 2 +- x/mint/simulation/proposals_test.go | 2 +- x/nft/keeper/keeper_test.go | 4 +- x/nft/simulation/operations_test.go | 2 +- x/params/simulation/operations_test.go | 2 +- x/params/simulation/proposals_test.go | 2 +- x/params/types/consensus_params_legacy.go | 2 +- x/params/types/subspace_test.go | 2 +- x/simulation/mock_cometbft.go | 6 +- x/simulation/params.go | 4 +- x/simulation/params_test.go | 2 +- x/simulation/simulate.go | 4 +- x/slashing/abci_test.go | 4 +- x/slashing/app_test.go | 4 +- x/slashing/keeper/hooks.go | 2 +- x/slashing/keeper/keeper_test.go | 4 +- x/slashing/simulation/operations_test.go | 4 +- x/slashing/simulation/proposals_test.go | 2 +- x/staking/app_test.go | 4 +- x/staking/client/cli/tx_test.go | 4 +- x/staking/genesis.go | 2 +- x/staking/keeper/abci.go | 2 +- x/staking/keeper/genesis.go | 2 +- x/staking/keeper/historical_info_test.go | 2 +- x/staking/keeper/keeper.go | 2 +- x/staking/keeper/keeper_test.go | 4 +- x/staking/keeper/val_state_change.go | 2 +- x/staking/keeper/validator_test.go | 2 +- x/staking/keeper_bench_test.go | 4 +- x/staking/migrations/v5/migrations_test.go | 2 +- x/staking/module.go | 2 +- x/staking/simulation/operations_test.go | 4 +- x/staking/simulation/proposals_test.go | 2 +- x/staking/testutil/cmt.go | 4 +- x/staking/types/historical_info.go | 2 +- x/staking/types/historical_info_test.go | 2 +- x/staking/types/staking.pb.go | 1926 ++--- x/staking/types/validator.go | 4 +- x/staking/types/validator_test.go | 2 +- x/upgrade/types/storeloader_test.go | 2 +- 341 files changed, 9024 insertions(+), 7892 deletions(-) rename api/cometbft/abci/{v1 => v2}/service.pulsar.go (54%) rename api/cometbft/abci/{v1 => v2}/service_grpc.pb.go (97%) rename api/cometbft/abci/{v1 => v2}/types.pulsar.go (85%) rename api/cometbft/types/{v1 => v2}/block.pulsar.go (84%) rename api/cometbft/types/{v1 => v2}/canonical.pulsar.go (87%) rename api/cometbft/types/{v1 => v2}/events.pulsar.go (83%) rename api/cometbft/types/{v1 => v2}/evidence.pulsar.go (88%) rename api/cometbft/types/{v1 => v2}/params.pulsar.go (90%) rename api/cometbft/types/{v1 => v2}/types.pulsar.go (84%) rename api/cometbft/types/{v1 => v2}/validator.pulsar.go (88%) rename proto/cometbft/abci/{v1 => v2}/service.proto (96%) rename proto/cometbft/abci/{v1 => v2}/types.proto (92%) rename proto/cometbft/types/{v1 => v2}/block.proto (78%) rename proto/cometbft/types/{v1 => v2}/canonical.proto (96%) rename proto/cometbft/types/{v1 => v2}/events.proto (86%) rename proto/cometbft/types/{v1 => v2}/evidence.proto (92%) rename proto/cometbft/types/{v1 => v2}/params.proto (99%) rename proto/cometbft/types/{v1 => v2}/types.proto (86%) rename proto/cometbft/types/{v1 => v2}/validator.proto (97%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f8b22daed..8b9aa094ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,11 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Breaking Changes + +* [#24837](https://github.com/cosmos/cosmos-sdk/pull/24837) Update to using CometBFT v2. + * This update changes the import paths from `cometbft/cometbft` to `cometbft/cometbft/v2`. Users can use the migration tool to automatically update their nodes. + ### Features * (server) [#24720](https://github.com/cosmos/cosmos-sdk/pull/24720) add `verbose_log_level` flag for configuring the log level when switching to verbose logging mode during sensitive operations (such as chain upgrades). diff --git a/Makefile b/Makefile index e816017961..63ddfe49d4 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ ifeq ($(findstring -,$(VERSION)),) # No "-" means it's just a hash VERSION := 0.0.0-$(VERSION_RAW) endif export VERSION -export CMTVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::') +export CMTVERSION := $(shell go list -m github.com/cometbft/cometbft/v2 | sed 's:.* ::') export COMMIT := $(shell git log -1 --format='%H') LEDGER_ENABLED ?= true BINDIR ?= $(GOPATH)/bin @@ -67,7 +67,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \ - -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION) + -X github.com/cometbft/cometbft/v2/version.TMCoreSemVer=$(CMTVERSION) # DB backend selection ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS))) diff --git a/UPGRADING.md b/UPGRADING.md index 598dd51905..bc043cd579 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -1,227 +1,25 @@ # Upgrade Reference -This document provides a quick reference for the upgrades from `v0.50.x` to `v0.53.x` of Cosmos SDK. +This document provides a quick reference for the upgrades from `v0.53.x` to `v0.54.x` of Cosmos SDK. Note, always read the **App Wiring Changes** section for more information on application wiring updates. -🚨Upgrading to v0.53.x will require a **coordinated** chain upgrade.🚨 +🚨Upgrading to v0.54.x will require a **coordinated** chain upgrade.🚨 ### TLDR; -Unordered transactions, `x/protocolpool`, and `x/epoch` are the major new features added in v0.53.x. +**The only major feature in Cosmos SDK v0.54.x is the upgrade from CometBFT v0.x.x to CometBFT v2.** -We also added the ability to add a `CheckTx` handler and enabled ed25519 signature verification. +For a full list of changes, see the [Changelog](https://github.com/cosmos/cosmos-sdk/blob/release/v0.54.x/CHANGELOG.md). -For a full list of changes, see the [Changelog](https://github.com/cosmos/cosmos-sdk/blob/release/v0.53.x/CHANGELOG.md). +#### Deprecation of `TimeoutCommit` -### Unordered Transactions +CometBFT v2 has deprecated the use of `TimeoutCommit` for a new field, `NextBlockDelay`, that is part of the +`FinalizeBlockResponse` ABCI message that is returned to CometBFT via the SDK baseapp. More information from +the CometBFT repo can be found [here](https://github.com/cometbft/cometbft/blob/88ef3d267de491db98a654be0af6d791e8724ed0/spec/abci/abci%2B%2B_methods.md?plain=1#L689). -The Cosmos SDK now supports unordered transactions. _This is an opt-in feature_. +For SDK application developers and node runners, this means that the `timeout_commit` value in the `config.toml` file +is now **ignored**. -Clients that use this feature may now submit their transactions in a fire-and-forget manner to chains that enabled unordered transactions. - -To submit an unordered transaction, clients must set the `unordered` flag to -`true` and ensure a reasonable `timeout_timestamp` is set. The `timeout_timestamp` is -used as a TTL for the transaction and provides replay protection. Each transaction's `timeout_timestamp` must be -unique to the account; however, the difference may be as small as a nanosecond. See [ADR-070](https://github.com/cosmos/cosmos-sdk/blob/main/docs/architecture/adr-070-unordered-transactions.md) for more details. - -Note that unordered transactions require sequence values to be zero, and will **FAIL** if a non-zero sequence value is set. -Please ensure no sequence value is set when submitting an unordered transaction. -Services that rely on prior assumptions about sequence values should be updated to handle unordered transactions. -Services should be aware that when the transaction is unordered, the transaction sequence will always be zero. - -#### Enabling Unordered Transactions - -To enable unordered transactions, supply the `WithUnorderedTransactions` option to the `x/auth` keeper: - -```go - app.AccountKeeper = authkeeper.NewAccountKeeper( - appCodec, - runtime.NewKVStoreService(keys[authtypes.StoreKey]), - authtypes.ProtoBaseAccount, - maccPerms, - authcodec.NewBech32Codec(sdk.Bech32MainPrefix), - sdk.Bech32MainPrefix, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), - authkeeper.WithUnorderedTransactions(true), // new option! - ) -``` - -If using dependency injection, update the auth module config. - -```go - { - Name: authtypes.ModuleName, - Config: appconfig.WrapAny(&authmodulev1.Module{ - Bech32Prefix: "cosmos", - ModuleAccountPermissions: moduleAccPerms, - EnableUnorderedTransactions: true, // remove this line if you do not want unordered transactions. - }), - }, -``` - -By default, unordered transactions use a transaction timeout duration of 10 minutes and a default gas charge of 2240 gas units. -To modify these default values, pass in the corresponding options to the new `SigVerifyOptions` field in `x/auth's` `ante.HandlerOptions`. - -```go -options := ante.HandlerOptions{ - SigVerifyOptions: []ante.SigVerificationDecoratorOption{ - // change below as needed. - ante.WithUnorderedTxGasCost(ante.DefaultUnorderedTxGasCost), - ante.WithMaxUnorderedTxTimeoutDuration(ante.DefaultMaxTimoutDuration), - }, -} -``` - -```go -anteDecorators := []sdk.AnteDecorator{ - // ... other decorators ... - ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler, options.SigVerifyOptions...), // supply new options -} -``` - -### App Wiring Changes - -In this section, we describe the required app wiring changes to run a v0.53.x Cosmos SDK application. - -**These changes are directly applicable to your application wiring.** - -The `x/auth` module now contains a `PreBlocker` that _must_ be set in the module manager's `SetOrderPreBlockers` method. - -```go -app.ModuleManager.SetOrderPreBlockers( - upgradetypes.ModuleName, - authtypes.ModuleName, // NEW -) -``` - -That's it. - -### New Modules - -Below are some **optional** new modules you can include in your chain. -To see a full example of wiring these modules, please check out the [SimApp](https://github.com/cosmos/cosmos-sdk/blob/release/v0.53.x/simapp/app.go). - -#### Epochs - -⚠️Adding this module requires a `StoreUpgrade`⚠️ - -The new, supplemental `x/epochs` module provides Cosmos SDK modules functionality to register and execute custom logic at fixed time-intervals. - -Required wiring: -- Keeper Instantiation -- StoreKey addition -- Hooks Registration -- App Module Registration -- entry in SetOrderBeginBlockers -- entry in SetGenesisModuleOrder -- entry in SetExportModuleOrder - -#### ProtocolPool - -:::warning - -Using `protocolpool` will cause the following `x/distribution` handlers to return an error: - - -**QueryService** - -- `CommunityPool` - -**MsgService** - -- `CommunityPoolSpend` -- `FundCommunityPool` - -If you have services that rely on this functionality from `x/distribution`, please update them to use the `x/protocolpool` equivalents. - -::: - -⚠️Adding this module requires a `StoreUpgrade`⚠️ - -The new, supplemental `x/protocolpool` module provides extended functionality for managing and distributing block reward revenue. - -Required wiring: -- Module Account Permissions - - protocolpooltypes.ModuleName (nil) - - protocolpooltypes.ProtocolPoolEscrowAccount (nil) -- Keeper Instantiation -- StoreKey addition -- Passing the keeper to the Distribution Keeper - - `distrkeeper.WithExternalCommunityPool(app.ProtocolPoolKeeper)` -- App Module Registration -- entry in SetOrderBeginBlockers -- entry in SetOrderEndBlockers -- entry in SetGenesisModuleOrder -- entry in SetExportModuleOrder **before `x/bank`** - -## Custom Minting Function in `x/mint` - -This release introduces the ability to configure a custom mint function in `x/mint`. The minting logic is now abstracted as a `MintFn` with a default implementation that can be overridden. - -### What’s New - -- **Configurable Mint Function:** - A new `MintFn` abstraction is introduced. By default, the module uses `DefaultMintFn`, but you can supply your own implementation. - -- **Deprecated InflationCalculationFn Parameter:** - The `InflationCalculationFn` argument previously provided to `mint.NewAppModule()` is now ignored and must be `nil`. To customize the default minter’s inflation behavior, wrap your custom function with `mintkeeper.DefaultMintFn` and pass it via the `WithMintFn` option: - -```go - mintkeeper.WithMintFn(mintkeeper.DefaultMintFn(customInflationFn)) -``` - -### How to Upgrade - -1. **Using the Default Minting Function** - - No action is needed if you’re happy with the default behavior. Make sure your application wiring initializes the MintKeeper like this: - -```go - mintKeeper := mintkeeper.NewKeeper( - appCodec, - storeService, - stakingKeeper, - accountKeeper, - bankKeeper, - authtypes.FeeCollectorName, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), - ) -``` - -2. **Using a Custom Minting Function** - - To use a custom minting function, define it as follows and pass it you your mintKeeper when constructing it: - -```go -func myCustomMintFunc(ctx sdk.Context, k *mintkeeper.Keeper) { - // do minting... -} - -// ... - mintKeeper := mintkeeper.NewKeeper( - appCodec, - storeService, - stakingKeeper, - accountKeeper, - bankKeeper, - authtypes.FeeCollectorName, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), - mintkeeper.WithMintFn(myCustomMintFunc), // Use custom minting function - ) -``` - -### Misc Changes - -#### Testnet's init-files Command - -Some changes were made to `testnet`'s `init-files` command to support our new testing framework, `Systemtest`. - -##### Flag Changes - -- The flag for validator count was changed from `--v` to `--validator-count`(shorthand: `-v`). - -##### Flag Additions -- `--staking-denom` allows changing the default stake denom, `stake`. -- `--commit-timeout` enables changing the commit timeout of the chain. -- `--single-host` enables running a multi-node network on a single host. This bumps each subsequent node's network addresses by 1. For example, node1's gRPC address will be 9090, node2's 9091, etc... \ No newline at end of file +For similar behavior, there is a new `baseapp` option, `SetNextBlockDelay` which can be passed to your application upon +initialization in `app.go`. \ No newline at end of file diff --git a/api/cometbft/abci/v1/service.pulsar.go b/api/cometbft/abci/v2/service.pulsar.go similarity index 54% rename from api/cometbft/abci/v1/service.pulsar.go rename to api/cometbft/abci/v2/service.pulsar.go index 9a8a4fdba6..e870e37e83 100644 --- a/api/cometbft/abci/v1/service.pulsar.go +++ b/api/cometbft/abci/v2/service.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package abciv1 +package abciv2 import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -11,7 +11,7 @@ import ( // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/abci/v1/service.proto +// source: cometbft/abci/v2/service.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -20,188 +20,188 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -var File_cometbft_abci_v1_service_proto protoreflect.FileDescriptor +var File_cometbft_abci_v2_service_proto protoreflect.FileDescriptor -var file_cometbft_abci_v1_service_proto_rawDesc = []byte{ +var file_cometbft_abci_v2_service_proto_rawDesc = []byte{ 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, - 0x76, 0x31, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x76, 0x32, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x10, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, - 0x76, 0x31, 0x1a, 0x1c, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, - 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x76, 0x32, 0x1a, 0x1c, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, + 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xc4, 0x0b, 0x0a, 0x0b, 0x41, 0x42, 0x43, 0x49, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x45, 0x0a, 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x63, 0x68, 0x6f, + 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, + 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x05, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x66, + 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x66, 0x6f, + 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x07, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x12, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, + 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, + 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4b, 0x0a, 0x06, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x1f, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x54, 0x0a, 0x09, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x22, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, + 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x52, + 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x0d, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x66, 0x66, 0x65, + 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, + 0x2e, 0x76, 0x32, 0x2e, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x11, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x12, 0x2a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, + 0x32, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6f, 0x0a, 0x12, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x12, 0x2b, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x70, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x66, 0x0a, 0x0f, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x28, 0x2e, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, + 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x66, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, + 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x57, 0x0a, 0x0a, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x12, 0x23, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x72, 0x0a, 0x13, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, + 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x60, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, + 0x32, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xb0, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x28, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, - 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x62, 0x63, 0x69, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x41, 0x58, + 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x62, 0x63, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x43, 0x41, 0x58, 0xaa, 0x02, 0x10, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x41, 0x62, 0x63, 0x69, - 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x41, - 0x62, 0x63, 0x69, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x5c, 0x41, 0x62, 0x63, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x2e, 0x56, 0x32, 0xca, 0x02, 0x10, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x41, + 0x62, 0x63, 0x69, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x1c, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x5c, 0x41, 0x62, 0x63, 0x69, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x3a, 0x3a, 0x41, 0x62, 0x63, 0x69, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x3a, 0x3a, 0x41, 0x62, 0x63, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_cometbft_abci_v1_service_proto_goTypes = []interface{}{ - (*EchoRequest)(nil), // 0: cometbft.abci.v1.EchoRequest - (*FlushRequest)(nil), // 1: cometbft.abci.v1.FlushRequest - (*InfoRequest)(nil), // 2: cometbft.abci.v1.InfoRequest - (*CheckTxRequest)(nil), // 3: cometbft.abci.v1.CheckTxRequest - (*QueryRequest)(nil), // 4: cometbft.abci.v1.QueryRequest - (*CommitRequest)(nil), // 5: cometbft.abci.v1.CommitRequest - (*InitChainRequest)(nil), // 6: cometbft.abci.v1.InitChainRequest - (*ListSnapshotsRequest)(nil), // 7: cometbft.abci.v1.ListSnapshotsRequest - (*OfferSnapshotRequest)(nil), // 8: cometbft.abci.v1.OfferSnapshotRequest - (*LoadSnapshotChunkRequest)(nil), // 9: cometbft.abci.v1.LoadSnapshotChunkRequest - (*ApplySnapshotChunkRequest)(nil), // 10: cometbft.abci.v1.ApplySnapshotChunkRequest - (*PrepareProposalRequest)(nil), // 11: cometbft.abci.v1.PrepareProposalRequest - (*ProcessProposalRequest)(nil), // 12: cometbft.abci.v1.ProcessProposalRequest - (*ExtendVoteRequest)(nil), // 13: cometbft.abci.v1.ExtendVoteRequest - (*VerifyVoteExtensionRequest)(nil), // 14: cometbft.abci.v1.VerifyVoteExtensionRequest - (*FinalizeBlockRequest)(nil), // 15: cometbft.abci.v1.FinalizeBlockRequest - (*EchoResponse)(nil), // 16: cometbft.abci.v1.EchoResponse - (*FlushResponse)(nil), // 17: cometbft.abci.v1.FlushResponse - (*InfoResponse)(nil), // 18: cometbft.abci.v1.InfoResponse - (*CheckTxResponse)(nil), // 19: cometbft.abci.v1.CheckTxResponse - (*QueryResponse)(nil), // 20: cometbft.abci.v1.QueryResponse - (*CommitResponse)(nil), // 21: cometbft.abci.v1.CommitResponse - (*InitChainResponse)(nil), // 22: cometbft.abci.v1.InitChainResponse - (*ListSnapshotsResponse)(nil), // 23: cometbft.abci.v1.ListSnapshotsResponse - (*OfferSnapshotResponse)(nil), // 24: cometbft.abci.v1.OfferSnapshotResponse - (*LoadSnapshotChunkResponse)(nil), // 25: cometbft.abci.v1.LoadSnapshotChunkResponse - (*ApplySnapshotChunkResponse)(nil), // 26: cometbft.abci.v1.ApplySnapshotChunkResponse - (*PrepareProposalResponse)(nil), // 27: cometbft.abci.v1.PrepareProposalResponse - (*ProcessProposalResponse)(nil), // 28: cometbft.abci.v1.ProcessProposalResponse - (*ExtendVoteResponse)(nil), // 29: cometbft.abci.v1.ExtendVoteResponse - (*VerifyVoteExtensionResponse)(nil), // 30: cometbft.abci.v1.VerifyVoteExtensionResponse - (*FinalizeBlockResponse)(nil), // 31: cometbft.abci.v1.FinalizeBlockResponse +var file_cometbft_abci_v2_service_proto_goTypes = []interface{}{ + (*EchoRequest)(nil), // 0: cometbft.abci.v2.EchoRequest + (*FlushRequest)(nil), // 1: cometbft.abci.v2.FlushRequest + (*InfoRequest)(nil), // 2: cometbft.abci.v2.InfoRequest + (*CheckTxRequest)(nil), // 3: cometbft.abci.v2.CheckTxRequest + (*QueryRequest)(nil), // 4: cometbft.abci.v2.QueryRequest + (*CommitRequest)(nil), // 5: cometbft.abci.v2.CommitRequest + (*InitChainRequest)(nil), // 6: cometbft.abci.v2.InitChainRequest + (*ListSnapshotsRequest)(nil), // 7: cometbft.abci.v2.ListSnapshotsRequest + (*OfferSnapshotRequest)(nil), // 8: cometbft.abci.v2.OfferSnapshotRequest + (*LoadSnapshotChunkRequest)(nil), // 9: cometbft.abci.v2.LoadSnapshotChunkRequest + (*ApplySnapshotChunkRequest)(nil), // 10: cometbft.abci.v2.ApplySnapshotChunkRequest + (*PrepareProposalRequest)(nil), // 11: cometbft.abci.v2.PrepareProposalRequest + (*ProcessProposalRequest)(nil), // 12: cometbft.abci.v2.ProcessProposalRequest + (*ExtendVoteRequest)(nil), // 13: cometbft.abci.v2.ExtendVoteRequest + (*VerifyVoteExtensionRequest)(nil), // 14: cometbft.abci.v2.VerifyVoteExtensionRequest + (*FinalizeBlockRequest)(nil), // 15: cometbft.abci.v2.FinalizeBlockRequest + (*EchoResponse)(nil), // 16: cometbft.abci.v2.EchoResponse + (*FlushResponse)(nil), // 17: cometbft.abci.v2.FlushResponse + (*InfoResponse)(nil), // 18: cometbft.abci.v2.InfoResponse + (*CheckTxResponse)(nil), // 19: cometbft.abci.v2.CheckTxResponse + (*QueryResponse)(nil), // 20: cometbft.abci.v2.QueryResponse + (*CommitResponse)(nil), // 21: cometbft.abci.v2.CommitResponse + (*InitChainResponse)(nil), // 22: cometbft.abci.v2.InitChainResponse + (*ListSnapshotsResponse)(nil), // 23: cometbft.abci.v2.ListSnapshotsResponse + (*OfferSnapshotResponse)(nil), // 24: cometbft.abci.v2.OfferSnapshotResponse + (*LoadSnapshotChunkResponse)(nil), // 25: cometbft.abci.v2.LoadSnapshotChunkResponse + (*ApplySnapshotChunkResponse)(nil), // 26: cometbft.abci.v2.ApplySnapshotChunkResponse + (*PrepareProposalResponse)(nil), // 27: cometbft.abci.v2.PrepareProposalResponse + (*ProcessProposalResponse)(nil), // 28: cometbft.abci.v2.ProcessProposalResponse + (*ExtendVoteResponse)(nil), // 29: cometbft.abci.v2.ExtendVoteResponse + (*VerifyVoteExtensionResponse)(nil), // 30: cometbft.abci.v2.VerifyVoteExtensionResponse + (*FinalizeBlockResponse)(nil), // 31: cometbft.abci.v2.FinalizeBlockResponse } -var file_cometbft_abci_v1_service_proto_depIdxs = []int32{ - 0, // 0: cometbft.abci.v1.ABCIService.Echo:input_type -> cometbft.abci.v1.EchoRequest - 1, // 1: cometbft.abci.v1.ABCIService.Flush:input_type -> cometbft.abci.v1.FlushRequest - 2, // 2: cometbft.abci.v1.ABCIService.Info:input_type -> cometbft.abci.v1.InfoRequest - 3, // 3: cometbft.abci.v1.ABCIService.CheckTx:input_type -> cometbft.abci.v1.CheckTxRequest - 4, // 4: cometbft.abci.v1.ABCIService.Query:input_type -> cometbft.abci.v1.QueryRequest - 5, // 5: cometbft.abci.v1.ABCIService.Commit:input_type -> cometbft.abci.v1.CommitRequest - 6, // 6: cometbft.abci.v1.ABCIService.InitChain:input_type -> cometbft.abci.v1.InitChainRequest - 7, // 7: cometbft.abci.v1.ABCIService.ListSnapshots:input_type -> cometbft.abci.v1.ListSnapshotsRequest - 8, // 8: cometbft.abci.v1.ABCIService.OfferSnapshot:input_type -> cometbft.abci.v1.OfferSnapshotRequest - 9, // 9: cometbft.abci.v1.ABCIService.LoadSnapshotChunk:input_type -> cometbft.abci.v1.LoadSnapshotChunkRequest - 10, // 10: cometbft.abci.v1.ABCIService.ApplySnapshotChunk:input_type -> cometbft.abci.v1.ApplySnapshotChunkRequest - 11, // 11: cometbft.abci.v1.ABCIService.PrepareProposal:input_type -> cometbft.abci.v1.PrepareProposalRequest - 12, // 12: cometbft.abci.v1.ABCIService.ProcessProposal:input_type -> cometbft.abci.v1.ProcessProposalRequest - 13, // 13: cometbft.abci.v1.ABCIService.ExtendVote:input_type -> cometbft.abci.v1.ExtendVoteRequest - 14, // 14: cometbft.abci.v1.ABCIService.VerifyVoteExtension:input_type -> cometbft.abci.v1.VerifyVoteExtensionRequest - 15, // 15: cometbft.abci.v1.ABCIService.FinalizeBlock:input_type -> cometbft.abci.v1.FinalizeBlockRequest - 16, // 16: cometbft.abci.v1.ABCIService.Echo:output_type -> cometbft.abci.v1.EchoResponse - 17, // 17: cometbft.abci.v1.ABCIService.Flush:output_type -> cometbft.abci.v1.FlushResponse - 18, // 18: cometbft.abci.v1.ABCIService.Info:output_type -> cometbft.abci.v1.InfoResponse - 19, // 19: cometbft.abci.v1.ABCIService.CheckTx:output_type -> cometbft.abci.v1.CheckTxResponse - 20, // 20: cometbft.abci.v1.ABCIService.Query:output_type -> cometbft.abci.v1.QueryResponse - 21, // 21: cometbft.abci.v1.ABCIService.Commit:output_type -> cometbft.abci.v1.CommitResponse - 22, // 22: cometbft.abci.v1.ABCIService.InitChain:output_type -> cometbft.abci.v1.InitChainResponse - 23, // 23: cometbft.abci.v1.ABCIService.ListSnapshots:output_type -> cometbft.abci.v1.ListSnapshotsResponse - 24, // 24: cometbft.abci.v1.ABCIService.OfferSnapshot:output_type -> cometbft.abci.v1.OfferSnapshotResponse - 25, // 25: cometbft.abci.v1.ABCIService.LoadSnapshotChunk:output_type -> cometbft.abci.v1.LoadSnapshotChunkResponse - 26, // 26: cometbft.abci.v1.ABCIService.ApplySnapshotChunk:output_type -> cometbft.abci.v1.ApplySnapshotChunkResponse - 27, // 27: cometbft.abci.v1.ABCIService.PrepareProposal:output_type -> cometbft.abci.v1.PrepareProposalResponse - 28, // 28: cometbft.abci.v1.ABCIService.ProcessProposal:output_type -> cometbft.abci.v1.ProcessProposalResponse - 29, // 29: cometbft.abci.v1.ABCIService.ExtendVote:output_type -> cometbft.abci.v1.ExtendVoteResponse - 30, // 30: cometbft.abci.v1.ABCIService.VerifyVoteExtension:output_type -> cometbft.abci.v1.VerifyVoteExtensionResponse - 31, // 31: cometbft.abci.v1.ABCIService.FinalizeBlock:output_type -> cometbft.abci.v1.FinalizeBlockResponse +var file_cometbft_abci_v2_service_proto_depIdxs = []int32{ + 0, // 0: cometbft.abci.v2.ABCIService.Echo:input_type -> cometbft.abci.v2.EchoRequest + 1, // 1: cometbft.abci.v2.ABCIService.Flush:input_type -> cometbft.abci.v2.FlushRequest + 2, // 2: cometbft.abci.v2.ABCIService.Info:input_type -> cometbft.abci.v2.InfoRequest + 3, // 3: cometbft.abci.v2.ABCIService.CheckTx:input_type -> cometbft.abci.v2.CheckTxRequest + 4, // 4: cometbft.abci.v2.ABCIService.Query:input_type -> cometbft.abci.v2.QueryRequest + 5, // 5: cometbft.abci.v2.ABCIService.Commit:input_type -> cometbft.abci.v2.CommitRequest + 6, // 6: cometbft.abci.v2.ABCIService.InitChain:input_type -> cometbft.abci.v2.InitChainRequest + 7, // 7: cometbft.abci.v2.ABCIService.ListSnapshots:input_type -> cometbft.abci.v2.ListSnapshotsRequest + 8, // 8: cometbft.abci.v2.ABCIService.OfferSnapshot:input_type -> cometbft.abci.v2.OfferSnapshotRequest + 9, // 9: cometbft.abci.v2.ABCIService.LoadSnapshotChunk:input_type -> cometbft.abci.v2.LoadSnapshotChunkRequest + 10, // 10: cometbft.abci.v2.ABCIService.ApplySnapshotChunk:input_type -> cometbft.abci.v2.ApplySnapshotChunkRequest + 11, // 11: cometbft.abci.v2.ABCIService.PrepareProposal:input_type -> cometbft.abci.v2.PrepareProposalRequest + 12, // 12: cometbft.abci.v2.ABCIService.ProcessProposal:input_type -> cometbft.abci.v2.ProcessProposalRequest + 13, // 13: cometbft.abci.v2.ABCIService.ExtendVote:input_type -> cometbft.abci.v2.ExtendVoteRequest + 14, // 14: cometbft.abci.v2.ABCIService.VerifyVoteExtension:input_type -> cometbft.abci.v2.VerifyVoteExtensionRequest + 15, // 15: cometbft.abci.v2.ABCIService.FinalizeBlock:input_type -> cometbft.abci.v2.FinalizeBlockRequest + 16, // 16: cometbft.abci.v2.ABCIService.Echo:output_type -> cometbft.abci.v2.EchoResponse + 17, // 17: cometbft.abci.v2.ABCIService.Flush:output_type -> cometbft.abci.v2.FlushResponse + 18, // 18: cometbft.abci.v2.ABCIService.Info:output_type -> cometbft.abci.v2.InfoResponse + 19, // 19: cometbft.abci.v2.ABCIService.CheckTx:output_type -> cometbft.abci.v2.CheckTxResponse + 20, // 20: cometbft.abci.v2.ABCIService.Query:output_type -> cometbft.abci.v2.QueryResponse + 21, // 21: cometbft.abci.v2.ABCIService.Commit:output_type -> cometbft.abci.v2.CommitResponse + 22, // 22: cometbft.abci.v2.ABCIService.InitChain:output_type -> cometbft.abci.v2.InitChainResponse + 23, // 23: cometbft.abci.v2.ABCIService.ListSnapshots:output_type -> cometbft.abci.v2.ListSnapshotsResponse + 24, // 24: cometbft.abci.v2.ABCIService.OfferSnapshot:output_type -> cometbft.abci.v2.OfferSnapshotResponse + 25, // 25: cometbft.abci.v2.ABCIService.LoadSnapshotChunk:output_type -> cometbft.abci.v2.LoadSnapshotChunkResponse + 26, // 26: cometbft.abci.v2.ABCIService.ApplySnapshotChunk:output_type -> cometbft.abci.v2.ApplySnapshotChunkResponse + 27, // 27: cometbft.abci.v2.ABCIService.PrepareProposal:output_type -> cometbft.abci.v2.PrepareProposalResponse + 28, // 28: cometbft.abci.v2.ABCIService.ProcessProposal:output_type -> cometbft.abci.v2.ProcessProposalResponse + 29, // 29: cometbft.abci.v2.ABCIService.ExtendVote:output_type -> cometbft.abci.v2.ExtendVoteResponse + 30, // 30: cometbft.abci.v2.ABCIService.VerifyVoteExtension:output_type -> cometbft.abci.v2.VerifyVoteExtensionResponse + 31, // 31: cometbft.abci.v2.ABCIService.FinalizeBlock:output_type -> cometbft.abci.v2.FinalizeBlockResponse 16, // [16:32] is the sub-list for method output_type 0, // [0:16] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -209,27 +209,27 @@ var file_cometbft_abci_v1_service_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_cometbft_abci_v1_service_proto_init() } -func file_cometbft_abci_v1_service_proto_init() { - if File_cometbft_abci_v1_service_proto != nil { +func init() { file_cometbft_abci_v2_service_proto_init() } +func file_cometbft_abci_v2_service_proto_init() { + if File_cometbft_abci_v2_service_proto != nil { return } - file_cometbft_abci_v1_types_proto_init() + file_cometbft_abci_v2_types_proto_init() type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_abci_v1_service_proto_rawDesc, + RawDescriptor: file_cometbft_abci_v2_service_proto_rawDesc, NumEnums: 0, NumMessages: 0, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_cometbft_abci_v1_service_proto_goTypes, - DependencyIndexes: file_cometbft_abci_v1_service_proto_depIdxs, + GoTypes: file_cometbft_abci_v2_service_proto_goTypes, + DependencyIndexes: file_cometbft_abci_v2_service_proto_depIdxs, }.Build() - File_cometbft_abci_v1_service_proto = out.File - file_cometbft_abci_v1_service_proto_rawDesc = nil - file_cometbft_abci_v1_service_proto_goTypes = nil - file_cometbft_abci_v1_service_proto_depIdxs = nil + File_cometbft_abci_v2_service_proto = out.File + file_cometbft_abci_v2_service_proto_rawDesc = nil + file_cometbft_abci_v2_service_proto_goTypes = nil + file_cometbft_abci_v2_service_proto_depIdxs = nil } diff --git a/api/cometbft/abci/v1/service_grpc.pb.go b/api/cometbft/abci/v2/service_grpc.pb.go similarity index 97% rename from api/cometbft/abci/v1/service_grpc.pb.go rename to api/cometbft/abci/v2/service_grpc.pb.go index 8517753732..119bb108f2 100644 --- a/api/cometbft/abci/v1/service_grpc.pb.go +++ b/api/cometbft/abci/v2/service_grpc.pb.go @@ -2,9 +2,9 @@ // versions: // - protoc-gen-go-grpc v1.5.1 // - protoc (unknown) -// source: cometbft/abci/v1/service.proto +// source: cometbft/abci/v2/service.proto -package abciv1 +package abciv2 import ( context "context" @@ -19,22 +19,22 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - ABCIService_Echo_FullMethodName = "/cometbft.abci.v1.ABCIService/Echo" - ABCIService_Flush_FullMethodName = "/cometbft.abci.v1.ABCIService/Flush" - ABCIService_Info_FullMethodName = "/cometbft.abci.v1.ABCIService/Info" - ABCIService_CheckTx_FullMethodName = "/cometbft.abci.v1.ABCIService/CheckTx" - ABCIService_Query_FullMethodName = "/cometbft.abci.v1.ABCIService/Query" - ABCIService_Commit_FullMethodName = "/cometbft.abci.v1.ABCIService/Commit" - ABCIService_InitChain_FullMethodName = "/cometbft.abci.v1.ABCIService/InitChain" - ABCIService_ListSnapshots_FullMethodName = "/cometbft.abci.v1.ABCIService/ListSnapshots" - ABCIService_OfferSnapshot_FullMethodName = "/cometbft.abci.v1.ABCIService/OfferSnapshot" - ABCIService_LoadSnapshotChunk_FullMethodName = "/cometbft.abci.v1.ABCIService/LoadSnapshotChunk" - ABCIService_ApplySnapshotChunk_FullMethodName = "/cometbft.abci.v1.ABCIService/ApplySnapshotChunk" - ABCIService_PrepareProposal_FullMethodName = "/cometbft.abci.v1.ABCIService/PrepareProposal" - ABCIService_ProcessProposal_FullMethodName = "/cometbft.abci.v1.ABCIService/ProcessProposal" - ABCIService_ExtendVote_FullMethodName = "/cometbft.abci.v1.ABCIService/ExtendVote" - ABCIService_VerifyVoteExtension_FullMethodName = "/cometbft.abci.v1.ABCIService/VerifyVoteExtension" - ABCIService_FinalizeBlock_FullMethodName = "/cometbft.abci.v1.ABCIService/FinalizeBlock" + ABCIService_Echo_FullMethodName = "/cometbft.abci.v2.ABCIService/Echo" + ABCIService_Flush_FullMethodName = "/cometbft.abci.v2.ABCIService/Flush" + ABCIService_Info_FullMethodName = "/cometbft.abci.v2.ABCIService/Info" + ABCIService_CheckTx_FullMethodName = "/cometbft.abci.v2.ABCIService/CheckTx" + ABCIService_Query_FullMethodName = "/cometbft.abci.v2.ABCIService/Query" + ABCIService_Commit_FullMethodName = "/cometbft.abci.v2.ABCIService/Commit" + ABCIService_InitChain_FullMethodName = "/cometbft.abci.v2.ABCIService/InitChain" + ABCIService_ListSnapshots_FullMethodName = "/cometbft.abci.v2.ABCIService/ListSnapshots" + ABCIService_OfferSnapshot_FullMethodName = "/cometbft.abci.v2.ABCIService/OfferSnapshot" + ABCIService_LoadSnapshotChunk_FullMethodName = "/cometbft.abci.v2.ABCIService/LoadSnapshotChunk" + ABCIService_ApplySnapshotChunk_FullMethodName = "/cometbft.abci.v2.ABCIService/ApplySnapshotChunk" + ABCIService_PrepareProposal_FullMethodName = "/cometbft.abci.v2.ABCIService/PrepareProposal" + ABCIService_ProcessProposal_FullMethodName = "/cometbft.abci.v2.ABCIService/ProcessProposal" + ABCIService_ExtendVote_FullMethodName = "/cometbft.abci.v2.ABCIService/ExtendVote" + ABCIService_VerifyVoteExtension_FullMethodName = "/cometbft.abci.v2.ABCIService/VerifyVoteExtension" + ABCIService_FinalizeBlock_FullMethodName = "/cometbft.abci.v2.ABCIService/FinalizeBlock" ) // ABCIServiceClient is the client API for ABCIService service. @@ -654,7 +654,7 @@ func _ABCIService_FinalizeBlock_Handler(srv interface{}, ctx context.Context, de // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) var ABCIService_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "cometbft.abci.v1.ABCIService", + ServiceName: "cometbft.abci.v2.ABCIService", HandlerType: (*ABCIServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -723,5 +723,5 @@ var ABCIService_ServiceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "cometbft/abci/v1/service.proto", + Metadata: "cometbft/abci/v2/service.proto", } diff --git a/api/cometbft/abci/v1/types.pulsar.go b/api/cometbft/abci/v2/types.pulsar.go similarity index 85% rename from api/cometbft/abci/v1/types.pulsar.go rename to api/cometbft/abci/v2/types.pulsar.go index 2736a47abd..4de73f9c9a 100644 --- a/api/cometbft/abci/v1/types.pulsar.go +++ b/api/cometbft/abci/v2/types.pulsar.go @@ -1,18 +1,20 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package abciv1 +package abciv2 import ( - v11 "cosmossdk.io/api/cometbft/crypto/v1" - v1 "cosmossdk.io/api/cometbft/types/v1" + v1 "cosmossdk.io/api/cometbft/crypto/v1" + v2 "cosmossdk.io/api/cometbft/types/v2" fmt "fmt" runtime "github.com/cosmos/cosmos-proto/runtime" _ "github.com/cosmos/gogoproto/gogoproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoiface "google.golang.org/protobuf/runtime/protoiface" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" timestamppb "google.golang.org/protobuf/types/known/timestamppb" io "io" reflect "reflect" + sort "sort" sync "sync" ) @@ -37,8 +39,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_Request = File_cometbft_abci_v1_types_proto.Messages().ByName("Request") + file_cometbft_abci_v2_types_proto_init() + md_Request = File_cometbft_abci_v2_types_proto.Messages().ByName("Request") fd_Request_echo = md_Request.Fields().ByName("echo") fd_Request_flush = md_Request.Fields().ByName("flush") fd_Request_info = md_Request.Fields().ByName("info") @@ -66,7 +68,7 @@ func (x *Request) ProtoReflect() protoreflect.Message { } func (x *Request) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[0] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -237,7 +239,7 @@ func (x *fastReflection_Request) Range(f func(protoreflect.FieldDescriptor, prot // a repeated field is populated if it is non-empty. func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.Request.echo": + case "cometbft.abci.v2.Request.echo": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_Echo); ok { @@ -245,7 +247,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.flush": + case "cometbft.abci.v2.Request.flush": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_Flush); ok { @@ -253,7 +255,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.info": + case "cometbft.abci.v2.Request.info": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_Info); ok { @@ -261,7 +263,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.init_chain": + case "cometbft.abci.v2.Request.init_chain": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_InitChain); ok { @@ -269,7 +271,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.query": + case "cometbft.abci.v2.Request.query": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_Query); ok { @@ -277,7 +279,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.check_tx": + case "cometbft.abci.v2.Request.check_tx": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_CheckTx); ok { @@ -285,7 +287,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.commit": + case "cometbft.abci.v2.Request.commit": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_Commit); ok { @@ -293,7 +295,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.list_snapshots": + case "cometbft.abci.v2.Request.list_snapshots": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_ListSnapshots); ok { @@ -301,7 +303,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.offer_snapshot": + case "cometbft.abci.v2.Request.offer_snapshot": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_OfferSnapshot); ok { @@ -309,7 +311,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.load_snapshot_chunk": + case "cometbft.abci.v2.Request.load_snapshot_chunk": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_LoadSnapshotChunk); ok { @@ -317,7 +319,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.apply_snapshot_chunk": + case "cometbft.abci.v2.Request.apply_snapshot_chunk": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_ApplySnapshotChunk); ok { @@ -325,7 +327,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.prepare_proposal": + case "cometbft.abci.v2.Request.prepare_proposal": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_PrepareProposal); ok { @@ -333,7 +335,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.process_proposal": + case "cometbft.abci.v2.Request.process_proposal": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_ProcessProposal); ok { @@ -341,7 +343,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.extend_vote": + case "cometbft.abci.v2.Request.extend_vote": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_ExtendVote); ok { @@ -349,7 +351,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.verify_vote_extension": + case "cometbft.abci.v2.Request.verify_vote_extension": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_VerifyVoteExtension); ok { @@ -357,7 +359,7 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Request.finalize_block": + case "cometbft.abci.v2.Request.finalize_block": if x.Value == nil { return false } else if _, ok := x.Value.(*Request_FinalizeBlock); ok { @@ -367,9 +369,9 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { } default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Request")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Request")) } - panic(fmt.Errorf("message cometbft.abci.v1.Request does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Request does not contain field %s", fd.FullName())) } } @@ -381,43 +383,43 @@ func (x *fastReflection_Request) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Request) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.Request.echo": + case "cometbft.abci.v2.Request.echo": x.Value = nil - case "cometbft.abci.v1.Request.flush": + case "cometbft.abci.v2.Request.flush": x.Value = nil - case "cometbft.abci.v1.Request.info": + case "cometbft.abci.v2.Request.info": x.Value = nil - case "cometbft.abci.v1.Request.init_chain": + case "cometbft.abci.v2.Request.init_chain": x.Value = nil - case "cometbft.abci.v1.Request.query": + case "cometbft.abci.v2.Request.query": x.Value = nil - case "cometbft.abci.v1.Request.check_tx": + case "cometbft.abci.v2.Request.check_tx": x.Value = nil - case "cometbft.abci.v1.Request.commit": + case "cometbft.abci.v2.Request.commit": x.Value = nil - case "cometbft.abci.v1.Request.list_snapshots": + case "cometbft.abci.v2.Request.list_snapshots": x.Value = nil - case "cometbft.abci.v1.Request.offer_snapshot": + case "cometbft.abci.v2.Request.offer_snapshot": x.Value = nil - case "cometbft.abci.v1.Request.load_snapshot_chunk": + case "cometbft.abci.v2.Request.load_snapshot_chunk": x.Value = nil - case "cometbft.abci.v1.Request.apply_snapshot_chunk": + case "cometbft.abci.v2.Request.apply_snapshot_chunk": x.Value = nil - case "cometbft.abci.v1.Request.prepare_proposal": + case "cometbft.abci.v2.Request.prepare_proposal": x.Value = nil - case "cometbft.abci.v1.Request.process_proposal": + case "cometbft.abci.v2.Request.process_proposal": x.Value = nil - case "cometbft.abci.v1.Request.extend_vote": + case "cometbft.abci.v2.Request.extend_vote": x.Value = nil - case "cometbft.abci.v1.Request.verify_vote_extension": + case "cometbft.abci.v2.Request.verify_vote_extension": x.Value = nil - case "cometbft.abci.v1.Request.finalize_block": + case "cometbft.abci.v2.Request.finalize_block": x.Value = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Request")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Request")) } - panic(fmt.Errorf("message cometbft.abci.v1.Request does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Request does not contain field %s", fd.FullName())) } } @@ -429,7 +431,7 @@ func (x *fastReflection_Request) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.Request.echo": + case "cometbft.abci.v2.Request.echo": if x.Value == nil { return protoreflect.ValueOfMessage((*EchoRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_Echo); ok { @@ -437,7 +439,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*EchoRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.flush": + case "cometbft.abci.v2.Request.flush": if x.Value == nil { return protoreflect.ValueOfMessage((*FlushRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_Flush); ok { @@ -445,7 +447,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*FlushRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.info": + case "cometbft.abci.v2.Request.info": if x.Value == nil { return protoreflect.ValueOfMessage((*InfoRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_Info); ok { @@ -453,7 +455,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*InfoRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.init_chain": + case "cometbft.abci.v2.Request.init_chain": if x.Value == nil { return protoreflect.ValueOfMessage((*InitChainRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_InitChain); ok { @@ -461,7 +463,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*InitChainRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.query": + case "cometbft.abci.v2.Request.query": if x.Value == nil { return protoreflect.ValueOfMessage((*QueryRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_Query); ok { @@ -469,7 +471,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*QueryRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.check_tx": + case "cometbft.abci.v2.Request.check_tx": if x.Value == nil { return protoreflect.ValueOfMessage((*CheckTxRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_CheckTx); ok { @@ -477,7 +479,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*CheckTxRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.commit": + case "cometbft.abci.v2.Request.commit": if x.Value == nil { return protoreflect.ValueOfMessage((*CommitRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_Commit); ok { @@ -485,7 +487,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*CommitRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.list_snapshots": + case "cometbft.abci.v2.Request.list_snapshots": if x.Value == nil { return protoreflect.ValueOfMessage((*ListSnapshotsRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_ListSnapshots); ok { @@ -493,7 +495,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*ListSnapshotsRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.offer_snapshot": + case "cometbft.abci.v2.Request.offer_snapshot": if x.Value == nil { return protoreflect.ValueOfMessage((*OfferSnapshotRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_OfferSnapshot); ok { @@ -501,7 +503,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*OfferSnapshotRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.load_snapshot_chunk": + case "cometbft.abci.v2.Request.load_snapshot_chunk": if x.Value == nil { return protoreflect.ValueOfMessage((*LoadSnapshotChunkRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_LoadSnapshotChunk); ok { @@ -509,7 +511,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*LoadSnapshotChunkRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.apply_snapshot_chunk": + case "cometbft.abci.v2.Request.apply_snapshot_chunk": if x.Value == nil { return protoreflect.ValueOfMessage((*ApplySnapshotChunkRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_ApplySnapshotChunk); ok { @@ -517,7 +519,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*ApplySnapshotChunkRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.prepare_proposal": + case "cometbft.abci.v2.Request.prepare_proposal": if x.Value == nil { return protoreflect.ValueOfMessage((*PrepareProposalRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_PrepareProposal); ok { @@ -525,7 +527,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*PrepareProposalRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.process_proposal": + case "cometbft.abci.v2.Request.process_proposal": if x.Value == nil { return protoreflect.ValueOfMessage((*ProcessProposalRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_ProcessProposal); ok { @@ -533,7 +535,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*ProcessProposalRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.extend_vote": + case "cometbft.abci.v2.Request.extend_vote": if x.Value == nil { return protoreflect.ValueOfMessage((*ExtendVoteRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_ExtendVote); ok { @@ -541,7 +543,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*ExtendVoteRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.verify_vote_extension": + case "cometbft.abci.v2.Request.verify_vote_extension": if x.Value == nil { return protoreflect.ValueOfMessage((*VerifyVoteExtensionRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_VerifyVoteExtension); ok { @@ -549,7 +551,7 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } else { return protoreflect.ValueOfMessage((*VerifyVoteExtensionRequest)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Request.finalize_block": + case "cometbft.abci.v2.Request.finalize_block": if x.Value == nil { return protoreflect.ValueOfMessage((*FinalizeBlockRequest)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Request_FinalizeBlock); ok { @@ -559,9 +561,9 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr } default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Request")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Request")) } - panic(fmt.Errorf("message cometbft.abci.v1.Request does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Request does not contain field %s", descriptor.FullName())) } } @@ -577,59 +579,59 @@ func (x *fastReflection_Request) Get(descriptor protoreflect.FieldDescriptor) pr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Request) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.Request.echo": + case "cometbft.abci.v2.Request.echo": cv := value.Message().Interface().(*EchoRequest) x.Value = &Request_Echo{Echo: cv} - case "cometbft.abci.v1.Request.flush": + case "cometbft.abci.v2.Request.flush": cv := value.Message().Interface().(*FlushRequest) x.Value = &Request_Flush{Flush: cv} - case "cometbft.abci.v1.Request.info": + case "cometbft.abci.v2.Request.info": cv := value.Message().Interface().(*InfoRequest) x.Value = &Request_Info{Info: cv} - case "cometbft.abci.v1.Request.init_chain": + case "cometbft.abci.v2.Request.init_chain": cv := value.Message().Interface().(*InitChainRequest) x.Value = &Request_InitChain{InitChain: cv} - case "cometbft.abci.v1.Request.query": + case "cometbft.abci.v2.Request.query": cv := value.Message().Interface().(*QueryRequest) x.Value = &Request_Query{Query: cv} - case "cometbft.abci.v1.Request.check_tx": + case "cometbft.abci.v2.Request.check_tx": cv := value.Message().Interface().(*CheckTxRequest) x.Value = &Request_CheckTx{CheckTx: cv} - case "cometbft.abci.v1.Request.commit": + case "cometbft.abci.v2.Request.commit": cv := value.Message().Interface().(*CommitRequest) x.Value = &Request_Commit{Commit: cv} - case "cometbft.abci.v1.Request.list_snapshots": + case "cometbft.abci.v2.Request.list_snapshots": cv := value.Message().Interface().(*ListSnapshotsRequest) x.Value = &Request_ListSnapshots{ListSnapshots: cv} - case "cometbft.abci.v1.Request.offer_snapshot": + case "cometbft.abci.v2.Request.offer_snapshot": cv := value.Message().Interface().(*OfferSnapshotRequest) x.Value = &Request_OfferSnapshot{OfferSnapshot: cv} - case "cometbft.abci.v1.Request.load_snapshot_chunk": + case "cometbft.abci.v2.Request.load_snapshot_chunk": cv := value.Message().Interface().(*LoadSnapshotChunkRequest) x.Value = &Request_LoadSnapshotChunk{LoadSnapshotChunk: cv} - case "cometbft.abci.v1.Request.apply_snapshot_chunk": + case "cometbft.abci.v2.Request.apply_snapshot_chunk": cv := value.Message().Interface().(*ApplySnapshotChunkRequest) x.Value = &Request_ApplySnapshotChunk{ApplySnapshotChunk: cv} - case "cometbft.abci.v1.Request.prepare_proposal": + case "cometbft.abci.v2.Request.prepare_proposal": cv := value.Message().Interface().(*PrepareProposalRequest) x.Value = &Request_PrepareProposal{PrepareProposal: cv} - case "cometbft.abci.v1.Request.process_proposal": + case "cometbft.abci.v2.Request.process_proposal": cv := value.Message().Interface().(*ProcessProposalRequest) x.Value = &Request_ProcessProposal{ProcessProposal: cv} - case "cometbft.abci.v1.Request.extend_vote": + case "cometbft.abci.v2.Request.extend_vote": cv := value.Message().Interface().(*ExtendVoteRequest) x.Value = &Request_ExtendVote{ExtendVote: cv} - case "cometbft.abci.v1.Request.verify_vote_extension": + case "cometbft.abci.v2.Request.verify_vote_extension": cv := value.Message().Interface().(*VerifyVoteExtensionRequest) x.Value = &Request_VerifyVoteExtension{VerifyVoteExtension: cv} - case "cometbft.abci.v1.Request.finalize_block": + case "cometbft.abci.v2.Request.finalize_block": cv := value.Message().Interface().(*FinalizeBlockRequest) x.Value = &Request_FinalizeBlock{FinalizeBlock: cv} default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Request")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Request")) } - panic(fmt.Errorf("message cometbft.abci.v1.Request does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Request does not contain field %s", fd.FullName())) } } @@ -645,7 +647,7 @@ func (x *fastReflection_Request) Set(fd protoreflect.FieldDescriptor, value prot // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Request.echo": + case "cometbft.abci.v2.Request.echo": if x.Value == nil { value := &EchoRequest{} oneofValue := &Request_Echo{Echo: value} @@ -661,7 +663,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.flush": + case "cometbft.abci.v2.Request.flush": if x.Value == nil { value := &FlushRequest{} oneofValue := &Request_Flush{Flush: value} @@ -677,7 +679,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.info": + case "cometbft.abci.v2.Request.info": if x.Value == nil { value := &InfoRequest{} oneofValue := &Request_Info{Info: value} @@ -693,7 +695,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.init_chain": + case "cometbft.abci.v2.Request.init_chain": if x.Value == nil { value := &InitChainRequest{} oneofValue := &Request_InitChain{InitChain: value} @@ -709,7 +711,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.query": + case "cometbft.abci.v2.Request.query": if x.Value == nil { value := &QueryRequest{} oneofValue := &Request_Query{Query: value} @@ -725,7 +727,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.check_tx": + case "cometbft.abci.v2.Request.check_tx": if x.Value == nil { value := &CheckTxRequest{} oneofValue := &Request_CheckTx{CheckTx: value} @@ -741,7 +743,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.commit": + case "cometbft.abci.v2.Request.commit": if x.Value == nil { value := &CommitRequest{} oneofValue := &Request_Commit{Commit: value} @@ -757,7 +759,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.list_snapshots": + case "cometbft.abci.v2.Request.list_snapshots": if x.Value == nil { value := &ListSnapshotsRequest{} oneofValue := &Request_ListSnapshots{ListSnapshots: value} @@ -773,7 +775,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.offer_snapshot": + case "cometbft.abci.v2.Request.offer_snapshot": if x.Value == nil { value := &OfferSnapshotRequest{} oneofValue := &Request_OfferSnapshot{OfferSnapshot: value} @@ -789,7 +791,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.load_snapshot_chunk": + case "cometbft.abci.v2.Request.load_snapshot_chunk": if x.Value == nil { value := &LoadSnapshotChunkRequest{} oneofValue := &Request_LoadSnapshotChunk{LoadSnapshotChunk: value} @@ -805,7 +807,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.apply_snapshot_chunk": + case "cometbft.abci.v2.Request.apply_snapshot_chunk": if x.Value == nil { value := &ApplySnapshotChunkRequest{} oneofValue := &Request_ApplySnapshotChunk{ApplySnapshotChunk: value} @@ -821,7 +823,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.prepare_proposal": + case "cometbft.abci.v2.Request.prepare_proposal": if x.Value == nil { value := &PrepareProposalRequest{} oneofValue := &Request_PrepareProposal{PrepareProposal: value} @@ -837,7 +839,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.process_proposal": + case "cometbft.abci.v2.Request.process_proposal": if x.Value == nil { value := &ProcessProposalRequest{} oneofValue := &Request_ProcessProposal{ProcessProposal: value} @@ -853,7 +855,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.extend_vote": + case "cometbft.abci.v2.Request.extend_vote": if x.Value == nil { value := &ExtendVoteRequest{} oneofValue := &Request_ExtendVote{ExtendVote: value} @@ -869,7 +871,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.verify_vote_extension": + case "cometbft.abci.v2.Request.verify_vote_extension": if x.Value == nil { value := &VerifyVoteExtensionRequest{} oneofValue := &Request_VerifyVoteExtension{VerifyVoteExtension: value} @@ -885,7 +887,7 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Request.finalize_block": + case "cometbft.abci.v2.Request.finalize_block": if x.Value == nil { value := &FinalizeBlockRequest{} oneofValue := &Request_FinalizeBlock{FinalizeBlock: value} @@ -903,9 +905,9 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor } default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Request")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Request")) } - panic(fmt.Errorf("message cometbft.abci.v1.Request does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Request does not contain field %s", fd.FullName())) } } @@ -914,59 +916,59 @@ func (x *fastReflection_Request) Mutable(fd protoreflect.FieldDescriptor) protor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Request) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Request.echo": + case "cometbft.abci.v2.Request.echo": value := &EchoRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.flush": + case "cometbft.abci.v2.Request.flush": value := &FlushRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.info": + case "cometbft.abci.v2.Request.info": value := &InfoRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.init_chain": + case "cometbft.abci.v2.Request.init_chain": value := &InitChainRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.query": + case "cometbft.abci.v2.Request.query": value := &QueryRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.check_tx": + case "cometbft.abci.v2.Request.check_tx": value := &CheckTxRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.commit": + case "cometbft.abci.v2.Request.commit": value := &CommitRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.list_snapshots": + case "cometbft.abci.v2.Request.list_snapshots": value := &ListSnapshotsRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.offer_snapshot": + case "cometbft.abci.v2.Request.offer_snapshot": value := &OfferSnapshotRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.load_snapshot_chunk": + case "cometbft.abci.v2.Request.load_snapshot_chunk": value := &LoadSnapshotChunkRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.apply_snapshot_chunk": + case "cometbft.abci.v2.Request.apply_snapshot_chunk": value := &ApplySnapshotChunkRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.prepare_proposal": + case "cometbft.abci.v2.Request.prepare_proposal": value := &PrepareProposalRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.process_proposal": + case "cometbft.abci.v2.Request.process_proposal": value := &ProcessProposalRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.extend_vote": + case "cometbft.abci.v2.Request.extend_vote": value := &ExtendVoteRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.verify_vote_extension": + case "cometbft.abci.v2.Request.verify_vote_extension": value := &VerifyVoteExtensionRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Request.finalize_block": + case "cometbft.abci.v2.Request.finalize_block": value := &FinalizeBlockRequest{} return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Request")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Request")) } - panic(fmt.Errorf("message cometbft.abci.v1.Request does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Request does not contain field %s", fd.FullName())) } } @@ -975,7 +977,7 @@ func (x *fastReflection_Request) NewField(fd protoreflect.FieldDescriptor) proto // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_Request) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "cometbft.abci.v1.Request.value": + case "cometbft.abci.v2.Request.value": if x.Value == nil { return nil } @@ -1014,7 +1016,7 @@ func (x *fastReflection_Request) WhichOneof(d protoreflect.OneofDescriptor) prot return x.Descriptor().Fields().ByName("finalize_block") } default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.Request", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.Request", d.FullName())) } panic("unreachable") } @@ -2066,8 +2068,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_EchoRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("EchoRequest") + file_cometbft_abci_v2_types_proto_init() + md_EchoRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("EchoRequest") fd_EchoRequest_message = md_EchoRequest.Fields().ByName("message") } @@ -2080,7 +2082,7 @@ func (x *EchoRequest) ProtoReflect() protoreflect.Message { } func (x *EchoRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[1] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2157,13 +2159,13 @@ func (x *fastReflection_EchoRequest) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_EchoRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.EchoRequest.message": + case "cometbft.abci.v2.EchoRequest.message": return x.Message != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoRequest does not contain field %s", fd.FullName())) } } @@ -2175,13 +2177,13 @@ func (x *fastReflection_EchoRequest) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.EchoRequest.message": + case "cometbft.abci.v2.EchoRequest.message": x.Message = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoRequest does not contain field %s", fd.FullName())) } } @@ -2193,14 +2195,14 @@ func (x *fastReflection_EchoRequest) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_EchoRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.EchoRequest.message": + case "cometbft.abci.v2.EchoRequest.message": value := x.Message return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoRequest does not contain field %s", descriptor.FullName())) } } @@ -2216,13 +2218,13 @@ func (x *fastReflection_EchoRequest) Get(descriptor protoreflect.FieldDescriptor // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.EchoRequest.message": + case "cometbft.abci.v2.EchoRequest.message": x.Message = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoRequest does not contain field %s", fd.FullName())) } } @@ -2238,13 +2240,13 @@ func (x *fastReflection_EchoRequest) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.EchoRequest.message": - panic(fmt.Errorf("field message of message cometbft.abci.v1.EchoRequest is not mutable")) + case "cometbft.abci.v2.EchoRequest.message": + panic(fmt.Errorf("field message of message cometbft.abci.v2.EchoRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoRequest does not contain field %s", fd.FullName())) } } @@ -2253,13 +2255,13 @@ func (x *fastReflection_EchoRequest) Mutable(fd protoreflect.FieldDescriptor) pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_EchoRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.EchoRequest.message": + case "cometbft.abci.v2.EchoRequest.message": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoRequest does not contain field %s", fd.FullName())) } } @@ -2269,7 +2271,7 @@ func (x *fastReflection_EchoRequest) NewField(fd protoreflect.FieldDescriptor) p func (x *fastReflection_EchoRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.EchoRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.EchoRequest", d.FullName())) } panic("unreachable") } @@ -2485,8 +2487,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_FlushRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("FlushRequest") + file_cometbft_abci_v2_types_proto_init() + md_FlushRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("FlushRequest") } var _ protoreflect.Message = (*fastReflection_FlushRequest)(nil) @@ -2498,7 +2500,7 @@ func (x *FlushRequest) ProtoReflect() protoreflect.Message { } func (x *FlushRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[2] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2571,9 +2573,9 @@ func (x *fastReflection_FlushRequest) Has(fd protoreflect.FieldDescriptor) bool switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushRequest does not contain field %s", fd.FullName())) } } @@ -2587,9 +2589,9 @@ func (x *fastReflection_FlushRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushRequest does not contain field %s", fd.FullName())) } } @@ -2603,9 +2605,9 @@ func (x *fastReflection_FlushRequest) Get(descriptor protoreflect.FieldDescripto switch descriptor.FullName() { default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushRequest does not contain field %s", descriptor.FullName())) } } @@ -2623,9 +2625,9 @@ func (x *fastReflection_FlushRequest) Set(fd protoreflect.FieldDescriptor, value switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushRequest does not contain field %s", fd.FullName())) } } @@ -2643,9 +2645,9 @@ func (x *fastReflection_FlushRequest) Mutable(fd protoreflect.FieldDescriptor) p switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushRequest does not contain field %s", fd.FullName())) } } @@ -2656,9 +2658,9 @@ func (x *fastReflection_FlushRequest) NewField(fd protoreflect.FieldDescriptor) switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushRequest does not contain field %s", fd.FullName())) } } @@ -2668,7 +2670,7 @@ func (x *fastReflection_FlushRequest) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_FlushRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.FlushRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.FlushRequest", d.FullName())) } panic("unreachable") } @@ -2845,8 +2847,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_InfoRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("InfoRequest") + file_cometbft_abci_v2_types_proto_init() + md_InfoRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("InfoRequest") fd_InfoRequest_version = md_InfoRequest.Fields().ByName("version") fd_InfoRequest_block_version = md_InfoRequest.Fields().ByName("block_version") fd_InfoRequest_p2p_version = md_InfoRequest.Fields().ByName("p2p_version") @@ -2862,7 +2864,7 @@ func (x *InfoRequest) ProtoReflect() protoreflect.Message { } func (x *InfoRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[3] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2957,19 +2959,19 @@ func (x *fastReflection_InfoRequest) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_InfoRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.InfoRequest.version": + case "cometbft.abci.v2.InfoRequest.version": return x.Version != "" - case "cometbft.abci.v1.InfoRequest.block_version": + case "cometbft.abci.v2.InfoRequest.block_version": return x.BlockVersion != uint64(0) - case "cometbft.abci.v1.InfoRequest.p2p_version": + case "cometbft.abci.v2.InfoRequest.p2p_version": return x.P2PVersion != uint64(0) - case "cometbft.abci.v1.InfoRequest.abci_version": + case "cometbft.abci.v2.InfoRequest.abci_version": return x.AbciVersion != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoRequest does not contain field %s", fd.FullName())) } } @@ -2981,19 +2983,19 @@ func (x *fastReflection_InfoRequest) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InfoRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.InfoRequest.version": + case "cometbft.abci.v2.InfoRequest.version": x.Version = "" - case "cometbft.abci.v1.InfoRequest.block_version": + case "cometbft.abci.v2.InfoRequest.block_version": x.BlockVersion = uint64(0) - case "cometbft.abci.v1.InfoRequest.p2p_version": + case "cometbft.abci.v2.InfoRequest.p2p_version": x.P2PVersion = uint64(0) - case "cometbft.abci.v1.InfoRequest.abci_version": + case "cometbft.abci.v2.InfoRequest.abci_version": x.AbciVersion = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoRequest does not contain field %s", fd.FullName())) } } @@ -3005,23 +3007,23 @@ func (x *fastReflection_InfoRequest) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_InfoRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.InfoRequest.version": + case "cometbft.abci.v2.InfoRequest.version": value := x.Version return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.InfoRequest.block_version": + case "cometbft.abci.v2.InfoRequest.block_version": value := x.BlockVersion return protoreflect.ValueOfUint64(value) - case "cometbft.abci.v1.InfoRequest.p2p_version": + case "cometbft.abci.v2.InfoRequest.p2p_version": value := x.P2PVersion return protoreflect.ValueOfUint64(value) - case "cometbft.abci.v1.InfoRequest.abci_version": + case "cometbft.abci.v2.InfoRequest.abci_version": value := x.AbciVersion return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoRequest does not contain field %s", descriptor.FullName())) } } @@ -3037,19 +3039,19 @@ func (x *fastReflection_InfoRequest) Get(descriptor protoreflect.FieldDescriptor // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InfoRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.InfoRequest.version": + case "cometbft.abci.v2.InfoRequest.version": x.Version = value.Interface().(string) - case "cometbft.abci.v1.InfoRequest.block_version": + case "cometbft.abci.v2.InfoRequest.block_version": x.BlockVersion = value.Uint() - case "cometbft.abci.v1.InfoRequest.p2p_version": + case "cometbft.abci.v2.InfoRequest.p2p_version": x.P2PVersion = value.Uint() - case "cometbft.abci.v1.InfoRequest.abci_version": + case "cometbft.abci.v2.InfoRequest.abci_version": x.AbciVersion = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoRequest does not contain field %s", fd.FullName())) } } @@ -3065,19 +3067,19 @@ func (x *fastReflection_InfoRequest) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InfoRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.InfoRequest.version": - panic(fmt.Errorf("field version of message cometbft.abci.v1.InfoRequest is not mutable")) - case "cometbft.abci.v1.InfoRequest.block_version": - panic(fmt.Errorf("field block_version of message cometbft.abci.v1.InfoRequest is not mutable")) - case "cometbft.abci.v1.InfoRequest.p2p_version": - panic(fmt.Errorf("field p2p_version of message cometbft.abci.v1.InfoRequest is not mutable")) - case "cometbft.abci.v1.InfoRequest.abci_version": - panic(fmt.Errorf("field abci_version of message cometbft.abci.v1.InfoRequest is not mutable")) + case "cometbft.abci.v2.InfoRequest.version": + panic(fmt.Errorf("field version of message cometbft.abci.v2.InfoRequest is not mutable")) + case "cometbft.abci.v2.InfoRequest.block_version": + panic(fmt.Errorf("field block_version of message cometbft.abci.v2.InfoRequest is not mutable")) + case "cometbft.abci.v2.InfoRequest.p2p_version": + panic(fmt.Errorf("field p2p_version of message cometbft.abci.v2.InfoRequest is not mutable")) + case "cometbft.abci.v2.InfoRequest.abci_version": + panic(fmt.Errorf("field abci_version of message cometbft.abci.v2.InfoRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoRequest does not contain field %s", fd.FullName())) } } @@ -3086,19 +3088,19 @@ func (x *fastReflection_InfoRequest) Mutable(fd protoreflect.FieldDescriptor) pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_InfoRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.InfoRequest.version": + case "cometbft.abci.v2.InfoRequest.version": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.InfoRequest.block_version": + case "cometbft.abci.v2.InfoRequest.block_version": return protoreflect.ValueOfUint64(uint64(0)) - case "cometbft.abci.v1.InfoRequest.p2p_version": + case "cometbft.abci.v2.InfoRequest.p2p_version": return protoreflect.ValueOfUint64(uint64(0)) - case "cometbft.abci.v1.InfoRequest.abci_version": + case "cometbft.abci.v2.InfoRequest.abci_version": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoRequest does not contain field %s", fd.FullName())) } } @@ -3108,7 +3110,7 @@ func (x *fastReflection_InfoRequest) NewField(fd protoreflect.FieldDescriptor) p func (x *fastReflection_InfoRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.InfoRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.InfoRequest", d.FullName())) } panic("unreachable") } @@ -3478,8 +3480,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_InitChainRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("InitChainRequest") + file_cometbft_abci_v2_types_proto_init() + md_InitChainRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("InitChainRequest") fd_InitChainRequest_time = md_InitChainRequest.Fields().ByName("time") fd_InitChainRequest_chain_id = md_InitChainRequest.Fields().ByName("chain_id") fd_InitChainRequest_consensus_params = md_InitChainRequest.Fields().ByName("consensus_params") @@ -3497,7 +3499,7 @@ func (x *InitChainRequest) ProtoReflect() protoreflect.Message { } func (x *InitChainRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[4] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3604,23 +3606,23 @@ func (x *fastReflection_InitChainRequest) Range(f func(protoreflect.FieldDescrip // a repeated field is populated if it is non-empty. func (x *fastReflection_InitChainRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.InitChainRequest.time": + case "cometbft.abci.v2.InitChainRequest.time": return x.Time != nil - case "cometbft.abci.v1.InitChainRequest.chain_id": + case "cometbft.abci.v2.InitChainRequest.chain_id": return x.ChainId != "" - case "cometbft.abci.v1.InitChainRequest.consensus_params": + case "cometbft.abci.v2.InitChainRequest.consensus_params": return x.ConsensusParams != nil - case "cometbft.abci.v1.InitChainRequest.validators": + case "cometbft.abci.v2.InitChainRequest.validators": return len(x.Validators) != 0 - case "cometbft.abci.v1.InitChainRequest.app_state_bytes": + case "cometbft.abci.v2.InitChainRequest.app_state_bytes": return len(x.AppStateBytes) != 0 - case "cometbft.abci.v1.InitChainRequest.initial_height": + case "cometbft.abci.v2.InitChainRequest.initial_height": return x.InitialHeight != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainRequest does not contain field %s", fd.FullName())) } } @@ -3632,23 +3634,23 @@ func (x *fastReflection_InitChainRequest) Has(fd protoreflect.FieldDescriptor) b // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InitChainRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.InitChainRequest.time": + case "cometbft.abci.v2.InitChainRequest.time": x.Time = nil - case "cometbft.abci.v1.InitChainRequest.chain_id": + case "cometbft.abci.v2.InitChainRequest.chain_id": x.ChainId = "" - case "cometbft.abci.v1.InitChainRequest.consensus_params": + case "cometbft.abci.v2.InitChainRequest.consensus_params": x.ConsensusParams = nil - case "cometbft.abci.v1.InitChainRequest.validators": + case "cometbft.abci.v2.InitChainRequest.validators": x.Validators = nil - case "cometbft.abci.v1.InitChainRequest.app_state_bytes": + case "cometbft.abci.v2.InitChainRequest.app_state_bytes": x.AppStateBytes = nil - case "cometbft.abci.v1.InitChainRequest.initial_height": + case "cometbft.abci.v2.InitChainRequest.initial_height": x.InitialHeight = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainRequest does not contain field %s", fd.FullName())) } } @@ -3660,32 +3662,32 @@ func (x *fastReflection_InitChainRequest) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_InitChainRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.InitChainRequest.time": + case "cometbft.abci.v2.InitChainRequest.time": value := x.Time return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.InitChainRequest.chain_id": + case "cometbft.abci.v2.InitChainRequest.chain_id": value := x.ChainId return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.InitChainRequest.consensus_params": + case "cometbft.abci.v2.InitChainRequest.consensus_params": value := x.ConsensusParams return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.InitChainRequest.validators": + case "cometbft.abci.v2.InitChainRequest.validators": if len(x.Validators) == 0 { return protoreflect.ValueOfList(&_InitChainRequest_4_list{}) } listValue := &_InitChainRequest_4_list{list: &x.Validators} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.InitChainRequest.app_state_bytes": + case "cometbft.abci.v2.InitChainRequest.app_state_bytes": value := x.AppStateBytes return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.InitChainRequest.initial_height": + case "cometbft.abci.v2.InitChainRequest.initial_height": value := x.InitialHeight return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainRequest does not contain field %s", descriptor.FullName())) } } @@ -3701,25 +3703,25 @@ func (x *fastReflection_InitChainRequest) Get(descriptor protoreflect.FieldDescr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InitChainRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.InitChainRequest.time": + case "cometbft.abci.v2.InitChainRequest.time": x.Time = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.abci.v1.InitChainRequest.chain_id": + case "cometbft.abci.v2.InitChainRequest.chain_id": x.ChainId = value.Interface().(string) - case "cometbft.abci.v1.InitChainRequest.consensus_params": - x.ConsensusParams = value.Message().Interface().(*v1.ConsensusParams) - case "cometbft.abci.v1.InitChainRequest.validators": + case "cometbft.abci.v2.InitChainRequest.consensus_params": + x.ConsensusParams = value.Message().Interface().(*v2.ConsensusParams) + case "cometbft.abci.v2.InitChainRequest.validators": lv := value.List() clv := lv.(*_InitChainRequest_4_list) x.Validators = *clv.list - case "cometbft.abci.v1.InitChainRequest.app_state_bytes": + case "cometbft.abci.v2.InitChainRequest.app_state_bytes": x.AppStateBytes = value.Bytes() - case "cometbft.abci.v1.InitChainRequest.initial_height": + case "cometbft.abci.v2.InitChainRequest.initial_height": x.InitialHeight = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainRequest does not contain field %s", fd.FullName())) } } @@ -3735,33 +3737,33 @@ func (x *fastReflection_InitChainRequest) Set(fd protoreflect.FieldDescriptor, v // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InitChainRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.InitChainRequest.time": + case "cometbft.abci.v2.InitChainRequest.time": if x.Time == nil { x.Time = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Time.ProtoReflect()) - case "cometbft.abci.v1.InitChainRequest.consensus_params": + case "cometbft.abci.v2.InitChainRequest.consensus_params": if x.ConsensusParams == nil { - x.ConsensusParams = new(v1.ConsensusParams) + x.ConsensusParams = new(v2.ConsensusParams) } return protoreflect.ValueOfMessage(x.ConsensusParams.ProtoReflect()) - case "cometbft.abci.v1.InitChainRequest.validators": + case "cometbft.abci.v2.InitChainRequest.validators": if x.Validators == nil { x.Validators = []*ValidatorUpdate{} } value := &_InitChainRequest_4_list{list: &x.Validators} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.InitChainRequest.chain_id": - panic(fmt.Errorf("field chain_id of message cometbft.abci.v1.InitChainRequest is not mutable")) - case "cometbft.abci.v1.InitChainRequest.app_state_bytes": - panic(fmt.Errorf("field app_state_bytes of message cometbft.abci.v1.InitChainRequest is not mutable")) - case "cometbft.abci.v1.InitChainRequest.initial_height": - panic(fmt.Errorf("field initial_height of message cometbft.abci.v1.InitChainRequest is not mutable")) + case "cometbft.abci.v2.InitChainRequest.chain_id": + panic(fmt.Errorf("field chain_id of message cometbft.abci.v2.InitChainRequest is not mutable")) + case "cometbft.abci.v2.InitChainRequest.app_state_bytes": + panic(fmt.Errorf("field app_state_bytes of message cometbft.abci.v2.InitChainRequest is not mutable")) + case "cometbft.abci.v2.InitChainRequest.initial_height": + panic(fmt.Errorf("field initial_height of message cometbft.abci.v2.InitChainRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainRequest does not contain field %s", fd.FullName())) } } @@ -3770,26 +3772,26 @@ func (x *fastReflection_InitChainRequest) Mutable(fd protoreflect.FieldDescripto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_InitChainRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.InitChainRequest.time": + case "cometbft.abci.v2.InitChainRequest.time": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.InitChainRequest.chain_id": + case "cometbft.abci.v2.InitChainRequest.chain_id": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.InitChainRequest.consensus_params": - m := new(v1.ConsensusParams) + case "cometbft.abci.v2.InitChainRequest.consensus_params": + m := new(v2.ConsensusParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.InitChainRequest.validators": + case "cometbft.abci.v2.InitChainRequest.validators": list := []*ValidatorUpdate{} return protoreflect.ValueOfList(&_InitChainRequest_4_list{list: &list}) - case "cometbft.abci.v1.InitChainRequest.app_state_bytes": + case "cometbft.abci.v2.InitChainRequest.app_state_bytes": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.InitChainRequest.initial_height": + case "cometbft.abci.v2.InitChainRequest.initial_height": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainRequest does not contain field %s", fd.FullName())) } } @@ -3799,7 +3801,7 @@ func (x *fastReflection_InitChainRequest) NewField(fd protoreflect.FieldDescript func (x *fastReflection_InitChainRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.InitChainRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.InitChainRequest", d.FullName())) } panic("unreachable") } @@ -4118,7 +4120,7 @@ func (x *fastReflection_InitChainRequest) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.ConsensusParams == nil { - x.ConsensusParams = &v1.ConsensusParams{} + x.ConsensusParams = &v2.ConsensusParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.ConsensusParams); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -4255,8 +4257,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_QueryRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("QueryRequest") + file_cometbft_abci_v2_types_proto_init() + md_QueryRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("QueryRequest") fd_QueryRequest_data = md_QueryRequest.Fields().ByName("data") fd_QueryRequest_path = md_QueryRequest.Fields().ByName("path") fd_QueryRequest_height = md_QueryRequest.Fields().ByName("height") @@ -4272,7 +4274,7 @@ func (x *QueryRequest) ProtoReflect() protoreflect.Message { } func (x *QueryRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[5] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4367,19 +4369,19 @@ func (x *fastReflection_QueryRequest) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_QueryRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.QueryRequest.data": + case "cometbft.abci.v2.QueryRequest.data": return len(x.Data) != 0 - case "cometbft.abci.v1.QueryRequest.path": + case "cometbft.abci.v2.QueryRequest.path": return x.Path != "" - case "cometbft.abci.v1.QueryRequest.height": + case "cometbft.abci.v2.QueryRequest.height": return x.Height != int64(0) - case "cometbft.abci.v1.QueryRequest.prove": + case "cometbft.abci.v2.QueryRequest.prove": return x.Prove != false default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryRequest does not contain field %s", fd.FullName())) } } @@ -4391,19 +4393,19 @@ func (x *fastReflection_QueryRequest) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.QueryRequest.data": + case "cometbft.abci.v2.QueryRequest.data": x.Data = nil - case "cometbft.abci.v1.QueryRequest.path": + case "cometbft.abci.v2.QueryRequest.path": x.Path = "" - case "cometbft.abci.v1.QueryRequest.height": + case "cometbft.abci.v2.QueryRequest.height": x.Height = int64(0) - case "cometbft.abci.v1.QueryRequest.prove": + case "cometbft.abci.v2.QueryRequest.prove": x.Prove = false default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryRequest does not contain field %s", fd.FullName())) } } @@ -4415,23 +4417,23 @@ func (x *fastReflection_QueryRequest) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_QueryRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.QueryRequest.data": + case "cometbft.abci.v2.QueryRequest.data": value := x.Data return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.QueryRequest.path": + case "cometbft.abci.v2.QueryRequest.path": value := x.Path return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.QueryRequest.height": + case "cometbft.abci.v2.QueryRequest.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.QueryRequest.prove": + case "cometbft.abci.v2.QueryRequest.prove": value := x.Prove return protoreflect.ValueOfBool(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryRequest does not contain field %s", descriptor.FullName())) } } @@ -4447,19 +4449,19 @@ func (x *fastReflection_QueryRequest) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.QueryRequest.data": + case "cometbft.abci.v2.QueryRequest.data": x.Data = value.Bytes() - case "cometbft.abci.v1.QueryRequest.path": + case "cometbft.abci.v2.QueryRequest.path": x.Path = value.Interface().(string) - case "cometbft.abci.v1.QueryRequest.height": + case "cometbft.abci.v2.QueryRequest.height": x.Height = value.Int() - case "cometbft.abci.v1.QueryRequest.prove": + case "cometbft.abci.v2.QueryRequest.prove": x.Prove = value.Bool() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryRequest does not contain field %s", fd.FullName())) } } @@ -4475,19 +4477,19 @@ func (x *fastReflection_QueryRequest) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.QueryRequest.data": - panic(fmt.Errorf("field data of message cometbft.abci.v1.QueryRequest is not mutable")) - case "cometbft.abci.v1.QueryRequest.path": - panic(fmt.Errorf("field path of message cometbft.abci.v1.QueryRequest is not mutable")) - case "cometbft.abci.v1.QueryRequest.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.QueryRequest is not mutable")) - case "cometbft.abci.v1.QueryRequest.prove": - panic(fmt.Errorf("field prove of message cometbft.abci.v1.QueryRequest is not mutable")) + case "cometbft.abci.v2.QueryRequest.data": + panic(fmt.Errorf("field data of message cometbft.abci.v2.QueryRequest is not mutable")) + case "cometbft.abci.v2.QueryRequest.path": + panic(fmt.Errorf("field path of message cometbft.abci.v2.QueryRequest is not mutable")) + case "cometbft.abci.v2.QueryRequest.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.QueryRequest is not mutable")) + case "cometbft.abci.v2.QueryRequest.prove": + panic(fmt.Errorf("field prove of message cometbft.abci.v2.QueryRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryRequest does not contain field %s", fd.FullName())) } } @@ -4496,19 +4498,19 @@ func (x *fastReflection_QueryRequest) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_QueryRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.QueryRequest.data": + case "cometbft.abci.v2.QueryRequest.data": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.QueryRequest.path": + case "cometbft.abci.v2.QueryRequest.path": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.QueryRequest.height": + case "cometbft.abci.v2.QueryRequest.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.QueryRequest.prove": + case "cometbft.abci.v2.QueryRequest.prove": return protoreflect.ValueOfBool(false) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryRequest does not contain field %s", fd.FullName())) } } @@ -4518,7 +4520,7 @@ func (x *fastReflection_QueryRequest) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_QueryRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.QueryRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.QueryRequest", d.FullName())) } panic("unreachable") } @@ -4841,8 +4843,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_CheckTxRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("CheckTxRequest") + file_cometbft_abci_v2_types_proto_init() + md_CheckTxRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("CheckTxRequest") fd_CheckTxRequest_tx = md_CheckTxRequest.Fields().ByName("tx") fd_CheckTxRequest_type = md_CheckTxRequest.Fields().ByName("type") } @@ -4856,7 +4858,7 @@ func (x *CheckTxRequest) ProtoReflect() protoreflect.Message { } func (x *CheckTxRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[6] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4939,15 +4941,15 @@ func (x *fastReflection_CheckTxRequest) Range(f func(protoreflect.FieldDescripto // a repeated field is populated if it is non-empty. func (x *fastReflection_CheckTxRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxRequest.tx": + case "cometbft.abci.v2.CheckTxRequest.tx": return len(x.Tx) != 0 - case "cometbft.abci.v1.CheckTxRequest.type": + case "cometbft.abci.v2.CheckTxRequest.type": return x.Type_ != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxRequest does not contain field %s", fd.FullName())) } } @@ -4959,15 +4961,15 @@ func (x *fastReflection_CheckTxRequest) Has(fd protoreflect.FieldDescriptor) boo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CheckTxRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxRequest.tx": + case "cometbft.abci.v2.CheckTxRequest.tx": x.Tx = nil - case "cometbft.abci.v1.CheckTxRequest.type": + case "cometbft.abci.v2.CheckTxRequest.type": x.Type_ = 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxRequest does not contain field %s", fd.FullName())) } } @@ -4979,17 +4981,17 @@ func (x *fastReflection_CheckTxRequest) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CheckTxRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.CheckTxRequest.tx": + case "cometbft.abci.v2.CheckTxRequest.tx": value := x.Tx return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.CheckTxRequest.type": + case "cometbft.abci.v2.CheckTxRequest.type": value := x.Type_ return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxRequest does not contain field %s", descriptor.FullName())) } } @@ -5005,15 +5007,15 @@ func (x *fastReflection_CheckTxRequest) Get(descriptor protoreflect.FieldDescrip // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CheckTxRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxRequest.tx": + case "cometbft.abci.v2.CheckTxRequest.tx": x.Tx = value.Bytes() - case "cometbft.abci.v1.CheckTxRequest.type": + case "cometbft.abci.v2.CheckTxRequest.type": x.Type_ = (CheckTxType)(value.Enum()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxRequest does not contain field %s", fd.FullName())) } } @@ -5029,15 +5031,15 @@ func (x *fastReflection_CheckTxRequest) Set(fd protoreflect.FieldDescriptor, val // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CheckTxRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxRequest.tx": - panic(fmt.Errorf("field tx of message cometbft.abci.v1.CheckTxRequest is not mutable")) - case "cometbft.abci.v1.CheckTxRequest.type": - panic(fmt.Errorf("field type of message cometbft.abci.v1.CheckTxRequest is not mutable")) + case "cometbft.abci.v2.CheckTxRequest.tx": + panic(fmt.Errorf("field tx of message cometbft.abci.v2.CheckTxRequest is not mutable")) + case "cometbft.abci.v2.CheckTxRequest.type": + panic(fmt.Errorf("field type of message cometbft.abci.v2.CheckTxRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxRequest does not contain field %s", fd.FullName())) } } @@ -5046,15 +5048,15 @@ func (x *fastReflection_CheckTxRequest) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CheckTxRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxRequest.tx": + case "cometbft.abci.v2.CheckTxRequest.tx": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.CheckTxRequest.type": + case "cometbft.abci.v2.CheckTxRequest.type": return protoreflect.ValueOfEnum(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxRequest does not contain field %s", fd.FullName())) } } @@ -5064,7 +5066,7 @@ func (x *fastReflection_CheckTxRequest) NewField(fd protoreflect.FieldDescriptor func (x *fastReflection_CheckTxRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.CheckTxRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.CheckTxRequest", d.FullName())) } panic("unreachable") } @@ -5309,8 +5311,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_CommitRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("CommitRequest") + file_cometbft_abci_v2_types_proto_init() + md_CommitRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("CommitRequest") } var _ protoreflect.Message = (*fastReflection_CommitRequest)(nil) @@ -5322,7 +5324,7 @@ func (x *CommitRequest) ProtoReflect() protoreflect.Message { } func (x *CommitRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[7] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5395,9 +5397,9 @@ func (x *fastReflection_CommitRequest) Has(fd protoreflect.FieldDescriptor) bool switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitRequest does not contain field %s", fd.FullName())) } } @@ -5411,9 +5413,9 @@ func (x *fastReflection_CommitRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitRequest does not contain field %s", fd.FullName())) } } @@ -5427,9 +5429,9 @@ func (x *fastReflection_CommitRequest) Get(descriptor protoreflect.FieldDescript switch descriptor.FullName() { default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitRequest does not contain field %s", descriptor.FullName())) } } @@ -5447,9 +5449,9 @@ func (x *fastReflection_CommitRequest) Set(fd protoreflect.FieldDescriptor, valu switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitRequest does not contain field %s", fd.FullName())) } } @@ -5467,9 +5469,9 @@ func (x *fastReflection_CommitRequest) Mutable(fd protoreflect.FieldDescriptor) switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitRequest does not contain field %s", fd.FullName())) } } @@ -5480,9 +5482,9 @@ func (x *fastReflection_CommitRequest) NewField(fd protoreflect.FieldDescriptor) switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitRequest does not contain field %s", fd.FullName())) } } @@ -5492,7 +5494,7 @@ func (x *fastReflection_CommitRequest) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_CommitRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.CommitRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.CommitRequest", d.FullName())) } panic("unreachable") } @@ -5665,8 +5667,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ListSnapshotsRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("ListSnapshotsRequest") + file_cometbft_abci_v2_types_proto_init() + md_ListSnapshotsRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("ListSnapshotsRequest") } var _ protoreflect.Message = (*fastReflection_ListSnapshotsRequest)(nil) @@ -5678,7 +5680,7 @@ func (x *ListSnapshotsRequest) ProtoReflect() protoreflect.Message { } func (x *ListSnapshotsRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[8] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5751,9 +5753,9 @@ func (x *fastReflection_ListSnapshotsRequest) Has(fd protoreflect.FieldDescripto switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsRequest does not contain field %s", fd.FullName())) } } @@ -5767,9 +5769,9 @@ func (x *fastReflection_ListSnapshotsRequest) Clear(fd protoreflect.FieldDescrip switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsRequest does not contain field %s", fd.FullName())) } } @@ -5783,9 +5785,9 @@ func (x *fastReflection_ListSnapshotsRequest) Get(descriptor protoreflect.FieldD switch descriptor.FullName() { default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsRequest does not contain field %s", descriptor.FullName())) } } @@ -5803,9 +5805,9 @@ func (x *fastReflection_ListSnapshotsRequest) Set(fd protoreflect.FieldDescripto switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsRequest does not contain field %s", fd.FullName())) } } @@ -5823,9 +5825,9 @@ func (x *fastReflection_ListSnapshotsRequest) Mutable(fd protoreflect.FieldDescr switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsRequest does not contain field %s", fd.FullName())) } } @@ -5836,9 +5838,9 @@ func (x *fastReflection_ListSnapshotsRequest) NewField(fd protoreflect.FieldDesc switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsRequest does not contain field %s", fd.FullName())) } } @@ -5848,7 +5850,7 @@ func (x *fastReflection_ListSnapshotsRequest) NewField(fd protoreflect.FieldDesc func (x *fastReflection_ListSnapshotsRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ListSnapshotsRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ListSnapshotsRequest", d.FullName())) } panic("unreachable") } @@ -6023,8 +6025,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_OfferSnapshotRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("OfferSnapshotRequest") + file_cometbft_abci_v2_types_proto_init() + md_OfferSnapshotRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("OfferSnapshotRequest") fd_OfferSnapshotRequest_snapshot = md_OfferSnapshotRequest.Fields().ByName("snapshot") fd_OfferSnapshotRequest_app_hash = md_OfferSnapshotRequest.Fields().ByName("app_hash") } @@ -6038,7 +6040,7 @@ func (x *OfferSnapshotRequest) ProtoReflect() protoreflect.Message { } func (x *OfferSnapshotRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[9] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6121,15 +6123,15 @@ func (x *fastReflection_OfferSnapshotRequest) Range(f func(protoreflect.FieldDes // a repeated field is populated if it is non-empty. func (x *fastReflection_OfferSnapshotRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotRequest.snapshot": + case "cometbft.abci.v2.OfferSnapshotRequest.snapshot": return x.Snapshot != nil - case "cometbft.abci.v1.OfferSnapshotRequest.app_hash": + case "cometbft.abci.v2.OfferSnapshotRequest.app_hash": return len(x.AppHash) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotRequest does not contain field %s", fd.FullName())) } } @@ -6141,15 +6143,15 @@ func (x *fastReflection_OfferSnapshotRequest) Has(fd protoreflect.FieldDescripto // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_OfferSnapshotRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotRequest.snapshot": + case "cometbft.abci.v2.OfferSnapshotRequest.snapshot": x.Snapshot = nil - case "cometbft.abci.v1.OfferSnapshotRequest.app_hash": + case "cometbft.abci.v2.OfferSnapshotRequest.app_hash": x.AppHash = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotRequest does not contain field %s", fd.FullName())) } } @@ -6161,17 +6163,17 @@ func (x *fastReflection_OfferSnapshotRequest) Clear(fd protoreflect.FieldDescrip // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_OfferSnapshotRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.OfferSnapshotRequest.snapshot": + case "cometbft.abci.v2.OfferSnapshotRequest.snapshot": value := x.Snapshot return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.OfferSnapshotRequest.app_hash": + case "cometbft.abci.v2.OfferSnapshotRequest.app_hash": value := x.AppHash return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotRequest does not contain field %s", descriptor.FullName())) } } @@ -6187,15 +6189,15 @@ func (x *fastReflection_OfferSnapshotRequest) Get(descriptor protoreflect.FieldD // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_OfferSnapshotRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotRequest.snapshot": + case "cometbft.abci.v2.OfferSnapshotRequest.snapshot": x.Snapshot = value.Message().Interface().(*Snapshot) - case "cometbft.abci.v1.OfferSnapshotRequest.app_hash": + case "cometbft.abci.v2.OfferSnapshotRequest.app_hash": x.AppHash = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotRequest does not contain field %s", fd.FullName())) } } @@ -6211,18 +6213,18 @@ func (x *fastReflection_OfferSnapshotRequest) Set(fd protoreflect.FieldDescripto // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_OfferSnapshotRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotRequest.snapshot": + case "cometbft.abci.v2.OfferSnapshotRequest.snapshot": if x.Snapshot == nil { x.Snapshot = new(Snapshot) } return protoreflect.ValueOfMessage(x.Snapshot.ProtoReflect()) - case "cometbft.abci.v1.OfferSnapshotRequest.app_hash": - panic(fmt.Errorf("field app_hash of message cometbft.abci.v1.OfferSnapshotRequest is not mutable")) + case "cometbft.abci.v2.OfferSnapshotRequest.app_hash": + panic(fmt.Errorf("field app_hash of message cometbft.abci.v2.OfferSnapshotRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotRequest does not contain field %s", fd.FullName())) } } @@ -6231,16 +6233,16 @@ func (x *fastReflection_OfferSnapshotRequest) Mutable(fd protoreflect.FieldDescr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_OfferSnapshotRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotRequest.snapshot": + case "cometbft.abci.v2.OfferSnapshotRequest.snapshot": m := new(Snapshot) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.OfferSnapshotRequest.app_hash": + case "cometbft.abci.v2.OfferSnapshotRequest.app_hash": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotRequest does not contain field %s", fd.FullName())) } } @@ -6250,7 +6252,7 @@ func (x *fastReflection_OfferSnapshotRequest) NewField(fd protoreflect.FieldDesc func (x *fastReflection_OfferSnapshotRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.OfferSnapshotRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.OfferSnapshotRequest", d.FullName())) } panic("unreachable") } @@ -6525,8 +6527,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_LoadSnapshotChunkRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("LoadSnapshotChunkRequest") + file_cometbft_abci_v2_types_proto_init() + md_LoadSnapshotChunkRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("LoadSnapshotChunkRequest") fd_LoadSnapshotChunkRequest_height = md_LoadSnapshotChunkRequest.Fields().ByName("height") fd_LoadSnapshotChunkRequest_format = md_LoadSnapshotChunkRequest.Fields().ByName("format") fd_LoadSnapshotChunkRequest_chunk = md_LoadSnapshotChunkRequest.Fields().ByName("chunk") @@ -6541,7 +6543,7 @@ func (x *LoadSnapshotChunkRequest) ProtoReflect() protoreflect.Message { } func (x *LoadSnapshotChunkRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[10] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6630,17 +6632,17 @@ func (x *fastReflection_LoadSnapshotChunkRequest) Range(f func(protoreflect.Fiel // a repeated field is populated if it is non-empty. func (x *fastReflection_LoadSnapshotChunkRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkRequest.height": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.height": return x.Height != uint64(0) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.format": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.format": return x.Format != uint32(0) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.chunk": return x.Chunk != uint32(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -6652,17 +6654,17 @@ func (x *fastReflection_LoadSnapshotChunkRequest) Has(fd protoreflect.FieldDescr // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LoadSnapshotChunkRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkRequest.height": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.height": x.Height = uint64(0) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.format": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.format": x.Format = uint32(0) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.chunk": x.Chunk = uint32(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -6674,20 +6676,20 @@ func (x *fastReflection_LoadSnapshotChunkRequest) Clear(fd protoreflect.FieldDes // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_LoadSnapshotChunkRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkRequest.height": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.height": value := x.Height return protoreflect.ValueOfUint64(value) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.format": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.format": value := x.Format return protoreflect.ValueOfUint32(value) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.chunk": value := x.Chunk return protoreflect.ValueOfUint32(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkRequest does not contain field %s", descriptor.FullName())) } } @@ -6703,17 +6705,17 @@ func (x *fastReflection_LoadSnapshotChunkRequest) Get(descriptor protoreflect.Fi // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LoadSnapshotChunkRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkRequest.height": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.height": x.Height = value.Uint() - case "cometbft.abci.v1.LoadSnapshotChunkRequest.format": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.format": x.Format = uint32(value.Uint()) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.chunk": x.Chunk = uint32(value.Uint()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -6729,17 +6731,17 @@ func (x *fastReflection_LoadSnapshotChunkRequest) Set(fd protoreflect.FieldDescr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LoadSnapshotChunkRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkRequest.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.LoadSnapshotChunkRequest is not mutable")) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.format": - panic(fmt.Errorf("field format of message cometbft.abci.v1.LoadSnapshotChunkRequest is not mutable")) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.chunk": - panic(fmt.Errorf("field chunk of message cometbft.abci.v1.LoadSnapshotChunkRequest is not mutable")) + case "cometbft.abci.v2.LoadSnapshotChunkRequest.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.LoadSnapshotChunkRequest is not mutable")) + case "cometbft.abci.v2.LoadSnapshotChunkRequest.format": + panic(fmt.Errorf("field format of message cometbft.abci.v2.LoadSnapshotChunkRequest is not mutable")) + case "cometbft.abci.v2.LoadSnapshotChunkRequest.chunk": + panic(fmt.Errorf("field chunk of message cometbft.abci.v2.LoadSnapshotChunkRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -6748,17 +6750,17 @@ func (x *fastReflection_LoadSnapshotChunkRequest) Mutable(fd protoreflect.FieldD // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_LoadSnapshotChunkRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkRequest.height": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.height": return protoreflect.ValueOfUint64(uint64(0)) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.format": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.format": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.abci.v1.LoadSnapshotChunkRequest.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkRequest.chunk": return protoreflect.ValueOfUint32(uint32(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -6768,7 +6770,7 @@ func (x *fastReflection_LoadSnapshotChunkRequest) NewField(fd protoreflect.Field func (x *fastReflection_LoadSnapshotChunkRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.LoadSnapshotChunkRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.LoadSnapshotChunkRequest", d.FullName())) } panic("unreachable") } @@ -7025,8 +7027,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ApplySnapshotChunkRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("ApplySnapshotChunkRequest") + file_cometbft_abci_v2_types_proto_init() + md_ApplySnapshotChunkRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("ApplySnapshotChunkRequest") fd_ApplySnapshotChunkRequest_index = md_ApplySnapshotChunkRequest.Fields().ByName("index") fd_ApplySnapshotChunkRequest_chunk = md_ApplySnapshotChunkRequest.Fields().ByName("chunk") fd_ApplySnapshotChunkRequest_sender = md_ApplySnapshotChunkRequest.Fields().ByName("sender") @@ -7041,7 +7043,7 @@ func (x *ApplySnapshotChunkRequest) ProtoReflect() protoreflect.Message { } func (x *ApplySnapshotChunkRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[11] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7130,17 +7132,17 @@ func (x *fastReflection_ApplySnapshotChunkRequest) Range(f func(protoreflect.Fie // a repeated field is populated if it is non-empty. func (x *fastReflection_ApplySnapshotChunkRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkRequest.index": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.index": return x.Index != uint32(0) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.chunk": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.chunk": return len(x.Chunk) != 0 - case "cometbft.abci.v1.ApplySnapshotChunkRequest.sender": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.sender": return x.Sender != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -7152,17 +7154,17 @@ func (x *fastReflection_ApplySnapshotChunkRequest) Has(fd protoreflect.FieldDesc // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ApplySnapshotChunkRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkRequest.index": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.index": x.Index = uint32(0) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.chunk": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.chunk": x.Chunk = nil - case "cometbft.abci.v1.ApplySnapshotChunkRequest.sender": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.sender": x.Sender = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -7174,20 +7176,20 @@ func (x *fastReflection_ApplySnapshotChunkRequest) Clear(fd protoreflect.FieldDe // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ApplySnapshotChunkRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkRequest.index": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.index": value := x.Index return protoreflect.ValueOfUint32(value) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.chunk": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.chunk": value := x.Chunk return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.sender": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.sender": value := x.Sender return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkRequest does not contain field %s", descriptor.FullName())) } } @@ -7203,17 +7205,17 @@ func (x *fastReflection_ApplySnapshotChunkRequest) Get(descriptor protoreflect.F // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ApplySnapshotChunkRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkRequest.index": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.index": x.Index = uint32(value.Uint()) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.chunk": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.chunk": x.Chunk = value.Bytes() - case "cometbft.abci.v1.ApplySnapshotChunkRequest.sender": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.sender": x.Sender = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -7229,17 +7231,17 @@ func (x *fastReflection_ApplySnapshotChunkRequest) Set(fd protoreflect.FieldDesc // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ApplySnapshotChunkRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkRequest.index": - panic(fmt.Errorf("field index of message cometbft.abci.v1.ApplySnapshotChunkRequest is not mutable")) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.chunk": - panic(fmt.Errorf("field chunk of message cometbft.abci.v1.ApplySnapshotChunkRequest is not mutable")) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.sender": - panic(fmt.Errorf("field sender of message cometbft.abci.v1.ApplySnapshotChunkRequest is not mutable")) + case "cometbft.abci.v2.ApplySnapshotChunkRequest.index": + panic(fmt.Errorf("field index of message cometbft.abci.v2.ApplySnapshotChunkRequest is not mutable")) + case "cometbft.abci.v2.ApplySnapshotChunkRequest.chunk": + panic(fmt.Errorf("field chunk of message cometbft.abci.v2.ApplySnapshotChunkRequest is not mutable")) + case "cometbft.abci.v2.ApplySnapshotChunkRequest.sender": + panic(fmt.Errorf("field sender of message cometbft.abci.v2.ApplySnapshotChunkRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -7248,17 +7250,17 @@ func (x *fastReflection_ApplySnapshotChunkRequest) Mutable(fd protoreflect.Field // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ApplySnapshotChunkRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkRequest.index": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.index": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.chunk": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.chunk": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ApplySnapshotChunkRequest.sender": + case "cometbft.abci.v2.ApplySnapshotChunkRequest.sender": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkRequest does not contain field %s", fd.FullName())) } } @@ -7268,7 +7270,7 @@ func (x *fastReflection_ApplySnapshotChunkRequest) NewField(fd protoreflect.Fiel func (x *fastReflection_ApplySnapshotChunkRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ApplySnapshotChunkRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ApplySnapshotChunkRequest", d.FullName())) } panic("unreachable") } @@ -7661,8 +7663,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_PrepareProposalRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("PrepareProposalRequest") + file_cometbft_abci_v2_types_proto_init() + md_PrepareProposalRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("PrepareProposalRequest") fd_PrepareProposalRequest_max_tx_bytes = md_PrepareProposalRequest.Fields().ByName("max_tx_bytes") fd_PrepareProposalRequest_txs = md_PrepareProposalRequest.Fields().ByName("txs") fd_PrepareProposalRequest_local_last_commit = md_PrepareProposalRequest.Fields().ByName("local_last_commit") @@ -7682,7 +7684,7 @@ func (x *PrepareProposalRequest) ProtoReflect() protoreflect.Message { } func (x *PrepareProposalRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[12] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7801,27 +7803,27 @@ func (x *fastReflection_PrepareProposalRequest) Range(f func(protoreflect.FieldD // a repeated field is populated if it is non-empty. func (x *fastReflection_PrepareProposalRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalRequest.max_tx_bytes": + case "cometbft.abci.v2.PrepareProposalRequest.max_tx_bytes": return x.MaxTxBytes != int64(0) - case "cometbft.abci.v1.PrepareProposalRequest.txs": + case "cometbft.abci.v2.PrepareProposalRequest.txs": return len(x.Txs) != 0 - case "cometbft.abci.v1.PrepareProposalRequest.local_last_commit": + case "cometbft.abci.v2.PrepareProposalRequest.local_last_commit": return x.LocalLastCommit != nil - case "cometbft.abci.v1.PrepareProposalRequest.misbehavior": + case "cometbft.abci.v2.PrepareProposalRequest.misbehavior": return len(x.Misbehavior) != 0 - case "cometbft.abci.v1.PrepareProposalRequest.height": + case "cometbft.abci.v2.PrepareProposalRequest.height": return x.Height != int64(0) - case "cometbft.abci.v1.PrepareProposalRequest.time": + case "cometbft.abci.v2.PrepareProposalRequest.time": return x.Time != nil - case "cometbft.abci.v1.PrepareProposalRequest.next_validators_hash": + case "cometbft.abci.v2.PrepareProposalRequest.next_validators_hash": return len(x.NextValidatorsHash) != 0 - case "cometbft.abci.v1.PrepareProposalRequest.proposer_address": + case "cometbft.abci.v2.PrepareProposalRequest.proposer_address": return len(x.ProposerAddress) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalRequest does not contain field %s", fd.FullName())) } } @@ -7833,27 +7835,27 @@ func (x *fastReflection_PrepareProposalRequest) Has(fd protoreflect.FieldDescrip // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PrepareProposalRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalRequest.max_tx_bytes": + case "cometbft.abci.v2.PrepareProposalRequest.max_tx_bytes": x.MaxTxBytes = int64(0) - case "cometbft.abci.v1.PrepareProposalRequest.txs": + case "cometbft.abci.v2.PrepareProposalRequest.txs": x.Txs = nil - case "cometbft.abci.v1.PrepareProposalRequest.local_last_commit": + case "cometbft.abci.v2.PrepareProposalRequest.local_last_commit": x.LocalLastCommit = nil - case "cometbft.abci.v1.PrepareProposalRequest.misbehavior": + case "cometbft.abci.v2.PrepareProposalRequest.misbehavior": x.Misbehavior = nil - case "cometbft.abci.v1.PrepareProposalRequest.height": + case "cometbft.abci.v2.PrepareProposalRequest.height": x.Height = int64(0) - case "cometbft.abci.v1.PrepareProposalRequest.time": + case "cometbft.abci.v2.PrepareProposalRequest.time": x.Time = nil - case "cometbft.abci.v1.PrepareProposalRequest.next_validators_hash": + case "cometbft.abci.v2.PrepareProposalRequest.next_validators_hash": x.NextValidatorsHash = nil - case "cometbft.abci.v1.PrepareProposalRequest.proposer_address": + case "cometbft.abci.v2.PrepareProposalRequest.proposer_address": x.ProposerAddress = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalRequest does not contain field %s", fd.FullName())) } } @@ -7865,41 +7867,41 @@ func (x *fastReflection_PrepareProposalRequest) Clear(fd protoreflect.FieldDescr // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_PrepareProposalRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.PrepareProposalRequest.max_tx_bytes": + case "cometbft.abci.v2.PrepareProposalRequest.max_tx_bytes": value := x.MaxTxBytes return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.PrepareProposalRequest.txs": + case "cometbft.abci.v2.PrepareProposalRequest.txs": if len(x.Txs) == 0 { return protoreflect.ValueOfList(&_PrepareProposalRequest_2_list{}) } listValue := &_PrepareProposalRequest_2_list{list: &x.Txs} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.PrepareProposalRequest.local_last_commit": + case "cometbft.abci.v2.PrepareProposalRequest.local_last_commit": value := x.LocalLastCommit return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.PrepareProposalRequest.misbehavior": + case "cometbft.abci.v2.PrepareProposalRequest.misbehavior": if len(x.Misbehavior) == 0 { return protoreflect.ValueOfList(&_PrepareProposalRequest_4_list{}) } listValue := &_PrepareProposalRequest_4_list{list: &x.Misbehavior} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.PrepareProposalRequest.height": + case "cometbft.abci.v2.PrepareProposalRequest.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.PrepareProposalRequest.time": + case "cometbft.abci.v2.PrepareProposalRequest.time": value := x.Time return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.PrepareProposalRequest.next_validators_hash": + case "cometbft.abci.v2.PrepareProposalRequest.next_validators_hash": value := x.NextValidatorsHash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.PrepareProposalRequest.proposer_address": + case "cometbft.abci.v2.PrepareProposalRequest.proposer_address": value := x.ProposerAddress return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalRequest does not contain field %s", descriptor.FullName())) } } @@ -7915,31 +7917,31 @@ func (x *fastReflection_PrepareProposalRequest) Get(descriptor protoreflect.Fiel // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PrepareProposalRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalRequest.max_tx_bytes": + case "cometbft.abci.v2.PrepareProposalRequest.max_tx_bytes": x.MaxTxBytes = value.Int() - case "cometbft.abci.v1.PrepareProposalRequest.txs": + case "cometbft.abci.v2.PrepareProposalRequest.txs": lv := value.List() clv := lv.(*_PrepareProposalRequest_2_list) x.Txs = *clv.list - case "cometbft.abci.v1.PrepareProposalRequest.local_last_commit": + case "cometbft.abci.v2.PrepareProposalRequest.local_last_commit": x.LocalLastCommit = value.Message().Interface().(*ExtendedCommitInfo) - case "cometbft.abci.v1.PrepareProposalRequest.misbehavior": + case "cometbft.abci.v2.PrepareProposalRequest.misbehavior": lv := value.List() clv := lv.(*_PrepareProposalRequest_4_list) x.Misbehavior = *clv.list - case "cometbft.abci.v1.PrepareProposalRequest.height": + case "cometbft.abci.v2.PrepareProposalRequest.height": x.Height = value.Int() - case "cometbft.abci.v1.PrepareProposalRequest.time": + case "cometbft.abci.v2.PrepareProposalRequest.time": x.Time = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.abci.v1.PrepareProposalRequest.next_validators_hash": + case "cometbft.abci.v2.PrepareProposalRequest.next_validators_hash": x.NextValidatorsHash = value.Bytes() - case "cometbft.abci.v1.PrepareProposalRequest.proposer_address": + case "cometbft.abci.v2.PrepareProposalRequest.proposer_address": x.ProposerAddress = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalRequest does not contain field %s", fd.FullName())) } } @@ -7955,41 +7957,41 @@ func (x *fastReflection_PrepareProposalRequest) Set(fd protoreflect.FieldDescrip // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PrepareProposalRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalRequest.txs": + case "cometbft.abci.v2.PrepareProposalRequest.txs": if x.Txs == nil { x.Txs = [][]byte{} } value := &_PrepareProposalRequest_2_list{list: &x.Txs} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.PrepareProposalRequest.local_last_commit": + case "cometbft.abci.v2.PrepareProposalRequest.local_last_commit": if x.LocalLastCommit == nil { x.LocalLastCommit = new(ExtendedCommitInfo) } return protoreflect.ValueOfMessage(x.LocalLastCommit.ProtoReflect()) - case "cometbft.abci.v1.PrepareProposalRequest.misbehavior": + case "cometbft.abci.v2.PrepareProposalRequest.misbehavior": if x.Misbehavior == nil { x.Misbehavior = []*Misbehavior{} } value := &_PrepareProposalRequest_4_list{list: &x.Misbehavior} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.PrepareProposalRequest.time": + case "cometbft.abci.v2.PrepareProposalRequest.time": if x.Time == nil { x.Time = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Time.ProtoReflect()) - case "cometbft.abci.v1.PrepareProposalRequest.max_tx_bytes": - panic(fmt.Errorf("field max_tx_bytes of message cometbft.abci.v1.PrepareProposalRequest is not mutable")) - case "cometbft.abci.v1.PrepareProposalRequest.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.PrepareProposalRequest is not mutable")) - case "cometbft.abci.v1.PrepareProposalRequest.next_validators_hash": - panic(fmt.Errorf("field next_validators_hash of message cometbft.abci.v1.PrepareProposalRequest is not mutable")) - case "cometbft.abci.v1.PrepareProposalRequest.proposer_address": - panic(fmt.Errorf("field proposer_address of message cometbft.abci.v1.PrepareProposalRequest is not mutable")) + case "cometbft.abci.v2.PrepareProposalRequest.max_tx_bytes": + panic(fmt.Errorf("field max_tx_bytes of message cometbft.abci.v2.PrepareProposalRequest is not mutable")) + case "cometbft.abci.v2.PrepareProposalRequest.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.PrepareProposalRequest is not mutable")) + case "cometbft.abci.v2.PrepareProposalRequest.next_validators_hash": + panic(fmt.Errorf("field next_validators_hash of message cometbft.abci.v2.PrepareProposalRequest is not mutable")) + case "cometbft.abci.v2.PrepareProposalRequest.proposer_address": + panic(fmt.Errorf("field proposer_address of message cometbft.abci.v2.PrepareProposalRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalRequest does not contain field %s", fd.FullName())) } } @@ -7998,31 +8000,31 @@ func (x *fastReflection_PrepareProposalRequest) Mutable(fd protoreflect.FieldDes // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_PrepareProposalRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalRequest.max_tx_bytes": + case "cometbft.abci.v2.PrepareProposalRequest.max_tx_bytes": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.PrepareProposalRequest.txs": + case "cometbft.abci.v2.PrepareProposalRequest.txs": list := [][]byte{} return protoreflect.ValueOfList(&_PrepareProposalRequest_2_list{list: &list}) - case "cometbft.abci.v1.PrepareProposalRequest.local_last_commit": + case "cometbft.abci.v2.PrepareProposalRequest.local_last_commit": m := new(ExtendedCommitInfo) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.PrepareProposalRequest.misbehavior": + case "cometbft.abci.v2.PrepareProposalRequest.misbehavior": list := []*Misbehavior{} return protoreflect.ValueOfList(&_PrepareProposalRequest_4_list{list: &list}) - case "cometbft.abci.v1.PrepareProposalRequest.height": + case "cometbft.abci.v2.PrepareProposalRequest.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.PrepareProposalRequest.time": + case "cometbft.abci.v2.PrepareProposalRequest.time": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.PrepareProposalRequest.next_validators_hash": + case "cometbft.abci.v2.PrepareProposalRequest.next_validators_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.PrepareProposalRequest.proposer_address": + case "cometbft.abci.v2.PrepareProposalRequest.proposer_address": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalRequest does not contain field %s", fd.FullName())) } } @@ -8032,7 +8034,7 @@ func (x *fastReflection_PrepareProposalRequest) NewField(fd protoreflect.FieldDe func (x *fastReflection_PrepareProposalRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.PrepareProposalRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.PrepareProposalRequest", d.FullName())) } panic("unreachable") } @@ -8665,8 +8667,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ProcessProposalRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("ProcessProposalRequest") + file_cometbft_abci_v2_types_proto_init() + md_ProcessProposalRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("ProcessProposalRequest") fd_ProcessProposalRequest_txs = md_ProcessProposalRequest.Fields().ByName("txs") fd_ProcessProposalRequest_proposed_last_commit = md_ProcessProposalRequest.Fields().ByName("proposed_last_commit") fd_ProcessProposalRequest_misbehavior = md_ProcessProposalRequest.Fields().ByName("misbehavior") @@ -8686,7 +8688,7 @@ func (x *ProcessProposalRequest) ProtoReflect() protoreflect.Message { } func (x *ProcessProposalRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[13] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8805,27 +8807,27 @@ func (x *fastReflection_ProcessProposalRequest) Range(f func(protoreflect.FieldD // a repeated field is populated if it is non-empty. func (x *fastReflection_ProcessProposalRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalRequest.txs": + case "cometbft.abci.v2.ProcessProposalRequest.txs": return len(x.Txs) != 0 - case "cometbft.abci.v1.ProcessProposalRequest.proposed_last_commit": + case "cometbft.abci.v2.ProcessProposalRequest.proposed_last_commit": return x.ProposedLastCommit != nil - case "cometbft.abci.v1.ProcessProposalRequest.misbehavior": + case "cometbft.abci.v2.ProcessProposalRequest.misbehavior": return len(x.Misbehavior) != 0 - case "cometbft.abci.v1.ProcessProposalRequest.hash": + case "cometbft.abci.v2.ProcessProposalRequest.hash": return len(x.Hash) != 0 - case "cometbft.abci.v1.ProcessProposalRequest.height": + case "cometbft.abci.v2.ProcessProposalRequest.height": return x.Height != int64(0) - case "cometbft.abci.v1.ProcessProposalRequest.time": + case "cometbft.abci.v2.ProcessProposalRequest.time": return x.Time != nil - case "cometbft.abci.v1.ProcessProposalRequest.next_validators_hash": + case "cometbft.abci.v2.ProcessProposalRequest.next_validators_hash": return len(x.NextValidatorsHash) != 0 - case "cometbft.abci.v1.ProcessProposalRequest.proposer_address": + case "cometbft.abci.v2.ProcessProposalRequest.proposer_address": return len(x.ProposerAddress) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalRequest does not contain field %s", fd.FullName())) } } @@ -8837,27 +8839,27 @@ func (x *fastReflection_ProcessProposalRequest) Has(fd protoreflect.FieldDescrip // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ProcessProposalRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalRequest.txs": + case "cometbft.abci.v2.ProcessProposalRequest.txs": x.Txs = nil - case "cometbft.abci.v1.ProcessProposalRequest.proposed_last_commit": + case "cometbft.abci.v2.ProcessProposalRequest.proposed_last_commit": x.ProposedLastCommit = nil - case "cometbft.abci.v1.ProcessProposalRequest.misbehavior": + case "cometbft.abci.v2.ProcessProposalRequest.misbehavior": x.Misbehavior = nil - case "cometbft.abci.v1.ProcessProposalRequest.hash": + case "cometbft.abci.v2.ProcessProposalRequest.hash": x.Hash = nil - case "cometbft.abci.v1.ProcessProposalRequest.height": + case "cometbft.abci.v2.ProcessProposalRequest.height": x.Height = int64(0) - case "cometbft.abci.v1.ProcessProposalRequest.time": + case "cometbft.abci.v2.ProcessProposalRequest.time": x.Time = nil - case "cometbft.abci.v1.ProcessProposalRequest.next_validators_hash": + case "cometbft.abci.v2.ProcessProposalRequest.next_validators_hash": x.NextValidatorsHash = nil - case "cometbft.abci.v1.ProcessProposalRequest.proposer_address": + case "cometbft.abci.v2.ProcessProposalRequest.proposer_address": x.ProposerAddress = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalRequest does not contain field %s", fd.FullName())) } } @@ -8869,41 +8871,41 @@ func (x *fastReflection_ProcessProposalRequest) Clear(fd protoreflect.FieldDescr // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ProcessProposalRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ProcessProposalRequest.txs": + case "cometbft.abci.v2.ProcessProposalRequest.txs": if len(x.Txs) == 0 { return protoreflect.ValueOfList(&_ProcessProposalRequest_1_list{}) } listValue := &_ProcessProposalRequest_1_list{list: &x.Txs} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.ProcessProposalRequest.proposed_last_commit": + case "cometbft.abci.v2.ProcessProposalRequest.proposed_last_commit": value := x.ProposedLastCommit return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.ProcessProposalRequest.misbehavior": + case "cometbft.abci.v2.ProcessProposalRequest.misbehavior": if len(x.Misbehavior) == 0 { return protoreflect.ValueOfList(&_ProcessProposalRequest_3_list{}) } listValue := &_ProcessProposalRequest_3_list{list: &x.Misbehavior} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.ProcessProposalRequest.hash": + case "cometbft.abci.v2.ProcessProposalRequest.hash": value := x.Hash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ProcessProposalRequest.height": + case "cometbft.abci.v2.ProcessProposalRequest.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.ProcessProposalRequest.time": + case "cometbft.abci.v2.ProcessProposalRequest.time": value := x.Time return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.ProcessProposalRequest.next_validators_hash": + case "cometbft.abci.v2.ProcessProposalRequest.next_validators_hash": value := x.NextValidatorsHash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ProcessProposalRequest.proposer_address": + case "cometbft.abci.v2.ProcessProposalRequest.proposer_address": value := x.ProposerAddress return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalRequest does not contain field %s", descriptor.FullName())) } } @@ -8919,31 +8921,31 @@ func (x *fastReflection_ProcessProposalRequest) Get(descriptor protoreflect.Fiel // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ProcessProposalRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalRequest.txs": + case "cometbft.abci.v2.ProcessProposalRequest.txs": lv := value.List() clv := lv.(*_ProcessProposalRequest_1_list) x.Txs = *clv.list - case "cometbft.abci.v1.ProcessProposalRequest.proposed_last_commit": + case "cometbft.abci.v2.ProcessProposalRequest.proposed_last_commit": x.ProposedLastCommit = value.Message().Interface().(*CommitInfo) - case "cometbft.abci.v1.ProcessProposalRequest.misbehavior": + case "cometbft.abci.v2.ProcessProposalRequest.misbehavior": lv := value.List() clv := lv.(*_ProcessProposalRequest_3_list) x.Misbehavior = *clv.list - case "cometbft.abci.v1.ProcessProposalRequest.hash": + case "cometbft.abci.v2.ProcessProposalRequest.hash": x.Hash = value.Bytes() - case "cometbft.abci.v1.ProcessProposalRequest.height": + case "cometbft.abci.v2.ProcessProposalRequest.height": x.Height = value.Int() - case "cometbft.abci.v1.ProcessProposalRequest.time": + case "cometbft.abci.v2.ProcessProposalRequest.time": x.Time = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.abci.v1.ProcessProposalRequest.next_validators_hash": + case "cometbft.abci.v2.ProcessProposalRequest.next_validators_hash": x.NextValidatorsHash = value.Bytes() - case "cometbft.abci.v1.ProcessProposalRequest.proposer_address": + case "cometbft.abci.v2.ProcessProposalRequest.proposer_address": x.ProposerAddress = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalRequest does not contain field %s", fd.FullName())) } } @@ -8959,41 +8961,41 @@ func (x *fastReflection_ProcessProposalRequest) Set(fd protoreflect.FieldDescrip // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ProcessProposalRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalRequest.txs": + case "cometbft.abci.v2.ProcessProposalRequest.txs": if x.Txs == nil { x.Txs = [][]byte{} } value := &_ProcessProposalRequest_1_list{list: &x.Txs} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.ProcessProposalRequest.proposed_last_commit": + case "cometbft.abci.v2.ProcessProposalRequest.proposed_last_commit": if x.ProposedLastCommit == nil { x.ProposedLastCommit = new(CommitInfo) } return protoreflect.ValueOfMessage(x.ProposedLastCommit.ProtoReflect()) - case "cometbft.abci.v1.ProcessProposalRequest.misbehavior": + case "cometbft.abci.v2.ProcessProposalRequest.misbehavior": if x.Misbehavior == nil { x.Misbehavior = []*Misbehavior{} } value := &_ProcessProposalRequest_3_list{list: &x.Misbehavior} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.ProcessProposalRequest.time": + case "cometbft.abci.v2.ProcessProposalRequest.time": if x.Time == nil { x.Time = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Time.ProtoReflect()) - case "cometbft.abci.v1.ProcessProposalRequest.hash": - panic(fmt.Errorf("field hash of message cometbft.abci.v1.ProcessProposalRequest is not mutable")) - case "cometbft.abci.v1.ProcessProposalRequest.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.ProcessProposalRequest is not mutable")) - case "cometbft.abci.v1.ProcessProposalRequest.next_validators_hash": - panic(fmt.Errorf("field next_validators_hash of message cometbft.abci.v1.ProcessProposalRequest is not mutable")) - case "cometbft.abci.v1.ProcessProposalRequest.proposer_address": - panic(fmt.Errorf("field proposer_address of message cometbft.abci.v1.ProcessProposalRequest is not mutable")) + case "cometbft.abci.v2.ProcessProposalRequest.hash": + panic(fmt.Errorf("field hash of message cometbft.abci.v2.ProcessProposalRequest is not mutable")) + case "cometbft.abci.v2.ProcessProposalRequest.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.ProcessProposalRequest is not mutable")) + case "cometbft.abci.v2.ProcessProposalRequest.next_validators_hash": + panic(fmt.Errorf("field next_validators_hash of message cometbft.abci.v2.ProcessProposalRequest is not mutable")) + case "cometbft.abci.v2.ProcessProposalRequest.proposer_address": + panic(fmt.Errorf("field proposer_address of message cometbft.abci.v2.ProcessProposalRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalRequest does not contain field %s", fd.FullName())) } } @@ -9002,31 +9004,31 @@ func (x *fastReflection_ProcessProposalRequest) Mutable(fd protoreflect.FieldDes // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ProcessProposalRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalRequest.txs": + case "cometbft.abci.v2.ProcessProposalRequest.txs": list := [][]byte{} return protoreflect.ValueOfList(&_ProcessProposalRequest_1_list{list: &list}) - case "cometbft.abci.v1.ProcessProposalRequest.proposed_last_commit": + case "cometbft.abci.v2.ProcessProposalRequest.proposed_last_commit": m := new(CommitInfo) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.ProcessProposalRequest.misbehavior": + case "cometbft.abci.v2.ProcessProposalRequest.misbehavior": list := []*Misbehavior{} return protoreflect.ValueOfList(&_ProcessProposalRequest_3_list{list: &list}) - case "cometbft.abci.v1.ProcessProposalRequest.hash": + case "cometbft.abci.v2.ProcessProposalRequest.hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ProcessProposalRequest.height": + case "cometbft.abci.v2.ProcessProposalRequest.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.ProcessProposalRequest.time": + case "cometbft.abci.v2.ProcessProposalRequest.time": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.ProcessProposalRequest.next_validators_hash": + case "cometbft.abci.v2.ProcessProposalRequest.next_validators_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ProcessProposalRequest.proposer_address": + case "cometbft.abci.v2.ProcessProposalRequest.proposer_address": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalRequest does not contain field %s", fd.FullName())) } } @@ -9036,7 +9038,7 @@ func (x *fastReflection_ProcessProposalRequest) NewField(fd protoreflect.FieldDe func (x *fastReflection_ProcessProposalRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ProcessProposalRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ProcessProposalRequest", d.FullName())) } panic("unreachable") } @@ -9687,8 +9689,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ExtendVoteRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("ExtendVoteRequest") + file_cometbft_abci_v2_types_proto_init() + md_ExtendVoteRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("ExtendVoteRequest") fd_ExtendVoteRequest_hash = md_ExtendVoteRequest.Fields().ByName("hash") fd_ExtendVoteRequest_height = md_ExtendVoteRequest.Fields().ByName("height") fd_ExtendVoteRequest_time = md_ExtendVoteRequest.Fields().ByName("time") @@ -9708,7 +9710,7 @@ func (x *ExtendVoteRequest) ProtoReflect() protoreflect.Message { } func (x *ExtendVoteRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[14] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9827,27 +9829,27 @@ func (x *fastReflection_ExtendVoteRequest) Range(f func(protoreflect.FieldDescri // a repeated field is populated if it is non-empty. func (x *fastReflection_ExtendVoteRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteRequest.hash": + case "cometbft.abci.v2.ExtendVoteRequest.hash": return len(x.Hash) != 0 - case "cometbft.abci.v1.ExtendVoteRequest.height": + case "cometbft.abci.v2.ExtendVoteRequest.height": return x.Height != int64(0) - case "cometbft.abci.v1.ExtendVoteRequest.time": + case "cometbft.abci.v2.ExtendVoteRequest.time": return x.Time != nil - case "cometbft.abci.v1.ExtendVoteRequest.txs": + case "cometbft.abci.v2.ExtendVoteRequest.txs": return len(x.Txs) != 0 - case "cometbft.abci.v1.ExtendVoteRequest.proposed_last_commit": + case "cometbft.abci.v2.ExtendVoteRequest.proposed_last_commit": return x.ProposedLastCommit != nil - case "cometbft.abci.v1.ExtendVoteRequest.misbehavior": + case "cometbft.abci.v2.ExtendVoteRequest.misbehavior": return len(x.Misbehavior) != 0 - case "cometbft.abci.v1.ExtendVoteRequest.next_validators_hash": + case "cometbft.abci.v2.ExtendVoteRequest.next_validators_hash": return len(x.NextValidatorsHash) != 0 - case "cometbft.abci.v1.ExtendVoteRequest.proposer_address": + case "cometbft.abci.v2.ExtendVoteRequest.proposer_address": return len(x.ProposerAddress) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteRequest does not contain field %s", fd.FullName())) } } @@ -9859,27 +9861,27 @@ func (x *fastReflection_ExtendVoteRequest) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendVoteRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteRequest.hash": + case "cometbft.abci.v2.ExtendVoteRequest.hash": x.Hash = nil - case "cometbft.abci.v1.ExtendVoteRequest.height": + case "cometbft.abci.v2.ExtendVoteRequest.height": x.Height = int64(0) - case "cometbft.abci.v1.ExtendVoteRequest.time": + case "cometbft.abci.v2.ExtendVoteRequest.time": x.Time = nil - case "cometbft.abci.v1.ExtendVoteRequest.txs": + case "cometbft.abci.v2.ExtendVoteRequest.txs": x.Txs = nil - case "cometbft.abci.v1.ExtendVoteRequest.proposed_last_commit": + case "cometbft.abci.v2.ExtendVoteRequest.proposed_last_commit": x.ProposedLastCommit = nil - case "cometbft.abci.v1.ExtendVoteRequest.misbehavior": + case "cometbft.abci.v2.ExtendVoteRequest.misbehavior": x.Misbehavior = nil - case "cometbft.abci.v1.ExtendVoteRequest.next_validators_hash": + case "cometbft.abci.v2.ExtendVoteRequest.next_validators_hash": x.NextValidatorsHash = nil - case "cometbft.abci.v1.ExtendVoteRequest.proposer_address": + case "cometbft.abci.v2.ExtendVoteRequest.proposer_address": x.ProposerAddress = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteRequest does not contain field %s", fd.FullName())) } } @@ -9891,41 +9893,41 @@ func (x *fastReflection_ExtendVoteRequest) Clear(fd protoreflect.FieldDescriptor // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ExtendVoteRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ExtendVoteRequest.hash": + case "cometbft.abci.v2.ExtendVoteRequest.hash": value := x.Hash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ExtendVoteRequest.height": + case "cometbft.abci.v2.ExtendVoteRequest.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.ExtendVoteRequest.time": + case "cometbft.abci.v2.ExtendVoteRequest.time": value := x.Time return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.ExtendVoteRequest.txs": + case "cometbft.abci.v2.ExtendVoteRequest.txs": if len(x.Txs) == 0 { return protoreflect.ValueOfList(&_ExtendVoteRequest_4_list{}) } listValue := &_ExtendVoteRequest_4_list{list: &x.Txs} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.ExtendVoteRequest.proposed_last_commit": + case "cometbft.abci.v2.ExtendVoteRequest.proposed_last_commit": value := x.ProposedLastCommit return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.ExtendVoteRequest.misbehavior": + case "cometbft.abci.v2.ExtendVoteRequest.misbehavior": if len(x.Misbehavior) == 0 { return protoreflect.ValueOfList(&_ExtendVoteRequest_6_list{}) } listValue := &_ExtendVoteRequest_6_list{list: &x.Misbehavior} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.ExtendVoteRequest.next_validators_hash": + case "cometbft.abci.v2.ExtendVoteRequest.next_validators_hash": value := x.NextValidatorsHash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ExtendVoteRequest.proposer_address": + case "cometbft.abci.v2.ExtendVoteRequest.proposer_address": value := x.ProposerAddress return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteRequest does not contain field %s", descriptor.FullName())) } } @@ -9941,31 +9943,31 @@ func (x *fastReflection_ExtendVoteRequest) Get(descriptor protoreflect.FieldDesc // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendVoteRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteRequest.hash": + case "cometbft.abci.v2.ExtendVoteRequest.hash": x.Hash = value.Bytes() - case "cometbft.abci.v1.ExtendVoteRequest.height": + case "cometbft.abci.v2.ExtendVoteRequest.height": x.Height = value.Int() - case "cometbft.abci.v1.ExtendVoteRequest.time": + case "cometbft.abci.v2.ExtendVoteRequest.time": x.Time = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.abci.v1.ExtendVoteRequest.txs": + case "cometbft.abci.v2.ExtendVoteRequest.txs": lv := value.List() clv := lv.(*_ExtendVoteRequest_4_list) x.Txs = *clv.list - case "cometbft.abci.v1.ExtendVoteRequest.proposed_last_commit": + case "cometbft.abci.v2.ExtendVoteRequest.proposed_last_commit": x.ProposedLastCommit = value.Message().Interface().(*CommitInfo) - case "cometbft.abci.v1.ExtendVoteRequest.misbehavior": + case "cometbft.abci.v2.ExtendVoteRequest.misbehavior": lv := value.List() clv := lv.(*_ExtendVoteRequest_6_list) x.Misbehavior = *clv.list - case "cometbft.abci.v1.ExtendVoteRequest.next_validators_hash": + case "cometbft.abci.v2.ExtendVoteRequest.next_validators_hash": x.NextValidatorsHash = value.Bytes() - case "cometbft.abci.v1.ExtendVoteRequest.proposer_address": + case "cometbft.abci.v2.ExtendVoteRequest.proposer_address": x.ProposerAddress = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteRequest does not contain field %s", fd.FullName())) } } @@ -9981,41 +9983,41 @@ func (x *fastReflection_ExtendVoteRequest) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendVoteRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteRequest.time": + case "cometbft.abci.v2.ExtendVoteRequest.time": if x.Time == nil { x.Time = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Time.ProtoReflect()) - case "cometbft.abci.v1.ExtendVoteRequest.txs": + case "cometbft.abci.v2.ExtendVoteRequest.txs": if x.Txs == nil { x.Txs = [][]byte{} } value := &_ExtendVoteRequest_4_list{list: &x.Txs} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.ExtendVoteRequest.proposed_last_commit": + case "cometbft.abci.v2.ExtendVoteRequest.proposed_last_commit": if x.ProposedLastCommit == nil { x.ProposedLastCommit = new(CommitInfo) } return protoreflect.ValueOfMessage(x.ProposedLastCommit.ProtoReflect()) - case "cometbft.abci.v1.ExtendVoteRequest.misbehavior": + case "cometbft.abci.v2.ExtendVoteRequest.misbehavior": if x.Misbehavior == nil { x.Misbehavior = []*Misbehavior{} } value := &_ExtendVoteRequest_6_list{list: &x.Misbehavior} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.ExtendVoteRequest.hash": - panic(fmt.Errorf("field hash of message cometbft.abci.v1.ExtendVoteRequest is not mutable")) - case "cometbft.abci.v1.ExtendVoteRequest.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.ExtendVoteRequest is not mutable")) - case "cometbft.abci.v1.ExtendVoteRequest.next_validators_hash": - panic(fmt.Errorf("field next_validators_hash of message cometbft.abci.v1.ExtendVoteRequest is not mutable")) - case "cometbft.abci.v1.ExtendVoteRequest.proposer_address": - panic(fmt.Errorf("field proposer_address of message cometbft.abci.v1.ExtendVoteRequest is not mutable")) + case "cometbft.abci.v2.ExtendVoteRequest.hash": + panic(fmt.Errorf("field hash of message cometbft.abci.v2.ExtendVoteRequest is not mutable")) + case "cometbft.abci.v2.ExtendVoteRequest.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.ExtendVoteRequest is not mutable")) + case "cometbft.abci.v2.ExtendVoteRequest.next_validators_hash": + panic(fmt.Errorf("field next_validators_hash of message cometbft.abci.v2.ExtendVoteRequest is not mutable")) + case "cometbft.abci.v2.ExtendVoteRequest.proposer_address": + panic(fmt.Errorf("field proposer_address of message cometbft.abci.v2.ExtendVoteRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteRequest does not contain field %s", fd.FullName())) } } @@ -10024,31 +10026,31 @@ func (x *fastReflection_ExtendVoteRequest) Mutable(fd protoreflect.FieldDescript // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ExtendVoteRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteRequest.hash": + case "cometbft.abci.v2.ExtendVoteRequest.hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ExtendVoteRequest.height": + case "cometbft.abci.v2.ExtendVoteRequest.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.ExtendVoteRequest.time": + case "cometbft.abci.v2.ExtendVoteRequest.time": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.ExtendVoteRequest.txs": + case "cometbft.abci.v2.ExtendVoteRequest.txs": list := [][]byte{} return protoreflect.ValueOfList(&_ExtendVoteRequest_4_list{list: &list}) - case "cometbft.abci.v1.ExtendVoteRequest.proposed_last_commit": + case "cometbft.abci.v2.ExtendVoteRequest.proposed_last_commit": m := new(CommitInfo) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.ExtendVoteRequest.misbehavior": + case "cometbft.abci.v2.ExtendVoteRequest.misbehavior": list := []*Misbehavior{} return protoreflect.ValueOfList(&_ExtendVoteRequest_6_list{list: &list}) - case "cometbft.abci.v1.ExtendVoteRequest.next_validators_hash": + case "cometbft.abci.v2.ExtendVoteRequest.next_validators_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ExtendVoteRequest.proposer_address": + case "cometbft.abci.v2.ExtendVoteRequest.proposer_address": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteRequest does not contain field %s", fd.FullName())) } } @@ -10058,7 +10060,7 @@ func (x *fastReflection_ExtendVoteRequest) NewField(fd protoreflect.FieldDescrip func (x *fastReflection_ExtendVoteRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ExtendVoteRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ExtendVoteRequest", d.FullName())) } panic("unreachable") } @@ -10600,20 +10602,22 @@ func (x *fastReflection_ExtendVoteRequest) ProtoMethods() *protoiface.Methods { } var ( - md_VerifyVoteExtensionRequest protoreflect.MessageDescriptor - fd_VerifyVoteExtensionRequest_hash protoreflect.FieldDescriptor - fd_VerifyVoteExtensionRequest_validator_address protoreflect.FieldDescriptor - fd_VerifyVoteExtensionRequest_height protoreflect.FieldDescriptor - fd_VerifyVoteExtensionRequest_vote_extension protoreflect.FieldDescriptor + md_VerifyVoteExtensionRequest protoreflect.MessageDescriptor + fd_VerifyVoteExtensionRequest_hash protoreflect.FieldDescriptor + fd_VerifyVoteExtensionRequest_validator_address protoreflect.FieldDescriptor + fd_VerifyVoteExtensionRequest_height protoreflect.FieldDescriptor + fd_VerifyVoteExtensionRequest_vote_extension protoreflect.FieldDescriptor + fd_VerifyVoteExtensionRequest_non_rp_vote_extension protoreflect.FieldDescriptor ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_VerifyVoteExtensionRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("VerifyVoteExtensionRequest") + file_cometbft_abci_v2_types_proto_init() + md_VerifyVoteExtensionRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("VerifyVoteExtensionRequest") fd_VerifyVoteExtensionRequest_hash = md_VerifyVoteExtensionRequest.Fields().ByName("hash") fd_VerifyVoteExtensionRequest_validator_address = md_VerifyVoteExtensionRequest.Fields().ByName("validator_address") fd_VerifyVoteExtensionRequest_height = md_VerifyVoteExtensionRequest.Fields().ByName("height") fd_VerifyVoteExtensionRequest_vote_extension = md_VerifyVoteExtensionRequest.Fields().ByName("vote_extension") + fd_VerifyVoteExtensionRequest_non_rp_vote_extension = md_VerifyVoteExtensionRequest.Fields().ByName("non_rp_vote_extension") } var _ protoreflect.Message = (*fastReflection_VerifyVoteExtensionRequest)(nil) @@ -10625,7 +10629,7 @@ func (x *VerifyVoteExtensionRequest) ProtoReflect() protoreflect.Message { } func (x *VerifyVoteExtensionRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[15] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -10705,6 +10709,12 @@ func (x *fastReflection_VerifyVoteExtensionRequest) Range(f func(protoreflect.Fi return } } + if len(x.NonRpVoteExtension) != 0 { + value := protoreflect.ValueOfBytes(x.NonRpVoteExtension) + if !f(fd_VerifyVoteExtensionRequest_non_rp_vote_extension, value) { + return + } + } } // Has reports whether a field is populated. @@ -10720,19 +10730,21 @@ func (x *fastReflection_VerifyVoteExtensionRequest) Range(f func(protoreflect.Fi // a repeated field is populated if it is non-empty. func (x *fastReflection_VerifyVoteExtensionRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionRequest.hash": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.hash": return len(x.Hash) != 0 - case "cometbft.abci.v1.VerifyVoteExtensionRequest.validator_address": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.validator_address": return len(x.ValidatorAddress) != 0 - case "cometbft.abci.v1.VerifyVoteExtensionRequest.height": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.height": return x.Height != int64(0) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.vote_extension": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.vote_extension": return len(x.VoteExtension) != 0 + case "cometbft.abci.v2.VerifyVoteExtensionRequest.non_rp_vote_extension": + return len(x.NonRpVoteExtension) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) } } @@ -10744,19 +10756,21 @@ func (x *fastReflection_VerifyVoteExtensionRequest) Has(fd protoreflect.FieldDes // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VerifyVoteExtensionRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionRequest.hash": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.hash": x.Hash = nil - case "cometbft.abci.v1.VerifyVoteExtensionRequest.validator_address": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.validator_address": x.ValidatorAddress = nil - case "cometbft.abci.v1.VerifyVoteExtensionRequest.height": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.height": x.Height = int64(0) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.vote_extension": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.vote_extension": x.VoteExtension = nil + case "cometbft.abci.v2.VerifyVoteExtensionRequest.non_rp_vote_extension": + x.NonRpVoteExtension = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) } } @@ -10768,23 +10782,26 @@ func (x *fastReflection_VerifyVoteExtensionRequest) Clear(fd protoreflect.FieldD // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_VerifyVoteExtensionRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionRequest.hash": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.hash": value := x.Hash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.validator_address": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.validator_address": value := x.ValidatorAddress return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.height": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.vote_extension": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.vote_extension": value := x.VoteExtension return protoreflect.ValueOfBytes(value) + case "cometbft.abci.v2.VerifyVoteExtensionRequest.non_rp_vote_extension": + value := x.NonRpVoteExtension + return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionRequest does not contain field %s", descriptor.FullName())) } } @@ -10800,19 +10817,21 @@ func (x *fastReflection_VerifyVoteExtensionRequest) Get(descriptor protoreflect. // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VerifyVoteExtensionRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionRequest.hash": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.hash": x.Hash = value.Bytes() - case "cometbft.abci.v1.VerifyVoteExtensionRequest.validator_address": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.validator_address": x.ValidatorAddress = value.Bytes() - case "cometbft.abci.v1.VerifyVoteExtensionRequest.height": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.height": x.Height = value.Int() - case "cometbft.abci.v1.VerifyVoteExtensionRequest.vote_extension": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.vote_extension": x.VoteExtension = value.Bytes() + case "cometbft.abci.v2.VerifyVoteExtensionRequest.non_rp_vote_extension": + x.NonRpVoteExtension = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) } } @@ -10828,19 +10847,21 @@ func (x *fastReflection_VerifyVoteExtensionRequest) Set(fd protoreflect.FieldDes // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VerifyVoteExtensionRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionRequest.hash": - panic(fmt.Errorf("field hash of message cometbft.abci.v1.VerifyVoteExtensionRequest is not mutable")) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.validator_address": - panic(fmt.Errorf("field validator_address of message cometbft.abci.v1.VerifyVoteExtensionRequest is not mutable")) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.VerifyVoteExtensionRequest is not mutable")) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.vote_extension": - panic(fmt.Errorf("field vote_extension of message cometbft.abci.v1.VerifyVoteExtensionRequest is not mutable")) + case "cometbft.abci.v2.VerifyVoteExtensionRequest.hash": + panic(fmt.Errorf("field hash of message cometbft.abci.v2.VerifyVoteExtensionRequest is not mutable")) + case "cometbft.abci.v2.VerifyVoteExtensionRequest.validator_address": + panic(fmt.Errorf("field validator_address of message cometbft.abci.v2.VerifyVoteExtensionRequest is not mutable")) + case "cometbft.abci.v2.VerifyVoteExtensionRequest.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.VerifyVoteExtensionRequest is not mutable")) + case "cometbft.abci.v2.VerifyVoteExtensionRequest.vote_extension": + panic(fmt.Errorf("field vote_extension of message cometbft.abci.v2.VerifyVoteExtensionRequest is not mutable")) + case "cometbft.abci.v2.VerifyVoteExtensionRequest.non_rp_vote_extension": + panic(fmt.Errorf("field non_rp_vote_extension of message cometbft.abci.v2.VerifyVoteExtensionRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) } } @@ -10849,19 +10870,21 @@ func (x *fastReflection_VerifyVoteExtensionRequest) Mutable(fd protoreflect.Fiel // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_VerifyVoteExtensionRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionRequest.hash": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.validator_address": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.validator_address": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.height": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.VerifyVoteExtensionRequest.vote_extension": + case "cometbft.abci.v2.VerifyVoteExtensionRequest.vote_extension": + return protoreflect.ValueOfBytes(nil) + case "cometbft.abci.v2.VerifyVoteExtensionRequest.non_rp_vote_extension": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionRequest does not contain field %s", fd.FullName())) } } @@ -10871,7 +10894,7 @@ func (x *fastReflection_VerifyVoteExtensionRequest) NewField(fd protoreflect.Fie func (x *fastReflection_VerifyVoteExtensionRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.VerifyVoteExtensionRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.VerifyVoteExtensionRequest", d.FullName())) } panic("unreachable") } @@ -10941,6 +10964,10 @@ func (x *fastReflection_VerifyVoteExtensionRequest) ProtoMethods() *protoiface.M if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + l = len(x.NonRpVoteExtension) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -10970,6 +10997,13 @@ func (x *fastReflection_VerifyVoteExtensionRequest) ProtoMethods() *protoiface.M i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.NonRpVoteExtension) > 0 { + i -= len(x.NonRpVoteExtension) + copy(dAtA[i:], x.NonRpVoteExtension) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.NonRpVoteExtension))) + i-- + dAtA[i] = 0x2a + } if len(x.VoteExtension) > 0 { i -= len(x.VoteExtension) copy(dAtA[i:], x.VoteExtension) @@ -11166,6 +11200,40 @@ func (x *fastReflection_VerifyVoteExtensionRequest) ProtoMethods() *protoiface.M x.VoteExtension = []byte{} } iNdEx = postIndex + case 5: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NonRpVoteExtension", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.NonRpVoteExtension = append(x.NonRpVoteExtension[:0], dAtA[iNdEx:postIndex]...) + if x.NonRpVoteExtension == nil { + x.NonRpVoteExtension = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -11312,8 +11380,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_FinalizeBlockRequest = File_cometbft_abci_v1_types_proto.Messages().ByName("FinalizeBlockRequest") + file_cometbft_abci_v2_types_proto_init() + md_FinalizeBlockRequest = File_cometbft_abci_v2_types_proto.Messages().ByName("FinalizeBlockRequest") fd_FinalizeBlockRequest_txs = md_FinalizeBlockRequest.Fields().ByName("txs") fd_FinalizeBlockRequest_decided_last_commit = md_FinalizeBlockRequest.Fields().ByName("decided_last_commit") fd_FinalizeBlockRequest_misbehavior = md_FinalizeBlockRequest.Fields().ByName("misbehavior") @@ -11334,7 +11402,7 @@ func (x *FinalizeBlockRequest) ProtoReflect() protoreflect.Message { } func (x *FinalizeBlockRequest) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[16] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -11459,29 +11527,29 @@ func (x *fastReflection_FinalizeBlockRequest) Range(f func(protoreflect.FieldDes // a repeated field is populated if it is non-empty. func (x *fastReflection_FinalizeBlockRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockRequest.txs": + case "cometbft.abci.v2.FinalizeBlockRequest.txs": return len(x.Txs) != 0 - case "cometbft.abci.v1.FinalizeBlockRequest.decided_last_commit": + case "cometbft.abci.v2.FinalizeBlockRequest.decided_last_commit": return x.DecidedLastCommit != nil - case "cometbft.abci.v1.FinalizeBlockRequest.misbehavior": + case "cometbft.abci.v2.FinalizeBlockRequest.misbehavior": return len(x.Misbehavior) != 0 - case "cometbft.abci.v1.FinalizeBlockRequest.hash": + case "cometbft.abci.v2.FinalizeBlockRequest.hash": return len(x.Hash) != 0 - case "cometbft.abci.v1.FinalizeBlockRequest.height": + case "cometbft.abci.v2.FinalizeBlockRequest.height": return x.Height != int64(0) - case "cometbft.abci.v1.FinalizeBlockRequest.time": + case "cometbft.abci.v2.FinalizeBlockRequest.time": return x.Time != nil - case "cometbft.abci.v1.FinalizeBlockRequest.next_validators_hash": + case "cometbft.abci.v2.FinalizeBlockRequest.next_validators_hash": return len(x.NextValidatorsHash) != 0 - case "cometbft.abci.v1.FinalizeBlockRequest.proposer_address": + case "cometbft.abci.v2.FinalizeBlockRequest.proposer_address": return len(x.ProposerAddress) != 0 - case "cometbft.abci.v1.FinalizeBlockRequest.syncing_to_height": + case "cometbft.abci.v2.FinalizeBlockRequest.syncing_to_height": return x.SyncingToHeight != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockRequest does not contain field %s", fd.FullName())) } } @@ -11493,29 +11561,29 @@ func (x *fastReflection_FinalizeBlockRequest) Has(fd protoreflect.FieldDescripto // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FinalizeBlockRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockRequest.txs": + case "cometbft.abci.v2.FinalizeBlockRequest.txs": x.Txs = nil - case "cometbft.abci.v1.FinalizeBlockRequest.decided_last_commit": + case "cometbft.abci.v2.FinalizeBlockRequest.decided_last_commit": x.DecidedLastCommit = nil - case "cometbft.abci.v1.FinalizeBlockRequest.misbehavior": + case "cometbft.abci.v2.FinalizeBlockRequest.misbehavior": x.Misbehavior = nil - case "cometbft.abci.v1.FinalizeBlockRequest.hash": + case "cometbft.abci.v2.FinalizeBlockRequest.hash": x.Hash = nil - case "cometbft.abci.v1.FinalizeBlockRequest.height": + case "cometbft.abci.v2.FinalizeBlockRequest.height": x.Height = int64(0) - case "cometbft.abci.v1.FinalizeBlockRequest.time": + case "cometbft.abci.v2.FinalizeBlockRequest.time": x.Time = nil - case "cometbft.abci.v1.FinalizeBlockRequest.next_validators_hash": + case "cometbft.abci.v2.FinalizeBlockRequest.next_validators_hash": x.NextValidatorsHash = nil - case "cometbft.abci.v1.FinalizeBlockRequest.proposer_address": + case "cometbft.abci.v2.FinalizeBlockRequest.proposer_address": x.ProposerAddress = nil - case "cometbft.abci.v1.FinalizeBlockRequest.syncing_to_height": + case "cometbft.abci.v2.FinalizeBlockRequest.syncing_to_height": x.SyncingToHeight = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockRequest does not contain field %s", fd.FullName())) } } @@ -11527,44 +11595,44 @@ func (x *fastReflection_FinalizeBlockRequest) Clear(fd protoreflect.FieldDescrip // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_FinalizeBlockRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.FinalizeBlockRequest.txs": + case "cometbft.abci.v2.FinalizeBlockRequest.txs": if len(x.Txs) == 0 { return protoreflect.ValueOfList(&_FinalizeBlockRequest_1_list{}) } listValue := &_FinalizeBlockRequest_1_list{list: &x.Txs} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.FinalizeBlockRequest.decided_last_commit": + case "cometbft.abci.v2.FinalizeBlockRequest.decided_last_commit": value := x.DecidedLastCommit return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockRequest.misbehavior": + case "cometbft.abci.v2.FinalizeBlockRequest.misbehavior": if len(x.Misbehavior) == 0 { return protoreflect.ValueOfList(&_FinalizeBlockRequest_3_list{}) } listValue := &_FinalizeBlockRequest_3_list{list: &x.Misbehavior} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.FinalizeBlockRequest.hash": + case "cometbft.abci.v2.FinalizeBlockRequest.hash": value := x.Hash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.FinalizeBlockRequest.height": + case "cometbft.abci.v2.FinalizeBlockRequest.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.FinalizeBlockRequest.time": + case "cometbft.abci.v2.FinalizeBlockRequest.time": value := x.Time return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockRequest.next_validators_hash": + case "cometbft.abci.v2.FinalizeBlockRequest.next_validators_hash": value := x.NextValidatorsHash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.FinalizeBlockRequest.proposer_address": + case "cometbft.abci.v2.FinalizeBlockRequest.proposer_address": value := x.ProposerAddress return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.FinalizeBlockRequest.syncing_to_height": + case "cometbft.abci.v2.FinalizeBlockRequest.syncing_to_height": value := x.SyncingToHeight return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockRequest does not contain field %s", descriptor.FullName())) } } @@ -11580,33 +11648,33 @@ func (x *fastReflection_FinalizeBlockRequest) Get(descriptor protoreflect.FieldD // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FinalizeBlockRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockRequest.txs": + case "cometbft.abci.v2.FinalizeBlockRequest.txs": lv := value.List() clv := lv.(*_FinalizeBlockRequest_1_list) x.Txs = *clv.list - case "cometbft.abci.v1.FinalizeBlockRequest.decided_last_commit": + case "cometbft.abci.v2.FinalizeBlockRequest.decided_last_commit": x.DecidedLastCommit = value.Message().Interface().(*CommitInfo) - case "cometbft.abci.v1.FinalizeBlockRequest.misbehavior": + case "cometbft.abci.v2.FinalizeBlockRequest.misbehavior": lv := value.List() clv := lv.(*_FinalizeBlockRequest_3_list) x.Misbehavior = *clv.list - case "cometbft.abci.v1.FinalizeBlockRequest.hash": + case "cometbft.abci.v2.FinalizeBlockRequest.hash": x.Hash = value.Bytes() - case "cometbft.abci.v1.FinalizeBlockRequest.height": + case "cometbft.abci.v2.FinalizeBlockRequest.height": x.Height = value.Int() - case "cometbft.abci.v1.FinalizeBlockRequest.time": + case "cometbft.abci.v2.FinalizeBlockRequest.time": x.Time = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.abci.v1.FinalizeBlockRequest.next_validators_hash": + case "cometbft.abci.v2.FinalizeBlockRequest.next_validators_hash": x.NextValidatorsHash = value.Bytes() - case "cometbft.abci.v1.FinalizeBlockRequest.proposer_address": + case "cometbft.abci.v2.FinalizeBlockRequest.proposer_address": x.ProposerAddress = value.Bytes() - case "cometbft.abci.v1.FinalizeBlockRequest.syncing_to_height": + case "cometbft.abci.v2.FinalizeBlockRequest.syncing_to_height": x.SyncingToHeight = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockRequest does not contain field %s", fd.FullName())) } } @@ -11622,43 +11690,43 @@ func (x *fastReflection_FinalizeBlockRequest) Set(fd protoreflect.FieldDescripto // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FinalizeBlockRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockRequest.txs": + case "cometbft.abci.v2.FinalizeBlockRequest.txs": if x.Txs == nil { x.Txs = [][]byte{} } value := &_FinalizeBlockRequest_1_list{list: &x.Txs} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.FinalizeBlockRequest.decided_last_commit": + case "cometbft.abci.v2.FinalizeBlockRequest.decided_last_commit": if x.DecidedLastCommit == nil { x.DecidedLastCommit = new(CommitInfo) } return protoreflect.ValueOfMessage(x.DecidedLastCommit.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockRequest.misbehavior": + case "cometbft.abci.v2.FinalizeBlockRequest.misbehavior": if x.Misbehavior == nil { x.Misbehavior = []*Misbehavior{} } value := &_FinalizeBlockRequest_3_list{list: &x.Misbehavior} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.FinalizeBlockRequest.time": + case "cometbft.abci.v2.FinalizeBlockRequest.time": if x.Time == nil { x.Time = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Time.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockRequest.hash": - panic(fmt.Errorf("field hash of message cometbft.abci.v1.FinalizeBlockRequest is not mutable")) - case "cometbft.abci.v1.FinalizeBlockRequest.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.FinalizeBlockRequest is not mutable")) - case "cometbft.abci.v1.FinalizeBlockRequest.next_validators_hash": - panic(fmt.Errorf("field next_validators_hash of message cometbft.abci.v1.FinalizeBlockRequest is not mutable")) - case "cometbft.abci.v1.FinalizeBlockRequest.proposer_address": - panic(fmt.Errorf("field proposer_address of message cometbft.abci.v1.FinalizeBlockRequest is not mutable")) - case "cometbft.abci.v1.FinalizeBlockRequest.syncing_to_height": - panic(fmt.Errorf("field syncing_to_height of message cometbft.abci.v1.FinalizeBlockRequest is not mutable")) + case "cometbft.abci.v2.FinalizeBlockRequest.hash": + panic(fmt.Errorf("field hash of message cometbft.abci.v2.FinalizeBlockRequest is not mutable")) + case "cometbft.abci.v2.FinalizeBlockRequest.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.FinalizeBlockRequest is not mutable")) + case "cometbft.abci.v2.FinalizeBlockRequest.next_validators_hash": + panic(fmt.Errorf("field next_validators_hash of message cometbft.abci.v2.FinalizeBlockRequest is not mutable")) + case "cometbft.abci.v2.FinalizeBlockRequest.proposer_address": + panic(fmt.Errorf("field proposer_address of message cometbft.abci.v2.FinalizeBlockRequest is not mutable")) + case "cometbft.abci.v2.FinalizeBlockRequest.syncing_to_height": + panic(fmt.Errorf("field syncing_to_height of message cometbft.abci.v2.FinalizeBlockRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockRequest does not contain field %s", fd.FullName())) } } @@ -11667,33 +11735,33 @@ func (x *fastReflection_FinalizeBlockRequest) Mutable(fd protoreflect.FieldDescr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_FinalizeBlockRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockRequest.txs": + case "cometbft.abci.v2.FinalizeBlockRequest.txs": list := [][]byte{} return protoreflect.ValueOfList(&_FinalizeBlockRequest_1_list{list: &list}) - case "cometbft.abci.v1.FinalizeBlockRequest.decided_last_commit": + case "cometbft.abci.v2.FinalizeBlockRequest.decided_last_commit": m := new(CommitInfo) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockRequest.misbehavior": + case "cometbft.abci.v2.FinalizeBlockRequest.misbehavior": list := []*Misbehavior{} return protoreflect.ValueOfList(&_FinalizeBlockRequest_3_list{list: &list}) - case "cometbft.abci.v1.FinalizeBlockRequest.hash": + case "cometbft.abci.v2.FinalizeBlockRequest.hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.FinalizeBlockRequest.height": + case "cometbft.abci.v2.FinalizeBlockRequest.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.FinalizeBlockRequest.time": + case "cometbft.abci.v2.FinalizeBlockRequest.time": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockRequest.next_validators_hash": + case "cometbft.abci.v2.FinalizeBlockRequest.next_validators_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.FinalizeBlockRequest.proposer_address": + case "cometbft.abci.v2.FinalizeBlockRequest.proposer_address": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.FinalizeBlockRequest.syncing_to_height": + case "cometbft.abci.v2.FinalizeBlockRequest.syncing_to_height": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockRequest")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockRequest does not contain field %s", fd.FullName())) } } @@ -11703,7 +11771,7 @@ func (x *fastReflection_FinalizeBlockRequest) NewField(fd protoreflect.FieldDesc func (x *fastReflection_FinalizeBlockRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.FinalizeBlockRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.FinalizeBlockRequest", d.FullName())) } panic("unreachable") } @@ -12293,8 +12361,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_Response = File_cometbft_abci_v1_types_proto.Messages().ByName("Response") + file_cometbft_abci_v2_types_proto_init() + md_Response = File_cometbft_abci_v2_types_proto.Messages().ByName("Response") fd_Response_exception = md_Response.Fields().ByName("exception") fd_Response_echo = md_Response.Fields().ByName("echo") fd_Response_flush = md_Response.Fields().ByName("flush") @@ -12323,7 +12391,7 @@ func (x *Response) ProtoReflect() protoreflect.Message { } func (x *Response) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[17] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -12500,7 +12568,7 @@ func (x *fastReflection_Response) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.Response.exception": + case "cometbft.abci.v2.Response.exception": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_Exception); ok { @@ -12508,7 +12576,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.echo": + case "cometbft.abci.v2.Response.echo": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_Echo); ok { @@ -12516,7 +12584,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.flush": + case "cometbft.abci.v2.Response.flush": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_Flush); ok { @@ -12524,7 +12592,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.info": + case "cometbft.abci.v2.Response.info": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_Info); ok { @@ -12532,7 +12600,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.init_chain": + case "cometbft.abci.v2.Response.init_chain": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_InitChain); ok { @@ -12540,7 +12608,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.query": + case "cometbft.abci.v2.Response.query": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_Query); ok { @@ -12548,7 +12616,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.check_tx": + case "cometbft.abci.v2.Response.check_tx": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_CheckTx); ok { @@ -12556,7 +12624,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.commit": + case "cometbft.abci.v2.Response.commit": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_Commit); ok { @@ -12564,7 +12632,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.list_snapshots": + case "cometbft.abci.v2.Response.list_snapshots": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_ListSnapshots); ok { @@ -12572,7 +12640,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.offer_snapshot": + case "cometbft.abci.v2.Response.offer_snapshot": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_OfferSnapshot); ok { @@ -12580,7 +12648,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.load_snapshot_chunk": + case "cometbft.abci.v2.Response.load_snapshot_chunk": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_LoadSnapshotChunk); ok { @@ -12588,7 +12656,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.apply_snapshot_chunk": + case "cometbft.abci.v2.Response.apply_snapshot_chunk": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_ApplySnapshotChunk); ok { @@ -12596,7 +12664,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.prepare_proposal": + case "cometbft.abci.v2.Response.prepare_proposal": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_PrepareProposal); ok { @@ -12604,7 +12672,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.process_proposal": + case "cometbft.abci.v2.Response.process_proposal": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_ProcessProposal); ok { @@ -12612,7 +12680,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.extend_vote": + case "cometbft.abci.v2.Response.extend_vote": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_ExtendVote); ok { @@ -12620,7 +12688,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.verify_vote_extension": + case "cometbft.abci.v2.Response.verify_vote_extension": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_VerifyVoteExtension); ok { @@ -12628,7 +12696,7 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.abci.v1.Response.finalize_block": + case "cometbft.abci.v2.Response.finalize_block": if x.Value == nil { return false } else if _, ok := x.Value.(*Response_FinalizeBlock); ok { @@ -12638,9 +12706,9 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { } default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Response")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Response")) } - panic(fmt.Errorf("message cometbft.abci.v1.Response does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Response does not contain field %s", fd.FullName())) } } @@ -12652,45 +12720,45 @@ func (x *fastReflection_Response) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Response) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.Response.exception": + case "cometbft.abci.v2.Response.exception": x.Value = nil - case "cometbft.abci.v1.Response.echo": + case "cometbft.abci.v2.Response.echo": x.Value = nil - case "cometbft.abci.v1.Response.flush": + case "cometbft.abci.v2.Response.flush": x.Value = nil - case "cometbft.abci.v1.Response.info": + case "cometbft.abci.v2.Response.info": x.Value = nil - case "cometbft.abci.v1.Response.init_chain": + case "cometbft.abci.v2.Response.init_chain": x.Value = nil - case "cometbft.abci.v1.Response.query": + case "cometbft.abci.v2.Response.query": x.Value = nil - case "cometbft.abci.v1.Response.check_tx": + case "cometbft.abci.v2.Response.check_tx": x.Value = nil - case "cometbft.abci.v1.Response.commit": + case "cometbft.abci.v2.Response.commit": x.Value = nil - case "cometbft.abci.v1.Response.list_snapshots": + case "cometbft.abci.v2.Response.list_snapshots": x.Value = nil - case "cometbft.abci.v1.Response.offer_snapshot": + case "cometbft.abci.v2.Response.offer_snapshot": x.Value = nil - case "cometbft.abci.v1.Response.load_snapshot_chunk": + case "cometbft.abci.v2.Response.load_snapshot_chunk": x.Value = nil - case "cometbft.abci.v1.Response.apply_snapshot_chunk": + case "cometbft.abci.v2.Response.apply_snapshot_chunk": x.Value = nil - case "cometbft.abci.v1.Response.prepare_proposal": + case "cometbft.abci.v2.Response.prepare_proposal": x.Value = nil - case "cometbft.abci.v1.Response.process_proposal": + case "cometbft.abci.v2.Response.process_proposal": x.Value = nil - case "cometbft.abci.v1.Response.extend_vote": + case "cometbft.abci.v2.Response.extend_vote": x.Value = nil - case "cometbft.abci.v1.Response.verify_vote_extension": + case "cometbft.abci.v2.Response.verify_vote_extension": x.Value = nil - case "cometbft.abci.v1.Response.finalize_block": + case "cometbft.abci.v2.Response.finalize_block": x.Value = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Response")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Response")) } - panic(fmt.Errorf("message cometbft.abci.v1.Response does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Response does not contain field %s", fd.FullName())) } } @@ -12702,7 +12770,7 @@ func (x *fastReflection_Response) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.Response.exception": + case "cometbft.abci.v2.Response.exception": if x.Value == nil { return protoreflect.ValueOfMessage((*ExceptionResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_Exception); ok { @@ -12710,7 +12778,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*ExceptionResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.echo": + case "cometbft.abci.v2.Response.echo": if x.Value == nil { return protoreflect.ValueOfMessage((*EchoResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_Echo); ok { @@ -12718,7 +12786,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*EchoResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.flush": + case "cometbft.abci.v2.Response.flush": if x.Value == nil { return protoreflect.ValueOfMessage((*FlushResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_Flush); ok { @@ -12726,7 +12794,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*FlushResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.info": + case "cometbft.abci.v2.Response.info": if x.Value == nil { return protoreflect.ValueOfMessage((*InfoResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_Info); ok { @@ -12734,7 +12802,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*InfoResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.init_chain": + case "cometbft.abci.v2.Response.init_chain": if x.Value == nil { return protoreflect.ValueOfMessage((*InitChainResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_InitChain); ok { @@ -12742,7 +12810,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*InitChainResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.query": + case "cometbft.abci.v2.Response.query": if x.Value == nil { return protoreflect.ValueOfMessage((*QueryResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_Query); ok { @@ -12750,7 +12818,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*QueryResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.check_tx": + case "cometbft.abci.v2.Response.check_tx": if x.Value == nil { return protoreflect.ValueOfMessage((*CheckTxResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_CheckTx); ok { @@ -12758,7 +12826,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*CheckTxResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.commit": + case "cometbft.abci.v2.Response.commit": if x.Value == nil { return protoreflect.ValueOfMessage((*CommitResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_Commit); ok { @@ -12766,7 +12834,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*CommitResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.list_snapshots": + case "cometbft.abci.v2.Response.list_snapshots": if x.Value == nil { return protoreflect.ValueOfMessage((*ListSnapshotsResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_ListSnapshots); ok { @@ -12774,7 +12842,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*ListSnapshotsResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.offer_snapshot": + case "cometbft.abci.v2.Response.offer_snapshot": if x.Value == nil { return protoreflect.ValueOfMessage((*OfferSnapshotResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_OfferSnapshot); ok { @@ -12782,7 +12850,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*OfferSnapshotResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.load_snapshot_chunk": + case "cometbft.abci.v2.Response.load_snapshot_chunk": if x.Value == nil { return protoreflect.ValueOfMessage((*LoadSnapshotChunkResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_LoadSnapshotChunk); ok { @@ -12790,7 +12858,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*LoadSnapshotChunkResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.apply_snapshot_chunk": + case "cometbft.abci.v2.Response.apply_snapshot_chunk": if x.Value == nil { return protoreflect.ValueOfMessage((*ApplySnapshotChunkResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_ApplySnapshotChunk); ok { @@ -12798,7 +12866,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*ApplySnapshotChunkResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.prepare_proposal": + case "cometbft.abci.v2.Response.prepare_proposal": if x.Value == nil { return protoreflect.ValueOfMessage((*PrepareProposalResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_PrepareProposal); ok { @@ -12806,7 +12874,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*PrepareProposalResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.process_proposal": + case "cometbft.abci.v2.Response.process_proposal": if x.Value == nil { return protoreflect.ValueOfMessage((*ProcessProposalResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_ProcessProposal); ok { @@ -12814,7 +12882,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*ProcessProposalResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.extend_vote": + case "cometbft.abci.v2.Response.extend_vote": if x.Value == nil { return protoreflect.ValueOfMessage((*ExtendVoteResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_ExtendVote); ok { @@ -12822,7 +12890,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*ExtendVoteResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.verify_vote_extension": + case "cometbft.abci.v2.Response.verify_vote_extension": if x.Value == nil { return protoreflect.ValueOfMessage((*VerifyVoteExtensionResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_VerifyVoteExtension); ok { @@ -12830,7 +12898,7 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*VerifyVoteExtensionResponse)(nil).ProtoReflect()) } - case "cometbft.abci.v1.Response.finalize_block": + case "cometbft.abci.v2.Response.finalize_block": if x.Value == nil { return protoreflect.ValueOfMessage((*FinalizeBlockResponse)(nil).ProtoReflect()) } else if v, ok := x.Value.(*Response_FinalizeBlock); ok { @@ -12840,9 +12908,9 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p } default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Response")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Response")) } - panic(fmt.Errorf("message cometbft.abci.v1.Response does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Response does not contain field %s", descriptor.FullName())) } } @@ -12858,62 +12926,62 @@ func (x *fastReflection_Response) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Response) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.Response.exception": + case "cometbft.abci.v2.Response.exception": cv := value.Message().Interface().(*ExceptionResponse) x.Value = &Response_Exception{Exception: cv} - case "cometbft.abci.v1.Response.echo": + case "cometbft.abci.v2.Response.echo": cv := value.Message().Interface().(*EchoResponse) x.Value = &Response_Echo{Echo: cv} - case "cometbft.abci.v1.Response.flush": + case "cometbft.abci.v2.Response.flush": cv := value.Message().Interface().(*FlushResponse) x.Value = &Response_Flush{Flush: cv} - case "cometbft.abci.v1.Response.info": + case "cometbft.abci.v2.Response.info": cv := value.Message().Interface().(*InfoResponse) x.Value = &Response_Info{Info: cv} - case "cometbft.abci.v1.Response.init_chain": + case "cometbft.abci.v2.Response.init_chain": cv := value.Message().Interface().(*InitChainResponse) x.Value = &Response_InitChain{InitChain: cv} - case "cometbft.abci.v1.Response.query": + case "cometbft.abci.v2.Response.query": cv := value.Message().Interface().(*QueryResponse) x.Value = &Response_Query{Query: cv} - case "cometbft.abci.v1.Response.check_tx": + case "cometbft.abci.v2.Response.check_tx": cv := value.Message().Interface().(*CheckTxResponse) x.Value = &Response_CheckTx{CheckTx: cv} - case "cometbft.abci.v1.Response.commit": + case "cometbft.abci.v2.Response.commit": cv := value.Message().Interface().(*CommitResponse) x.Value = &Response_Commit{Commit: cv} - case "cometbft.abci.v1.Response.list_snapshots": + case "cometbft.abci.v2.Response.list_snapshots": cv := value.Message().Interface().(*ListSnapshotsResponse) x.Value = &Response_ListSnapshots{ListSnapshots: cv} - case "cometbft.abci.v1.Response.offer_snapshot": + case "cometbft.abci.v2.Response.offer_snapshot": cv := value.Message().Interface().(*OfferSnapshotResponse) x.Value = &Response_OfferSnapshot{OfferSnapshot: cv} - case "cometbft.abci.v1.Response.load_snapshot_chunk": + case "cometbft.abci.v2.Response.load_snapshot_chunk": cv := value.Message().Interface().(*LoadSnapshotChunkResponse) x.Value = &Response_LoadSnapshotChunk{LoadSnapshotChunk: cv} - case "cometbft.abci.v1.Response.apply_snapshot_chunk": + case "cometbft.abci.v2.Response.apply_snapshot_chunk": cv := value.Message().Interface().(*ApplySnapshotChunkResponse) x.Value = &Response_ApplySnapshotChunk{ApplySnapshotChunk: cv} - case "cometbft.abci.v1.Response.prepare_proposal": + case "cometbft.abci.v2.Response.prepare_proposal": cv := value.Message().Interface().(*PrepareProposalResponse) x.Value = &Response_PrepareProposal{PrepareProposal: cv} - case "cometbft.abci.v1.Response.process_proposal": + case "cometbft.abci.v2.Response.process_proposal": cv := value.Message().Interface().(*ProcessProposalResponse) x.Value = &Response_ProcessProposal{ProcessProposal: cv} - case "cometbft.abci.v1.Response.extend_vote": + case "cometbft.abci.v2.Response.extend_vote": cv := value.Message().Interface().(*ExtendVoteResponse) x.Value = &Response_ExtendVote{ExtendVote: cv} - case "cometbft.abci.v1.Response.verify_vote_extension": + case "cometbft.abci.v2.Response.verify_vote_extension": cv := value.Message().Interface().(*VerifyVoteExtensionResponse) x.Value = &Response_VerifyVoteExtension{VerifyVoteExtension: cv} - case "cometbft.abci.v1.Response.finalize_block": + case "cometbft.abci.v2.Response.finalize_block": cv := value.Message().Interface().(*FinalizeBlockResponse) x.Value = &Response_FinalizeBlock{FinalizeBlock: cv} default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Response")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Response")) } - panic(fmt.Errorf("message cometbft.abci.v1.Response does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Response does not contain field %s", fd.FullName())) } } @@ -12929,7 +12997,7 @@ func (x *fastReflection_Response) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Response.exception": + case "cometbft.abci.v2.Response.exception": if x.Value == nil { value := &ExceptionResponse{} oneofValue := &Response_Exception{Exception: value} @@ -12945,7 +13013,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.echo": + case "cometbft.abci.v2.Response.echo": if x.Value == nil { value := &EchoResponse{} oneofValue := &Response_Echo{Echo: value} @@ -12961,7 +13029,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.flush": + case "cometbft.abci.v2.Response.flush": if x.Value == nil { value := &FlushResponse{} oneofValue := &Response_Flush{Flush: value} @@ -12977,7 +13045,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.info": + case "cometbft.abci.v2.Response.info": if x.Value == nil { value := &InfoResponse{} oneofValue := &Response_Info{Info: value} @@ -12993,7 +13061,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.init_chain": + case "cometbft.abci.v2.Response.init_chain": if x.Value == nil { value := &InitChainResponse{} oneofValue := &Response_InitChain{InitChain: value} @@ -13009,7 +13077,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.query": + case "cometbft.abci.v2.Response.query": if x.Value == nil { value := &QueryResponse{} oneofValue := &Response_Query{Query: value} @@ -13025,7 +13093,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.check_tx": + case "cometbft.abci.v2.Response.check_tx": if x.Value == nil { value := &CheckTxResponse{} oneofValue := &Response_CheckTx{CheckTx: value} @@ -13041,7 +13109,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.commit": + case "cometbft.abci.v2.Response.commit": if x.Value == nil { value := &CommitResponse{} oneofValue := &Response_Commit{Commit: value} @@ -13057,7 +13125,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.list_snapshots": + case "cometbft.abci.v2.Response.list_snapshots": if x.Value == nil { value := &ListSnapshotsResponse{} oneofValue := &Response_ListSnapshots{ListSnapshots: value} @@ -13073,7 +13141,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.offer_snapshot": + case "cometbft.abci.v2.Response.offer_snapshot": if x.Value == nil { value := &OfferSnapshotResponse{} oneofValue := &Response_OfferSnapshot{OfferSnapshot: value} @@ -13089,7 +13157,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.load_snapshot_chunk": + case "cometbft.abci.v2.Response.load_snapshot_chunk": if x.Value == nil { value := &LoadSnapshotChunkResponse{} oneofValue := &Response_LoadSnapshotChunk{LoadSnapshotChunk: value} @@ -13105,7 +13173,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.apply_snapshot_chunk": + case "cometbft.abci.v2.Response.apply_snapshot_chunk": if x.Value == nil { value := &ApplySnapshotChunkResponse{} oneofValue := &Response_ApplySnapshotChunk{ApplySnapshotChunk: value} @@ -13121,7 +13189,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.prepare_proposal": + case "cometbft.abci.v2.Response.prepare_proposal": if x.Value == nil { value := &PrepareProposalResponse{} oneofValue := &Response_PrepareProposal{PrepareProposal: value} @@ -13137,7 +13205,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.process_proposal": + case "cometbft.abci.v2.Response.process_proposal": if x.Value == nil { value := &ProcessProposalResponse{} oneofValue := &Response_ProcessProposal{ProcessProposal: value} @@ -13153,7 +13221,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.extend_vote": + case "cometbft.abci.v2.Response.extend_vote": if x.Value == nil { value := &ExtendVoteResponse{} oneofValue := &Response_ExtendVote{ExtendVote: value} @@ -13169,7 +13237,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.verify_vote_extension": + case "cometbft.abci.v2.Response.verify_vote_extension": if x.Value == nil { value := &VerifyVoteExtensionResponse{} oneofValue := &Response_VerifyVoteExtension{VerifyVoteExtension: value} @@ -13185,7 +13253,7 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto x.Value = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.abci.v1.Response.finalize_block": + case "cometbft.abci.v2.Response.finalize_block": if x.Value == nil { value := &FinalizeBlockResponse{} oneofValue := &Response_FinalizeBlock{FinalizeBlock: value} @@ -13203,9 +13271,9 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto } default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Response")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Response")) } - panic(fmt.Errorf("message cometbft.abci.v1.Response does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Response does not contain field %s", fd.FullName())) } } @@ -13214,62 +13282,62 @@ func (x *fastReflection_Response) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Response) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Response.exception": + case "cometbft.abci.v2.Response.exception": value := &ExceptionResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.echo": + case "cometbft.abci.v2.Response.echo": value := &EchoResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.flush": + case "cometbft.abci.v2.Response.flush": value := &FlushResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.info": + case "cometbft.abci.v2.Response.info": value := &InfoResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.init_chain": + case "cometbft.abci.v2.Response.init_chain": value := &InitChainResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.query": + case "cometbft.abci.v2.Response.query": value := &QueryResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.check_tx": + case "cometbft.abci.v2.Response.check_tx": value := &CheckTxResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.commit": + case "cometbft.abci.v2.Response.commit": value := &CommitResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.list_snapshots": + case "cometbft.abci.v2.Response.list_snapshots": value := &ListSnapshotsResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.offer_snapshot": + case "cometbft.abci.v2.Response.offer_snapshot": value := &OfferSnapshotResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.load_snapshot_chunk": + case "cometbft.abci.v2.Response.load_snapshot_chunk": value := &LoadSnapshotChunkResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.apply_snapshot_chunk": + case "cometbft.abci.v2.Response.apply_snapshot_chunk": value := &ApplySnapshotChunkResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.prepare_proposal": + case "cometbft.abci.v2.Response.prepare_proposal": value := &PrepareProposalResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.process_proposal": + case "cometbft.abci.v2.Response.process_proposal": value := &ProcessProposalResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.extend_vote": + case "cometbft.abci.v2.Response.extend_vote": value := &ExtendVoteResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.verify_vote_extension": + case "cometbft.abci.v2.Response.verify_vote_extension": value := &VerifyVoteExtensionResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Response.finalize_block": + case "cometbft.abci.v2.Response.finalize_block": value := &FinalizeBlockResponse{} return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Response")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Response")) } - panic(fmt.Errorf("message cometbft.abci.v1.Response does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Response does not contain field %s", fd.FullName())) } } @@ -13278,7 +13346,7 @@ func (x *fastReflection_Response) NewField(fd protoreflect.FieldDescriptor) prot // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_Response) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "cometbft.abci.v1.Response.value": + case "cometbft.abci.v2.Response.value": if x.Value == nil { return nil } @@ -13319,7 +13387,7 @@ func (x *fastReflection_Response) WhichOneof(d protoreflect.OneofDescriptor) pro return x.Descriptor().Fields().ByName("finalize_block") } default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.Response", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.Response", d.FullName())) } panic("unreachable") } @@ -14427,8 +14495,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ExceptionResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("ExceptionResponse") + file_cometbft_abci_v2_types_proto_init() + md_ExceptionResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("ExceptionResponse") fd_ExceptionResponse_error = md_ExceptionResponse.Fields().ByName("error") } @@ -14441,7 +14509,7 @@ func (x *ExceptionResponse) ProtoReflect() protoreflect.Message { } func (x *ExceptionResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[18] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -14518,13 +14586,13 @@ func (x *fastReflection_ExceptionResponse) Range(f func(protoreflect.FieldDescri // a repeated field is populated if it is non-empty. func (x *fastReflection_ExceptionResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ExceptionResponse.error": + case "cometbft.abci.v2.ExceptionResponse.error": return x.Error != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExceptionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExceptionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExceptionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExceptionResponse does not contain field %s", fd.FullName())) } } @@ -14536,13 +14604,13 @@ func (x *fastReflection_ExceptionResponse) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExceptionResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ExceptionResponse.error": + case "cometbft.abci.v2.ExceptionResponse.error": x.Error = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExceptionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExceptionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExceptionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExceptionResponse does not contain field %s", fd.FullName())) } } @@ -14554,14 +14622,14 @@ func (x *fastReflection_ExceptionResponse) Clear(fd protoreflect.FieldDescriptor // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ExceptionResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ExceptionResponse.error": + case "cometbft.abci.v2.ExceptionResponse.error": value := x.Error return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExceptionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExceptionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExceptionResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExceptionResponse does not contain field %s", descriptor.FullName())) } } @@ -14577,13 +14645,13 @@ func (x *fastReflection_ExceptionResponse) Get(descriptor protoreflect.FieldDesc // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExceptionResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ExceptionResponse.error": + case "cometbft.abci.v2.ExceptionResponse.error": x.Error = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExceptionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExceptionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExceptionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExceptionResponse does not contain field %s", fd.FullName())) } } @@ -14599,13 +14667,13 @@ func (x *fastReflection_ExceptionResponse) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExceptionResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExceptionResponse.error": - panic(fmt.Errorf("field error of message cometbft.abci.v1.ExceptionResponse is not mutable")) + case "cometbft.abci.v2.ExceptionResponse.error": + panic(fmt.Errorf("field error of message cometbft.abci.v2.ExceptionResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExceptionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExceptionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExceptionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExceptionResponse does not contain field %s", fd.FullName())) } } @@ -14614,13 +14682,13 @@ func (x *fastReflection_ExceptionResponse) Mutable(fd protoreflect.FieldDescript // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ExceptionResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExceptionResponse.error": + case "cometbft.abci.v2.ExceptionResponse.error": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExceptionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExceptionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExceptionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExceptionResponse does not contain field %s", fd.FullName())) } } @@ -14630,7 +14698,7 @@ func (x *fastReflection_ExceptionResponse) NewField(fd protoreflect.FieldDescrip func (x *fastReflection_ExceptionResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ExceptionResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ExceptionResponse", d.FullName())) } panic("unreachable") } @@ -14847,8 +14915,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_EchoResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("EchoResponse") + file_cometbft_abci_v2_types_proto_init() + md_EchoResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("EchoResponse") fd_EchoResponse_message = md_EchoResponse.Fields().ByName("message") } @@ -14861,7 +14929,7 @@ func (x *EchoResponse) ProtoReflect() protoreflect.Message { } func (x *EchoResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[19] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -14938,13 +15006,13 @@ func (x *fastReflection_EchoResponse) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_EchoResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.EchoResponse.message": + case "cometbft.abci.v2.EchoResponse.message": return x.Message != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoResponse does not contain field %s", fd.FullName())) } } @@ -14956,13 +15024,13 @@ func (x *fastReflection_EchoResponse) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.EchoResponse.message": + case "cometbft.abci.v2.EchoResponse.message": x.Message = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoResponse does not contain field %s", fd.FullName())) } } @@ -14974,14 +15042,14 @@ func (x *fastReflection_EchoResponse) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_EchoResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.EchoResponse.message": + case "cometbft.abci.v2.EchoResponse.message": value := x.Message return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoResponse does not contain field %s", descriptor.FullName())) } } @@ -14997,13 +15065,13 @@ func (x *fastReflection_EchoResponse) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.EchoResponse.message": + case "cometbft.abci.v2.EchoResponse.message": x.Message = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoResponse does not contain field %s", fd.FullName())) } } @@ -15019,13 +15087,13 @@ func (x *fastReflection_EchoResponse) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.EchoResponse.message": - panic(fmt.Errorf("field message of message cometbft.abci.v1.EchoResponse is not mutable")) + case "cometbft.abci.v2.EchoResponse.message": + panic(fmt.Errorf("field message of message cometbft.abci.v2.EchoResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoResponse does not contain field %s", fd.FullName())) } } @@ -15034,13 +15102,13 @@ func (x *fastReflection_EchoResponse) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_EchoResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.EchoResponse.message": + case "cometbft.abci.v2.EchoResponse.message": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EchoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EchoResponse does not contain field %s", fd.FullName())) } } @@ -15050,7 +15118,7 @@ func (x *fastReflection_EchoResponse) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_EchoResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.EchoResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.EchoResponse", d.FullName())) } panic("unreachable") } @@ -15266,8 +15334,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_FlushResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("FlushResponse") + file_cometbft_abci_v2_types_proto_init() + md_FlushResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("FlushResponse") } var _ protoreflect.Message = (*fastReflection_FlushResponse)(nil) @@ -15279,7 +15347,7 @@ func (x *FlushResponse) ProtoReflect() protoreflect.Message { } func (x *FlushResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[20] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -15352,9 +15420,9 @@ func (x *fastReflection_FlushResponse) Has(fd protoreflect.FieldDescriptor) bool switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushResponse does not contain field %s", fd.FullName())) } } @@ -15368,9 +15436,9 @@ func (x *fastReflection_FlushResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushResponse does not contain field %s", fd.FullName())) } } @@ -15384,9 +15452,9 @@ func (x *fastReflection_FlushResponse) Get(descriptor protoreflect.FieldDescript switch descriptor.FullName() { default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushResponse does not contain field %s", descriptor.FullName())) } } @@ -15404,9 +15472,9 @@ func (x *fastReflection_FlushResponse) Set(fd protoreflect.FieldDescriptor, valu switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushResponse does not contain field %s", fd.FullName())) } } @@ -15424,9 +15492,9 @@ func (x *fastReflection_FlushResponse) Mutable(fd protoreflect.FieldDescriptor) switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushResponse does not contain field %s", fd.FullName())) } } @@ -15437,9 +15505,9 @@ func (x *fastReflection_FlushResponse) NewField(fd protoreflect.FieldDescriptor) switch fd.FullName() { default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FlushResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FlushResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FlushResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FlushResponse does not contain field %s", fd.FullName())) } } @@ -15449,7 +15517,7 @@ func (x *fastReflection_FlushResponse) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_FlushResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.FlushResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.FlushResponse", d.FullName())) } panic("unreachable") } @@ -15617,6 +15685,88 @@ func (x *fastReflection_FlushResponse) ProtoMethods() *protoiface.Methods { } } +var _ protoreflect.Map = (*_InfoResponse_6_map)(nil) + +type _InfoResponse_6_map struct { + m *map[string]uint32 +} + +func (x *_InfoResponse_6_map) Len() int { + if x.m == nil { + return 0 + } + return len(*x.m) +} + +func (x *_InfoResponse_6_map) Range(f func(protoreflect.MapKey, protoreflect.Value) bool) { + if x.m == nil { + return + } + for k, v := range *x.m { + mapKey := (protoreflect.MapKey)(protoreflect.ValueOfString(k)) + mapValue := protoreflect.ValueOfUint32(v) + if !f(mapKey, mapValue) { + break + } + } +} + +func (x *_InfoResponse_6_map) Has(key protoreflect.MapKey) bool { + if x.m == nil { + return false + } + keyUnwrapped := key.String() + concreteValue := keyUnwrapped + _, ok := (*x.m)[concreteValue] + return ok +} + +func (x *_InfoResponse_6_map) Clear(key protoreflect.MapKey) { + if x.m == nil { + return + } + keyUnwrapped := key.String() + concreteKey := keyUnwrapped + delete(*x.m, concreteKey) +} + +func (x *_InfoResponse_6_map) Get(key protoreflect.MapKey) protoreflect.Value { + if x.m == nil { + return protoreflect.Value{} + } + keyUnwrapped := key.String() + concreteKey := keyUnwrapped + v, ok := (*x.m)[concreteKey] + if !ok { + return protoreflect.Value{} + } + return protoreflect.ValueOfUint32(v) +} + +func (x *_InfoResponse_6_map) Set(key protoreflect.MapKey, value protoreflect.Value) { + if !key.IsValid() || !value.IsValid() { + panic("invalid key or value provided") + } + keyUnwrapped := key.String() + concreteKey := keyUnwrapped + valueUnwrapped := value.Uint() + concreteValue := (uint32)(valueUnwrapped) + (*x.m)[concreteKey] = concreteValue +} + +func (x *_InfoResponse_6_map) Mutable(key protoreflect.MapKey) protoreflect.Value { + panic("should not call Mutable on protoreflect.Map whose value is not of type protoreflect.Message") +} + +func (x *_InfoResponse_6_map) NewValue() protoreflect.Value { + v := uint32(0) + return protoreflect.ValueOfUint32(v) +} + +func (x *_InfoResponse_6_map) IsValid() bool { + return x.m != nil +} + var ( md_InfoResponse protoreflect.MessageDescriptor fd_InfoResponse_data protoreflect.FieldDescriptor @@ -15624,16 +15774,20 @@ var ( fd_InfoResponse_app_version protoreflect.FieldDescriptor fd_InfoResponse_last_block_height protoreflect.FieldDescriptor fd_InfoResponse_last_block_app_hash protoreflect.FieldDescriptor + fd_InfoResponse_lane_priorities protoreflect.FieldDescriptor + fd_InfoResponse_default_lane protoreflect.FieldDescriptor ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_InfoResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("InfoResponse") + file_cometbft_abci_v2_types_proto_init() + md_InfoResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("InfoResponse") fd_InfoResponse_data = md_InfoResponse.Fields().ByName("data") fd_InfoResponse_version = md_InfoResponse.Fields().ByName("version") fd_InfoResponse_app_version = md_InfoResponse.Fields().ByName("app_version") fd_InfoResponse_last_block_height = md_InfoResponse.Fields().ByName("last_block_height") fd_InfoResponse_last_block_app_hash = md_InfoResponse.Fields().ByName("last_block_app_hash") + fd_InfoResponse_lane_priorities = md_InfoResponse.Fields().ByName("lane_priorities") + fd_InfoResponse_default_lane = md_InfoResponse.Fields().ByName("default_lane") } var _ protoreflect.Message = (*fastReflection_InfoResponse)(nil) @@ -15645,7 +15799,7 @@ func (x *InfoResponse) ProtoReflect() protoreflect.Message { } func (x *InfoResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[21] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -15731,6 +15885,18 @@ func (x *fastReflection_InfoResponse) Range(f func(protoreflect.FieldDescriptor, return } } + if len(x.LanePriorities) != 0 { + value := protoreflect.ValueOfMap(&_InfoResponse_6_map{m: &x.LanePriorities}) + if !f(fd_InfoResponse_lane_priorities, value) { + return + } + } + if x.DefaultLane != "" { + value := protoreflect.ValueOfString(x.DefaultLane) + if !f(fd_InfoResponse_default_lane, value) { + return + } + } } // Has reports whether a field is populated. @@ -15746,21 +15912,25 @@ func (x *fastReflection_InfoResponse) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_InfoResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.InfoResponse.data": + case "cometbft.abci.v2.InfoResponse.data": return x.Data != "" - case "cometbft.abci.v1.InfoResponse.version": + case "cometbft.abci.v2.InfoResponse.version": return x.Version != "" - case "cometbft.abci.v1.InfoResponse.app_version": + case "cometbft.abci.v2.InfoResponse.app_version": return x.AppVersion != uint64(0) - case "cometbft.abci.v1.InfoResponse.last_block_height": + case "cometbft.abci.v2.InfoResponse.last_block_height": return x.LastBlockHeight != int64(0) - case "cometbft.abci.v1.InfoResponse.last_block_app_hash": + case "cometbft.abci.v2.InfoResponse.last_block_app_hash": return len(x.LastBlockAppHash) != 0 + case "cometbft.abci.v2.InfoResponse.lane_priorities": + return len(x.LanePriorities) != 0 + case "cometbft.abci.v2.InfoResponse.default_lane": + return x.DefaultLane != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoResponse does not contain field %s", fd.FullName())) } } @@ -15772,21 +15942,25 @@ func (x *fastReflection_InfoResponse) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InfoResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.InfoResponse.data": + case "cometbft.abci.v2.InfoResponse.data": x.Data = "" - case "cometbft.abci.v1.InfoResponse.version": + case "cometbft.abci.v2.InfoResponse.version": x.Version = "" - case "cometbft.abci.v1.InfoResponse.app_version": + case "cometbft.abci.v2.InfoResponse.app_version": x.AppVersion = uint64(0) - case "cometbft.abci.v1.InfoResponse.last_block_height": + case "cometbft.abci.v2.InfoResponse.last_block_height": x.LastBlockHeight = int64(0) - case "cometbft.abci.v1.InfoResponse.last_block_app_hash": + case "cometbft.abci.v2.InfoResponse.last_block_app_hash": x.LastBlockAppHash = nil + case "cometbft.abci.v2.InfoResponse.lane_priorities": + x.LanePriorities = nil + case "cometbft.abci.v2.InfoResponse.default_lane": + x.DefaultLane = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoResponse does not contain field %s", fd.FullName())) } } @@ -15798,26 +15972,35 @@ func (x *fastReflection_InfoResponse) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_InfoResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.InfoResponse.data": + case "cometbft.abci.v2.InfoResponse.data": value := x.Data return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.InfoResponse.version": + case "cometbft.abci.v2.InfoResponse.version": value := x.Version return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.InfoResponse.app_version": + case "cometbft.abci.v2.InfoResponse.app_version": value := x.AppVersion return protoreflect.ValueOfUint64(value) - case "cometbft.abci.v1.InfoResponse.last_block_height": + case "cometbft.abci.v2.InfoResponse.last_block_height": value := x.LastBlockHeight return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.InfoResponse.last_block_app_hash": + case "cometbft.abci.v2.InfoResponse.last_block_app_hash": value := x.LastBlockAppHash return protoreflect.ValueOfBytes(value) + case "cometbft.abci.v2.InfoResponse.lane_priorities": + if len(x.LanePriorities) == 0 { + return protoreflect.ValueOfMap(&_InfoResponse_6_map{}) + } + mapValue := &_InfoResponse_6_map{m: &x.LanePriorities} + return protoreflect.ValueOfMap(mapValue) + case "cometbft.abci.v2.InfoResponse.default_lane": + value := x.DefaultLane + return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoResponse does not contain field %s", descriptor.FullName())) } } @@ -15833,21 +16016,27 @@ func (x *fastReflection_InfoResponse) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InfoResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.InfoResponse.data": + case "cometbft.abci.v2.InfoResponse.data": x.Data = value.Interface().(string) - case "cometbft.abci.v1.InfoResponse.version": + case "cometbft.abci.v2.InfoResponse.version": x.Version = value.Interface().(string) - case "cometbft.abci.v1.InfoResponse.app_version": + case "cometbft.abci.v2.InfoResponse.app_version": x.AppVersion = value.Uint() - case "cometbft.abci.v1.InfoResponse.last_block_height": + case "cometbft.abci.v2.InfoResponse.last_block_height": x.LastBlockHeight = value.Int() - case "cometbft.abci.v1.InfoResponse.last_block_app_hash": + case "cometbft.abci.v2.InfoResponse.last_block_app_hash": x.LastBlockAppHash = value.Bytes() + case "cometbft.abci.v2.InfoResponse.lane_priorities": + mv := value.Map() + cmv := mv.(*_InfoResponse_6_map) + x.LanePriorities = *cmv.m + case "cometbft.abci.v2.InfoResponse.default_lane": + x.DefaultLane = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoResponse does not contain field %s", fd.FullName())) } } @@ -15863,21 +16052,29 @@ func (x *fastReflection_InfoResponse) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InfoResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.InfoResponse.data": - panic(fmt.Errorf("field data of message cometbft.abci.v1.InfoResponse is not mutable")) - case "cometbft.abci.v1.InfoResponse.version": - panic(fmt.Errorf("field version of message cometbft.abci.v1.InfoResponse is not mutable")) - case "cometbft.abci.v1.InfoResponse.app_version": - panic(fmt.Errorf("field app_version of message cometbft.abci.v1.InfoResponse is not mutable")) - case "cometbft.abci.v1.InfoResponse.last_block_height": - panic(fmt.Errorf("field last_block_height of message cometbft.abci.v1.InfoResponse is not mutable")) - case "cometbft.abci.v1.InfoResponse.last_block_app_hash": - panic(fmt.Errorf("field last_block_app_hash of message cometbft.abci.v1.InfoResponse is not mutable")) + case "cometbft.abci.v2.InfoResponse.lane_priorities": + if x.LanePriorities == nil { + x.LanePriorities = make(map[string]uint32) + } + value := &_InfoResponse_6_map{m: &x.LanePriorities} + return protoreflect.ValueOfMap(value) + case "cometbft.abci.v2.InfoResponse.data": + panic(fmt.Errorf("field data of message cometbft.abci.v2.InfoResponse is not mutable")) + case "cometbft.abci.v2.InfoResponse.version": + panic(fmt.Errorf("field version of message cometbft.abci.v2.InfoResponse is not mutable")) + case "cometbft.abci.v2.InfoResponse.app_version": + panic(fmt.Errorf("field app_version of message cometbft.abci.v2.InfoResponse is not mutable")) + case "cometbft.abci.v2.InfoResponse.last_block_height": + panic(fmt.Errorf("field last_block_height of message cometbft.abci.v2.InfoResponse is not mutable")) + case "cometbft.abci.v2.InfoResponse.last_block_app_hash": + panic(fmt.Errorf("field last_block_app_hash of message cometbft.abci.v2.InfoResponse is not mutable")) + case "cometbft.abci.v2.InfoResponse.default_lane": + panic(fmt.Errorf("field default_lane of message cometbft.abci.v2.InfoResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoResponse does not contain field %s", fd.FullName())) } } @@ -15886,21 +16083,26 @@ func (x *fastReflection_InfoResponse) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_InfoResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.InfoResponse.data": + case "cometbft.abci.v2.InfoResponse.data": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.InfoResponse.version": + case "cometbft.abci.v2.InfoResponse.version": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.InfoResponse.app_version": + case "cometbft.abci.v2.InfoResponse.app_version": return protoreflect.ValueOfUint64(uint64(0)) - case "cometbft.abci.v1.InfoResponse.last_block_height": + case "cometbft.abci.v2.InfoResponse.last_block_height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.InfoResponse.last_block_app_hash": + case "cometbft.abci.v2.InfoResponse.last_block_app_hash": return protoreflect.ValueOfBytes(nil) + case "cometbft.abci.v2.InfoResponse.lane_priorities": + m := make(map[string]uint32) + return protoreflect.ValueOfMap(&_InfoResponse_6_map{m: &m}) + case "cometbft.abci.v2.InfoResponse.default_lane": + return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InfoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InfoResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InfoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InfoResponse does not contain field %s", fd.FullName())) } } @@ -15910,7 +16112,7 @@ func (x *fastReflection_InfoResponse) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_InfoResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.InfoResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.InfoResponse", d.FullName())) } panic("unreachable") } @@ -15983,6 +16185,31 @@ func (x *fastReflection_InfoResponse) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + if len(x.LanePriorities) > 0 { + SiZeMaP := func(k string, v uint32) { + mapEntrySize := 1 + len(k) + runtime.Sov(uint64(len(k))) + 1 + runtime.Sov(uint64(v)) + n += mapEntrySize + 1 + runtime.Sov(uint64(mapEntrySize)) + } + if options.Deterministic { + sortme := make([]string, 0, len(x.LanePriorities)) + for k := range x.LanePriorities { + sortme = append(sortme, k) + } + sort.Strings(sortme) + for _, k := range sortme { + v := x.LanePriorities[k] + SiZeMaP(k, v) + } + } else { + for k, v := range x.LanePriorities { + SiZeMaP(k, v) + } + } + } + l = len(x.DefaultLane) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -16012,6 +16239,54 @@ func (x *fastReflection_InfoResponse) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.DefaultLane) > 0 { + i -= len(x.DefaultLane) + copy(dAtA[i:], x.DefaultLane) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.DefaultLane))) + i-- + dAtA[i] = 0x3a + } + if len(x.LanePriorities) > 0 { + MaRsHaLmAp := func(k string, v uint32) (protoiface.MarshalOutput, error) { + baseI := i + i = runtime.EncodeVarint(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = runtime.EncodeVarint(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = runtime.EncodeVarint(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 + return protoiface.MarshalOutput{}, nil + } + if options.Deterministic { + keysForLanePriorities := make([]string, 0, len(x.LanePriorities)) + for k := range x.LanePriorities { + keysForLanePriorities = append(keysForLanePriorities, string(k)) + } + sort.Slice(keysForLanePriorities, func(i, j int) bool { + return keysForLanePriorities[i] < keysForLanePriorities[j] + }) + for iNdEx := len(keysForLanePriorities) - 1; iNdEx >= 0; iNdEx-- { + v := x.LanePriorities[string(keysForLanePriorities[iNdEx])] + out, err := MaRsHaLmAp(keysForLanePriorities[iNdEx], v) + if err != nil { + return out, err + } + } + } else { + for k := range x.LanePriorities { + v := x.LanePriorities[k] + out, err := MaRsHaLmAp(k, v) + if err != nil { + return out, err + } + } + } + } if len(x.LastBlockAppHash) > 0 { i -= len(x.LastBlockAppHash) copy(dAtA[i:], x.LastBlockAppHash) @@ -16228,6 +16503,151 @@ func (x *fastReflection_InfoResponse) ProtoMethods() *protoiface.Methods { x.LastBlockAppHash = []byte{} } iNdEx = postIndex + case 6: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field LanePriorities", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + if x.LanePriorities == nil { + x.LanePriorities = make(map[string]uint32) + } + var mapkey string + var mapvalue uint32 + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postStringIndexmapkey > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + mapvalue |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + } else { + iNdEx = entryPreIndex + skippy, err := runtime.Skip(dAtA[iNdEx:]) + if err != nil { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if (iNdEx + skippy) > postIndex { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + x.LanePriorities[mapkey] = mapvalue + iNdEx = postIndex + case 7: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field DefaultLane", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.DefaultLane = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -16322,8 +16742,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_InitChainResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("InitChainResponse") + file_cometbft_abci_v2_types_proto_init() + md_InitChainResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("InitChainResponse") fd_InitChainResponse_consensus_params = md_InitChainResponse.Fields().ByName("consensus_params") fd_InitChainResponse_validators = md_InitChainResponse.Fields().ByName("validators") fd_InitChainResponse_app_hash = md_InitChainResponse.Fields().ByName("app_hash") @@ -16338,7 +16758,7 @@ func (x *InitChainResponse) ProtoReflect() protoreflect.Message { } func (x *InitChainResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[22] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -16427,17 +16847,17 @@ func (x *fastReflection_InitChainResponse) Range(f func(protoreflect.FieldDescri // a repeated field is populated if it is non-empty. func (x *fastReflection_InitChainResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.InitChainResponse.consensus_params": + case "cometbft.abci.v2.InitChainResponse.consensus_params": return x.ConsensusParams != nil - case "cometbft.abci.v1.InitChainResponse.validators": + case "cometbft.abci.v2.InitChainResponse.validators": return len(x.Validators) != 0 - case "cometbft.abci.v1.InitChainResponse.app_hash": + case "cometbft.abci.v2.InitChainResponse.app_hash": return len(x.AppHash) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainResponse does not contain field %s", fd.FullName())) } } @@ -16449,17 +16869,17 @@ func (x *fastReflection_InitChainResponse) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InitChainResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.InitChainResponse.consensus_params": + case "cometbft.abci.v2.InitChainResponse.consensus_params": x.ConsensusParams = nil - case "cometbft.abci.v1.InitChainResponse.validators": + case "cometbft.abci.v2.InitChainResponse.validators": x.Validators = nil - case "cometbft.abci.v1.InitChainResponse.app_hash": + case "cometbft.abci.v2.InitChainResponse.app_hash": x.AppHash = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainResponse does not contain field %s", fd.FullName())) } } @@ -16471,23 +16891,23 @@ func (x *fastReflection_InitChainResponse) Clear(fd protoreflect.FieldDescriptor // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_InitChainResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.InitChainResponse.consensus_params": + case "cometbft.abci.v2.InitChainResponse.consensus_params": value := x.ConsensusParams return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.InitChainResponse.validators": + case "cometbft.abci.v2.InitChainResponse.validators": if len(x.Validators) == 0 { return protoreflect.ValueOfList(&_InitChainResponse_2_list{}) } listValue := &_InitChainResponse_2_list{list: &x.Validators} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.InitChainResponse.app_hash": + case "cometbft.abci.v2.InitChainResponse.app_hash": value := x.AppHash return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainResponse does not contain field %s", descriptor.FullName())) } } @@ -16503,19 +16923,19 @@ func (x *fastReflection_InitChainResponse) Get(descriptor protoreflect.FieldDesc // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InitChainResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.InitChainResponse.consensus_params": - x.ConsensusParams = value.Message().Interface().(*v1.ConsensusParams) - case "cometbft.abci.v1.InitChainResponse.validators": + case "cometbft.abci.v2.InitChainResponse.consensus_params": + x.ConsensusParams = value.Message().Interface().(*v2.ConsensusParams) + case "cometbft.abci.v2.InitChainResponse.validators": lv := value.List() clv := lv.(*_InitChainResponse_2_list) x.Validators = *clv.list - case "cometbft.abci.v1.InitChainResponse.app_hash": + case "cometbft.abci.v2.InitChainResponse.app_hash": x.AppHash = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainResponse does not contain field %s", fd.FullName())) } } @@ -16531,24 +16951,24 @@ func (x *fastReflection_InitChainResponse) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_InitChainResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.InitChainResponse.consensus_params": + case "cometbft.abci.v2.InitChainResponse.consensus_params": if x.ConsensusParams == nil { - x.ConsensusParams = new(v1.ConsensusParams) + x.ConsensusParams = new(v2.ConsensusParams) } return protoreflect.ValueOfMessage(x.ConsensusParams.ProtoReflect()) - case "cometbft.abci.v1.InitChainResponse.validators": + case "cometbft.abci.v2.InitChainResponse.validators": if x.Validators == nil { x.Validators = []*ValidatorUpdate{} } value := &_InitChainResponse_2_list{list: &x.Validators} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.InitChainResponse.app_hash": - panic(fmt.Errorf("field app_hash of message cometbft.abci.v1.InitChainResponse is not mutable")) + case "cometbft.abci.v2.InitChainResponse.app_hash": + panic(fmt.Errorf("field app_hash of message cometbft.abci.v2.InitChainResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainResponse does not contain field %s", fd.FullName())) } } @@ -16557,19 +16977,19 @@ func (x *fastReflection_InitChainResponse) Mutable(fd protoreflect.FieldDescript // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_InitChainResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.InitChainResponse.consensus_params": - m := new(v1.ConsensusParams) + case "cometbft.abci.v2.InitChainResponse.consensus_params": + m := new(v2.ConsensusParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.InitChainResponse.validators": + case "cometbft.abci.v2.InitChainResponse.validators": list := []*ValidatorUpdate{} return protoreflect.ValueOfList(&_InitChainResponse_2_list{list: &list}) - case "cometbft.abci.v1.InitChainResponse.app_hash": + case "cometbft.abci.v2.InitChainResponse.app_hash": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.InitChainResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.InitChainResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.InitChainResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.InitChainResponse does not contain field %s", fd.FullName())) } } @@ -16579,7 +16999,7 @@ func (x *fastReflection_InitChainResponse) NewField(fd protoreflect.FieldDescrip func (x *fastReflection_InitChainResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.InitChainResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.InitChainResponse", d.FullName())) } panic("unreachable") } @@ -16793,7 +17213,7 @@ func (x *fastReflection_InitChainResponse) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.ConsensusParams == nil { - x.ConsensusParams = &v1.ConsensusParams{} + x.ConsensusParams = &v2.ConsensusParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.ConsensusParams); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -16916,8 +17336,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_QueryResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("QueryResponse") + file_cometbft_abci_v2_types_proto_init() + md_QueryResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("QueryResponse") fd_QueryResponse_code = md_QueryResponse.Fields().ByName("code") fd_QueryResponse_log = md_QueryResponse.Fields().ByName("log") fd_QueryResponse_info = md_QueryResponse.Fields().ByName("info") @@ -16938,7 +17358,7 @@ func (x *QueryResponse) ProtoReflect() protoreflect.Message { } func (x *QueryResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[23] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -17063,29 +17483,29 @@ func (x *fastReflection_QueryResponse) Range(f func(protoreflect.FieldDescriptor // a repeated field is populated if it is non-empty. func (x *fastReflection_QueryResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.QueryResponse.code": + case "cometbft.abci.v2.QueryResponse.code": return x.Code != uint32(0) - case "cometbft.abci.v1.QueryResponse.log": + case "cometbft.abci.v2.QueryResponse.log": return x.Log != "" - case "cometbft.abci.v1.QueryResponse.info": + case "cometbft.abci.v2.QueryResponse.info": return x.Info != "" - case "cometbft.abci.v1.QueryResponse.index": + case "cometbft.abci.v2.QueryResponse.index": return x.Index != int64(0) - case "cometbft.abci.v1.QueryResponse.key": + case "cometbft.abci.v2.QueryResponse.key": return len(x.Key) != 0 - case "cometbft.abci.v1.QueryResponse.value": + case "cometbft.abci.v2.QueryResponse.value": return len(x.Value) != 0 - case "cometbft.abci.v1.QueryResponse.proof_ops": + case "cometbft.abci.v2.QueryResponse.proof_ops": return x.ProofOps != nil - case "cometbft.abci.v1.QueryResponse.height": + case "cometbft.abci.v2.QueryResponse.height": return x.Height != int64(0) - case "cometbft.abci.v1.QueryResponse.codespace": + case "cometbft.abci.v2.QueryResponse.codespace": return x.Codespace != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryResponse does not contain field %s", fd.FullName())) } } @@ -17097,29 +17517,29 @@ func (x *fastReflection_QueryResponse) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.QueryResponse.code": + case "cometbft.abci.v2.QueryResponse.code": x.Code = uint32(0) - case "cometbft.abci.v1.QueryResponse.log": + case "cometbft.abci.v2.QueryResponse.log": x.Log = "" - case "cometbft.abci.v1.QueryResponse.info": + case "cometbft.abci.v2.QueryResponse.info": x.Info = "" - case "cometbft.abci.v1.QueryResponse.index": + case "cometbft.abci.v2.QueryResponse.index": x.Index = int64(0) - case "cometbft.abci.v1.QueryResponse.key": + case "cometbft.abci.v2.QueryResponse.key": x.Key = nil - case "cometbft.abci.v1.QueryResponse.value": + case "cometbft.abci.v2.QueryResponse.value": x.Value = nil - case "cometbft.abci.v1.QueryResponse.proof_ops": + case "cometbft.abci.v2.QueryResponse.proof_ops": x.ProofOps = nil - case "cometbft.abci.v1.QueryResponse.height": + case "cometbft.abci.v2.QueryResponse.height": x.Height = int64(0) - case "cometbft.abci.v1.QueryResponse.codespace": + case "cometbft.abci.v2.QueryResponse.codespace": x.Codespace = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryResponse does not contain field %s", fd.FullName())) } } @@ -17131,38 +17551,38 @@ func (x *fastReflection_QueryResponse) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_QueryResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.QueryResponse.code": + case "cometbft.abci.v2.QueryResponse.code": value := x.Code return protoreflect.ValueOfUint32(value) - case "cometbft.abci.v1.QueryResponse.log": + case "cometbft.abci.v2.QueryResponse.log": value := x.Log return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.QueryResponse.info": + case "cometbft.abci.v2.QueryResponse.info": value := x.Info return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.QueryResponse.index": + case "cometbft.abci.v2.QueryResponse.index": value := x.Index return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.QueryResponse.key": + case "cometbft.abci.v2.QueryResponse.key": value := x.Key return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.QueryResponse.value": + case "cometbft.abci.v2.QueryResponse.value": value := x.Value return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.QueryResponse.proof_ops": + case "cometbft.abci.v2.QueryResponse.proof_ops": value := x.ProofOps return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.QueryResponse.height": + case "cometbft.abci.v2.QueryResponse.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.QueryResponse.codespace": + case "cometbft.abci.v2.QueryResponse.codespace": value := x.Codespace return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryResponse does not contain field %s", descriptor.FullName())) } } @@ -17178,29 +17598,29 @@ func (x *fastReflection_QueryResponse) Get(descriptor protoreflect.FieldDescript // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.QueryResponse.code": + case "cometbft.abci.v2.QueryResponse.code": x.Code = uint32(value.Uint()) - case "cometbft.abci.v1.QueryResponse.log": + case "cometbft.abci.v2.QueryResponse.log": x.Log = value.Interface().(string) - case "cometbft.abci.v1.QueryResponse.info": + case "cometbft.abci.v2.QueryResponse.info": x.Info = value.Interface().(string) - case "cometbft.abci.v1.QueryResponse.index": + case "cometbft.abci.v2.QueryResponse.index": x.Index = value.Int() - case "cometbft.abci.v1.QueryResponse.key": + case "cometbft.abci.v2.QueryResponse.key": x.Key = value.Bytes() - case "cometbft.abci.v1.QueryResponse.value": + case "cometbft.abci.v2.QueryResponse.value": x.Value = value.Bytes() - case "cometbft.abci.v1.QueryResponse.proof_ops": - x.ProofOps = value.Message().Interface().(*v11.ProofOps) - case "cometbft.abci.v1.QueryResponse.height": + case "cometbft.abci.v2.QueryResponse.proof_ops": + x.ProofOps = value.Message().Interface().(*v1.ProofOps) + case "cometbft.abci.v2.QueryResponse.height": x.Height = value.Int() - case "cometbft.abci.v1.QueryResponse.codespace": + case "cometbft.abci.v2.QueryResponse.codespace": x.Codespace = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryResponse does not contain field %s", fd.FullName())) } } @@ -17216,32 +17636,32 @@ func (x *fastReflection_QueryResponse) Set(fd protoreflect.FieldDescriptor, valu // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.QueryResponse.proof_ops": + case "cometbft.abci.v2.QueryResponse.proof_ops": if x.ProofOps == nil { - x.ProofOps = new(v11.ProofOps) + x.ProofOps = new(v1.ProofOps) } return protoreflect.ValueOfMessage(x.ProofOps.ProtoReflect()) - case "cometbft.abci.v1.QueryResponse.code": - panic(fmt.Errorf("field code of message cometbft.abci.v1.QueryResponse is not mutable")) - case "cometbft.abci.v1.QueryResponse.log": - panic(fmt.Errorf("field log of message cometbft.abci.v1.QueryResponse is not mutable")) - case "cometbft.abci.v1.QueryResponse.info": - panic(fmt.Errorf("field info of message cometbft.abci.v1.QueryResponse is not mutable")) - case "cometbft.abci.v1.QueryResponse.index": - panic(fmt.Errorf("field index of message cometbft.abci.v1.QueryResponse is not mutable")) - case "cometbft.abci.v1.QueryResponse.key": - panic(fmt.Errorf("field key of message cometbft.abci.v1.QueryResponse is not mutable")) - case "cometbft.abci.v1.QueryResponse.value": - panic(fmt.Errorf("field value of message cometbft.abci.v1.QueryResponse is not mutable")) - case "cometbft.abci.v1.QueryResponse.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.QueryResponse is not mutable")) - case "cometbft.abci.v1.QueryResponse.codespace": - panic(fmt.Errorf("field codespace of message cometbft.abci.v1.QueryResponse is not mutable")) + case "cometbft.abci.v2.QueryResponse.code": + panic(fmt.Errorf("field code of message cometbft.abci.v2.QueryResponse is not mutable")) + case "cometbft.abci.v2.QueryResponse.log": + panic(fmt.Errorf("field log of message cometbft.abci.v2.QueryResponse is not mutable")) + case "cometbft.abci.v2.QueryResponse.info": + panic(fmt.Errorf("field info of message cometbft.abci.v2.QueryResponse is not mutable")) + case "cometbft.abci.v2.QueryResponse.index": + panic(fmt.Errorf("field index of message cometbft.abci.v2.QueryResponse is not mutable")) + case "cometbft.abci.v2.QueryResponse.key": + panic(fmt.Errorf("field key of message cometbft.abci.v2.QueryResponse is not mutable")) + case "cometbft.abci.v2.QueryResponse.value": + panic(fmt.Errorf("field value of message cometbft.abci.v2.QueryResponse is not mutable")) + case "cometbft.abci.v2.QueryResponse.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.QueryResponse is not mutable")) + case "cometbft.abci.v2.QueryResponse.codespace": + panic(fmt.Errorf("field codespace of message cometbft.abci.v2.QueryResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryResponse does not contain field %s", fd.FullName())) } } @@ -17250,30 +17670,30 @@ func (x *fastReflection_QueryResponse) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_QueryResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.QueryResponse.code": + case "cometbft.abci.v2.QueryResponse.code": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.abci.v1.QueryResponse.log": + case "cometbft.abci.v2.QueryResponse.log": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.QueryResponse.info": + case "cometbft.abci.v2.QueryResponse.info": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.QueryResponse.index": + case "cometbft.abci.v2.QueryResponse.index": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.QueryResponse.key": + case "cometbft.abci.v2.QueryResponse.key": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.QueryResponse.value": + case "cometbft.abci.v2.QueryResponse.value": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.QueryResponse.proof_ops": - m := new(v11.ProofOps) + case "cometbft.abci.v2.QueryResponse.proof_ops": + m := new(v1.ProofOps) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.QueryResponse.height": + case "cometbft.abci.v2.QueryResponse.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.QueryResponse.codespace": + case "cometbft.abci.v2.QueryResponse.codespace": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.QueryResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.QueryResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.QueryResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.QueryResponse does not contain field %s", fd.FullName())) } } @@ -17283,7 +17703,7 @@ func (x *fastReflection_QueryResponse) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_QueryResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.QueryResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.QueryResponse", d.FullName())) } panic("unreachable") } @@ -17713,7 +18133,7 @@ func (x *fastReflection_QueryResponse) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.ProofOps == nil { - x.ProofOps = &v11.ProofOps{} + x.ProofOps = &v1.ProofOps{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.ProofOps); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -17866,11 +18286,12 @@ var ( fd_CheckTxResponse_gas_used protoreflect.FieldDescriptor fd_CheckTxResponse_events protoreflect.FieldDescriptor fd_CheckTxResponse_codespace protoreflect.FieldDescriptor + fd_CheckTxResponse_lane_id protoreflect.FieldDescriptor ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_CheckTxResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("CheckTxResponse") + file_cometbft_abci_v2_types_proto_init() + md_CheckTxResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("CheckTxResponse") fd_CheckTxResponse_code = md_CheckTxResponse.Fields().ByName("code") fd_CheckTxResponse_data = md_CheckTxResponse.Fields().ByName("data") fd_CheckTxResponse_log = md_CheckTxResponse.Fields().ByName("log") @@ -17879,6 +18300,7 @@ func init() { fd_CheckTxResponse_gas_used = md_CheckTxResponse.Fields().ByName("gas_used") fd_CheckTxResponse_events = md_CheckTxResponse.Fields().ByName("events") fd_CheckTxResponse_codespace = md_CheckTxResponse.Fields().ByName("codespace") + fd_CheckTxResponse_lane_id = md_CheckTxResponse.Fields().ByName("lane_id") } var _ protoreflect.Message = (*fastReflection_CheckTxResponse)(nil) @@ -17890,7 +18312,7 @@ func (x *CheckTxResponse) ProtoReflect() protoreflect.Message { } func (x *CheckTxResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[24] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -17994,6 +18416,12 @@ func (x *fastReflection_CheckTxResponse) Range(f func(protoreflect.FieldDescript return } } + if x.LaneId != "" { + value := protoreflect.ValueOfString(x.LaneId) + if !f(fd_CheckTxResponse_lane_id, value) { + return + } + } } // Has reports whether a field is populated. @@ -18009,27 +18437,29 @@ func (x *fastReflection_CheckTxResponse) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_CheckTxResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxResponse.code": + case "cometbft.abci.v2.CheckTxResponse.code": return x.Code != uint32(0) - case "cometbft.abci.v1.CheckTxResponse.data": + case "cometbft.abci.v2.CheckTxResponse.data": return len(x.Data) != 0 - case "cometbft.abci.v1.CheckTxResponse.log": + case "cometbft.abci.v2.CheckTxResponse.log": return x.Log != "" - case "cometbft.abci.v1.CheckTxResponse.info": + case "cometbft.abci.v2.CheckTxResponse.info": return x.Info != "" - case "cometbft.abci.v1.CheckTxResponse.gas_wanted": + case "cometbft.abci.v2.CheckTxResponse.gas_wanted": return x.GasWanted != int64(0) - case "cometbft.abci.v1.CheckTxResponse.gas_used": + case "cometbft.abci.v2.CheckTxResponse.gas_used": return x.GasUsed != int64(0) - case "cometbft.abci.v1.CheckTxResponse.events": + case "cometbft.abci.v2.CheckTxResponse.events": return len(x.Events) != 0 - case "cometbft.abci.v1.CheckTxResponse.codespace": + case "cometbft.abci.v2.CheckTxResponse.codespace": return x.Codespace != "" + case "cometbft.abci.v2.CheckTxResponse.lane_id": + return x.LaneId != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxResponse does not contain field %s", fd.FullName())) } } @@ -18041,27 +18471,29 @@ func (x *fastReflection_CheckTxResponse) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CheckTxResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxResponse.code": + case "cometbft.abci.v2.CheckTxResponse.code": x.Code = uint32(0) - case "cometbft.abci.v1.CheckTxResponse.data": + case "cometbft.abci.v2.CheckTxResponse.data": x.Data = nil - case "cometbft.abci.v1.CheckTxResponse.log": + case "cometbft.abci.v2.CheckTxResponse.log": x.Log = "" - case "cometbft.abci.v1.CheckTxResponse.info": + case "cometbft.abci.v2.CheckTxResponse.info": x.Info = "" - case "cometbft.abci.v1.CheckTxResponse.gas_wanted": + case "cometbft.abci.v2.CheckTxResponse.gas_wanted": x.GasWanted = int64(0) - case "cometbft.abci.v1.CheckTxResponse.gas_used": + case "cometbft.abci.v2.CheckTxResponse.gas_used": x.GasUsed = int64(0) - case "cometbft.abci.v1.CheckTxResponse.events": + case "cometbft.abci.v2.CheckTxResponse.events": x.Events = nil - case "cometbft.abci.v1.CheckTxResponse.codespace": + case "cometbft.abci.v2.CheckTxResponse.codespace": x.Codespace = "" + case "cometbft.abci.v2.CheckTxResponse.lane_id": + x.LaneId = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxResponse does not contain field %s", fd.FullName())) } } @@ -18073,38 +18505,41 @@ func (x *fastReflection_CheckTxResponse) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CheckTxResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.CheckTxResponse.code": + case "cometbft.abci.v2.CheckTxResponse.code": value := x.Code return protoreflect.ValueOfUint32(value) - case "cometbft.abci.v1.CheckTxResponse.data": + case "cometbft.abci.v2.CheckTxResponse.data": value := x.Data return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.CheckTxResponse.log": + case "cometbft.abci.v2.CheckTxResponse.log": value := x.Log return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.CheckTxResponse.info": + case "cometbft.abci.v2.CheckTxResponse.info": value := x.Info return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.CheckTxResponse.gas_wanted": + case "cometbft.abci.v2.CheckTxResponse.gas_wanted": value := x.GasWanted return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.CheckTxResponse.gas_used": + case "cometbft.abci.v2.CheckTxResponse.gas_used": value := x.GasUsed return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.CheckTxResponse.events": + case "cometbft.abci.v2.CheckTxResponse.events": if len(x.Events) == 0 { return protoreflect.ValueOfList(&_CheckTxResponse_7_list{}) } listValue := &_CheckTxResponse_7_list{list: &x.Events} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.CheckTxResponse.codespace": + case "cometbft.abci.v2.CheckTxResponse.codespace": value := x.Codespace return protoreflect.ValueOfString(value) + case "cometbft.abci.v2.CheckTxResponse.lane_id": + value := x.LaneId + return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxResponse does not contain field %s", descriptor.FullName())) } } @@ -18120,29 +18555,31 @@ func (x *fastReflection_CheckTxResponse) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CheckTxResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxResponse.code": + case "cometbft.abci.v2.CheckTxResponse.code": x.Code = uint32(value.Uint()) - case "cometbft.abci.v1.CheckTxResponse.data": + case "cometbft.abci.v2.CheckTxResponse.data": x.Data = value.Bytes() - case "cometbft.abci.v1.CheckTxResponse.log": + case "cometbft.abci.v2.CheckTxResponse.log": x.Log = value.Interface().(string) - case "cometbft.abci.v1.CheckTxResponse.info": + case "cometbft.abci.v2.CheckTxResponse.info": x.Info = value.Interface().(string) - case "cometbft.abci.v1.CheckTxResponse.gas_wanted": + case "cometbft.abci.v2.CheckTxResponse.gas_wanted": x.GasWanted = value.Int() - case "cometbft.abci.v1.CheckTxResponse.gas_used": + case "cometbft.abci.v2.CheckTxResponse.gas_used": x.GasUsed = value.Int() - case "cometbft.abci.v1.CheckTxResponse.events": + case "cometbft.abci.v2.CheckTxResponse.events": lv := value.List() clv := lv.(*_CheckTxResponse_7_list) x.Events = *clv.list - case "cometbft.abci.v1.CheckTxResponse.codespace": + case "cometbft.abci.v2.CheckTxResponse.codespace": x.Codespace = value.Interface().(string) + case "cometbft.abci.v2.CheckTxResponse.lane_id": + x.LaneId = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxResponse does not contain field %s", fd.FullName())) } } @@ -18158,31 +18595,33 @@ func (x *fastReflection_CheckTxResponse) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CheckTxResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxResponse.events": + case "cometbft.abci.v2.CheckTxResponse.events": if x.Events == nil { x.Events = []*Event{} } value := &_CheckTxResponse_7_list{list: &x.Events} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.CheckTxResponse.code": - panic(fmt.Errorf("field code of message cometbft.abci.v1.CheckTxResponse is not mutable")) - case "cometbft.abci.v1.CheckTxResponse.data": - panic(fmt.Errorf("field data of message cometbft.abci.v1.CheckTxResponse is not mutable")) - case "cometbft.abci.v1.CheckTxResponse.log": - panic(fmt.Errorf("field log of message cometbft.abci.v1.CheckTxResponse is not mutable")) - case "cometbft.abci.v1.CheckTxResponse.info": - panic(fmt.Errorf("field info of message cometbft.abci.v1.CheckTxResponse is not mutable")) - case "cometbft.abci.v1.CheckTxResponse.gas_wanted": - panic(fmt.Errorf("field gas_wanted of message cometbft.abci.v1.CheckTxResponse is not mutable")) - case "cometbft.abci.v1.CheckTxResponse.gas_used": - panic(fmt.Errorf("field gas_used of message cometbft.abci.v1.CheckTxResponse is not mutable")) - case "cometbft.abci.v1.CheckTxResponse.codespace": - panic(fmt.Errorf("field codespace of message cometbft.abci.v1.CheckTxResponse is not mutable")) + case "cometbft.abci.v2.CheckTxResponse.code": + panic(fmt.Errorf("field code of message cometbft.abci.v2.CheckTxResponse is not mutable")) + case "cometbft.abci.v2.CheckTxResponse.data": + panic(fmt.Errorf("field data of message cometbft.abci.v2.CheckTxResponse is not mutable")) + case "cometbft.abci.v2.CheckTxResponse.log": + panic(fmt.Errorf("field log of message cometbft.abci.v2.CheckTxResponse is not mutable")) + case "cometbft.abci.v2.CheckTxResponse.info": + panic(fmt.Errorf("field info of message cometbft.abci.v2.CheckTxResponse is not mutable")) + case "cometbft.abci.v2.CheckTxResponse.gas_wanted": + panic(fmt.Errorf("field gas_wanted of message cometbft.abci.v2.CheckTxResponse is not mutable")) + case "cometbft.abci.v2.CheckTxResponse.gas_used": + panic(fmt.Errorf("field gas_used of message cometbft.abci.v2.CheckTxResponse is not mutable")) + case "cometbft.abci.v2.CheckTxResponse.codespace": + panic(fmt.Errorf("field codespace of message cometbft.abci.v2.CheckTxResponse is not mutable")) + case "cometbft.abci.v2.CheckTxResponse.lane_id": + panic(fmt.Errorf("field lane_id of message cometbft.abci.v2.CheckTxResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxResponse does not contain field %s", fd.FullName())) } } @@ -18191,28 +18630,30 @@ func (x *fastReflection_CheckTxResponse) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CheckTxResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.CheckTxResponse.code": + case "cometbft.abci.v2.CheckTxResponse.code": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.abci.v1.CheckTxResponse.data": + case "cometbft.abci.v2.CheckTxResponse.data": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.CheckTxResponse.log": + case "cometbft.abci.v2.CheckTxResponse.log": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.CheckTxResponse.info": + case "cometbft.abci.v2.CheckTxResponse.info": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.CheckTxResponse.gas_wanted": + case "cometbft.abci.v2.CheckTxResponse.gas_wanted": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.CheckTxResponse.gas_used": + case "cometbft.abci.v2.CheckTxResponse.gas_used": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.CheckTxResponse.events": + case "cometbft.abci.v2.CheckTxResponse.events": list := []*Event{} return protoreflect.ValueOfList(&_CheckTxResponse_7_list{list: &list}) - case "cometbft.abci.v1.CheckTxResponse.codespace": + case "cometbft.abci.v2.CheckTxResponse.codespace": + return protoreflect.ValueOfString("") + case "cometbft.abci.v2.CheckTxResponse.lane_id": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CheckTxResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CheckTxResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CheckTxResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CheckTxResponse does not contain field %s", fd.FullName())) } } @@ -18222,7 +18663,7 @@ func (x *fastReflection_CheckTxResponse) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_CheckTxResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.CheckTxResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.CheckTxResponse", d.FullName())) } panic("unreachable") } @@ -18308,6 +18749,10 @@ func (x *fastReflection_CheckTxResponse) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + l = len(x.LaneId) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -18337,6 +18782,13 @@ func (x *fastReflection_CheckTxResponse) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.LaneId) > 0 { + i -= len(x.LaneId) + copy(dAtA[i:], x.LaneId) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.LaneId))) + i-- + dAtA[i] = 0x62 + } if len(x.Codespace) > 0 { i -= len(x.Codespace) copy(dAtA[i:], x.Codespace) @@ -18666,6 +19118,38 @@ func (x *fastReflection_CheckTxResponse) ProtoMethods() *protoiface.Methods { } x.Codespace = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 12: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field LaneId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.LaneId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -18707,8 +19191,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_CommitResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("CommitResponse") + file_cometbft_abci_v2_types_proto_init() + md_CommitResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("CommitResponse") fd_CommitResponse_retain_height = md_CommitResponse.Fields().ByName("retain_height") } @@ -18721,7 +19205,7 @@ func (x *CommitResponse) ProtoReflect() protoreflect.Message { } func (x *CommitResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[25] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -18798,13 +19282,13 @@ func (x *fastReflection_CommitResponse) Range(f func(protoreflect.FieldDescripto // a repeated field is populated if it is non-empty. func (x *fastReflection_CommitResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.CommitResponse.retain_height": + case "cometbft.abci.v2.CommitResponse.retain_height": return x.RetainHeight != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitResponse does not contain field %s", fd.FullName())) } } @@ -18816,13 +19300,13 @@ func (x *fastReflection_CommitResponse) Has(fd protoreflect.FieldDescriptor) boo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.CommitResponse.retain_height": + case "cometbft.abci.v2.CommitResponse.retain_height": x.RetainHeight = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitResponse does not contain field %s", fd.FullName())) } } @@ -18834,14 +19318,14 @@ func (x *fastReflection_CommitResponse) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CommitResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.CommitResponse.retain_height": + case "cometbft.abci.v2.CommitResponse.retain_height": value := x.RetainHeight return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitResponse does not contain field %s", descriptor.FullName())) } } @@ -18857,13 +19341,13 @@ func (x *fastReflection_CommitResponse) Get(descriptor protoreflect.FieldDescrip // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.CommitResponse.retain_height": + case "cometbft.abci.v2.CommitResponse.retain_height": x.RetainHeight = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitResponse does not contain field %s", fd.FullName())) } } @@ -18879,13 +19363,13 @@ func (x *fastReflection_CommitResponse) Set(fd protoreflect.FieldDescriptor, val // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.CommitResponse.retain_height": - panic(fmt.Errorf("field retain_height of message cometbft.abci.v1.CommitResponse is not mutable")) + case "cometbft.abci.v2.CommitResponse.retain_height": + panic(fmt.Errorf("field retain_height of message cometbft.abci.v2.CommitResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitResponse does not contain field %s", fd.FullName())) } } @@ -18894,13 +19378,13 @@ func (x *fastReflection_CommitResponse) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CommitResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.CommitResponse.retain_height": + case "cometbft.abci.v2.CommitResponse.retain_height": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitResponse does not contain field %s", fd.FullName())) } } @@ -18910,7 +19394,7 @@ func (x *fastReflection_CommitResponse) NewField(fd protoreflect.FieldDescriptor func (x *fastReflection_CommitResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.CommitResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.CommitResponse", d.FullName())) } panic("unreachable") } @@ -19162,8 +19646,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ListSnapshotsResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("ListSnapshotsResponse") + file_cometbft_abci_v2_types_proto_init() + md_ListSnapshotsResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("ListSnapshotsResponse") fd_ListSnapshotsResponse_snapshots = md_ListSnapshotsResponse.Fields().ByName("snapshots") } @@ -19176,7 +19660,7 @@ func (x *ListSnapshotsResponse) ProtoReflect() protoreflect.Message { } func (x *ListSnapshotsResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[26] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -19253,13 +19737,13 @@ func (x *fastReflection_ListSnapshotsResponse) Range(f func(protoreflect.FieldDe // a repeated field is populated if it is non-empty. func (x *fastReflection_ListSnapshotsResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ListSnapshotsResponse.snapshots": + case "cometbft.abci.v2.ListSnapshotsResponse.snapshots": return len(x.Snapshots) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsResponse does not contain field %s", fd.FullName())) } } @@ -19271,13 +19755,13 @@ func (x *fastReflection_ListSnapshotsResponse) Has(fd protoreflect.FieldDescript // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ListSnapshotsResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ListSnapshotsResponse.snapshots": + case "cometbft.abci.v2.ListSnapshotsResponse.snapshots": x.Snapshots = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsResponse does not contain field %s", fd.FullName())) } } @@ -19289,7 +19773,7 @@ func (x *fastReflection_ListSnapshotsResponse) Clear(fd protoreflect.FieldDescri // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ListSnapshotsResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ListSnapshotsResponse.snapshots": + case "cometbft.abci.v2.ListSnapshotsResponse.snapshots": if len(x.Snapshots) == 0 { return protoreflect.ValueOfList(&_ListSnapshotsResponse_1_list{}) } @@ -19297,9 +19781,9 @@ func (x *fastReflection_ListSnapshotsResponse) Get(descriptor protoreflect.Field return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsResponse does not contain field %s", descriptor.FullName())) } } @@ -19315,15 +19799,15 @@ func (x *fastReflection_ListSnapshotsResponse) Get(descriptor protoreflect.Field // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ListSnapshotsResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ListSnapshotsResponse.snapshots": + case "cometbft.abci.v2.ListSnapshotsResponse.snapshots": lv := value.List() clv := lv.(*_ListSnapshotsResponse_1_list) x.Snapshots = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsResponse does not contain field %s", fd.FullName())) } } @@ -19339,7 +19823,7 @@ func (x *fastReflection_ListSnapshotsResponse) Set(fd protoreflect.FieldDescript // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ListSnapshotsResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ListSnapshotsResponse.snapshots": + case "cometbft.abci.v2.ListSnapshotsResponse.snapshots": if x.Snapshots == nil { x.Snapshots = []*Snapshot{} } @@ -19347,9 +19831,9 @@ func (x *fastReflection_ListSnapshotsResponse) Mutable(fd protoreflect.FieldDesc return protoreflect.ValueOfList(value) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsResponse does not contain field %s", fd.FullName())) } } @@ -19358,14 +19842,14 @@ func (x *fastReflection_ListSnapshotsResponse) Mutable(fd protoreflect.FieldDesc // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ListSnapshotsResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ListSnapshotsResponse.snapshots": + case "cometbft.abci.v2.ListSnapshotsResponse.snapshots": list := []*Snapshot{} return protoreflect.ValueOfList(&_ListSnapshotsResponse_1_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ListSnapshotsResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ListSnapshotsResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ListSnapshotsResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ListSnapshotsResponse does not contain field %s", fd.FullName())) } } @@ -19375,7 +19859,7 @@ func (x *fastReflection_ListSnapshotsResponse) NewField(fd protoreflect.FieldDes func (x *fastReflection_ListSnapshotsResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ListSnapshotsResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ListSnapshotsResponse", d.FullName())) } panic("unreachable") } @@ -19605,8 +20089,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_OfferSnapshotResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("OfferSnapshotResponse") + file_cometbft_abci_v2_types_proto_init() + md_OfferSnapshotResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("OfferSnapshotResponse") fd_OfferSnapshotResponse_result = md_OfferSnapshotResponse.Fields().ByName("result") } @@ -19619,7 +20103,7 @@ func (x *OfferSnapshotResponse) ProtoReflect() protoreflect.Message { } func (x *OfferSnapshotResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[27] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -19696,13 +20180,13 @@ func (x *fastReflection_OfferSnapshotResponse) Range(f func(protoreflect.FieldDe // a repeated field is populated if it is non-empty. func (x *fastReflection_OfferSnapshotResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotResponse.result": + case "cometbft.abci.v2.OfferSnapshotResponse.result": return x.Result != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotResponse does not contain field %s", fd.FullName())) } } @@ -19714,13 +20198,13 @@ func (x *fastReflection_OfferSnapshotResponse) Has(fd protoreflect.FieldDescript // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_OfferSnapshotResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotResponse.result": + case "cometbft.abci.v2.OfferSnapshotResponse.result": x.Result = 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotResponse does not contain field %s", fd.FullName())) } } @@ -19732,14 +20216,14 @@ func (x *fastReflection_OfferSnapshotResponse) Clear(fd protoreflect.FieldDescri // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_OfferSnapshotResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.OfferSnapshotResponse.result": + case "cometbft.abci.v2.OfferSnapshotResponse.result": value := x.Result return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotResponse does not contain field %s", descriptor.FullName())) } } @@ -19755,13 +20239,13 @@ func (x *fastReflection_OfferSnapshotResponse) Get(descriptor protoreflect.Field // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_OfferSnapshotResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotResponse.result": + case "cometbft.abci.v2.OfferSnapshotResponse.result": x.Result = (OfferSnapshotResult)(value.Enum()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotResponse does not contain field %s", fd.FullName())) } } @@ -19777,13 +20261,13 @@ func (x *fastReflection_OfferSnapshotResponse) Set(fd protoreflect.FieldDescript // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_OfferSnapshotResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotResponse.result": - panic(fmt.Errorf("field result of message cometbft.abci.v1.OfferSnapshotResponse is not mutable")) + case "cometbft.abci.v2.OfferSnapshotResponse.result": + panic(fmt.Errorf("field result of message cometbft.abci.v2.OfferSnapshotResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotResponse does not contain field %s", fd.FullName())) } } @@ -19792,13 +20276,13 @@ func (x *fastReflection_OfferSnapshotResponse) Mutable(fd protoreflect.FieldDesc // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_OfferSnapshotResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.OfferSnapshotResponse.result": + case "cometbft.abci.v2.OfferSnapshotResponse.result": return protoreflect.ValueOfEnum(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.OfferSnapshotResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.OfferSnapshotResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.OfferSnapshotResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.OfferSnapshotResponse does not contain field %s", fd.FullName())) } } @@ -19808,7 +20292,7 @@ func (x *fastReflection_OfferSnapshotResponse) NewField(fd protoreflect.FieldDes func (x *fastReflection_OfferSnapshotResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.OfferSnapshotResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.OfferSnapshotResponse", d.FullName())) } panic("unreachable") } @@ -20009,8 +20493,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_LoadSnapshotChunkResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("LoadSnapshotChunkResponse") + file_cometbft_abci_v2_types_proto_init() + md_LoadSnapshotChunkResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("LoadSnapshotChunkResponse") fd_LoadSnapshotChunkResponse_chunk = md_LoadSnapshotChunkResponse.Fields().ByName("chunk") } @@ -20023,7 +20507,7 @@ func (x *LoadSnapshotChunkResponse) ProtoReflect() protoreflect.Message { } func (x *LoadSnapshotChunkResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[28] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -20100,13 +20584,13 @@ func (x *fastReflection_LoadSnapshotChunkResponse) Range(f func(protoreflect.Fie // a repeated field is populated if it is non-empty. func (x *fastReflection_LoadSnapshotChunkResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkResponse.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkResponse.chunk": return len(x.Chunk) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20118,13 +20602,13 @@ func (x *fastReflection_LoadSnapshotChunkResponse) Has(fd protoreflect.FieldDesc // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LoadSnapshotChunkResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkResponse.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkResponse.chunk": x.Chunk = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20136,14 +20620,14 @@ func (x *fastReflection_LoadSnapshotChunkResponse) Clear(fd protoreflect.FieldDe // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_LoadSnapshotChunkResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkResponse.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkResponse.chunk": value := x.Chunk return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkResponse does not contain field %s", descriptor.FullName())) } } @@ -20159,13 +20643,13 @@ func (x *fastReflection_LoadSnapshotChunkResponse) Get(descriptor protoreflect.F // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LoadSnapshotChunkResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkResponse.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkResponse.chunk": x.Chunk = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20181,13 +20665,13 @@ func (x *fastReflection_LoadSnapshotChunkResponse) Set(fd protoreflect.FieldDesc // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LoadSnapshotChunkResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkResponse.chunk": - panic(fmt.Errorf("field chunk of message cometbft.abci.v1.LoadSnapshotChunkResponse is not mutable")) + case "cometbft.abci.v2.LoadSnapshotChunkResponse.chunk": + panic(fmt.Errorf("field chunk of message cometbft.abci.v2.LoadSnapshotChunkResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20196,13 +20680,13 @@ func (x *fastReflection_LoadSnapshotChunkResponse) Mutable(fd protoreflect.Field // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_LoadSnapshotChunkResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.LoadSnapshotChunkResponse.chunk": + case "cometbft.abci.v2.LoadSnapshotChunkResponse.chunk": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.LoadSnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.LoadSnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.LoadSnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20212,7 +20696,7 @@ func (x *fastReflection_LoadSnapshotChunkResponse) NewField(fd protoreflect.Fiel func (x *fastReflection_LoadSnapshotChunkResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.LoadSnapshotChunkResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.LoadSnapshotChunkResponse", d.FullName())) } panic("unreachable") } @@ -20525,8 +21009,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ApplySnapshotChunkResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("ApplySnapshotChunkResponse") + file_cometbft_abci_v2_types_proto_init() + md_ApplySnapshotChunkResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("ApplySnapshotChunkResponse") fd_ApplySnapshotChunkResponse_result = md_ApplySnapshotChunkResponse.Fields().ByName("result") fd_ApplySnapshotChunkResponse_refetch_chunks = md_ApplySnapshotChunkResponse.Fields().ByName("refetch_chunks") fd_ApplySnapshotChunkResponse_reject_senders = md_ApplySnapshotChunkResponse.Fields().ByName("reject_senders") @@ -20541,7 +21025,7 @@ func (x *ApplySnapshotChunkResponse) ProtoReflect() protoreflect.Message { } func (x *ApplySnapshotChunkResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[29] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -20630,17 +21114,17 @@ func (x *fastReflection_ApplySnapshotChunkResponse) Range(f func(protoreflect.Fi // a repeated field is populated if it is non-empty. func (x *fastReflection_ApplySnapshotChunkResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkResponse.result": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.result": return x.Result != 0 - case "cometbft.abci.v1.ApplySnapshotChunkResponse.refetch_chunks": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.refetch_chunks": return len(x.RefetchChunks) != 0 - case "cometbft.abci.v1.ApplySnapshotChunkResponse.reject_senders": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.reject_senders": return len(x.RejectSenders) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20652,17 +21136,17 @@ func (x *fastReflection_ApplySnapshotChunkResponse) Has(fd protoreflect.FieldDes // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ApplySnapshotChunkResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkResponse.result": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.result": x.Result = 0 - case "cometbft.abci.v1.ApplySnapshotChunkResponse.refetch_chunks": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.refetch_chunks": x.RefetchChunks = nil - case "cometbft.abci.v1.ApplySnapshotChunkResponse.reject_senders": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.reject_senders": x.RejectSenders = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20674,16 +21158,16 @@ func (x *fastReflection_ApplySnapshotChunkResponse) Clear(fd protoreflect.FieldD // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ApplySnapshotChunkResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkResponse.result": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.result": value := x.Result return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "cometbft.abci.v1.ApplySnapshotChunkResponse.refetch_chunks": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.refetch_chunks": if len(x.RefetchChunks) == 0 { return protoreflect.ValueOfList(&_ApplySnapshotChunkResponse_2_list{}) } listValue := &_ApplySnapshotChunkResponse_2_list{list: &x.RefetchChunks} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.ApplySnapshotChunkResponse.reject_senders": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.reject_senders": if len(x.RejectSenders) == 0 { return protoreflect.ValueOfList(&_ApplySnapshotChunkResponse_3_list{}) } @@ -20691,9 +21175,9 @@ func (x *fastReflection_ApplySnapshotChunkResponse) Get(descriptor protoreflect. return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkResponse does not contain field %s", descriptor.FullName())) } } @@ -20709,21 +21193,21 @@ func (x *fastReflection_ApplySnapshotChunkResponse) Get(descriptor protoreflect. // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ApplySnapshotChunkResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkResponse.result": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.result": x.Result = (ApplySnapshotChunkResult)(value.Enum()) - case "cometbft.abci.v1.ApplySnapshotChunkResponse.refetch_chunks": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.refetch_chunks": lv := value.List() clv := lv.(*_ApplySnapshotChunkResponse_2_list) x.RefetchChunks = *clv.list - case "cometbft.abci.v1.ApplySnapshotChunkResponse.reject_senders": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.reject_senders": lv := value.List() clv := lv.(*_ApplySnapshotChunkResponse_3_list) x.RejectSenders = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20739,25 +21223,25 @@ func (x *fastReflection_ApplySnapshotChunkResponse) Set(fd protoreflect.FieldDes // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ApplySnapshotChunkResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkResponse.refetch_chunks": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.refetch_chunks": if x.RefetchChunks == nil { x.RefetchChunks = []uint32{} } value := &_ApplySnapshotChunkResponse_2_list{list: &x.RefetchChunks} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.ApplySnapshotChunkResponse.reject_senders": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.reject_senders": if x.RejectSenders == nil { x.RejectSenders = []string{} } value := &_ApplySnapshotChunkResponse_3_list{list: &x.RejectSenders} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.ApplySnapshotChunkResponse.result": - panic(fmt.Errorf("field result of message cometbft.abci.v1.ApplySnapshotChunkResponse is not mutable")) + case "cometbft.abci.v2.ApplySnapshotChunkResponse.result": + panic(fmt.Errorf("field result of message cometbft.abci.v2.ApplySnapshotChunkResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20766,19 +21250,19 @@ func (x *fastReflection_ApplySnapshotChunkResponse) Mutable(fd protoreflect.Fiel // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ApplySnapshotChunkResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ApplySnapshotChunkResponse.result": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.result": return protoreflect.ValueOfEnum(0) - case "cometbft.abci.v1.ApplySnapshotChunkResponse.refetch_chunks": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.refetch_chunks": list := []uint32{} return protoreflect.ValueOfList(&_ApplySnapshotChunkResponse_2_list{list: &list}) - case "cometbft.abci.v1.ApplySnapshotChunkResponse.reject_senders": + case "cometbft.abci.v2.ApplySnapshotChunkResponse.reject_senders": list := []string{} return protoreflect.ValueOfList(&_ApplySnapshotChunkResponse_3_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ApplySnapshotChunkResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ApplySnapshotChunkResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ApplySnapshotChunkResponse does not contain field %s", fd.FullName())) } } @@ -20788,7 +21272,7 @@ func (x *fastReflection_ApplySnapshotChunkResponse) NewField(fd protoreflect.Fie func (x *fastReflection_ApplySnapshotChunkResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ApplySnapshotChunkResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ApplySnapshotChunkResponse", d.FullName())) } panic("unreachable") } @@ -21185,8 +21669,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_PrepareProposalResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("PrepareProposalResponse") + file_cometbft_abci_v2_types_proto_init() + md_PrepareProposalResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("PrepareProposalResponse") fd_PrepareProposalResponse_txs = md_PrepareProposalResponse.Fields().ByName("txs") } @@ -21199,7 +21683,7 @@ func (x *PrepareProposalResponse) ProtoReflect() protoreflect.Message { } func (x *PrepareProposalResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[30] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -21276,13 +21760,13 @@ func (x *fastReflection_PrepareProposalResponse) Range(f func(protoreflect.Field // a repeated field is populated if it is non-empty. func (x *fastReflection_PrepareProposalResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalResponse.txs": + case "cometbft.abci.v2.PrepareProposalResponse.txs": return len(x.Txs) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalResponse does not contain field %s", fd.FullName())) } } @@ -21294,13 +21778,13 @@ func (x *fastReflection_PrepareProposalResponse) Has(fd protoreflect.FieldDescri // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PrepareProposalResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalResponse.txs": + case "cometbft.abci.v2.PrepareProposalResponse.txs": x.Txs = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalResponse does not contain field %s", fd.FullName())) } } @@ -21312,7 +21796,7 @@ func (x *fastReflection_PrepareProposalResponse) Clear(fd protoreflect.FieldDesc // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_PrepareProposalResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.PrepareProposalResponse.txs": + case "cometbft.abci.v2.PrepareProposalResponse.txs": if len(x.Txs) == 0 { return protoreflect.ValueOfList(&_PrepareProposalResponse_1_list{}) } @@ -21320,9 +21804,9 @@ func (x *fastReflection_PrepareProposalResponse) Get(descriptor protoreflect.Fie return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalResponse does not contain field %s", descriptor.FullName())) } } @@ -21338,15 +21822,15 @@ func (x *fastReflection_PrepareProposalResponse) Get(descriptor protoreflect.Fie // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PrepareProposalResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalResponse.txs": + case "cometbft.abci.v2.PrepareProposalResponse.txs": lv := value.List() clv := lv.(*_PrepareProposalResponse_1_list) x.Txs = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalResponse does not contain field %s", fd.FullName())) } } @@ -21362,7 +21846,7 @@ func (x *fastReflection_PrepareProposalResponse) Set(fd protoreflect.FieldDescri // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PrepareProposalResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalResponse.txs": + case "cometbft.abci.v2.PrepareProposalResponse.txs": if x.Txs == nil { x.Txs = [][]byte{} } @@ -21370,9 +21854,9 @@ func (x *fastReflection_PrepareProposalResponse) Mutable(fd protoreflect.FieldDe return protoreflect.ValueOfList(value) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalResponse does not contain field %s", fd.FullName())) } } @@ -21381,14 +21865,14 @@ func (x *fastReflection_PrepareProposalResponse) Mutable(fd protoreflect.FieldDe // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_PrepareProposalResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.PrepareProposalResponse.txs": + case "cometbft.abci.v2.PrepareProposalResponse.txs": list := [][]byte{} return protoreflect.ValueOfList(&_PrepareProposalResponse_1_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.PrepareProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.PrepareProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.PrepareProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.PrepareProposalResponse does not contain field %s", fd.FullName())) } } @@ -21398,7 +21882,7 @@ func (x *fastReflection_PrepareProposalResponse) NewField(fd protoreflect.FieldD func (x *fastReflection_PrepareProposalResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.PrepareProposalResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.PrepareProposalResponse", d.FullName())) } panic("unreachable") } @@ -21619,8 +22103,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ProcessProposalResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("ProcessProposalResponse") + file_cometbft_abci_v2_types_proto_init() + md_ProcessProposalResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("ProcessProposalResponse") fd_ProcessProposalResponse_status = md_ProcessProposalResponse.Fields().ByName("status") } @@ -21633,7 +22117,7 @@ func (x *ProcessProposalResponse) ProtoReflect() protoreflect.Message { } func (x *ProcessProposalResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[31] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -21710,13 +22194,13 @@ func (x *fastReflection_ProcessProposalResponse) Range(f func(protoreflect.Field // a repeated field is populated if it is non-empty. func (x *fastReflection_ProcessProposalResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalResponse.status": + case "cometbft.abci.v2.ProcessProposalResponse.status": return x.Status != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalResponse does not contain field %s", fd.FullName())) } } @@ -21728,13 +22212,13 @@ func (x *fastReflection_ProcessProposalResponse) Has(fd protoreflect.FieldDescri // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ProcessProposalResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalResponse.status": + case "cometbft.abci.v2.ProcessProposalResponse.status": x.Status = 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalResponse does not contain field %s", fd.FullName())) } } @@ -21746,14 +22230,14 @@ func (x *fastReflection_ProcessProposalResponse) Clear(fd protoreflect.FieldDesc // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ProcessProposalResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ProcessProposalResponse.status": + case "cometbft.abci.v2.ProcessProposalResponse.status": value := x.Status return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalResponse does not contain field %s", descriptor.FullName())) } } @@ -21769,13 +22253,13 @@ func (x *fastReflection_ProcessProposalResponse) Get(descriptor protoreflect.Fie // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ProcessProposalResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalResponse.status": + case "cometbft.abci.v2.ProcessProposalResponse.status": x.Status = (ProcessProposalStatus)(value.Enum()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalResponse does not contain field %s", fd.FullName())) } } @@ -21791,13 +22275,13 @@ func (x *fastReflection_ProcessProposalResponse) Set(fd protoreflect.FieldDescri // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ProcessProposalResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalResponse.status": - panic(fmt.Errorf("field status of message cometbft.abci.v1.ProcessProposalResponse is not mutable")) + case "cometbft.abci.v2.ProcessProposalResponse.status": + panic(fmt.Errorf("field status of message cometbft.abci.v2.ProcessProposalResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalResponse does not contain field %s", fd.FullName())) } } @@ -21806,13 +22290,13 @@ func (x *fastReflection_ProcessProposalResponse) Mutable(fd protoreflect.FieldDe // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ProcessProposalResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ProcessProposalResponse.status": + case "cometbft.abci.v2.ProcessProposalResponse.status": return protoreflect.ValueOfEnum(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ProcessProposalResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ProcessProposalResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ProcessProposalResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ProcessProposalResponse does not contain field %s", fd.FullName())) } } @@ -21822,7 +22306,7 @@ func (x *fastReflection_ProcessProposalResponse) NewField(fd protoreflect.FieldD func (x *fastReflection_ProcessProposalResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ProcessProposalResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ProcessProposalResponse", d.FullName())) } panic("unreachable") } @@ -22018,14 +22502,16 @@ func (x *fastReflection_ProcessProposalResponse) ProtoMethods() *protoiface.Meth } var ( - md_ExtendVoteResponse protoreflect.MessageDescriptor - fd_ExtendVoteResponse_vote_extension protoreflect.FieldDescriptor + md_ExtendVoteResponse protoreflect.MessageDescriptor + fd_ExtendVoteResponse_vote_extension protoreflect.FieldDescriptor + fd_ExtendVoteResponse_non_rp_extension protoreflect.FieldDescriptor ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ExtendVoteResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("ExtendVoteResponse") + file_cometbft_abci_v2_types_proto_init() + md_ExtendVoteResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("ExtendVoteResponse") fd_ExtendVoteResponse_vote_extension = md_ExtendVoteResponse.Fields().ByName("vote_extension") + fd_ExtendVoteResponse_non_rp_extension = md_ExtendVoteResponse.Fields().ByName("non_rp_extension") } var _ protoreflect.Message = (*fastReflection_ExtendVoteResponse)(nil) @@ -22037,7 +22523,7 @@ func (x *ExtendVoteResponse) ProtoReflect() protoreflect.Message { } func (x *ExtendVoteResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[32] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -22099,6 +22585,12 @@ func (x *fastReflection_ExtendVoteResponse) Range(f func(protoreflect.FieldDescr return } } + if len(x.NonRpExtension) != 0 { + value := protoreflect.ValueOfBytes(x.NonRpExtension) + if !f(fd_ExtendVoteResponse_non_rp_extension, value) { + return + } + } } // Has reports whether a field is populated. @@ -22114,13 +22606,15 @@ func (x *fastReflection_ExtendVoteResponse) Range(f func(protoreflect.FieldDescr // a repeated field is populated if it is non-empty. func (x *fastReflection_ExtendVoteResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteResponse.vote_extension": + case "cometbft.abci.v2.ExtendVoteResponse.vote_extension": return len(x.VoteExtension) != 0 + case "cometbft.abci.v2.ExtendVoteResponse.non_rp_extension": + return len(x.NonRpExtension) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteResponse does not contain field %s", fd.FullName())) } } @@ -22132,13 +22626,15 @@ func (x *fastReflection_ExtendVoteResponse) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendVoteResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteResponse.vote_extension": + case "cometbft.abci.v2.ExtendVoteResponse.vote_extension": x.VoteExtension = nil + case "cometbft.abci.v2.ExtendVoteResponse.non_rp_extension": + x.NonRpExtension = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteResponse does not contain field %s", fd.FullName())) } } @@ -22150,14 +22646,17 @@ func (x *fastReflection_ExtendVoteResponse) Clear(fd protoreflect.FieldDescripto // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ExtendVoteResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ExtendVoteResponse.vote_extension": + case "cometbft.abci.v2.ExtendVoteResponse.vote_extension": value := x.VoteExtension return protoreflect.ValueOfBytes(value) + case "cometbft.abci.v2.ExtendVoteResponse.non_rp_extension": + value := x.NonRpExtension + return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteResponse does not contain field %s", descriptor.FullName())) } } @@ -22173,13 +22672,15 @@ func (x *fastReflection_ExtendVoteResponse) Get(descriptor protoreflect.FieldDes // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendVoteResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteResponse.vote_extension": + case "cometbft.abci.v2.ExtendVoteResponse.vote_extension": x.VoteExtension = value.Bytes() + case "cometbft.abci.v2.ExtendVoteResponse.non_rp_extension": + x.NonRpExtension = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteResponse does not contain field %s", fd.FullName())) } } @@ -22195,13 +22696,15 @@ func (x *fastReflection_ExtendVoteResponse) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendVoteResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteResponse.vote_extension": - panic(fmt.Errorf("field vote_extension of message cometbft.abci.v1.ExtendVoteResponse is not mutable")) + case "cometbft.abci.v2.ExtendVoteResponse.vote_extension": + panic(fmt.Errorf("field vote_extension of message cometbft.abci.v2.ExtendVoteResponse is not mutable")) + case "cometbft.abci.v2.ExtendVoteResponse.non_rp_extension": + panic(fmt.Errorf("field non_rp_extension of message cometbft.abci.v2.ExtendVoteResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteResponse does not contain field %s", fd.FullName())) } } @@ -22210,13 +22713,15 @@ func (x *fastReflection_ExtendVoteResponse) Mutable(fd protoreflect.FieldDescrip // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ExtendVoteResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExtendVoteResponse.vote_extension": + case "cometbft.abci.v2.ExtendVoteResponse.vote_extension": + return protoreflect.ValueOfBytes(nil) + case "cometbft.abci.v2.ExtendVoteResponse.non_rp_extension": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendVoteResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendVoteResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendVoteResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendVoteResponse does not contain field %s", fd.FullName())) } } @@ -22226,7 +22731,7 @@ func (x *fastReflection_ExtendVoteResponse) NewField(fd protoreflect.FieldDescri func (x *fastReflection_ExtendVoteResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ExtendVoteResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ExtendVoteResponse", d.FullName())) } panic("unreachable") } @@ -22285,6 +22790,10 @@ func (x *fastReflection_ExtendVoteResponse) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + l = len(x.NonRpExtension) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -22314,6 +22823,13 @@ func (x *fastReflection_ExtendVoteResponse) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.NonRpExtension) > 0 { + i -= len(x.NonRpExtension) + copy(dAtA[i:], x.NonRpExtension) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.NonRpExtension))) + i-- + dAtA[i] = 0x12 + } if len(x.VoteExtension) > 0 { i -= len(x.VoteExtension) copy(dAtA[i:], x.VoteExtension) @@ -22404,6 +22920,40 @@ func (x *fastReflection_ExtendVoteResponse) ProtoMethods() *protoiface.Methods { x.VoteExtension = []byte{} } iNdEx = postIndex + case 2: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NonRpExtension", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.NonRpExtension = append(x.NonRpExtension[:0], dAtA[iNdEx:postIndex]...) + if x.NonRpExtension == nil { + x.NonRpExtension = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -22445,8 +22995,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_VerifyVoteExtensionResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("VerifyVoteExtensionResponse") + file_cometbft_abci_v2_types_proto_init() + md_VerifyVoteExtensionResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("VerifyVoteExtensionResponse") fd_VerifyVoteExtensionResponse_status = md_VerifyVoteExtensionResponse.Fields().ByName("status") } @@ -22459,7 +23009,7 @@ func (x *VerifyVoteExtensionResponse) ProtoReflect() protoreflect.Message { } func (x *VerifyVoteExtensionResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[33] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -22536,13 +23086,13 @@ func (x *fastReflection_VerifyVoteExtensionResponse) Range(f func(protoreflect.F // a repeated field is populated if it is non-empty. func (x *fastReflection_VerifyVoteExtensionResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionResponse.status": + case "cometbft.abci.v2.VerifyVoteExtensionResponse.status": return x.Status != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) } } @@ -22554,13 +23104,13 @@ func (x *fastReflection_VerifyVoteExtensionResponse) Has(fd protoreflect.FieldDe // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VerifyVoteExtensionResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionResponse.status": + case "cometbft.abci.v2.VerifyVoteExtensionResponse.status": x.Status = 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) } } @@ -22572,14 +23122,14 @@ func (x *fastReflection_VerifyVoteExtensionResponse) Clear(fd protoreflect.Field // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_VerifyVoteExtensionResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionResponse.status": + case "cometbft.abci.v2.VerifyVoteExtensionResponse.status": value := x.Status return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionResponse does not contain field %s", descriptor.FullName())) } } @@ -22595,13 +23145,13 @@ func (x *fastReflection_VerifyVoteExtensionResponse) Get(descriptor protoreflect // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VerifyVoteExtensionResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionResponse.status": + case "cometbft.abci.v2.VerifyVoteExtensionResponse.status": x.Status = (VerifyVoteExtensionStatus)(value.Enum()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) } } @@ -22617,13 +23167,13 @@ func (x *fastReflection_VerifyVoteExtensionResponse) Set(fd protoreflect.FieldDe // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VerifyVoteExtensionResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionResponse.status": - panic(fmt.Errorf("field status of message cometbft.abci.v1.VerifyVoteExtensionResponse is not mutable")) + case "cometbft.abci.v2.VerifyVoteExtensionResponse.status": + panic(fmt.Errorf("field status of message cometbft.abci.v2.VerifyVoteExtensionResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) } } @@ -22632,13 +23182,13 @@ func (x *fastReflection_VerifyVoteExtensionResponse) Mutable(fd protoreflect.Fie // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_VerifyVoteExtensionResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.VerifyVoteExtensionResponse.status": + case "cometbft.abci.v2.VerifyVoteExtensionResponse.status": return protoreflect.ValueOfEnum(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VerifyVoteExtensionResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VerifyVoteExtensionResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VerifyVoteExtensionResponse does not contain field %s", fd.FullName())) } } @@ -22648,7 +23198,7 @@ func (x *fastReflection_VerifyVoteExtensionResponse) NewField(fd protoreflect.Fi func (x *fastReflection_VerifyVoteExtensionResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.VerifyVoteExtensionResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.VerifyVoteExtensionResponse", d.FullName())) } panic("unreachable") } @@ -23003,16 +23553,18 @@ var ( fd_FinalizeBlockResponse_validator_updates protoreflect.FieldDescriptor fd_FinalizeBlockResponse_consensus_param_updates protoreflect.FieldDescriptor fd_FinalizeBlockResponse_app_hash protoreflect.FieldDescriptor + fd_FinalizeBlockResponse_next_block_delay protoreflect.FieldDescriptor ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_FinalizeBlockResponse = File_cometbft_abci_v1_types_proto.Messages().ByName("FinalizeBlockResponse") + file_cometbft_abci_v2_types_proto_init() + md_FinalizeBlockResponse = File_cometbft_abci_v2_types_proto.Messages().ByName("FinalizeBlockResponse") fd_FinalizeBlockResponse_events = md_FinalizeBlockResponse.Fields().ByName("events") fd_FinalizeBlockResponse_tx_results = md_FinalizeBlockResponse.Fields().ByName("tx_results") fd_FinalizeBlockResponse_validator_updates = md_FinalizeBlockResponse.Fields().ByName("validator_updates") fd_FinalizeBlockResponse_consensus_param_updates = md_FinalizeBlockResponse.Fields().ByName("consensus_param_updates") fd_FinalizeBlockResponse_app_hash = md_FinalizeBlockResponse.Fields().ByName("app_hash") + fd_FinalizeBlockResponse_next_block_delay = md_FinalizeBlockResponse.Fields().ByName("next_block_delay") } var _ protoreflect.Message = (*fastReflection_FinalizeBlockResponse)(nil) @@ -23024,7 +23576,7 @@ func (x *FinalizeBlockResponse) ProtoReflect() protoreflect.Message { } func (x *FinalizeBlockResponse) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[34] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[34] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -23110,6 +23662,12 @@ func (x *fastReflection_FinalizeBlockResponse) Range(f func(protoreflect.FieldDe return } } + if x.NextBlockDelay != nil { + value := protoreflect.ValueOfMessage(x.NextBlockDelay.ProtoReflect()) + if !f(fd_FinalizeBlockResponse_next_block_delay, value) { + return + } + } } // Has reports whether a field is populated. @@ -23125,21 +23683,23 @@ func (x *fastReflection_FinalizeBlockResponse) Range(f func(protoreflect.FieldDe // a repeated field is populated if it is non-empty. func (x *fastReflection_FinalizeBlockResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockResponse.events": + case "cometbft.abci.v2.FinalizeBlockResponse.events": return len(x.Events) != 0 - case "cometbft.abci.v1.FinalizeBlockResponse.tx_results": + case "cometbft.abci.v2.FinalizeBlockResponse.tx_results": return len(x.TxResults) != 0 - case "cometbft.abci.v1.FinalizeBlockResponse.validator_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.validator_updates": return len(x.ValidatorUpdates) != 0 - case "cometbft.abci.v1.FinalizeBlockResponse.consensus_param_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.consensus_param_updates": return x.ConsensusParamUpdates != nil - case "cometbft.abci.v1.FinalizeBlockResponse.app_hash": + case "cometbft.abci.v2.FinalizeBlockResponse.app_hash": return len(x.AppHash) != 0 + case "cometbft.abci.v2.FinalizeBlockResponse.next_block_delay": + return x.NextBlockDelay != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockResponse does not contain field %s", fd.FullName())) } } @@ -23151,21 +23711,23 @@ func (x *fastReflection_FinalizeBlockResponse) Has(fd protoreflect.FieldDescript // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FinalizeBlockResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockResponse.events": + case "cometbft.abci.v2.FinalizeBlockResponse.events": x.Events = nil - case "cometbft.abci.v1.FinalizeBlockResponse.tx_results": + case "cometbft.abci.v2.FinalizeBlockResponse.tx_results": x.TxResults = nil - case "cometbft.abci.v1.FinalizeBlockResponse.validator_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.validator_updates": x.ValidatorUpdates = nil - case "cometbft.abci.v1.FinalizeBlockResponse.consensus_param_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.consensus_param_updates": x.ConsensusParamUpdates = nil - case "cometbft.abci.v1.FinalizeBlockResponse.app_hash": + case "cometbft.abci.v2.FinalizeBlockResponse.app_hash": x.AppHash = nil + case "cometbft.abci.v2.FinalizeBlockResponse.next_block_delay": + x.NextBlockDelay = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockResponse does not contain field %s", fd.FullName())) } } @@ -23177,35 +23739,38 @@ func (x *fastReflection_FinalizeBlockResponse) Clear(fd protoreflect.FieldDescri // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_FinalizeBlockResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.FinalizeBlockResponse.events": + case "cometbft.abci.v2.FinalizeBlockResponse.events": if len(x.Events) == 0 { return protoreflect.ValueOfList(&_FinalizeBlockResponse_1_list{}) } listValue := &_FinalizeBlockResponse_1_list{list: &x.Events} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.FinalizeBlockResponse.tx_results": + case "cometbft.abci.v2.FinalizeBlockResponse.tx_results": if len(x.TxResults) == 0 { return protoreflect.ValueOfList(&_FinalizeBlockResponse_2_list{}) } listValue := &_FinalizeBlockResponse_2_list{list: &x.TxResults} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.FinalizeBlockResponse.validator_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.validator_updates": if len(x.ValidatorUpdates) == 0 { return protoreflect.ValueOfList(&_FinalizeBlockResponse_3_list{}) } listValue := &_FinalizeBlockResponse_3_list{list: &x.ValidatorUpdates} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.FinalizeBlockResponse.consensus_param_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.consensus_param_updates": value := x.ConsensusParamUpdates return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockResponse.app_hash": + case "cometbft.abci.v2.FinalizeBlockResponse.app_hash": value := x.AppHash return protoreflect.ValueOfBytes(value) + case "cometbft.abci.v2.FinalizeBlockResponse.next_block_delay": + value := x.NextBlockDelay + return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockResponse does not contain field %s", descriptor.FullName())) } } @@ -23221,27 +23786,29 @@ func (x *fastReflection_FinalizeBlockResponse) Get(descriptor protoreflect.Field // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FinalizeBlockResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockResponse.events": + case "cometbft.abci.v2.FinalizeBlockResponse.events": lv := value.List() clv := lv.(*_FinalizeBlockResponse_1_list) x.Events = *clv.list - case "cometbft.abci.v1.FinalizeBlockResponse.tx_results": + case "cometbft.abci.v2.FinalizeBlockResponse.tx_results": lv := value.List() clv := lv.(*_FinalizeBlockResponse_2_list) x.TxResults = *clv.list - case "cometbft.abci.v1.FinalizeBlockResponse.validator_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.validator_updates": lv := value.List() clv := lv.(*_FinalizeBlockResponse_3_list) x.ValidatorUpdates = *clv.list - case "cometbft.abci.v1.FinalizeBlockResponse.consensus_param_updates": - x.ConsensusParamUpdates = value.Message().Interface().(*v1.ConsensusParams) - case "cometbft.abci.v1.FinalizeBlockResponse.app_hash": + case "cometbft.abci.v2.FinalizeBlockResponse.consensus_param_updates": + x.ConsensusParamUpdates = value.Message().Interface().(*v2.ConsensusParams) + case "cometbft.abci.v2.FinalizeBlockResponse.app_hash": x.AppHash = value.Bytes() + case "cometbft.abci.v2.FinalizeBlockResponse.next_block_delay": + x.NextBlockDelay = value.Message().Interface().(*durationpb.Duration) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockResponse does not contain field %s", fd.FullName())) } } @@ -23257,36 +23824,41 @@ func (x *fastReflection_FinalizeBlockResponse) Set(fd protoreflect.FieldDescript // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FinalizeBlockResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockResponse.events": + case "cometbft.abci.v2.FinalizeBlockResponse.events": if x.Events == nil { x.Events = []*Event{} } value := &_FinalizeBlockResponse_1_list{list: &x.Events} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.FinalizeBlockResponse.tx_results": + case "cometbft.abci.v2.FinalizeBlockResponse.tx_results": if x.TxResults == nil { x.TxResults = []*ExecTxResult{} } value := &_FinalizeBlockResponse_2_list{list: &x.TxResults} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.FinalizeBlockResponse.validator_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.validator_updates": if x.ValidatorUpdates == nil { x.ValidatorUpdates = []*ValidatorUpdate{} } value := &_FinalizeBlockResponse_3_list{list: &x.ValidatorUpdates} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.FinalizeBlockResponse.consensus_param_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.consensus_param_updates": if x.ConsensusParamUpdates == nil { - x.ConsensusParamUpdates = new(v1.ConsensusParams) + x.ConsensusParamUpdates = new(v2.ConsensusParams) } return protoreflect.ValueOfMessage(x.ConsensusParamUpdates.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockResponse.app_hash": - panic(fmt.Errorf("field app_hash of message cometbft.abci.v1.FinalizeBlockResponse is not mutable")) + case "cometbft.abci.v2.FinalizeBlockResponse.next_block_delay": + if x.NextBlockDelay == nil { + x.NextBlockDelay = new(durationpb.Duration) + } + return protoreflect.ValueOfMessage(x.NextBlockDelay.ProtoReflect()) + case "cometbft.abci.v2.FinalizeBlockResponse.app_hash": + panic(fmt.Errorf("field app_hash of message cometbft.abci.v2.FinalizeBlockResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockResponse does not contain field %s", fd.FullName())) } } @@ -23295,25 +23867,28 @@ func (x *fastReflection_FinalizeBlockResponse) Mutable(fd protoreflect.FieldDesc // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_FinalizeBlockResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.FinalizeBlockResponse.events": + case "cometbft.abci.v2.FinalizeBlockResponse.events": list := []*Event{} return protoreflect.ValueOfList(&_FinalizeBlockResponse_1_list{list: &list}) - case "cometbft.abci.v1.FinalizeBlockResponse.tx_results": + case "cometbft.abci.v2.FinalizeBlockResponse.tx_results": list := []*ExecTxResult{} return protoreflect.ValueOfList(&_FinalizeBlockResponse_2_list{list: &list}) - case "cometbft.abci.v1.FinalizeBlockResponse.validator_updates": + case "cometbft.abci.v2.FinalizeBlockResponse.validator_updates": list := []*ValidatorUpdate{} return protoreflect.ValueOfList(&_FinalizeBlockResponse_3_list{list: &list}) - case "cometbft.abci.v1.FinalizeBlockResponse.consensus_param_updates": - m := new(v1.ConsensusParams) + case "cometbft.abci.v2.FinalizeBlockResponse.consensus_param_updates": + m := new(v2.ConsensusParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.FinalizeBlockResponse.app_hash": + case "cometbft.abci.v2.FinalizeBlockResponse.app_hash": return protoreflect.ValueOfBytes(nil) + case "cometbft.abci.v2.FinalizeBlockResponse.next_block_delay": + m := new(durationpb.Duration) + return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.FinalizeBlockResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.FinalizeBlockResponse")) } - panic(fmt.Errorf("message cometbft.abci.v1.FinalizeBlockResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.FinalizeBlockResponse does not contain field %s", fd.FullName())) } } @@ -23323,7 +23898,7 @@ func (x *fastReflection_FinalizeBlockResponse) NewField(fd protoreflect.FieldDes func (x *fastReflection_FinalizeBlockResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.FinalizeBlockResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.FinalizeBlockResponse", d.FullName())) } panic("unreachable") } @@ -23404,6 +23979,10 @@ func (x *fastReflection_FinalizeBlockResponse) ProtoMethods() *protoiface.Method if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + if x.NextBlockDelay != nil { + l = options.Size(x.NextBlockDelay) + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -23433,6 +24012,20 @@ func (x *fastReflection_FinalizeBlockResponse) ProtoMethods() *protoiface.Method i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if x.NextBlockDelay != nil { + encoded, err := options.Marshal(x.NextBlockDelay) + if err != nil { + return protoiface.MarshalOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Buf: input.Buf, + }, err + } + i -= len(encoded) + copy(dAtA[i:], encoded) + i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) + i-- + dAtA[i] = 0x32 + } if len(x.AppHash) > 0 { i -= len(x.AppHash) copy(dAtA[i:], x.AppHash) @@ -23683,7 +24276,7 @@ func (x *fastReflection_FinalizeBlockResponse) ProtoMethods() *protoiface.Method return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.ConsensusParamUpdates == nil { - x.ConsensusParamUpdates = &v1.ConsensusParams{} + x.ConsensusParamUpdates = &v2.ConsensusParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.ConsensusParamUpdates); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -23723,6 +24316,42 @@ func (x *fastReflection_FinalizeBlockResponse) ProtoMethods() *protoiface.Method x.AppHash = []byte{} } iNdEx = postIndex + case 6: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NextBlockDelay", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + if x.NextBlockDelay == nil { + x.NextBlockDelay = &durationpb.Duration{} + } + if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.NextBlockDelay); err != nil { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -23816,8 +24445,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_CommitInfo = File_cometbft_abci_v1_types_proto.Messages().ByName("CommitInfo") + file_cometbft_abci_v2_types_proto_init() + md_CommitInfo = File_cometbft_abci_v2_types_proto.Messages().ByName("CommitInfo") fd_CommitInfo_round = md_CommitInfo.Fields().ByName("round") fd_CommitInfo_votes = md_CommitInfo.Fields().ByName("votes") } @@ -23831,7 +24460,7 @@ func (x *CommitInfo) ProtoReflect() protoreflect.Message { } func (x *CommitInfo) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[35] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[35] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -23914,15 +24543,15 @@ func (x *fastReflection_CommitInfo) Range(f func(protoreflect.FieldDescriptor, p // a repeated field is populated if it is non-empty. func (x *fastReflection_CommitInfo) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.CommitInfo.round": + case "cometbft.abci.v2.CommitInfo.round": return x.Round != int32(0) - case "cometbft.abci.v1.CommitInfo.votes": + case "cometbft.abci.v2.CommitInfo.votes": return len(x.Votes) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitInfo does not contain field %s", fd.FullName())) } } @@ -23934,15 +24563,15 @@ func (x *fastReflection_CommitInfo) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitInfo) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.CommitInfo.round": + case "cometbft.abci.v2.CommitInfo.round": x.Round = int32(0) - case "cometbft.abci.v1.CommitInfo.votes": + case "cometbft.abci.v2.CommitInfo.votes": x.Votes = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitInfo does not contain field %s", fd.FullName())) } } @@ -23954,10 +24583,10 @@ func (x *fastReflection_CommitInfo) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CommitInfo) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.CommitInfo.round": + case "cometbft.abci.v2.CommitInfo.round": value := x.Round return protoreflect.ValueOfInt32(value) - case "cometbft.abci.v1.CommitInfo.votes": + case "cometbft.abci.v2.CommitInfo.votes": if len(x.Votes) == 0 { return protoreflect.ValueOfList(&_CommitInfo_2_list{}) } @@ -23965,9 +24594,9 @@ func (x *fastReflection_CommitInfo) Get(descriptor protoreflect.FieldDescriptor) return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitInfo does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitInfo does not contain field %s", descriptor.FullName())) } } @@ -23983,17 +24612,17 @@ func (x *fastReflection_CommitInfo) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitInfo) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.CommitInfo.round": + case "cometbft.abci.v2.CommitInfo.round": x.Round = int32(value.Int()) - case "cometbft.abci.v1.CommitInfo.votes": + case "cometbft.abci.v2.CommitInfo.votes": lv := value.List() clv := lv.(*_CommitInfo_2_list) x.Votes = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitInfo does not contain field %s", fd.FullName())) } } @@ -24009,19 +24638,19 @@ func (x *fastReflection_CommitInfo) Set(fd protoreflect.FieldDescriptor, value p // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitInfo) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.CommitInfo.votes": + case "cometbft.abci.v2.CommitInfo.votes": if x.Votes == nil { x.Votes = []*VoteInfo{} } value := &_CommitInfo_2_list{list: &x.Votes} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.CommitInfo.round": - panic(fmt.Errorf("field round of message cometbft.abci.v1.CommitInfo is not mutable")) + case "cometbft.abci.v2.CommitInfo.round": + panic(fmt.Errorf("field round of message cometbft.abci.v2.CommitInfo is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitInfo does not contain field %s", fd.FullName())) } } @@ -24030,16 +24659,16 @@ func (x *fastReflection_CommitInfo) Mutable(fd protoreflect.FieldDescriptor) pro // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CommitInfo) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.CommitInfo.round": + case "cometbft.abci.v2.CommitInfo.round": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.abci.v1.CommitInfo.votes": + case "cometbft.abci.v2.CommitInfo.votes": list := []*VoteInfo{} return protoreflect.ValueOfList(&_CommitInfo_2_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.CommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.CommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.CommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.CommitInfo does not contain field %s", fd.FullName())) } } @@ -24049,7 +24678,7 @@ func (x *fastReflection_CommitInfo) NewField(fd protoreflect.FieldDescriptor) pr func (x *fastReflection_CommitInfo) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.CommitInfo", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.CommitInfo", d.FullName())) } panic("unreachable") } @@ -24358,8 +24987,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ExtendedCommitInfo = File_cometbft_abci_v1_types_proto.Messages().ByName("ExtendedCommitInfo") + file_cometbft_abci_v2_types_proto_init() + md_ExtendedCommitInfo = File_cometbft_abci_v2_types_proto.Messages().ByName("ExtendedCommitInfo") fd_ExtendedCommitInfo_round = md_ExtendedCommitInfo.Fields().ByName("round") fd_ExtendedCommitInfo_votes = md_ExtendedCommitInfo.Fields().ByName("votes") } @@ -24373,7 +25002,7 @@ func (x *ExtendedCommitInfo) ProtoReflect() protoreflect.Message { } func (x *ExtendedCommitInfo) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[36] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[36] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -24456,15 +25085,15 @@ func (x *fastReflection_ExtendedCommitInfo) Range(f func(protoreflect.FieldDescr // a repeated field is populated if it is non-empty. func (x *fastReflection_ExtendedCommitInfo) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedCommitInfo.round": + case "cometbft.abci.v2.ExtendedCommitInfo.round": return x.Round != int32(0) - case "cometbft.abci.v1.ExtendedCommitInfo.votes": + case "cometbft.abci.v2.ExtendedCommitInfo.votes": return len(x.Votes) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedCommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedCommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedCommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedCommitInfo does not contain field %s", fd.FullName())) } } @@ -24476,15 +25105,15 @@ func (x *fastReflection_ExtendedCommitInfo) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommitInfo) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedCommitInfo.round": + case "cometbft.abci.v2.ExtendedCommitInfo.round": x.Round = int32(0) - case "cometbft.abci.v1.ExtendedCommitInfo.votes": + case "cometbft.abci.v2.ExtendedCommitInfo.votes": x.Votes = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedCommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedCommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedCommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedCommitInfo does not contain field %s", fd.FullName())) } } @@ -24496,10 +25125,10 @@ func (x *fastReflection_ExtendedCommitInfo) Clear(fd protoreflect.FieldDescripto // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ExtendedCommitInfo) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ExtendedCommitInfo.round": + case "cometbft.abci.v2.ExtendedCommitInfo.round": value := x.Round return protoreflect.ValueOfInt32(value) - case "cometbft.abci.v1.ExtendedCommitInfo.votes": + case "cometbft.abci.v2.ExtendedCommitInfo.votes": if len(x.Votes) == 0 { return protoreflect.ValueOfList(&_ExtendedCommitInfo_2_list{}) } @@ -24507,9 +25136,9 @@ func (x *fastReflection_ExtendedCommitInfo) Get(descriptor protoreflect.FieldDes return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedCommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedCommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedCommitInfo does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedCommitInfo does not contain field %s", descriptor.FullName())) } } @@ -24525,17 +25154,17 @@ func (x *fastReflection_ExtendedCommitInfo) Get(descriptor protoreflect.FieldDes // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommitInfo) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedCommitInfo.round": + case "cometbft.abci.v2.ExtendedCommitInfo.round": x.Round = int32(value.Int()) - case "cometbft.abci.v1.ExtendedCommitInfo.votes": + case "cometbft.abci.v2.ExtendedCommitInfo.votes": lv := value.List() clv := lv.(*_ExtendedCommitInfo_2_list) x.Votes = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedCommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedCommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedCommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedCommitInfo does not contain field %s", fd.FullName())) } } @@ -24551,19 +25180,19 @@ func (x *fastReflection_ExtendedCommitInfo) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommitInfo) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedCommitInfo.votes": + case "cometbft.abci.v2.ExtendedCommitInfo.votes": if x.Votes == nil { x.Votes = []*ExtendedVoteInfo{} } value := &_ExtendedCommitInfo_2_list{list: &x.Votes} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.ExtendedCommitInfo.round": - panic(fmt.Errorf("field round of message cometbft.abci.v1.ExtendedCommitInfo is not mutable")) + case "cometbft.abci.v2.ExtendedCommitInfo.round": + panic(fmt.Errorf("field round of message cometbft.abci.v2.ExtendedCommitInfo is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedCommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedCommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedCommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedCommitInfo does not contain field %s", fd.FullName())) } } @@ -24572,16 +25201,16 @@ func (x *fastReflection_ExtendedCommitInfo) Mutable(fd protoreflect.FieldDescrip // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ExtendedCommitInfo) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedCommitInfo.round": + case "cometbft.abci.v2.ExtendedCommitInfo.round": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.abci.v1.ExtendedCommitInfo.votes": + case "cometbft.abci.v2.ExtendedCommitInfo.votes": list := []*ExtendedVoteInfo{} return protoreflect.ValueOfList(&_ExtendedCommitInfo_2_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedCommitInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedCommitInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedCommitInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedCommitInfo does not contain field %s", fd.FullName())) } } @@ -24591,7 +25220,7 @@ func (x *fastReflection_ExtendedCommitInfo) NewField(fd protoreflect.FieldDescri func (x *fastReflection_ExtendedCommitInfo) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ExtendedCommitInfo", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ExtendedCommitInfo", d.FullName())) } panic("unreachable") } @@ -24900,8 +25529,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_Event = File_cometbft_abci_v1_types_proto.Messages().ByName("Event") + file_cometbft_abci_v2_types_proto_init() + md_Event = File_cometbft_abci_v2_types_proto.Messages().ByName("Event") fd_Event_type = md_Event.Fields().ByName("type") fd_Event_attributes = md_Event.Fields().ByName("attributes") } @@ -24915,7 +25544,7 @@ func (x *Event) ProtoReflect() protoreflect.Message { } func (x *Event) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[37] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[37] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -24998,15 +25627,15 @@ func (x *fastReflection_Event) Range(f func(protoreflect.FieldDescriptor, protor // a repeated field is populated if it is non-empty. func (x *fastReflection_Event) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.Event.type": + case "cometbft.abci.v2.Event.type": return x.Type_ != "" - case "cometbft.abci.v1.Event.attributes": + case "cometbft.abci.v2.Event.attributes": return len(x.Attributes) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Event")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Event")) } - panic(fmt.Errorf("message cometbft.abci.v1.Event does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Event does not contain field %s", fd.FullName())) } } @@ -25018,15 +25647,15 @@ func (x *fastReflection_Event) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Event) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.Event.type": + case "cometbft.abci.v2.Event.type": x.Type_ = "" - case "cometbft.abci.v1.Event.attributes": + case "cometbft.abci.v2.Event.attributes": x.Attributes = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Event")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Event")) } - panic(fmt.Errorf("message cometbft.abci.v1.Event does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Event does not contain field %s", fd.FullName())) } } @@ -25038,10 +25667,10 @@ func (x *fastReflection_Event) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Event) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.Event.type": + case "cometbft.abci.v2.Event.type": value := x.Type_ return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.Event.attributes": + case "cometbft.abci.v2.Event.attributes": if len(x.Attributes) == 0 { return protoreflect.ValueOfList(&_Event_2_list{}) } @@ -25049,9 +25678,9 @@ func (x *fastReflection_Event) Get(descriptor protoreflect.FieldDescriptor) prot return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Event")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Event")) } - panic(fmt.Errorf("message cometbft.abci.v1.Event does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Event does not contain field %s", descriptor.FullName())) } } @@ -25067,17 +25696,17 @@ func (x *fastReflection_Event) Get(descriptor protoreflect.FieldDescriptor) prot // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Event) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.Event.type": + case "cometbft.abci.v2.Event.type": x.Type_ = value.Interface().(string) - case "cometbft.abci.v1.Event.attributes": + case "cometbft.abci.v2.Event.attributes": lv := value.List() clv := lv.(*_Event_2_list) x.Attributes = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Event")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Event")) } - panic(fmt.Errorf("message cometbft.abci.v1.Event does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Event does not contain field %s", fd.FullName())) } } @@ -25093,19 +25722,19 @@ func (x *fastReflection_Event) Set(fd protoreflect.FieldDescriptor, value protor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Event) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Event.attributes": + case "cometbft.abci.v2.Event.attributes": if x.Attributes == nil { x.Attributes = []*EventAttribute{} } value := &_Event_2_list{list: &x.Attributes} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.Event.type": - panic(fmt.Errorf("field type of message cometbft.abci.v1.Event is not mutable")) + case "cometbft.abci.v2.Event.type": + panic(fmt.Errorf("field type of message cometbft.abci.v2.Event is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Event")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Event")) } - panic(fmt.Errorf("message cometbft.abci.v1.Event does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Event does not contain field %s", fd.FullName())) } } @@ -25114,16 +25743,16 @@ func (x *fastReflection_Event) Mutable(fd protoreflect.FieldDescriptor) protoref // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Event) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Event.type": + case "cometbft.abci.v2.Event.type": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.Event.attributes": + case "cometbft.abci.v2.Event.attributes": list := []*EventAttribute{} return protoreflect.ValueOfList(&_Event_2_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Event")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Event")) } - panic(fmt.Errorf("message cometbft.abci.v1.Event does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Event does not contain field %s", fd.FullName())) } } @@ -25133,7 +25762,7 @@ func (x *fastReflection_Event) NewField(fd protoreflect.FieldDescriptor) protore func (x *fastReflection_Event) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.Event", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.Event", d.FullName())) } panic("unreachable") } @@ -25408,8 +26037,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_EventAttribute = File_cometbft_abci_v1_types_proto.Messages().ByName("EventAttribute") + file_cometbft_abci_v2_types_proto_init() + md_EventAttribute = File_cometbft_abci_v2_types_proto.Messages().ByName("EventAttribute") fd_EventAttribute_key = md_EventAttribute.Fields().ByName("key") fd_EventAttribute_value = md_EventAttribute.Fields().ByName("value") fd_EventAttribute_index = md_EventAttribute.Fields().ByName("index") @@ -25424,7 +26053,7 @@ func (x *EventAttribute) ProtoReflect() protoreflect.Message { } func (x *EventAttribute) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[38] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[38] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -25513,17 +26142,17 @@ func (x *fastReflection_EventAttribute) Range(f func(protoreflect.FieldDescripto // a repeated field is populated if it is non-empty. func (x *fastReflection_EventAttribute) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.EventAttribute.key": + case "cometbft.abci.v2.EventAttribute.key": return x.Key != "" - case "cometbft.abci.v1.EventAttribute.value": + case "cometbft.abci.v2.EventAttribute.value": return x.Value != "" - case "cometbft.abci.v1.EventAttribute.index": + case "cometbft.abci.v2.EventAttribute.index": return x.Index != false default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EventAttribute")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EventAttribute")) } - panic(fmt.Errorf("message cometbft.abci.v1.EventAttribute does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EventAttribute does not contain field %s", fd.FullName())) } } @@ -25535,17 +26164,17 @@ func (x *fastReflection_EventAttribute) Has(fd protoreflect.FieldDescriptor) boo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EventAttribute) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.EventAttribute.key": + case "cometbft.abci.v2.EventAttribute.key": x.Key = "" - case "cometbft.abci.v1.EventAttribute.value": + case "cometbft.abci.v2.EventAttribute.value": x.Value = "" - case "cometbft.abci.v1.EventAttribute.index": + case "cometbft.abci.v2.EventAttribute.index": x.Index = false default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EventAttribute")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EventAttribute")) } - panic(fmt.Errorf("message cometbft.abci.v1.EventAttribute does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EventAttribute does not contain field %s", fd.FullName())) } } @@ -25557,20 +26186,20 @@ func (x *fastReflection_EventAttribute) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_EventAttribute) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.EventAttribute.key": + case "cometbft.abci.v2.EventAttribute.key": value := x.Key return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.EventAttribute.value": + case "cometbft.abci.v2.EventAttribute.value": value := x.Value return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.EventAttribute.index": + case "cometbft.abci.v2.EventAttribute.index": value := x.Index return protoreflect.ValueOfBool(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EventAttribute")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EventAttribute")) } - panic(fmt.Errorf("message cometbft.abci.v1.EventAttribute does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EventAttribute does not contain field %s", descriptor.FullName())) } } @@ -25586,17 +26215,17 @@ func (x *fastReflection_EventAttribute) Get(descriptor protoreflect.FieldDescrip // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EventAttribute) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.EventAttribute.key": + case "cometbft.abci.v2.EventAttribute.key": x.Key = value.Interface().(string) - case "cometbft.abci.v1.EventAttribute.value": + case "cometbft.abci.v2.EventAttribute.value": x.Value = value.Interface().(string) - case "cometbft.abci.v1.EventAttribute.index": + case "cometbft.abci.v2.EventAttribute.index": x.Index = value.Bool() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EventAttribute")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EventAttribute")) } - panic(fmt.Errorf("message cometbft.abci.v1.EventAttribute does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EventAttribute does not contain field %s", fd.FullName())) } } @@ -25612,17 +26241,17 @@ func (x *fastReflection_EventAttribute) Set(fd protoreflect.FieldDescriptor, val // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EventAttribute) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.EventAttribute.key": - panic(fmt.Errorf("field key of message cometbft.abci.v1.EventAttribute is not mutable")) - case "cometbft.abci.v1.EventAttribute.value": - panic(fmt.Errorf("field value of message cometbft.abci.v1.EventAttribute is not mutable")) - case "cometbft.abci.v1.EventAttribute.index": - panic(fmt.Errorf("field index of message cometbft.abci.v1.EventAttribute is not mutable")) + case "cometbft.abci.v2.EventAttribute.key": + panic(fmt.Errorf("field key of message cometbft.abci.v2.EventAttribute is not mutable")) + case "cometbft.abci.v2.EventAttribute.value": + panic(fmt.Errorf("field value of message cometbft.abci.v2.EventAttribute is not mutable")) + case "cometbft.abci.v2.EventAttribute.index": + panic(fmt.Errorf("field index of message cometbft.abci.v2.EventAttribute is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EventAttribute")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EventAttribute")) } - panic(fmt.Errorf("message cometbft.abci.v1.EventAttribute does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EventAttribute does not contain field %s", fd.FullName())) } } @@ -25631,17 +26260,17 @@ func (x *fastReflection_EventAttribute) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_EventAttribute) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.EventAttribute.key": + case "cometbft.abci.v2.EventAttribute.key": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.EventAttribute.value": + case "cometbft.abci.v2.EventAttribute.value": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.EventAttribute.index": + case "cometbft.abci.v2.EventAttribute.index": return protoreflect.ValueOfBool(false) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.EventAttribute")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.EventAttribute")) } - panic(fmt.Errorf("message cometbft.abci.v1.EventAttribute does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.EventAttribute does not contain field %s", fd.FullName())) } } @@ -25651,7 +26280,7 @@ func (x *fastReflection_EventAttribute) NewField(fd protoreflect.FieldDescriptor func (x *fastReflection_EventAttribute) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.EventAttribute", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.EventAttribute", d.FullName())) } panic("unreachable") } @@ -26002,8 +26631,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ExecTxResult = File_cometbft_abci_v1_types_proto.Messages().ByName("ExecTxResult") + file_cometbft_abci_v2_types_proto_init() + md_ExecTxResult = File_cometbft_abci_v2_types_proto.Messages().ByName("ExecTxResult") fd_ExecTxResult_code = md_ExecTxResult.Fields().ByName("code") fd_ExecTxResult_data = md_ExecTxResult.Fields().ByName("data") fd_ExecTxResult_log = md_ExecTxResult.Fields().ByName("log") @@ -26023,7 +26652,7 @@ func (x *ExecTxResult) ProtoReflect() protoreflect.Message { } func (x *ExecTxResult) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[39] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[39] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -26142,27 +26771,27 @@ func (x *fastReflection_ExecTxResult) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_ExecTxResult) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ExecTxResult.code": + case "cometbft.abci.v2.ExecTxResult.code": return x.Code != uint32(0) - case "cometbft.abci.v1.ExecTxResult.data": + case "cometbft.abci.v2.ExecTxResult.data": return len(x.Data) != 0 - case "cometbft.abci.v1.ExecTxResult.log": + case "cometbft.abci.v2.ExecTxResult.log": return x.Log != "" - case "cometbft.abci.v1.ExecTxResult.info": + case "cometbft.abci.v2.ExecTxResult.info": return x.Info != "" - case "cometbft.abci.v1.ExecTxResult.gas_wanted": + case "cometbft.abci.v2.ExecTxResult.gas_wanted": return x.GasWanted != int64(0) - case "cometbft.abci.v1.ExecTxResult.gas_used": + case "cometbft.abci.v2.ExecTxResult.gas_used": return x.GasUsed != int64(0) - case "cometbft.abci.v1.ExecTxResult.events": + case "cometbft.abci.v2.ExecTxResult.events": return len(x.Events) != 0 - case "cometbft.abci.v1.ExecTxResult.codespace": + case "cometbft.abci.v2.ExecTxResult.codespace": return x.Codespace != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExecTxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExecTxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExecTxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExecTxResult does not contain field %s", fd.FullName())) } } @@ -26174,27 +26803,27 @@ func (x *fastReflection_ExecTxResult) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExecTxResult) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ExecTxResult.code": + case "cometbft.abci.v2.ExecTxResult.code": x.Code = uint32(0) - case "cometbft.abci.v1.ExecTxResult.data": + case "cometbft.abci.v2.ExecTxResult.data": x.Data = nil - case "cometbft.abci.v1.ExecTxResult.log": + case "cometbft.abci.v2.ExecTxResult.log": x.Log = "" - case "cometbft.abci.v1.ExecTxResult.info": + case "cometbft.abci.v2.ExecTxResult.info": x.Info = "" - case "cometbft.abci.v1.ExecTxResult.gas_wanted": + case "cometbft.abci.v2.ExecTxResult.gas_wanted": x.GasWanted = int64(0) - case "cometbft.abci.v1.ExecTxResult.gas_used": + case "cometbft.abci.v2.ExecTxResult.gas_used": x.GasUsed = int64(0) - case "cometbft.abci.v1.ExecTxResult.events": + case "cometbft.abci.v2.ExecTxResult.events": x.Events = nil - case "cometbft.abci.v1.ExecTxResult.codespace": + case "cometbft.abci.v2.ExecTxResult.codespace": x.Codespace = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExecTxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExecTxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExecTxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExecTxResult does not contain field %s", fd.FullName())) } } @@ -26206,38 +26835,38 @@ func (x *fastReflection_ExecTxResult) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ExecTxResult) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ExecTxResult.code": + case "cometbft.abci.v2.ExecTxResult.code": value := x.Code return protoreflect.ValueOfUint32(value) - case "cometbft.abci.v1.ExecTxResult.data": + case "cometbft.abci.v2.ExecTxResult.data": value := x.Data return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ExecTxResult.log": + case "cometbft.abci.v2.ExecTxResult.log": value := x.Log return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.ExecTxResult.info": + case "cometbft.abci.v2.ExecTxResult.info": value := x.Info return protoreflect.ValueOfString(value) - case "cometbft.abci.v1.ExecTxResult.gas_wanted": + case "cometbft.abci.v2.ExecTxResult.gas_wanted": value := x.GasWanted return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.ExecTxResult.gas_used": + case "cometbft.abci.v2.ExecTxResult.gas_used": value := x.GasUsed return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.ExecTxResult.events": + case "cometbft.abci.v2.ExecTxResult.events": if len(x.Events) == 0 { return protoreflect.ValueOfList(&_ExecTxResult_7_list{}) } listValue := &_ExecTxResult_7_list{list: &x.Events} return protoreflect.ValueOfList(listValue) - case "cometbft.abci.v1.ExecTxResult.codespace": + case "cometbft.abci.v2.ExecTxResult.codespace": value := x.Codespace return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExecTxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExecTxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExecTxResult does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExecTxResult does not contain field %s", descriptor.FullName())) } } @@ -26253,29 +26882,29 @@ func (x *fastReflection_ExecTxResult) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExecTxResult) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ExecTxResult.code": + case "cometbft.abci.v2.ExecTxResult.code": x.Code = uint32(value.Uint()) - case "cometbft.abci.v1.ExecTxResult.data": + case "cometbft.abci.v2.ExecTxResult.data": x.Data = value.Bytes() - case "cometbft.abci.v1.ExecTxResult.log": + case "cometbft.abci.v2.ExecTxResult.log": x.Log = value.Interface().(string) - case "cometbft.abci.v1.ExecTxResult.info": + case "cometbft.abci.v2.ExecTxResult.info": x.Info = value.Interface().(string) - case "cometbft.abci.v1.ExecTxResult.gas_wanted": + case "cometbft.abci.v2.ExecTxResult.gas_wanted": x.GasWanted = value.Int() - case "cometbft.abci.v1.ExecTxResult.gas_used": + case "cometbft.abci.v2.ExecTxResult.gas_used": x.GasUsed = value.Int() - case "cometbft.abci.v1.ExecTxResult.events": + case "cometbft.abci.v2.ExecTxResult.events": lv := value.List() clv := lv.(*_ExecTxResult_7_list) x.Events = *clv.list - case "cometbft.abci.v1.ExecTxResult.codespace": + case "cometbft.abci.v2.ExecTxResult.codespace": x.Codespace = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExecTxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExecTxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExecTxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExecTxResult does not contain field %s", fd.FullName())) } } @@ -26291,31 +26920,31 @@ func (x *fastReflection_ExecTxResult) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExecTxResult) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExecTxResult.events": + case "cometbft.abci.v2.ExecTxResult.events": if x.Events == nil { x.Events = []*Event{} } value := &_ExecTxResult_7_list{list: &x.Events} return protoreflect.ValueOfList(value) - case "cometbft.abci.v1.ExecTxResult.code": - panic(fmt.Errorf("field code of message cometbft.abci.v1.ExecTxResult is not mutable")) - case "cometbft.abci.v1.ExecTxResult.data": - panic(fmt.Errorf("field data of message cometbft.abci.v1.ExecTxResult is not mutable")) - case "cometbft.abci.v1.ExecTxResult.log": - panic(fmt.Errorf("field log of message cometbft.abci.v1.ExecTxResult is not mutable")) - case "cometbft.abci.v1.ExecTxResult.info": - panic(fmt.Errorf("field info of message cometbft.abci.v1.ExecTxResult is not mutable")) - case "cometbft.abci.v1.ExecTxResult.gas_wanted": - panic(fmt.Errorf("field gas_wanted of message cometbft.abci.v1.ExecTxResult is not mutable")) - case "cometbft.abci.v1.ExecTxResult.gas_used": - panic(fmt.Errorf("field gas_used of message cometbft.abci.v1.ExecTxResult is not mutable")) - case "cometbft.abci.v1.ExecTxResult.codespace": - panic(fmt.Errorf("field codespace of message cometbft.abci.v1.ExecTxResult is not mutable")) + case "cometbft.abci.v2.ExecTxResult.code": + panic(fmt.Errorf("field code of message cometbft.abci.v2.ExecTxResult is not mutable")) + case "cometbft.abci.v2.ExecTxResult.data": + panic(fmt.Errorf("field data of message cometbft.abci.v2.ExecTxResult is not mutable")) + case "cometbft.abci.v2.ExecTxResult.log": + panic(fmt.Errorf("field log of message cometbft.abci.v2.ExecTxResult is not mutable")) + case "cometbft.abci.v2.ExecTxResult.info": + panic(fmt.Errorf("field info of message cometbft.abci.v2.ExecTxResult is not mutable")) + case "cometbft.abci.v2.ExecTxResult.gas_wanted": + panic(fmt.Errorf("field gas_wanted of message cometbft.abci.v2.ExecTxResult is not mutable")) + case "cometbft.abci.v2.ExecTxResult.gas_used": + panic(fmt.Errorf("field gas_used of message cometbft.abci.v2.ExecTxResult is not mutable")) + case "cometbft.abci.v2.ExecTxResult.codespace": + panic(fmt.Errorf("field codespace of message cometbft.abci.v2.ExecTxResult is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExecTxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExecTxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExecTxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExecTxResult does not contain field %s", fd.FullName())) } } @@ -26324,28 +26953,28 @@ func (x *fastReflection_ExecTxResult) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ExecTxResult) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExecTxResult.code": + case "cometbft.abci.v2.ExecTxResult.code": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.abci.v1.ExecTxResult.data": + case "cometbft.abci.v2.ExecTxResult.data": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ExecTxResult.log": + case "cometbft.abci.v2.ExecTxResult.log": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.ExecTxResult.info": + case "cometbft.abci.v2.ExecTxResult.info": return protoreflect.ValueOfString("") - case "cometbft.abci.v1.ExecTxResult.gas_wanted": + case "cometbft.abci.v2.ExecTxResult.gas_wanted": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.ExecTxResult.gas_used": + case "cometbft.abci.v2.ExecTxResult.gas_used": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.ExecTxResult.events": + case "cometbft.abci.v2.ExecTxResult.events": list := []*Event{} return protoreflect.ValueOfList(&_ExecTxResult_7_list{list: &list}) - case "cometbft.abci.v1.ExecTxResult.codespace": + case "cometbft.abci.v2.ExecTxResult.codespace": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExecTxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExecTxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExecTxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExecTxResult does not contain field %s", fd.FullName())) } } @@ -26355,7 +26984,7 @@ func (x *fastReflection_ExecTxResult) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_ExecTxResult) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ExecTxResult", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ExecTxResult", d.FullName())) } panic("unreachable") } @@ -26843,8 +27472,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_TxResult = File_cometbft_abci_v1_types_proto.Messages().ByName("TxResult") + file_cometbft_abci_v2_types_proto_init() + md_TxResult = File_cometbft_abci_v2_types_proto.Messages().ByName("TxResult") fd_TxResult_height = md_TxResult.Fields().ByName("height") fd_TxResult_index = md_TxResult.Fields().ByName("index") fd_TxResult_tx = md_TxResult.Fields().ByName("tx") @@ -26860,7 +27489,7 @@ func (x *TxResult) ProtoReflect() protoreflect.Message { } func (x *TxResult) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[40] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[40] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -26955,19 +27584,19 @@ func (x *fastReflection_TxResult) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_TxResult) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.TxResult.height": + case "cometbft.abci.v2.TxResult.height": return x.Height != int64(0) - case "cometbft.abci.v1.TxResult.index": + case "cometbft.abci.v2.TxResult.index": return x.Index != uint32(0) - case "cometbft.abci.v1.TxResult.tx": + case "cometbft.abci.v2.TxResult.tx": return len(x.Tx) != 0 - case "cometbft.abci.v1.TxResult.result": + case "cometbft.abci.v2.TxResult.result": return x.Result != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.TxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.TxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.TxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.TxResult does not contain field %s", fd.FullName())) } } @@ -26979,19 +27608,19 @@ func (x *fastReflection_TxResult) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TxResult) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.TxResult.height": + case "cometbft.abci.v2.TxResult.height": x.Height = int64(0) - case "cometbft.abci.v1.TxResult.index": + case "cometbft.abci.v2.TxResult.index": x.Index = uint32(0) - case "cometbft.abci.v1.TxResult.tx": + case "cometbft.abci.v2.TxResult.tx": x.Tx = nil - case "cometbft.abci.v1.TxResult.result": + case "cometbft.abci.v2.TxResult.result": x.Result = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.TxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.TxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.TxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.TxResult does not contain field %s", fd.FullName())) } } @@ -27003,23 +27632,23 @@ func (x *fastReflection_TxResult) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TxResult) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.TxResult.height": + case "cometbft.abci.v2.TxResult.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.TxResult.index": + case "cometbft.abci.v2.TxResult.index": value := x.Index return protoreflect.ValueOfUint32(value) - case "cometbft.abci.v1.TxResult.tx": + case "cometbft.abci.v2.TxResult.tx": value := x.Tx return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.TxResult.result": + case "cometbft.abci.v2.TxResult.result": value := x.Result return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.TxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.TxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.TxResult does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.TxResult does not contain field %s", descriptor.FullName())) } } @@ -27035,19 +27664,19 @@ func (x *fastReflection_TxResult) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TxResult) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.TxResult.height": + case "cometbft.abci.v2.TxResult.height": x.Height = value.Int() - case "cometbft.abci.v1.TxResult.index": + case "cometbft.abci.v2.TxResult.index": x.Index = uint32(value.Uint()) - case "cometbft.abci.v1.TxResult.tx": + case "cometbft.abci.v2.TxResult.tx": x.Tx = value.Bytes() - case "cometbft.abci.v1.TxResult.result": + case "cometbft.abci.v2.TxResult.result": x.Result = value.Message().Interface().(*ExecTxResult) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.TxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.TxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.TxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.TxResult does not contain field %s", fd.FullName())) } } @@ -27063,22 +27692,22 @@ func (x *fastReflection_TxResult) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TxResult) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.TxResult.result": + case "cometbft.abci.v2.TxResult.result": if x.Result == nil { x.Result = new(ExecTxResult) } return protoreflect.ValueOfMessage(x.Result.ProtoReflect()) - case "cometbft.abci.v1.TxResult.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.TxResult is not mutable")) - case "cometbft.abci.v1.TxResult.index": - panic(fmt.Errorf("field index of message cometbft.abci.v1.TxResult is not mutable")) - case "cometbft.abci.v1.TxResult.tx": - panic(fmt.Errorf("field tx of message cometbft.abci.v1.TxResult is not mutable")) + case "cometbft.abci.v2.TxResult.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.TxResult is not mutable")) + case "cometbft.abci.v2.TxResult.index": + panic(fmt.Errorf("field index of message cometbft.abci.v2.TxResult is not mutable")) + case "cometbft.abci.v2.TxResult.tx": + panic(fmt.Errorf("field tx of message cometbft.abci.v2.TxResult is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.TxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.TxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.TxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.TxResult does not contain field %s", fd.FullName())) } } @@ -27087,20 +27716,20 @@ func (x *fastReflection_TxResult) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TxResult) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.TxResult.height": + case "cometbft.abci.v2.TxResult.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.TxResult.index": + case "cometbft.abci.v2.TxResult.index": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.abci.v1.TxResult.tx": + case "cometbft.abci.v2.TxResult.tx": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.TxResult.result": + case "cometbft.abci.v2.TxResult.result": m := new(ExecTxResult) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.TxResult")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.TxResult")) } - panic(fmt.Errorf("message cometbft.abci.v1.TxResult does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.TxResult does not contain field %s", fd.FullName())) } } @@ -27110,7 +27739,7 @@ func (x *fastReflection_TxResult) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_TxResult) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.TxResult", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.TxResult", d.FullName())) } panic("unreachable") } @@ -27438,8 +28067,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_Validator = File_cometbft_abci_v1_types_proto.Messages().ByName("Validator") + file_cometbft_abci_v2_types_proto_init() + md_Validator = File_cometbft_abci_v2_types_proto.Messages().ByName("Validator") fd_Validator_address = md_Validator.Fields().ByName("address") fd_Validator_power = md_Validator.Fields().ByName("power") } @@ -27453,7 +28082,7 @@ func (x *Validator) ProtoReflect() protoreflect.Message { } func (x *Validator) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[41] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[41] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -27536,15 +28165,15 @@ func (x *fastReflection_Validator) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_Validator) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.Validator.address": + case "cometbft.abci.v2.Validator.address": return len(x.Address) != 0 - case "cometbft.abci.v1.Validator.power": + case "cometbft.abci.v2.Validator.power": return x.Power != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Validator")) } - panic(fmt.Errorf("message cometbft.abci.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Validator does not contain field %s", fd.FullName())) } } @@ -27556,15 +28185,15 @@ func (x *fastReflection_Validator) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Validator) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.Validator.address": + case "cometbft.abci.v2.Validator.address": x.Address = nil - case "cometbft.abci.v1.Validator.power": + case "cometbft.abci.v2.Validator.power": x.Power = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Validator")) } - panic(fmt.Errorf("message cometbft.abci.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Validator does not contain field %s", fd.FullName())) } } @@ -27576,17 +28205,17 @@ func (x *fastReflection_Validator) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Validator) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.Validator.address": + case "cometbft.abci.v2.Validator.address": value := x.Address return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.Validator.power": + case "cometbft.abci.v2.Validator.power": value := x.Power return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Validator")) } - panic(fmt.Errorf("message cometbft.abci.v1.Validator does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Validator does not contain field %s", descriptor.FullName())) } } @@ -27602,15 +28231,15 @@ func (x *fastReflection_Validator) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Validator) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.Validator.address": + case "cometbft.abci.v2.Validator.address": x.Address = value.Bytes() - case "cometbft.abci.v1.Validator.power": + case "cometbft.abci.v2.Validator.power": x.Power = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Validator")) } - panic(fmt.Errorf("message cometbft.abci.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Validator does not contain field %s", fd.FullName())) } } @@ -27626,15 +28255,15 @@ func (x *fastReflection_Validator) Set(fd protoreflect.FieldDescriptor, value pr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Validator) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Validator.address": - panic(fmt.Errorf("field address of message cometbft.abci.v1.Validator is not mutable")) - case "cometbft.abci.v1.Validator.power": - panic(fmt.Errorf("field power of message cometbft.abci.v1.Validator is not mutable")) + case "cometbft.abci.v2.Validator.address": + panic(fmt.Errorf("field address of message cometbft.abci.v2.Validator is not mutable")) + case "cometbft.abci.v2.Validator.power": + panic(fmt.Errorf("field power of message cometbft.abci.v2.Validator is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Validator")) } - panic(fmt.Errorf("message cometbft.abci.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Validator does not contain field %s", fd.FullName())) } } @@ -27643,15 +28272,15 @@ func (x *fastReflection_Validator) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Validator) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Validator.address": + case "cometbft.abci.v2.Validator.address": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.Validator.power": + case "cometbft.abci.v2.Validator.power": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Validator")) } - panic(fmt.Errorf("message cometbft.abci.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Validator does not contain field %s", fd.FullName())) } } @@ -27661,7 +28290,7 @@ func (x *fastReflection_Validator) NewField(fd protoreflect.FieldDescriptor) pro func (x *fastReflection_Validator) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.Validator", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.Validator", d.FullName())) } panic("unreachable") } @@ -27909,8 +28538,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ValidatorUpdate = File_cometbft_abci_v1_types_proto.Messages().ByName("ValidatorUpdate") + file_cometbft_abci_v2_types_proto_init() + md_ValidatorUpdate = File_cometbft_abci_v2_types_proto.Messages().ByName("ValidatorUpdate") fd_ValidatorUpdate_power = md_ValidatorUpdate.Fields().ByName("power") fd_ValidatorUpdate_pub_key_bytes = md_ValidatorUpdate.Fields().ByName("pub_key_bytes") fd_ValidatorUpdate_pub_key_type = md_ValidatorUpdate.Fields().ByName("pub_key_type") @@ -27925,7 +28554,7 @@ func (x *ValidatorUpdate) ProtoReflect() protoreflect.Message { } func (x *ValidatorUpdate) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[42] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[42] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -28014,17 +28643,17 @@ func (x *fastReflection_ValidatorUpdate) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_ValidatorUpdate) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ValidatorUpdate.power": + case "cometbft.abci.v2.ValidatorUpdate.power": return x.Power != int64(0) - case "cometbft.abci.v1.ValidatorUpdate.pub_key_bytes": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_bytes": return len(x.PubKeyBytes) != 0 - case "cometbft.abci.v1.ValidatorUpdate.pub_key_type": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_type": return x.PubKeyType != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ValidatorUpdate")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ValidatorUpdate")) } - panic(fmt.Errorf("message cometbft.abci.v1.ValidatorUpdate does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ValidatorUpdate does not contain field %s", fd.FullName())) } } @@ -28036,17 +28665,17 @@ func (x *fastReflection_ValidatorUpdate) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorUpdate) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ValidatorUpdate.power": + case "cometbft.abci.v2.ValidatorUpdate.power": x.Power = int64(0) - case "cometbft.abci.v1.ValidatorUpdate.pub_key_bytes": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_bytes": x.PubKeyBytes = nil - case "cometbft.abci.v1.ValidatorUpdate.pub_key_type": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_type": x.PubKeyType = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ValidatorUpdate")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ValidatorUpdate")) } - panic(fmt.Errorf("message cometbft.abci.v1.ValidatorUpdate does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ValidatorUpdate does not contain field %s", fd.FullName())) } } @@ -28058,20 +28687,20 @@ func (x *fastReflection_ValidatorUpdate) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ValidatorUpdate) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ValidatorUpdate.power": + case "cometbft.abci.v2.ValidatorUpdate.power": value := x.Power return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.ValidatorUpdate.pub_key_bytes": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_bytes": value := x.PubKeyBytes return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ValidatorUpdate.pub_key_type": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_type": value := x.PubKeyType return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ValidatorUpdate")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ValidatorUpdate")) } - panic(fmt.Errorf("message cometbft.abci.v1.ValidatorUpdate does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ValidatorUpdate does not contain field %s", descriptor.FullName())) } } @@ -28087,17 +28716,17 @@ func (x *fastReflection_ValidatorUpdate) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorUpdate) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ValidatorUpdate.power": + case "cometbft.abci.v2.ValidatorUpdate.power": x.Power = value.Int() - case "cometbft.abci.v1.ValidatorUpdate.pub_key_bytes": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_bytes": x.PubKeyBytes = value.Bytes() - case "cometbft.abci.v1.ValidatorUpdate.pub_key_type": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_type": x.PubKeyType = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ValidatorUpdate")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ValidatorUpdate")) } - panic(fmt.Errorf("message cometbft.abci.v1.ValidatorUpdate does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ValidatorUpdate does not contain field %s", fd.FullName())) } } @@ -28113,17 +28742,17 @@ func (x *fastReflection_ValidatorUpdate) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorUpdate) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ValidatorUpdate.power": - panic(fmt.Errorf("field power of message cometbft.abci.v1.ValidatorUpdate is not mutable")) - case "cometbft.abci.v1.ValidatorUpdate.pub_key_bytes": - panic(fmt.Errorf("field pub_key_bytes of message cometbft.abci.v1.ValidatorUpdate is not mutable")) - case "cometbft.abci.v1.ValidatorUpdate.pub_key_type": - panic(fmt.Errorf("field pub_key_type of message cometbft.abci.v1.ValidatorUpdate is not mutable")) + case "cometbft.abci.v2.ValidatorUpdate.power": + panic(fmt.Errorf("field power of message cometbft.abci.v2.ValidatorUpdate is not mutable")) + case "cometbft.abci.v2.ValidatorUpdate.pub_key_bytes": + panic(fmt.Errorf("field pub_key_bytes of message cometbft.abci.v2.ValidatorUpdate is not mutable")) + case "cometbft.abci.v2.ValidatorUpdate.pub_key_type": + panic(fmt.Errorf("field pub_key_type of message cometbft.abci.v2.ValidatorUpdate is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ValidatorUpdate")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ValidatorUpdate")) } - panic(fmt.Errorf("message cometbft.abci.v1.ValidatorUpdate does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ValidatorUpdate does not contain field %s", fd.FullName())) } } @@ -28132,17 +28761,17 @@ func (x *fastReflection_ValidatorUpdate) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ValidatorUpdate) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ValidatorUpdate.power": + case "cometbft.abci.v2.ValidatorUpdate.power": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.ValidatorUpdate.pub_key_bytes": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_bytes": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ValidatorUpdate.pub_key_type": + case "cometbft.abci.v2.ValidatorUpdate.pub_key_type": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ValidatorUpdate")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ValidatorUpdate")) } - panic(fmt.Errorf("message cometbft.abci.v1.ValidatorUpdate does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ValidatorUpdate does not contain field %s", fd.FullName())) } } @@ -28152,7 +28781,7 @@ func (x *fastReflection_ValidatorUpdate) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_ValidatorUpdate) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ValidatorUpdate", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ValidatorUpdate", d.FullName())) } panic("unreachable") } @@ -28442,8 +29071,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_VoteInfo = File_cometbft_abci_v1_types_proto.Messages().ByName("VoteInfo") + file_cometbft_abci_v2_types_proto_init() + md_VoteInfo = File_cometbft_abci_v2_types_proto.Messages().ByName("VoteInfo") fd_VoteInfo_validator = md_VoteInfo.Fields().ByName("validator") fd_VoteInfo_block_id_flag = md_VoteInfo.Fields().ByName("block_id_flag") } @@ -28457,7 +29086,7 @@ func (x *VoteInfo) ProtoReflect() protoreflect.Message { } func (x *VoteInfo) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[43] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[43] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -28540,15 +29169,15 @@ func (x *fastReflection_VoteInfo) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_VoteInfo) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.VoteInfo.validator": + case "cometbft.abci.v2.VoteInfo.validator": return x.Validator != nil - case "cometbft.abci.v1.VoteInfo.block_id_flag": + case "cometbft.abci.v2.VoteInfo.block_id_flag": return x.BlockIdFlag != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.VoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VoteInfo does not contain field %s", fd.FullName())) } } @@ -28560,15 +29189,15 @@ func (x *fastReflection_VoteInfo) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VoteInfo) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.VoteInfo.validator": + case "cometbft.abci.v2.VoteInfo.validator": x.Validator = nil - case "cometbft.abci.v1.VoteInfo.block_id_flag": + case "cometbft.abci.v2.VoteInfo.block_id_flag": x.BlockIdFlag = 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.VoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VoteInfo does not contain field %s", fd.FullName())) } } @@ -28580,17 +29209,17 @@ func (x *fastReflection_VoteInfo) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_VoteInfo) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.VoteInfo.validator": + case "cometbft.abci.v2.VoteInfo.validator": value := x.Validator return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.VoteInfo.block_id_flag": + case "cometbft.abci.v2.VoteInfo.block_id_flag": value := x.BlockIdFlag return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.VoteInfo does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VoteInfo does not contain field %s", descriptor.FullName())) } } @@ -28606,15 +29235,15 @@ func (x *fastReflection_VoteInfo) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VoteInfo) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.VoteInfo.validator": + case "cometbft.abci.v2.VoteInfo.validator": x.Validator = value.Message().Interface().(*Validator) - case "cometbft.abci.v1.VoteInfo.block_id_flag": - x.BlockIdFlag = (v1.BlockIDFlag)(value.Enum()) + case "cometbft.abci.v2.VoteInfo.block_id_flag": + x.BlockIdFlag = (v2.BlockIDFlag)(value.Enum()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.VoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VoteInfo does not contain field %s", fd.FullName())) } } @@ -28630,18 +29259,18 @@ func (x *fastReflection_VoteInfo) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VoteInfo) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.VoteInfo.validator": + case "cometbft.abci.v2.VoteInfo.validator": if x.Validator == nil { x.Validator = new(Validator) } return protoreflect.ValueOfMessage(x.Validator.ProtoReflect()) - case "cometbft.abci.v1.VoteInfo.block_id_flag": - panic(fmt.Errorf("field block_id_flag of message cometbft.abci.v1.VoteInfo is not mutable")) + case "cometbft.abci.v2.VoteInfo.block_id_flag": + panic(fmt.Errorf("field block_id_flag of message cometbft.abci.v2.VoteInfo is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.VoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VoteInfo does not contain field %s", fd.FullName())) } } @@ -28650,16 +29279,16 @@ func (x *fastReflection_VoteInfo) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_VoteInfo) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.VoteInfo.validator": + case "cometbft.abci.v2.VoteInfo.validator": m := new(Validator) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.VoteInfo.block_id_flag": + case "cometbft.abci.v2.VoteInfo.block_id_flag": return protoreflect.ValueOfEnum(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.VoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.VoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.VoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.VoteInfo does not contain field %s", fd.FullName())) } } @@ -28669,7 +29298,7 @@ func (x *fastReflection_VoteInfo) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_VoteInfo) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.VoteInfo", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.VoteInfo", d.FullName())) } panic("unreachable") } @@ -28878,7 +29507,7 @@ func (x *fastReflection_VoteInfo) ProtoMethods() *protoiface.Methods { } b := dAtA[iNdEx] iNdEx++ - x.BlockIdFlag |= v1.BlockIDFlag(b&0x7F) << shift + x.BlockIdFlag |= v2.BlockIDFlag(b&0x7F) << shift if b < 0x80 { break } @@ -28919,20 +29548,24 @@ func (x *fastReflection_VoteInfo) ProtoMethods() *protoiface.Methods { } var ( - md_ExtendedVoteInfo protoreflect.MessageDescriptor - fd_ExtendedVoteInfo_validator protoreflect.FieldDescriptor - fd_ExtendedVoteInfo_vote_extension protoreflect.FieldDescriptor - fd_ExtendedVoteInfo_extension_signature protoreflect.FieldDescriptor - fd_ExtendedVoteInfo_block_id_flag protoreflect.FieldDescriptor + md_ExtendedVoteInfo protoreflect.MessageDescriptor + fd_ExtendedVoteInfo_validator protoreflect.FieldDescriptor + fd_ExtendedVoteInfo_vote_extension protoreflect.FieldDescriptor + fd_ExtendedVoteInfo_extension_signature protoreflect.FieldDescriptor + fd_ExtendedVoteInfo_block_id_flag protoreflect.FieldDescriptor + fd_ExtendedVoteInfo_non_rp_vote_extension protoreflect.FieldDescriptor + fd_ExtendedVoteInfo_non_rp_extension_signature protoreflect.FieldDescriptor ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_ExtendedVoteInfo = File_cometbft_abci_v1_types_proto.Messages().ByName("ExtendedVoteInfo") + file_cometbft_abci_v2_types_proto_init() + md_ExtendedVoteInfo = File_cometbft_abci_v2_types_proto.Messages().ByName("ExtendedVoteInfo") fd_ExtendedVoteInfo_validator = md_ExtendedVoteInfo.Fields().ByName("validator") fd_ExtendedVoteInfo_vote_extension = md_ExtendedVoteInfo.Fields().ByName("vote_extension") fd_ExtendedVoteInfo_extension_signature = md_ExtendedVoteInfo.Fields().ByName("extension_signature") fd_ExtendedVoteInfo_block_id_flag = md_ExtendedVoteInfo.Fields().ByName("block_id_flag") + fd_ExtendedVoteInfo_non_rp_vote_extension = md_ExtendedVoteInfo.Fields().ByName("non_rp_vote_extension") + fd_ExtendedVoteInfo_non_rp_extension_signature = md_ExtendedVoteInfo.Fields().ByName("non_rp_extension_signature") } var _ protoreflect.Message = (*fastReflection_ExtendedVoteInfo)(nil) @@ -28944,7 +29577,7 @@ func (x *ExtendedVoteInfo) ProtoReflect() protoreflect.Message { } func (x *ExtendedVoteInfo) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[44] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[44] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -29024,6 +29657,18 @@ func (x *fastReflection_ExtendedVoteInfo) Range(f func(protoreflect.FieldDescrip return } } + if len(x.NonRpVoteExtension) != 0 { + value := protoreflect.ValueOfBytes(x.NonRpVoteExtension) + if !f(fd_ExtendedVoteInfo_non_rp_vote_extension, value) { + return + } + } + if len(x.NonRpExtensionSignature) != 0 { + value := protoreflect.ValueOfBytes(x.NonRpExtensionSignature) + if !f(fd_ExtendedVoteInfo_non_rp_extension_signature, value) { + return + } + } } // Has reports whether a field is populated. @@ -29039,19 +29684,23 @@ func (x *fastReflection_ExtendedVoteInfo) Range(f func(protoreflect.FieldDescrip // a repeated field is populated if it is non-empty. func (x *fastReflection_ExtendedVoteInfo) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedVoteInfo.validator": + case "cometbft.abci.v2.ExtendedVoteInfo.validator": return x.Validator != nil - case "cometbft.abci.v1.ExtendedVoteInfo.vote_extension": + case "cometbft.abci.v2.ExtendedVoteInfo.vote_extension": return len(x.VoteExtension) != 0 - case "cometbft.abci.v1.ExtendedVoteInfo.extension_signature": + case "cometbft.abci.v2.ExtendedVoteInfo.extension_signature": return len(x.ExtensionSignature) != 0 - case "cometbft.abci.v1.ExtendedVoteInfo.block_id_flag": + case "cometbft.abci.v2.ExtendedVoteInfo.block_id_flag": return x.BlockIdFlag != 0 + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_vote_extension": + return len(x.NonRpVoteExtension) != 0 + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_extension_signature": + return len(x.NonRpExtensionSignature) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedVoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedVoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedVoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedVoteInfo does not contain field %s", fd.FullName())) } } @@ -29063,19 +29712,23 @@ func (x *fastReflection_ExtendedVoteInfo) Has(fd protoreflect.FieldDescriptor) b // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedVoteInfo) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedVoteInfo.validator": + case "cometbft.abci.v2.ExtendedVoteInfo.validator": x.Validator = nil - case "cometbft.abci.v1.ExtendedVoteInfo.vote_extension": + case "cometbft.abci.v2.ExtendedVoteInfo.vote_extension": x.VoteExtension = nil - case "cometbft.abci.v1.ExtendedVoteInfo.extension_signature": + case "cometbft.abci.v2.ExtendedVoteInfo.extension_signature": x.ExtensionSignature = nil - case "cometbft.abci.v1.ExtendedVoteInfo.block_id_flag": + case "cometbft.abci.v2.ExtendedVoteInfo.block_id_flag": x.BlockIdFlag = 0 + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_vote_extension": + x.NonRpVoteExtension = nil + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_extension_signature": + x.NonRpExtensionSignature = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedVoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedVoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedVoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedVoteInfo does not contain field %s", fd.FullName())) } } @@ -29087,23 +29740,29 @@ func (x *fastReflection_ExtendedVoteInfo) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ExtendedVoteInfo) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.ExtendedVoteInfo.validator": + case "cometbft.abci.v2.ExtendedVoteInfo.validator": value := x.Validator return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.ExtendedVoteInfo.vote_extension": + case "cometbft.abci.v2.ExtendedVoteInfo.vote_extension": value := x.VoteExtension return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ExtendedVoteInfo.extension_signature": + case "cometbft.abci.v2.ExtendedVoteInfo.extension_signature": value := x.ExtensionSignature return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.ExtendedVoteInfo.block_id_flag": + case "cometbft.abci.v2.ExtendedVoteInfo.block_id_flag": value := x.BlockIdFlag return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_vote_extension": + value := x.NonRpVoteExtension + return protoreflect.ValueOfBytes(value) + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_extension_signature": + value := x.NonRpExtensionSignature + return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedVoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedVoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedVoteInfo does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedVoteInfo does not contain field %s", descriptor.FullName())) } } @@ -29119,19 +29778,23 @@ func (x *fastReflection_ExtendedVoteInfo) Get(descriptor protoreflect.FieldDescr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedVoteInfo) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedVoteInfo.validator": + case "cometbft.abci.v2.ExtendedVoteInfo.validator": x.Validator = value.Message().Interface().(*Validator) - case "cometbft.abci.v1.ExtendedVoteInfo.vote_extension": + case "cometbft.abci.v2.ExtendedVoteInfo.vote_extension": x.VoteExtension = value.Bytes() - case "cometbft.abci.v1.ExtendedVoteInfo.extension_signature": + case "cometbft.abci.v2.ExtendedVoteInfo.extension_signature": x.ExtensionSignature = value.Bytes() - case "cometbft.abci.v1.ExtendedVoteInfo.block_id_flag": - x.BlockIdFlag = (v1.BlockIDFlag)(value.Enum()) + case "cometbft.abci.v2.ExtendedVoteInfo.block_id_flag": + x.BlockIdFlag = (v2.BlockIDFlag)(value.Enum()) + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_vote_extension": + x.NonRpVoteExtension = value.Bytes() + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_extension_signature": + x.NonRpExtensionSignature = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedVoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedVoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedVoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedVoteInfo does not contain field %s", fd.FullName())) } } @@ -29147,22 +29810,26 @@ func (x *fastReflection_ExtendedVoteInfo) Set(fd protoreflect.FieldDescriptor, v // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedVoteInfo) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedVoteInfo.validator": + case "cometbft.abci.v2.ExtendedVoteInfo.validator": if x.Validator == nil { x.Validator = new(Validator) } return protoreflect.ValueOfMessage(x.Validator.ProtoReflect()) - case "cometbft.abci.v1.ExtendedVoteInfo.vote_extension": - panic(fmt.Errorf("field vote_extension of message cometbft.abci.v1.ExtendedVoteInfo is not mutable")) - case "cometbft.abci.v1.ExtendedVoteInfo.extension_signature": - panic(fmt.Errorf("field extension_signature of message cometbft.abci.v1.ExtendedVoteInfo is not mutable")) - case "cometbft.abci.v1.ExtendedVoteInfo.block_id_flag": - panic(fmt.Errorf("field block_id_flag of message cometbft.abci.v1.ExtendedVoteInfo is not mutable")) + case "cometbft.abci.v2.ExtendedVoteInfo.vote_extension": + panic(fmt.Errorf("field vote_extension of message cometbft.abci.v2.ExtendedVoteInfo is not mutable")) + case "cometbft.abci.v2.ExtendedVoteInfo.extension_signature": + panic(fmt.Errorf("field extension_signature of message cometbft.abci.v2.ExtendedVoteInfo is not mutable")) + case "cometbft.abci.v2.ExtendedVoteInfo.block_id_flag": + panic(fmt.Errorf("field block_id_flag of message cometbft.abci.v2.ExtendedVoteInfo is not mutable")) + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_vote_extension": + panic(fmt.Errorf("field non_rp_vote_extension of message cometbft.abci.v2.ExtendedVoteInfo is not mutable")) + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_extension_signature": + panic(fmt.Errorf("field non_rp_extension_signature of message cometbft.abci.v2.ExtendedVoteInfo is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedVoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedVoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedVoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedVoteInfo does not contain field %s", fd.FullName())) } } @@ -29171,20 +29838,24 @@ func (x *fastReflection_ExtendedVoteInfo) Mutable(fd protoreflect.FieldDescripto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ExtendedVoteInfo) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.ExtendedVoteInfo.validator": + case "cometbft.abci.v2.ExtendedVoteInfo.validator": m := new(Validator) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.ExtendedVoteInfo.vote_extension": + case "cometbft.abci.v2.ExtendedVoteInfo.vote_extension": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ExtendedVoteInfo.extension_signature": + case "cometbft.abci.v2.ExtendedVoteInfo.extension_signature": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.ExtendedVoteInfo.block_id_flag": + case "cometbft.abci.v2.ExtendedVoteInfo.block_id_flag": return protoreflect.ValueOfEnum(0) + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_vote_extension": + return protoreflect.ValueOfBytes(nil) + case "cometbft.abci.v2.ExtendedVoteInfo.non_rp_extension_signature": + return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.ExtendedVoteInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.ExtendedVoteInfo")) } - panic(fmt.Errorf("message cometbft.abci.v1.ExtendedVoteInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.ExtendedVoteInfo does not contain field %s", fd.FullName())) } } @@ -29194,7 +29865,7 @@ func (x *fastReflection_ExtendedVoteInfo) NewField(fd protoreflect.FieldDescript func (x *fastReflection_ExtendedVoteInfo) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.ExtendedVoteInfo", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.ExtendedVoteInfo", d.FullName())) } panic("unreachable") } @@ -29264,6 +29935,14 @@ func (x *fastReflection_ExtendedVoteInfo) ProtoMethods() *protoiface.Methods { if x.BlockIdFlag != 0 { n += 1 + runtime.Sov(uint64(x.BlockIdFlag)) } + l = len(x.NonRpVoteExtension) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } + l = len(x.NonRpExtensionSignature) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -29293,6 +29972,20 @@ func (x *fastReflection_ExtendedVoteInfo) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.NonRpExtensionSignature) > 0 { + i -= len(x.NonRpExtensionSignature) + copy(dAtA[i:], x.NonRpExtensionSignature) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.NonRpExtensionSignature))) + i-- + dAtA[i] = 0x3a + } + if len(x.NonRpVoteExtension) > 0 { + i -= len(x.NonRpVoteExtension) + copy(dAtA[i:], x.NonRpVoteExtension) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.NonRpVoteExtension))) + i-- + dAtA[i] = 0x32 + } if x.BlockIdFlag != 0 { i = runtime.EncodeVarint(dAtA, i, uint64(x.BlockIdFlag)) i-- @@ -29493,11 +30186,79 @@ func (x *fastReflection_ExtendedVoteInfo) ProtoMethods() *protoiface.Methods { } b := dAtA[iNdEx] iNdEx++ - x.BlockIdFlag |= v1.BlockIDFlag(b&0x7F) << shift + x.BlockIdFlag |= v2.BlockIDFlag(b&0x7F) << shift if b < 0x80 { break } } + case 6: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NonRpVoteExtension", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.NonRpVoteExtension = append(x.NonRpVoteExtension[:0], dAtA[iNdEx:postIndex]...) + if x.NonRpVoteExtension == nil { + x.NonRpVoteExtension = []byte{} + } + iNdEx = postIndex + case 7: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NonRpExtensionSignature", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.NonRpExtensionSignature = append(x.NonRpExtensionSignature[:0], dAtA[iNdEx:postIndex]...) + if x.NonRpExtensionSignature == nil { + x.NonRpExtensionSignature = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -29543,8 +30304,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_Misbehavior = File_cometbft_abci_v1_types_proto.Messages().ByName("Misbehavior") + file_cometbft_abci_v2_types_proto_init() + md_Misbehavior = File_cometbft_abci_v2_types_proto.Messages().ByName("Misbehavior") fd_Misbehavior_type = md_Misbehavior.Fields().ByName("type") fd_Misbehavior_validator = md_Misbehavior.Fields().ByName("validator") fd_Misbehavior_height = md_Misbehavior.Fields().ByName("height") @@ -29561,7 +30322,7 @@ func (x *Misbehavior) ProtoReflect() protoreflect.Message { } func (x *Misbehavior) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[45] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[45] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -29662,21 +30423,21 @@ func (x *fastReflection_Misbehavior) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_Misbehavior) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.Misbehavior.type": + case "cometbft.abci.v2.Misbehavior.type": return x.Type_ != 0 - case "cometbft.abci.v1.Misbehavior.validator": + case "cometbft.abci.v2.Misbehavior.validator": return x.Validator != nil - case "cometbft.abci.v1.Misbehavior.height": + case "cometbft.abci.v2.Misbehavior.height": return x.Height != int64(0) - case "cometbft.abci.v1.Misbehavior.time": + case "cometbft.abci.v2.Misbehavior.time": return x.Time != nil - case "cometbft.abci.v1.Misbehavior.total_voting_power": + case "cometbft.abci.v2.Misbehavior.total_voting_power": return x.TotalVotingPower != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Misbehavior")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Misbehavior")) } - panic(fmt.Errorf("message cometbft.abci.v1.Misbehavior does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Misbehavior does not contain field %s", fd.FullName())) } } @@ -29688,21 +30449,21 @@ func (x *fastReflection_Misbehavior) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Misbehavior) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.Misbehavior.type": + case "cometbft.abci.v2.Misbehavior.type": x.Type_ = 0 - case "cometbft.abci.v1.Misbehavior.validator": + case "cometbft.abci.v2.Misbehavior.validator": x.Validator = nil - case "cometbft.abci.v1.Misbehavior.height": + case "cometbft.abci.v2.Misbehavior.height": x.Height = int64(0) - case "cometbft.abci.v1.Misbehavior.time": + case "cometbft.abci.v2.Misbehavior.time": x.Time = nil - case "cometbft.abci.v1.Misbehavior.total_voting_power": + case "cometbft.abci.v2.Misbehavior.total_voting_power": x.TotalVotingPower = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Misbehavior")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Misbehavior")) } - panic(fmt.Errorf("message cometbft.abci.v1.Misbehavior does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Misbehavior does not contain field %s", fd.FullName())) } } @@ -29714,26 +30475,26 @@ func (x *fastReflection_Misbehavior) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Misbehavior) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.Misbehavior.type": + case "cometbft.abci.v2.Misbehavior.type": value := x.Type_ return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "cometbft.abci.v1.Misbehavior.validator": + case "cometbft.abci.v2.Misbehavior.validator": value := x.Validator return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Misbehavior.height": + case "cometbft.abci.v2.Misbehavior.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.abci.v1.Misbehavior.time": + case "cometbft.abci.v2.Misbehavior.time": value := x.Time return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.abci.v1.Misbehavior.total_voting_power": + case "cometbft.abci.v2.Misbehavior.total_voting_power": value := x.TotalVotingPower return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Misbehavior")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Misbehavior")) } - panic(fmt.Errorf("message cometbft.abci.v1.Misbehavior does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Misbehavior does not contain field %s", descriptor.FullName())) } } @@ -29749,21 +30510,21 @@ func (x *fastReflection_Misbehavior) Get(descriptor protoreflect.FieldDescriptor // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Misbehavior) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.Misbehavior.type": + case "cometbft.abci.v2.Misbehavior.type": x.Type_ = (MisbehaviorType)(value.Enum()) - case "cometbft.abci.v1.Misbehavior.validator": + case "cometbft.abci.v2.Misbehavior.validator": x.Validator = value.Message().Interface().(*Validator) - case "cometbft.abci.v1.Misbehavior.height": + case "cometbft.abci.v2.Misbehavior.height": x.Height = value.Int() - case "cometbft.abci.v1.Misbehavior.time": + case "cometbft.abci.v2.Misbehavior.time": x.Time = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.abci.v1.Misbehavior.total_voting_power": + case "cometbft.abci.v2.Misbehavior.total_voting_power": x.TotalVotingPower = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Misbehavior")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Misbehavior")) } - panic(fmt.Errorf("message cometbft.abci.v1.Misbehavior does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Misbehavior does not contain field %s", fd.FullName())) } } @@ -29779,27 +30540,27 @@ func (x *fastReflection_Misbehavior) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Misbehavior) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Misbehavior.validator": + case "cometbft.abci.v2.Misbehavior.validator": if x.Validator == nil { x.Validator = new(Validator) } return protoreflect.ValueOfMessage(x.Validator.ProtoReflect()) - case "cometbft.abci.v1.Misbehavior.time": + case "cometbft.abci.v2.Misbehavior.time": if x.Time == nil { x.Time = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Time.ProtoReflect()) - case "cometbft.abci.v1.Misbehavior.type": - panic(fmt.Errorf("field type of message cometbft.abci.v1.Misbehavior is not mutable")) - case "cometbft.abci.v1.Misbehavior.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.Misbehavior is not mutable")) - case "cometbft.abci.v1.Misbehavior.total_voting_power": - panic(fmt.Errorf("field total_voting_power of message cometbft.abci.v1.Misbehavior is not mutable")) + case "cometbft.abci.v2.Misbehavior.type": + panic(fmt.Errorf("field type of message cometbft.abci.v2.Misbehavior is not mutable")) + case "cometbft.abci.v2.Misbehavior.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.Misbehavior is not mutable")) + case "cometbft.abci.v2.Misbehavior.total_voting_power": + panic(fmt.Errorf("field total_voting_power of message cometbft.abci.v2.Misbehavior is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Misbehavior")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Misbehavior")) } - panic(fmt.Errorf("message cometbft.abci.v1.Misbehavior does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Misbehavior does not contain field %s", fd.FullName())) } } @@ -29808,23 +30569,23 @@ func (x *fastReflection_Misbehavior) Mutable(fd protoreflect.FieldDescriptor) pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Misbehavior) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Misbehavior.type": + case "cometbft.abci.v2.Misbehavior.type": return protoreflect.ValueOfEnum(0) - case "cometbft.abci.v1.Misbehavior.validator": + case "cometbft.abci.v2.Misbehavior.validator": m := new(Validator) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.Misbehavior.height": + case "cometbft.abci.v2.Misbehavior.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.abci.v1.Misbehavior.time": + case "cometbft.abci.v2.Misbehavior.time": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.abci.v1.Misbehavior.total_voting_power": + case "cometbft.abci.v2.Misbehavior.total_voting_power": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Misbehavior")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Misbehavior")) } - panic(fmt.Errorf("message cometbft.abci.v1.Misbehavior does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Misbehavior does not contain field %s", fd.FullName())) } } @@ -29834,7 +30595,7 @@ func (x *fastReflection_Misbehavior) NewField(fd protoreflect.FieldDescriptor) p func (x *fastReflection_Misbehavior) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.Misbehavior", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.Misbehavior", d.FullName())) } panic("unreachable") } @@ -30201,8 +30962,8 @@ var ( ) func init() { - file_cometbft_abci_v1_types_proto_init() - md_Snapshot = File_cometbft_abci_v1_types_proto.Messages().ByName("Snapshot") + file_cometbft_abci_v2_types_proto_init() + md_Snapshot = File_cometbft_abci_v2_types_proto.Messages().ByName("Snapshot") fd_Snapshot_height = md_Snapshot.Fields().ByName("height") fd_Snapshot_format = md_Snapshot.Fields().ByName("format") fd_Snapshot_chunks = md_Snapshot.Fields().ByName("chunks") @@ -30219,7 +30980,7 @@ func (x *Snapshot) ProtoReflect() protoreflect.Message { } func (x *Snapshot) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[46] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[46] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -30320,21 +31081,21 @@ func (x *fastReflection_Snapshot) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Snapshot) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.abci.v1.Snapshot.height": + case "cometbft.abci.v2.Snapshot.height": return x.Height != uint64(0) - case "cometbft.abci.v1.Snapshot.format": + case "cometbft.abci.v2.Snapshot.format": return x.Format != uint32(0) - case "cometbft.abci.v1.Snapshot.chunks": + case "cometbft.abci.v2.Snapshot.chunks": return x.Chunks != uint32(0) - case "cometbft.abci.v1.Snapshot.hash": + case "cometbft.abci.v2.Snapshot.hash": return len(x.Hash) != 0 - case "cometbft.abci.v1.Snapshot.metadata": + case "cometbft.abci.v2.Snapshot.metadata": return len(x.Metadata) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Snapshot")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Snapshot")) } - panic(fmt.Errorf("message cometbft.abci.v1.Snapshot does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Snapshot does not contain field %s", fd.FullName())) } } @@ -30346,21 +31107,21 @@ func (x *fastReflection_Snapshot) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Snapshot) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.abci.v1.Snapshot.height": + case "cometbft.abci.v2.Snapshot.height": x.Height = uint64(0) - case "cometbft.abci.v1.Snapshot.format": + case "cometbft.abci.v2.Snapshot.format": x.Format = uint32(0) - case "cometbft.abci.v1.Snapshot.chunks": + case "cometbft.abci.v2.Snapshot.chunks": x.Chunks = uint32(0) - case "cometbft.abci.v1.Snapshot.hash": + case "cometbft.abci.v2.Snapshot.hash": x.Hash = nil - case "cometbft.abci.v1.Snapshot.metadata": + case "cometbft.abci.v2.Snapshot.metadata": x.Metadata = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Snapshot")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Snapshot")) } - panic(fmt.Errorf("message cometbft.abci.v1.Snapshot does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Snapshot does not contain field %s", fd.FullName())) } } @@ -30372,26 +31133,26 @@ func (x *fastReflection_Snapshot) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Snapshot) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.abci.v1.Snapshot.height": + case "cometbft.abci.v2.Snapshot.height": value := x.Height return protoreflect.ValueOfUint64(value) - case "cometbft.abci.v1.Snapshot.format": + case "cometbft.abci.v2.Snapshot.format": value := x.Format return protoreflect.ValueOfUint32(value) - case "cometbft.abci.v1.Snapshot.chunks": + case "cometbft.abci.v2.Snapshot.chunks": value := x.Chunks return protoreflect.ValueOfUint32(value) - case "cometbft.abci.v1.Snapshot.hash": + case "cometbft.abci.v2.Snapshot.hash": value := x.Hash return protoreflect.ValueOfBytes(value) - case "cometbft.abci.v1.Snapshot.metadata": + case "cometbft.abci.v2.Snapshot.metadata": value := x.Metadata return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Snapshot")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Snapshot")) } - panic(fmt.Errorf("message cometbft.abci.v1.Snapshot does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Snapshot does not contain field %s", descriptor.FullName())) } } @@ -30407,21 +31168,21 @@ func (x *fastReflection_Snapshot) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Snapshot) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.abci.v1.Snapshot.height": + case "cometbft.abci.v2.Snapshot.height": x.Height = value.Uint() - case "cometbft.abci.v1.Snapshot.format": + case "cometbft.abci.v2.Snapshot.format": x.Format = uint32(value.Uint()) - case "cometbft.abci.v1.Snapshot.chunks": + case "cometbft.abci.v2.Snapshot.chunks": x.Chunks = uint32(value.Uint()) - case "cometbft.abci.v1.Snapshot.hash": + case "cometbft.abci.v2.Snapshot.hash": x.Hash = value.Bytes() - case "cometbft.abci.v1.Snapshot.metadata": + case "cometbft.abci.v2.Snapshot.metadata": x.Metadata = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Snapshot")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Snapshot")) } - panic(fmt.Errorf("message cometbft.abci.v1.Snapshot does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Snapshot does not contain field %s", fd.FullName())) } } @@ -30437,21 +31198,21 @@ func (x *fastReflection_Snapshot) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Snapshot) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Snapshot.height": - panic(fmt.Errorf("field height of message cometbft.abci.v1.Snapshot is not mutable")) - case "cometbft.abci.v1.Snapshot.format": - panic(fmt.Errorf("field format of message cometbft.abci.v1.Snapshot is not mutable")) - case "cometbft.abci.v1.Snapshot.chunks": - panic(fmt.Errorf("field chunks of message cometbft.abci.v1.Snapshot is not mutable")) - case "cometbft.abci.v1.Snapshot.hash": - panic(fmt.Errorf("field hash of message cometbft.abci.v1.Snapshot is not mutable")) - case "cometbft.abci.v1.Snapshot.metadata": - panic(fmt.Errorf("field metadata of message cometbft.abci.v1.Snapshot is not mutable")) + case "cometbft.abci.v2.Snapshot.height": + panic(fmt.Errorf("field height of message cometbft.abci.v2.Snapshot is not mutable")) + case "cometbft.abci.v2.Snapshot.format": + panic(fmt.Errorf("field format of message cometbft.abci.v2.Snapshot is not mutable")) + case "cometbft.abci.v2.Snapshot.chunks": + panic(fmt.Errorf("field chunks of message cometbft.abci.v2.Snapshot is not mutable")) + case "cometbft.abci.v2.Snapshot.hash": + panic(fmt.Errorf("field hash of message cometbft.abci.v2.Snapshot is not mutable")) + case "cometbft.abci.v2.Snapshot.metadata": + panic(fmt.Errorf("field metadata of message cometbft.abci.v2.Snapshot is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Snapshot")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Snapshot")) } - panic(fmt.Errorf("message cometbft.abci.v1.Snapshot does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Snapshot does not contain field %s", fd.FullName())) } } @@ -30460,21 +31221,21 @@ func (x *fastReflection_Snapshot) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Snapshot) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.abci.v1.Snapshot.height": + case "cometbft.abci.v2.Snapshot.height": return protoreflect.ValueOfUint64(uint64(0)) - case "cometbft.abci.v1.Snapshot.format": + case "cometbft.abci.v2.Snapshot.format": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.abci.v1.Snapshot.chunks": + case "cometbft.abci.v2.Snapshot.chunks": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.abci.v1.Snapshot.hash": + case "cometbft.abci.v2.Snapshot.hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.abci.v1.Snapshot.metadata": + case "cometbft.abci.v2.Snapshot.metadata": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v1.Snapshot")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.abci.v2.Snapshot")) } - panic(fmt.Errorf("message cometbft.abci.v1.Snapshot does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.abci.v2.Snapshot does not contain field %s", fd.FullName())) } } @@ -30484,7 +31245,7 @@ func (x *fastReflection_Snapshot) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Snapshot) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v1.Snapshot", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.abci.v2.Snapshot", d.FullName())) } panic("unreachable") } @@ -30827,7 +31588,7 @@ func (x *fastReflection_Snapshot) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/abci/v1/types.proto +// source: cometbft/abci/v2/types.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -30877,11 +31638,11 @@ func (x CheckTxType) String() string { } func (CheckTxType) Descriptor() protoreflect.EnumDescriptor { - return file_cometbft_abci_v1_types_proto_enumTypes[0].Descriptor() + return file_cometbft_abci_v2_types_proto_enumTypes[0].Descriptor() } func (CheckTxType) Type() protoreflect.EnumType { - return &file_cometbft_abci_v1_types_proto_enumTypes[0] + return &file_cometbft_abci_v2_types_proto_enumTypes[0] } func (x CheckTxType) Number() protoreflect.EnumNumber { @@ -30890,7 +31651,7 @@ func (x CheckTxType) Number() protoreflect.EnumNumber { // Deprecated: Use CheckTxType.Descriptor instead. func (CheckTxType) EnumDescriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{0} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{0} } // The result of offering a snapshot. @@ -30942,11 +31703,11 @@ func (x OfferSnapshotResult) String() string { } func (OfferSnapshotResult) Descriptor() protoreflect.EnumDescriptor { - return file_cometbft_abci_v1_types_proto_enumTypes[1].Descriptor() + return file_cometbft_abci_v2_types_proto_enumTypes[1].Descriptor() } func (OfferSnapshotResult) Type() protoreflect.EnumType { - return &file_cometbft_abci_v1_types_proto_enumTypes[1] + return &file_cometbft_abci_v2_types_proto_enumTypes[1] } func (x OfferSnapshotResult) Number() protoreflect.EnumNumber { @@ -30955,7 +31716,7 @@ func (x OfferSnapshotResult) Number() protoreflect.EnumNumber { // Deprecated: Use OfferSnapshotResult.Descriptor instead. func (OfferSnapshotResult) EnumDescriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{1} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{1} } // The result of applying a snapshot chunk. @@ -31007,11 +31768,11 @@ func (x ApplySnapshotChunkResult) String() string { } func (ApplySnapshotChunkResult) Descriptor() protoreflect.EnumDescriptor { - return file_cometbft_abci_v1_types_proto_enumTypes[2].Descriptor() + return file_cometbft_abci_v2_types_proto_enumTypes[2].Descriptor() } func (ApplySnapshotChunkResult) Type() protoreflect.EnumType { - return &file_cometbft_abci_v1_types_proto_enumTypes[2] + return &file_cometbft_abci_v2_types_proto_enumTypes[2] } func (x ApplySnapshotChunkResult) Number() protoreflect.EnumNumber { @@ -31020,7 +31781,7 @@ func (x ApplySnapshotChunkResult) Number() protoreflect.EnumNumber { // Deprecated: Use ApplySnapshotChunkResult.Descriptor instead. func (ApplySnapshotChunkResult) EnumDescriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{2} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{2} } // ProcessProposalStatus is the status of the proposal processing. @@ -31060,11 +31821,11 @@ func (x ProcessProposalStatus) String() string { } func (ProcessProposalStatus) Descriptor() protoreflect.EnumDescriptor { - return file_cometbft_abci_v1_types_proto_enumTypes[3].Descriptor() + return file_cometbft_abci_v2_types_proto_enumTypes[3].Descriptor() } func (ProcessProposalStatus) Type() protoreflect.EnumType { - return &file_cometbft_abci_v1_types_proto_enumTypes[3] + return &file_cometbft_abci_v2_types_proto_enumTypes[3] } func (x ProcessProposalStatus) Number() protoreflect.EnumNumber { @@ -31073,7 +31834,7 @@ func (x ProcessProposalStatus) Number() protoreflect.EnumNumber { // Deprecated: Use ProcessProposalStatus.Descriptor instead. func (ProcessProposalStatus) EnumDescriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{3} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{3} } // VerifyVoteExtensionStatus is the status of the vote extension verification. @@ -31116,11 +31877,11 @@ func (x VerifyVoteExtensionStatus) String() string { } func (VerifyVoteExtensionStatus) Descriptor() protoreflect.EnumDescriptor { - return file_cometbft_abci_v1_types_proto_enumTypes[4].Descriptor() + return file_cometbft_abci_v2_types_proto_enumTypes[4].Descriptor() } func (VerifyVoteExtensionStatus) Type() protoreflect.EnumType { - return &file_cometbft_abci_v1_types_proto_enumTypes[4] + return &file_cometbft_abci_v2_types_proto_enumTypes[4] } func (x VerifyVoteExtensionStatus) Number() protoreflect.EnumNumber { @@ -31129,7 +31890,7 @@ func (x VerifyVoteExtensionStatus) Number() protoreflect.EnumNumber { // Deprecated: Use VerifyVoteExtensionStatus.Descriptor instead. func (VerifyVoteExtensionStatus) EnumDescriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{4} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{4} } // The type of misbehavior committed by a validator. @@ -31169,11 +31930,11 @@ func (x MisbehaviorType) String() string { } func (MisbehaviorType) Descriptor() protoreflect.EnumDescriptor { - return file_cometbft_abci_v1_types_proto_enumTypes[5].Descriptor() + return file_cometbft_abci_v2_types_proto_enumTypes[5].Descriptor() } func (MisbehaviorType) Type() protoreflect.EnumType { - return &file_cometbft_abci_v1_types_proto_enumTypes[5] + return &file_cometbft_abci_v2_types_proto_enumTypes[5] } func (x MisbehaviorType) Number() protoreflect.EnumNumber { @@ -31182,7 +31943,7 @@ func (x MisbehaviorType) Number() protoreflect.EnumNumber { // Deprecated: Use MisbehaviorType.Descriptor instead. func (MisbehaviorType) EnumDescriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{5} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{5} } // Request represents a request to the ABCI application. @@ -31217,7 +31978,7 @@ type Request struct { func (x *Request) Reset() { *x = Request{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[0] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31231,7 +31992,7 @@ func (*Request) ProtoMessage() {} // Deprecated: Use Request.ProtoReflect.Descriptor instead. func (*Request) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{0} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{0} } func (x *Request) GetValue() isRequest_Value { @@ -31465,7 +32226,7 @@ type EchoRequest struct { func (x *EchoRequest) Reset() { *x = EchoRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[1] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31479,7 +32240,7 @@ func (*EchoRequest) ProtoMessage() {} // Deprecated: Use EchoRequest.ProtoReflect.Descriptor instead. func (*EchoRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{1} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{1} } func (x *EchoRequest) GetMessage() string { @@ -31499,7 +32260,7 @@ type FlushRequest struct { func (x *FlushRequest) Reset() { *x = FlushRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[2] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31513,7 +32274,7 @@ func (*FlushRequest) ProtoMessage() {} // Deprecated: Use FlushRequest.ProtoReflect.Descriptor instead. func (*FlushRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{2} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{2} } // InfoRequest is a request for the ABCI application version. @@ -31531,7 +32292,7 @@ type InfoRequest struct { func (x *InfoRequest) Reset() { *x = InfoRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[3] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31545,7 +32306,7 @@ func (*InfoRequest) ProtoMessage() {} // Deprecated: Use InfoRequest.ProtoReflect.Descriptor instead. func (*InfoRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{3} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{3} } func (x *InfoRequest) GetVersion() string { @@ -31584,7 +32345,7 @@ type InitChainRequest struct { Time *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"` ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - ConsensusParams *v1.ConsensusParams `protobuf:"bytes,3,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` + ConsensusParams *v2.ConsensusParams `protobuf:"bytes,3,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` Validators []*ValidatorUpdate `protobuf:"bytes,4,rep,name=validators,proto3" json:"validators,omitempty"` AppStateBytes []byte `protobuf:"bytes,5,opt,name=app_state_bytes,json=appStateBytes,proto3" json:"app_state_bytes,omitempty"` InitialHeight int64 `protobuf:"varint,6,opt,name=initial_height,json=initialHeight,proto3" json:"initial_height,omitempty"` @@ -31593,7 +32354,7 @@ type InitChainRequest struct { func (x *InitChainRequest) Reset() { *x = InitChainRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[4] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31607,7 +32368,7 @@ func (*InitChainRequest) ProtoMessage() {} // Deprecated: Use InitChainRequest.ProtoReflect.Descriptor instead. func (*InitChainRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{4} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{4} } func (x *InitChainRequest) GetTime() *timestamppb.Timestamp { @@ -31624,7 +32385,7 @@ func (x *InitChainRequest) GetChainId() string { return "" } -func (x *InitChainRequest) GetConsensusParams() *v1.ConsensusParams { +func (x *InitChainRequest) GetConsensusParams() *v2.ConsensusParams { if x != nil { return x.ConsensusParams } @@ -31667,7 +32428,7 @@ type QueryRequest struct { func (x *QueryRequest) Reset() { *x = QueryRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[5] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31681,7 +32442,7 @@ func (*QueryRequest) ProtoMessage() {} // Deprecated: Use QueryRequest.ProtoReflect.Descriptor instead. func (*QueryRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{5} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{5} } func (x *QueryRequest) GetData() []byte { @@ -31719,13 +32480,13 @@ type CheckTxRequest struct { unknownFields protoimpl.UnknownFields Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` - Type_ CheckTxType `protobuf:"varint,3,opt,name=type,proto3,enum=cometbft.abci.v1.CheckTxType" json:"type,omitempty"` + Type_ CheckTxType `protobuf:"varint,3,opt,name=type,proto3,enum=cometbft.abci.v2.CheckTxType" json:"type,omitempty"` } func (x *CheckTxRequest) Reset() { *x = CheckTxRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[6] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31739,7 +32500,7 @@ func (*CheckTxRequest) ProtoMessage() {} // Deprecated: Use CheckTxRequest.ProtoReflect.Descriptor instead. func (*CheckTxRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{6} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{6} } func (x *CheckTxRequest) GetTx() []byte { @@ -31766,7 +32527,7 @@ type CommitRequest struct { func (x *CommitRequest) Reset() { *x = CommitRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[7] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31780,7 +32541,7 @@ func (*CommitRequest) ProtoMessage() {} // Deprecated: Use CommitRequest.ProtoReflect.Descriptor instead. func (*CommitRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{7} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{7} } // Request to list available snapshots. @@ -31793,7 +32554,7 @@ type ListSnapshotsRequest struct { func (x *ListSnapshotsRequest) Reset() { *x = ListSnapshotsRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[8] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31807,7 +32568,7 @@ func (*ListSnapshotsRequest) ProtoMessage() {} // Deprecated: Use ListSnapshotsRequest.ProtoReflect.Descriptor instead. func (*ListSnapshotsRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{8} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{8} } // Request offering a snapshot to the application. @@ -31823,7 +32584,7 @@ type OfferSnapshotRequest struct { func (x *OfferSnapshotRequest) Reset() { *x = OfferSnapshotRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[9] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31837,7 +32598,7 @@ func (*OfferSnapshotRequest) ProtoMessage() {} // Deprecated: Use OfferSnapshotRequest.ProtoReflect.Descriptor instead. func (*OfferSnapshotRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{9} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{9} } func (x *OfferSnapshotRequest) GetSnapshot() *Snapshot { @@ -31868,7 +32629,7 @@ type LoadSnapshotChunkRequest struct { func (x *LoadSnapshotChunkRequest) Reset() { *x = LoadSnapshotChunkRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[10] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31882,7 +32643,7 @@ func (*LoadSnapshotChunkRequest) ProtoMessage() {} // Deprecated: Use LoadSnapshotChunkRequest.ProtoReflect.Descriptor instead. func (*LoadSnapshotChunkRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{10} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{10} } func (x *LoadSnapshotChunkRequest) GetHeight() uint64 { @@ -31920,7 +32681,7 @@ type ApplySnapshotChunkRequest struct { func (x *ApplySnapshotChunkRequest) Reset() { *x = ApplySnapshotChunkRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[11] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31934,7 +32695,7 @@ func (*ApplySnapshotChunkRequest) ProtoMessage() {} // Deprecated: Use ApplySnapshotChunkRequest.ProtoReflect.Descriptor instead. func (*ApplySnapshotChunkRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{11} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{11} } func (x *ApplySnapshotChunkRequest) GetIndex() uint32 { @@ -31982,7 +32743,7 @@ type PrepareProposalRequest struct { func (x *PrepareProposalRequest) Reset() { *x = PrepareProposalRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[12] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -31996,7 +32757,7 @@ func (*PrepareProposalRequest) ProtoMessage() {} // Deprecated: Use PrepareProposalRequest.ProtoReflect.Descriptor instead. func (*PrepareProposalRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{12} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{12} } func (x *PrepareProposalRequest) GetMaxTxBytes() int64 { @@ -32077,7 +32838,7 @@ type ProcessProposalRequest struct { func (x *ProcessProposalRequest) Reset() { *x = ProcessProposalRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[13] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32091,7 +32852,7 @@ func (*ProcessProposalRequest) ProtoMessage() {} // Deprecated: Use ProcessProposalRequest.ProtoReflect.Descriptor instead. func (*ProcessProposalRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{13} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{13} } func (x *ProcessProposalRequest) GetTxs() [][]byte { @@ -32173,7 +32934,7 @@ type ExtendVoteRequest struct { func (x *ExtendVoteRequest) Reset() { *x = ExtendVoteRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[14] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32187,7 +32948,7 @@ func (*ExtendVoteRequest) ProtoMessage() {} // Deprecated: Use ExtendVoteRequest.ProtoReflect.Descriptor instead. func (*ExtendVoteRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{14} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{14} } func (x *ExtendVoteRequest) GetHash() []byte { @@ -32248,6 +33009,8 @@ func (x *ExtendVoteRequest) GetProposerAddress() []byte { // VerifyVoteExtensionRequest is a request for the application to verify a vote extension // produced by a different validator. +// The request contains two vote extension fields: one that is replay-protected ('vote_extension') +// and one that is not ('non_rp_vote_extension'). type VerifyVoteExtensionRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -32258,13 +33021,16 @@ type VerifyVoteExtensionRequest struct { // the validator that signed the vote extension ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` - VoteExtension []byte `protobuf:"bytes,4,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` + // replay-protected vote extension + VoteExtension []byte `protobuf:"bytes,4,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` + // non-replay-protected vote extension + NonRpVoteExtension []byte `protobuf:"bytes,5,opt,name=non_rp_vote_extension,json=nonRpVoteExtension,proto3" json:"non_rp_vote_extension,omitempty"` } func (x *VerifyVoteExtensionRequest) Reset() { *x = VerifyVoteExtensionRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[15] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32278,7 +33044,7 @@ func (*VerifyVoteExtensionRequest) ProtoMessage() {} // Deprecated: Use VerifyVoteExtensionRequest.ProtoReflect.Descriptor instead. func (*VerifyVoteExtensionRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{15} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{15} } func (x *VerifyVoteExtensionRequest) GetHash() []byte { @@ -32309,6 +33075,13 @@ func (x *VerifyVoteExtensionRequest) GetVoteExtension() []byte { return nil } +func (x *VerifyVoteExtensionRequest) GetNonRpVoteExtension() []byte { + if x != nil { + return x.NonRpVoteExtension + } + return nil +} + // FinalizeBlockRequest is a request to finalize the block. type FinalizeBlockRequest struct { state protoimpl.MessageState @@ -32332,7 +33105,7 @@ type FinalizeBlockRequest struct { func (x *FinalizeBlockRequest) Reset() { *x = FinalizeBlockRequest{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[16] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32346,7 +33119,7 @@ func (*FinalizeBlockRequest) ProtoMessage() {} // Deprecated: Use FinalizeBlockRequest.ProtoReflect.Descriptor instead. func (*FinalizeBlockRequest) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{16} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{16} } func (x *FinalizeBlockRequest) GetTxs() [][]byte { @@ -32445,7 +33218,7 @@ type Response struct { func (x *Response) Reset() { *x = Response{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[17] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32459,7 +33232,7 @@ func (*Response) ProtoMessage() {} // Deprecated: Use Response.ProtoReflect.Descriptor instead. func (*Response) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{17} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{17} } func (x *Response) GetValue() isResponse_Value { @@ -32706,7 +33479,7 @@ type ExceptionResponse struct { func (x *ExceptionResponse) Reset() { *x = ExceptionResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[18] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32720,7 +33493,7 @@ func (*ExceptionResponse) ProtoMessage() {} // Deprecated: Use ExceptionResponse.ProtoReflect.Descriptor instead. func (*ExceptionResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{18} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{18} } func (x *ExceptionResponse) GetError() string { @@ -32742,7 +33515,7 @@ type EchoResponse struct { func (x *EchoResponse) Reset() { *x = EchoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[19] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32756,7 +33529,7 @@ func (*EchoResponse) ProtoMessage() {} // Deprecated: Use EchoResponse.ProtoReflect.Descriptor instead. func (*EchoResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{19} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{19} } func (x *EchoResponse) GetMessage() string { @@ -32776,7 +33549,7 @@ type FlushResponse struct { func (x *FlushResponse) Reset() { *x = FlushResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[20] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32790,7 +33563,7 @@ func (*FlushResponse) ProtoMessage() {} // Deprecated: Use FlushResponse.ProtoReflect.Descriptor instead. func (*FlushResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{20} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{20} } // InfoResponse contains the ABCI application version information. @@ -32799,17 +33572,19 @@ type InfoResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` - Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` - AppVersion uint64 `protobuf:"varint,3,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty"` - LastBlockHeight int64 `protobuf:"varint,4,opt,name=last_block_height,json=lastBlockHeight,proto3" json:"last_block_height,omitempty"` - LastBlockAppHash []byte `protobuf:"bytes,5,opt,name=last_block_app_hash,json=lastBlockAppHash,proto3" json:"last_block_app_hash,omitempty"` + Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + AppVersion uint64 `protobuf:"varint,3,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty"` + LastBlockHeight int64 `protobuf:"varint,4,opt,name=last_block_height,json=lastBlockHeight,proto3" json:"last_block_height,omitempty"` + LastBlockAppHash []byte `protobuf:"bytes,5,opt,name=last_block_app_hash,json=lastBlockAppHash,proto3" json:"last_block_app_hash,omitempty"` + LanePriorities map[string]uint32 `protobuf:"bytes,6,rep,name=lane_priorities,json=lanePriorities,proto3" json:"lane_priorities,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + DefaultLane string `protobuf:"bytes,7,opt,name=default_lane,json=defaultLane,proto3" json:"default_lane,omitempty"` } func (x *InfoResponse) Reset() { *x = InfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[21] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32823,7 +33598,7 @@ func (*InfoResponse) ProtoMessage() {} // Deprecated: Use InfoResponse.ProtoReflect.Descriptor instead. func (*InfoResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{21} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{21} } func (x *InfoResponse) GetData() string { @@ -32861,6 +33636,20 @@ func (x *InfoResponse) GetLastBlockAppHash() []byte { return nil } +func (x *InfoResponse) GetLanePriorities() map[string]uint32 { + if x != nil { + return x.LanePriorities + } + return nil +} + +func (x *InfoResponse) GetDefaultLane() string { + if x != nil { + return x.DefaultLane + } + return "" +} + // InitChainResponse contains the ABCI application's hash and updates to the // validator set and/or the consensus params, if any. type InitChainResponse struct { @@ -32868,7 +33657,7 @@ type InitChainResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ConsensusParams *v1.ConsensusParams `protobuf:"bytes,1,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` + ConsensusParams *v2.ConsensusParams `protobuf:"bytes,1,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` Validators []*ValidatorUpdate `protobuf:"bytes,2,rep,name=validators,proto3" json:"validators,omitempty"` AppHash []byte `protobuf:"bytes,3,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` } @@ -32876,7 +33665,7 @@ type InitChainResponse struct { func (x *InitChainResponse) Reset() { *x = InitChainResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[22] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32890,10 +33679,10 @@ func (*InitChainResponse) ProtoMessage() {} // Deprecated: Use InitChainResponse.ProtoReflect.Descriptor instead. func (*InitChainResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{22} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{22} } -func (x *InitChainResponse) GetConsensusParams() *v1.ConsensusParams { +func (x *InitChainResponse) GetConsensusParams() *v2.ConsensusParams { if x != nil { return x.ConsensusParams } @@ -32922,20 +33711,20 @@ type QueryResponse struct { Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` // bytes data = 2; // use "value" instead. - Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` // nondeterministic - Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` // nondeterministic - Index int64 `protobuf:"varint,5,opt,name=index,proto3" json:"index,omitempty"` - Key []byte `protobuf:"bytes,6,opt,name=key,proto3" json:"key,omitempty"` - Value []byte `protobuf:"bytes,7,opt,name=value,proto3" json:"value,omitempty"` - ProofOps *v11.ProofOps `protobuf:"bytes,8,opt,name=proof_ops,json=proofOps,proto3" json:"proof_ops,omitempty"` - Height int64 `protobuf:"varint,9,opt,name=height,proto3" json:"height,omitempty"` - Codespace string `protobuf:"bytes,10,opt,name=codespace,proto3" json:"codespace,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` // nondeterministic + Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` // nondeterministic + Index int64 `protobuf:"varint,5,opt,name=index,proto3" json:"index,omitempty"` + Key []byte `protobuf:"bytes,6,opt,name=key,proto3" json:"key,omitempty"` + Value []byte `protobuf:"bytes,7,opt,name=value,proto3" json:"value,omitempty"` + ProofOps *v1.ProofOps `protobuf:"bytes,8,opt,name=proof_ops,json=proofOps,proto3" json:"proof_ops,omitempty"` + Height int64 `protobuf:"varint,9,opt,name=height,proto3" json:"height,omitempty"` + Codespace string `protobuf:"bytes,10,opt,name=codespace,proto3" json:"codespace,omitempty"` } func (x *QueryResponse) Reset() { *x = QueryResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[23] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -32949,7 +33738,7 @@ func (*QueryResponse) ProtoMessage() {} // Deprecated: Use QueryResponse.ProtoReflect.Descriptor instead. func (*QueryResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{23} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{23} } func (x *QueryResponse) GetCode() uint32 { @@ -32994,7 +33783,7 @@ func (x *QueryResponse) GetValue() []byte { return nil } -func (x *QueryResponse) GetProofOps() *v11.ProofOps { +func (x *QueryResponse) GetProofOps() *v1.ProofOps { if x != nil { return x.ProofOps } @@ -33030,12 +33819,13 @@ type CheckTxResponse struct { GasUsed int64 `protobuf:"varint,6,opt,name=gas_used,proto3" json:"gas_used,omitempty"` Events []*Event `protobuf:"bytes,7,rep,name=events,proto3" json:"events,omitempty"` // nondeterministic Codespace string `protobuf:"bytes,8,opt,name=codespace,proto3" json:"codespace,omitempty"` + LaneId string `protobuf:"bytes,12,opt,name=lane_id,json=laneId,proto3" json:"lane_id,omitempty"` } func (x *CheckTxResponse) Reset() { *x = CheckTxResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[24] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33049,7 +33839,7 @@ func (*CheckTxResponse) ProtoMessage() {} // Deprecated: Use CheckTxResponse.ProtoReflect.Descriptor instead. func (*CheckTxResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{24} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{24} } func (x *CheckTxResponse) GetCode() uint32 { @@ -33108,6 +33898,13 @@ func (x *CheckTxResponse) GetCodespace() string { return "" } +func (x *CheckTxResponse) GetLaneId() string { + if x != nil { + return x.LaneId + } + return "" +} + // CommitResponse indicates how much blocks should CometBFT retain. type CommitResponse struct { state protoimpl.MessageState @@ -33120,7 +33917,7 @@ type CommitResponse struct { func (x *CommitResponse) Reset() { *x = CommitResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[25] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33134,7 +33931,7 @@ func (*CommitResponse) ProtoMessage() {} // Deprecated: Use CommitResponse.ProtoReflect.Descriptor instead. func (*CommitResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{25} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{25} } func (x *CommitResponse) GetRetainHeight() int64 { @@ -33156,7 +33953,7 @@ type ListSnapshotsResponse struct { func (x *ListSnapshotsResponse) Reset() { *x = ListSnapshotsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[26] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33170,7 +33967,7 @@ func (*ListSnapshotsResponse) ProtoMessage() {} // Deprecated: Use ListSnapshotsResponse.ProtoReflect.Descriptor instead. func (*ListSnapshotsResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{26} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{26} } func (x *ListSnapshotsResponse) GetSnapshots() []*Snapshot { @@ -33187,13 +33984,13 @@ type OfferSnapshotResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Result OfferSnapshotResult `protobuf:"varint,1,opt,name=result,proto3,enum=cometbft.abci.v1.OfferSnapshotResult" json:"result,omitempty"` + Result OfferSnapshotResult `protobuf:"varint,1,opt,name=result,proto3,enum=cometbft.abci.v2.OfferSnapshotResult" json:"result,omitempty"` } func (x *OfferSnapshotResponse) Reset() { *x = OfferSnapshotResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[27] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33207,7 +34004,7 @@ func (*OfferSnapshotResponse) ProtoMessage() {} // Deprecated: Use OfferSnapshotResponse.ProtoReflect.Descriptor instead. func (*OfferSnapshotResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{27} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{27} } func (x *OfferSnapshotResponse) GetResult() OfferSnapshotResult { @@ -33229,7 +34026,7 @@ type LoadSnapshotChunkResponse struct { func (x *LoadSnapshotChunkResponse) Reset() { *x = LoadSnapshotChunkResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[28] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33243,7 +34040,7 @@ func (*LoadSnapshotChunkResponse) ProtoMessage() {} // Deprecated: Use LoadSnapshotChunkResponse.ProtoReflect.Descriptor instead. func (*LoadSnapshotChunkResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{28} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{28} } func (x *LoadSnapshotChunkResponse) GetChunk() []byte { @@ -33259,7 +34056,7 @@ type ApplySnapshotChunkResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Result ApplySnapshotChunkResult `protobuf:"varint,1,opt,name=result,proto3,enum=cometbft.abci.v1.ApplySnapshotChunkResult" json:"result,omitempty"` + Result ApplySnapshotChunkResult `protobuf:"varint,1,opt,name=result,proto3,enum=cometbft.abci.v2.ApplySnapshotChunkResult" json:"result,omitempty"` RefetchChunks []uint32 `protobuf:"varint,2,rep,packed,name=refetch_chunks,json=refetchChunks,proto3" json:"refetch_chunks,omitempty"` // Chunks to refetch and reapply RejectSenders []string `protobuf:"bytes,3,rep,name=reject_senders,json=rejectSenders,proto3" json:"reject_senders,omitempty"` // Chunk senders to reject and ban } @@ -33267,7 +34064,7 @@ type ApplySnapshotChunkResponse struct { func (x *ApplySnapshotChunkResponse) Reset() { *x = ApplySnapshotChunkResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[29] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33281,7 +34078,7 @@ func (*ApplySnapshotChunkResponse) ProtoMessage() {} // Deprecated: Use ApplySnapshotChunkResponse.ProtoReflect.Descriptor instead. func (*ApplySnapshotChunkResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{29} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{29} } func (x *ApplySnapshotChunkResponse) GetResult() ApplySnapshotChunkResult { @@ -33317,7 +34114,7 @@ type PrepareProposalResponse struct { func (x *PrepareProposalResponse) Reset() { *x = PrepareProposalResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[30] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33331,7 +34128,7 @@ func (*PrepareProposalResponse) ProtoMessage() {} // Deprecated: Use PrepareProposalResponse.ProtoReflect.Descriptor instead. func (*PrepareProposalResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{30} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{30} } func (x *PrepareProposalResponse) GetTxs() [][]byte { @@ -33348,13 +34145,13 @@ type ProcessProposalResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Status ProcessProposalStatus `protobuf:"varint,1,opt,name=status,proto3,enum=cometbft.abci.v1.ProcessProposalStatus" json:"status,omitempty"` + Status ProcessProposalStatus `protobuf:"varint,1,opt,name=status,proto3,enum=cometbft.abci.v2.ProcessProposalStatus" json:"status,omitempty"` } func (x *ProcessProposalResponse) Reset() { *x = ProcessProposalResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[31] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33368,7 +34165,7 @@ func (*ProcessProposalResponse) ProtoMessage() {} // Deprecated: Use ProcessProposalResponse.ProtoReflect.Descriptor instead. func (*ProcessProposalResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{31} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{31} } func (x *ProcessProposalResponse) GetStatus() ProcessProposalStatus { @@ -33380,18 +34177,21 @@ func (x *ProcessProposalResponse) GetStatus() ProcessProposalStatus { // ExtendVoteResponse contains the vote extension that the application would like to // attach to its next precommit vote. +// Information in `vote_extension` will be replay-protected. +// Information in `non_rp_extension` will not be replay-protected. type ExtendVoteResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - VoteExtension []byte `protobuf:"bytes,1,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` + VoteExtension []byte `protobuf:"bytes,1,opt,name=vote_extension,json=voteExtension,proto3" json:"vote_extension,omitempty"` // this extension's signature is replay-protected + NonRpExtension []byte `protobuf:"bytes,2,opt,name=non_rp_extension,json=nonRpExtension,proto3" json:"non_rp_extension,omitempty"` // this extension's signature is _not_ replay-protected } func (x *ExtendVoteResponse) Reset() { *x = ExtendVoteResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[32] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33405,7 +34205,7 @@ func (*ExtendVoteResponse) ProtoMessage() {} // Deprecated: Use ExtendVoteResponse.ProtoReflect.Descriptor instead. func (*ExtendVoteResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{32} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{32} } func (x *ExtendVoteResponse) GetVoteExtension() []byte { @@ -33415,6 +34215,13 @@ func (x *ExtendVoteResponse) GetVoteExtension() []byte { return nil } +func (x *ExtendVoteResponse) GetNonRpExtension() []byte { + if x != nil { + return x.NonRpExtension + } + return nil +} + // VerifyVoteExtensionResponse indicates the ABCI application's decision // whenever the vote extension should be accepted or not. type VerifyVoteExtensionResponse struct { @@ -33422,13 +34229,13 @@ type VerifyVoteExtensionResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Status VerifyVoteExtensionStatus `protobuf:"varint,1,opt,name=status,proto3,enum=cometbft.abci.v1.VerifyVoteExtensionStatus" json:"status,omitempty"` + Status VerifyVoteExtensionStatus `protobuf:"varint,1,opt,name=status,proto3,enum=cometbft.abci.v2.VerifyVoteExtensionStatus" json:"status,omitempty"` } func (x *VerifyVoteExtensionResponse) Reset() { *x = VerifyVoteExtensionResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[33] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33442,7 +34249,7 @@ func (*VerifyVoteExtensionResponse) ProtoMessage() {} // Deprecated: Use VerifyVoteExtensionResponse.ProtoReflect.Descriptor instead. func (*VerifyVoteExtensionResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{33} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{33} } func (x *VerifyVoteExtensionResponse) GetStatus() VerifyVoteExtensionStatus { @@ -33467,17 +34274,20 @@ type FinalizeBlockResponse struct { // a list of updates to the validator set. These will reflect the validator set at current height + 2. ValidatorUpdates []*ValidatorUpdate `protobuf:"bytes,3,rep,name=validator_updates,json=validatorUpdates,proto3" json:"validator_updates,omitempty"` // updates to the consensus params, if any. - ConsensusParamUpdates *v1.ConsensusParams `protobuf:"bytes,4,opt,name=consensus_param_updates,json=consensusParamUpdates,proto3" json:"consensus_param_updates,omitempty"` + ConsensusParamUpdates *v2.ConsensusParams `protobuf:"bytes,4,opt,name=consensus_param_updates,json=consensusParamUpdates,proto3" json:"consensus_param_updates,omitempty"` // app_hash is the hash of the applications' state which is used to confirm // that execution of the transactions was deterministic. // It is up to the application to decide which algorithm to use. AppHash []byte `protobuf:"bytes,5,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + // delay between the time when this block is committed and the next height is started. + // previously `timeout_commit` in config.toml + NextBlockDelay *durationpb.Duration `protobuf:"bytes,6,opt,name=next_block_delay,json=nextBlockDelay,proto3" json:"next_block_delay,omitempty"` } func (x *FinalizeBlockResponse) Reset() { *x = FinalizeBlockResponse{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[34] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[34] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33491,7 +34301,7 @@ func (*FinalizeBlockResponse) ProtoMessage() {} // Deprecated: Use FinalizeBlockResponse.ProtoReflect.Descriptor instead. func (*FinalizeBlockResponse) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{34} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{34} } func (x *FinalizeBlockResponse) GetEvents() []*Event { @@ -33515,7 +34325,7 @@ func (x *FinalizeBlockResponse) GetValidatorUpdates() []*ValidatorUpdate { return nil } -func (x *FinalizeBlockResponse) GetConsensusParamUpdates() *v1.ConsensusParams { +func (x *FinalizeBlockResponse) GetConsensusParamUpdates() *v2.ConsensusParams { if x != nil { return x.ConsensusParamUpdates } @@ -33529,6 +34339,13 @@ func (x *FinalizeBlockResponse) GetAppHash() []byte { return nil } +func (x *FinalizeBlockResponse) GetNextBlockDelay() *durationpb.Duration { + if x != nil { + return x.NextBlockDelay + } + return nil +} + // CommitInfo contains votes for the particular round. type CommitInfo struct { state protoimpl.MessageState @@ -33542,7 +34359,7 @@ type CommitInfo struct { func (x *CommitInfo) Reset() { *x = CommitInfo{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[35] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[35] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33556,7 +34373,7 @@ func (*CommitInfo) ProtoMessage() {} // Deprecated: Use CommitInfo.ProtoReflect.Descriptor instead. func (*CommitInfo) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{35} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{35} } func (x *CommitInfo) GetRound() int32 { @@ -33591,7 +34408,7 @@ type ExtendedCommitInfo struct { func (x *ExtendedCommitInfo) Reset() { *x = ExtendedCommitInfo{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[36] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[36] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33605,7 +34422,7 @@ func (*ExtendedCommitInfo) ProtoMessage() {} // Deprecated: Use ExtendedCommitInfo.ProtoReflect.Descriptor instead. func (*ExtendedCommitInfo) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{36} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{36} } func (x *ExtendedCommitInfo) GetRound() int32 { @@ -33639,7 +34456,7 @@ type Event struct { func (x *Event) Reset() { *x = Event{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[37] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[37] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33653,7 +34470,7 @@ func (*Event) ProtoMessage() {} // Deprecated: Use Event.ProtoReflect.Descriptor instead. func (*Event) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{37} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{37} } func (x *Event) GetType_() string { @@ -33684,7 +34501,7 @@ type EventAttribute struct { func (x *EventAttribute) Reset() { *x = EventAttribute{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[38] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[38] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33698,7 +34515,7 @@ func (*EventAttribute) ProtoMessage() {} // Deprecated: Use EventAttribute.ProtoReflect.Descriptor instead. func (*EventAttribute) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{38} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{38} } func (x *EventAttribute) GetKey() string { @@ -33743,7 +34560,7 @@ type ExecTxResult struct { func (x *ExecTxResult) Reset() { *x = ExecTxResult{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[39] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[39] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33757,7 +34574,7 @@ func (*ExecTxResult) ProtoMessage() {} // Deprecated: Use ExecTxResult.ProtoReflect.Descriptor instead. func (*ExecTxResult) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{39} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{39} } func (x *ExecTxResult) GetCode() uint32 { @@ -33833,7 +34650,7 @@ type TxResult struct { func (x *TxResult) Reset() { *x = TxResult{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[40] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[40] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33847,7 +34664,7 @@ func (*TxResult) ProtoMessage() {} // Deprecated: Use TxResult.ProtoReflect.Descriptor instead. func (*TxResult) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{40} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{40} } func (x *TxResult) GetHeight() int64 { @@ -33892,7 +34709,7 @@ type Validator struct { func (x *Validator) Reset() { *x = Validator{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[41] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[41] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33906,7 +34723,7 @@ func (*Validator) ProtoMessage() {} // Deprecated: Use Validator.ProtoReflect.Descriptor instead. func (*Validator) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{41} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{41} } func (x *Validator) GetAddress() []byte { @@ -33937,7 +34754,7 @@ type ValidatorUpdate struct { func (x *ValidatorUpdate) Reset() { *x = ValidatorUpdate{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[42] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[42] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -33951,7 +34768,7 @@ func (*ValidatorUpdate) ProtoMessage() {} // Deprecated: Use ValidatorUpdate.ProtoReflect.Descriptor instead. func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{42} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{42} } func (x *ValidatorUpdate) GetPower() int64 { @@ -33982,13 +34799,13 @@ type VoteInfo struct { unknownFields protoimpl.UnknownFields Validator *Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator,omitempty"` - BlockIdFlag v1.BlockIDFlag `protobuf:"varint,3,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.types.v1.BlockIDFlag" json:"block_id_flag,omitempty"` + BlockIdFlag v2.BlockIDFlag `protobuf:"varint,3,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.types.v2.BlockIDFlag" json:"block_id_flag,omitempty"` } func (x *VoteInfo) Reset() { *x = VoteInfo{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[43] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[43] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -34002,7 +34819,7 @@ func (*VoteInfo) ProtoMessage() {} // Deprecated: Use VoteInfo.ProtoReflect.Descriptor instead. func (*VoteInfo) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{43} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{43} } func (x *VoteInfo) GetValidator() *Validator { @@ -34012,11 +34829,11 @@ func (x *VoteInfo) GetValidator() *Validator { return nil } -func (x *VoteInfo) GetBlockIdFlag() v1.BlockIDFlag { +func (x *VoteInfo) GetBlockIdFlag() v2.BlockIDFlag { if x != nil { return x.BlockIdFlag } - return v1.BlockIDFlag(0) + return v2.BlockIDFlag(0) } // ExtendedVoteInfo extends VoteInfo with the vote extensions (non-deterministic). @@ -34032,13 +34849,17 @@ type ExtendedVoteInfo struct { // Vote extension signature created by CometBFT ExtensionSignature []byte `protobuf:"bytes,4,opt,name=extension_signature,json=extensionSignature,proto3" json:"extension_signature,omitempty"` // block_id_flag indicates whether the validator voted for a block, nil, or did not vote at all - BlockIdFlag v1.BlockIDFlag `protobuf:"varint,5,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.types.v1.BlockIDFlag" json:"block_id_flag,omitempty"` + BlockIdFlag v2.BlockIDFlag `protobuf:"varint,5,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.types.v2.BlockIDFlag" json:"block_id_flag,omitempty"` + // Non-deterministic non-replay-protected extension provided by the sending validator's application. + NonRpVoteExtension []byte `protobuf:"bytes,6,opt,name=non_rp_vote_extension,json=nonRpVoteExtension,proto3" json:"non_rp_vote_extension,omitempty"` + // Signature on non-replay-protected extension created by CometBFT + NonRpExtensionSignature []byte `protobuf:"bytes,7,opt,name=non_rp_extension_signature,json=nonRpExtensionSignature,proto3" json:"non_rp_extension_signature,omitempty"` } func (x *ExtendedVoteInfo) Reset() { *x = ExtendedVoteInfo{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[44] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[44] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -34052,7 +34873,7 @@ func (*ExtendedVoteInfo) ProtoMessage() {} // Deprecated: Use ExtendedVoteInfo.ProtoReflect.Descriptor instead. func (*ExtendedVoteInfo) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{44} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{44} } func (x *ExtendedVoteInfo) GetValidator() *Validator { @@ -34076,11 +34897,25 @@ func (x *ExtendedVoteInfo) GetExtensionSignature() []byte { return nil } -func (x *ExtendedVoteInfo) GetBlockIdFlag() v1.BlockIDFlag { +func (x *ExtendedVoteInfo) GetBlockIdFlag() v2.BlockIDFlag { if x != nil { return x.BlockIdFlag } - return v1.BlockIDFlag(0) + return v2.BlockIDFlag(0) +} + +func (x *ExtendedVoteInfo) GetNonRpVoteExtension() []byte { + if x != nil { + return x.NonRpVoteExtension + } + return nil +} + +func (x *ExtendedVoteInfo) GetNonRpExtensionSignature() []byte { + if x != nil { + return x.NonRpExtensionSignature + } + return nil } // Misbehavior is a type of misbehavior committed by a validator. @@ -34089,7 +34924,7 @@ type Misbehavior struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Type_ MisbehaviorType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.abci.v1.MisbehaviorType" json:"type,omitempty"` + Type_ MisbehaviorType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.abci.v2.MisbehaviorType" json:"type,omitempty"` // The offending validator Validator *Validator `protobuf:"bytes,2,opt,name=validator,proto3" json:"validator,omitempty"` // The height when the offense occurred @@ -34105,7 +34940,7 @@ type Misbehavior struct { func (x *Misbehavior) Reset() { *x = Misbehavior{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[45] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[45] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -34119,7 +34954,7 @@ func (*Misbehavior) ProtoMessage() {} // Deprecated: Use Misbehavior.ProtoReflect.Descriptor instead. func (*Misbehavior) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{45} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{45} } func (x *Misbehavior) GetType_() MisbehaviorType { @@ -34173,7 +35008,7 @@ type Snapshot struct { func (x *Snapshot) Reset() { *x = Snapshot{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_abci_v1_types_proto_msgTypes[46] + mi := &file_cometbft_abci_v2_types_proto_msgTypes[46] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -34187,7 +35022,7 @@ func (*Snapshot) ProtoMessage() {} // Deprecated: Use Snapshot.ProtoReflect.Descriptor instead. func (*Snapshot) Descriptor() ([]byte, []int) { - return file_cometbft_abci_v1_types_proto_rawDescGZIP(), []int{46} + return file_cometbft_abci_v2_types_proto_rawDescGZIP(), []int{46} } func (x *Snapshot) GetHeight() uint64 { @@ -34225,95 +35060,97 @@ func (x *Snapshot) GetMetadata() []byte { return nil } -var File_cometbft_abci_v1_types_proto protoreflect.FileDescriptor +var File_cometbft_abci_v2_types_proto protoreflect.FileDescriptor -var file_cometbft_abci_v1_types_proto_rawDesc = []byte{ +var file_cometbft_abci_v2_types_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, - 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x10, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, + 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x10, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x1a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, + 0x2f, 0x76, 0x32, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, - 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x09, 0x0a, 0x07, 0x52, + 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x09, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x04, 0x65, 0x63, 0x68, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, + 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x65, 0x63, 0x68, 0x6f, 0x12, 0x36, 0x0a, 0x05, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6c, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x05, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x12, 0x33, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x43, 0x0a, 0x0a, 0x69, 0x6e, 0x69, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x36, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x3d, 0x0a, 0x08, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x74, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x07, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x12, 0x39, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, + 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x4f, 0x0a, 0x0e, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, + 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x6c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x12, 0x4f, 0x0a, 0x0e, 0x6f, 0x66, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x66, 0x66, 0x65, + 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x6f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x5c, 0x0a, 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, + 0x32, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x11, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x12, 0x5f, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x12, 0x55, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x55, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x46, 0x0a, 0x0b, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, + 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x12, 0x62, 0x0a, 0x15, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, + 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x13, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x4f, 0x0a, 0x0e, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, - 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, + 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x4a, 0x04, 0x08, 0x07, 0x10, 0x08, @@ -34339,12 +35176,12 @@ var file_cometbft_abci_v1_types_proto_rawDesc = []byte{ 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x4d, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x47, 0x0a, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, + 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x61, 0x70, 0x70, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, @@ -34362,14 +35199,14 @@ var file_cometbft_abci_v1_types_proto_rawDesc = []byte{ 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x74, 0x78, 0x12, 0x31, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, + 0x76, 0x32, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x0f, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x16, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x69, 0x0a, 0x14, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x36, 0x0a, 0x08, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x08, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x70, 0x70, 0x48, 0x61, 0x73, 0x68, 0x22, 0x60, @@ -34392,12 +35229,12 @@ var file_cometbft_abci_v1_types_proto_rawDesc = []byte{ 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, 0x12, 0x56, 0x0a, 0x11, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x45, 0x0a, 0x0b, 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, @@ -34416,12 +35253,12 @@ var file_cometbft_abci_v1_types_proto_rawDesc = []byte{ 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, 0x12, 0x54, 0x0a, 0x14, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, + 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x12, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x45, 0x0a, 0x0b, 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, @@ -34447,12 +35284,12 @@ var file_cometbft_abci_v1_types_proto_rawDesc = []byte{ 0x20, 0x03, 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, 0x12, 0x54, 0x0a, 0x14, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, + 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x12, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x45, 0x0a, 0x0b, 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, + 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x30, 0x0a, 0x14, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x07, @@ -34460,7 +35297,7 @@ var file_cometbft_abci_v1_types_proto_rawDesc = []byte{ 0x74, 0x6f, 0x72, 0x73, 0x48, 0x61, 0x73, 0x68, 0x12, 0x29, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x22, 0x9c, 0x01, 0x0a, 0x1a, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, + 0x65, 0x73, 0x73, 0x22, 0xcf, 0x01, 0x0a, 0x1a, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x2b, 0x0a, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, @@ -34470,607 +35307,643 @@ var file_cometbft_abci_v1_types_proto_rawDesc = []byte{ 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x76, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, - 0x6f, 0x6e, 0x22, 0xb2, 0x03, 0x0a, 0x14, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, - 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x74, - 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, 0x12, 0x52, 0x0a, - 0x13, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x64, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x11, - 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x64, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, - 0x74, 0x12, 0x45, 0x0a, 0x0b, 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, - 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, - 0x61, 0x76, 0x69, 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, 0x6d, 0x69, 0x73, - 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x12, 0x38, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, - 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x30, - 0x0a, 0x14, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, - 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x12, 0x6e, 0x65, - 0x78, 0x74, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x48, 0x61, 0x73, 0x68, - 0x12, 0x29, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x70, - 0x6f, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x73, - 0x79, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x6f, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x73, 0x79, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x54, - 0x6f, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0xa5, 0x0a, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x09, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x63, 0x65, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x09, - 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x04, 0x65, 0x63, 0x68, - 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x04, 0x65, 0x63, 0x68, 0x6f, 0x12, - 0x37, 0x0a, 0x05, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, - 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, - 0x31, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, - 0x00, 0x52, 0x05, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x12, 0x34, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x44, - 0x0a, 0x0a, 0x69, 0x6e, 0x69, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, - 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x69, 0x74, 0x43, - 0x68, 0x61, 0x69, 0x6e, 0x12, 0x37, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x3e, 0x0a, - 0x08, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x74, 0x78, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x48, 0x00, 0x52, 0x07, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x12, 0x3a, 0x0a, - 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, - 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x50, 0x0a, 0x0e, 0x6c, 0x69, 0x73, - 0x74, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, - 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x6c, 0x69, - 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x12, 0x50, 0x0a, 0x0e, 0x6f, - 0x66, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x18, 0x0e, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, - 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0d, - 0x6f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x5d, 0x0a, - 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x5f, 0x63, - 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f, - 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x11, 0x6c, 0x6f, 0x61, 0x64, 0x53, - 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x12, 0x60, 0x0a, 0x14, - 0x61, 0x70, 0x70, 0x6c, 0x79, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x5f, 0x63, - 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x70, - 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, - 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x12, 0x56, - 0x0a, 0x10, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, - 0x61, 0x6c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x65, 0x70, - 0x61, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x72, - 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x56, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, - 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x29, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, - 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, - 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x70, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x47, - 0x0a, 0x0b, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x18, 0x13, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x65, 0x78, 0x74, - 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x12, 0x63, 0x0a, 0x15, 0x76, 0x65, 0x72, 0x69, 0x66, - 0x79, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, - 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, - 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x13, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, - 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x50, 0x0a, 0x0e, - 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x15, + 0x6f, 0x6e, 0x12, 0x31, 0x0a, 0x15, 0x6e, 0x6f, 0x6e, 0x5f, 0x72, 0x70, 0x5f, 0x76, 0x6f, 0x74, + 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x12, 0x6e, 0x6f, 0x6e, 0x52, 0x70, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, + 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xb2, 0x03, 0x0a, 0x14, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, + 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, + 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, + 0x12, 0x52, 0x0a, 0x13, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x64, 0x5f, 0x6c, 0x61, 0x73, 0x74, + 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, + 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x04, 0xc8, 0xde, 0x1f, + 0x00, 0x52, 0x11, 0x64, 0x65, 0x63, 0x69, 0x64, 0x65, 0x64, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, + 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x45, 0x0a, 0x0b, 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, + 0x69, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, + 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x69, 0x73, + 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, + 0x6d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x68, + 0x61, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, + 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x38, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, + 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x04, 0x74, 0x69, 0x6d, + 0x65, 0x12, 0x30, 0x0a, 0x14, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x74, 0x6f, 0x72, 0x73, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x12, 0x6e, 0x65, 0x78, 0x74, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x48, + 0x61, 0x73, 0x68, 0x12, 0x29, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, + 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x70, + 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, + 0x0a, 0x11, 0x73, 0x79, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x6f, 0x5f, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x73, 0x79, 0x6e, 0x63, 0x69, + 0x6e, 0x67, 0x54, 0x6f, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0xa5, 0x0a, 0x0a, 0x08, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x09, 0x65, 0x78, 0x63, 0x65, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, + 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, + 0x00, 0x52, 0x09, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x04, + 0x65, 0x63, 0x68, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x63, + 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x04, 0x65, 0x63, + 0x68, 0x6f, 0x12, 0x37, 0x0a, 0x05, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x48, 0x00, 0x52, 0x05, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x12, 0x34, 0x0a, 0x04, 0x69, + 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, + 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x6e, 0x66, + 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x12, 0x44, 0x0a, 0x0a, 0x69, 0x6e, 0x69, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, + 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, + 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, + 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x37, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, + 0x12, 0x3e, 0x0a, 0x08, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x74, 0x78, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, + 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x07, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, + 0x12, 0x3a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x50, 0x0a, 0x0e, + 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, - 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, - 0x0d, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x07, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04, 0x08, - 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, 0x0a, 0x10, 0x0b, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c, 0x22, - 0x29, 0x0a, 0x11, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x28, 0x0a, 0x0c, 0x45, 0x63, - 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x6c, 0x75, 0x73, 0x68, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xb8, 0x01, 0x0a, 0x0c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x56, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x62, 0x6c, - 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x12, 0x2d, 0x0a, 0x13, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, - 0x61, 0x70, 0x70, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, - 0x6c, 0x61, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x41, 0x70, 0x70, 0x48, 0x61, 0x73, 0x68, - 0x22, 0xc6, 0x01, 0x0a, 0x11, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, - 0x73, 0x75, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, - 0x72, 0x61, 0x6d, 0x73, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, - 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x47, 0x0a, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, - 0x6f, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, - 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x04, 0xc8, 0xde, - 0x1f, 0x00, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x19, - 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x07, 0x61, 0x70, 0x70, 0x48, 0x61, 0x73, 0x68, 0x22, 0xf8, 0x01, 0x0a, 0x0d, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, - 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, - 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6c, 0x6f, - 0x67, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x12, 0x39, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x5f, 0x6f, 0x70, 0x73, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x6f, - 0x66, 0x4f, 0x70, 0x73, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x4f, 0x70, 0x73, 0x12, 0x16, - 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, - 0x70, 0x61, 0x63, 0x65, 0x22, 0xab, 0x02, 0x0a, 0x0f, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6c, - 0x6f, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x61, 0x73, 0x5f, 0x77, 0x61, - 0x6e, 0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x67, 0x61, 0x73, 0x5f, - 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, - 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, - 0x65, 0x64, 0x12, 0x49, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, - 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x18, 0xc8, 0xde, 0x1f, - 0x00, 0xea, 0xde, 0x1f, 0x10, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x6f, 0x6d, 0x69, 0x74, - 0x65, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1c, 0x0a, - 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4a, 0x04, 0x08, 0x09, 0x10, - 0x0c, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, - 0x69, 0x74, 0x79, 0x52, 0x0d, 0x6d, 0x65, 0x6d, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x65, 0x72, 0x72, - 0x6f, 0x72, 0x22, 0x41, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x5f, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x74, - 0x61, 0x69, 0x6e, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, - 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x51, 0x0a, 0x15, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, - 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, - 0x0a, 0x09, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x09, 0x73, - 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x22, 0x56, 0x0a, 0x15, 0x4f, 0x66, 0x66, 0x65, - 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x3d, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0e, 0x32, 0x25, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, - 0x6f, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x22, 0x31, 0x0a, 0x19, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, - 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x63, 0x68, - 0x75, 0x6e, 0x6b, 0x22, 0xae, 0x01, 0x0a, 0x1a, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, - 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x42, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, - 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, - 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, - 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x66, 0x65, 0x74, 0x63, - 0x68, 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0d, - 0x72, 0x65, 0x66, 0x65, 0x74, 0x63, 0x68, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x73, 0x12, 0x25, 0x0a, - 0x0e, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x53, 0x65, 0x6e, - 0x64, 0x65, 0x72, 0x73, 0x22, 0x2b, 0x0a, 0x17, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, - 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x10, 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, - 0x73, 0x22, 0x5a, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, - 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x06, - 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, - 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x3b, 0x0a, - 0x12, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, - 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x76, 0x6f, 0x74, - 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x62, 0x0a, 0x1b, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x73, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, + 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, + 0x73, 0x68, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, + 0x0d, 0x6c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x12, 0x50, + 0x0a, 0x0e, 0x6f, 0x66, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, + 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, + 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, + 0x00, 0x52, 0x0d, 0x6f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, + 0x12, 0x5d, 0x0a, 0x13, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, + 0x74, 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, + 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, + 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x11, 0x6c, 0x6f, + 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x12, + 0x60, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, + 0x74, 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, + 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, + 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x12, 0x61, + 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, + 0x6b, 0x12, 0x56, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x5f, 0x70, 0x72, 0x6f, + 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x63, 0x6f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, + 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72, + 0x65, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x56, 0x0a, 0x10, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x18, 0x12, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, + 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, + 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, + 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, + 0x6c, 0x12, 0x47, 0x0a, 0x0b, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x76, 0x6f, 0x74, 0x65, + 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, + 0x56, 0x6f, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0a, + 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x12, 0x63, 0x0a, 0x15, 0x76, 0x65, + 0x72, 0x69, 0x66, 0x79, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, + 0x69, 0x6f, 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, + 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, - 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xee, - 0x02, 0x0a, 0x15, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x49, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, - 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x13, 0x76, 0x65, 0x72, 0x69, + 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, + 0x50, 0x0a, 0x0e, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, + 0x6b, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, + 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, + 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x48, 0x00, 0x52, 0x0d, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, + 0x6b, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, + 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x4a, 0x04, 0x08, 0x0a, 0x10, 0x0b, 0x4a, 0x04, 0x08, 0x0b, + 0x10, 0x0c, 0x22, 0x29, 0x0a, 0x11, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x28, 0x0a, + 0x0c, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x6c, 0x75, 0x73, 0x68, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xfb, 0x02, 0x0a, 0x0c, 0x49, 0x6e, 0x66, + 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, + 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x5f, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x61, 0x70, + 0x70, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, + 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x12, 0x2d, 0x0a, 0x13, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x62, 0x6c, 0x6f, + 0x63, 0x6b, 0x5f, 0x61, 0x70, 0x70, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x41, 0x70, 0x70, 0x48, + 0x61, 0x73, 0x68, 0x12, 0x5b, 0x0a, 0x0f, 0x6c, 0x61, 0x6e, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x6f, + 0x72, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x63, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x4c, 0x61, 0x6e, + 0x65, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x0e, 0x6c, 0x61, 0x6e, 0x65, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x69, 0x65, 0x73, + 0x12, 0x21, 0x0a, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x6c, 0x61, 0x6e, 0x65, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x4c, + 0x61, 0x6e, 0x65, 0x1a, 0x41, 0x0a, 0x13, 0x4c, 0x61, 0x6e, 0x65, 0x50, 0x72, 0x69, 0x6f, 0x72, + 0x69, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xc6, 0x01, 0x0a, 0x11, 0x49, 0x6e, 0x69, 0x74, 0x43, + 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x10, + 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x65, + 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x73, + 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x47, 0x0a, 0x0a, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, + 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x74, 0x6f, 0x72, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x68, 0x61, 0x73, 0x68, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x70, 0x70, 0x48, 0x61, 0x73, 0x68, 0x22, + 0xf8, 0x01, 0x0a, 0x0d, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x39, 0x0a, 0x09, 0x70, 0x72, 0x6f, + 0x6f, 0x66, 0x5f, 0x6f, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x2e, 0x76, + 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x4f, 0x70, 0x73, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x6f, + 0x66, 0x4f, 0x70, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1c, 0x0a, 0x09, + 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0xc4, 0x02, 0x0a, 0x0f, 0x43, + 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, + 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, + 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, + 0x67, 0x61, 0x73, 0x5f, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x0a, 0x67, 0x61, 0x73, 0x5f, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, + 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, + 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x12, 0x49, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, + 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, + 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x18, 0xc8, 0xde, 0x1f, 0x00, 0xea, 0xde, 0x1f, 0x10, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x6f, 0x6d, 0x69, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x06, 0x65, 0x76, 0x65, - 0x6e, 0x74, 0x73, 0x12, 0x3d, 0x0a, 0x0a, 0x74, 0x78, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x54, - 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x09, 0x74, 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x73, 0x12, 0x54, 0x0a, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, - 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, - 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, - 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x12, 0x5a, 0x0a, 0x17, 0x63, 0x6f, 0x6e, 0x73, - 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5f, 0x75, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, - 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x15, 0x63, - 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x68, 0x61, 0x73, 0x68, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x70, 0x70, 0x48, 0x61, 0x73, 0x68, 0x22, - 0x5a, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, - 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, - 0x75, 0x6e, 0x64, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x6f, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, - 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x04, - 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x05, 0x76, 0x6f, 0x74, 0x65, 0x73, 0x22, 0x6a, 0x0a, 0x12, 0x45, - 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, - 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x3e, 0x0a, 0x05, 0x76, 0x6f, 0x74, 0x65, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, - 0x65, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, - 0x52, 0x05, 0x76, 0x6f, 0x74, 0x65, 0x73, 0x22, 0x7b, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x74, 0x79, 0x70, 0x65, 0x12, 0x5e, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x42, 0x1c, 0xc8, 0xde, 0x1f, 0x00, - 0xea, 0xde, 0x1f, 0x14, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x2c, 0x6f, - 0x6d, 0x69, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x22, 0x4e, 0x0a, 0x0e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x22, 0x81, 0x02, 0x0a, 0x0c, 0x45, 0x78, 0x65, 0x63, 0x54, 0x78, 0x52, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, - 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, - 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x61, 0x73, 0x5f, 0x77, 0x61, 0x6e, 0x74, 0x65, - 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x67, 0x61, 0x73, 0x5f, 0x77, 0x61, 0x6e, - 0x74, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x12, - 0x49, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x17, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x18, 0xc8, 0xde, 0x1f, 0x00, 0xea, 0xde, - 0x1f, 0x10, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x6f, 0x6d, 0x69, 0x74, 0x65, 0x6d, 0x70, - 0x74, 0x79, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, - 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, - 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x86, 0x01, 0x0a, 0x08, 0x54, 0x78, 0x52, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, - 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, - 0x64, 0x65, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, - 0x02, 0x74, 0x78, 0x12, 0x3c, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x54, 0x78, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x22, 0x3b, 0x0a, 0x09, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x18, - 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, - 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, - 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x22, 0x73, - 0x0a, 0x0f, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0d, 0x70, 0x75, 0x62, 0x5f, 0x6b, - 0x65, 0x79, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, - 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0c, 0x70, - 0x75, 0x62, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, - 0x01, 0x10, 0x02, 0x22, 0x95, 0x01, 0x0a, 0x08, 0x56, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, - 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, - 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, - 0x72, 0x12, 0x42, 0x0a, 0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6c, - 0x61, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, - 0x63, 0x6b, 0x49, 0x44, 0x46, 0x6c, 0x61, 0x67, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, - 0x64, 0x46, 0x6c, 0x61, 0x67, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0xf5, 0x01, 0x0a, 0x10, - 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, - 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, - 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, - 0x72, 0x12, 0x25, 0x0a, 0x0e, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, - 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x76, 0x6f, 0x74, 0x65, 0x45, - 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x13, 0x65, 0x78, 0x74, 0x65, - 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x12, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, - 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x42, 0x0a, 0x0d, 0x62, 0x6c, 0x6f, - 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, + 0x6e, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, + 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6c, 0x61, 0x6e, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x6c, 0x61, 0x6e, 0x65, 0x49, 0x64, 0x4a, 0x04, 0x08, 0x09, 0x10, 0x0c, + 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, + 0x74, 0x79, 0x52, 0x0d, 0x6d, 0x65, 0x6d, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x65, 0x72, 0x72, 0x6f, + 0x72, 0x22, 0x41, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x5f, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x61, + 0x69, 0x6e, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, + 0x08, 0x02, 0x10, 0x03, 0x22, 0x51, 0x0a, 0x15, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x6e, 0x61, 0x70, + 0x73, 0x68, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, + 0x09, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x09, 0x73, 0x6e, + 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x22, 0x56, 0x0a, 0x15, 0x4f, 0x66, 0x66, 0x65, 0x72, + 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x3d, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x25, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, + 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, + 0x31, 0x0a, 0x19, 0x4c, 0x6f, 0x61, 0x64, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, + 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x63, 0x68, 0x75, + 0x6e, 0x6b, 0x22, 0xae, 0x01, 0x0a, 0x1a, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, + 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x42, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x2a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, + 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x66, 0x65, 0x74, 0x63, 0x68, + 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0d, 0x72, + 0x65, 0x66, 0x65, 0x74, 0x63, 0x68, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x73, 0x12, 0x25, 0x0a, 0x0e, + 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x18, 0x03, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x53, 0x65, 0x6e, 0x64, + 0x65, 0x72, 0x73, 0x22, 0x2b, 0x0a, 0x17, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x72, + 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, + 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, + 0x22, 0x5a, 0x0a, 0x17, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, + 0x73, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x63, 0x6f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x50, + 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x65, 0x0a, 0x12, + 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, + 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x76, 0x6f, 0x74, 0x65, + 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x6e, 0x6f, 0x6e, + 0x5f, 0x72, 0x70, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6e, 0x6f, 0x6e, 0x52, 0x70, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, + 0x69, 0x6f, 0x6e, 0x22, 0x62, 0x0a, 0x1b, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, + 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, + 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, + 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, + 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xbd, 0x03, 0x0a, 0x15, 0x46, 0x69, 0x6e, 0x61, + 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x49, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x18, 0xc8, 0xde, 0x1f, 0x00, + 0xea, 0xde, 0x1f, 0x10, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x6f, 0x6d, 0x69, 0x74, 0x65, + 0x6d, 0x70, 0x74, 0x79, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x3d, 0x0a, 0x0a, + 0x74, 0x78, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x54, 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x52, 0x09, 0x74, 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x54, 0x0a, 0x11, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, + 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x73, 0x12, 0x5a, 0x0a, 0x17, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x5f, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, + 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, + 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x12, 0x19, 0x0a, + 0x08, 0x61, 0x70, 0x70, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x07, 0x61, 0x70, 0x70, 0x48, 0x61, 0x73, 0x68, 0x12, 0x4d, 0x0a, 0x10, 0x6e, 0x65, 0x78, 0x74, + 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xc8, + 0xde, 0x1f, 0x00, 0x98, 0xdf, 0x1f, 0x01, 0x52, 0x0e, 0x6e, 0x65, 0x78, 0x74, 0x42, 0x6c, 0x6f, + 0x63, 0x6b, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x22, 0x5a, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x69, + 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x36, 0x0a, 0x05, 0x76, + 0x6f, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x6f, + 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x05, 0x76, 0x6f, + 0x74, 0x65, 0x73, 0x22, 0x6a, 0x0a, 0x12, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, + 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, + 0x3e, 0x0a, 0x05, 0x76, 0x6f, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, + 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, + 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x56, 0x6f, 0x74, 0x65, 0x49, 0x6e, + 0x66, 0x6f, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x05, 0x76, 0x6f, 0x74, 0x65, 0x73, 0x22, + 0x7b, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x5e, 0x0a, 0x0a, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, + 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x42, 0x1c, 0xc8, 0xde, 0x1f, 0x00, 0xea, 0xde, 0x1f, 0x14, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x2c, 0x6f, 0x6d, 0x69, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x79, + 0x52, 0x0a, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x22, 0x4e, 0x0a, 0x0e, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x81, 0x02, 0x0a, + 0x0c, 0x45, 0x78, 0x65, 0x63, 0x54, 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, + 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x67, + 0x61, 0x73, 0x5f, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0a, 0x67, 0x61, 0x73, 0x5f, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x67, + 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x67, + 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x12, 0x49, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, + 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, + 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, + 0x42, 0x18, 0xc8, 0xde, 0x1f, 0x00, 0xea, 0xde, 0x1f, 0x10, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, + 0x2c, 0x6f, 0x6d, 0x69, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, + 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x22, 0x86, 0x01, 0x0a, 0x08, 0x54, 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x16, 0x0a, + 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x74, + 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x74, 0x78, 0x12, 0x3c, 0x0a, 0x06, 0x72, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, + 0x78, 0x65, 0x63, 0x54, 0x78, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x42, 0x04, 0xc8, 0xde, 0x1f, + 0x00, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x3b, 0x0a, 0x09, 0x56, 0x61, 0x6c, + 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x22, 0x73, 0x0a, 0x0f, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, + 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, + 0x22, 0x0a, 0x0d, 0x70, 0x75, 0x62, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x42, 0x79, + 0x74, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0c, 0x70, 0x75, 0x62, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x75, 0x62, 0x4b, 0x65, + 0x79, 0x54, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x22, 0x95, 0x01, 0x0a, 0x08, + 0x56, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, + 0x64, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, + 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x09, + 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x42, 0x0a, 0x0d, 0x62, 0x6c, 0x6f, + 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x46, 0x6c, 0x61, 0x67, + 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x46, 0x6c, 0x61, 0x67, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x46, 0x6c, 0x61, 0x67, 0x4a, 0x04, 0x08, - 0x02, 0x10, 0x03, 0x22, 0x85, 0x02, 0x0a, 0x0b, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, - 0x69, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0e, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, - 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, - 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, - 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, - 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x12, 0x38, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, - 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2c, 0x0a, - 0x12, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x76, 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, - 0x77, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x74, 0x6f, 0x74, 0x61, 0x6c, - 0x56, 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x22, 0x82, 0x01, 0x0a, 0x08, - 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x75, 0x6e, - 0x6b, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x73, - 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, - 0x68, 0x61, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0x2a, 0x62, 0x0a, 0x0b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x54, 0x79, 0x70, 0x65, 0x12, - 0x19, 0x0a, 0x15, 0x43, 0x48, 0x45, 0x43, 0x4b, 0x5f, 0x54, 0x58, 0x5f, 0x54, 0x59, 0x50, 0x45, - 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x48, - 0x45, 0x43, 0x4b, 0x5f, 0x54, 0x58, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x43, 0x48, - 0x45, 0x43, 0x4b, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x43, 0x48, 0x45, 0x43, 0x4b, 0x5f, 0x54, - 0x58, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x48, 0x45, 0x43, 0x4b, 0x10, 0x02, 0x1a, 0x04, - 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0xf5, 0x01, 0x0a, 0x13, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, - 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x21, 0x0a, 0x1d, + 0x02, 0x10, 0x03, 0x22, 0xe5, 0x02, 0x0a, 0x10, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, + 0x56, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, + 0x64, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, + 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x09, + 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x25, 0x0a, 0x0e, 0x76, 0x6f, 0x74, + 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x0d, 0x76, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, + 0x12, 0x2f, 0x0a, 0x13, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, + 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x12, 0x65, + 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, + 0x65, 0x12, 0x42, 0x0a, 0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6c, + 0x61, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, + 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, + 0x63, 0x6b, 0x49, 0x44, 0x46, 0x6c, 0x61, 0x67, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, + 0x64, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x31, 0x0a, 0x15, 0x6e, 0x6f, 0x6e, 0x5f, 0x72, 0x70, 0x5f, + 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x12, 0x6e, 0x6f, 0x6e, 0x52, 0x70, 0x56, 0x6f, 0x74, 0x65, 0x45, + 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x1a, 0x6e, 0x6f, 0x6e, 0x5f, + 0x72, 0x70, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x67, + 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x17, 0x6e, 0x6f, + 0x6e, 0x52, 0x70, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x67, 0x6e, + 0x61, 0x74, 0x75, 0x72, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x85, 0x02, 0x0a, 0x0b, + 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x35, 0x0a, 0x04, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, + 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x4d, 0x69, 0x73, + 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, + 0x70, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, + 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, + 0x6f, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x38, 0x0a, 0x04, 0x74, + 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, + 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x76, + 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x10, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x56, 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x6f, + 0x77, 0x65, 0x72, 0x22, 0x82, 0x01, 0x0a, 0x08, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, + 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, + 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, + 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, + 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x06, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, + 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, + 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2a, 0x62, 0x0a, 0x0b, 0x43, 0x68, 0x65, 0x63, + 0x6b, 0x54, 0x78, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x48, 0x45, 0x43, 0x4b, + 0x5f, 0x54, 0x58, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, + 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x48, 0x45, 0x43, 0x4b, 0x5f, 0x54, 0x58, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x43, 0x48, 0x45, 0x43, 0x4b, 0x10, 0x01, 0x12, 0x17, 0x0a, + 0x13, 0x43, 0x48, 0x45, 0x43, 0x4b, 0x5f, 0x54, 0x58, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, + 0x48, 0x45, 0x43, 0x4b, 0x10, 0x02, 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0xf5, 0x01, 0x0a, + 0x13, 0x4f, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, + 0x73, 0x75, 0x6c, 0x74, 0x12, 0x21, 0x0a, 0x1d, 0x4f, 0x46, 0x46, 0x45, 0x52, 0x5f, 0x53, 0x4e, + 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x55, 0x4e, + 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x20, 0x0a, 0x1c, 0x4f, 0x46, 0x46, 0x45, 0x52, + 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, + 0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, 0x10, 0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x4f, 0x46, 0x46, + 0x45, 0x52, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x55, + 0x4c, 0x54, 0x5f, 0x41, 0x42, 0x4f, 0x52, 0x54, 0x10, 0x02, 0x12, 0x20, 0x0a, 0x1c, 0x4f, 0x46, + 0x46, 0x45, 0x52, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x53, + 0x55, 0x4c, 0x54, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x10, 0x03, 0x12, 0x27, 0x0a, 0x23, 0x4f, 0x46, 0x46, 0x45, 0x52, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, - 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, - 0x20, 0x0a, 0x1c, 0x4f, 0x46, 0x46, 0x45, 0x52, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, - 0x54, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, 0x10, - 0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x4f, 0x46, 0x46, 0x45, 0x52, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, - 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x41, 0x42, 0x4f, 0x52, 0x54, - 0x10, 0x02, 0x12, 0x20, 0x0a, 0x1c, 0x4f, 0x46, 0x46, 0x45, 0x52, 0x5f, 0x53, 0x4e, 0x41, 0x50, - 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x52, 0x45, 0x4a, 0x45, - 0x43, 0x54, 0x10, 0x03, 0x12, 0x27, 0x0a, 0x23, 0x4f, 0x46, 0x46, 0x45, 0x52, 0x5f, 0x53, 0x4e, - 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x52, 0x45, - 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x10, 0x04, 0x12, 0x27, 0x0a, - 0x23, 0x4f, 0x46, 0x46, 0x45, 0x52, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, - 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x53, 0x45, - 0x4e, 0x44, 0x45, 0x52, 0x10, 0x05, 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0xa0, 0x02, 0x0a, - 0x18, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, - 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x27, 0x0a, 0x23, 0x41, 0x50, 0x50, - 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, - 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, - 0x10, 0x00, 0x12, 0x26, 0x0a, 0x22, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, - 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, - 0x54, 0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, 0x10, 0x01, 0x12, 0x25, 0x0a, 0x21, 0x41, 0x50, - 0x50, 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, - 0x4e, 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x41, 0x42, 0x4f, 0x52, 0x54, 0x10, - 0x02, 0x12, 0x25, 0x0a, 0x21, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, + 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x46, 0x4f, 0x52, + 0x4d, 0x41, 0x54, 0x10, 0x04, 0x12, 0x27, 0x0a, 0x23, 0x4f, 0x46, 0x46, 0x45, 0x52, 0x5f, 0x53, + 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x52, + 0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x53, 0x45, 0x4e, 0x44, 0x45, 0x52, 0x10, 0x05, 0x1a, 0x04, + 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0xa0, 0x02, 0x0a, 0x18, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x53, 0x6e, + 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, + 0x74, 0x12, 0x27, 0x0a, 0x23, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, - 0x5f, 0x52, 0x45, 0x54, 0x52, 0x59, 0x10, 0x03, 0x12, 0x2e, 0x0a, 0x2a, 0x41, 0x50, 0x50, 0x4c, - 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, - 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x52, 0x45, 0x54, 0x52, 0x59, 0x5f, 0x53, 0x4e, - 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x10, 0x04, 0x12, 0x2f, 0x0a, 0x2b, 0x41, 0x50, 0x50, 0x4c, - 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, - 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x53, - 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x10, 0x05, 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x2a, - 0x8a, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, - 0x73, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x23, 0x0a, 0x1f, 0x50, 0x52, 0x4f, - 0x43, 0x45, 0x53, 0x53, 0x5f, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, - 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x22, - 0x0a, 0x1e, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x53, 0x53, 0x5f, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, - 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, - 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x53, 0x53, 0x5f, 0x50, 0x52, - 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x52, 0x45, - 0x4a, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0x9d, 0x01, 0x0a, - 0x19, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, - 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28, 0x0a, 0x24, 0x56, 0x45, - 0x52, 0x49, 0x46, 0x59, 0x5f, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x53, - 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, - 0x57, 0x4e, 0x10, 0x00, 0x12, 0x27, 0x0a, 0x23, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x5f, 0x56, - 0x4f, 0x54, 0x45, 0x5f, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, - 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, 0x10, 0x01, 0x12, 0x27, 0x0a, - 0x23, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x5f, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x45, 0x58, 0x54, - 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x52, 0x45, - 0x4a, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0x84, 0x01, 0x0a, - 0x0f, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x1c, 0x0a, 0x18, 0x4d, 0x49, 0x53, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, - 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x23, - 0x0a, 0x1f, 0x4d, 0x49, 0x53, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x54, 0x59, - 0x50, 0x45, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x5f, 0x56, 0x4f, 0x54, - 0x45, 0x10, 0x01, 0x12, 0x28, 0x0a, 0x24, 0x4d, 0x49, 0x53, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49, - 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x43, 0x4c, - 0x49, 0x45, 0x4e, 0x54, 0x5f, 0x41, 0x54, 0x54, 0x41, 0x43, 0x4b, 0x10, 0x02, 0x1a, 0x04, 0x88, - 0xa3, 0x1e, 0x00, 0x42, 0xae, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x54, 0x79, - 0x70, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x28, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x62, - 0x63, 0x69, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x41, 0x58, 0xaa, 0x02, 0x10, 0x43, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x41, 0x62, 0x63, 0x69, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, - 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x41, 0x62, 0x63, 0x69, 0x5c, 0x56, 0x31, - 0xe2, 0x02, 0x1c, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x41, 0x62, 0x63, 0x69, - 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, - 0x02, 0x12, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, 0x3a, 0x41, 0x62, 0x63, 0x69, - 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x26, 0x0a, 0x22, 0x41, 0x50, + 0x50, 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, + 0x4e, 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, + 0x10, 0x01, 0x12, 0x25, 0x0a, 0x21, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, + 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, + 0x54, 0x5f, 0x41, 0x42, 0x4f, 0x52, 0x54, 0x10, 0x02, 0x12, 0x25, 0x0a, 0x21, 0x41, 0x50, 0x50, + 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, + 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x52, 0x45, 0x54, 0x52, 0x59, 0x10, 0x03, + 0x12, 0x2e, 0x0a, 0x2a, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, + 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, + 0x52, 0x45, 0x54, 0x52, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x10, 0x04, + 0x12, 0x2f, 0x0a, 0x2b, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, + 0x4f, 0x54, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, + 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x10, + 0x05, 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0x8a, 0x01, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x12, 0x23, 0x0a, 0x1f, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x53, 0x53, 0x5f, 0x50, 0x52, 0x4f, + 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x4b, + 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x53, + 0x53, 0x5f, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, + 0x53, 0x5f, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x52, + 0x4f, 0x43, 0x45, 0x53, 0x53, 0x5f, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, + 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, 0x04, + 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0x9d, 0x01, 0x0a, 0x19, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x56, + 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, + 0x75, 0x73, 0x12, 0x28, 0x0a, 0x24, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x5f, 0x56, 0x4f, 0x54, + 0x45, 0x5f, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, + 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x27, 0x0a, 0x23, + 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x5f, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x45, 0x58, 0x54, 0x45, + 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x43, 0x43, + 0x45, 0x50, 0x54, 0x10, 0x01, 0x12, 0x27, 0x0a, 0x23, 0x56, 0x45, 0x52, 0x49, 0x46, 0x59, 0x5f, + 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x53, + 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x10, 0x02, 0x1a, 0x04, + 0x88, 0xa3, 0x1e, 0x00, 0x2a, 0x84, 0x01, 0x0a, 0x0f, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, + 0x76, 0x69, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x4d, 0x49, 0x53, 0x42, + 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x4b, + 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x23, 0x0a, 0x1f, 0x4d, 0x49, 0x53, 0x42, 0x45, 0x48, + 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x55, 0x50, 0x4c, 0x49, + 0x43, 0x41, 0x54, 0x45, 0x5f, 0x56, 0x4f, 0x54, 0x45, 0x10, 0x01, 0x12, 0x28, 0x0a, 0x24, 0x4d, + 0x49, 0x53, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, + 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54, 0x5f, 0x41, 0x54, 0x54, + 0x41, 0x43, 0x4b, 0x10, 0x02, 0x1a, 0x04, 0x88, 0xa3, 0x1e, 0x00, 0x42, 0xae, 0x01, 0x0a, 0x14, + 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, + 0x69, 0x2e, 0x76, 0x32, 0x42, 0x0a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x28, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, + 0x63, 0x69, 0x2f, 0x76, 0x32, 0x3b, 0x61, 0x62, 0x63, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x43, + 0x41, 0x58, 0xaa, 0x02, 0x10, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x41, 0x62, + 0x63, 0x69, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x10, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, + 0x5c, 0x41, 0x62, 0x63, 0x69, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x1c, 0x43, 0x6f, 0x6d, 0x65, 0x74, + 0x62, 0x66, 0x74, 0x5c, 0x41, 0x62, 0x63, 0x69, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, + 0x66, 0x74, 0x3a, 0x3a, 0x41, 0x62, 0x63, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( - file_cometbft_abci_v1_types_proto_rawDescOnce sync.Once - file_cometbft_abci_v1_types_proto_rawDescData = file_cometbft_abci_v1_types_proto_rawDesc + file_cometbft_abci_v2_types_proto_rawDescOnce sync.Once + file_cometbft_abci_v2_types_proto_rawDescData = file_cometbft_abci_v2_types_proto_rawDesc ) -func file_cometbft_abci_v1_types_proto_rawDescGZIP() []byte { - file_cometbft_abci_v1_types_proto_rawDescOnce.Do(func() { - file_cometbft_abci_v1_types_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_abci_v1_types_proto_rawDescData) +func file_cometbft_abci_v2_types_proto_rawDescGZIP() []byte { + file_cometbft_abci_v2_types_proto_rawDescOnce.Do(func() { + file_cometbft_abci_v2_types_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_abci_v2_types_proto_rawDescData) }) - return file_cometbft_abci_v1_types_proto_rawDescData + return file_cometbft_abci_v2_types_proto_rawDescData } -var file_cometbft_abci_v1_types_proto_enumTypes = make([]protoimpl.EnumInfo, 6) -var file_cometbft_abci_v1_types_proto_msgTypes = make([]protoimpl.MessageInfo, 47) -var file_cometbft_abci_v1_types_proto_goTypes = []interface{}{ - (CheckTxType)(0), // 0: cometbft.abci.v1.CheckTxType - (OfferSnapshotResult)(0), // 1: cometbft.abci.v1.OfferSnapshotResult - (ApplySnapshotChunkResult)(0), // 2: cometbft.abci.v1.ApplySnapshotChunkResult - (ProcessProposalStatus)(0), // 3: cometbft.abci.v1.ProcessProposalStatus - (VerifyVoteExtensionStatus)(0), // 4: cometbft.abci.v1.VerifyVoteExtensionStatus - (MisbehaviorType)(0), // 5: cometbft.abci.v1.MisbehaviorType - (*Request)(nil), // 6: cometbft.abci.v1.Request - (*EchoRequest)(nil), // 7: cometbft.abci.v1.EchoRequest - (*FlushRequest)(nil), // 8: cometbft.abci.v1.FlushRequest - (*InfoRequest)(nil), // 9: cometbft.abci.v1.InfoRequest - (*InitChainRequest)(nil), // 10: cometbft.abci.v1.InitChainRequest - (*QueryRequest)(nil), // 11: cometbft.abci.v1.QueryRequest - (*CheckTxRequest)(nil), // 12: cometbft.abci.v1.CheckTxRequest - (*CommitRequest)(nil), // 13: cometbft.abci.v1.CommitRequest - (*ListSnapshotsRequest)(nil), // 14: cometbft.abci.v1.ListSnapshotsRequest - (*OfferSnapshotRequest)(nil), // 15: cometbft.abci.v1.OfferSnapshotRequest - (*LoadSnapshotChunkRequest)(nil), // 16: cometbft.abci.v1.LoadSnapshotChunkRequest - (*ApplySnapshotChunkRequest)(nil), // 17: cometbft.abci.v1.ApplySnapshotChunkRequest - (*PrepareProposalRequest)(nil), // 18: cometbft.abci.v1.PrepareProposalRequest - (*ProcessProposalRequest)(nil), // 19: cometbft.abci.v1.ProcessProposalRequest - (*ExtendVoteRequest)(nil), // 20: cometbft.abci.v1.ExtendVoteRequest - (*VerifyVoteExtensionRequest)(nil), // 21: cometbft.abci.v1.VerifyVoteExtensionRequest - (*FinalizeBlockRequest)(nil), // 22: cometbft.abci.v1.FinalizeBlockRequest - (*Response)(nil), // 23: cometbft.abci.v1.Response - (*ExceptionResponse)(nil), // 24: cometbft.abci.v1.ExceptionResponse - (*EchoResponse)(nil), // 25: cometbft.abci.v1.EchoResponse - (*FlushResponse)(nil), // 26: cometbft.abci.v1.FlushResponse - (*InfoResponse)(nil), // 27: cometbft.abci.v1.InfoResponse - (*InitChainResponse)(nil), // 28: cometbft.abci.v1.InitChainResponse - (*QueryResponse)(nil), // 29: cometbft.abci.v1.QueryResponse - (*CheckTxResponse)(nil), // 30: cometbft.abci.v1.CheckTxResponse - (*CommitResponse)(nil), // 31: cometbft.abci.v1.CommitResponse - (*ListSnapshotsResponse)(nil), // 32: cometbft.abci.v1.ListSnapshotsResponse - (*OfferSnapshotResponse)(nil), // 33: cometbft.abci.v1.OfferSnapshotResponse - (*LoadSnapshotChunkResponse)(nil), // 34: cometbft.abci.v1.LoadSnapshotChunkResponse - (*ApplySnapshotChunkResponse)(nil), // 35: cometbft.abci.v1.ApplySnapshotChunkResponse - (*PrepareProposalResponse)(nil), // 36: cometbft.abci.v1.PrepareProposalResponse - (*ProcessProposalResponse)(nil), // 37: cometbft.abci.v1.ProcessProposalResponse - (*ExtendVoteResponse)(nil), // 38: cometbft.abci.v1.ExtendVoteResponse - (*VerifyVoteExtensionResponse)(nil), // 39: cometbft.abci.v1.VerifyVoteExtensionResponse - (*FinalizeBlockResponse)(nil), // 40: cometbft.abci.v1.FinalizeBlockResponse - (*CommitInfo)(nil), // 41: cometbft.abci.v1.CommitInfo - (*ExtendedCommitInfo)(nil), // 42: cometbft.abci.v1.ExtendedCommitInfo - (*Event)(nil), // 43: cometbft.abci.v1.Event - (*EventAttribute)(nil), // 44: cometbft.abci.v1.EventAttribute - (*ExecTxResult)(nil), // 45: cometbft.abci.v1.ExecTxResult - (*TxResult)(nil), // 46: cometbft.abci.v1.TxResult - (*Validator)(nil), // 47: cometbft.abci.v1.Validator - (*ValidatorUpdate)(nil), // 48: cometbft.abci.v1.ValidatorUpdate - (*VoteInfo)(nil), // 49: cometbft.abci.v1.VoteInfo - (*ExtendedVoteInfo)(nil), // 50: cometbft.abci.v1.ExtendedVoteInfo - (*Misbehavior)(nil), // 51: cometbft.abci.v1.Misbehavior - (*Snapshot)(nil), // 52: cometbft.abci.v1.Snapshot - (*timestamppb.Timestamp)(nil), // 53: google.protobuf.Timestamp - (*v1.ConsensusParams)(nil), // 54: cometbft.types.v1.ConsensusParams - (*v11.ProofOps)(nil), // 55: cometbft.crypto.v1.ProofOps - (v1.BlockIDFlag)(0), // 56: cometbft.types.v1.BlockIDFlag +var file_cometbft_abci_v2_types_proto_enumTypes = make([]protoimpl.EnumInfo, 6) +var file_cometbft_abci_v2_types_proto_msgTypes = make([]protoimpl.MessageInfo, 48) +var file_cometbft_abci_v2_types_proto_goTypes = []interface{}{ + (CheckTxType)(0), // 0: cometbft.abci.v2.CheckTxType + (OfferSnapshotResult)(0), // 1: cometbft.abci.v2.OfferSnapshotResult + (ApplySnapshotChunkResult)(0), // 2: cometbft.abci.v2.ApplySnapshotChunkResult + (ProcessProposalStatus)(0), // 3: cometbft.abci.v2.ProcessProposalStatus + (VerifyVoteExtensionStatus)(0), // 4: cometbft.abci.v2.VerifyVoteExtensionStatus + (MisbehaviorType)(0), // 5: cometbft.abci.v2.MisbehaviorType + (*Request)(nil), // 6: cometbft.abci.v2.Request + (*EchoRequest)(nil), // 7: cometbft.abci.v2.EchoRequest + (*FlushRequest)(nil), // 8: cometbft.abci.v2.FlushRequest + (*InfoRequest)(nil), // 9: cometbft.abci.v2.InfoRequest + (*InitChainRequest)(nil), // 10: cometbft.abci.v2.InitChainRequest + (*QueryRequest)(nil), // 11: cometbft.abci.v2.QueryRequest + (*CheckTxRequest)(nil), // 12: cometbft.abci.v2.CheckTxRequest + (*CommitRequest)(nil), // 13: cometbft.abci.v2.CommitRequest + (*ListSnapshotsRequest)(nil), // 14: cometbft.abci.v2.ListSnapshotsRequest + (*OfferSnapshotRequest)(nil), // 15: cometbft.abci.v2.OfferSnapshotRequest + (*LoadSnapshotChunkRequest)(nil), // 16: cometbft.abci.v2.LoadSnapshotChunkRequest + (*ApplySnapshotChunkRequest)(nil), // 17: cometbft.abci.v2.ApplySnapshotChunkRequest + (*PrepareProposalRequest)(nil), // 18: cometbft.abci.v2.PrepareProposalRequest + (*ProcessProposalRequest)(nil), // 19: cometbft.abci.v2.ProcessProposalRequest + (*ExtendVoteRequest)(nil), // 20: cometbft.abci.v2.ExtendVoteRequest + (*VerifyVoteExtensionRequest)(nil), // 21: cometbft.abci.v2.VerifyVoteExtensionRequest + (*FinalizeBlockRequest)(nil), // 22: cometbft.abci.v2.FinalizeBlockRequest + (*Response)(nil), // 23: cometbft.abci.v2.Response + (*ExceptionResponse)(nil), // 24: cometbft.abci.v2.ExceptionResponse + (*EchoResponse)(nil), // 25: cometbft.abci.v2.EchoResponse + (*FlushResponse)(nil), // 26: cometbft.abci.v2.FlushResponse + (*InfoResponse)(nil), // 27: cometbft.abci.v2.InfoResponse + (*InitChainResponse)(nil), // 28: cometbft.abci.v2.InitChainResponse + (*QueryResponse)(nil), // 29: cometbft.abci.v2.QueryResponse + (*CheckTxResponse)(nil), // 30: cometbft.abci.v2.CheckTxResponse + (*CommitResponse)(nil), // 31: cometbft.abci.v2.CommitResponse + (*ListSnapshotsResponse)(nil), // 32: cometbft.abci.v2.ListSnapshotsResponse + (*OfferSnapshotResponse)(nil), // 33: cometbft.abci.v2.OfferSnapshotResponse + (*LoadSnapshotChunkResponse)(nil), // 34: cometbft.abci.v2.LoadSnapshotChunkResponse + (*ApplySnapshotChunkResponse)(nil), // 35: cometbft.abci.v2.ApplySnapshotChunkResponse + (*PrepareProposalResponse)(nil), // 36: cometbft.abci.v2.PrepareProposalResponse + (*ProcessProposalResponse)(nil), // 37: cometbft.abci.v2.ProcessProposalResponse + (*ExtendVoteResponse)(nil), // 38: cometbft.abci.v2.ExtendVoteResponse + (*VerifyVoteExtensionResponse)(nil), // 39: cometbft.abci.v2.VerifyVoteExtensionResponse + (*FinalizeBlockResponse)(nil), // 40: cometbft.abci.v2.FinalizeBlockResponse + (*CommitInfo)(nil), // 41: cometbft.abci.v2.CommitInfo + (*ExtendedCommitInfo)(nil), // 42: cometbft.abci.v2.ExtendedCommitInfo + (*Event)(nil), // 43: cometbft.abci.v2.Event + (*EventAttribute)(nil), // 44: cometbft.abci.v2.EventAttribute + (*ExecTxResult)(nil), // 45: cometbft.abci.v2.ExecTxResult + (*TxResult)(nil), // 46: cometbft.abci.v2.TxResult + (*Validator)(nil), // 47: cometbft.abci.v2.Validator + (*ValidatorUpdate)(nil), // 48: cometbft.abci.v2.ValidatorUpdate + (*VoteInfo)(nil), // 49: cometbft.abci.v2.VoteInfo + (*ExtendedVoteInfo)(nil), // 50: cometbft.abci.v2.ExtendedVoteInfo + (*Misbehavior)(nil), // 51: cometbft.abci.v2.Misbehavior + (*Snapshot)(nil), // 52: cometbft.abci.v2.Snapshot + nil, // 53: cometbft.abci.v2.InfoResponse.LanePrioritiesEntry + (*timestamppb.Timestamp)(nil), // 54: google.protobuf.Timestamp + (*v2.ConsensusParams)(nil), // 55: cometbft.types.v2.ConsensusParams + (*v1.ProofOps)(nil), // 56: cometbft.crypto.v1.ProofOps + (*durationpb.Duration)(nil), // 57: google.protobuf.Duration + (v2.BlockIDFlag)(0), // 58: cometbft.types.v2.BlockIDFlag } -var file_cometbft_abci_v1_types_proto_depIdxs = []int32{ - 7, // 0: cometbft.abci.v1.Request.echo:type_name -> cometbft.abci.v1.EchoRequest - 8, // 1: cometbft.abci.v1.Request.flush:type_name -> cometbft.abci.v1.FlushRequest - 9, // 2: cometbft.abci.v1.Request.info:type_name -> cometbft.abci.v1.InfoRequest - 10, // 3: cometbft.abci.v1.Request.init_chain:type_name -> cometbft.abci.v1.InitChainRequest - 11, // 4: cometbft.abci.v1.Request.query:type_name -> cometbft.abci.v1.QueryRequest - 12, // 5: cometbft.abci.v1.Request.check_tx:type_name -> cometbft.abci.v1.CheckTxRequest - 13, // 6: cometbft.abci.v1.Request.commit:type_name -> cometbft.abci.v1.CommitRequest - 14, // 7: cometbft.abci.v1.Request.list_snapshots:type_name -> cometbft.abci.v1.ListSnapshotsRequest - 15, // 8: cometbft.abci.v1.Request.offer_snapshot:type_name -> cometbft.abci.v1.OfferSnapshotRequest - 16, // 9: cometbft.abci.v1.Request.load_snapshot_chunk:type_name -> cometbft.abci.v1.LoadSnapshotChunkRequest - 17, // 10: cometbft.abci.v1.Request.apply_snapshot_chunk:type_name -> cometbft.abci.v1.ApplySnapshotChunkRequest - 18, // 11: cometbft.abci.v1.Request.prepare_proposal:type_name -> cometbft.abci.v1.PrepareProposalRequest - 19, // 12: cometbft.abci.v1.Request.process_proposal:type_name -> cometbft.abci.v1.ProcessProposalRequest - 20, // 13: cometbft.abci.v1.Request.extend_vote:type_name -> cometbft.abci.v1.ExtendVoteRequest - 21, // 14: cometbft.abci.v1.Request.verify_vote_extension:type_name -> cometbft.abci.v1.VerifyVoteExtensionRequest - 22, // 15: cometbft.abci.v1.Request.finalize_block:type_name -> cometbft.abci.v1.FinalizeBlockRequest - 53, // 16: cometbft.abci.v1.InitChainRequest.time:type_name -> google.protobuf.Timestamp - 54, // 17: cometbft.abci.v1.InitChainRequest.consensus_params:type_name -> cometbft.types.v1.ConsensusParams - 48, // 18: cometbft.abci.v1.InitChainRequest.validators:type_name -> cometbft.abci.v1.ValidatorUpdate - 0, // 19: cometbft.abci.v1.CheckTxRequest.type:type_name -> cometbft.abci.v1.CheckTxType - 52, // 20: cometbft.abci.v1.OfferSnapshotRequest.snapshot:type_name -> cometbft.abci.v1.Snapshot - 42, // 21: cometbft.abci.v1.PrepareProposalRequest.local_last_commit:type_name -> cometbft.abci.v1.ExtendedCommitInfo - 51, // 22: cometbft.abci.v1.PrepareProposalRequest.misbehavior:type_name -> cometbft.abci.v1.Misbehavior - 53, // 23: cometbft.abci.v1.PrepareProposalRequest.time:type_name -> google.protobuf.Timestamp - 41, // 24: cometbft.abci.v1.ProcessProposalRequest.proposed_last_commit:type_name -> cometbft.abci.v1.CommitInfo - 51, // 25: cometbft.abci.v1.ProcessProposalRequest.misbehavior:type_name -> cometbft.abci.v1.Misbehavior - 53, // 26: cometbft.abci.v1.ProcessProposalRequest.time:type_name -> google.protobuf.Timestamp - 53, // 27: cometbft.abci.v1.ExtendVoteRequest.time:type_name -> google.protobuf.Timestamp - 41, // 28: cometbft.abci.v1.ExtendVoteRequest.proposed_last_commit:type_name -> cometbft.abci.v1.CommitInfo - 51, // 29: cometbft.abci.v1.ExtendVoteRequest.misbehavior:type_name -> cometbft.abci.v1.Misbehavior - 41, // 30: cometbft.abci.v1.FinalizeBlockRequest.decided_last_commit:type_name -> cometbft.abci.v1.CommitInfo - 51, // 31: cometbft.abci.v1.FinalizeBlockRequest.misbehavior:type_name -> cometbft.abci.v1.Misbehavior - 53, // 32: cometbft.abci.v1.FinalizeBlockRequest.time:type_name -> google.protobuf.Timestamp - 24, // 33: cometbft.abci.v1.Response.exception:type_name -> cometbft.abci.v1.ExceptionResponse - 25, // 34: cometbft.abci.v1.Response.echo:type_name -> cometbft.abci.v1.EchoResponse - 26, // 35: cometbft.abci.v1.Response.flush:type_name -> cometbft.abci.v1.FlushResponse - 27, // 36: cometbft.abci.v1.Response.info:type_name -> cometbft.abci.v1.InfoResponse - 28, // 37: cometbft.abci.v1.Response.init_chain:type_name -> cometbft.abci.v1.InitChainResponse - 29, // 38: cometbft.abci.v1.Response.query:type_name -> cometbft.abci.v1.QueryResponse - 30, // 39: cometbft.abci.v1.Response.check_tx:type_name -> cometbft.abci.v1.CheckTxResponse - 31, // 40: cometbft.abci.v1.Response.commit:type_name -> cometbft.abci.v1.CommitResponse - 32, // 41: cometbft.abci.v1.Response.list_snapshots:type_name -> cometbft.abci.v1.ListSnapshotsResponse - 33, // 42: cometbft.abci.v1.Response.offer_snapshot:type_name -> cometbft.abci.v1.OfferSnapshotResponse - 34, // 43: cometbft.abci.v1.Response.load_snapshot_chunk:type_name -> cometbft.abci.v1.LoadSnapshotChunkResponse - 35, // 44: cometbft.abci.v1.Response.apply_snapshot_chunk:type_name -> cometbft.abci.v1.ApplySnapshotChunkResponse - 36, // 45: cometbft.abci.v1.Response.prepare_proposal:type_name -> cometbft.abci.v1.PrepareProposalResponse - 37, // 46: cometbft.abci.v1.Response.process_proposal:type_name -> cometbft.abci.v1.ProcessProposalResponse - 38, // 47: cometbft.abci.v1.Response.extend_vote:type_name -> cometbft.abci.v1.ExtendVoteResponse - 39, // 48: cometbft.abci.v1.Response.verify_vote_extension:type_name -> cometbft.abci.v1.VerifyVoteExtensionResponse - 40, // 49: cometbft.abci.v1.Response.finalize_block:type_name -> cometbft.abci.v1.FinalizeBlockResponse - 54, // 50: cometbft.abci.v1.InitChainResponse.consensus_params:type_name -> cometbft.types.v1.ConsensusParams - 48, // 51: cometbft.abci.v1.InitChainResponse.validators:type_name -> cometbft.abci.v1.ValidatorUpdate - 55, // 52: cometbft.abci.v1.QueryResponse.proof_ops:type_name -> cometbft.crypto.v1.ProofOps - 43, // 53: cometbft.abci.v1.CheckTxResponse.events:type_name -> cometbft.abci.v1.Event - 52, // 54: cometbft.abci.v1.ListSnapshotsResponse.snapshots:type_name -> cometbft.abci.v1.Snapshot - 1, // 55: cometbft.abci.v1.OfferSnapshotResponse.result:type_name -> cometbft.abci.v1.OfferSnapshotResult - 2, // 56: cometbft.abci.v1.ApplySnapshotChunkResponse.result:type_name -> cometbft.abci.v1.ApplySnapshotChunkResult - 3, // 57: cometbft.abci.v1.ProcessProposalResponse.status:type_name -> cometbft.abci.v1.ProcessProposalStatus - 4, // 58: cometbft.abci.v1.VerifyVoteExtensionResponse.status:type_name -> cometbft.abci.v1.VerifyVoteExtensionStatus - 43, // 59: cometbft.abci.v1.FinalizeBlockResponse.events:type_name -> cometbft.abci.v1.Event - 45, // 60: cometbft.abci.v1.FinalizeBlockResponse.tx_results:type_name -> cometbft.abci.v1.ExecTxResult - 48, // 61: cometbft.abci.v1.FinalizeBlockResponse.validator_updates:type_name -> cometbft.abci.v1.ValidatorUpdate - 54, // 62: cometbft.abci.v1.FinalizeBlockResponse.consensus_param_updates:type_name -> cometbft.types.v1.ConsensusParams - 49, // 63: cometbft.abci.v1.CommitInfo.votes:type_name -> cometbft.abci.v1.VoteInfo - 50, // 64: cometbft.abci.v1.ExtendedCommitInfo.votes:type_name -> cometbft.abci.v1.ExtendedVoteInfo - 44, // 65: cometbft.abci.v1.Event.attributes:type_name -> cometbft.abci.v1.EventAttribute - 43, // 66: cometbft.abci.v1.ExecTxResult.events:type_name -> cometbft.abci.v1.Event - 45, // 67: cometbft.abci.v1.TxResult.result:type_name -> cometbft.abci.v1.ExecTxResult - 47, // 68: cometbft.abci.v1.VoteInfo.validator:type_name -> cometbft.abci.v1.Validator - 56, // 69: cometbft.abci.v1.VoteInfo.block_id_flag:type_name -> cometbft.types.v1.BlockIDFlag - 47, // 70: cometbft.abci.v1.ExtendedVoteInfo.validator:type_name -> cometbft.abci.v1.Validator - 56, // 71: cometbft.abci.v1.ExtendedVoteInfo.block_id_flag:type_name -> cometbft.types.v1.BlockIDFlag - 5, // 72: cometbft.abci.v1.Misbehavior.type:type_name -> cometbft.abci.v1.MisbehaviorType - 47, // 73: cometbft.abci.v1.Misbehavior.validator:type_name -> cometbft.abci.v1.Validator - 53, // 74: cometbft.abci.v1.Misbehavior.time:type_name -> google.protobuf.Timestamp - 75, // [75:75] is the sub-list for method output_type - 75, // [75:75] is the sub-list for method input_type - 75, // [75:75] is the sub-list for extension type_name - 75, // [75:75] is the sub-list for extension extendee - 0, // [0:75] is the sub-list for field type_name +var file_cometbft_abci_v2_types_proto_depIdxs = []int32{ + 7, // 0: cometbft.abci.v2.Request.echo:type_name -> cometbft.abci.v2.EchoRequest + 8, // 1: cometbft.abci.v2.Request.flush:type_name -> cometbft.abci.v2.FlushRequest + 9, // 2: cometbft.abci.v2.Request.info:type_name -> cometbft.abci.v2.InfoRequest + 10, // 3: cometbft.abci.v2.Request.init_chain:type_name -> cometbft.abci.v2.InitChainRequest + 11, // 4: cometbft.abci.v2.Request.query:type_name -> cometbft.abci.v2.QueryRequest + 12, // 5: cometbft.abci.v2.Request.check_tx:type_name -> cometbft.abci.v2.CheckTxRequest + 13, // 6: cometbft.abci.v2.Request.commit:type_name -> cometbft.abci.v2.CommitRequest + 14, // 7: cometbft.abci.v2.Request.list_snapshots:type_name -> cometbft.abci.v2.ListSnapshotsRequest + 15, // 8: cometbft.abci.v2.Request.offer_snapshot:type_name -> cometbft.abci.v2.OfferSnapshotRequest + 16, // 9: cometbft.abci.v2.Request.load_snapshot_chunk:type_name -> cometbft.abci.v2.LoadSnapshotChunkRequest + 17, // 10: cometbft.abci.v2.Request.apply_snapshot_chunk:type_name -> cometbft.abci.v2.ApplySnapshotChunkRequest + 18, // 11: cometbft.abci.v2.Request.prepare_proposal:type_name -> cometbft.abci.v2.PrepareProposalRequest + 19, // 12: cometbft.abci.v2.Request.process_proposal:type_name -> cometbft.abci.v2.ProcessProposalRequest + 20, // 13: cometbft.abci.v2.Request.extend_vote:type_name -> cometbft.abci.v2.ExtendVoteRequest + 21, // 14: cometbft.abci.v2.Request.verify_vote_extension:type_name -> cometbft.abci.v2.VerifyVoteExtensionRequest + 22, // 15: cometbft.abci.v2.Request.finalize_block:type_name -> cometbft.abci.v2.FinalizeBlockRequest + 54, // 16: cometbft.abci.v2.InitChainRequest.time:type_name -> google.protobuf.Timestamp + 55, // 17: cometbft.abci.v2.InitChainRequest.consensus_params:type_name -> cometbft.types.v2.ConsensusParams + 48, // 18: cometbft.abci.v2.InitChainRequest.validators:type_name -> cometbft.abci.v2.ValidatorUpdate + 0, // 19: cometbft.abci.v2.CheckTxRequest.type:type_name -> cometbft.abci.v2.CheckTxType + 52, // 20: cometbft.abci.v2.OfferSnapshotRequest.snapshot:type_name -> cometbft.abci.v2.Snapshot + 42, // 21: cometbft.abci.v2.PrepareProposalRequest.local_last_commit:type_name -> cometbft.abci.v2.ExtendedCommitInfo + 51, // 22: cometbft.abci.v2.PrepareProposalRequest.misbehavior:type_name -> cometbft.abci.v2.Misbehavior + 54, // 23: cometbft.abci.v2.PrepareProposalRequest.time:type_name -> google.protobuf.Timestamp + 41, // 24: cometbft.abci.v2.ProcessProposalRequest.proposed_last_commit:type_name -> cometbft.abci.v2.CommitInfo + 51, // 25: cometbft.abci.v2.ProcessProposalRequest.misbehavior:type_name -> cometbft.abci.v2.Misbehavior + 54, // 26: cometbft.abci.v2.ProcessProposalRequest.time:type_name -> google.protobuf.Timestamp + 54, // 27: cometbft.abci.v2.ExtendVoteRequest.time:type_name -> google.protobuf.Timestamp + 41, // 28: cometbft.abci.v2.ExtendVoteRequest.proposed_last_commit:type_name -> cometbft.abci.v2.CommitInfo + 51, // 29: cometbft.abci.v2.ExtendVoteRequest.misbehavior:type_name -> cometbft.abci.v2.Misbehavior + 41, // 30: cometbft.abci.v2.FinalizeBlockRequest.decided_last_commit:type_name -> cometbft.abci.v2.CommitInfo + 51, // 31: cometbft.abci.v2.FinalizeBlockRequest.misbehavior:type_name -> cometbft.abci.v2.Misbehavior + 54, // 32: cometbft.abci.v2.FinalizeBlockRequest.time:type_name -> google.protobuf.Timestamp + 24, // 33: cometbft.abci.v2.Response.exception:type_name -> cometbft.abci.v2.ExceptionResponse + 25, // 34: cometbft.abci.v2.Response.echo:type_name -> cometbft.abci.v2.EchoResponse + 26, // 35: cometbft.abci.v2.Response.flush:type_name -> cometbft.abci.v2.FlushResponse + 27, // 36: cometbft.abci.v2.Response.info:type_name -> cometbft.abci.v2.InfoResponse + 28, // 37: cometbft.abci.v2.Response.init_chain:type_name -> cometbft.abci.v2.InitChainResponse + 29, // 38: cometbft.abci.v2.Response.query:type_name -> cometbft.abci.v2.QueryResponse + 30, // 39: cometbft.abci.v2.Response.check_tx:type_name -> cometbft.abci.v2.CheckTxResponse + 31, // 40: cometbft.abci.v2.Response.commit:type_name -> cometbft.abci.v2.CommitResponse + 32, // 41: cometbft.abci.v2.Response.list_snapshots:type_name -> cometbft.abci.v2.ListSnapshotsResponse + 33, // 42: cometbft.abci.v2.Response.offer_snapshot:type_name -> cometbft.abci.v2.OfferSnapshotResponse + 34, // 43: cometbft.abci.v2.Response.load_snapshot_chunk:type_name -> cometbft.abci.v2.LoadSnapshotChunkResponse + 35, // 44: cometbft.abci.v2.Response.apply_snapshot_chunk:type_name -> cometbft.abci.v2.ApplySnapshotChunkResponse + 36, // 45: cometbft.abci.v2.Response.prepare_proposal:type_name -> cometbft.abci.v2.PrepareProposalResponse + 37, // 46: cometbft.abci.v2.Response.process_proposal:type_name -> cometbft.abci.v2.ProcessProposalResponse + 38, // 47: cometbft.abci.v2.Response.extend_vote:type_name -> cometbft.abci.v2.ExtendVoteResponse + 39, // 48: cometbft.abci.v2.Response.verify_vote_extension:type_name -> cometbft.abci.v2.VerifyVoteExtensionResponse + 40, // 49: cometbft.abci.v2.Response.finalize_block:type_name -> cometbft.abci.v2.FinalizeBlockResponse + 53, // 50: cometbft.abci.v2.InfoResponse.lane_priorities:type_name -> cometbft.abci.v2.InfoResponse.LanePrioritiesEntry + 55, // 51: cometbft.abci.v2.InitChainResponse.consensus_params:type_name -> cometbft.types.v2.ConsensusParams + 48, // 52: cometbft.abci.v2.InitChainResponse.validators:type_name -> cometbft.abci.v2.ValidatorUpdate + 56, // 53: cometbft.abci.v2.QueryResponse.proof_ops:type_name -> cometbft.crypto.v1.ProofOps + 43, // 54: cometbft.abci.v2.CheckTxResponse.events:type_name -> cometbft.abci.v2.Event + 52, // 55: cometbft.abci.v2.ListSnapshotsResponse.snapshots:type_name -> cometbft.abci.v2.Snapshot + 1, // 56: cometbft.abci.v2.OfferSnapshotResponse.result:type_name -> cometbft.abci.v2.OfferSnapshotResult + 2, // 57: cometbft.abci.v2.ApplySnapshotChunkResponse.result:type_name -> cometbft.abci.v2.ApplySnapshotChunkResult + 3, // 58: cometbft.abci.v2.ProcessProposalResponse.status:type_name -> cometbft.abci.v2.ProcessProposalStatus + 4, // 59: cometbft.abci.v2.VerifyVoteExtensionResponse.status:type_name -> cometbft.abci.v2.VerifyVoteExtensionStatus + 43, // 60: cometbft.abci.v2.FinalizeBlockResponse.events:type_name -> cometbft.abci.v2.Event + 45, // 61: cometbft.abci.v2.FinalizeBlockResponse.tx_results:type_name -> cometbft.abci.v2.ExecTxResult + 48, // 62: cometbft.abci.v2.FinalizeBlockResponse.validator_updates:type_name -> cometbft.abci.v2.ValidatorUpdate + 55, // 63: cometbft.abci.v2.FinalizeBlockResponse.consensus_param_updates:type_name -> cometbft.types.v2.ConsensusParams + 57, // 64: cometbft.abci.v2.FinalizeBlockResponse.next_block_delay:type_name -> google.protobuf.Duration + 49, // 65: cometbft.abci.v2.CommitInfo.votes:type_name -> cometbft.abci.v2.VoteInfo + 50, // 66: cometbft.abci.v2.ExtendedCommitInfo.votes:type_name -> cometbft.abci.v2.ExtendedVoteInfo + 44, // 67: cometbft.abci.v2.Event.attributes:type_name -> cometbft.abci.v2.EventAttribute + 43, // 68: cometbft.abci.v2.ExecTxResult.events:type_name -> cometbft.abci.v2.Event + 45, // 69: cometbft.abci.v2.TxResult.result:type_name -> cometbft.abci.v2.ExecTxResult + 47, // 70: cometbft.abci.v2.VoteInfo.validator:type_name -> cometbft.abci.v2.Validator + 58, // 71: cometbft.abci.v2.VoteInfo.block_id_flag:type_name -> cometbft.types.v2.BlockIDFlag + 47, // 72: cometbft.abci.v2.ExtendedVoteInfo.validator:type_name -> cometbft.abci.v2.Validator + 58, // 73: cometbft.abci.v2.ExtendedVoteInfo.block_id_flag:type_name -> cometbft.types.v2.BlockIDFlag + 5, // 74: cometbft.abci.v2.Misbehavior.type:type_name -> cometbft.abci.v2.MisbehaviorType + 47, // 75: cometbft.abci.v2.Misbehavior.validator:type_name -> cometbft.abci.v2.Validator + 54, // 76: cometbft.abci.v2.Misbehavior.time:type_name -> google.protobuf.Timestamp + 77, // [77:77] is the sub-list for method output_type + 77, // [77:77] is the sub-list for method input_type + 77, // [77:77] is the sub-list for extension type_name + 77, // [77:77] is the sub-list for extension extendee + 0, // [0:77] is the sub-list for field type_name } -func init() { file_cometbft_abci_v1_types_proto_init() } -func file_cometbft_abci_v1_types_proto_init() { - if File_cometbft_abci_v1_types_proto != nil { +func init() { file_cometbft_abci_v2_types_proto_init() } +func file_cometbft_abci_v2_types_proto_init() { + if File_cometbft_abci_v2_types_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_cometbft_abci_v1_types_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Request); i { case 0: return &v.state @@ -35082,7 +35955,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EchoRequest); i { case 0: return &v.state @@ -35094,7 +35967,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FlushRequest); i { case 0: return &v.state @@ -35106,7 +35979,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*InfoRequest); i { case 0: return &v.state @@ -35118,7 +35991,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*InitChainRequest); i { case 0: return &v.state @@ -35130,7 +36003,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*QueryRequest); i { case 0: return &v.state @@ -35142,7 +36015,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CheckTxRequest); i { case 0: return &v.state @@ -35154,7 +36027,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CommitRequest); i { case 0: return &v.state @@ -35166,7 +36039,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListSnapshotsRequest); i { case 0: return &v.state @@ -35178,7 +36051,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*OfferSnapshotRequest); i { case 0: return &v.state @@ -35190,7 +36063,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LoadSnapshotChunkRequest); i { case 0: return &v.state @@ -35202,7 +36075,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ApplySnapshotChunkRequest); i { case 0: return &v.state @@ -35214,7 +36087,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PrepareProposalRequest); i { case 0: return &v.state @@ -35226,7 +36099,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessProposalRequest); i { case 0: return &v.state @@ -35238,7 +36111,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ExtendVoteRequest); i { case 0: return &v.state @@ -35250,7 +36123,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VerifyVoteExtensionRequest); i { case 0: return &v.state @@ -35262,7 +36135,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FinalizeBlockRequest); i { case 0: return &v.state @@ -35274,7 +36147,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Response); i { case 0: return &v.state @@ -35286,7 +36159,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ExceptionResponse); i { case 0: return &v.state @@ -35298,7 +36171,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EchoResponse); i { case 0: return &v.state @@ -35310,7 +36183,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FlushResponse); i { case 0: return &v.state @@ -35322,7 +36195,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*InfoResponse); i { case 0: return &v.state @@ -35334,7 +36207,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*InitChainResponse); i { case 0: return &v.state @@ -35346,7 +36219,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*QueryResponse); i { case 0: return &v.state @@ -35358,7 +36231,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CheckTxResponse); i { case 0: return &v.state @@ -35370,7 +36243,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CommitResponse); i { case 0: return &v.state @@ -35382,7 +36255,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListSnapshotsResponse); i { case 0: return &v.state @@ -35394,7 +36267,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*OfferSnapshotResponse); i { case 0: return &v.state @@ -35406,7 +36279,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LoadSnapshotChunkResponse); i { case 0: return &v.state @@ -35418,7 +36291,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ApplySnapshotChunkResponse); i { case 0: return &v.state @@ -35430,7 +36303,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PrepareProposalResponse); i { case 0: return &v.state @@ -35442,7 +36315,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessProposalResponse); i { case 0: return &v.state @@ -35454,7 +36327,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ExtendVoteResponse); i { case 0: return &v.state @@ -35466,7 +36339,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VerifyVoteExtensionResponse); i { case 0: return &v.state @@ -35478,7 +36351,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FinalizeBlockResponse); i { case 0: return &v.state @@ -35490,7 +36363,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CommitInfo); i { case 0: return &v.state @@ -35502,7 +36375,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ExtendedCommitInfo); i { case 0: return &v.state @@ -35514,7 +36387,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Event); i { case 0: return &v.state @@ -35526,7 +36399,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EventAttribute); i { case 0: return &v.state @@ -35538,7 +36411,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ExecTxResult); i { case 0: return &v.state @@ -35550,7 +36423,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TxResult); i { case 0: return &v.state @@ -35562,7 +36435,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Validator); i { case 0: return &v.state @@ -35574,7 +36447,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ValidatorUpdate); i { case 0: return &v.state @@ -35586,7 +36459,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VoteInfo); i { case 0: return &v.state @@ -35598,7 +36471,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ExtendedVoteInfo); i { case 0: return &v.state @@ -35610,7 +36483,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Misbehavior); i { case 0: return &v.state @@ -35622,7 +36495,7 @@ func file_cometbft_abci_v1_types_proto_init() { return nil } } - file_cometbft_abci_v1_types_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_abci_v2_types_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Snapshot); i { case 0: return &v.state @@ -35635,7 +36508,7 @@ func file_cometbft_abci_v1_types_proto_init() { } } } - file_cometbft_abci_v1_types_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_cometbft_abci_v2_types_proto_msgTypes[0].OneofWrappers = []interface{}{ (*Request_Echo)(nil), (*Request_Flush)(nil), (*Request_Info)(nil), @@ -35653,7 +36526,7 @@ func file_cometbft_abci_v1_types_proto_init() { (*Request_VerifyVoteExtension)(nil), (*Request_FinalizeBlock)(nil), } - file_cometbft_abci_v1_types_proto_msgTypes[17].OneofWrappers = []interface{}{ + file_cometbft_abci_v2_types_proto_msgTypes[17].OneofWrappers = []interface{}{ (*Response_Exception)(nil), (*Response_Echo)(nil), (*Response_Flush)(nil), @@ -35676,19 +36549,19 @@ func file_cometbft_abci_v1_types_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_abci_v1_types_proto_rawDesc, + RawDescriptor: file_cometbft_abci_v2_types_proto_rawDesc, NumEnums: 6, - NumMessages: 47, + NumMessages: 48, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cometbft_abci_v1_types_proto_goTypes, - DependencyIndexes: file_cometbft_abci_v1_types_proto_depIdxs, - EnumInfos: file_cometbft_abci_v1_types_proto_enumTypes, - MessageInfos: file_cometbft_abci_v1_types_proto_msgTypes, + GoTypes: file_cometbft_abci_v2_types_proto_goTypes, + DependencyIndexes: file_cometbft_abci_v2_types_proto_depIdxs, + EnumInfos: file_cometbft_abci_v2_types_proto_enumTypes, + MessageInfos: file_cometbft_abci_v2_types_proto_msgTypes, }.Build() - File_cometbft_abci_v1_types_proto = out.File - file_cometbft_abci_v1_types_proto_rawDesc = nil - file_cometbft_abci_v1_types_proto_goTypes = nil - file_cometbft_abci_v1_types_proto_depIdxs = nil + File_cometbft_abci_v2_types_proto = out.File + file_cometbft_abci_v2_types_proto_rawDesc = nil + file_cometbft_abci_v2_types_proto_goTypes = nil + file_cometbft_abci_v2_types_proto_depIdxs = nil } diff --git a/api/cometbft/types/v1/block.pulsar.go b/api/cometbft/types/v2/block.pulsar.go similarity index 84% rename from api/cometbft/types/v1/block.pulsar.go rename to api/cometbft/types/v2/block.pulsar.go index 63b514835f..83289ff5bd 100644 --- a/api/cometbft/types/v1/block.pulsar.go +++ b/api/cometbft/types/v2/block.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package typesv1 +package typesv2 import ( fmt "fmt" @@ -22,8 +22,8 @@ var ( ) func init() { - file_cometbft_types_v1_block_proto_init() - md_Block = File_cometbft_types_v1_block_proto.Messages().ByName("Block") + file_cometbft_types_v2_block_proto_init() + md_Block = File_cometbft_types_v2_block_proto.Messages().ByName("Block") fd_Block_header = md_Block.Fields().ByName("header") fd_Block_data = md_Block.Fields().ByName("data") fd_Block_evidence = md_Block.Fields().ByName("evidence") @@ -39,7 +39,7 @@ func (x *Block) ProtoReflect() protoreflect.Message { } func (x *Block) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_block_proto_msgTypes[0] + mi := &file_cometbft_types_v2_block_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -134,19 +134,19 @@ func (x *fastReflection_Block) Range(f func(protoreflect.FieldDescriptor, protor // a repeated field is populated if it is non-empty. func (x *fastReflection_Block) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Block.header": + case "cometbft.types.v2.Block.header": return x.Header != nil - case "cometbft.types.v1.Block.data": + case "cometbft.types.v2.Block.data": return x.Data != nil - case "cometbft.types.v1.Block.evidence": + case "cometbft.types.v2.Block.evidence": return x.Evidence != nil - case "cometbft.types.v1.Block.last_commit": + case "cometbft.types.v2.Block.last_commit": return x.LastCommit != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Block")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Block")) } - panic(fmt.Errorf("message cometbft.types.v1.Block does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Block does not contain field %s", fd.FullName())) } } @@ -158,19 +158,19 @@ func (x *fastReflection_Block) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Block) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Block.header": + case "cometbft.types.v2.Block.header": x.Header = nil - case "cometbft.types.v1.Block.data": + case "cometbft.types.v2.Block.data": x.Data = nil - case "cometbft.types.v1.Block.evidence": + case "cometbft.types.v2.Block.evidence": x.Evidence = nil - case "cometbft.types.v1.Block.last_commit": + case "cometbft.types.v2.Block.last_commit": x.LastCommit = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Block")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Block")) } - panic(fmt.Errorf("message cometbft.types.v1.Block does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Block does not contain field %s", fd.FullName())) } } @@ -182,23 +182,23 @@ func (x *fastReflection_Block) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Block) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Block.header": + case "cometbft.types.v2.Block.header": value := x.Header return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Block.data": + case "cometbft.types.v2.Block.data": value := x.Data return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Block.evidence": + case "cometbft.types.v2.Block.evidence": value := x.Evidence return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Block.last_commit": + case "cometbft.types.v2.Block.last_commit": value := x.LastCommit return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Block")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Block")) } - panic(fmt.Errorf("message cometbft.types.v1.Block does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Block does not contain field %s", descriptor.FullName())) } } @@ -214,19 +214,19 @@ func (x *fastReflection_Block) Get(descriptor protoreflect.FieldDescriptor) prot // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Block) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Block.header": + case "cometbft.types.v2.Block.header": x.Header = value.Message().Interface().(*Header) - case "cometbft.types.v1.Block.data": + case "cometbft.types.v2.Block.data": x.Data = value.Message().Interface().(*Data) - case "cometbft.types.v1.Block.evidence": + case "cometbft.types.v2.Block.evidence": x.Evidence = value.Message().Interface().(*EvidenceList) - case "cometbft.types.v1.Block.last_commit": + case "cometbft.types.v2.Block.last_commit": x.LastCommit = value.Message().Interface().(*Commit) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Block")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Block")) } - panic(fmt.Errorf("message cometbft.types.v1.Block does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Block does not contain field %s", fd.FullName())) } } @@ -242,31 +242,31 @@ func (x *fastReflection_Block) Set(fd protoreflect.FieldDescriptor, value protor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Block) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Block.header": + case "cometbft.types.v2.Block.header": if x.Header == nil { x.Header = new(Header) } return protoreflect.ValueOfMessage(x.Header.ProtoReflect()) - case "cometbft.types.v1.Block.data": + case "cometbft.types.v2.Block.data": if x.Data == nil { x.Data = new(Data) } return protoreflect.ValueOfMessage(x.Data.ProtoReflect()) - case "cometbft.types.v1.Block.evidence": + case "cometbft.types.v2.Block.evidence": if x.Evidence == nil { x.Evidence = new(EvidenceList) } return protoreflect.ValueOfMessage(x.Evidence.ProtoReflect()) - case "cometbft.types.v1.Block.last_commit": + case "cometbft.types.v2.Block.last_commit": if x.LastCommit == nil { x.LastCommit = new(Commit) } return protoreflect.ValueOfMessage(x.LastCommit.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Block")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Block")) } - panic(fmt.Errorf("message cometbft.types.v1.Block does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Block does not contain field %s", fd.FullName())) } } @@ -275,23 +275,23 @@ func (x *fastReflection_Block) Mutable(fd protoreflect.FieldDescriptor) protoref // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Block) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Block.header": + case "cometbft.types.v2.Block.header": m := new(Header) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Block.data": + case "cometbft.types.v2.Block.data": m := new(Data) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Block.evidence": + case "cometbft.types.v2.Block.evidence": m := new(EvidenceList) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Block.last_commit": + case "cometbft.types.v2.Block.last_commit": m := new(Commit) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Block")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Block")) } - panic(fmt.Errorf("message cometbft.types.v1.Block does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Block does not contain field %s", fd.FullName())) } } @@ -301,7 +301,7 @@ func (x *fastReflection_Block) NewField(fd protoreflect.FieldDescriptor) protore func (x *fastReflection_Block) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Block", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Block", d.FullName())) } panic("unreachable") } @@ -689,7 +689,7 @@ func (x *fastReflection_Block) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/types/v1/block.proto +// source: cometbft/types/v2/block.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -713,7 +713,7 @@ type Block struct { func (x *Block) Reset() { *x = Block{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_block_proto_msgTypes[0] + mi := &file_cometbft_types_v2_block_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -727,7 +727,7 @@ func (*Block) ProtoMessage() {} // Deprecated: Use Block.ProtoReflect.Descriptor instead. func (*Block) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_block_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_block_proto_rawDescGZIP(), []int{0} } func (x *Block) GetHeader() *Header { @@ -758,72 +758,72 @@ func (x *Block) GetLastCommit() *Commit { return nil } -var File_cometbft_types_v1_block_proto protoreflect.FileDescriptor +var File_cometbft_types_v2_block_proto protoreflect.FileDescriptor -var file_cometbft_types_v1_block_proto_rawDesc = []byte{ +var file_cometbft_types_v2_block_proto_rawDesc = []byte{ 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x2f, 0x76, 0x32, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x76, 0x32, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x2e, 0x70, 0x72, + 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf2, 0x01, 0x0a, 0x05, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x37, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x04, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x31, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x44, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x41, 0x0a, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x4c, 0x69, + 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x3a, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, + 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x42, 0xb5, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x50, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x42, 0x0a, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x11, 0x43, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, + 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, + 0x76, 0x32, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, + 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x11, 0x43, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, - 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0x73, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, 0x3a, 0x54, 0x79, 0x70, - 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_cometbft_types_v1_block_proto_rawDescOnce sync.Once - file_cometbft_types_v1_block_proto_rawDescData = file_cometbft_types_v1_block_proto_rawDesc + file_cometbft_types_v2_block_proto_rawDescOnce sync.Once + file_cometbft_types_v2_block_proto_rawDescData = file_cometbft_types_v2_block_proto_rawDesc ) -func file_cometbft_types_v1_block_proto_rawDescGZIP() []byte { - file_cometbft_types_v1_block_proto_rawDescOnce.Do(func() { - file_cometbft_types_v1_block_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v1_block_proto_rawDescData) +func file_cometbft_types_v2_block_proto_rawDescGZIP() []byte { + file_cometbft_types_v2_block_proto_rawDescOnce.Do(func() { + file_cometbft_types_v2_block_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v2_block_proto_rawDescData) }) - return file_cometbft_types_v1_block_proto_rawDescData + return file_cometbft_types_v2_block_proto_rawDescData } -var file_cometbft_types_v1_block_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_cometbft_types_v1_block_proto_goTypes = []interface{}{ - (*Block)(nil), // 0: cometbft.types.v1.Block - (*Header)(nil), // 1: cometbft.types.v1.Header - (*Data)(nil), // 2: cometbft.types.v1.Data - (*EvidenceList)(nil), // 3: cometbft.types.v1.EvidenceList - (*Commit)(nil), // 4: cometbft.types.v1.Commit +var file_cometbft_types_v2_block_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_cometbft_types_v2_block_proto_goTypes = []interface{}{ + (*Block)(nil), // 0: cometbft.types.v2.Block + (*Header)(nil), // 1: cometbft.types.v2.Header + (*Data)(nil), // 2: cometbft.types.v2.Data + (*EvidenceList)(nil), // 3: cometbft.types.v2.EvidenceList + (*Commit)(nil), // 4: cometbft.types.v2.Commit } -var file_cometbft_types_v1_block_proto_depIdxs = []int32{ - 1, // 0: cometbft.types.v1.Block.header:type_name -> cometbft.types.v1.Header - 2, // 1: cometbft.types.v1.Block.data:type_name -> cometbft.types.v1.Data - 3, // 2: cometbft.types.v1.Block.evidence:type_name -> cometbft.types.v1.EvidenceList - 4, // 3: cometbft.types.v1.Block.last_commit:type_name -> cometbft.types.v1.Commit +var file_cometbft_types_v2_block_proto_depIdxs = []int32{ + 1, // 0: cometbft.types.v2.Block.header:type_name -> cometbft.types.v2.Header + 2, // 1: cometbft.types.v2.Block.data:type_name -> cometbft.types.v2.Data + 3, // 2: cometbft.types.v2.Block.evidence:type_name -> cometbft.types.v2.EvidenceList + 4, // 3: cometbft.types.v2.Block.last_commit:type_name -> cometbft.types.v2.Commit 4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name @@ -831,15 +831,15 @@ var file_cometbft_types_v1_block_proto_depIdxs = []int32{ 0, // [0:4] is the sub-list for field type_name } -func init() { file_cometbft_types_v1_block_proto_init() } -func file_cometbft_types_v1_block_proto_init() { - if File_cometbft_types_v1_block_proto != nil { +func init() { file_cometbft_types_v2_block_proto_init() } +func file_cometbft_types_v2_block_proto_init() { + if File_cometbft_types_v2_block_proto != nil { return } - file_cometbft_types_v1_types_proto_init() - file_cometbft_types_v1_evidence_proto_init() + file_cometbft_types_v2_types_proto_init() + file_cometbft_types_v2_evidence_proto_init() if !protoimpl.UnsafeEnabled { - file_cometbft_types_v1_block_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_block_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Block); i { case 0: return &v.state @@ -856,18 +856,18 @@ func file_cometbft_types_v1_block_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_types_v1_block_proto_rawDesc, + RawDescriptor: file_cometbft_types_v2_block_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cometbft_types_v1_block_proto_goTypes, - DependencyIndexes: file_cometbft_types_v1_block_proto_depIdxs, - MessageInfos: file_cometbft_types_v1_block_proto_msgTypes, + GoTypes: file_cometbft_types_v2_block_proto_goTypes, + DependencyIndexes: file_cometbft_types_v2_block_proto_depIdxs, + MessageInfos: file_cometbft_types_v2_block_proto_msgTypes, }.Build() - File_cometbft_types_v1_block_proto = out.File - file_cometbft_types_v1_block_proto_rawDesc = nil - file_cometbft_types_v1_block_proto_goTypes = nil - file_cometbft_types_v1_block_proto_depIdxs = nil + File_cometbft_types_v2_block_proto = out.File + file_cometbft_types_v2_block_proto_rawDesc = nil + file_cometbft_types_v2_block_proto_goTypes = nil + file_cometbft_types_v2_block_proto_depIdxs = nil } diff --git a/api/cometbft/types/v1/canonical.pulsar.go b/api/cometbft/types/v2/canonical.pulsar.go similarity index 87% rename from api/cometbft/types/v1/canonical.pulsar.go rename to api/cometbft/types/v2/canonical.pulsar.go index 7623d6c9d9..9776aefd3a 100644 --- a/api/cometbft/types/v1/canonical.pulsar.go +++ b/api/cometbft/types/v2/canonical.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package typesv1 +package typesv2 import ( binary "encoding/binary" @@ -22,8 +22,8 @@ var ( ) func init() { - file_cometbft_types_v1_canonical_proto_init() - md_CanonicalBlockID = File_cometbft_types_v1_canonical_proto.Messages().ByName("CanonicalBlockID") + file_cometbft_types_v2_canonical_proto_init() + md_CanonicalBlockID = File_cometbft_types_v2_canonical_proto.Messages().ByName("CanonicalBlockID") fd_CanonicalBlockID_hash = md_CanonicalBlockID.Fields().ByName("hash") fd_CanonicalBlockID_part_set_header = md_CanonicalBlockID.Fields().ByName("part_set_header") } @@ -37,7 +37,7 @@ func (x *CanonicalBlockID) ProtoReflect() protoreflect.Message { } func (x *CanonicalBlockID) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[0] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -120,15 +120,15 @@ func (x *fastReflection_CanonicalBlockID) Range(f func(protoreflect.FieldDescrip // a repeated field is populated if it is non-empty. func (x *fastReflection_CanonicalBlockID) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.CanonicalBlockID.hash": + case "cometbft.types.v2.CanonicalBlockID.hash": return len(x.Hash) != 0 - case "cometbft.types.v1.CanonicalBlockID.part_set_header": + case "cometbft.types.v2.CanonicalBlockID.part_set_header": return x.PartSetHeader != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalBlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalBlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalBlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalBlockID does not contain field %s", fd.FullName())) } } @@ -140,15 +140,15 @@ func (x *fastReflection_CanonicalBlockID) Has(fd protoreflect.FieldDescriptor) b // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalBlockID) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalBlockID.hash": + case "cometbft.types.v2.CanonicalBlockID.hash": x.Hash = nil - case "cometbft.types.v1.CanonicalBlockID.part_set_header": + case "cometbft.types.v2.CanonicalBlockID.part_set_header": x.PartSetHeader = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalBlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalBlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalBlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalBlockID does not contain field %s", fd.FullName())) } } @@ -160,17 +160,17 @@ func (x *fastReflection_CanonicalBlockID) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CanonicalBlockID) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.CanonicalBlockID.hash": + case "cometbft.types.v2.CanonicalBlockID.hash": value := x.Hash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.CanonicalBlockID.part_set_header": + case "cometbft.types.v2.CanonicalBlockID.part_set_header": value := x.PartSetHeader return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalBlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalBlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalBlockID does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalBlockID does not contain field %s", descriptor.FullName())) } } @@ -186,15 +186,15 @@ func (x *fastReflection_CanonicalBlockID) Get(descriptor protoreflect.FieldDescr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalBlockID) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalBlockID.hash": + case "cometbft.types.v2.CanonicalBlockID.hash": x.Hash = value.Bytes() - case "cometbft.types.v1.CanonicalBlockID.part_set_header": + case "cometbft.types.v2.CanonicalBlockID.part_set_header": x.PartSetHeader = value.Message().Interface().(*CanonicalPartSetHeader) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalBlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalBlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalBlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalBlockID does not contain field %s", fd.FullName())) } } @@ -210,18 +210,18 @@ func (x *fastReflection_CanonicalBlockID) Set(fd protoreflect.FieldDescriptor, v // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalBlockID) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalBlockID.part_set_header": + case "cometbft.types.v2.CanonicalBlockID.part_set_header": if x.PartSetHeader == nil { x.PartSetHeader = new(CanonicalPartSetHeader) } return protoreflect.ValueOfMessage(x.PartSetHeader.ProtoReflect()) - case "cometbft.types.v1.CanonicalBlockID.hash": - panic(fmt.Errorf("field hash of message cometbft.types.v1.CanonicalBlockID is not mutable")) + case "cometbft.types.v2.CanonicalBlockID.hash": + panic(fmt.Errorf("field hash of message cometbft.types.v2.CanonicalBlockID is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalBlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalBlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalBlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalBlockID does not contain field %s", fd.FullName())) } } @@ -230,16 +230,16 @@ func (x *fastReflection_CanonicalBlockID) Mutable(fd protoreflect.FieldDescripto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CanonicalBlockID) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalBlockID.hash": + case "cometbft.types.v2.CanonicalBlockID.hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.CanonicalBlockID.part_set_header": + case "cometbft.types.v2.CanonicalBlockID.part_set_header": m := new(CanonicalPartSetHeader) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalBlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalBlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalBlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalBlockID does not contain field %s", fd.FullName())) } } @@ -249,7 +249,7 @@ func (x *fastReflection_CanonicalBlockID) NewField(fd protoreflect.FieldDescript func (x *fastReflection_CanonicalBlockID) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.CanonicalBlockID", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.CanonicalBlockID", d.FullName())) } panic("unreachable") } @@ -523,8 +523,8 @@ var ( ) func init() { - file_cometbft_types_v1_canonical_proto_init() - md_CanonicalPartSetHeader = File_cometbft_types_v1_canonical_proto.Messages().ByName("CanonicalPartSetHeader") + file_cometbft_types_v2_canonical_proto_init() + md_CanonicalPartSetHeader = File_cometbft_types_v2_canonical_proto.Messages().ByName("CanonicalPartSetHeader") fd_CanonicalPartSetHeader_total = md_CanonicalPartSetHeader.Fields().ByName("total") fd_CanonicalPartSetHeader_hash = md_CanonicalPartSetHeader.Fields().ByName("hash") } @@ -538,7 +538,7 @@ func (x *CanonicalPartSetHeader) ProtoReflect() protoreflect.Message { } func (x *CanonicalPartSetHeader) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[1] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -621,15 +621,15 @@ func (x *fastReflection_CanonicalPartSetHeader) Range(f func(protoreflect.FieldD // a repeated field is populated if it is non-empty. func (x *fastReflection_CanonicalPartSetHeader) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.CanonicalPartSetHeader.total": + case "cometbft.types.v2.CanonicalPartSetHeader.total": return x.Total != uint32(0) - case "cometbft.types.v1.CanonicalPartSetHeader.hash": + case "cometbft.types.v2.CanonicalPartSetHeader.hash": return len(x.Hash) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalPartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalPartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalPartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalPartSetHeader does not contain field %s", fd.FullName())) } } @@ -641,15 +641,15 @@ func (x *fastReflection_CanonicalPartSetHeader) Has(fd protoreflect.FieldDescrip // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalPartSetHeader) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalPartSetHeader.total": + case "cometbft.types.v2.CanonicalPartSetHeader.total": x.Total = uint32(0) - case "cometbft.types.v1.CanonicalPartSetHeader.hash": + case "cometbft.types.v2.CanonicalPartSetHeader.hash": x.Hash = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalPartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalPartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalPartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalPartSetHeader does not contain field %s", fd.FullName())) } } @@ -661,17 +661,17 @@ func (x *fastReflection_CanonicalPartSetHeader) Clear(fd protoreflect.FieldDescr // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CanonicalPartSetHeader) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.CanonicalPartSetHeader.total": + case "cometbft.types.v2.CanonicalPartSetHeader.total": value := x.Total return protoreflect.ValueOfUint32(value) - case "cometbft.types.v1.CanonicalPartSetHeader.hash": + case "cometbft.types.v2.CanonicalPartSetHeader.hash": value := x.Hash return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalPartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalPartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalPartSetHeader does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalPartSetHeader does not contain field %s", descriptor.FullName())) } } @@ -687,15 +687,15 @@ func (x *fastReflection_CanonicalPartSetHeader) Get(descriptor protoreflect.Fiel // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalPartSetHeader) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalPartSetHeader.total": + case "cometbft.types.v2.CanonicalPartSetHeader.total": x.Total = uint32(value.Uint()) - case "cometbft.types.v1.CanonicalPartSetHeader.hash": + case "cometbft.types.v2.CanonicalPartSetHeader.hash": x.Hash = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalPartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalPartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalPartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalPartSetHeader does not contain field %s", fd.FullName())) } } @@ -711,15 +711,15 @@ func (x *fastReflection_CanonicalPartSetHeader) Set(fd protoreflect.FieldDescrip // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalPartSetHeader) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalPartSetHeader.total": - panic(fmt.Errorf("field total of message cometbft.types.v1.CanonicalPartSetHeader is not mutable")) - case "cometbft.types.v1.CanonicalPartSetHeader.hash": - panic(fmt.Errorf("field hash of message cometbft.types.v1.CanonicalPartSetHeader is not mutable")) + case "cometbft.types.v2.CanonicalPartSetHeader.total": + panic(fmt.Errorf("field total of message cometbft.types.v2.CanonicalPartSetHeader is not mutable")) + case "cometbft.types.v2.CanonicalPartSetHeader.hash": + panic(fmt.Errorf("field hash of message cometbft.types.v2.CanonicalPartSetHeader is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalPartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalPartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalPartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalPartSetHeader does not contain field %s", fd.FullName())) } } @@ -728,15 +728,15 @@ func (x *fastReflection_CanonicalPartSetHeader) Mutable(fd protoreflect.FieldDes // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CanonicalPartSetHeader) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalPartSetHeader.total": + case "cometbft.types.v2.CanonicalPartSetHeader.total": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.types.v1.CanonicalPartSetHeader.hash": + case "cometbft.types.v2.CanonicalPartSetHeader.hash": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalPartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalPartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalPartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalPartSetHeader does not contain field %s", fd.FullName())) } } @@ -746,7 +746,7 @@ func (x *fastReflection_CanonicalPartSetHeader) NewField(fd protoreflect.FieldDe func (x *fastReflection_CanonicalPartSetHeader) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.CanonicalPartSetHeader", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.CanonicalPartSetHeader", d.FullName())) } panic("unreachable") } @@ -998,8 +998,8 @@ var ( ) func init() { - file_cometbft_types_v1_canonical_proto_init() - md_CanonicalProposal = File_cometbft_types_v1_canonical_proto.Messages().ByName("CanonicalProposal") + file_cometbft_types_v2_canonical_proto_init() + md_CanonicalProposal = File_cometbft_types_v2_canonical_proto.Messages().ByName("CanonicalProposal") fd_CanonicalProposal_type = md_CanonicalProposal.Fields().ByName("type") fd_CanonicalProposal_height = md_CanonicalProposal.Fields().ByName("height") fd_CanonicalProposal_round = md_CanonicalProposal.Fields().ByName("round") @@ -1018,7 +1018,7 @@ func (x *CanonicalProposal) ProtoReflect() protoreflect.Message { } func (x *CanonicalProposal) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[2] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1131,25 +1131,25 @@ func (x *fastReflection_CanonicalProposal) Range(f func(protoreflect.FieldDescri // a repeated field is populated if it is non-empty. func (x *fastReflection_CanonicalProposal) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.CanonicalProposal.type": + case "cometbft.types.v2.CanonicalProposal.type": return x.Type_ != 0 - case "cometbft.types.v1.CanonicalProposal.height": + case "cometbft.types.v2.CanonicalProposal.height": return x.Height != int64(0) - case "cometbft.types.v1.CanonicalProposal.round": + case "cometbft.types.v2.CanonicalProposal.round": return x.Round != int64(0) - case "cometbft.types.v1.CanonicalProposal.pol_round": + case "cometbft.types.v2.CanonicalProposal.pol_round": return x.PolRound != int64(0) - case "cometbft.types.v1.CanonicalProposal.block_id": + case "cometbft.types.v2.CanonicalProposal.block_id": return x.BlockId != nil - case "cometbft.types.v1.CanonicalProposal.timestamp": + case "cometbft.types.v2.CanonicalProposal.timestamp": return x.Timestamp != nil - case "cometbft.types.v1.CanonicalProposal.chain_id": + case "cometbft.types.v2.CanonicalProposal.chain_id": return x.ChainId != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalProposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalProposal")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalProposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalProposal does not contain field %s", fd.FullName())) } } @@ -1161,25 +1161,25 @@ func (x *fastReflection_CanonicalProposal) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalProposal) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalProposal.type": + case "cometbft.types.v2.CanonicalProposal.type": x.Type_ = 0 - case "cometbft.types.v1.CanonicalProposal.height": + case "cometbft.types.v2.CanonicalProposal.height": x.Height = int64(0) - case "cometbft.types.v1.CanonicalProposal.round": + case "cometbft.types.v2.CanonicalProposal.round": x.Round = int64(0) - case "cometbft.types.v1.CanonicalProposal.pol_round": + case "cometbft.types.v2.CanonicalProposal.pol_round": x.PolRound = int64(0) - case "cometbft.types.v1.CanonicalProposal.block_id": + case "cometbft.types.v2.CanonicalProposal.block_id": x.BlockId = nil - case "cometbft.types.v1.CanonicalProposal.timestamp": + case "cometbft.types.v2.CanonicalProposal.timestamp": x.Timestamp = nil - case "cometbft.types.v1.CanonicalProposal.chain_id": + case "cometbft.types.v2.CanonicalProposal.chain_id": x.ChainId = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalProposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalProposal")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalProposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalProposal does not contain field %s", fd.FullName())) } } @@ -1191,32 +1191,32 @@ func (x *fastReflection_CanonicalProposal) Clear(fd protoreflect.FieldDescriptor // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CanonicalProposal) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.CanonicalProposal.type": + case "cometbft.types.v2.CanonicalProposal.type": value := x.Type_ return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "cometbft.types.v1.CanonicalProposal.height": + case "cometbft.types.v2.CanonicalProposal.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.CanonicalProposal.round": + case "cometbft.types.v2.CanonicalProposal.round": value := x.Round return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.CanonicalProposal.pol_round": + case "cometbft.types.v2.CanonicalProposal.pol_round": value := x.PolRound return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.CanonicalProposal.block_id": + case "cometbft.types.v2.CanonicalProposal.block_id": value := x.BlockId return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.CanonicalProposal.timestamp": + case "cometbft.types.v2.CanonicalProposal.timestamp": value := x.Timestamp return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.CanonicalProposal.chain_id": + case "cometbft.types.v2.CanonicalProposal.chain_id": value := x.ChainId return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalProposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalProposal")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalProposal does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalProposal does not contain field %s", descriptor.FullName())) } } @@ -1232,25 +1232,25 @@ func (x *fastReflection_CanonicalProposal) Get(descriptor protoreflect.FieldDesc // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalProposal) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalProposal.type": + case "cometbft.types.v2.CanonicalProposal.type": x.Type_ = (SignedMsgType)(value.Enum()) - case "cometbft.types.v1.CanonicalProposal.height": + case "cometbft.types.v2.CanonicalProposal.height": x.Height = value.Int() - case "cometbft.types.v1.CanonicalProposal.round": + case "cometbft.types.v2.CanonicalProposal.round": x.Round = value.Int() - case "cometbft.types.v1.CanonicalProposal.pol_round": + case "cometbft.types.v2.CanonicalProposal.pol_round": x.PolRound = value.Int() - case "cometbft.types.v1.CanonicalProposal.block_id": + case "cometbft.types.v2.CanonicalProposal.block_id": x.BlockId = value.Message().Interface().(*CanonicalBlockID) - case "cometbft.types.v1.CanonicalProposal.timestamp": + case "cometbft.types.v2.CanonicalProposal.timestamp": x.Timestamp = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.types.v1.CanonicalProposal.chain_id": + case "cometbft.types.v2.CanonicalProposal.chain_id": x.ChainId = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalProposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalProposal")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalProposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalProposal does not contain field %s", fd.FullName())) } } @@ -1266,31 +1266,31 @@ func (x *fastReflection_CanonicalProposal) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalProposal) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalProposal.block_id": + case "cometbft.types.v2.CanonicalProposal.block_id": if x.BlockId == nil { x.BlockId = new(CanonicalBlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) - case "cometbft.types.v1.CanonicalProposal.timestamp": + case "cometbft.types.v2.CanonicalProposal.timestamp": if x.Timestamp == nil { x.Timestamp = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Timestamp.ProtoReflect()) - case "cometbft.types.v1.CanonicalProposal.type": - panic(fmt.Errorf("field type of message cometbft.types.v1.CanonicalProposal is not mutable")) - case "cometbft.types.v1.CanonicalProposal.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.CanonicalProposal is not mutable")) - case "cometbft.types.v1.CanonicalProposal.round": - panic(fmt.Errorf("field round of message cometbft.types.v1.CanonicalProposal is not mutable")) - case "cometbft.types.v1.CanonicalProposal.pol_round": - panic(fmt.Errorf("field pol_round of message cometbft.types.v1.CanonicalProposal is not mutable")) - case "cometbft.types.v1.CanonicalProposal.chain_id": - panic(fmt.Errorf("field chain_id of message cometbft.types.v1.CanonicalProposal is not mutable")) + case "cometbft.types.v2.CanonicalProposal.type": + panic(fmt.Errorf("field type of message cometbft.types.v2.CanonicalProposal is not mutable")) + case "cometbft.types.v2.CanonicalProposal.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.CanonicalProposal is not mutable")) + case "cometbft.types.v2.CanonicalProposal.round": + panic(fmt.Errorf("field round of message cometbft.types.v2.CanonicalProposal is not mutable")) + case "cometbft.types.v2.CanonicalProposal.pol_round": + panic(fmt.Errorf("field pol_round of message cometbft.types.v2.CanonicalProposal is not mutable")) + case "cometbft.types.v2.CanonicalProposal.chain_id": + panic(fmt.Errorf("field chain_id of message cometbft.types.v2.CanonicalProposal is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalProposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalProposal")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalProposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalProposal does not contain field %s", fd.FullName())) } } @@ -1299,27 +1299,27 @@ func (x *fastReflection_CanonicalProposal) Mutable(fd protoreflect.FieldDescript // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CanonicalProposal) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalProposal.type": + case "cometbft.types.v2.CanonicalProposal.type": return protoreflect.ValueOfEnum(0) - case "cometbft.types.v1.CanonicalProposal.height": + case "cometbft.types.v2.CanonicalProposal.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.CanonicalProposal.round": + case "cometbft.types.v2.CanonicalProposal.round": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.CanonicalProposal.pol_round": + case "cometbft.types.v2.CanonicalProposal.pol_round": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.CanonicalProposal.block_id": + case "cometbft.types.v2.CanonicalProposal.block_id": m := new(CanonicalBlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.CanonicalProposal.timestamp": + case "cometbft.types.v2.CanonicalProposal.timestamp": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.CanonicalProposal.chain_id": + case "cometbft.types.v2.CanonicalProposal.chain_id": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalProposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalProposal")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalProposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalProposal does not contain field %s", fd.FullName())) } } @@ -1329,7 +1329,7 @@ func (x *fastReflection_CanonicalProposal) NewField(fd protoreflect.FieldDescrip func (x *fastReflection_CanonicalProposal) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.CanonicalProposal", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.CanonicalProposal", d.FullName())) } panic("unreachable") } @@ -1751,8 +1751,8 @@ var ( ) func init() { - file_cometbft_types_v1_canonical_proto_init() - md_CanonicalVote = File_cometbft_types_v1_canonical_proto.Messages().ByName("CanonicalVote") + file_cometbft_types_v2_canonical_proto_init() + md_CanonicalVote = File_cometbft_types_v2_canonical_proto.Messages().ByName("CanonicalVote") fd_CanonicalVote_type = md_CanonicalVote.Fields().ByName("type") fd_CanonicalVote_height = md_CanonicalVote.Fields().ByName("height") fd_CanonicalVote_round = md_CanonicalVote.Fields().ByName("round") @@ -1770,7 +1770,7 @@ func (x *CanonicalVote) ProtoReflect() protoreflect.Message { } func (x *CanonicalVote) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[3] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1877,23 +1877,23 @@ func (x *fastReflection_CanonicalVote) Range(f func(protoreflect.FieldDescriptor // a repeated field is populated if it is non-empty. func (x *fastReflection_CanonicalVote) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVote.type": + case "cometbft.types.v2.CanonicalVote.type": return x.Type_ != 0 - case "cometbft.types.v1.CanonicalVote.height": + case "cometbft.types.v2.CanonicalVote.height": return x.Height != int64(0) - case "cometbft.types.v1.CanonicalVote.round": + case "cometbft.types.v2.CanonicalVote.round": return x.Round != int64(0) - case "cometbft.types.v1.CanonicalVote.block_id": + case "cometbft.types.v2.CanonicalVote.block_id": return x.BlockId != nil - case "cometbft.types.v1.CanonicalVote.timestamp": + case "cometbft.types.v2.CanonicalVote.timestamp": return x.Timestamp != nil - case "cometbft.types.v1.CanonicalVote.chain_id": + case "cometbft.types.v2.CanonicalVote.chain_id": return x.ChainId != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVote")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVote does not contain field %s", fd.FullName())) } } @@ -1905,23 +1905,23 @@ func (x *fastReflection_CanonicalVote) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalVote) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVote.type": + case "cometbft.types.v2.CanonicalVote.type": x.Type_ = 0 - case "cometbft.types.v1.CanonicalVote.height": + case "cometbft.types.v2.CanonicalVote.height": x.Height = int64(0) - case "cometbft.types.v1.CanonicalVote.round": + case "cometbft.types.v2.CanonicalVote.round": x.Round = int64(0) - case "cometbft.types.v1.CanonicalVote.block_id": + case "cometbft.types.v2.CanonicalVote.block_id": x.BlockId = nil - case "cometbft.types.v1.CanonicalVote.timestamp": + case "cometbft.types.v2.CanonicalVote.timestamp": x.Timestamp = nil - case "cometbft.types.v1.CanonicalVote.chain_id": + case "cometbft.types.v2.CanonicalVote.chain_id": x.ChainId = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVote")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVote does not contain field %s", fd.FullName())) } } @@ -1933,29 +1933,29 @@ func (x *fastReflection_CanonicalVote) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CanonicalVote) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.CanonicalVote.type": + case "cometbft.types.v2.CanonicalVote.type": value := x.Type_ return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "cometbft.types.v1.CanonicalVote.height": + case "cometbft.types.v2.CanonicalVote.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.CanonicalVote.round": + case "cometbft.types.v2.CanonicalVote.round": value := x.Round return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.CanonicalVote.block_id": + case "cometbft.types.v2.CanonicalVote.block_id": value := x.BlockId return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.CanonicalVote.timestamp": + case "cometbft.types.v2.CanonicalVote.timestamp": value := x.Timestamp return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.CanonicalVote.chain_id": + case "cometbft.types.v2.CanonicalVote.chain_id": value := x.ChainId return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVote")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVote does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVote does not contain field %s", descriptor.FullName())) } } @@ -1971,23 +1971,23 @@ func (x *fastReflection_CanonicalVote) Get(descriptor protoreflect.FieldDescript // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalVote) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVote.type": + case "cometbft.types.v2.CanonicalVote.type": x.Type_ = (SignedMsgType)(value.Enum()) - case "cometbft.types.v1.CanonicalVote.height": + case "cometbft.types.v2.CanonicalVote.height": x.Height = value.Int() - case "cometbft.types.v1.CanonicalVote.round": + case "cometbft.types.v2.CanonicalVote.round": x.Round = value.Int() - case "cometbft.types.v1.CanonicalVote.block_id": + case "cometbft.types.v2.CanonicalVote.block_id": x.BlockId = value.Message().Interface().(*CanonicalBlockID) - case "cometbft.types.v1.CanonicalVote.timestamp": + case "cometbft.types.v2.CanonicalVote.timestamp": x.Timestamp = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.types.v1.CanonicalVote.chain_id": + case "cometbft.types.v2.CanonicalVote.chain_id": x.ChainId = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVote")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVote does not contain field %s", fd.FullName())) } } @@ -2003,29 +2003,29 @@ func (x *fastReflection_CanonicalVote) Set(fd protoreflect.FieldDescriptor, valu // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalVote) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVote.block_id": + case "cometbft.types.v2.CanonicalVote.block_id": if x.BlockId == nil { x.BlockId = new(CanonicalBlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) - case "cometbft.types.v1.CanonicalVote.timestamp": + case "cometbft.types.v2.CanonicalVote.timestamp": if x.Timestamp == nil { x.Timestamp = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Timestamp.ProtoReflect()) - case "cometbft.types.v1.CanonicalVote.type": - panic(fmt.Errorf("field type of message cometbft.types.v1.CanonicalVote is not mutable")) - case "cometbft.types.v1.CanonicalVote.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.CanonicalVote is not mutable")) - case "cometbft.types.v1.CanonicalVote.round": - panic(fmt.Errorf("field round of message cometbft.types.v1.CanonicalVote is not mutable")) - case "cometbft.types.v1.CanonicalVote.chain_id": - panic(fmt.Errorf("field chain_id of message cometbft.types.v1.CanonicalVote is not mutable")) + case "cometbft.types.v2.CanonicalVote.type": + panic(fmt.Errorf("field type of message cometbft.types.v2.CanonicalVote is not mutable")) + case "cometbft.types.v2.CanonicalVote.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.CanonicalVote is not mutable")) + case "cometbft.types.v2.CanonicalVote.round": + panic(fmt.Errorf("field round of message cometbft.types.v2.CanonicalVote is not mutable")) + case "cometbft.types.v2.CanonicalVote.chain_id": + panic(fmt.Errorf("field chain_id of message cometbft.types.v2.CanonicalVote is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVote")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVote does not contain field %s", fd.FullName())) } } @@ -2034,25 +2034,25 @@ func (x *fastReflection_CanonicalVote) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CanonicalVote) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVote.type": + case "cometbft.types.v2.CanonicalVote.type": return protoreflect.ValueOfEnum(0) - case "cometbft.types.v1.CanonicalVote.height": + case "cometbft.types.v2.CanonicalVote.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.CanonicalVote.round": + case "cometbft.types.v2.CanonicalVote.round": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.CanonicalVote.block_id": + case "cometbft.types.v2.CanonicalVote.block_id": m := new(CanonicalBlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.CanonicalVote.timestamp": + case "cometbft.types.v2.CanonicalVote.timestamp": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.CanonicalVote.chain_id": + case "cometbft.types.v2.CanonicalVote.chain_id": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVote")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVote does not contain field %s", fd.FullName())) } } @@ -2062,7 +2062,7 @@ func (x *fastReflection_CanonicalVote) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_CanonicalVote) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.CanonicalVote", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.CanonicalVote", d.FullName())) } panic("unreachable") } @@ -2455,8 +2455,8 @@ var ( ) func init() { - file_cometbft_types_v1_canonical_proto_init() - md_CanonicalVoteExtension = File_cometbft_types_v1_canonical_proto.Messages().ByName("CanonicalVoteExtension") + file_cometbft_types_v2_canonical_proto_init() + md_CanonicalVoteExtension = File_cometbft_types_v2_canonical_proto.Messages().ByName("CanonicalVoteExtension") fd_CanonicalVoteExtension_extension = md_CanonicalVoteExtension.Fields().ByName("extension") fd_CanonicalVoteExtension_height = md_CanonicalVoteExtension.Fields().ByName("height") fd_CanonicalVoteExtension_round = md_CanonicalVoteExtension.Fields().ByName("round") @@ -2472,7 +2472,7 @@ func (x *CanonicalVoteExtension) ProtoReflect() protoreflect.Message { } func (x *CanonicalVoteExtension) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[4] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2567,19 +2567,19 @@ func (x *fastReflection_CanonicalVoteExtension) Range(f func(protoreflect.FieldD // a repeated field is populated if it is non-empty. func (x *fastReflection_CanonicalVoteExtension) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVoteExtension.extension": + case "cometbft.types.v2.CanonicalVoteExtension.extension": return len(x.Extension) != 0 - case "cometbft.types.v1.CanonicalVoteExtension.height": + case "cometbft.types.v2.CanonicalVoteExtension.height": return x.Height != int64(0) - case "cometbft.types.v1.CanonicalVoteExtension.round": + case "cometbft.types.v2.CanonicalVoteExtension.round": return x.Round != int64(0) - case "cometbft.types.v1.CanonicalVoteExtension.chain_id": + case "cometbft.types.v2.CanonicalVoteExtension.chain_id": return x.ChainId != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVoteExtension")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVoteExtension")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVoteExtension does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVoteExtension does not contain field %s", fd.FullName())) } } @@ -2591,19 +2591,19 @@ func (x *fastReflection_CanonicalVoteExtension) Has(fd protoreflect.FieldDescrip // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalVoteExtension) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVoteExtension.extension": + case "cometbft.types.v2.CanonicalVoteExtension.extension": x.Extension = nil - case "cometbft.types.v1.CanonicalVoteExtension.height": + case "cometbft.types.v2.CanonicalVoteExtension.height": x.Height = int64(0) - case "cometbft.types.v1.CanonicalVoteExtension.round": + case "cometbft.types.v2.CanonicalVoteExtension.round": x.Round = int64(0) - case "cometbft.types.v1.CanonicalVoteExtension.chain_id": + case "cometbft.types.v2.CanonicalVoteExtension.chain_id": x.ChainId = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVoteExtension")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVoteExtension")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVoteExtension does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVoteExtension does not contain field %s", fd.FullName())) } } @@ -2615,23 +2615,23 @@ func (x *fastReflection_CanonicalVoteExtension) Clear(fd protoreflect.FieldDescr // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CanonicalVoteExtension) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.CanonicalVoteExtension.extension": + case "cometbft.types.v2.CanonicalVoteExtension.extension": value := x.Extension return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.CanonicalVoteExtension.height": + case "cometbft.types.v2.CanonicalVoteExtension.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.CanonicalVoteExtension.round": + case "cometbft.types.v2.CanonicalVoteExtension.round": value := x.Round return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.CanonicalVoteExtension.chain_id": + case "cometbft.types.v2.CanonicalVoteExtension.chain_id": value := x.ChainId return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVoteExtension")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVoteExtension")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVoteExtension does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVoteExtension does not contain field %s", descriptor.FullName())) } } @@ -2647,19 +2647,19 @@ func (x *fastReflection_CanonicalVoteExtension) Get(descriptor protoreflect.Fiel // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalVoteExtension) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVoteExtension.extension": + case "cometbft.types.v2.CanonicalVoteExtension.extension": x.Extension = value.Bytes() - case "cometbft.types.v1.CanonicalVoteExtension.height": + case "cometbft.types.v2.CanonicalVoteExtension.height": x.Height = value.Int() - case "cometbft.types.v1.CanonicalVoteExtension.round": + case "cometbft.types.v2.CanonicalVoteExtension.round": x.Round = value.Int() - case "cometbft.types.v1.CanonicalVoteExtension.chain_id": + case "cometbft.types.v2.CanonicalVoteExtension.chain_id": x.ChainId = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVoteExtension")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVoteExtension")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVoteExtension does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVoteExtension does not contain field %s", fd.FullName())) } } @@ -2675,19 +2675,19 @@ func (x *fastReflection_CanonicalVoteExtension) Set(fd protoreflect.FieldDescrip // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CanonicalVoteExtension) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVoteExtension.extension": - panic(fmt.Errorf("field extension of message cometbft.types.v1.CanonicalVoteExtension is not mutable")) - case "cometbft.types.v1.CanonicalVoteExtension.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.CanonicalVoteExtension is not mutable")) - case "cometbft.types.v1.CanonicalVoteExtension.round": - panic(fmt.Errorf("field round of message cometbft.types.v1.CanonicalVoteExtension is not mutable")) - case "cometbft.types.v1.CanonicalVoteExtension.chain_id": - panic(fmt.Errorf("field chain_id of message cometbft.types.v1.CanonicalVoteExtension is not mutable")) + case "cometbft.types.v2.CanonicalVoteExtension.extension": + panic(fmt.Errorf("field extension of message cometbft.types.v2.CanonicalVoteExtension is not mutable")) + case "cometbft.types.v2.CanonicalVoteExtension.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.CanonicalVoteExtension is not mutable")) + case "cometbft.types.v2.CanonicalVoteExtension.round": + panic(fmt.Errorf("field round of message cometbft.types.v2.CanonicalVoteExtension is not mutable")) + case "cometbft.types.v2.CanonicalVoteExtension.chain_id": + panic(fmt.Errorf("field chain_id of message cometbft.types.v2.CanonicalVoteExtension is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVoteExtension")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVoteExtension")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVoteExtension does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVoteExtension does not contain field %s", fd.FullName())) } } @@ -2696,19 +2696,19 @@ func (x *fastReflection_CanonicalVoteExtension) Mutable(fd protoreflect.FieldDes // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CanonicalVoteExtension) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CanonicalVoteExtension.extension": + case "cometbft.types.v2.CanonicalVoteExtension.extension": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.CanonicalVoteExtension.height": + case "cometbft.types.v2.CanonicalVoteExtension.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.CanonicalVoteExtension.round": + case "cometbft.types.v2.CanonicalVoteExtension.round": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.CanonicalVoteExtension.chain_id": + case "cometbft.types.v2.CanonicalVoteExtension.chain_id": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CanonicalVoteExtension")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CanonicalVoteExtension")) } - panic(fmt.Errorf("message cometbft.types.v1.CanonicalVoteExtension does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CanonicalVoteExtension does not contain field %s", fd.FullName())) } } @@ -2718,7 +2718,7 @@ func (x *fastReflection_CanonicalVoteExtension) NewField(fd protoreflect.FieldDe func (x *fastReflection_CanonicalVoteExtension) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.CanonicalVoteExtension", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.CanonicalVoteExtension", d.FullName())) } panic("unreachable") } @@ -3016,7 +3016,7 @@ func (x *fastReflection_CanonicalVoteExtension) ProtoMethods() *protoiface.Metho // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/types/v1/canonical.proto +// source: cometbft/types/v2/canonical.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -3039,7 +3039,7 @@ type CanonicalBlockID struct { func (x *CanonicalBlockID) Reset() { *x = CanonicalBlockID{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[0] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3053,7 +3053,7 @@ func (*CanonicalBlockID) ProtoMessage() {} // Deprecated: Use CanonicalBlockID.ProtoReflect.Descriptor instead. func (*CanonicalBlockID) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_canonical_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_canonical_proto_rawDescGZIP(), []int{0} } func (x *CanonicalBlockID) GetHash() []byte { @@ -3084,7 +3084,7 @@ type CanonicalPartSetHeader struct { func (x *CanonicalPartSetHeader) Reset() { *x = CanonicalPartSetHeader{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[1] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3098,7 +3098,7 @@ func (*CanonicalPartSetHeader) ProtoMessage() {} // Deprecated: Use CanonicalPartSetHeader.ProtoReflect.Descriptor instead. func (*CanonicalPartSetHeader) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_canonical_proto_rawDescGZIP(), []int{1} + return file_cometbft_types_v2_canonical_proto_rawDescGZIP(), []int{1} } func (x *CanonicalPartSetHeader) GetTotal() uint32 { @@ -3122,7 +3122,7 @@ type CanonicalProposal struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Type_ SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.types.v1.SignedMsgType" json:"type,omitempty"` // type alias for byte + Type_ SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.types.v2.SignedMsgType" json:"type,omitempty"` // type alias for byte Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` // canonicalization requires fixed size encoding here Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` // canonicalization requires fixed size encoding here PolRound int64 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` @@ -3134,7 +3134,7 @@ type CanonicalProposal struct { func (x *CanonicalProposal) Reset() { *x = CanonicalProposal{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[2] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3148,7 +3148,7 @@ func (*CanonicalProposal) ProtoMessage() {} // Deprecated: Use CanonicalProposal.ProtoReflect.Descriptor instead. func (*CanonicalProposal) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_canonical_proto_rawDescGZIP(), []int{2} + return file_cometbft_types_v2_canonical_proto_rawDescGZIP(), []int{2} } func (x *CanonicalProposal) GetType_() SignedMsgType { @@ -3207,7 +3207,7 @@ type CanonicalVote struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Type_ SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.types.v1.SignedMsgType" json:"type,omitempty"` // type alias for byte + Type_ SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.types.v2.SignedMsgType" json:"type,omitempty"` // type alias for byte Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` // canonicalization requires fixed size encoding here Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` // canonicalization requires fixed size encoding here BlockId *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` @@ -3218,7 +3218,7 @@ type CanonicalVote struct { func (x *CanonicalVote) Reset() { *x = CanonicalVote{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[3] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3232,7 +3232,7 @@ func (*CanonicalVote) ProtoMessage() {} // Deprecated: Use CanonicalVote.ProtoReflect.Descriptor instead. func (*CanonicalVote) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_canonical_proto_rawDescGZIP(), []int{3} + return file_cometbft_types_v2_canonical_proto_rawDescGZIP(), []int{3} } func (x *CanonicalVote) GetType_() SignedMsgType { @@ -3293,7 +3293,7 @@ type CanonicalVoteExtension struct { func (x *CanonicalVoteExtension) Reset() { *x = CanonicalVoteExtension{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_canonical_proto_msgTypes[4] + mi := &file_cometbft_types_v2_canonical_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3307,7 +3307,7 @@ func (*CanonicalVoteExtension) ProtoMessage() {} // Deprecated: Use CanonicalVoteExtension.ProtoReflect.Descriptor instead. func (*CanonicalVoteExtension) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_canonical_proto_rawDescGZIP(), []int{4} + return file_cometbft_types_v2_canonical_proto_rawDescGZIP(), []int{4} } func (x *CanonicalVoteExtension) GetExtension() []byte { @@ -3338,15 +3338,15 @@ func (x *CanonicalVoteExtension) GetChainId() string { return "" } -var File_cometbft_types_v1_canonical_proto protoreflect.FileDescriptor +var File_cometbft_types_v2_canonical_proto protoreflect.FileDescriptor -var file_cometbft_types_v1_canonical_proto_rawDesc = []byte{ +var file_cometbft_types_v2_canonical_proto_rawDesc = []byte{ 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x70, 0x72, + 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, + 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7f, 0x0a, 0x10, @@ -3355,7 +3355,7 @@ var file_cometbft_types_v1_canonical_proto_rawDesc = []byte{ 0x68, 0x61, 0x73, 0x68, 0x12, 0x57, 0x0a, 0x0f, 0x70, 0x61, 0x72, 0x74, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, - 0x31, 0x2e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x53, + 0x32, 0x2e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x53, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x74, 0x53, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x42, 0x0a, 0x16, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x72, 0x74, 0x53, 0x65, @@ -3365,7 +3365,7 @@ var file_cometbft_types_v1_canonical_proto_rawDesc = []byte{ 0x68, 0x22, 0xdb, 0x02, 0x0a, 0x11, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x34, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x10, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, @@ -3374,7 +3374,7 @@ var file_cometbft_types_v1_canonical_proto_rawDesc = []byte{ 0xe2, 0xde, 0x1f, 0x08, 0x50, 0x4f, 0x4c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x08, 0x70, 0x6f, 0x6c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x4b, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x6e, + 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x0b, 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x42, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, @@ -3387,13 +3387,13 @@ var file_cometbft_types_v1_canonical_proto_rawDesc = []byte{ 0xac, 0x02, 0x0a, 0x0d, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x56, 0x6f, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, + 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x10, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x10, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x4b, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x6e, 0x6f, + 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x0b, 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x42, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, @@ -3412,50 +3412,50 @@ var file_cometbft_types_v1_canonical_proto_rawDesc = []byte{ 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x42, 0xb9, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x42, 0x0e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x3b, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, - 0x31, 0xca, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, - 0x65, 0x73, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x32, 0xca, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, + 0x65, 0x73, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, + 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_cometbft_types_v1_canonical_proto_rawDescOnce sync.Once - file_cometbft_types_v1_canonical_proto_rawDescData = file_cometbft_types_v1_canonical_proto_rawDesc + file_cometbft_types_v2_canonical_proto_rawDescOnce sync.Once + file_cometbft_types_v2_canonical_proto_rawDescData = file_cometbft_types_v2_canonical_proto_rawDesc ) -func file_cometbft_types_v1_canonical_proto_rawDescGZIP() []byte { - file_cometbft_types_v1_canonical_proto_rawDescOnce.Do(func() { - file_cometbft_types_v1_canonical_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v1_canonical_proto_rawDescData) +func file_cometbft_types_v2_canonical_proto_rawDescGZIP() []byte { + file_cometbft_types_v2_canonical_proto_rawDescOnce.Do(func() { + file_cometbft_types_v2_canonical_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v2_canonical_proto_rawDescData) }) - return file_cometbft_types_v1_canonical_proto_rawDescData + return file_cometbft_types_v2_canonical_proto_rawDescData } -var file_cometbft_types_v1_canonical_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_cometbft_types_v1_canonical_proto_goTypes = []interface{}{ - (*CanonicalBlockID)(nil), // 0: cometbft.types.v1.CanonicalBlockID - (*CanonicalPartSetHeader)(nil), // 1: cometbft.types.v1.CanonicalPartSetHeader - (*CanonicalProposal)(nil), // 2: cometbft.types.v1.CanonicalProposal - (*CanonicalVote)(nil), // 3: cometbft.types.v1.CanonicalVote - (*CanonicalVoteExtension)(nil), // 4: cometbft.types.v1.CanonicalVoteExtension - (SignedMsgType)(0), // 5: cometbft.types.v1.SignedMsgType +var file_cometbft_types_v2_canonical_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_cometbft_types_v2_canonical_proto_goTypes = []interface{}{ + (*CanonicalBlockID)(nil), // 0: cometbft.types.v2.CanonicalBlockID + (*CanonicalPartSetHeader)(nil), // 1: cometbft.types.v2.CanonicalPartSetHeader + (*CanonicalProposal)(nil), // 2: cometbft.types.v2.CanonicalProposal + (*CanonicalVote)(nil), // 3: cometbft.types.v2.CanonicalVote + (*CanonicalVoteExtension)(nil), // 4: cometbft.types.v2.CanonicalVoteExtension + (SignedMsgType)(0), // 5: cometbft.types.v2.SignedMsgType (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp } -var file_cometbft_types_v1_canonical_proto_depIdxs = []int32{ - 1, // 0: cometbft.types.v1.CanonicalBlockID.part_set_header:type_name -> cometbft.types.v1.CanonicalPartSetHeader - 5, // 1: cometbft.types.v1.CanonicalProposal.type:type_name -> cometbft.types.v1.SignedMsgType - 0, // 2: cometbft.types.v1.CanonicalProposal.block_id:type_name -> cometbft.types.v1.CanonicalBlockID - 6, // 3: cometbft.types.v1.CanonicalProposal.timestamp:type_name -> google.protobuf.Timestamp - 5, // 4: cometbft.types.v1.CanonicalVote.type:type_name -> cometbft.types.v1.SignedMsgType - 0, // 5: cometbft.types.v1.CanonicalVote.block_id:type_name -> cometbft.types.v1.CanonicalBlockID - 6, // 6: cometbft.types.v1.CanonicalVote.timestamp:type_name -> google.protobuf.Timestamp +var file_cometbft_types_v2_canonical_proto_depIdxs = []int32{ + 1, // 0: cometbft.types.v2.CanonicalBlockID.part_set_header:type_name -> cometbft.types.v2.CanonicalPartSetHeader + 5, // 1: cometbft.types.v2.CanonicalProposal.type:type_name -> cometbft.types.v2.SignedMsgType + 0, // 2: cometbft.types.v2.CanonicalProposal.block_id:type_name -> cometbft.types.v2.CanonicalBlockID + 6, // 3: cometbft.types.v2.CanonicalProposal.timestamp:type_name -> google.protobuf.Timestamp + 5, // 4: cometbft.types.v2.CanonicalVote.type:type_name -> cometbft.types.v2.SignedMsgType + 0, // 5: cometbft.types.v2.CanonicalVote.block_id:type_name -> cometbft.types.v2.CanonicalBlockID + 6, // 6: cometbft.types.v2.CanonicalVote.timestamp:type_name -> google.protobuf.Timestamp 7, // [7:7] is the sub-list for method output_type 7, // [7:7] is the sub-list for method input_type 7, // [7:7] is the sub-list for extension type_name @@ -3463,14 +3463,14 @@ var file_cometbft_types_v1_canonical_proto_depIdxs = []int32{ 0, // [0:7] is the sub-list for field type_name } -func init() { file_cometbft_types_v1_canonical_proto_init() } -func file_cometbft_types_v1_canonical_proto_init() { - if File_cometbft_types_v1_canonical_proto != nil { +func init() { file_cometbft_types_v2_canonical_proto_init() } +func file_cometbft_types_v2_canonical_proto_init() { + if File_cometbft_types_v2_canonical_proto != nil { return } - file_cometbft_types_v1_types_proto_init() + file_cometbft_types_v2_types_proto_init() if !protoimpl.UnsafeEnabled { - file_cometbft_types_v1_canonical_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_canonical_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CanonicalBlockID); i { case 0: return &v.state @@ -3482,7 +3482,7 @@ func file_cometbft_types_v1_canonical_proto_init() { return nil } } - file_cometbft_types_v1_canonical_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_canonical_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CanonicalPartSetHeader); i { case 0: return &v.state @@ -3494,7 +3494,7 @@ func file_cometbft_types_v1_canonical_proto_init() { return nil } } - file_cometbft_types_v1_canonical_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_canonical_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CanonicalProposal); i { case 0: return &v.state @@ -3506,7 +3506,7 @@ func file_cometbft_types_v1_canonical_proto_init() { return nil } } - file_cometbft_types_v1_canonical_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_canonical_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CanonicalVote); i { case 0: return &v.state @@ -3518,7 +3518,7 @@ func file_cometbft_types_v1_canonical_proto_init() { return nil } } - file_cometbft_types_v1_canonical_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_canonical_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CanonicalVoteExtension); i { case 0: return &v.state @@ -3535,18 +3535,18 @@ func file_cometbft_types_v1_canonical_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_types_v1_canonical_proto_rawDesc, + RawDescriptor: file_cometbft_types_v2_canonical_proto_rawDesc, NumEnums: 0, NumMessages: 5, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cometbft_types_v1_canonical_proto_goTypes, - DependencyIndexes: file_cometbft_types_v1_canonical_proto_depIdxs, - MessageInfos: file_cometbft_types_v1_canonical_proto_msgTypes, + GoTypes: file_cometbft_types_v2_canonical_proto_goTypes, + DependencyIndexes: file_cometbft_types_v2_canonical_proto_depIdxs, + MessageInfos: file_cometbft_types_v2_canonical_proto_msgTypes, }.Build() - File_cometbft_types_v1_canonical_proto = out.File - file_cometbft_types_v1_canonical_proto_rawDesc = nil - file_cometbft_types_v1_canonical_proto_goTypes = nil - file_cometbft_types_v1_canonical_proto_depIdxs = nil + File_cometbft_types_v2_canonical_proto = out.File + file_cometbft_types_v2_canonical_proto_rawDesc = nil + file_cometbft_types_v2_canonical_proto_goTypes = nil + file_cometbft_types_v2_canonical_proto_depIdxs = nil } diff --git a/api/cometbft/types/v1/events.pulsar.go b/api/cometbft/types/v2/events.pulsar.go similarity index 83% rename from api/cometbft/types/v1/events.pulsar.go rename to api/cometbft/types/v2/events.pulsar.go index b8d2f3861b..c95b40caa2 100644 --- a/api/cometbft/types/v1/events.pulsar.go +++ b/api/cometbft/types/v2/events.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package typesv1 +package typesv2 import ( fmt "fmt" @@ -20,8 +20,8 @@ var ( ) func init() { - file_cometbft_types_v1_events_proto_init() - md_EventDataRoundState = File_cometbft_types_v1_events_proto.Messages().ByName("EventDataRoundState") + file_cometbft_types_v2_events_proto_init() + md_EventDataRoundState = File_cometbft_types_v2_events_proto.Messages().ByName("EventDataRoundState") fd_EventDataRoundState_height = md_EventDataRoundState.Fields().ByName("height") fd_EventDataRoundState_round = md_EventDataRoundState.Fields().ByName("round") fd_EventDataRoundState_step = md_EventDataRoundState.Fields().ByName("step") @@ -36,7 +36,7 @@ func (x *EventDataRoundState) ProtoReflect() protoreflect.Message { } func (x *EventDataRoundState) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_events_proto_msgTypes[0] + mi := &file_cometbft_types_v2_events_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -125,17 +125,17 @@ func (x *fastReflection_EventDataRoundState) Range(f func(protoreflect.FieldDesc // a repeated field is populated if it is non-empty. func (x *fastReflection_EventDataRoundState) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.EventDataRoundState.height": + case "cometbft.types.v2.EventDataRoundState.height": return x.Height != int64(0) - case "cometbft.types.v1.EventDataRoundState.round": + case "cometbft.types.v2.EventDataRoundState.round": return x.Round != int32(0) - case "cometbft.types.v1.EventDataRoundState.step": + case "cometbft.types.v2.EventDataRoundState.step": return x.Step != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EventDataRoundState")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EventDataRoundState")) } - panic(fmt.Errorf("message cometbft.types.v1.EventDataRoundState does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EventDataRoundState does not contain field %s", fd.FullName())) } } @@ -147,17 +147,17 @@ func (x *fastReflection_EventDataRoundState) Has(fd protoreflect.FieldDescriptor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EventDataRoundState) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.EventDataRoundState.height": + case "cometbft.types.v2.EventDataRoundState.height": x.Height = int64(0) - case "cometbft.types.v1.EventDataRoundState.round": + case "cometbft.types.v2.EventDataRoundState.round": x.Round = int32(0) - case "cometbft.types.v1.EventDataRoundState.step": + case "cometbft.types.v2.EventDataRoundState.step": x.Step = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EventDataRoundState")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EventDataRoundState")) } - panic(fmt.Errorf("message cometbft.types.v1.EventDataRoundState does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EventDataRoundState does not contain field %s", fd.FullName())) } } @@ -169,20 +169,20 @@ func (x *fastReflection_EventDataRoundState) Clear(fd protoreflect.FieldDescript // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_EventDataRoundState) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.EventDataRoundState.height": + case "cometbft.types.v2.EventDataRoundState.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.EventDataRoundState.round": + case "cometbft.types.v2.EventDataRoundState.round": value := x.Round return protoreflect.ValueOfInt32(value) - case "cometbft.types.v1.EventDataRoundState.step": + case "cometbft.types.v2.EventDataRoundState.step": value := x.Step return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EventDataRoundState")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EventDataRoundState")) } - panic(fmt.Errorf("message cometbft.types.v1.EventDataRoundState does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EventDataRoundState does not contain field %s", descriptor.FullName())) } } @@ -198,17 +198,17 @@ func (x *fastReflection_EventDataRoundState) Get(descriptor protoreflect.FieldDe // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EventDataRoundState) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.EventDataRoundState.height": + case "cometbft.types.v2.EventDataRoundState.height": x.Height = value.Int() - case "cometbft.types.v1.EventDataRoundState.round": + case "cometbft.types.v2.EventDataRoundState.round": x.Round = int32(value.Int()) - case "cometbft.types.v1.EventDataRoundState.step": + case "cometbft.types.v2.EventDataRoundState.step": x.Step = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EventDataRoundState")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EventDataRoundState")) } - panic(fmt.Errorf("message cometbft.types.v1.EventDataRoundState does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EventDataRoundState does not contain field %s", fd.FullName())) } } @@ -224,17 +224,17 @@ func (x *fastReflection_EventDataRoundState) Set(fd protoreflect.FieldDescriptor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EventDataRoundState) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.EventDataRoundState.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.EventDataRoundState is not mutable")) - case "cometbft.types.v1.EventDataRoundState.round": - panic(fmt.Errorf("field round of message cometbft.types.v1.EventDataRoundState is not mutable")) - case "cometbft.types.v1.EventDataRoundState.step": - panic(fmt.Errorf("field step of message cometbft.types.v1.EventDataRoundState is not mutable")) + case "cometbft.types.v2.EventDataRoundState.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.EventDataRoundState is not mutable")) + case "cometbft.types.v2.EventDataRoundState.round": + panic(fmt.Errorf("field round of message cometbft.types.v2.EventDataRoundState is not mutable")) + case "cometbft.types.v2.EventDataRoundState.step": + panic(fmt.Errorf("field step of message cometbft.types.v2.EventDataRoundState is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EventDataRoundState")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EventDataRoundState")) } - panic(fmt.Errorf("message cometbft.types.v1.EventDataRoundState does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EventDataRoundState does not contain field %s", fd.FullName())) } } @@ -243,17 +243,17 @@ func (x *fastReflection_EventDataRoundState) Mutable(fd protoreflect.FieldDescri // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_EventDataRoundState) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.EventDataRoundState.height": + case "cometbft.types.v2.EventDataRoundState.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.EventDataRoundState.round": + case "cometbft.types.v2.EventDataRoundState.round": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.types.v1.EventDataRoundState.step": + case "cometbft.types.v2.EventDataRoundState.step": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EventDataRoundState")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EventDataRoundState")) } - panic(fmt.Errorf("message cometbft.types.v1.EventDataRoundState does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EventDataRoundState does not contain field %s", fd.FullName())) } } @@ -263,7 +263,7 @@ func (x *fastReflection_EventDataRoundState) NewField(fd protoreflect.FieldDescr func (x *fastReflection_EventDataRoundState) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.EventDataRoundState", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.EventDataRoundState", d.FullName())) } panic("unreachable") } @@ -532,7 +532,7 @@ func (x *fastReflection_EventDataRoundState) ProtoMethods() *protoiface.Methods // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/types/v1/events.proto +// source: cometbft/types/v2/events.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -555,7 +555,7 @@ type EventDataRoundState struct { func (x *EventDataRoundState) Reset() { *x = EventDataRoundState{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_events_proto_msgTypes[0] + mi := &file_cometbft_types_v2_events_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -569,7 +569,7 @@ func (*EventDataRoundState) ProtoMessage() {} // Deprecated: Use EventDataRoundState.ProtoReflect.Descriptor instead. func (*EventDataRoundState) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_events_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_events_proto_rawDescGZIP(), []int{0} } func (x *EventDataRoundState) GetHeight() int64 { @@ -593,49 +593,49 @@ func (x *EventDataRoundState) GetStep() string { return "" } -var File_cometbft_types_v1_events_proto protoreflect.FileDescriptor +var File_cometbft_types_v2_events_proto protoreflect.FileDescriptor -var file_cometbft_types_v1_events_proto_rawDesc = []byte{ +var file_cometbft_types_v2_events_proto_rawDesc = []byte{ 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x76, 0x32, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2e, 0x76, 0x31, 0x22, 0x57, 0x0a, 0x13, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, + 0x2e, 0x76, 0x32, 0x22, 0x57, 0x0a, 0x13, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x65, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x74, 0x65, 0x70, 0x42, 0xb6, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, + 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x42, 0x0b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x76, - 0x31, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x11, 0x43, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, 0xe2, + 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x76, + 0x32, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, + 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x11, 0x43, 0x6f, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, - 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, + 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, - 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_cometbft_types_v1_events_proto_rawDescOnce sync.Once - file_cometbft_types_v1_events_proto_rawDescData = file_cometbft_types_v1_events_proto_rawDesc + file_cometbft_types_v2_events_proto_rawDescOnce sync.Once + file_cometbft_types_v2_events_proto_rawDescData = file_cometbft_types_v2_events_proto_rawDesc ) -func file_cometbft_types_v1_events_proto_rawDescGZIP() []byte { - file_cometbft_types_v1_events_proto_rawDescOnce.Do(func() { - file_cometbft_types_v1_events_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v1_events_proto_rawDescData) +func file_cometbft_types_v2_events_proto_rawDescGZIP() []byte { + file_cometbft_types_v2_events_proto_rawDescOnce.Do(func() { + file_cometbft_types_v2_events_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v2_events_proto_rawDescData) }) - return file_cometbft_types_v1_events_proto_rawDescData + return file_cometbft_types_v2_events_proto_rawDescData } -var file_cometbft_types_v1_events_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_cometbft_types_v1_events_proto_goTypes = []interface{}{ - (*EventDataRoundState)(nil), // 0: cometbft.types.v1.EventDataRoundState +var file_cometbft_types_v2_events_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_cometbft_types_v2_events_proto_goTypes = []interface{}{ + (*EventDataRoundState)(nil), // 0: cometbft.types.v2.EventDataRoundState } -var file_cometbft_types_v1_events_proto_depIdxs = []int32{ +var file_cometbft_types_v2_events_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -643,13 +643,13 @@ var file_cometbft_types_v1_events_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_cometbft_types_v1_events_proto_init() } -func file_cometbft_types_v1_events_proto_init() { - if File_cometbft_types_v1_events_proto != nil { +func init() { file_cometbft_types_v2_events_proto_init() } +func file_cometbft_types_v2_events_proto_init() { + if File_cometbft_types_v2_events_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_cometbft_types_v1_events_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_events_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EventDataRoundState); i { case 0: return &v.state @@ -666,18 +666,18 @@ func file_cometbft_types_v1_events_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_types_v1_events_proto_rawDesc, + RawDescriptor: file_cometbft_types_v2_events_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cometbft_types_v1_events_proto_goTypes, - DependencyIndexes: file_cometbft_types_v1_events_proto_depIdxs, - MessageInfos: file_cometbft_types_v1_events_proto_msgTypes, + GoTypes: file_cometbft_types_v2_events_proto_goTypes, + DependencyIndexes: file_cometbft_types_v2_events_proto_depIdxs, + MessageInfos: file_cometbft_types_v2_events_proto_msgTypes, }.Build() - File_cometbft_types_v1_events_proto = out.File - file_cometbft_types_v1_events_proto_rawDesc = nil - file_cometbft_types_v1_events_proto_goTypes = nil - file_cometbft_types_v1_events_proto_depIdxs = nil + File_cometbft_types_v2_events_proto = out.File + file_cometbft_types_v2_events_proto_rawDesc = nil + file_cometbft_types_v2_events_proto_goTypes = nil + file_cometbft_types_v2_events_proto_depIdxs = nil } diff --git a/api/cometbft/types/v1/evidence.pulsar.go b/api/cometbft/types/v2/evidence.pulsar.go similarity index 88% rename from api/cometbft/types/v1/evidence.pulsar.go rename to api/cometbft/types/v2/evidence.pulsar.go index af79c9ca2c..9c734673b2 100644 --- a/api/cometbft/types/v1/evidence.pulsar.go +++ b/api/cometbft/types/v2/evidence.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package typesv1 +package typesv2 import ( fmt "fmt" @@ -21,8 +21,8 @@ var ( ) func init() { - file_cometbft_types_v1_evidence_proto_init() - md_Evidence = File_cometbft_types_v1_evidence_proto.Messages().ByName("Evidence") + file_cometbft_types_v2_evidence_proto_init() + md_Evidence = File_cometbft_types_v2_evidence_proto.Messages().ByName("Evidence") fd_Evidence_duplicate_vote_evidence = md_Evidence.Fields().ByName("duplicate_vote_evidence") fd_Evidence_light_client_attack_evidence = md_Evidence.Fields().ByName("light_client_attack_evidence") } @@ -36,7 +36,7 @@ func (x *Evidence) ProtoReflect() protoreflect.Message { } func (x *Evidence) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_evidence_proto_msgTypes[0] + mi := &file_cometbft_types_v2_evidence_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -123,7 +123,7 @@ func (x *fastReflection_Evidence) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Evidence) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Evidence.duplicate_vote_evidence": + case "cometbft.types.v2.Evidence.duplicate_vote_evidence": if x.Sum == nil { return false } else if _, ok := x.Sum.(*Evidence_DuplicateVoteEvidence); ok { @@ -131,7 +131,7 @@ func (x *fastReflection_Evidence) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "cometbft.types.v1.Evidence.light_client_attack_evidence": + case "cometbft.types.v2.Evidence.light_client_attack_evidence": if x.Sum == nil { return false } else if _, ok := x.Sum.(*Evidence_LightClientAttackEvidence); ok { @@ -141,9 +141,9 @@ func (x *fastReflection_Evidence) Has(fd protoreflect.FieldDescriptor) bool { } default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Evidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Evidence")) } - panic(fmt.Errorf("message cometbft.types.v1.Evidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Evidence does not contain field %s", fd.FullName())) } } @@ -155,15 +155,15 @@ func (x *fastReflection_Evidence) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Evidence) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Evidence.duplicate_vote_evidence": + case "cometbft.types.v2.Evidence.duplicate_vote_evidence": x.Sum = nil - case "cometbft.types.v1.Evidence.light_client_attack_evidence": + case "cometbft.types.v2.Evidence.light_client_attack_evidence": x.Sum = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Evidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Evidence")) } - panic(fmt.Errorf("message cometbft.types.v1.Evidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Evidence does not contain field %s", fd.FullName())) } } @@ -175,7 +175,7 @@ func (x *fastReflection_Evidence) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Evidence) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Evidence.duplicate_vote_evidence": + case "cometbft.types.v2.Evidence.duplicate_vote_evidence": if x.Sum == nil { return protoreflect.ValueOfMessage((*DuplicateVoteEvidence)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*Evidence_DuplicateVoteEvidence); ok { @@ -183,7 +183,7 @@ func (x *fastReflection_Evidence) Get(descriptor protoreflect.FieldDescriptor) p } else { return protoreflect.ValueOfMessage((*DuplicateVoteEvidence)(nil).ProtoReflect()) } - case "cometbft.types.v1.Evidence.light_client_attack_evidence": + case "cometbft.types.v2.Evidence.light_client_attack_evidence": if x.Sum == nil { return protoreflect.ValueOfMessage((*LightClientAttackEvidence)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*Evidence_LightClientAttackEvidence); ok { @@ -193,9 +193,9 @@ func (x *fastReflection_Evidence) Get(descriptor protoreflect.FieldDescriptor) p } default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Evidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Evidence")) } - panic(fmt.Errorf("message cometbft.types.v1.Evidence does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Evidence does not contain field %s", descriptor.FullName())) } } @@ -211,17 +211,17 @@ func (x *fastReflection_Evidence) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Evidence) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Evidence.duplicate_vote_evidence": + case "cometbft.types.v2.Evidence.duplicate_vote_evidence": cv := value.Message().Interface().(*DuplicateVoteEvidence) x.Sum = &Evidence_DuplicateVoteEvidence{DuplicateVoteEvidence: cv} - case "cometbft.types.v1.Evidence.light_client_attack_evidence": + case "cometbft.types.v2.Evidence.light_client_attack_evidence": cv := value.Message().Interface().(*LightClientAttackEvidence) x.Sum = &Evidence_LightClientAttackEvidence{LightClientAttackEvidence: cv} default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Evidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Evidence")) } - panic(fmt.Errorf("message cometbft.types.v1.Evidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Evidence does not contain field %s", fd.FullName())) } } @@ -237,7 +237,7 @@ func (x *fastReflection_Evidence) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Evidence) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Evidence.duplicate_vote_evidence": + case "cometbft.types.v2.Evidence.duplicate_vote_evidence": if x.Sum == nil { value := &DuplicateVoteEvidence{} oneofValue := &Evidence_DuplicateVoteEvidence{DuplicateVoteEvidence: value} @@ -253,7 +253,7 @@ func (x *fastReflection_Evidence) Mutable(fd protoreflect.FieldDescriptor) proto x.Sum = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "cometbft.types.v1.Evidence.light_client_attack_evidence": + case "cometbft.types.v2.Evidence.light_client_attack_evidence": if x.Sum == nil { value := &LightClientAttackEvidence{} oneofValue := &Evidence_LightClientAttackEvidence{LightClientAttackEvidence: value} @@ -271,9 +271,9 @@ func (x *fastReflection_Evidence) Mutable(fd protoreflect.FieldDescriptor) proto } default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Evidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Evidence")) } - panic(fmt.Errorf("message cometbft.types.v1.Evidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Evidence does not contain field %s", fd.FullName())) } } @@ -282,17 +282,17 @@ func (x *fastReflection_Evidence) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Evidence) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Evidence.duplicate_vote_evidence": + case "cometbft.types.v2.Evidence.duplicate_vote_evidence": value := &DuplicateVoteEvidence{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Evidence.light_client_attack_evidence": + case "cometbft.types.v2.Evidence.light_client_attack_evidence": value := &LightClientAttackEvidence{} return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Evidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Evidence")) } - panic(fmt.Errorf("message cometbft.types.v1.Evidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Evidence does not contain field %s", fd.FullName())) } } @@ -301,7 +301,7 @@ func (x *fastReflection_Evidence) NewField(fd protoreflect.FieldDescriptor) prot // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_Evidence) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "cometbft.types.v1.Evidence.sum": + case "cometbft.types.v2.Evidence.sum": if x.Sum == nil { return nil } @@ -312,7 +312,7 @@ func (x *fastReflection_Evidence) WhichOneof(d protoreflect.OneofDescriptor) pro return x.Descriptor().Fields().ByName("light_client_attack_evidence") } default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Evidence", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Evidence", d.FullName())) } panic("unreachable") } @@ -602,8 +602,8 @@ var ( ) func init() { - file_cometbft_types_v1_evidence_proto_init() - md_DuplicateVoteEvidence = File_cometbft_types_v1_evidence_proto.Messages().ByName("DuplicateVoteEvidence") + file_cometbft_types_v2_evidence_proto_init() + md_DuplicateVoteEvidence = File_cometbft_types_v2_evidence_proto.Messages().ByName("DuplicateVoteEvidence") fd_DuplicateVoteEvidence_vote_a = md_DuplicateVoteEvidence.Fields().ByName("vote_a") fd_DuplicateVoteEvidence_vote_b = md_DuplicateVoteEvidence.Fields().ByName("vote_b") fd_DuplicateVoteEvidence_total_voting_power = md_DuplicateVoteEvidence.Fields().ByName("total_voting_power") @@ -620,7 +620,7 @@ func (x *DuplicateVoteEvidence) ProtoReflect() protoreflect.Message { } func (x *DuplicateVoteEvidence) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_evidence_proto_msgTypes[1] + mi := &file_cometbft_types_v2_evidence_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -721,21 +721,21 @@ func (x *fastReflection_DuplicateVoteEvidence) Range(f func(protoreflect.FieldDe // a repeated field is populated if it is non-empty. func (x *fastReflection_DuplicateVoteEvidence) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.DuplicateVoteEvidence.vote_a": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_a": return x.VoteA != nil - case "cometbft.types.v1.DuplicateVoteEvidence.vote_b": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_b": return x.VoteB != nil - case "cometbft.types.v1.DuplicateVoteEvidence.total_voting_power": + case "cometbft.types.v2.DuplicateVoteEvidence.total_voting_power": return x.TotalVotingPower != int64(0) - case "cometbft.types.v1.DuplicateVoteEvidence.validator_power": + case "cometbft.types.v2.DuplicateVoteEvidence.validator_power": return x.ValidatorPower != int64(0) - case "cometbft.types.v1.DuplicateVoteEvidence.timestamp": + case "cometbft.types.v2.DuplicateVoteEvidence.timestamp": return x.Timestamp != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.DuplicateVoteEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.DuplicateVoteEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.DuplicateVoteEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.DuplicateVoteEvidence does not contain field %s", fd.FullName())) } } @@ -747,21 +747,21 @@ func (x *fastReflection_DuplicateVoteEvidence) Has(fd protoreflect.FieldDescript // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_DuplicateVoteEvidence) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.DuplicateVoteEvidence.vote_a": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_a": x.VoteA = nil - case "cometbft.types.v1.DuplicateVoteEvidence.vote_b": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_b": x.VoteB = nil - case "cometbft.types.v1.DuplicateVoteEvidence.total_voting_power": + case "cometbft.types.v2.DuplicateVoteEvidence.total_voting_power": x.TotalVotingPower = int64(0) - case "cometbft.types.v1.DuplicateVoteEvidence.validator_power": + case "cometbft.types.v2.DuplicateVoteEvidence.validator_power": x.ValidatorPower = int64(0) - case "cometbft.types.v1.DuplicateVoteEvidence.timestamp": + case "cometbft.types.v2.DuplicateVoteEvidence.timestamp": x.Timestamp = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.DuplicateVoteEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.DuplicateVoteEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.DuplicateVoteEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.DuplicateVoteEvidence does not contain field %s", fd.FullName())) } } @@ -773,26 +773,26 @@ func (x *fastReflection_DuplicateVoteEvidence) Clear(fd protoreflect.FieldDescri // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_DuplicateVoteEvidence) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.DuplicateVoteEvidence.vote_a": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_a": value := x.VoteA return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.DuplicateVoteEvidence.vote_b": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_b": value := x.VoteB return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.DuplicateVoteEvidence.total_voting_power": + case "cometbft.types.v2.DuplicateVoteEvidence.total_voting_power": value := x.TotalVotingPower return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.DuplicateVoteEvidence.validator_power": + case "cometbft.types.v2.DuplicateVoteEvidence.validator_power": value := x.ValidatorPower return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.DuplicateVoteEvidence.timestamp": + case "cometbft.types.v2.DuplicateVoteEvidence.timestamp": value := x.Timestamp return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.DuplicateVoteEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.DuplicateVoteEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.DuplicateVoteEvidence does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.DuplicateVoteEvidence does not contain field %s", descriptor.FullName())) } } @@ -808,21 +808,21 @@ func (x *fastReflection_DuplicateVoteEvidence) Get(descriptor protoreflect.Field // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_DuplicateVoteEvidence) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.DuplicateVoteEvidence.vote_a": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_a": x.VoteA = value.Message().Interface().(*Vote) - case "cometbft.types.v1.DuplicateVoteEvidence.vote_b": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_b": x.VoteB = value.Message().Interface().(*Vote) - case "cometbft.types.v1.DuplicateVoteEvidence.total_voting_power": + case "cometbft.types.v2.DuplicateVoteEvidence.total_voting_power": x.TotalVotingPower = value.Int() - case "cometbft.types.v1.DuplicateVoteEvidence.validator_power": + case "cometbft.types.v2.DuplicateVoteEvidence.validator_power": x.ValidatorPower = value.Int() - case "cometbft.types.v1.DuplicateVoteEvidence.timestamp": + case "cometbft.types.v2.DuplicateVoteEvidence.timestamp": x.Timestamp = value.Message().Interface().(*timestamppb.Timestamp) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.DuplicateVoteEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.DuplicateVoteEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.DuplicateVoteEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.DuplicateVoteEvidence does not contain field %s", fd.FullName())) } } @@ -838,30 +838,30 @@ func (x *fastReflection_DuplicateVoteEvidence) Set(fd protoreflect.FieldDescript // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_DuplicateVoteEvidence) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.DuplicateVoteEvidence.vote_a": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_a": if x.VoteA == nil { x.VoteA = new(Vote) } return protoreflect.ValueOfMessage(x.VoteA.ProtoReflect()) - case "cometbft.types.v1.DuplicateVoteEvidence.vote_b": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_b": if x.VoteB == nil { x.VoteB = new(Vote) } return protoreflect.ValueOfMessage(x.VoteB.ProtoReflect()) - case "cometbft.types.v1.DuplicateVoteEvidence.timestamp": + case "cometbft.types.v2.DuplicateVoteEvidence.timestamp": if x.Timestamp == nil { x.Timestamp = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Timestamp.ProtoReflect()) - case "cometbft.types.v1.DuplicateVoteEvidence.total_voting_power": - panic(fmt.Errorf("field total_voting_power of message cometbft.types.v1.DuplicateVoteEvidence is not mutable")) - case "cometbft.types.v1.DuplicateVoteEvidence.validator_power": - panic(fmt.Errorf("field validator_power of message cometbft.types.v1.DuplicateVoteEvidence is not mutable")) + case "cometbft.types.v2.DuplicateVoteEvidence.total_voting_power": + panic(fmt.Errorf("field total_voting_power of message cometbft.types.v2.DuplicateVoteEvidence is not mutable")) + case "cometbft.types.v2.DuplicateVoteEvidence.validator_power": + panic(fmt.Errorf("field validator_power of message cometbft.types.v2.DuplicateVoteEvidence is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.DuplicateVoteEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.DuplicateVoteEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.DuplicateVoteEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.DuplicateVoteEvidence does not contain field %s", fd.FullName())) } } @@ -870,24 +870,24 @@ func (x *fastReflection_DuplicateVoteEvidence) Mutable(fd protoreflect.FieldDesc // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_DuplicateVoteEvidence) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.DuplicateVoteEvidence.vote_a": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_a": m := new(Vote) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.DuplicateVoteEvidence.vote_b": + case "cometbft.types.v2.DuplicateVoteEvidence.vote_b": m := new(Vote) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.DuplicateVoteEvidence.total_voting_power": + case "cometbft.types.v2.DuplicateVoteEvidence.total_voting_power": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.DuplicateVoteEvidence.validator_power": + case "cometbft.types.v2.DuplicateVoteEvidence.validator_power": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.DuplicateVoteEvidence.timestamp": + case "cometbft.types.v2.DuplicateVoteEvidence.timestamp": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.DuplicateVoteEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.DuplicateVoteEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.DuplicateVoteEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.DuplicateVoteEvidence does not contain field %s", fd.FullName())) } } @@ -897,7 +897,7 @@ func (x *fastReflection_DuplicateVoteEvidence) NewField(fd protoreflect.FieldDes func (x *fastReflection_DuplicateVoteEvidence) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.DuplicateVoteEvidence", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.DuplicateVoteEvidence", d.FullName())) } panic("unreachable") } @@ -1342,8 +1342,8 @@ var ( ) func init() { - file_cometbft_types_v1_evidence_proto_init() - md_LightClientAttackEvidence = File_cometbft_types_v1_evidence_proto.Messages().ByName("LightClientAttackEvidence") + file_cometbft_types_v2_evidence_proto_init() + md_LightClientAttackEvidence = File_cometbft_types_v2_evidence_proto.Messages().ByName("LightClientAttackEvidence") fd_LightClientAttackEvidence_conflicting_block = md_LightClientAttackEvidence.Fields().ByName("conflicting_block") fd_LightClientAttackEvidence_common_height = md_LightClientAttackEvidence.Fields().ByName("common_height") fd_LightClientAttackEvidence_byzantine_validators = md_LightClientAttackEvidence.Fields().ByName("byzantine_validators") @@ -1360,7 +1360,7 @@ func (x *LightClientAttackEvidence) ProtoReflect() protoreflect.Message { } func (x *LightClientAttackEvidence) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_evidence_proto_msgTypes[2] + mi := &file_cometbft_types_v2_evidence_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1461,21 +1461,21 @@ func (x *fastReflection_LightClientAttackEvidence) Range(f func(protoreflect.Fie // a repeated field is populated if it is non-empty. func (x *fastReflection_LightClientAttackEvidence) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.LightClientAttackEvidence.conflicting_block": + case "cometbft.types.v2.LightClientAttackEvidence.conflicting_block": return x.ConflictingBlock != nil - case "cometbft.types.v1.LightClientAttackEvidence.common_height": + case "cometbft.types.v2.LightClientAttackEvidence.common_height": return x.CommonHeight != int64(0) - case "cometbft.types.v1.LightClientAttackEvidence.byzantine_validators": + case "cometbft.types.v2.LightClientAttackEvidence.byzantine_validators": return len(x.ByzantineValidators) != 0 - case "cometbft.types.v1.LightClientAttackEvidence.total_voting_power": + case "cometbft.types.v2.LightClientAttackEvidence.total_voting_power": return x.TotalVotingPower != int64(0) - case "cometbft.types.v1.LightClientAttackEvidence.timestamp": + case "cometbft.types.v2.LightClientAttackEvidence.timestamp": return x.Timestamp != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightClientAttackEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightClientAttackEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.LightClientAttackEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightClientAttackEvidence does not contain field %s", fd.FullName())) } } @@ -1487,21 +1487,21 @@ func (x *fastReflection_LightClientAttackEvidence) Has(fd protoreflect.FieldDesc // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LightClientAttackEvidence) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.LightClientAttackEvidence.conflicting_block": + case "cometbft.types.v2.LightClientAttackEvidence.conflicting_block": x.ConflictingBlock = nil - case "cometbft.types.v1.LightClientAttackEvidence.common_height": + case "cometbft.types.v2.LightClientAttackEvidence.common_height": x.CommonHeight = int64(0) - case "cometbft.types.v1.LightClientAttackEvidence.byzantine_validators": + case "cometbft.types.v2.LightClientAttackEvidence.byzantine_validators": x.ByzantineValidators = nil - case "cometbft.types.v1.LightClientAttackEvidence.total_voting_power": + case "cometbft.types.v2.LightClientAttackEvidence.total_voting_power": x.TotalVotingPower = int64(0) - case "cometbft.types.v1.LightClientAttackEvidence.timestamp": + case "cometbft.types.v2.LightClientAttackEvidence.timestamp": x.Timestamp = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightClientAttackEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightClientAttackEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.LightClientAttackEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightClientAttackEvidence does not contain field %s", fd.FullName())) } } @@ -1513,29 +1513,29 @@ func (x *fastReflection_LightClientAttackEvidence) Clear(fd protoreflect.FieldDe // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_LightClientAttackEvidence) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.LightClientAttackEvidence.conflicting_block": + case "cometbft.types.v2.LightClientAttackEvidence.conflicting_block": value := x.ConflictingBlock return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.LightClientAttackEvidence.common_height": + case "cometbft.types.v2.LightClientAttackEvidence.common_height": value := x.CommonHeight return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.LightClientAttackEvidence.byzantine_validators": + case "cometbft.types.v2.LightClientAttackEvidence.byzantine_validators": if len(x.ByzantineValidators) == 0 { return protoreflect.ValueOfList(&_LightClientAttackEvidence_3_list{}) } listValue := &_LightClientAttackEvidence_3_list{list: &x.ByzantineValidators} return protoreflect.ValueOfList(listValue) - case "cometbft.types.v1.LightClientAttackEvidence.total_voting_power": + case "cometbft.types.v2.LightClientAttackEvidence.total_voting_power": value := x.TotalVotingPower return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.LightClientAttackEvidence.timestamp": + case "cometbft.types.v2.LightClientAttackEvidence.timestamp": value := x.Timestamp return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightClientAttackEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightClientAttackEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.LightClientAttackEvidence does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightClientAttackEvidence does not contain field %s", descriptor.FullName())) } } @@ -1551,23 +1551,23 @@ func (x *fastReflection_LightClientAttackEvidence) Get(descriptor protoreflect.F // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LightClientAttackEvidence) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.LightClientAttackEvidence.conflicting_block": + case "cometbft.types.v2.LightClientAttackEvidence.conflicting_block": x.ConflictingBlock = value.Message().Interface().(*LightBlock) - case "cometbft.types.v1.LightClientAttackEvidence.common_height": + case "cometbft.types.v2.LightClientAttackEvidence.common_height": x.CommonHeight = value.Int() - case "cometbft.types.v1.LightClientAttackEvidence.byzantine_validators": + case "cometbft.types.v2.LightClientAttackEvidence.byzantine_validators": lv := value.List() clv := lv.(*_LightClientAttackEvidence_3_list) x.ByzantineValidators = *clv.list - case "cometbft.types.v1.LightClientAttackEvidence.total_voting_power": + case "cometbft.types.v2.LightClientAttackEvidence.total_voting_power": x.TotalVotingPower = value.Int() - case "cometbft.types.v1.LightClientAttackEvidence.timestamp": + case "cometbft.types.v2.LightClientAttackEvidence.timestamp": x.Timestamp = value.Message().Interface().(*timestamppb.Timestamp) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightClientAttackEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightClientAttackEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.LightClientAttackEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightClientAttackEvidence does not contain field %s", fd.FullName())) } } @@ -1583,31 +1583,31 @@ func (x *fastReflection_LightClientAttackEvidence) Set(fd protoreflect.FieldDesc // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LightClientAttackEvidence) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.LightClientAttackEvidence.conflicting_block": + case "cometbft.types.v2.LightClientAttackEvidence.conflicting_block": if x.ConflictingBlock == nil { x.ConflictingBlock = new(LightBlock) } return protoreflect.ValueOfMessage(x.ConflictingBlock.ProtoReflect()) - case "cometbft.types.v1.LightClientAttackEvidence.byzantine_validators": + case "cometbft.types.v2.LightClientAttackEvidence.byzantine_validators": if x.ByzantineValidators == nil { x.ByzantineValidators = []*Validator{} } value := &_LightClientAttackEvidence_3_list{list: &x.ByzantineValidators} return protoreflect.ValueOfList(value) - case "cometbft.types.v1.LightClientAttackEvidence.timestamp": + case "cometbft.types.v2.LightClientAttackEvidence.timestamp": if x.Timestamp == nil { x.Timestamp = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Timestamp.ProtoReflect()) - case "cometbft.types.v1.LightClientAttackEvidence.common_height": - panic(fmt.Errorf("field common_height of message cometbft.types.v1.LightClientAttackEvidence is not mutable")) - case "cometbft.types.v1.LightClientAttackEvidence.total_voting_power": - panic(fmt.Errorf("field total_voting_power of message cometbft.types.v1.LightClientAttackEvidence is not mutable")) + case "cometbft.types.v2.LightClientAttackEvidence.common_height": + panic(fmt.Errorf("field common_height of message cometbft.types.v2.LightClientAttackEvidence is not mutable")) + case "cometbft.types.v2.LightClientAttackEvidence.total_voting_power": + panic(fmt.Errorf("field total_voting_power of message cometbft.types.v2.LightClientAttackEvidence is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightClientAttackEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightClientAttackEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.LightClientAttackEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightClientAttackEvidence does not contain field %s", fd.FullName())) } } @@ -1616,24 +1616,24 @@ func (x *fastReflection_LightClientAttackEvidence) Mutable(fd protoreflect.Field // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_LightClientAttackEvidence) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.LightClientAttackEvidence.conflicting_block": + case "cometbft.types.v2.LightClientAttackEvidence.conflicting_block": m := new(LightBlock) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.LightClientAttackEvidence.common_height": + case "cometbft.types.v2.LightClientAttackEvidence.common_height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.LightClientAttackEvidence.byzantine_validators": + case "cometbft.types.v2.LightClientAttackEvidence.byzantine_validators": list := []*Validator{} return protoreflect.ValueOfList(&_LightClientAttackEvidence_3_list{list: &list}) - case "cometbft.types.v1.LightClientAttackEvidence.total_voting_power": + case "cometbft.types.v2.LightClientAttackEvidence.total_voting_power": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.LightClientAttackEvidence.timestamp": + case "cometbft.types.v2.LightClientAttackEvidence.timestamp": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightClientAttackEvidence")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightClientAttackEvidence")) } - panic(fmt.Errorf("message cometbft.types.v1.LightClientAttackEvidence does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightClientAttackEvidence does not contain field %s", fd.FullName())) } } @@ -1643,7 +1643,7 @@ func (x *fastReflection_LightClientAttackEvidence) NewField(fd protoreflect.Fiel func (x *fastReflection_LightClientAttackEvidence) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.LightClientAttackEvidence", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.LightClientAttackEvidence", d.FullName())) } panic("unreachable") } @@ -2086,8 +2086,8 @@ var ( ) func init() { - file_cometbft_types_v1_evidence_proto_init() - md_EvidenceList = File_cometbft_types_v1_evidence_proto.Messages().ByName("EvidenceList") + file_cometbft_types_v2_evidence_proto_init() + md_EvidenceList = File_cometbft_types_v2_evidence_proto.Messages().ByName("EvidenceList") fd_EvidenceList_evidence = md_EvidenceList.Fields().ByName("evidence") } @@ -2100,7 +2100,7 @@ func (x *EvidenceList) ProtoReflect() protoreflect.Message { } func (x *EvidenceList) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_evidence_proto_msgTypes[3] + mi := &file_cometbft_types_v2_evidence_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2177,13 +2177,13 @@ func (x *fastReflection_EvidenceList) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_EvidenceList) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.EvidenceList.evidence": + case "cometbft.types.v2.EvidenceList.evidence": return len(x.Evidence) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceList")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceList")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceList does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceList does not contain field %s", fd.FullName())) } } @@ -2195,13 +2195,13 @@ func (x *fastReflection_EvidenceList) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EvidenceList) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.EvidenceList.evidence": + case "cometbft.types.v2.EvidenceList.evidence": x.Evidence = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceList")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceList")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceList does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceList does not contain field %s", fd.FullName())) } } @@ -2213,7 +2213,7 @@ func (x *fastReflection_EvidenceList) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_EvidenceList) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.EvidenceList.evidence": + case "cometbft.types.v2.EvidenceList.evidence": if len(x.Evidence) == 0 { return protoreflect.ValueOfList(&_EvidenceList_1_list{}) } @@ -2221,9 +2221,9 @@ func (x *fastReflection_EvidenceList) Get(descriptor protoreflect.FieldDescripto return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceList")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceList")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceList does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceList does not contain field %s", descriptor.FullName())) } } @@ -2239,15 +2239,15 @@ func (x *fastReflection_EvidenceList) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EvidenceList) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.EvidenceList.evidence": + case "cometbft.types.v2.EvidenceList.evidence": lv := value.List() clv := lv.(*_EvidenceList_1_list) x.Evidence = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceList")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceList")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceList does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceList does not contain field %s", fd.FullName())) } } @@ -2263,7 +2263,7 @@ func (x *fastReflection_EvidenceList) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EvidenceList) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.EvidenceList.evidence": + case "cometbft.types.v2.EvidenceList.evidence": if x.Evidence == nil { x.Evidence = []*Evidence{} } @@ -2271,9 +2271,9 @@ func (x *fastReflection_EvidenceList) Mutable(fd protoreflect.FieldDescriptor) p return protoreflect.ValueOfList(value) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceList")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceList")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceList does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceList does not contain field %s", fd.FullName())) } } @@ -2282,14 +2282,14 @@ func (x *fastReflection_EvidenceList) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_EvidenceList) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.EvidenceList.evidence": + case "cometbft.types.v2.EvidenceList.evidence": list := []*Evidence{} return protoreflect.ValueOfList(&_EvidenceList_1_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceList")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceList")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceList does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceList does not contain field %s", fd.FullName())) } } @@ -2299,7 +2299,7 @@ func (x *fastReflection_EvidenceList) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_EvidenceList) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.EvidenceList", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.EvidenceList", d.FullName())) } panic("unreachable") } @@ -2527,7 +2527,7 @@ func (x *fastReflection_EvidenceList) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/types/v1/evidence.proto +// source: cometbft/types/v2/evidence.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -2554,7 +2554,7 @@ type Evidence struct { func (x *Evidence) Reset() { *x = Evidence{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_evidence_proto_msgTypes[0] + mi := &file_cometbft_types_v2_evidence_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2568,7 +2568,7 @@ func (*Evidence) ProtoMessage() {} // Deprecated: Use Evidence.ProtoReflect.Descriptor instead. func (*Evidence) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_evidence_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_evidence_proto_rawDescGZIP(), []int{0} } func (x *Evidence) GetSum() isEvidence_Sum { @@ -2624,7 +2624,7 @@ type DuplicateVoteEvidence struct { func (x *DuplicateVoteEvidence) Reset() { *x = DuplicateVoteEvidence{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_evidence_proto_msgTypes[1] + mi := &file_cometbft_types_v2_evidence_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2638,7 +2638,7 @@ func (*DuplicateVoteEvidence) ProtoMessage() {} // Deprecated: Use DuplicateVoteEvidence.ProtoReflect.Descriptor instead. func (*DuplicateVoteEvidence) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_evidence_proto_rawDescGZIP(), []int{1} + return file_cometbft_types_v2_evidence_proto_rawDescGZIP(), []int{1} } func (x *DuplicateVoteEvidence) GetVoteA() *Vote { @@ -2692,7 +2692,7 @@ type LightClientAttackEvidence struct { func (x *LightClientAttackEvidence) Reset() { *x = LightClientAttackEvidence{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_evidence_proto_msgTypes[2] + mi := &file_cometbft_types_v2_evidence_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2706,7 +2706,7 @@ func (*LightClientAttackEvidence) ProtoMessage() {} // Deprecated: Use LightClientAttackEvidence.ProtoReflect.Descriptor instead. func (*LightClientAttackEvidence) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_evidence_proto_rawDescGZIP(), []int{2} + return file_cometbft_types_v2_evidence_proto_rawDescGZIP(), []int{2} } func (x *LightClientAttackEvidence) GetConflictingBlock() *LightBlock { @@ -2756,7 +2756,7 @@ type EvidenceList struct { func (x *EvidenceList) Reset() { *x = EvidenceList{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_evidence_proto_msgTypes[3] + mi := &file_cometbft_types_v2_evidence_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2770,7 +2770,7 @@ func (*EvidenceList) ProtoMessage() {} // Deprecated: Use EvidenceList.ProtoReflect.Descriptor instead. func (*EvidenceList) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_evidence_proto_rawDescGZIP(), []int{3} + return file_cometbft_types_v2_evidence_proto_rawDescGZIP(), []int{3} } func (x *EvidenceList) GetEvidence() []*Evidence { @@ -2780,16 +2780,16 @@ func (x *EvidenceList) GetEvidence() []*Evidence { return nil } -var File_cometbft_types_v1_evidence_proto protoreflect.FileDescriptor +var File_cometbft_types_v2_evidence_proto protoreflect.FileDescriptor -var file_cometbft_types_v1_evidence_proto_rawDesc = []byte{ +var file_cometbft_types_v2_evidence_proto_rawDesc = []byte{ 0x0a, 0x20, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x2f, 0x76, 0x32, 0x2f, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x76, 0x31, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, + 0x65, 0x73, 0x2e, 0x76, 0x32, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, + 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, @@ -2797,14 +2797,14 @@ var file_cometbft_types_v1_evidence_proto_rawDesc = []byte{ 0x01, 0x0a, 0x08, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x62, 0x0a, 0x17, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x15, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x6f, 0x0a, 0x1c, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x5f, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x43, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x19, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, @@ -2812,10 +2812,10 @@ var file_cometbft_types_v1_evidence_proto_rawDesc = []byte{ 0x69, 0x63, 0x61, 0x74, 0x65, 0x56, 0x6f, 0x74, 0x65, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x06, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x05, 0x76, 0x6f, 0x74, 0x65, + 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x05, 0x76, 0x6f, 0x74, 0x65, 0x41, 0x12, 0x2e, 0x0a, 0x06, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x05, 0x76, 0x6f, 0x74, 0x65, + 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x6f, 0x74, 0x65, 0x52, 0x05, 0x76, 0x6f, 0x74, 0x65, 0x42, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x76, 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x56, 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x12, @@ -2830,14 +2830,14 @@ var file_cometbft_types_v1_evidence_proto_rawDesc = []byte{ 0x63, 0x6b, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x4a, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x42, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x4f, 0x0a, 0x14, 0x62, 0x79, 0x7a, 0x61, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, + 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x13, 0x62, 0x79, 0x7a, 0x61, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x76, 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x77, @@ -2850,55 +2850,55 @@ var file_cometbft_types_v1_evidence_proto_rawDesc = []byte{ 0x0a, 0x0c, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x42, 0x04, 0xc8, + 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x42, 0xb8, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x0d, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x42, 0x0d, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x31, 0xca, 0x02, + 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x3b, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, - 0x56, 0x31, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, - 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x56, 0x32, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, + 0x70, 0x65, 0x73, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, 0x3a, 0x54, - 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_cometbft_types_v1_evidence_proto_rawDescOnce sync.Once - file_cometbft_types_v1_evidence_proto_rawDescData = file_cometbft_types_v1_evidence_proto_rawDesc + file_cometbft_types_v2_evidence_proto_rawDescOnce sync.Once + file_cometbft_types_v2_evidence_proto_rawDescData = file_cometbft_types_v2_evidence_proto_rawDesc ) -func file_cometbft_types_v1_evidence_proto_rawDescGZIP() []byte { - file_cometbft_types_v1_evidence_proto_rawDescOnce.Do(func() { - file_cometbft_types_v1_evidence_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v1_evidence_proto_rawDescData) +func file_cometbft_types_v2_evidence_proto_rawDescGZIP() []byte { + file_cometbft_types_v2_evidence_proto_rawDescOnce.Do(func() { + file_cometbft_types_v2_evidence_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v2_evidence_proto_rawDescData) }) - return file_cometbft_types_v1_evidence_proto_rawDescData + return file_cometbft_types_v2_evidence_proto_rawDescData } -var file_cometbft_types_v1_evidence_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_cometbft_types_v1_evidence_proto_goTypes = []interface{}{ - (*Evidence)(nil), // 0: cometbft.types.v1.Evidence - (*DuplicateVoteEvidence)(nil), // 1: cometbft.types.v1.DuplicateVoteEvidence - (*LightClientAttackEvidence)(nil), // 2: cometbft.types.v1.LightClientAttackEvidence - (*EvidenceList)(nil), // 3: cometbft.types.v1.EvidenceList - (*Vote)(nil), // 4: cometbft.types.v1.Vote +var file_cometbft_types_v2_evidence_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_cometbft_types_v2_evidence_proto_goTypes = []interface{}{ + (*Evidence)(nil), // 0: cometbft.types.v2.Evidence + (*DuplicateVoteEvidence)(nil), // 1: cometbft.types.v2.DuplicateVoteEvidence + (*LightClientAttackEvidence)(nil), // 2: cometbft.types.v2.LightClientAttackEvidence + (*EvidenceList)(nil), // 3: cometbft.types.v2.EvidenceList + (*Vote)(nil), // 4: cometbft.types.v2.Vote (*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp - (*LightBlock)(nil), // 6: cometbft.types.v1.LightBlock - (*Validator)(nil), // 7: cometbft.types.v1.Validator + (*LightBlock)(nil), // 6: cometbft.types.v2.LightBlock + (*Validator)(nil), // 7: cometbft.types.v2.Validator } -var file_cometbft_types_v1_evidence_proto_depIdxs = []int32{ - 1, // 0: cometbft.types.v1.Evidence.duplicate_vote_evidence:type_name -> cometbft.types.v1.DuplicateVoteEvidence - 2, // 1: cometbft.types.v1.Evidence.light_client_attack_evidence:type_name -> cometbft.types.v1.LightClientAttackEvidence - 4, // 2: cometbft.types.v1.DuplicateVoteEvidence.vote_a:type_name -> cometbft.types.v1.Vote - 4, // 3: cometbft.types.v1.DuplicateVoteEvidence.vote_b:type_name -> cometbft.types.v1.Vote - 5, // 4: cometbft.types.v1.DuplicateVoteEvidence.timestamp:type_name -> google.protobuf.Timestamp - 6, // 5: cometbft.types.v1.LightClientAttackEvidence.conflicting_block:type_name -> cometbft.types.v1.LightBlock - 7, // 6: cometbft.types.v1.LightClientAttackEvidence.byzantine_validators:type_name -> cometbft.types.v1.Validator - 5, // 7: cometbft.types.v1.LightClientAttackEvidence.timestamp:type_name -> google.protobuf.Timestamp - 0, // 8: cometbft.types.v1.EvidenceList.evidence:type_name -> cometbft.types.v1.Evidence +var file_cometbft_types_v2_evidence_proto_depIdxs = []int32{ + 1, // 0: cometbft.types.v2.Evidence.duplicate_vote_evidence:type_name -> cometbft.types.v2.DuplicateVoteEvidence + 2, // 1: cometbft.types.v2.Evidence.light_client_attack_evidence:type_name -> cometbft.types.v2.LightClientAttackEvidence + 4, // 2: cometbft.types.v2.DuplicateVoteEvidence.vote_a:type_name -> cometbft.types.v2.Vote + 4, // 3: cometbft.types.v2.DuplicateVoteEvidence.vote_b:type_name -> cometbft.types.v2.Vote + 5, // 4: cometbft.types.v2.DuplicateVoteEvidence.timestamp:type_name -> google.protobuf.Timestamp + 6, // 5: cometbft.types.v2.LightClientAttackEvidence.conflicting_block:type_name -> cometbft.types.v2.LightBlock + 7, // 6: cometbft.types.v2.LightClientAttackEvidence.byzantine_validators:type_name -> cometbft.types.v2.Validator + 5, // 7: cometbft.types.v2.LightClientAttackEvidence.timestamp:type_name -> google.protobuf.Timestamp + 0, // 8: cometbft.types.v2.EvidenceList.evidence:type_name -> cometbft.types.v2.Evidence 9, // [9:9] is the sub-list for method output_type 9, // [9:9] is the sub-list for method input_type 9, // [9:9] is the sub-list for extension type_name @@ -2906,15 +2906,15 @@ var file_cometbft_types_v1_evidence_proto_depIdxs = []int32{ 0, // [0:9] is the sub-list for field type_name } -func init() { file_cometbft_types_v1_evidence_proto_init() } -func file_cometbft_types_v1_evidence_proto_init() { - if File_cometbft_types_v1_evidence_proto != nil { +func init() { file_cometbft_types_v2_evidence_proto_init() } +func file_cometbft_types_v2_evidence_proto_init() { + if File_cometbft_types_v2_evidence_proto != nil { return } - file_cometbft_types_v1_types_proto_init() - file_cometbft_types_v1_validator_proto_init() + file_cometbft_types_v2_types_proto_init() + file_cometbft_types_v2_validator_proto_init() if !protoimpl.UnsafeEnabled { - file_cometbft_types_v1_evidence_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_evidence_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Evidence); i { case 0: return &v.state @@ -2926,7 +2926,7 @@ func file_cometbft_types_v1_evidence_proto_init() { return nil } } - file_cometbft_types_v1_evidence_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_evidence_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DuplicateVoteEvidence); i { case 0: return &v.state @@ -2938,7 +2938,7 @@ func file_cometbft_types_v1_evidence_proto_init() { return nil } } - file_cometbft_types_v1_evidence_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_evidence_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LightClientAttackEvidence); i { case 0: return &v.state @@ -2950,7 +2950,7 @@ func file_cometbft_types_v1_evidence_proto_init() { return nil } } - file_cometbft_types_v1_evidence_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_evidence_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EvidenceList); i { case 0: return &v.state @@ -2963,7 +2963,7 @@ func file_cometbft_types_v1_evidence_proto_init() { } } } - file_cometbft_types_v1_evidence_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_cometbft_types_v2_evidence_proto_msgTypes[0].OneofWrappers = []interface{}{ (*Evidence_DuplicateVoteEvidence)(nil), (*Evidence_LightClientAttackEvidence)(nil), } @@ -2971,18 +2971,18 @@ func file_cometbft_types_v1_evidence_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_types_v1_evidence_proto_rawDesc, + RawDescriptor: file_cometbft_types_v2_evidence_proto_rawDesc, NumEnums: 0, NumMessages: 4, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cometbft_types_v1_evidence_proto_goTypes, - DependencyIndexes: file_cometbft_types_v1_evidence_proto_depIdxs, - MessageInfos: file_cometbft_types_v1_evidence_proto_msgTypes, + GoTypes: file_cometbft_types_v2_evidence_proto_goTypes, + DependencyIndexes: file_cometbft_types_v2_evidence_proto_depIdxs, + MessageInfos: file_cometbft_types_v2_evidence_proto_msgTypes, }.Build() - File_cometbft_types_v1_evidence_proto = out.File - file_cometbft_types_v1_evidence_proto_rawDesc = nil - file_cometbft_types_v1_evidence_proto_goTypes = nil - file_cometbft_types_v1_evidence_proto_depIdxs = nil + File_cometbft_types_v2_evidence_proto = out.File + file_cometbft_types_v2_evidence_proto_rawDesc = nil + file_cometbft_types_v2_evidence_proto_goTypes = nil + file_cometbft_types_v2_evidence_proto_depIdxs = nil } diff --git a/api/cometbft/types/v1/params.pulsar.go b/api/cometbft/types/v2/params.pulsar.go similarity index 90% rename from api/cometbft/types/v1/params.pulsar.go rename to api/cometbft/types/v2/params.pulsar.go index 01e0095539..5770f85a31 100644 --- a/api/cometbft/types/v1/params.pulsar.go +++ b/api/cometbft/types/v2/params.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package typesv1 +package typesv2 import ( fmt "fmt" @@ -27,8 +27,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_ConsensusParams = File_cometbft_types_v1_params_proto.Messages().ByName("ConsensusParams") + file_cometbft_types_v2_params_proto_init() + md_ConsensusParams = File_cometbft_types_v2_params_proto.Messages().ByName("ConsensusParams") fd_ConsensusParams_block = md_ConsensusParams.Fields().ByName("block") fd_ConsensusParams_evidence = md_ConsensusParams.Fields().ByName("evidence") fd_ConsensusParams_validator = md_ConsensusParams.Fields().ByName("validator") @@ -47,7 +47,7 @@ func (x *ConsensusParams) ProtoReflect() protoreflect.Message { } func (x *ConsensusParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[0] + mi := &file_cometbft_types_v2_params_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -160,25 +160,25 @@ func (x *fastReflection_ConsensusParams) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_ConsensusParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.ConsensusParams.block": + case "cometbft.types.v2.ConsensusParams.block": return x.Block != nil - case "cometbft.types.v1.ConsensusParams.evidence": + case "cometbft.types.v2.ConsensusParams.evidence": return x.Evidence != nil - case "cometbft.types.v1.ConsensusParams.validator": + case "cometbft.types.v2.ConsensusParams.validator": return x.Validator != nil - case "cometbft.types.v1.ConsensusParams.version": + case "cometbft.types.v2.ConsensusParams.version": return x.Version != nil - case "cometbft.types.v1.ConsensusParams.abci": + case "cometbft.types.v2.ConsensusParams.abci": return x.Abci != nil - case "cometbft.types.v1.ConsensusParams.synchrony": + case "cometbft.types.v2.ConsensusParams.synchrony": return x.Synchrony != nil - case "cometbft.types.v1.ConsensusParams.feature": + case "cometbft.types.v2.ConsensusParams.feature": return x.Feature != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ConsensusParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ConsensusParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ConsensusParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ConsensusParams does not contain field %s", fd.FullName())) } } @@ -190,25 +190,25 @@ func (x *fastReflection_ConsensusParams) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ConsensusParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.ConsensusParams.block": + case "cometbft.types.v2.ConsensusParams.block": x.Block = nil - case "cometbft.types.v1.ConsensusParams.evidence": + case "cometbft.types.v2.ConsensusParams.evidence": x.Evidence = nil - case "cometbft.types.v1.ConsensusParams.validator": + case "cometbft.types.v2.ConsensusParams.validator": x.Validator = nil - case "cometbft.types.v1.ConsensusParams.version": + case "cometbft.types.v2.ConsensusParams.version": x.Version = nil - case "cometbft.types.v1.ConsensusParams.abci": + case "cometbft.types.v2.ConsensusParams.abci": x.Abci = nil - case "cometbft.types.v1.ConsensusParams.synchrony": + case "cometbft.types.v2.ConsensusParams.synchrony": x.Synchrony = nil - case "cometbft.types.v1.ConsensusParams.feature": + case "cometbft.types.v2.ConsensusParams.feature": x.Feature = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ConsensusParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ConsensusParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ConsensusParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ConsensusParams does not contain field %s", fd.FullName())) } } @@ -220,32 +220,32 @@ func (x *fastReflection_ConsensusParams) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ConsensusParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.ConsensusParams.block": + case "cometbft.types.v2.ConsensusParams.block": value := x.Block return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.evidence": + case "cometbft.types.v2.ConsensusParams.evidence": value := x.Evidence return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.validator": + case "cometbft.types.v2.ConsensusParams.validator": value := x.Validator return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.version": + case "cometbft.types.v2.ConsensusParams.version": value := x.Version return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.abci": + case "cometbft.types.v2.ConsensusParams.abci": value := x.Abci return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.synchrony": + case "cometbft.types.v2.ConsensusParams.synchrony": value := x.Synchrony return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.feature": + case "cometbft.types.v2.ConsensusParams.feature": value := x.Feature return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ConsensusParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ConsensusParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ConsensusParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ConsensusParams does not contain field %s", descriptor.FullName())) } } @@ -261,25 +261,25 @@ func (x *fastReflection_ConsensusParams) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ConsensusParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.ConsensusParams.block": + case "cometbft.types.v2.ConsensusParams.block": x.Block = value.Message().Interface().(*BlockParams) - case "cometbft.types.v1.ConsensusParams.evidence": + case "cometbft.types.v2.ConsensusParams.evidence": x.Evidence = value.Message().Interface().(*EvidenceParams) - case "cometbft.types.v1.ConsensusParams.validator": + case "cometbft.types.v2.ConsensusParams.validator": x.Validator = value.Message().Interface().(*ValidatorParams) - case "cometbft.types.v1.ConsensusParams.version": + case "cometbft.types.v2.ConsensusParams.version": x.Version = value.Message().Interface().(*VersionParams) - case "cometbft.types.v1.ConsensusParams.abci": + case "cometbft.types.v2.ConsensusParams.abci": x.Abci = value.Message().Interface().(*ABCIParams) - case "cometbft.types.v1.ConsensusParams.synchrony": + case "cometbft.types.v2.ConsensusParams.synchrony": x.Synchrony = value.Message().Interface().(*SynchronyParams) - case "cometbft.types.v1.ConsensusParams.feature": + case "cometbft.types.v2.ConsensusParams.feature": x.Feature = value.Message().Interface().(*FeatureParams) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ConsensusParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ConsensusParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ConsensusParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ConsensusParams does not contain field %s", fd.FullName())) } } @@ -295,46 +295,46 @@ func (x *fastReflection_ConsensusParams) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ConsensusParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ConsensusParams.block": + case "cometbft.types.v2.ConsensusParams.block": if x.Block == nil { x.Block = new(BlockParams) } return protoreflect.ValueOfMessage(x.Block.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.evidence": + case "cometbft.types.v2.ConsensusParams.evidence": if x.Evidence == nil { x.Evidence = new(EvidenceParams) } return protoreflect.ValueOfMessage(x.Evidence.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.validator": + case "cometbft.types.v2.ConsensusParams.validator": if x.Validator == nil { x.Validator = new(ValidatorParams) } return protoreflect.ValueOfMessage(x.Validator.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.version": + case "cometbft.types.v2.ConsensusParams.version": if x.Version == nil { x.Version = new(VersionParams) } return protoreflect.ValueOfMessage(x.Version.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.abci": + case "cometbft.types.v2.ConsensusParams.abci": if x.Abci == nil { x.Abci = new(ABCIParams) } return protoreflect.ValueOfMessage(x.Abci.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.synchrony": + case "cometbft.types.v2.ConsensusParams.synchrony": if x.Synchrony == nil { x.Synchrony = new(SynchronyParams) } return protoreflect.ValueOfMessage(x.Synchrony.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.feature": + case "cometbft.types.v2.ConsensusParams.feature": if x.Feature == nil { x.Feature = new(FeatureParams) } return protoreflect.ValueOfMessage(x.Feature.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ConsensusParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ConsensusParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ConsensusParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ConsensusParams does not contain field %s", fd.FullName())) } } @@ -343,32 +343,32 @@ func (x *fastReflection_ConsensusParams) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ConsensusParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ConsensusParams.block": + case "cometbft.types.v2.ConsensusParams.block": m := new(BlockParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.evidence": + case "cometbft.types.v2.ConsensusParams.evidence": m := new(EvidenceParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.validator": + case "cometbft.types.v2.ConsensusParams.validator": m := new(ValidatorParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.version": + case "cometbft.types.v2.ConsensusParams.version": m := new(VersionParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.abci": + case "cometbft.types.v2.ConsensusParams.abci": m := new(ABCIParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.synchrony": + case "cometbft.types.v2.ConsensusParams.synchrony": m := new(SynchronyParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ConsensusParams.feature": + case "cometbft.types.v2.ConsensusParams.feature": m := new(FeatureParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ConsensusParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ConsensusParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ConsensusParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ConsensusParams does not contain field %s", fd.FullName())) } } @@ -378,7 +378,7 @@ func (x *fastReflection_ConsensusParams) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_ConsensusParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.ConsensusParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.ConsensusParams", d.FullName())) } panic("unreachable") } @@ -931,8 +931,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_BlockParams = File_cometbft_types_v1_params_proto.Messages().ByName("BlockParams") + file_cometbft_types_v2_params_proto_init() + md_BlockParams = File_cometbft_types_v2_params_proto.Messages().ByName("BlockParams") fd_BlockParams_max_bytes = md_BlockParams.Fields().ByName("max_bytes") fd_BlockParams_max_gas = md_BlockParams.Fields().ByName("max_gas") } @@ -946,7 +946,7 @@ func (x *BlockParams) ProtoReflect() protoreflect.Message { } func (x *BlockParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[1] + mi := &file_cometbft_types_v2_params_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1029,15 +1029,15 @@ func (x *fastReflection_BlockParams) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_BlockParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.BlockParams.max_bytes": + case "cometbft.types.v2.BlockParams.max_bytes": return x.MaxBytes != int64(0) - case "cometbft.types.v1.BlockParams.max_gas": + case "cometbft.types.v2.BlockParams.max_gas": return x.MaxGas != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockParams")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockParams does not contain field %s", fd.FullName())) } } @@ -1049,15 +1049,15 @@ func (x *fastReflection_BlockParams) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.BlockParams.max_bytes": + case "cometbft.types.v2.BlockParams.max_bytes": x.MaxBytes = int64(0) - case "cometbft.types.v1.BlockParams.max_gas": + case "cometbft.types.v2.BlockParams.max_gas": x.MaxGas = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockParams")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockParams does not contain field %s", fd.FullName())) } } @@ -1069,17 +1069,17 @@ func (x *fastReflection_BlockParams) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_BlockParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.BlockParams.max_bytes": + case "cometbft.types.v2.BlockParams.max_bytes": value := x.MaxBytes return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.BlockParams.max_gas": + case "cometbft.types.v2.BlockParams.max_gas": value := x.MaxGas return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockParams")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockParams does not contain field %s", descriptor.FullName())) } } @@ -1095,15 +1095,15 @@ func (x *fastReflection_BlockParams) Get(descriptor protoreflect.FieldDescriptor // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.BlockParams.max_bytes": + case "cometbft.types.v2.BlockParams.max_bytes": x.MaxBytes = value.Int() - case "cometbft.types.v1.BlockParams.max_gas": + case "cometbft.types.v2.BlockParams.max_gas": x.MaxGas = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockParams")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockParams does not contain field %s", fd.FullName())) } } @@ -1119,15 +1119,15 @@ func (x *fastReflection_BlockParams) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.BlockParams.max_bytes": - panic(fmt.Errorf("field max_bytes of message cometbft.types.v1.BlockParams is not mutable")) - case "cometbft.types.v1.BlockParams.max_gas": - panic(fmt.Errorf("field max_gas of message cometbft.types.v1.BlockParams is not mutable")) + case "cometbft.types.v2.BlockParams.max_bytes": + panic(fmt.Errorf("field max_bytes of message cometbft.types.v2.BlockParams is not mutable")) + case "cometbft.types.v2.BlockParams.max_gas": + panic(fmt.Errorf("field max_gas of message cometbft.types.v2.BlockParams is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockParams")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockParams does not contain field %s", fd.FullName())) } } @@ -1136,15 +1136,15 @@ func (x *fastReflection_BlockParams) Mutable(fd protoreflect.FieldDescriptor) pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_BlockParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.BlockParams.max_bytes": + case "cometbft.types.v2.BlockParams.max_bytes": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.BlockParams.max_gas": + case "cometbft.types.v2.BlockParams.max_gas": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockParams")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockParams does not contain field %s", fd.FullName())) } } @@ -1154,7 +1154,7 @@ func (x *fastReflection_BlockParams) NewField(fd protoreflect.FieldDescriptor) p func (x *fastReflection_BlockParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.BlockParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.BlockParams", d.FullName())) } panic("unreachable") } @@ -1384,8 +1384,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_EvidenceParams = File_cometbft_types_v1_params_proto.Messages().ByName("EvidenceParams") + file_cometbft_types_v2_params_proto_init() + md_EvidenceParams = File_cometbft_types_v2_params_proto.Messages().ByName("EvidenceParams") fd_EvidenceParams_max_age_num_blocks = md_EvidenceParams.Fields().ByName("max_age_num_blocks") fd_EvidenceParams_max_age_duration = md_EvidenceParams.Fields().ByName("max_age_duration") fd_EvidenceParams_max_bytes = md_EvidenceParams.Fields().ByName("max_bytes") @@ -1400,7 +1400,7 @@ func (x *EvidenceParams) ProtoReflect() protoreflect.Message { } func (x *EvidenceParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[2] + mi := &file_cometbft_types_v2_params_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1489,17 +1489,17 @@ func (x *fastReflection_EvidenceParams) Range(f func(protoreflect.FieldDescripto // a repeated field is populated if it is non-empty. func (x *fastReflection_EvidenceParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.EvidenceParams.max_age_num_blocks": + case "cometbft.types.v2.EvidenceParams.max_age_num_blocks": return x.MaxAgeNumBlocks != int64(0) - case "cometbft.types.v1.EvidenceParams.max_age_duration": + case "cometbft.types.v2.EvidenceParams.max_age_duration": return x.MaxAgeDuration != nil - case "cometbft.types.v1.EvidenceParams.max_bytes": + case "cometbft.types.v2.EvidenceParams.max_bytes": return x.MaxBytes != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceParams")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceParams does not contain field %s", fd.FullName())) } } @@ -1511,17 +1511,17 @@ func (x *fastReflection_EvidenceParams) Has(fd protoreflect.FieldDescriptor) boo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EvidenceParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.EvidenceParams.max_age_num_blocks": + case "cometbft.types.v2.EvidenceParams.max_age_num_blocks": x.MaxAgeNumBlocks = int64(0) - case "cometbft.types.v1.EvidenceParams.max_age_duration": + case "cometbft.types.v2.EvidenceParams.max_age_duration": x.MaxAgeDuration = nil - case "cometbft.types.v1.EvidenceParams.max_bytes": + case "cometbft.types.v2.EvidenceParams.max_bytes": x.MaxBytes = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceParams")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceParams does not contain field %s", fd.FullName())) } } @@ -1533,20 +1533,20 @@ func (x *fastReflection_EvidenceParams) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_EvidenceParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.EvidenceParams.max_age_num_blocks": + case "cometbft.types.v2.EvidenceParams.max_age_num_blocks": value := x.MaxAgeNumBlocks return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.EvidenceParams.max_age_duration": + case "cometbft.types.v2.EvidenceParams.max_age_duration": value := x.MaxAgeDuration return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.EvidenceParams.max_bytes": + case "cometbft.types.v2.EvidenceParams.max_bytes": value := x.MaxBytes return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceParams")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceParams does not contain field %s", descriptor.FullName())) } } @@ -1562,17 +1562,17 @@ func (x *fastReflection_EvidenceParams) Get(descriptor protoreflect.FieldDescrip // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EvidenceParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.EvidenceParams.max_age_num_blocks": + case "cometbft.types.v2.EvidenceParams.max_age_num_blocks": x.MaxAgeNumBlocks = value.Int() - case "cometbft.types.v1.EvidenceParams.max_age_duration": + case "cometbft.types.v2.EvidenceParams.max_age_duration": x.MaxAgeDuration = value.Message().Interface().(*durationpb.Duration) - case "cometbft.types.v1.EvidenceParams.max_bytes": + case "cometbft.types.v2.EvidenceParams.max_bytes": x.MaxBytes = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceParams")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceParams does not contain field %s", fd.FullName())) } } @@ -1588,20 +1588,20 @@ func (x *fastReflection_EvidenceParams) Set(fd protoreflect.FieldDescriptor, val // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EvidenceParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.EvidenceParams.max_age_duration": + case "cometbft.types.v2.EvidenceParams.max_age_duration": if x.MaxAgeDuration == nil { x.MaxAgeDuration = new(durationpb.Duration) } return protoreflect.ValueOfMessage(x.MaxAgeDuration.ProtoReflect()) - case "cometbft.types.v1.EvidenceParams.max_age_num_blocks": - panic(fmt.Errorf("field max_age_num_blocks of message cometbft.types.v1.EvidenceParams is not mutable")) - case "cometbft.types.v1.EvidenceParams.max_bytes": - panic(fmt.Errorf("field max_bytes of message cometbft.types.v1.EvidenceParams is not mutable")) + case "cometbft.types.v2.EvidenceParams.max_age_num_blocks": + panic(fmt.Errorf("field max_age_num_blocks of message cometbft.types.v2.EvidenceParams is not mutable")) + case "cometbft.types.v2.EvidenceParams.max_bytes": + panic(fmt.Errorf("field max_bytes of message cometbft.types.v2.EvidenceParams is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceParams")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceParams does not contain field %s", fd.FullName())) } } @@ -1610,18 +1610,18 @@ func (x *fastReflection_EvidenceParams) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_EvidenceParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.EvidenceParams.max_age_num_blocks": + case "cometbft.types.v2.EvidenceParams.max_age_num_blocks": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.EvidenceParams.max_age_duration": + case "cometbft.types.v2.EvidenceParams.max_age_duration": m := new(durationpb.Duration) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.EvidenceParams.max_bytes": + case "cometbft.types.v2.EvidenceParams.max_bytes": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.EvidenceParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.EvidenceParams")) } - panic(fmt.Errorf("message cometbft.types.v1.EvidenceParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.EvidenceParams does not contain field %s", fd.FullName())) } } @@ -1631,7 +1631,7 @@ func (x *fastReflection_EvidenceParams) NewField(fd protoreflect.FieldDescriptor func (x *fastReflection_EvidenceParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.EvidenceParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.EvidenceParams", d.FullName())) } panic("unreachable") } @@ -1959,8 +1959,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_ValidatorParams = File_cometbft_types_v1_params_proto.Messages().ByName("ValidatorParams") + file_cometbft_types_v2_params_proto_init() + md_ValidatorParams = File_cometbft_types_v2_params_proto.Messages().ByName("ValidatorParams") fd_ValidatorParams_pub_key_types = md_ValidatorParams.Fields().ByName("pub_key_types") } @@ -1973,7 +1973,7 @@ func (x *ValidatorParams) ProtoReflect() protoreflect.Message { } func (x *ValidatorParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[3] + mi := &file_cometbft_types_v2_params_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2050,13 +2050,13 @@ func (x *fastReflection_ValidatorParams) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_ValidatorParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.ValidatorParams.pub_key_types": + case "cometbft.types.v2.ValidatorParams.pub_key_types": return len(x.PubKeyTypes) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorParams does not contain field %s", fd.FullName())) } } @@ -2068,13 +2068,13 @@ func (x *fastReflection_ValidatorParams) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.ValidatorParams.pub_key_types": + case "cometbft.types.v2.ValidatorParams.pub_key_types": x.PubKeyTypes = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorParams does not contain field %s", fd.FullName())) } } @@ -2086,7 +2086,7 @@ func (x *fastReflection_ValidatorParams) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ValidatorParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.ValidatorParams.pub_key_types": + case "cometbft.types.v2.ValidatorParams.pub_key_types": if len(x.PubKeyTypes) == 0 { return protoreflect.ValueOfList(&_ValidatorParams_1_list{}) } @@ -2094,9 +2094,9 @@ func (x *fastReflection_ValidatorParams) Get(descriptor protoreflect.FieldDescri return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorParams does not contain field %s", descriptor.FullName())) } } @@ -2112,15 +2112,15 @@ func (x *fastReflection_ValidatorParams) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.ValidatorParams.pub_key_types": + case "cometbft.types.v2.ValidatorParams.pub_key_types": lv := value.List() clv := lv.(*_ValidatorParams_1_list) x.PubKeyTypes = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorParams does not contain field %s", fd.FullName())) } } @@ -2136,7 +2136,7 @@ func (x *fastReflection_ValidatorParams) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ValidatorParams.pub_key_types": + case "cometbft.types.v2.ValidatorParams.pub_key_types": if x.PubKeyTypes == nil { x.PubKeyTypes = []string{} } @@ -2144,9 +2144,9 @@ func (x *fastReflection_ValidatorParams) Mutable(fd protoreflect.FieldDescriptor return protoreflect.ValueOfList(value) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorParams does not contain field %s", fd.FullName())) } } @@ -2155,14 +2155,14 @@ func (x *fastReflection_ValidatorParams) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ValidatorParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ValidatorParams.pub_key_types": + case "cometbft.types.v2.ValidatorParams.pub_key_types": list := []string{} return protoreflect.ValueOfList(&_ValidatorParams_1_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorParams does not contain field %s", fd.FullName())) } } @@ -2172,7 +2172,7 @@ func (x *fastReflection_ValidatorParams) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_ValidatorParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.ValidatorParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.ValidatorParams", d.FullName())) } panic("unreachable") } @@ -2393,8 +2393,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_VersionParams = File_cometbft_types_v1_params_proto.Messages().ByName("VersionParams") + file_cometbft_types_v2_params_proto_init() + md_VersionParams = File_cometbft_types_v2_params_proto.Messages().ByName("VersionParams") fd_VersionParams_app = md_VersionParams.Fields().ByName("app") } @@ -2407,7 +2407,7 @@ func (x *VersionParams) ProtoReflect() protoreflect.Message { } func (x *VersionParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[4] + mi := &file_cometbft_types_v2_params_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2484,13 +2484,13 @@ func (x *fastReflection_VersionParams) Range(f func(protoreflect.FieldDescriptor // a repeated field is populated if it is non-empty. func (x *fastReflection_VersionParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.VersionParams.app": + case "cometbft.types.v2.VersionParams.app": return x.App != uint64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.VersionParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.VersionParams")) } - panic(fmt.Errorf("message cometbft.types.v1.VersionParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.VersionParams does not contain field %s", fd.FullName())) } } @@ -2502,13 +2502,13 @@ func (x *fastReflection_VersionParams) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VersionParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.VersionParams.app": + case "cometbft.types.v2.VersionParams.app": x.App = uint64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.VersionParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.VersionParams")) } - panic(fmt.Errorf("message cometbft.types.v1.VersionParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.VersionParams does not contain field %s", fd.FullName())) } } @@ -2520,14 +2520,14 @@ func (x *fastReflection_VersionParams) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_VersionParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.VersionParams.app": + case "cometbft.types.v2.VersionParams.app": value := x.App return protoreflect.ValueOfUint64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.VersionParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.VersionParams")) } - panic(fmt.Errorf("message cometbft.types.v1.VersionParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.VersionParams does not contain field %s", descriptor.FullName())) } } @@ -2543,13 +2543,13 @@ func (x *fastReflection_VersionParams) Get(descriptor protoreflect.FieldDescript // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VersionParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.VersionParams.app": + case "cometbft.types.v2.VersionParams.app": x.App = value.Uint() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.VersionParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.VersionParams")) } - panic(fmt.Errorf("message cometbft.types.v1.VersionParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.VersionParams does not contain field %s", fd.FullName())) } } @@ -2565,13 +2565,13 @@ func (x *fastReflection_VersionParams) Set(fd protoreflect.FieldDescriptor, valu // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_VersionParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.VersionParams.app": - panic(fmt.Errorf("field app of message cometbft.types.v1.VersionParams is not mutable")) + case "cometbft.types.v2.VersionParams.app": + panic(fmt.Errorf("field app of message cometbft.types.v2.VersionParams is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.VersionParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.VersionParams")) } - panic(fmt.Errorf("message cometbft.types.v1.VersionParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.VersionParams does not contain field %s", fd.FullName())) } } @@ -2580,13 +2580,13 @@ func (x *fastReflection_VersionParams) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_VersionParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.VersionParams.app": + case "cometbft.types.v2.VersionParams.app": return protoreflect.ValueOfUint64(uint64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.VersionParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.VersionParams")) } - panic(fmt.Errorf("message cometbft.types.v1.VersionParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.VersionParams does not contain field %s", fd.FullName())) } } @@ -2596,7 +2596,7 @@ func (x *fastReflection_VersionParams) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_VersionParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.VersionParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.VersionParams", d.FullName())) } panic("unreachable") } @@ -2798,8 +2798,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_HashedParams = File_cometbft_types_v1_params_proto.Messages().ByName("HashedParams") + file_cometbft_types_v2_params_proto_init() + md_HashedParams = File_cometbft_types_v2_params_proto.Messages().ByName("HashedParams") fd_HashedParams_block_max_bytes = md_HashedParams.Fields().ByName("block_max_bytes") fd_HashedParams_block_max_gas = md_HashedParams.Fields().ByName("block_max_gas") } @@ -2813,7 +2813,7 @@ func (x *HashedParams) ProtoReflect() protoreflect.Message { } func (x *HashedParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[5] + mi := &file_cometbft_types_v2_params_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2896,15 +2896,15 @@ func (x *fastReflection_HashedParams) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_HashedParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.HashedParams.block_max_bytes": + case "cometbft.types.v2.HashedParams.block_max_bytes": return x.BlockMaxBytes != int64(0) - case "cometbft.types.v1.HashedParams.block_max_gas": + case "cometbft.types.v2.HashedParams.block_max_gas": return x.BlockMaxGas != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.HashedParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.HashedParams")) } - panic(fmt.Errorf("message cometbft.types.v1.HashedParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.HashedParams does not contain field %s", fd.FullName())) } } @@ -2916,15 +2916,15 @@ func (x *fastReflection_HashedParams) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HashedParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.HashedParams.block_max_bytes": + case "cometbft.types.v2.HashedParams.block_max_bytes": x.BlockMaxBytes = int64(0) - case "cometbft.types.v1.HashedParams.block_max_gas": + case "cometbft.types.v2.HashedParams.block_max_gas": x.BlockMaxGas = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.HashedParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.HashedParams")) } - panic(fmt.Errorf("message cometbft.types.v1.HashedParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.HashedParams does not contain field %s", fd.FullName())) } } @@ -2936,17 +2936,17 @@ func (x *fastReflection_HashedParams) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_HashedParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.HashedParams.block_max_bytes": + case "cometbft.types.v2.HashedParams.block_max_bytes": value := x.BlockMaxBytes return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.HashedParams.block_max_gas": + case "cometbft.types.v2.HashedParams.block_max_gas": value := x.BlockMaxGas return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.HashedParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.HashedParams")) } - panic(fmt.Errorf("message cometbft.types.v1.HashedParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.HashedParams does not contain field %s", descriptor.FullName())) } } @@ -2962,15 +2962,15 @@ func (x *fastReflection_HashedParams) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HashedParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.HashedParams.block_max_bytes": + case "cometbft.types.v2.HashedParams.block_max_bytes": x.BlockMaxBytes = value.Int() - case "cometbft.types.v1.HashedParams.block_max_gas": + case "cometbft.types.v2.HashedParams.block_max_gas": x.BlockMaxGas = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.HashedParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.HashedParams")) } - panic(fmt.Errorf("message cometbft.types.v1.HashedParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.HashedParams does not contain field %s", fd.FullName())) } } @@ -2986,15 +2986,15 @@ func (x *fastReflection_HashedParams) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HashedParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.HashedParams.block_max_bytes": - panic(fmt.Errorf("field block_max_bytes of message cometbft.types.v1.HashedParams is not mutable")) - case "cometbft.types.v1.HashedParams.block_max_gas": - panic(fmt.Errorf("field block_max_gas of message cometbft.types.v1.HashedParams is not mutable")) + case "cometbft.types.v2.HashedParams.block_max_bytes": + panic(fmt.Errorf("field block_max_bytes of message cometbft.types.v2.HashedParams is not mutable")) + case "cometbft.types.v2.HashedParams.block_max_gas": + panic(fmt.Errorf("field block_max_gas of message cometbft.types.v2.HashedParams is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.HashedParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.HashedParams")) } - panic(fmt.Errorf("message cometbft.types.v1.HashedParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.HashedParams does not contain field %s", fd.FullName())) } } @@ -3003,15 +3003,15 @@ func (x *fastReflection_HashedParams) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_HashedParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.HashedParams.block_max_bytes": + case "cometbft.types.v2.HashedParams.block_max_bytes": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.HashedParams.block_max_gas": + case "cometbft.types.v2.HashedParams.block_max_gas": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.HashedParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.HashedParams")) } - panic(fmt.Errorf("message cometbft.types.v1.HashedParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.HashedParams does not contain field %s", fd.FullName())) } } @@ -3021,7 +3021,7 @@ func (x *fastReflection_HashedParams) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_HashedParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.HashedParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.HashedParams", d.FullName())) } panic("unreachable") } @@ -3250,8 +3250,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_SynchronyParams = File_cometbft_types_v1_params_proto.Messages().ByName("SynchronyParams") + file_cometbft_types_v2_params_proto_init() + md_SynchronyParams = File_cometbft_types_v2_params_proto.Messages().ByName("SynchronyParams") fd_SynchronyParams_precision = md_SynchronyParams.Fields().ByName("precision") fd_SynchronyParams_message_delay = md_SynchronyParams.Fields().ByName("message_delay") } @@ -3265,7 +3265,7 @@ func (x *SynchronyParams) ProtoReflect() protoreflect.Message { } func (x *SynchronyParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[6] + mi := &file_cometbft_types_v2_params_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3348,15 +3348,15 @@ func (x *fastReflection_SynchronyParams) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_SynchronyParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.SynchronyParams.precision": + case "cometbft.types.v2.SynchronyParams.precision": return x.Precision != nil - case "cometbft.types.v1.SynchronyParams.message_delay": + case "cometbft.types.v2.SynchronyParams.message_delay": return x.MessageDelay != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SynchronyParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SynchronyParams")) } - panic(fmt.Errorf("message cometbft.types.v1.SynchronyParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SynchronyParams does not contain field %s", fd.FullName())) } } @@ -3368,15 +3368,15 @@ func (x *fastReflection_SynchronyParams) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SynchronyParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.SynchronyParams.precision": + case "cometbft.types.v2.SynchronyParams.precision": x.Precision = nil - case "cometbft.types.v1.SynchronyParams.message_delay": + case "cometbft.types.v2.SynchronyParams.message_delay": x.MessageDelay = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SynchronyParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SynchronyParams")) } - panic(fmt.Errorf("message cometbft.types.v1.SynchronyParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SynchronyParams does not contain field %s", fd.FullName())) } } @@ -3388,17 +3388,17 @@ func (x *fastReflection_SynchronyParams) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_SynchronyParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.SynchronyParams.precision": + case "cometbft.types.v2.SynchronyParams.precision": value := x.Precision return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.SynchronyParams.message_delay": + case "cometbft.types.v2.SynchronyParams.message_delay": value := x.MessageDelay return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SynchronyParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SynchronyParams")) } - panic(fmt.Errorf("message cometbft.types.v1.SynchronyParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SynchronyParams does not contain field %s", descriptor.FullName())) } } @@ -3414,15 +3414,15 @@ func (x *fastReflection_SynchronyParams) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SynchronyParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.SynchronyParams.precision": + case "cometbft.types.v2.SynchronyParams.precision": x.Precision = value.Message().Interface().(*durationpb.Duration) - case "cometbft.types.v1.SynchronyParams.message_delay": + case "cometbft.types.v2.SynchronyParams.message_delay": x.MessageDelay = value.Message().Interface().(*durationpb.Duration) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SynchronyParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SynchronyParams")) } - panic(fmt.Errorf("message cometbft.types.v1.SynchronyParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SynchronyParams does not contain field %s", fd.FullName())) } } @@ -3438,21 +3438,21 @@ func (x *fastReflection_SynchronyParams) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SynchronyParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.SynchronyParams.precision": + case "cometbft.types.v2.SynchronyParams.precision": if x.Precision == nil { x.Precision = new(durationpb.Duration) } return protoreflect.ValueOfMessage(x.Precision.ProtoReflect()) - case "cometbft.types.v1.SynchronyParams.message_delay": + case "cometbft.types.v2.SynchronyParams.message_delay": if x.MessageDelay == nil { x.MessageDelay = new(durationpb.Duration) } return protoreflect.ValueOfMessage(x.MessageDelay.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SynchronyParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SynchronyParams")) } - panic(fmt.Errorf("message cometbft.types.v1.SynchronyParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SynchronyParams does not contain field %s", fd.FullName())) } } @@ -3461,17 +3461,17 @@ func (x *fastReflection_SynchronyParams) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_SynchronyParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.SynchronyParams.precision": + case "cometbft.types.v2.SynchronyParams.precision": m := new(durationpb.Duration) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.SynchronyParams.message_delay": + case "cometbft.types.v2.SynchronyParams.message_delay": m := new(durationpb.Duration) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SynchronyParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SynchronyParams")) } - panic(fmt.Errorf("message cometbft.types.v1.SynchronyParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SynchronyParams does not contain field %s", fd.FullName())) } } @@ -3481,7 +3481,7 @@ func (x *fastReflection_SynchronyParams) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_SynchronyParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.SynchronyParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.SynchronyParams", d.FullName())) } panic("unreachable") } @@ -3764,8 +3764,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_FeatureParams = File_cometbft_types_v1_params_proto.Messages().ByName("FeatureParams") + file_cometbft_types_v2_params_proto_init() + md_FeatureParams = File_cometbft_types_v2_params_proto.Messages().ByName("FeatureParams") fd_FeatureParams_vote_extensions_enable_height = md_FeatureParams.Fields().ByName("vote_extensions_enable_height") fd_FeatureParams_pbts_enable_height = md_FeatureParams.Fields().ByName("pbts_enable_height") } @@ -3779,7 +3779,7 @@ func (x *FeatureParams) ProtoReflect() protoreflect.Message { } func (x *FeatureParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[7] + mi := &file_cometbft_types_v2_params_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3862,15 +3862,15 @@ func (x *fastReflection_FeatureParams) Range(f func(protoreflect.FieldDescriptor // a repeated field is populated if it is non-empty. func (x *fastReflection_FeatureParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.FeatureParams.vote_extensions_enable_height": + case "cometbft.types.v2.FeatureParams.vote_extensions_enable_height": return x.VoteExtensionsEnableHeight != nil - case "cometbft.types.v1.FeatureParams.pbts_enable_height": + case "cometbft.types.v2.FeatureParams.pbts_enable_height": return x.PbtsEnableHeight != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.FeatureParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.FeatureParams")) } - panic(fmt.Errorf("message cometbft.types.v1.FeatureParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.FeatureParams does not contain field %s", fd.FullName())) } } @@ -3882,15 +3882,15 @@ func (x *fastReflection_FeatureParams) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FeatureParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.FeatureParams.vote_extensions_enable_height": + case "cometbft.types.v2.FeatureParams.vote_extensions_enable_height": x.VoteExtensionsEnableHeight = nil - case "cometbft.types.v1.FeatureParams.pbts_enable_height": + case "cometbft.types.v2.FeatureParams.pbts_enable_height": x.PbtsEnableHeight = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.FeatureParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.FeatureParams")) } - panic(fmt.Errorf("message cometbft.types.v1.FeatureParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.FeatureParams does not contain field %s", fd.FullName())) } } @@ -3902,17 +3902,17 @@ func (x *fastReflection_FeatureParams) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_FeatureParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.FeatureParams.vote_extensions_enable_height": + case "cometbft.types.v2.FeatureParams.vote_extensions_enable_height": value := x.VoteExtensionsEnableHeight return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.FeatureParams.pbts_enable_height": + case "cometbft.types.v2.FeatureParams.pbts_enable_height": value := x.PbtsEnableHeight return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.FeatureParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.FeatureParams")) } - panic(fmt.Errorf("message cometbft.types.v1.FeatureParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.FeatureParams does not contain field %s", descriptor.FullName())) } } @@ -3928,15 +3928,15 @@ func (x *fastReflection_FeatureParams) Get(descriptor protoreflect.FieldDescript // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FeatureParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.FeatureParams.vote_extensions_enable_height": + case "cometbft.types.v2.FeatureParams.vote_extensions_enable_height": x.VoteExtensionsEnableHeight = value.Message().Interface().(*wrapperspb.Int64Value) - case "cometbft.types.v1.FeatureParams.pbts_enable_height": + case "cometbft.types.v2.FeatureParams.pbts_enable_height": x.PbtsEnableHeight = value.Message().Interface().(*wrapperspb.Int64Value) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.FeatureParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.FeatureParams")) } - panic(fmt.Errorf("message cometbft.types.v1.FeatureParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.FeatureParams does not contain field %s", fd.FullName())) } } @@ -3952,21 +3952,21 @@ func (x *fastReflection_FeatureParams) Set(fd protoreflect.FieldDescriptor, valu // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_FeatureParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.FeatureParams.vote_extensions_enable_height": + case "cometbft.types.v2.FeatureParams.vote_extensions_enable_height": if x.VoteExtensionsEnableHeight == nil { x.VoteExtensionsEnableHeight = new(wrapperspb.Int64Value) } return protoreflect.ValueOfMessage(x.VoteExtensionsEnableHeight.ProtoReflect()) - case "cometbft.types.v1.FeatureParams.pbts_enable_height": + case "cometbft.types.v2.FeatureParams.pbts_enable_height": if x.PbtsEnableHeight == nil { x.PbtsEnableHeight = new(wrapperspb.Int64Value) } return protoreflect.ValueOfMessage(x.PbtsEnableHeight.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.FeatureParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.FeatureParams")) } - panic(fmt.Errorf("message cometbft.types.v1.FeatureParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.FeatureParams does not contain field %s", fd.FullName())) } } @@ -3975,17 +3975,17 @@ func (x *fastReflection_FeatureParams) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_FeatureParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.FeatureParams.vote_extensions_enable_height": + case "cometbft.types.v2.FeatureParams.vote_extensions_enable_height": m := new(wrapperspb.Int64Value) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.FeatureParams.pbts_enable_height": + case "cometbft.types.v2.FeatureParams.pbts_enable_height": m := new(wrapperspb.Int64Value) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.FeatureParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.FeatureParams")) } - panic(fmt.Errorf("message cometbft.types.v1.FeatureParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.FeatureParams does not contain field %s", fd.FullName())) } } @@ -3995,7 +3995,7 @@ func (x *fastReflection_FeatureParams) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_FeatureParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.FeatureParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.FeatureParams", d.FullName())) } panic("unreachable") } @@ -4277,8 +4277,8 @@ var ( ) func init() { - file_cometbft_types_v1_params_proto_init() - md_ABCIParams = File_cometbft_types_v1_params_proto.Messages().ByName("ABCIParams") + file_cometbft_types_v2_params_proto_init() + md_ABCIParams = File_cometbft_types_v2_params_proto.Messages().ByName("ABCIParams") fd_ABCIParams_vote_extensions_enable_height = md_ABCIParams.Fields().ByName("vote_extensions_enable_height") } @@ -4291,7 +4291,7 @@ func (x *ABCIParams) ProtoReflect() protoreflect.Message { } func (x *ABCIParams) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_params_proto_msgTypes[8] + mi := &file_cometbft_types_v2_params_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4368,13 +4368,13 @@ func (x *fastReflection_ABCIParams) Range(f func(protoreflect.FieldDescriptor, p // a repeated field is populated if it is non-empty. func (x *fastReflection_ABCIParams) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.ABCIParams.vote_extensions_enable_height": + case "cometbft.types.v2.ABCIParams.vote_extensions_enable_height": return x.VoteExtensionsEnableHeight != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ABCIParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ABCIParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ABCIParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ABCIParams does not contain field %s", fd.FullName())) } } @@ -4386,13 +4386,13 @@ func (x *fastReflection_ABCIParams) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ABCIParams) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.ABCIParams.vote_extensions_enable_height": + case "cometbft.types.v2.ABCIParams.vote_extensions_enable_height": x.VoteExtensionsEnableHeight = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ABCIParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ABCIParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ABCIParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ABCIParams does not contain field %s", fd.FullName())) } } @@ -4404,14 +4404,14 @@ func (x *fastReflection_ABCIParams) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ABCIParams) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.ABCIParams.vote_extensions_enable_height": + case "cometbft.types.v2.ABCIParams.vote_extensions_enable_height": value := x.VoteExtensionsEnableHeight return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ABCIParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ABCIParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ABCIParams does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ABCIParams does not contain field %s", descriptor.FullName())) } } @@ -4427,13 +4427,13 @@ func (x *fastReflection_ABCIParams) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ABCIParams) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.ABCIParams.vote_extensions_enable_height": + case "cometbft.types.v2.ABCIParams.vote_extensions_enable_height": x.VoteExtensionsEnableHeight = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ABCIParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ABCIParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ABCIParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ABCIParams does not contain field %s", fd.FullName())) } } @@ -4449,13 +4449,13 @@ func (x *fastReflection_ABCIParams) Set(fd protoreflect.FieldDescriptor, value p // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ABCIParams) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ABCIParams.vote_extensions_enable_height": - panic(fmt.Errorf("field vote_extensions_enable_height of message cometbft.types.v1.ABCIParams is not mutable")) + case "cometbft.types.v2.ABCIParams.vote_extensions_enable_height": + panic(fmt.Errorf("field vote_extensions_enable_height of message cometbft.types.v2.ABCIParams is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ABCIParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ABCIParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ABCIParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ABCIParams does not contain field %s", fd.FullName())) } } @@ -4464,13 +4464,13 @@ func (x *fastReflection_ABCIParams) Mutable(fd protoreflect.FieldDescriptor) pro // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ABCIParams) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ABCIParams.vote_extensions_enable_height": + case "cometbft.types.v2.ABCIParams.vote_extensions_enable_height": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ABCIParams")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ABCIParams")) } - panic(fmt.Errorf("message cometbft.types.v1.ABCIParams does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ABCIParams does not contain field %s", fd.FullName())) } } @@ -4480,7 +4480,7 @@ func (x *fastReflection_ABCIParams) NewField(fd protoreflect.FieldDescriptor) pr func (x *fastReflection_ABCIParams) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.ABCIParams", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.ABCIParams", d.FullName())) } panic("unreachable") } @@ -4679,7 +4679,7 @@ func (x *fastReflection_ABCIParams) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/types/v1/params.proto +// source: cometbft/types/v2/params.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -4708,7 +4708,7 @@ type ConsensusParams struct { func (x *ConsensusParams) Reset() { *x = ConsensusParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[0] + mi := &file_cometbft_types_v2_params_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4722,7 +4722,7 @@ func (*ConsensusParams) ProtoMessage() {} // Deprecated: Use ConsensusParams.ProtoReflect.Descriptor instead. func (*ConsensusParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{0} } func (x *ConsensusParams) GetBlock() *BlockParams { @@ -4797,7 +4797,7 @@ type BlockParams struct { func (x *BlockParams) Reset() { *x = BlockParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[1] + mi := &file_cometbft_types_v2_params_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4811,7 +4811,7 @@ func (*BlockParams) ProtoMessage() {} // Deprecated: Use BlockParams.ProtoReflect.Descriptor instead. func (*BlockParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{1} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{1} } func (x *BlockParams) GetMaxBytes() int64 { @@ -4856,7 +4856,7 @@ type EvidenceParams struct { func (x *EvidenceParams) Reset() { *x = EvidenceParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[2] + mi := &file_cometbft_types_v2_params_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4870,7 +4870,7 @@ func (*EvidenceParams) ProtoMessage() {} // Deprecated: Use EvidenceParams.ProtoReflect.Descriptor instead. func (*EvidenceParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{2} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{2} } func (x *EvidenceParams) GetMaxAgeNumBlocks() int64 { @@ -4908,7 +4908,7 @@ type ValidatorParams struct { func (x *ValidatorParams) Reset() { *x = ValidatorParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[3] + mi := &file_cometbft_types_v2_params_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4922,7 +4922,7 @@ func (*ValidatorParams) ProtoMessage() {} // Deprecated: Use ValidatorParams.ProtoReflect.Descriptor instead. func (*ValidatorParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{3} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{3} } func (x *ValidatorParams) GetPubKeyTypes() []string { @@ -4947,7 +4947,7 @@ type VersionParams struct { func (x *VersionParams) Reset() { *x = VersionParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[4] + mi := &file_cometbft_types_v2_params_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4961,7 +4961,7 @@ func (*VersionParams) ProtoMessage() {} // Deprecated: Use VersionParams.ProtoReflect.Descriptor instead. func (*VersionParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{4} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{4} } func (x *VersionParams) GetApp() uint64 { @@ -4986,7 +4986,7 @@ type HashedParams struct { func (x *HashedParams) Reset() { *x = HashedParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[5] + mi := &file_cometbft_types_v2_params_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5000,7 +5000,7 @@ func (*HashedParams) ProtoMessage() {} // Deprecated: Use HashedParams.ProtoReflect.Descriptor instead. func (*HashedParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{5} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{5} } func (x *HashedParams) GetBlockMaxBytes() int64 { @@ -5039,7 +5039,7 @@ type SynchronyParams struct { func (x *SynchronyParams) Reset() { *x = SynchronyParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[6] + mi := &file_cometbft_types_v2_params_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5053,7 +5053,7 @@ func (*SynchronyParams) ProtoMessage() {} // Deprecated: Use SynchronyParams.ProtoReflect.Descriptor instead. func (*SynchronyParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{6} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{6} } func (x *SynchronyParams) GetPrecision() *durationpb.Duration { @@ -5109,7 +5109,7 @@ type FeatureParams struct { func (x *FeatureParams) Reset() { *x = FeatureParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[7] + mi := &file_cometbft_types_v2_params_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5123,7 +5123,7 @@ func (*FeatureParams) ProtoMessage() {} // Deprecated: Use FeatureParams.ProtoReflect.Descriptor instead. func (*FeatureParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{7} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{7} } func (x *FeatureParams) GetVoteExtensionsEnableHeight() *wrapperspb.Int64Value { @@ -5156,7 +5156,7 @@ type ABCIParams struct { func (x *ABCIParams) Reset() { *x = ABCIParams{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_params_proto_msgTypes[8] + mi := &file_cometbft_types_v2_params_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5170,7 +5170,7 @@ func (*ABCIParams) ProtoMessage() {} // Deprecated: Use ABCIParams.ProtoReflect.Descriptor instead. func (*ABCIParams) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_params_proto_rawDescGZIP(), []int{8} + return file_cometbft_types_v2_params_proto_rawDescGZIP(), []int{8} } func (x *ABCIParams) GetVoteExtensionsEnableHeight() int64 { @@ -5180,13 +5180,13 @@ func (x *ABCIParams) GetVoteExtensionsEnableHeight() int64 { return 0 } -var File_cometbft_types_v1_params_proto protoreflect.FileDescriptor +var File_cometbft_types_v2_params_proto protoreflect.FileDescriptor -var file_cometbft_types_v1_params_proto_rawDesc = []byte{ +var file_cometbft_types_v2_params_proto_rawDesc = []byte{ 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2e, 0x76, 0x31, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, + 0x2e, 0x76, 0x32, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, @@ -5194,30 +5194,30 @@ var file_cometbft_types_v1_params_proto_rawDesc = []byte{ 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb9, 0x03, 0x0a, 0x0f, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x34, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x3d, 0x0a, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x40, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x3a, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x04, 0x61, 0x62, 0x63, 0x69, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x2e, 0x41, 0x42, 0x43, 0x49, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x02, 0x18, + 0x76, 0x32, 0x2e, 0x41, 0x42, 0x43, 0x49, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x02, 0x18, 0x01, 0x52, 0x04, 0x61, 0x62, 0x63, 0x69, 0x12, 0x40, 0x0a, 0x09, 0x73, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x09, 0x73, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x79, 0x12, 0x3a, 0x0a, 0x07, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x46, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x07, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x49, 0x0a, 0x0b, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x62, 0x79, 0x74, 0x65, @@ -5276,59 +5276,59 @@ var file_cometbft_types_v1_params_proto_rawDesc = []byte{ 0x6f, 0x74, 0x65, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x02, 0x18, 0x01, 0x42, 0xba, 0x01, 0xa8, 0xe2, 0x1e, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x50, 0x61, 0x72, + 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x42, 0x0b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x31, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x3b, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, - 0x73, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, - 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, + 0x73, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, + 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, - 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_cometbft_types_v1_params_proto_rawDescOnce sync.Once - file_cometbft_types_v1_params_proto_rawDescData = file_cometbft_types_v1_params_proto_rawDesc + file_cometbft_types_v2_params_proto_rawDescOnce sync.Once + file_cometbft_types_v2_params_proto_rawDescData = file_cometbft_types_v2_params_proto_rawDesc ) -func file_cometbft_types_v1_params_proto_rawDescGZIP() []byte { - file_cometbft_types_v1_params_proto_rawDescOnce.Do(func() { - file_cometbft_types_v1_params_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v1_params_proto_rawDescData) +func file_cometbft_types_v2_params_proto_rawDescGZIP() []byte { + file_cometbft_types_v2_params_proto_rawDescOnce.Do(func() { + file_cometbft_types_v2_params_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v2_params_proto_rawDescData) }) - return file_cometbft_types_v1_params_proto_rawDescData + return file_cometbft_types_v2_params_proto_rawDescData } -var file_cometbft_types_v1_params_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_cometbft_types_v1_params_proto_goTypes = []interface{}{ - (*ConsensusParams)(nil), // 0: cometbft.types.v1.ConsensusParams - (*BlockParams)(nil), // 1: cometbft.types.v1.BlockParams - (*EvidenceParams)(nil), // 2: cometbft.types.v1.EvidenceParams - (*ValidatorParams)(nil), // 3: cometbft.types.v1.ValidatorParams - (*VersionParams)(nil), // 4: cometbft.types.v1.VersionParams - (*HashedParams)(nil), // 5: cometbft.types.v1.HashedParams - (*SynchronyParams)(nil), // 6: cometbft.types.v1.SynchronyParams - (*FeatureParams)(nil), // 7: cometbft.types.v1.FeatureParams - (*ABCIParams)(nil), // 8: cometbft.types.v1.ABCIParams +var file_cometbft_types_v2_params_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_cometbft_types_v2_params_proto_goTypes = []interface{}{ + (*ConsensusParams)(nil), // 0: cometbft.types.v2.ConsensusParams + (*BlockParams)(nil), // 1: cometbft.types.v2.BlockParams + (*EvidenceParams)(nil), // 2: cometbft.types.v2.EvidenceParams + (*ValidatorParams)(nil), // 3: cometbft.types.v2.ValidatorParams + (*VersionParams)(nil), // 4: cometbft.types.v2.VersionParams + (*HashedParams)(nil), // 5: cometbft.types.v2.HashedParams + (*SynchronyParams)(nil), // 6: cometbft.types.v2.SynchronyParams + (*FeatureParams)(nil), // 7: cometbft.types.v2.FeatureParams + (*ABCIParams)(nil), // 8: cometbft.types.v2.ABCIParams (*durationpb.Duration)(nil), // 9: google.protobuf.Duration (*wrapperspb.Int64Value)(nil), // 10: google.protobuf.Int64Value } -var file_cometbft_types_v1_params_proto_depIdxs = []int32{ - 1, // 0: cometbft.types.v1.ConsensusParams.block:type_name -> cometbft.types.v1.BlockParams - 2, // 1: cometbft.types.v1.ConsensusParams.evidence:type_name -> cometbft.types.v1.EvidenceParams - 3, // 2: cometbft.types.v1.ConsensusParams.validator:type_name -> cometbft.types.v1.ValidatorParams - 4, // 3: cometbft.types.v1.ConsensusParams.version:type_name -> cometbft.types.v1.VersionParams - 8, // 4: cometbft.types.v1.ConsensusParams.abci:type_name -> cometbft.types.v1.ABCIParams - 6, // 5: cometbft.types.v1.ConsensusParams.synchrony:type_name -> cometbft.types.v1.SynchronyParams - 7, // 6: cometbft.types.v1.ConsensusParams.feature:type_name -> cometbft.types.v1.FeatureParams - 9, // 7: cometbft.types.v1.EvidenceParams.max_age_duration:type_name -> google.protobuf.Duration - 9, // 8: cometbft.types.v1.SynchronyParams.precision:type_name -> google.protobuf.Duration - 9, // 9: cometbft.types.v1.SynchronyParams.message_delay:type_name -> google.protobuf.Duration - 10, // 10: cometbft.types.v1.FeatureParams.vote_extensions_enable_height:type_name -> google.protobuf.Int64Value - 10, // 11: cometbft.types.v1.FeatureParams.pbts_enable_height:type_name -> google.protobuf.Int64Value +var file_cometbft_types_v2_params_proto_depIdxs = []int32{ + 1, // 0: cometbft.types.v2.ConsensusParams.block:type_name -> cometbft.types.v2.BlockParams + 2, // 1: cometbft.types.v2.ConsensusParams.evidence:type_name -> cometbft.types.v2.EvidenceParams + 3, // 2: cometbft.types.v2.ConsensusParams.validator:type_name -> cometbft.types.v2.ValidatorParams + 4, // 3: cometbft.types.v2.ConsensusParams.version:type_name -> cometbft.types.v2.VersionParams + 8, // 4: cometbft.types.v2.ConsensusParams.abci:type_name -> cometbft.types.v2.ABCIParams + 6, // 5: cometbft.types.v2.ConsensusParams.synchrony:type_name -> cometbft.types.v2.SynchronyParams + 7, // 6: cometbft.types.v2.ConsensusParams.feature:type_name -> cometbft.types.v2.FeatureParams + 9, // 7: cometbft.types.v2.EvidenceParams.max_age_duration:type_name -> google.protobuf.Duration + 9, // 8: cometbft.types.v2.SynchronyParams.precision:type_name -> google.protobuf.Duration + 9, // 9: cometbft.types.v2.SynchronyParams.message_delay:type_name -> google.protobuf.Duration + 10, // 10: cometbft.types.v2.FeatureParams.vote_extensions_enable_height:type_name -> google.protobuf.Int64Value + 10, // 11: cometbft.types.v2.FeatureParams.pbts_enable_height:type_name -> google.protobuf.Int64Value 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name @@ -5336,13 +5336,13 @@ var file_cometbft_types_v1_params_proto_depIdxs = []int32{ 0, // [0:12] is the sub-list for field type_name } -func init() { file_cometbft_types_v1_params_proto_init() } -func file_cometbft_types_v1_params_proto_init() { - if File_cometbft_types_v1_params_proto != nil { +func init() { file_cometbft_types_v2_params_proto_init() } +func file_cometbft_types_v2_params_proto_init() { + if File_cometbft_types_v2_params_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_cometbft_types_v1_params_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ConsensusParams); i { case 0: return &v.state @@ -5354,7 +5354,7 @@ func file_cometbft_types_v1_params_proto_init() { return nil } } - file_cometbft_types_v1_params_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BlockParams); i { case 0: return &v.state @@ -5366,7 +5366,7 @@ func file_cometbft_types_v1_params_proto_init() { return nil } } - file_cometbft_types_v1_params_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EvidenceParams); i { case 0: return &v.state @@ -5378,7 +5378,7 @@ func file_cometbft_types_v1_params_proto_init() { return nil } } - file_cometbft_types_v1_params_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ValidatorParams); i { case 0: return &v.state @@ -5390,7 +5390,7 @@ func file_cometbft_types_v1_params_proto_init() { return nil } } - file_cometbft_types_v1_params_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*VersionParams); i { case 0: return &v.state @@ -5402,7 +5402,7 @@ func file_cometbft_types_v1_params_proto_init() { return nil } } - file_cometbft_types_v1_params_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HashedParams); i { case 0: return &v.state @@ -5414,7 +5414,7 @@ func file_cometbft_types_v1_params_proto_init() { return nil } } - file_cometbft_types_v1_params_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SynchronyParams); i { case 0: return &v.state @@ -5426,7 +5426,7 @@ func file_cometbft_types_v1_params_proto_init() { return nil } } - file_cometbft_types_v1_params_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FeatureParams); i { case 0: return &v.state @@ -5438,7 +5438,7 @@ func file_cometbft_types_v1_params_proto_init() { return nil } } - file_cometbft_types_v1_params_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_params_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ABCIParams); i { case 0: return &v.state @@ -5455,18 +5455,18 @@ func file_cometbft_types_v1_params_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_types_v1_params_proto_rawDesc, + RawDescriptor: file_cometbft_types_v2_params_proto_rawDesc, NumEnums: 0, NumMessages: 9, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cometbft_types_v1_params_proto_goTypes, - DependencyIndexes: file_cometbft_types_v1_params_proto_depIdxs, - MessageInfos: file_cometbft_types_v1_params_proto_msgTypes, + GoTypes: file_cometbft_types_v2_params_proto_goTypes, + DependencyIndexes: file_cometbft_types_v2_params_proto_depIdxs, + MessageInfos: file_cometbft_types_v2_params_proto_msgTypes, }.Build() - File_cometbft_types_v1_params_proto = out.File - file_cometbft_types_v1_params_proto_rawDesc = nil - file_cometbft_types_v1_params_proto_goTypes = nil - file_cometbft_types_v1_params_proto_depIdxs = nil + File_cometbft_types_v2_params_proto = out.File + file_cometbft_types_v2_params_proto_rawDesc = nil + file_cometbft_types_v2_params_proto_goTypes = nil + file_cometbft_types_v2_params_proto_depIdxs = nil } diff --git a/api/cometbft/types/v1/types.pulsar.go b/api/cometbft/types/v2/types.pulsar.go similarity index 84% rename from api/cometbft/types/v1/types.pulsar.go rename to api/cometbft/types/v2/types.pulsar.go index 18ae00537c..70cef5feb3 100644 --- a/api/cometbft/types/v1/types.pulsar.go +++ b/api/cometbft/types/v2/types.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package typesv1 +package typesv2 import ( v1 "cosmossdk.io/api/cometbft/crypto/v1" @@ -23,8 +23,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_PartSetHeader = File_cometbft_types_v1_types_proto.Messages().ByName("PartSetHeader") + file_cometbft_types_v2_types_proto_init() + md_PartSetHeader = File_cometbft_types_v2_types_proto.Messages().ByName("PartSetHeader") fd_PartSetHeader_total = md_PartSetHeader.Fields().ByName("total") fd_PartSetHeader_hash = md_PartSetHeader.Fields().ByName("hash") } @@ -38,7 +38,7 @@ func (x *PartSetHeader) ProtoReflect() protoreflect.Message { } func (x *PartSetHeader) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[0] + mi := &file_cometbft_types_v2_types_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -121,15 +121,15 @@ func (x *fastReflection_PartSetHeader) Range(f func(protoreflect.FieldDescriptor // a repeated field is populated if it is non-empty. func (x *fastReflection_PartSetHeader) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.PartSetHeader.total": + case "cometbft.types.v2.PartSetHeader.total": return x.Total != uint32(0) - case "cometbft.types.v1.PartSetHeader.hash": + case "cometbft.types.v2.PartSetHeader.hash": return len(x.Hash) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.PartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.PartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.PartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.PartSetHeader does not contain field %s", fd.FullName())) } } @@ -141,15 +141,15 @@ func (x *fastReflection_PartSetHeader) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PartSetHeader) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.PartSetHeader.total": + case "cometbft.types.v2.PartSetHeader.total": x.Total = uint32(0) - case "cometbft.types.v1.PartSetHeader.hash": + case "cometbft.types.v2.PartSetHeader.hash": x.Hash = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.PartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.PartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.PartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.PartSetHeader does not contain field %s", fd.FullName())) } } @@ -161,17 +161,17 @@ func (x *fastReflection_PartSetHeader) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_PartSetHeader) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.PartSetHeader.total": + case "cometbft.types.v2.PartSetHeader.total": value := x.Total return protoreflect.ValueOfUint32(value) - case "cometbft.types.v1.PartSetHeader.hash": + case "cometbft.types.v2.PartSetHeader.hash": value := x.Hash return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.PartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.PartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.PartSetHeader does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.PartSetHeader does not contain field %s", descriptor.FullName())) } } @@ -187,15 +187,15 @@ func (x *fastReflection_PartSetHeader) Get(descriptor protoreflect.FieldDescript // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PartSetHeader) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.PartSetHeader.total": + case "cometbft.types.v2.PartSetHeader.total": x.Total = uint32(value.Uint()) - case "cometbft.types.v1.PartSetHeader.hash": + case "cometbft.types.v2.PartSetHeader.hash": x.Hash = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.PartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.PartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.PartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.PartSetHeader does not contain field %s", fd.FullName())) } } @@ -211,15 +211,15 @@ func (x *fastReflection_PartSetHeader) Set(fd protoreflect.FieldDescriptor, valu // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_PartSetHeader) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.PartSetHeader.total": - panic(fmt.Errorf("field total of message cometbft.types.v1.PartSetHeader is not mutable")) - case "cometbft.types.v1.PartSetHeader.hash": - panic(fmt.Errorf("field hash of message cometbft.types.v1.PartSetHeader is not mutable")) + case "cometbft.types.v2.PartSetHeader.total": + panic(fmt.Errorf("field total of message cometbft.types.v2.PartSetHeader is not mutable")) + case "cometbft.types.v2.PartSetHeader.hash": + panic(fmt.Errorf("field hash of message cometbft.types.v2.PartSetHeader is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.PartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.PartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.PartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.PartSetHeader does not contain field %s", fd.FullName())) } } @@ -228,15 +228,15 @@ func (x *fastReflection_PartSetHeader) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_PartSetHeader) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.PartSetHeader.total": + case "cometbft.types.v2.PartSetHeader.total": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.types.v1.PartSetHeader.hash": + case "cometbft.types.v2.PartSetHeader.hash": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.PartSetHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.PartSetHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.PartSetHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.PartSetHeader does not contain field %s", fd.FullName())) } } @@ -246,7 +246,7 @@ func (x *fastReflection_PartSetHeader) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_PartSetHeader) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.PartSetHeader", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.PartSetHeader", d.FullName())) } panic("unreachable") } @@ -494,8 +494,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_Part = File_cometbft_types_v1_types_proto.Messages().ByName("Part") + file_cometbft_types_v2_types_proto_init() + md_Part = File_cometbft_types_v2_types_proto.Messages().ByName("Part") fd_Part_index = md_Part.Fields().ByName("index") fd_Part_bytes = md_Part.Fields().ByName("bytes") fd_Part_proof = md_Part.Fields().ByName("proof") @@ -510,7 +510,7 @@ func (x *Part) ProtoReflect() protoreflect.Message { } func (x *Part) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[1] + mi := &file_cometbft_types_v2_types_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -599,17 +599,17 @@ func (x *fastReflection_Part) Range(f func(protoreflect.FieldDescriptor, protore // a repeated field is populated if it is non-empty. func (x *fastReflection_Part) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Part.index": + case "cometbft.types.v2.Part.index": return x.Index != uint32(0) - case "cometbft.types.v1.Part.bytes": + case "cometbft.types.v2.Part.bytes": return len(x.Bytes) != 0 - case "cometbft.types.v1.Part.proof": + case "cometbft.types.v2.Part.proof": return x.Proof != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Part")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Part")) } - panic(fmt.Errorf("message cometbft.types.v1.Part does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Part does not contain field %s", fd.FullName())) } } @@ -621,17 +621,17 @@ func (x *fastReflection_Part) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Part) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Part.index": + case "cometbft.types.v2.Part.index": x.Index = uint32(0) - case "cometbft.types.v1.Part.bytes": + case "cometbft.types.v2.Part.bytes": x.Bytes = nil - case "cometbft.types.v1.Part.proof": + case "cometbft.types.v2.Part.proof": x.Proof = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Part")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Part")) } - panic(fmt.Errorf("message cometbft.types.v1.Part does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Part does not contain field %s", fd.FullName())) } } @@ -643,20 +643,20 @@ func (x *fastReflection_Part) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Part) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Part.index": + case "cometbft.types.v2.Part.index": value := x.Index return protoreflect.ValueOfUint32(value) - case "cometbft.types.v1.Part.bytes": + case "cometbft.types.v2.Part.bytes": value := x.Bytes return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Part.proof": + case "cometbft.types.v2.Part.proof": value := x.Proof return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Part")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Part")) } - panic(fmt.Errorf("message cometbft.types.v1.Part does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Part does not contain field %s", descriptor.FullName())) } } @@ -672,17 +672,17 @@ func (x *fastReflection_Part) Get(descriptor protoreflect.FieldDescriptor) proto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Part) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Part.index": + case "cometbft.types.v2.Part.index": x.Index = uint32(value.Uint()) - case "cometbft.types.v1.Part.bytes": + case "cometbft.types.v2.Part.bytes": x.Bytes = value.Bytes() - case "cometbft.types.v1.Part.proof": + case "cometbft.types.v2.Part.proof": x.Proof = value.Message().Interface().(*v1.Proof) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Part")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Part")) } - panic(fmt.Errorf("message cometbft.types.v1.Part does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Part does not contain field %s", fd.FullName())) } } @@ -698,20 +698,20 @@ func (x *fastReflection_Part) Set(fd protoreflect.FieldDescriptor, value protore // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Part) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Part.proof": + case "cometbft.types.v2.Part.proof": if x.Proof == nil { x.Proof = new(v1.Proof) } return protoreflect.ValueOfMessage(x.Proof.ProtoReflect()) - case "cometbft.types.v1.Part.index": - panic(fmt.Errorf("field index of message cometbft.types.v1.Part is not mutable")) - case "cometbft.types.v1.Part.bytes": - panic(fmt.Errorf("field bytes of message cometbft.types.v1.Part is not mutable")) + case "cometbft.types.v2.Part.index": + panic(fmt.Errorf("field index of message cometbft.types.v2.Part is not mutable")) + case "cometbft.types.v2.Part.bytes": + panic(fmt.Errorf("field bytes of message cometbft.types.v2.Part is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Part")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Part")) } - panic(fmt.Errorf("message cometbft.types.v1.Part does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Part does not contain field %s", fd.FullName())) } } @@ -720,18 +720,18 @@ func (x *fastReflection_Part) Mutable(fd protoreflect.FieldDescriptor) protorefl // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Part) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Part.index": + case "cometbft.types.v2.Part.index": return protoreflect.ValueOfUint32(uint32(0)) - case "cometbft.types.v1.Part.bytes": + case "cometbft.types.v2.Part.bytes": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Part.proof": + case "cometbft.types.v2.Part.proof": m := new(v1.Proof) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Part")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Part")) } - panic(fmt.Errorf("message cometbft.types.v1.Part does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Part does not contain field %s", fd.FullName())) } } @@ -741,7 +741,7 @@ func (x *fastReflection_Part) NewField(fd protoreflect.FieldDescriptor) protoref func (x *fastReflection_Part) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Part", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Part", d.FullName())) } panic("unreachable") } @@ -1042,8 +1042,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_BlockID = File_cometbft_types_v1_types_proto.Messages().ByName("BlockID") + file_cometbft_types_v2_types_proto_init() + md_BlockID = File_cometbft_types_v2_types_proto.Messages().ByName("BlockID") fd_BlockID_hash = md_BlockID.Fields().ByName("hash") fd_BlockID_part_set_header = md_BlockID.Fields().ByName("part_set_header") } @@ -1057,7 +1057,7 @@ func (x *BlockID) ProtoReflect() protoreflect.Message { } func (x *BlockID) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[2] + mi := &file_cometbft_types_v2_types_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1140,15 +1140,15 @@ func (x *fastReflection_BlockID) Range(f func(protoreflect.FieldDescriptor, prot // a repeated field is populated if it is non-empty. func (x *fastReflection_BlockID) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.BlockID.hash": + case "cometbft.types.v2.BlockID.hash": return len(x.Hash) != 0 - case "cometbft.types.v1.BlockID.part_set_header": + case "cometbft.types.v2.BlockID.part_set_header": return x.PartSetHeader != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockID does not contain field %s", fd.FullName())) } } @@ -1160,15 +1160,15 @@ func (x *fastReflection_BlockID) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockID) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.BlockID.hash": + case "cometbft.types.v2.BlockID.hash": x.Hash = nil - case "cometbft.types.v1.BlockID.part_set_header": + case "cometbft.types.v2.BlockID.part_set_header": x.PartSetHeader = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockID does not contain field %s", fd.FullName())) } } @@ -1180,17 +1180,17 @@ func (x *fastReflection_BlockID) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_BlockID) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.BlockID.hash": + case "cometbft.types.v2.BlockID.hash": value := x.Hash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.BlockID.part_set_header": + case "cometbft.types.v2.BlockID.part_set_header": value := x.PartSetHeader return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockID does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockID does not contain field %s", descriptor.FullName())) } } @@ -1206,15 +1206,15 @@ func (x *fastReflection_BlockID) Get(descriptor protoreflect.FieldDescriptor) pr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockID) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.BlockID.hash": + case "cometbft.types.v2.BlockID.hash": x.Hash = value.Bytes() - case "cometbft.types.v1.BlockID.part_set_header": + case "cometbft.types.v2.BlockID.part_set_header": x.PartSetHeader = value.Message().Interface().(*PartSetHeader) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockID does not contain field %s", fd.FullName())) } } @@ -1230,18 +1230,18 @@ func (x *fastReflection_BlockID) Set(fd protoreflect.FieldDescriptor, value prot // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockID) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.BlockID.part_set_header": + case "cometbft.types.v2.BlockID.part_set_header": if x.PartSetHeader == nil { x.PartSetHeader = new(PartSetHeader) } return protoreflect.ValueOfMessage(x.PartSetHeader.ProtoReflect()) - case "cometbft.types.v1.BlockID.hash": - panic(fmt.Errorf("field hash of message cometbft.types.v1.BlockID is not mutable")) + case "cometbft.types.v2.BlockID.hash": + panic(fmt.Errorf("field hash of message cometbft.types.v2.BlockID is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockID does not contain field %s", fd.FullName())) } } @@ -1250,16 +1250,16 @@ func (x *fastReflection_BlockID) Mutable(fd protoreflect.FieldDescriptor) protor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_BlockID) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.BlockID.hash": + case "cometbft.types.v2.BlockID.hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.BlockID.part_set_header": + case "cometbft.types.v2.BlockID.part_set_header": m := new(PartSetHeader) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockID")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockID")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockID does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockID does not contain field %s", fd.FullName())) } } @@ -1269,7 +1269,7 @@ func (x *fastReflection_BlockID) NewField(fd protoreflect.FieldDescriptor) proto func (x *fastReflection_BlockID) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.BlockID", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.BlockID", d.FullName())) } panic("unreachable") } @@ -1555,8 +1555,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_Header = File_cometbft_types_v1_types_proto.Messages().ByName("Header") + file_cometbft_types_v2_types_proto_init() + md_Header = File_cometbft_types_v2_types_proto.Messages().ByName("Header") fd_Header_version = md_Header.Fields().ByName("version") fd_Header_chain_id = md_Header.Fields().ByName("chain_id") fd_Header_height = md_Header.Fields().ByName("height") @@ -1582,7 +1582,7 @@ func (x *Header) ProtoReflect() protoreflect.Message { } func (x *Header) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[3] + mi := &file_cometbft_types_v2_types_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1737,39 +1737,39 @@ func (x *fastReflection_Header) Range(f func(protoreflect.FieldDescriptor, proto // a repeated field is populated if it is non-empty. func (x *fastReflection_Header) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Header.version": + case "cometbft.types.v2.Header.version": return x.Version != nil - case "cometbft.types.v1.Header.chain_id": + case "cometbft.types.v2.Header.chain_id": return x.ChainId != "" - case "cometbft.types.v1.Header.height": + case "cometbft.types.v2.Header.height": return x.Height != int64(0) - case "cometbft.types.v1.Header.time": + case "cometbft.types.v2.Header.time": return x.Time != nil - case "cometbft.types.v1.Header.last_block_id": + case "cometbft.types.v2.Header.last_block_id": return x.LastBlockId != nil - case "cometbft.types.v1.Header.last_commit_hash": + case "cometbft.types.v2.Header.last_commit_hash": return len(x.LastCommitHash) != 0 - case "cometbft.types.v1.Header.data_hash": + case "cometbft.types.v2.Header.data_hash": return len(x.DataHash) != 0 - case "cometbft.types.v1.Header.validators_hash": + case "cometbft.types.v2.Header.validators_hash": return len(x.ValidatorsHash) != 0 - case "cometbft.types.v1.Header.next_validators_hash": + case "cometbft.types.v2.Header.next_validators_hash": return len(x.NextValidatorsHash) != 0 - case "cometbft.types.v1.Header.consensus_hash": + case "cometbft.types.v2.Header.consensus_hash": return len(x.ConsensusHash) != 0 - case "cometbft.types.v1.Header.app_hash": + case "cometbft.types.v2.Header.app_hash": return len(x.AppHash) != 0 - case "cometbft.types.v1.Header.last_results_hash": + case "cometbft.types.v2.Header.last_results_hash": return len(x.LastResultsHash) != 0 - case "cometbft.types.v1.Header.evidence_hash": + case "cometbft.types.v2.Header.evidence_hash": return len(x.EvidenceHash) != 0 - case "cometbft.types.v1.Header.proposer_address": + case "cometbft.types.v2.Header.proposer_address": return len(x.ProposerAddress) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Header")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Header")) } - panic(fmt.Errorf("message cometbft.types.v1.Header does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Header does not contain field %s", fd.FullName())) } } @@ -1781,39 +1781,39 @@ func (x *fastReflection_Header) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Header) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Header.version": + case "cometbft.types.v2.Header.version": x.Version = nil - case "cometbft.types.v1.Header.chain_id": + case "cometbft.types.v2.Header.chain_id": x.ChainId = "" - case "cometbft.types.v1.Header.height": + case "cometbft.types.v2.Header.height": x.Height = int64(0) - case "cometbft.types.v1.Header.time": + case "cometbft.types.v2.Header.time": x.Time = nil - case "cometbft.types.v1.Header.last_block_id": + case "cometbft.types.v2.Header.last_block_id": x.LastBlockId = nil - case "cometbft.types.v1.Header.last_commit_hash": + case "cometbft.types.v2.Header.last_commit_hash": x.LastCommitHash = nil - case "cometbft.types.v1.Header.data_hash": + case "cometbft.types.v2.Header.data_hash": x.DataHash = nil - case "cometbft.types.v1.Header.validators_hash": + case "cometbft.types.v2.Header.validators_hash": x.ValidatorsHash = nil - case "cometbft.types.v1.Header.next_validators_hash": + case "cometbft.types.v2.Header.next_validators_hash": x.NextValidatorsHash = nil - case "cometbft.types.v1.Header.consensus_hash": + case "cometbft.types.v2.Header.consensus_hash": x.ConsensusHash = nil - case "cometbft.types.v1.Header.app_hash": + case "cometbft.types.v2.Header.app_hash": x.AppHash = nil - case "cometbft.types.v1.Header.last_results_hash": + case "cometbft.types.v2.Header.last_results_hash": x.LastResultsHash = nil - case "cometbft.types.v1.Header.evidence_hash": + case "cometbft.types.v2.Header.evidence_hash": x.EvidenceHash = nil - case "cometbft.types.v1.Header.proposer_address": + case "cometbft.types.v2.Header.proposer_address": x.ProposerAddress = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Header")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Header")) } - panic(fmt.Errorf("message cometbft.types.v1.Header does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Header does not contain field %s", fd.FullName())) } } @@ -1825,53 +1825,53 @@ func (x *fastReflection_Header) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Header) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Header.version": + case "cometbft.types.v2.Header.version": value := x.Version return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Header.chain_id": + case "cometbft.types.v2.Header.chain_id": value := x.ChainId return protoreflect.ValueOfString(value) - case "cometbft.types.v1.Header.height": + case "cometbft.types.v2.Header.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.Header.time": + case "cometbft.types.v2.Header.time": value := x.Time return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Header.last_block_id": + case "cometbft.types.v2.Header.last_block_id": value := x.LastBlockId return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Header.last_commit_hash": + case "cometbft.types.v2.Header.last_commit_hash": value := x.LastCommitHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Header.data_hash": + case "cometbft.types.v2.Header.data_hash": value := x.DataHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Header.validators_hash": + case "cometbft.types.v2.Header.validators_hash": value := x.ValidatorsHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Header.next_validators_hash": + case "cometbft.types.v2.Header.next_validators_hash": value := x.NextValidatorsHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Header.consensus_hash": + case "cometbft.types.v2.Header.consensus_hash": value := x.ConsensusHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Header.app_hash": + case "cometbft.types.v2.Header.app_hash": value := x.AppHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Header.last_results_hash": + case "cometbft.types.v2.Header.last_results_hash": value := x.LastResultsHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Header.evidence_hash": + case "cometbft.types.v2.Header.evidence_hash": value := x.EvidenceHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Header.proposer_address": + case "cometbft.types.v2.Header.proposer_address": value := x.ProposerAddress return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Header")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Header")) } - panic(fmt.Errorf("message cometbft.types.v1.Header does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Header does not contain field %s", descriptor.FullName())) } } @@ -1887,39 +1887,39 @@ func (x *fastReflection_Header) Get(descriptor protoreflect.FieldDescriptor) pro // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Header) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Header.version": + case "cometbft.types.v2.Header.version": x.Version = value.Message().Interface().(*v11.Consensus) - case "cometbft.types.v1.Header.chain_id": + case "cometbft.types.v2.Header.chain_id": x.ChainId = value.Interface().(string) - case "cometbft.types.v1.Header.height": + case "cometbft.types.v2.Header.height": x.Height = value.Int() - case "cometbft.types.v1.Header.time": + case "cometbft.types.v2.Header.time": x.Time = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.types.v1.Header.last_block_id": + case "cometbft.types.v2.Header.last_block_id": x.LastBlockId = value.Message().Interface().(*BlockID) - case "cometbft.types.v1.Header.last_commit_hash": + case "cometbft.types.v2.Header.last_commit_hash": x.LastCommitHash = value.Bytes() - case "cometbft.types.v1.Header.data_hash": + case "cometbft.types.v2.Header.data_hash": x.DataHash = value.Bytes() - case "cometbft.types.v1.Header.validators_hash": + case "cometbft.types.v2.Header.validators_hash": x.ValidatorsHash = value.Bytes() - case "cometbft.types.v1.Header.next_validators_hash": + case "cometbft.types.v2.Header.next_validators_hash": x.NextValidatorsHash = value.Bytes() - case "cometbft.types.v1.Header.consensus_hash": + case "cometbft.types.v2.Header.consensus_hash": x.ConsensusHash = value.Bytes() - case "cometbft.types.v1.Header.app_hash": + case "cometbft.types.v2.Header.app_hash": x.AppHash = value.Bytes() - case "cometbft.types.v1.Header.last_results_hash": + case "cometbft.types.v2.Header.last_results_hash": x.LastResultsHash = value.Bytes() - case "cometbft.types.v1.Header.evidence_hash": + case "cometbft.types.v2.Header.evidence_hash": x.EvidenceHash = value.Bytes() - case "cometbft.types.v1.Header.proposer_address": + case "cometbft.types.v2.Header.proposer_address": x.ProposerAddress = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Header")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Header")) } - panic(fmt.Errorf("message cometbft.types.v1.Header does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Header does not contain field %s", fd.FullName())) } } @@ -1935,48 +1935,48 @@ func (x *fastReflection_Header) Set(fd protoreflect.FieldDescriptor, value proto // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Header) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Header.version": + case "cometbft.types.v2.Header.version": if x.Version == nil { x.Version = new(v11.Consensus) } return protoreflect.ValueOfMessage(x.Version.ProtoReflect()) - case "cometbft.types.v1.Header.time": + case "cometbft.types.v2.Header.time": if x.Time == nil { x.Time = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Time.ProtoReflect()) - case "cometbft.types.v1.Header.last_block_id": + case "cometbft.types.v2.Header.last_block_id": if x.LastBlockId == nil { x.LastBlockId = new(BlockID) } return protoreflect.ValueOfMessage(x.LastBlockId.ProtoReflect()) - case "cometbft.types.v1.Header.chain_id": - panic(fmt.Errorf("field chain_id of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.last_commit_hash": - panic(fmt.Errorf("field last_commit_hash of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.data_hash": - panic(fmt.Errorf("field data_hash of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.validators_hash": - panic(fmt.Errorf("field validators_hash of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.next_validators_hash": - panic(fmt.Errorf("field next_validators_hash of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.consensus_hash": - panic(fmt.Errorf("field consensus_hash of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.app_hash": - panic(fmt.Errorf("field app_hash of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.last_results_hash": - panic(fmt.Errorf("field last_results_hash of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.evidence_hash": - panic(fmt.Errorf("field evidence_hash of message cometbft.types.v1.Header is not mutable")) - case "cometbft.types.v1.Header.proposer_address": - panic(fmt.Errorf("field proposer_address of message cometbft.types.v1.Header is not mutable")) + case "cometbft.types.v2.Header.chain_id": + panic(fmt.Errorf("field chain_id of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.last_commit_hash": + panic(fmt.Errorf("field last_commit_hash of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.data_hash": + panic(fmt.Errorf("field data_hash of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.validators_hash": + panic(fmt.Errorf("field validators_hash of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.next_validators_hash": + panic(fmt.Errorf("field next_validators_hash of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.consensus_hash": + panic(fmt.Errorf("field consensus_hash of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.app_hash": + panic(fmt.Errorf("field app_hash of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.last_results_hash": + panic(fmt.Errorf("field last_results_hash of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.evidence_hash": + panic(fmt.Errorf("field evidence_hash of message cometbft.types.v2.Header is not mutable")) + case "cometbft.types.v2.Header.proposer_address": + panic(fmt.Errorf("field proposer_address of message cometbft.types.v2.Header is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Header")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Header")) } - panic(fmt.Errorf("message cometbft.types.v1.Header does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Header does not contain field %s", fd.FullName())) } } @@ -1985,42 +1985,42 @@ func (x *fastReflection_Header) Mutable(fd protoreflect.FieldDescriptor) protore // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Header) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Header.version": + case "cometbft.types.v2.Header.version": m := new(v11.Consensus) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Header.chain_id": + case "cometbft.types.v2.Header.chain_id": return protoreflect.ValueOfString("") - case "cometbft.types.v1.Header.height": + case "cometbft.types.v2.Header.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.Header.time": + case "cometbft.types.v2.Header.time": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Header.last_block_id": + case "cometbft.types.v2.Header.last_block_id": m := new(BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Header.last_commit_hash": + case "cometbft.types.v2.Header.last_commit_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Header.data_hash": + case "cometbft.types.v2.Header.data_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Header.validators_hash": + case "cometbft.types.v2.Header.validators_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Header.next_validators_hash": + case "cometbft.types.v2.Header.next_validators_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Header.consensus_hash": + case "cometbft.types.v2.Header.consensus_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Header.app_hash": + case "cometbft.types.v2.Header.app_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Header.last_results_hash": + case "cometbft.types.v2.Header.last_results_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Header.evidence_hash": + case "cometbft.types.v2.Header.evidence_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Header.proposer_address": + case "cometbft.types.v2.Header.proposer_address": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Header")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Header")) } - panic(fmt.Errorf("message cometbft.types.v1.Header does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Header does not contain field %s", fd.FullName())) } } @@ -2030,7 +2030,7 @@ func (x *fastReflection_Header) NewField(fd protoreflect.FieldDescriptor) protor func (x *fastReflection_Header) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Header", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Header", d.FullName())) } panic("unreachable") } @@ -2887,8 +2887,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_Data = File_cometbft_types_v1_types_proto.Messages().ByName("Data") + file_cometbft_types_v2_types_proto_init() + md_Data = File_cometbft_types_v2_types_proto.Messages().ByName("Data") fd_Data_txs = md_Data.Fields().ByName("txs") } @@ -2901,7 +2901,7 @@ func (x *Data) ProtoReflect() protoreflect.Message { } func (x *Data) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[4] + mi := &file_cometbft_types_v2_types_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2978,13 +2978,13 @@ func (x *fastReflection_Data) Range(f func(protoreflect.FieldDescriptor, protore // a repeated field is populated if it is non-empty. func (x *fastReflection_Data) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Data.txs": + case "cometbft.types.v2.Data.txs": return len(x.Txs) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Data")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Data")) } - panic(fmt.Errorf("message cometbft.types.v1.Data does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Data does not contain field %s", fd.FullName())) } } @@ -2996,13 +2996,13 @@ func (x *fastReflection_Data) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Data) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Data.txs": + case "cometbft.types.v2.Data.txs": x.Txs = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Data")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Data")) } - panic(fmt.Errorf("message cometbft.types.v1.Data does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Data does not contain field %s", fd.FullName())) } } @@ -3014,7 +3014,7 @@ func (x *fastReflection_Data) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Data) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Data.txs": + case "cometbft.types.v2.Data.txs": if len(x.Txs) == 0 { return protoreflect.ValueOfList(&_Data_1_list{}) } @@ -3022,9 +3022,9 @@ func (x *fastReflection_Data) Get(descriptor protoreflect.FieldDescriptor) proto return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Data")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Data")) } - panic(fmt.Errorf("message cometbft.types.v1.Data does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Data does not contain field %s", descriptor.FullName())) } } @@ -3040,15 +3040,15 @@ func (x *fastReflection_Data) Get(descriptor protoreflect.FieldDescriptor) proto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Data) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Data.txs": + case "cometbft.types.v2.Data.txs": lv := value.List() clv := lv.(*_Data_1_list) x.Txs = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Data")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Data")) } - panic(fmt.Errorf("message cometbft.types.v1.Data does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Data does not contain field %s", fd.FullName())) } } @@ -3064,7 +3064,7 @@ func (x *fastReflection_Data) Set(fd protoreflect.FieldDescriptor, value protore // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Data) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Data.txs": + case "cometbft.types.v2.Data.txs": if x.Txs == nil { x.Txs = [][]byte{} } @@ -3072,9 +3072,9 @@ func (x *fastReflection_Data) Mutable(fd protoreflect.FieldDescriptor) protorefl return protoreflect.ValueOfList(value) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Data")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Data")) } - panic(fmt.Errorf("message cometbft.types.v1.Data does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Data does not contain field %s", fd.FullName())) } } @@ -3083,14 +3083,14 @@ func (x *fastReflection_Data) Mutable(fd protoreflect.FieldDescriptor) protorefl // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Data) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Data.txs": + case "cometbft.types.v2.Data.txs": list := [][]byte{} return protoreflect.ValueOfList(&_Data_1_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Data")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Data")) } - panic(fmt.Errorf("message cometbft.types.v1.Data does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Data does not contain field %s", fd.FullName())) } } @@ -3100,7 +3100,7 @@ func (x *fastReflection_Data) NewField(fd protoreflect.FieldDescriptor) protoref func (x *fastReflection_Data) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Data", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Data", d.FullName())) } panic("unreachable") } @@ -3316,22 +3316,24 @@ func (x *fastReflection_Data) ProtoMethods() *protoiface.Methods { } var ( - md_Vote protoreflect.MessageDescriptor - fd_Vote_type protoreflect.FieldDescriptor - fd_Vote_height protoreflect.FieldDescriptor - fd_Vote_round protoreflect.FieldDescriptor - fd_Vote_block_id protoreflect.FieldDescriptor - fd_Vote_timestamp protoreflect.FieldDescriptor - fd_Vote_validator_address protoreflect.FieldDescriptor - fd_Vote_validator_index protoreflect.FieldDescriptor - fd_Vote_signature protoreflect.FieldDescriptor - fd_Vote_extension protoreflect.FieldDescriptor - fd_Vote_extension_signature protoreflect.FieldDescriptor + md_Vote protoreflect.MessageDescriptor + fd_Vote_type protoreflect.FieldDescriptor + fd_Vote_height protoreflect.FieldDescriptor + fd_Vote_round protoreflect.FieldDescriptor + fd_Vote_block_id protoreflect.FieldDescriptor + fd_Vote_timestamp protoreflect.FieldDescriptor + fd_Vote_validator_address protoreflect.FieldDescriptor + fd_Vote_validator_index protoreflect.FieldDescriptor + fd_Vote_signature protoreflect.FieldDescriptor + fd_Vote_extension protoreflect.FieldDescriptor + fd_Vote_extension_signature protoreflect.FieldDescriptor + fd_Vote_non_rp_extension protoreflect.FieldDescriptor + fd_Vote_non_rp_extension_signature protoreflect.FieldDescriptor ) func init() { - file_cometbft_types_v1_types_proto_init() - md_Vote = File_cometbft_types_v1_types_proto.Messages().ByName("Vote") + file_cometbft_types_v2_types_proto_init() + md_Vote = File_cometbft_types_v2_types_proto.Messages().ByName("Vote") fd_Vote_type = md_Vote.Fields().ByName("type") fd_Vote_height = md_Vote.Fields().ByName("height") fd_Vote_round = md_Vote.Fields().ByName("round") @@ -3342,6 +3344,8 @@ func init() { fd_Vote_signature = md_Vote.Fields().ByName("signature") fd_Vote_extension = md_Vote.Fields().ByName("extension") fd_Vote_extension_signature = md_Vote.Fields().ByName("extension_signature") + fd_Vote_non_rp_extension = md_Vote.Fields().ByName("non_rp_extension") + fd_Vote_non_rp_extension_signature = md_Vote.Fields().ByName("non_rp_extension_signature") } var _ protoreflect.Message = (*fastReflection_Vote)(nil) @@ -3353,7 +3357,7 @@ func (x *Vote) ProtoReflect() protoreflect.Message { } func (x *Vote) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[5] + mi := &file_cometbft_types_v2_types_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3469,6 +3473,18 @@ func (x *fastReflection_Vote) Range(f func(protoreflect.FieldDescriptor, protore return } } + if len(x.NonRpExtension) != 0 { + value := protoreflect.ValueOfBytes(x.NonRpExtension) + if !f(fd_Vote_non_rp_extension, value) { + return + } + } + if len(x.NonRpExtensionSignature) != 0 { + value := protoreflect.ValueOfBytes(x.NonRpExtensionSignature) + if !f(fd_Vote_non_rp_extension_signature, value) { + return + } + } } // Has reports whether a field is populated. @@ -3484,31 +3500,35 @@ func (x *fastReflection_Vote) Range(f func(protoreflect.FieldDescriptor, protore // a repeated field is populated if it is non-empty. func (x *fastReflection_Vote) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Vote.type": + case "cometbft.types.v2.Vote.type": return x.Type_ != 0 - case "cometbft.types.v1.Vote.height": + case "cometbft.types.v2.Vote.height": return x.Height != int64(0) - case "cometbft.types.v1.Vote.round": + case "cometbft.types.v2.Vote.round": return x.Round != int32(0) - case "cometbft.types.v1.Vote.block_id": + case "cometbft.types.v2.Vote.block_id": return x.BlockId != nil - case "cometbft.types.v1.Vote.timestamp": + case "cometbft.types.v2.Vote.timestamp": return x.Timestamp != nil - case "cometbft.types.v1.Vote.validator_address": + case "cometbft.types.v2.Vote.validator_address": return len(x.ValidatorAddress) != 0 - case "cometbft.types.v1.Vote.validator_index": + case "cometbft.types.v2.Vote.validator_index": return x.ValidatorIndex != int32(0) - case "cometbft.types.v1.Vote.signature": + case "cometbft.types.v2.Vote.signature": return len(x.Signature) != 0 - case "cometbft.types.v1.Vote.extension": + case "cometbft.types.v2.Vote.extension": return len(x.Extension) != 0 - case "cometbft.types.v1.Vote.extension_signature": + case "cometbft.types.v2.Vote.extension_signature": return len(x.ExtensionSignature) != 0 + case "cometbft.types.v2.Vote.non_rp_extension": + return len(x.NonRpExtension) != 0 + case "cometbft.types.v2.Vote.non_rp_extension_signature": + return len(x.NonRpExtensionSignature) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Vote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Vote")) } - panic(fmt.Errorf("message cometbft.types.v1.Vote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Vote does not contain field %s", fd.FullName())) } } @@ -3520,31 +3540,35 @@ func (x *fastReflection_Vote) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Vote) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Vote.type": + case "cometbft.types.v2.Vote.type": x.Type_ = 0 - case "cometbft.types.v1.Vote.height": + case "cometbft.types.v2.Vote.height": x.Height = int64(0) - case "cometbft.types.v1.Vote.round": + case "cometbft.types.v2.Vote.round": x.Round = int32(0) - case "cometbft.types.v1.Vote.block_id": + case "cometbft.types.v2.Vote.block_id": x.BlockId = nil - case "cometbft.types.v1.Vote.timestamp": + case "cometbft.types.v2.Vote.timestamp": x.Timestamp = nil - case "cometbft.types.v1.Vote.validator_address": + case "cometbft.types.v2.Vote.validator_address": x.ValidatorAddress = nil - case "cometbft.types.v1.Vote.validator_index": + case "cometbft.types.v2.Vote.validator_index": x.ValidatorIndex = int32(0) - case "cometbft.types.v1.Vote.signature": + case "cometbft.types.v2.Vote.signature": x.Signature = nil - case "cometbft.types.v1.Vote.extension": + case "cometbft.types.v2.Vote.extension": x.Extension = nil - case "cometbft.types.v1.Vote.extension_signature": + case "cometbft.types.v2.Vote.extension_signature": x.ExtensionSignature = nil + case "cometbft.types.v2.Vote.non_rp_extension": + x.NonRpExtension = nil + case "cometbft.types.v2.Vote.non_rp_extension_signature": + x.NonRpExtensionSignature = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Vote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Vote")) } - panic(fmt.Errorf("message cometbft.types.v1.Vote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Vote does not contain field %s", fd.FullName())) } } @@ -3556,41 +3580,47 @@ func (x *fastReflection_Vote) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Vote) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Vote.type": + case "cometbft.types.v2.Vote.type": value := x.Type_ return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "cometbft.types.v1.Vote.height": + case "cometbft.types.v2.Vote.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.Vote.round": + case "cometbft.types.v2.Vote.round": value := x.Round return protoreflect.ValueOfInt32(value) - case "cometbft.types.v1.Vote.block_id": + case "cometbft.types.v2.Vote.block_id": value := x.BlockId return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Vote.timestamp": + case "cometbft.types.v2.Vote.timestamp": value := x.Timestamp return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Vote.validator_address": + case "cometbft.types.v2.Vote.validator_address": value := x.ValidatorAddress return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Vote.validator_index": + case "cometbft.types.v2.Vote.validator_index": value := x.ValidatorIndex return protoreflect.ValueOfInt32(value) - case "cometbft.types.v1.Vote.signature": + case "cometbft.types.v2.Vote.signature": value := x.Signature return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Vote.extension": + case "cometbft.types.v2.Vote.extension": value := x.Extension return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Vote.extension_signature": + case "cometbft.types.v2.Vote.extension_signature": value := x.ExtensionSignature return protoreflect.ValueOfBytes(value) + case "cometbft.types.v2.Vote.non_rp_extension": + value := x.NonRpExtension + return protoreflect.ValueOfBytes(value) + case "cometbft.types.v2.Vote.non_rp_extension_signature": + value := x.NonRpExtensionSignature + return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Vote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Vote")) } - panic(fmt.Errorf("message cometbft.types.v1.Vote does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Vote does not contain field %s", descriptor.FullName())) } } @@ -3606,31 +3636,35 @@ func (x *fastReflection_Vote) Get(descriptor protoreflect.FieldDescriptor) proto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Vote) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Vote.type": + case "cometbft.types.v2.Vote.type": x.Type_ = (SignedMsgType)(value.Enum()) - case "cometbft.types.v1.Vote.height": + case "cometbft.types.v2.Vote.height": x.Height = value.Int() - case "cometbft.types.v1.Vote.round": + case "cometbft.types.v2.Vote.round": x.Round = int32(value.Int()) - case "cometbft.types.v1.Vote.block_id": + case "cometbft.types.v2.Vote.block_id": x.BlockId = value.Message().Interface().(*BlockID) - case "cometbft.types.v1.Vote.timestamp": + case "cometbft.types.v2.Vote.timestamp": x.Timestamp = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.types.v1.Vote.validator_address": + case "cometbft.types.v2.Vote.validator_address": x.ValidatorAddress = value.Bytes() - case "cometbft.types.v1.Vote.validator_index": + case "cometbft.types.v2.Vote.validator_index": x.ValidatorIndex = int32(value.Int()) - case "cometbft.types.v1.Vote.signature": + case "cometbft.types.v2.Vote.signature": x.Signature = value.Bytes() - case "cometbft.types.v1.Vote.extension": + case "cometbft.types.v2.Vote.extension": x.Extension = value.Bytes() - case "cometbft.types.v1.Vote.extension_signature": + case "cometbft.types.v2.Vote.extension_signature": x.ExtensionSignature = value.Bytes() + case "cometbft.types.v2.Vote.non_rp_extension": + x.NonRpExtension = value.Bytes() + case "cometbft.types.v2.Vote.non_rp_extension_signature": + x.NonRpExtensionSignature = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Vote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Vote")) } - panic(fmt.Errorf("message cometbft.types.v1.Vote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Vote does not contain field %s", fd.FullName())) } } @@ -3646,37 +3680,41 @@ func (x *fastReflection_Vote) Set(fd protoreflect.FieldDescriptor, value protore // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Vote) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Vote.block_id": + case "cometbft.types.v2.Vote.block_id": if x.BlockId == nil { x.BlockId = new(BlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) - case "cometbft.types.v1.Vote.timestamp": + case "cometbft.types.v2.Vote.timestamp": if x.Timestamp == nil { x.Timestamp = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Timestamp.ProtoReflect()) - case "cometbft.types.v1.Vote.type": - panic(fmt.Errorf("field type of message cometbft.types.v1.Vote is not mutable")) - case "cometbft.types.v1.Vote.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.Vote is not mutable")) - case "cometbft.types.v1.Vote.round": - panic(fmt.Errorf("field round of message cometbft.types.v1.Vote is not mutable")) - case "cometbft.types.v1.Vote.validator_address": - panic(fmt.Errorf("field validator_address of message cometbft.types.v1.Vote is not mutable")) - case "cometbft.types.v1.Vote.validator_index": - panic(fmt.Errorf("field validator_index of message cometbft.types.v1.Vote is not mutable")) - case "cometbft.types.v1.Vote.signature": - panic(fmt.Errorf("field signature of message cometbft.types.v1.Vote is not mutable")) - case "cometbft.types.v1.Vote.extension": - panic(fmt.Errorf("field extension of message cometbft.types.v1.Vote is not mutable")) - case "cometbft.types.v1.Vote.extension_signature": - panic(fmt.Errorf("field extension_signature of message cometbft.types.v1.Vote is not mutable")) + case "cometbft.types.v2.Vote.type": + panic(fmt.Errorf("field type of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.round": + panic(fmt.Errorf("field round of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.validator_address": + panic(fmt.Errorf("field validator_address of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.validator_index": + panic(fmt.Errorf("field validator_index of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.signature": + panic(fmt.Errorf("field signature of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.extension": + panic(fmt.Errorf("field extension of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.extension_signature": + panic(fmt.Errorf("field extension_signature of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.non_rp_extension": + panic(fmt.Errorf("field non_rp_extension of message cometbft.types.v2.Vote is not mutable")) + case "cometbft.types.v2.Vote.non_rp_extension_signature": + panic(fmt.Errorf("field non_rp_extension_signature of message cometbft.types.v2.Vote is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Vote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Vote")) } - panic(fmt.Errorf("message cometbft.types.v1.Vote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Vote does not contain field %s", fd.FullName())) } } @@ -3685,33 +3723,37 @@ func (x *fastReflection_Vote) Mutable(fd protoreflect.FieldDescriptor) protorefl // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Vote) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Vote.type": + case "cometbft.types.v2.Vote.type": return protoreflect.ValueOfEnum(0) - case "cometbft.types.v1.Vote.height": + case "cometbft.types.v2.Vote.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.Vote.round": + case "cometbft.types.v2.Vote.round": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.types.v1.Vote.block_id": + case "cometbft.types.v2.Vote.block_id": m := new(BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Vote.timestamp": + case "cometbft.types.v2.Vote.timestamp": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Vote.validator_address": + case "cometbft.types.v2.Vote.validator_address": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Vote.validator_index": + case "cometbft.types.v2.Vote.validator_index": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.types.v1.Vote.signature": + case "cometbft.types.v2.Vote.signature": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Vote.extension": + case "cometbft.types.v2.Vote.extension": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Vote.extension_signature": + case "cometbft.types.v2.Vote.extension_signature": + return protoreflect.ValueOfBytes(nil) + case "cometbft.types.v2.Vote.non_rp_extension": + return protoreflect.ValueOfBytes(nil) + case "cometbft.types.v2.Vote.non_rp_extension_signature": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Vote")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Vote")) } - panic(fmt.Errorf("message cometbft.types.v1.Vote does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Vote does not contain field %s", fd.FullName())) } } @@ -3721,7 +3763,7 @@ func (x *fastReflection_Vote) NewField(fd protoreflect.FieldDescriptor) protoref func (x *fastReflection_Vote) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Vote", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Vote", d.FullName())) } panic("unreachable") } @@ -3812,6 +3854,14 @@ func (x *fastReflection_Vote) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + l = len(x.NonRpExtension) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } + l = len(x.NonRpExtensionSignature) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -3841,6 +3891,20 @@ func (x *fastReflection_Vote) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.NonRpExtensionSignature) > 0 { + i -= len(x.NonRpExtensionSignature) + copy(dAtA[i:], x.NonRpExtensionSignature) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.NonRpExtensionSignature))) + i-- + dAtA[i] = 0x62 + } + if len(x.NonRpExtension) > 0 { + i -= len(x.NonRpExtension) + copy(dAtA[i:], x.NonRpExtension) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.NonRpExtension))) + i-- + dAtA[i] = 0x5a + } if len(x.ExtensionSignature) > 0 { i -= len(x.ExtensionSignature) copy(dAtA[i:], x.ExtensionSignature) @@ -4250,6 +4314,74 @@ func (x *fastReflection_Vote) ProtoMethods() *protoiface.Methods { x.ExtensionSignature = []byte{} } iNdEx = postIndex + case 11: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NonRpExtension", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.NonRpExtension = append(x.NonRpExtension[:0], dAtA[iNdEx:postIndex]...) + if x.NonRpExtension == nil { + x.NonRpExtension = []byte{} + } + iNdEx = postIndex + case 12: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NonRpExtensionSignature", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.NonRpExtensionSignature = append(x.NonRpExtensionSignature[:0], dAtA[iNdEx:postIndex]...) + if x.NonRpExtensionSignature == nil { + x.NonRpExtensionSignature = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -4345,8 +4477,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_Commit = File_cometbft_types_v1_types_proto.Messages().ByName("Commit") + file_cometbft_types_v2_types_proto_init() + md_Commit = File_cometbft_types_v2_types_proto.Messages().ByName("Commit") fd_Commit_height = md_Commit.Fields().ByName("height") fd_Commit_round = md_Commit.Fields().ByName("round") fd_Commit_block_id = md_Commit.Fields().ByName("block_id") @@ -4362,7 +4494,7 @@ func (x *Commit) ProtoReflect() protoreflect.Message { } func (x *Commit) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[6] + mi := &file_cometbft_types_v2_types_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4457,19 +4589,19 @@ func (x *fastReflection_Commit) Range(f func(protoreflect.FieldDescriptor, proto // a repeated field is populated if it is non-empty. func (x *fastReflection_Commit) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Commit.height": + case "cometbft.types.v2.Commit.height": return x.Height != int64(0) - case "cometbft.types.v1.Commit.round": + case "cometbft.types.v2.Commit.round": return x.Round != int32(0) - case "cometbft.types.v1.Commit.block_id": + case "cometbft.types.v2.Commit.block_id": return x.BlockId != nil - case "cometbft.types.v1.Commit.signatures": + case "cometbft.types.v2.Commit.signatures": return len(x.Signatures) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Commit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Commit")) } - panic(fmt.Errorf("message cometbft.types.v1.Commit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Commit does not contain field %s", fd.FullName())) } } @@ -4481,19 +4613,19 @@ func (x *fastReflection_Commit) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Commit) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Commit.height": + case "cometbft.types.v2.Commit.height": x.Height = int64(0) - case "cometbft.types.v1.Commit.round": + case "cometbft.types.v2.Commit.round": x.Round = int32(0) - case "cometbft.types.v1.Commit.block_id": + case "cometbft.types.v2.Commit.block_id": x.BlockId = nil - case "cometbft.types.v1.Commit.signatures": + case "cometbft.types.v2.Commit.signatures": x.Signatures = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Commit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Commit")) } - panic(fmt.Errorf("message cometbft.types.v1.Commit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Commit does not contain field %s", fd.FullName())) } } @@ -4505,16 +4637,16 @@ func (x *fastReflection_Commit) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Commit) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Commit.height": + case "cometbft.types.v2.Commit.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.Commit.round": + case "cometbft.types.v2.Commit.round": value := x.Round return protoreflect.ValueOfInt32(value) - case "cometbft.types.v1.Commit.block_id": + case "cometbft.types.v2.Commit.block_id": value := x.BlockId return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Commit.signatures": + case "cometbft.types.v2.Commit.signatures": if len(x.Signatures) == 0 { return protoreflect.ValueOfList(&_Commit_4_list{}) } @@ -4522,9 +4654,9 @@ func (x *fastReflection_Commit) Get(descriptor protoreflect.FieldDescriptor) pro return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Commit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Commit")) } - panic(fmt.Errorf("message cometbft.types.v1.Commit does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Commit does not contain field %s", descriptor.FullName())) } } @@ -4540,21 +4672,21 @@ func (x *fastReflection_Commit) Get(descriptor protoreflect.FieldDescriptor) pro // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Commit) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Commit.height": + case "cometbft.types.v2.Commit.height": x.Height = value.Int() - case "cometbft.types.v1.Commit.round": + case "cometbft.types.v2.Commit.round": x.Round = int32(value.Int()) - case "cometbft.types.v1.Commit.block_id": + case "cometbft.types.v2.Commit.block_id": x.BlockId = value.Message().Interface().(*BlockID) - case "cometbft.types.v1.Commit.signatures": + case "cometbft.types.v2.Commit.signatures": lv := value.List() clv := lv.(*_Commit_4_list) x.Signatures = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Commit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Commit")) } - panic(fmt.Errorf("message cometbft.types.v1.Commit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Commit does not contain field %s", fd.FullName())) } } @@ -4570,26 +4702,26 @@ func (x *fastReflection_Commit) Set(fd protoreflect.FieldDescriptor, value proto // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Commit) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Commit.block_id": + case "cometbft.types.v2.Commit.block_id": if x.BlockId == nil { x.BlockId = new(BlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) - case "cometbft.types.v1.Commit.signatures": + case "cometbft.types.v2.Commit.signatures": if x.Signatures == nil { x.Signatures = []*CommitSig{} } value := &_Commit_4_list{list: &x.Signatures} return protoreflect.ValueOfList(value) - case "cometbft.types.v1.Commit.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.Commit is not mutable")) - case "cometbft.types.v1.Commit.round": - panic(fmt.Errorf("field round of message cometbft.types.v1.Commit is not mutable")) + case "cometbft.types.v2.Commit.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.Commit is not mutable")) + case "cometbft.types.v2.Commit.round": + panic(fmt.Errorf("field round of message cometbft.types.v2.Commit is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Commit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Commit")) } - panic(fmt.Errorf("message cometbft.types.v1.Commit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Commit does not contain field %s", fd.FullName())) } } @@ -4598,21 +4730,21 @@ func (x *fastReflection_Commit) Mutable(fd protoreflect.FieldDescriptor) protore // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Commit) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Commit.height": + case "cometbft.types.v2.Commit.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.Commit.round": + case "cometbft.types.v2.Commit.round": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.types.v1.Commit.block_id": + case "cometbft.types.v2.Commit.block_id": m := new(BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Commit.signatures": + case "cometbft.types.v2.Commit.signatures": list := []*CommitSig{} return protoreflect.ValueOfList(&_Commit_4_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Commit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Commit")) } - panic(fmt.Errorf("message cometbft.types.v1.Commit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Commit does not contain field %s", fd.FullName())) } } @@ -4622,7 +4754,7 @@ func (x *fastReflection_Commit) NewField(fd protoreflect.FieldDescriptor) protor func (x *fastReflection_Commit) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Commit", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Commit", d.FullName())) } panic("unreachable") } @@ -4963,8 +5095,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_CommitSig = File_cometbft_types_v1_types_proto.Messages().ByName("CommitSig") + file_cometbft_types_v2_types_proto_init() + md_CommitSig = File_cometbft_types_v2_types_proto.Messages().ByName("CommitSig") fd_CommitSig_block_id_flag = md_CommitSig.Fields().ByName("block_id_flag") fd_CommitSig_validator_address = md_CommitSig.Fields().ByName("validator_address") fd_CommitSig_timestamp = md_CommitSig.Fields().ByName("timestamp") @@ -4980,7 +5112,7 @@ func (x *CommitSig) ProtoReflect() protoreflect.Message { } func (x *CommitSig) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[7] + mi := &file_cometbft_types_v2_types_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5075,19 +5207,19 @@ func (x *fastReflection_CommitSig) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_CommitSig) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.CommitSig.block_id_flag": + case "cometbft.types.v2.CommitSig.block_id_flag": return x.BlockIdFlag != 0 - case "cometbft.types.v1.CommitSig.validator_address": + case "cometbft.types.v2.CommitSig.validator_address": return len(x.ValidatorAddress) != 0 - case "cometbft.types.v1.CommitSig.timestamp": + case "cometbft.types.v2.CommitSig.timestamp": return x.Timestamp != nil - case "cometbft.types.v1.CommitSig.signature": + case "cometbft.types.v2.CommitSig.signature": return len(x.Signature) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.CommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CommitSig does not contain field %s", fd.FullName())) } } @@ -5099,19 +5231,19 @@ func (x *fastReflection_CommitSig) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitSig) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.CommitSig.block_id_flag": + case "cometbft.types.v2.CommitSig.block_id_flag": x.BlockIdFlag = 0 - case "cometbft.types.v1.CommitSig.validator_address": + case "cometbft.types.v2.CommitSig.validator_address": x.ValidatorAddress = nil - case "cometbft.types.v1.CommitSig.timestamp": + case "cometbft.types.v2.CommitSig.timestamp": x.Timestamp = nil - case "cometbft.types.v1.CommitSig.signature": + case "cometbft.types.v2.CommitSig.signature": x.Signature = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.CommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CommitSig does not contain field %s", fd.FullName())) } } @@ -5123,23 +5255,23 @@ func (x *fastReflection_CommitSig) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_CommitSig) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.CommitSig.block_id_flag": + case "cometbft.types.v2.CommitSig.block_id_flag": value := x.BlockIdFlag return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "cometbft.types.v1.CommitSig.validator_address": + case "cometbft.types.v2.CommitSig.validator_address": value := x.ValidatorAddress return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.CommitSig.timestamp": + case "cometbft.types.v2.CommitSig.timestamp": value := x.Timestamp return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.CommitSig.signature": + case "cometbft.types.v2.CommitSig.signature": value := x.Signature return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.CommitSig does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CommitSig does not contain field %s", descriptor.FullName())) } } @@ -5155,19 +5287,19 @@ func (x *fastReflection_CommitSig) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitSig) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.CommitSig.block_id_flag": + case "cometbft.types.v2.CommitSig.block_id_flag": x.BlockIdFlag = (BlockIDFlag)(value.Enum()) - case "cometbft.types.v1.CommitSig.validator_address": + case "cometbft.types.v2.CommitSig.validator_address": x.ValidatorAddress = value.Bytes() - case "cometbft.types.v1.CommitSig.timestamp": + case "cometbft.types.v2.CommitSig.timestamp": x.Timestamp = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.types.v1.CommitSig.signature": + case "cometbft.types.v2.CommitSig.signature": x.Signature = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.CommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CommitSig does not contain field %s", fd.FullName())) } } @@ -5183,22 +5315,22 @@ func (x *fastReflection_CommitSig) Set(fd protoreflect.FieldDescriptor, value pr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_CommitSig) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CommitSig.timestamp": + case "cometbft.types.v2.CommitSig.timestamp": if x.Timestamp == nil { x.Timestamp = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Timestamp.ProtoReflect()) - case "cometbft.types.v1.CommitSig.block_id_flag": - panic(fmt.Errorf("field block_id_flag of message cometbft.types.v1.CommitSig is not mutable")) - case "cometbft.types.v1.CommitSig.validator_address": - panic(fmt.Errorf("field validator_address of message cometbft.types.v1.CommitSig is not mutable")) - case "cometbft.types.v1.CommitSig.signature": - panic(fmt.Errorf("field signature of message cometbft.types.v1.CommitSig is not mutable")) + case "cometbft.types.v2.CommitSig.block_id_flag": + panic(fmt.Errorf("field block_id_flag of message cometbft.types.v2.CommitSig is not mutable")) + case "cometbft.types.v2.CommitSig.validator_address": + panic(fmt.Errorf("field validator_address of message cometbft.types.v2.CommitSig is not mutable")) + case "cometbft.types.v2.CommitSig.signature": + panic(fmt.Errorf("field signature of message cometbft.types.v2.CommitSig is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.CommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CommitSig does not contain field %s", fd.FullName())) } } @@ -5207,20 +5339,20 @@ func (x *fastReflection_CommitSig) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_CommitSig) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.CommitSig.block_id_flag": + case "cometbft.types.v2.CommitSig.block_id_flag": return protoreflect.ValueOfEnum(0) - case "cometbft.types.v1.CommitSig.validator_address": + case "cometbft.types.v2.CommitSig.validator_address": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.CommitSig.timestamp": + case "cometbft.types.v2.CommitSig.timestamp": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.CommitSig.signature": + case "cometbft.types.v2.CommitSig.signature": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.CommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.CommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.CommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.CommitSig does not contain field %s", fd.FullName())) } } @@ -5230,7 +5362,7 @@ func (x *fastReflection_CommitSig) NewField(fd protoreflect.FieldDescriptor) pro func (x *fastReflection_CommitSig) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.CommitSig", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.CommitSig", d.FullName())) } panic("unreachable") } @@ -5629,8 +5761,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_ExtendedCommit = File_cometbft_types_v1_types_proto.Messages().ByName("ExtendedCommit") + file_cometbft_types_v2_types_proto_init() + md_ExtendedCommit = File_cometbft_types_v2_types_proto.Messages().ByName("ExtendedCommit") fd_ExtendedCommit_height = md_ExtendedCommit.Fields().ByName("height") fd_ExtendedCommit_round = md_ExtendedCommit.Fields().ByName("round") fd_ExtendedCommit_block_id = md_ExtendedCommit.Fields().ByName("block_id") @@ -5646,7 +5778,7 @@ func (x *ExtendedCommit) ProtoReflect() protoreflect.Message { } func (x *ExtendedCommit) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[8] + mi := &file_cometbft_types_v2_types_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5741,19 +5873,19 @@ func (x *fastReflection_ExtendedCommit) Range(f func(protoreflect.FieldDescripto // a repeated field is populated if it is non-empty. func (x *fastReflection_ExtendedCommit) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommit.height": + case "cometbft.types.v2.ExtendedCommit.height": return x.Height != int64(0) - case "cometbft.types.v1.ExtendedCommit.round": + case "cometbft.types.v2.ExtendedCommit.round": return x.Round != int32(0) - case "cometbft.types.v1.ExtendedCommit.block_id": + case "cometbft.types.v2.ExtendedCommit.block_id": return x.BlockId != nil - case "cometbft.types.v1.ExtendedCommit.extended_signatures": + case "cometbft.types.v2.ExtendedCommit.extended_signatures": return len(x.ExtendedSignatures) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommit")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommit does not contain field %s", fd.FullName())) } } @@ -5765,19 +5897,19 @@ func (x *fastReflection_ExtendedCommit) Has(fd protoreflect.FieldDescriptor) boo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommit) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommit.height": + case "cometbft.types.v2.ExtendedCommit.height": x.Height = int64(0) - case "cometbft.types.v1.ExtendedCommit.round": + case "cometbft.types.v2.ExtendedCommit.round": x.Round = int32(0) - case "cometbft.types.v1.ExtendedCommit.block_id": + case "cometbft.types.v2.ExtendedCommit.block_id": x.BlockId = nil - case "cometbft.types.v1.ExtendedCommit.extended_signatures": + case "cometbft.types.v2.ExtendedCommit.extended_signatures": x.ExtendedSignatures = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommit")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommit does not contain field %s", fd.FullName())) } } @@ -5789,16 +5921,16 @@ func (x *fastReflection_ExtendedCommit) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ExtendedCommit) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.ExtendedCommit.height": + case "cometbft.types.v2.ExtendedCommit.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.ExtendedCommit.round": + case "cometbft.types.v2.ExtendedCommit.round": value := x.Round return protoreflect.ValueOfInt32(value) - case "cometbft.types.v1.ExtendedCommit.block_id": + case "cometbft.types.v2.ExtendedCommit.block_id": value := x.BlockId return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ExtendedCommit.extended_signatures": + case "cometbft.types.v2.ExtendedCommit.extended_signatures": if len(x.ExtendedSignatures) == 0 { return protoreflect.ValueOfList(&_ExtendedCommit_4_list{}) } @@ -5806,9 +5938,9 @@ func (x *fastReflection_ExtendedCommit) Get(descriptor protoreflect.FieldDescrip return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommit")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommit does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommit does not contain field %s", descriptor.FullName())) } } @@ -5824,21 +5956,21 @@ func (x *fastReflection_ExtendedCommit) Get(descriptor protoreflect.FieldDescrip // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommit) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommit.height": + case "cometbft.types.v2.ExtendedCommit.height": x.Height = value.Int() - case "cometbft.types.v1.ExtendedCommit.round": + case "cometbft.types.v2.ExtendedCommit.round": x.Round = int32(value.Int()) - case "cometbft.types.v1.ExtendedCommit.block_id": + case "cometbft.types.v2.ExtendedCommit.block_id": x.BlockId = value.Message().Interface().(*BlockID) - case "cometbft.types.v1.ExtendedCommit.extended_signatures": + case "cometbft.types.v2.ExtendedCommit.extended_signatures": lv := value.List() clv := lv.(*_ExtendedCommit_4_list) x.ExtendedSignatures = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommit")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommit does not contain field %s", fd.FullName())) } } @@ -5854,26 +5986,26 @@ func (x *fastReflection_ExtendedCommit) Set(fd protoreflect.FieldDescriptor, val // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommit) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommit.block_id": + case "cometbft.types.v2.ExtendedCommit.block_id": if x.BlockId == nil { x.BlockId = new(BlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) - case "cometbft.types.v1.ExtendedCommit.extended_signatures": + case "cometbft.types.v2.ExtendedCommit.extended_signatures": if x.ExtendedSignatures == nil { x.ExtendedSignatures = []*ExtendedCommitSig{} } value := &_ExtendedCommit_4_list{list: &x.ExtendedSignatures} return protoreflect.ValueOfList(value) - case "cometbft.types.v1.ExtendedCommit.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.ExtendedCommit is not mutable")) - case "cometbft.types.v1.ExtendedCommit.round": - panic(fmt.Errorf("field round of message cometbft.types.v1.ExtendedCommit is not mutable")) + case "cometbft.types.v2.ExtendedCommit.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.ExtendedCommit is not mutable")) + case "cometbft.types.v2.ExtendedCommit.round": + panic(fmt.Errorf("field round of message cometbft.types.v2.ExtendedCommit is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommit")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommit does not contain field %s", fd.FullName())) } } @@ -5882,21 +6014,21 @@ func (x *fastReflection_ExtendedCommit) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ExtendedCommit) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommit.height": + case "cometbft.types.v2.ExtendedCommit.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.ExtendedCommit.round": + case "cometbft.types.v2.ExtendedCommit.round": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.types.v1.ExtendedCommit.block_id": + case "cometbft.types.v2.ExtendedCommit.block_id": m := new(BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ExtendedCommit.extended_signatures": + case "cometbft.types.v2.ExtendedCommit.extended_signatures": list := []*ExtendedCommitSig{} return protoreflect.ValueOfList(&_ExtendedCommit_4_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommit")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommit")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommit does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommit does not contain field %s", fd.FullName())) } } @@ -5906,7 +6038,7 @@ func (x *fastReflection_ExtendedCommit) NewField(fd protoreflect.FieldDescriptor func (x *fastReflection_ExtendedCommit) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.ExtendedCommit", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.ExtendedCommit", d.FullName())) } panic("unreachable") } @@ -6239,24 +6371,28 @@ func (x *fastReflection_ExtendedCommit) ProtoMethods() *protoiface.Methods { } var ( - md_ExtendedCommitSig protoreflect.MessageDescriptor - fd_ExtendedCommitSig_block_id_flag protoreflect.FieldDescriptor - fd_ExtendedCommitSig_validator_address protoreflect.FieldDescriptor - fd_ExtendedCommitSig_timestamp protoreflect.FieldDescriptor - fd_ExtendedCommitSig_signature protoreflect.FieldDescriptor - fd_ExtendedCommitSig_extension protoreflect.FieldDescriptor - fd_ExtendedCommitSig_extension_signature protoreflect.FieldDescriptor + md_ExtendedCommitSig protoreflect.MessageDescriptor + fd_ExtendedCommitSig_block_id_flag protoreflect.FieldDescriptor + fd_ExtendedCommitSig_validator_address protoreflect.FieldDescriptor + fd_ExtendedCommitSig_timestamp protoreflect.FieldDescriptor + fd_ExtendedCommitSig_signature protoreflect.FieldDescriptor + fd_ExtendedCommitSig_extension protoreflect.FieldDescriptor + fd_ExtendedCommitSig_extension_signature protoreflect.FieldDescriptor + fd_ExtendedCommitSig_non_rp_extension protoreflect.FieldDescriptor + fd_ExtendedCommitSig_non_rp_extension_signature protoreflect.FieldDescriptor ) func init() { - file_cometbft_types_v1_types_proto_init() - md_ExtendedCommitSig = File_cometbft_types_v1_types_proto.Messages().ByName("ExtendedCommitSig") + file_cometbft_types_v2_types_proto_init() + md_ExtendedCommitSig = File_cometbft_types_v2_types_proto.Messages().ByName("ExtendedCommitSig") fd_ExtendedCommitSig_block_id_flag = md_ExtendedCommitSig.Fields().ByName("block_id_flag") fd_ExtendedCommitSig_validator_address = md_ExtendedCommitSig.Fields().ByName("validator_address") fd_ExtendedCommitSig_timestamp = md_ExtendedCommitSig.Fields().ByName("timestamp") fd_ExtendedCommitSig_signature = md_ExtendedCommitSig.Fields().ByName("signature") fd_ExtendedCommitSig_extension = md_ExtendedCommitSig.Fields().ByName("extension") fd_ExtendedCommitSig_extension_signature = md_ExtendedCommitSig.Fields().ByName("extension_signature") + fd_ExtendedCommitSig_non_rp_extension = md_ExtendedCommitSig.Fields().ByName("non_rp_extension") + fd_ExtendedCommitSig_non_rp_extension_signature = md_ExtendedCommitSig.Fields().ByName("non_rp_extension_signature") } var _ protoreflect.Message = (*fastReflection_ExtendedCommitSig)(nil) @@ -6268,7 +6404,7 @@ func (x *ExtendedCommitSig) ProtoReflect() protoreflect.Message { } func (x *ExtendedCommitSig) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[9] + mi := &file_cometbft_types_v2_types_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6360,6 +6496,18 @@ func (x *fastReflection_ExtendedCommitSig) Range(f func(protoreflect.FieldDescri return } } + if len(x.NonRpExtension) != 0 { + value := protoreflect.ValueOfBytes(x.NonRpExtension) + if !f(fd_ExtendedCommitSig_non_rp_extension, value) { + return + } + } + if len(x.NonRpExtensionSignature) != 0 { + value := protoreflect.ValueOfBytes(x.NonRpExtensionSignature) + if !f(fd_ExtendedCommitSig_non_rp_extension_signature, value) { + return + } + } } // Has reports whether a field is populated. @@ -6375,23 +6523,27 @@ func (x *fastReflection_ExtendedCommitSig) Range(f func(protoreflect.FieldDescri // a repeated field is populated if it is non-empty. func (x *fastReflection_ExtendedCommitSig) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommitSig.block_id_flag": + case "cometbft.types.v2.ExtendedCommitSig.block_id_flag": return x.BlockIdFlag != 0 - case "cometbft.types.v1.ExtendedCommitSig.validator_address": + case "cometbft.types.v2.ExtendedCommitSig.validator_address": return len(x.ValidatorAddress) != 0 - case "cometbft.types.v1.ExtendedCommitSig.timestamp": + case "cometbft.types.v2.ExtendedCommitSig.timestamp": return x.Timestamp != nil - case "cometbft.types.v1.ExtendedCommitSig.signature": + case "cometbft.types.v2.ExtendedCommitSig.signature": return len(x.Signature) != 0 - case "cometbft.types.v1.ExtendedCommitSig.extension": + case "cometbft.types.v2.ExtendedCommitSig.extension": return len(x.Extension) != 0 - case "cometbft.types.v1.ExtendedCommitSig.extension_signature": + case "cometbft.types.v2.ExtendedCommitSig.extension_signature": return len(x.ExtensionSignature) != 0 + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension": + return len(x.NonRpExtension) != 0 + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension_signature": + return len(x.NonRpExtensionSignature) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommitSig does not contain field %s", fd.FullName())) } } @@ -6403,23 +6555,27 @@ func (x *fastReflection_ExtendedCommitSig) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommitSig) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommitSig.block_id_flag": + case "cometbft.types.v2.ExtendedCommitSig.block_id_flag": x.BlockIdFlag = 0 - case "cometbft.types.v1.ExtendedCommitSig.validator_address": + case "cometbft.types.v2.ExtendedCommitSig.validator_address": x.ValidatorAddress = nil - case "cometbft.types.v1.ExtendedCommitSig.timestamp": + case "cometbft.types.v2.ExtendedCommitSig.timestamp": x.Timestamp = nil - case "cometbft.types.v1.ExtendedCommitSig.signature": + case "cometbft.types.v2.ExtendedCommitSig.signature": x.Signature = nil - case "cometbft.types.v1.ExtendedCommitSig.extension": + case "cometbft.types.v2.ExtendedCommitSig.extension": x.Extension = nil - case "cometbft.types.v1.ExtendedCommitSig.extension_signature": + case "cometbft.types.v2.ExtendedCommitSig.extension_signature": x.ExtensionSignature = nil + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension": + x.NonRpExtension = nil + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension_signature": + x.NonRpExtensionSignature = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommitSig does not contain field %s", fd.FullName())) } } @@ -6431,29 +6587,35 @@ func (x *fastReflection_ExtendedCommitSig) Clear(fd protoreflect.FieldDescriptor // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ExtendedCommitSig) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.ExtendedCommitSig.block_id_flag": + case "cometbft.types.v2.ExtendedCommitSig.block_id_flag": value := x.BlockIdFlag return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "cometbft.types.v1.ExtendedCommitSig.validator_address": + case "cometbft.types.v2.ExtendedCommitSig.validator_address": value := x.ValidatorAddress return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.ExtendedCommitSig.timestamp": + case "cometbft.types.v2.ExtendedCommitSig.timestamp": value := x.Timestamp return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ExtendedCommitSig.signature": + case "cometbft.types.v2.ExtendedCommitSig.signature": value := x.Signature return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.ExtendedCommitSig.extension": + case "cometbft.types.v2.ExtendedCommitSig.extension": value := x.Extension return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.ExtendedCommitSig.extension_signature": + case "cometbft.types.v2.ExtendedCommitSig.extension_signature": value := x.ExtensionSignature return protoreflect.ValueOfBytes(value) + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension": + value := x.NonRpExtension + return protoreflect.ValueOfBytes(value) + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension_signature": + value := x.NonRpExtensionSignature + return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommitSig does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommitSig does not contain field %s", descriptor.FullName())) } } @@ -6469,23 +6631,27 @@ func (x *fastReflection_ExtendedCommitSig) Get(descriptor protoreflect.FieldDesc // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommitSig) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommitSig.block_id_flag": + case "cometbft.types.v2.ExtendedCommitSig.block_id_flag": x.BlockIdFlag = (BlockIDFlag)(value.Enum()) - case "cometbft.types.v1.ExtendedCommitSig.validator_address": + case "cometbft.types.v2.ExtendedCommitSig.validator_address": x.ValidatorAddress = value.Bytes() - case "cometbft.types.v1.ExtendedCommitSig.timestamp": + case "cometbft.types.v2.ExtendedCommitSig.timestamp": x.Timestamp = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.types.v1.ExtendedCommitSig.signature": + case "cometbft.types.v2.ExtendedCommitSig.signature": x.Signature = value.Bytes() - case "cometbft.types.v1.ExtendedCommitSig.extension": + case "cometbft.types.v2.ExtendedCommitSig.extension": x.Extension = value.Bytes() - case "cometbft.types.v1.ExtendedCommitSig.extension_signature": + case "cometbft.types.v2.ExtendedCommitSig.extension_signature": x.ExtensionSignature = value.Bytes() + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension": + x.NonRpExtension = value.Bytes() + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension_signature": + x.NonRpExtensionSignature = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommitSig does not contain field %s", fd.FullName())) } } @@ -6501,26 +6667,30 @@ func (x *fastReflection_ExtendedCommitSig) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ExtendedCommitSig) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommitSig.timestamp": + case "cometbft.types.v2.ExtendedCommitSig.timestamp": if x.Timestamp == nil { x.Timestamp = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Timestamp.ProtoReflect()) - case "cometbft.types.v1.ExtendedCommitSig.block_id_flag": - panic(fmt.Errorf("field block_id_flag of message cometbft.types.v1.ExtendedCommitSig is not mutable")) - case "cometbft.types.v1.ExtendedCommitSig.validator_address": - panic(fmt.Errorf("field validator_address of message cometbft.types.v1.ExtendedCommitSig is not mutable")) - case "cometbft.types.v1.ExtendedCommitSig.signature": - panic(fmt.Errorf("field signature of message cometbft.types.v1.ExtendedCommitSig is not mutable")) - case "cometbft.types.v1.ExtendedCommitSig.extension": - panic(fmt.Errorf("field extension of message cometbft.types.v1.ExtendedCommitSig is not mutable")) - case "cometbft.types.v1.ExtendedCommitSig.extension_signature": - panic(fmt.Errorf("field extension_signature of message cometbft.types.v1.ExtendedCommitSig is not mutable")) + case "cometbft.types.v2.ExtendedCommitSig.block_id_flag": + panic(fmt.Errorf("field block_id_flag of message cometbft.types.v2.ExtendedCommitSig is not mutable")) + case "cometbft.types.v2.ExtendedCommitSig.validator_address": + panic(fmt.Errorf("field validator_address of message cometbft.types.v2.ExtendedCommitSig is not mutable")) + case "cometbft.types.v2.ExtendedCommitSig.signature": + panic(fmt.Errorf("field signature of message cometbft.types.v2.ExtendedCommitSig is not mutable")) + case "cometbft.types.v2.ExtendedCommitSig.extension": + panic(fmt.Errorf("field extension of message cometbft.types.v2.ExtendedCommitSig is not mutable")) + case "cometbft.types.v2.ExtendedCommitSig.extension_signature": + panic(fmt.Errorf("field extension_signature of message cometbft.types.v2.ExtendedCommitSig is not mutable")) + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension": + panic(fmt.Errorf("field non_rp_extension of message cometbft.types.v2.ExtendedCommitSig is not mutable")) + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension_signature": + panic(fmt.Errorf("field non_rp_extension_signature of message cometbft.types.v2.ExtendedCommitSig is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommitSig does not contain field %s", fd.FullName())) } } @@ -6529,24 +6699,28 @@ func (x *fastReflection_ExtendedCommitSig) Mutable(fd protoreflect.FieldDescript // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ExtendedCommitSig) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ExtendedCommitSig.block_id_flag": + case "cometbft.types.v2.ExtendedCommitSig.block_id_flag": return protoreflect.ValueOfEnum(0) - case "cometbft.types.v1.ExtendedCommitSig.validator_address": + case "cometbft.types.v2.ExtendedCommitSig.validator_address": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.ExtendedCommitSig.timestamp": + case "cometbft.types.v2.ExtendedCommitSig.timestamp": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ExtendedCommitSig.signature": + case "cometbft.types.v2.ExtendedCommitSig.signature": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.ExtendedCommitSig.extension": + case "cometbft.types.v2.ExtendedCommitSig.extension": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.ExtendedCommitSig.extension_signature": + case "cometbft.types.v2.ExtendedCommitSig.extension_signature": + return protoreflect.ValueOfBytes(nil) + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension": + return protoreflect.ValueOfBytes(nil) + case "cometbft.types.v2.ExtendedCommitSig.non_rp_extension_signature": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ExtendedCommitSig")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ExtendedCommitSig")) } - panic(fmt.Errorf("message cometbft.types.v1.ExtendedCommitSig does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ExtendedCommitSig does not contain field %s", fd.FullName())) } } @@ -6556,7 +6730,7 @@ func (x *fastReflection_ExtendedCommitSig) NewField(fd protoreflect.FieldDescrip func (x *fastReflection_ExtendedCommitSig) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.ExtendedCommitSig", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.ExtendedCommitSig", d.FullName())) } panic("unreachable") } @@ -6634,6 +6808,14 @@ func (x *fastReflection_ExtendedCommitSig) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + l = len(x.NonRpExtension) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } + l = len(x.NonRpExtensionSignature) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -6663,6 +6845,20 @@ func (x *fastReflection_ExtendedCommitSig) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.NonRpExtensionSignature) > 0 { + i -= len(x.NonRpExtensionSignature) + copy(dAtA[i:], x.NonRpExtensionSignature) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.NonRpExtensionSignature))) + i-- + dAtA[i] = 0x42 + } + if len(x.NonRpExtension) > 0 { + i -= len(x.NonRpExtension) + copy(dAtA[i:], x.NonRpExtension) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.NonRpExtension))) + i-- + dAtA[i] = 0x3a + } if len(x.ExtensionSignature) > 0 { i -= len(x.ExtensionSignature) copy(dAtA[i:], x.ExtensionSignature) @@ -6950,6 +7146,74 @@ func (x *fastReflection_ExtendedCommitSig) ProtoMethods() *protoiface.Methods { x.ExtensionSignature = []byte{} } iNdEx = postIndex + case 7: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NonRpExtension", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.NonRpExtension = append(x.NonRpExtension[:0], dAtA[iNdEx:postIndex]...) + if x.NonRpExtension == nil { + x.NonRpExtension = []byte{} + } + iNdEx = postIndex + case 8: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NonRpExtensionSignature", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.NonRpExtensionSignature = append(x.NonRpExtensionSignature[:0], dAtA[iNdEx:postIndex]...) + if x.NonRpExtensionSignature == nil { + x.NonRpExtensionSignature = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -6997,8 +7261,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_Proposal = File_cometbft_types_v1_types_proto.Messages().ByName("Proposal") + file_cometbft_types_v2_types_proto_init() + md_Proposal = File_cometbft_types_v2_types_proto.Messages().ByName("Proposal") fd_Proposal_type = md_Proposal.Fields().ByName("type") fd_Proposal_height = md_Proposal.Fields().ByName("height") fd_Proposal_round = md_Proposal.Fields().ByName("round") @@ -7017,7 +7281,7 @@ func (x *Proposal) ProtoReflect() protoreflect.Message { } func (x *Proposal) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[10] + mi := &file_cometbft_types_v2_types_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7130,25 +7394,25 @@ func (x *fastReflection_Proposal) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Proposal) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Proposal.type": + case "cometbft.types.v2.Proposal.type": return x.Type_ != 0 - case "cometbft.types.v1.Proposal.height": + case "cometbft.types.v2.Proposal.height": return x.Height != int64(0) - case "cometbft.types.v1.Proposal.round": + case "cometbft.types.v2.Proposal.round": return x.Round != int32(0) - case "cometbft.types.v1.Proposal.pol_round": + case "cometbft.types.v2.Proposal.pol_round": return x.PolRound != int32(0) - case "cometbft.types.v1.Proposal.block_id": + case "cometbft.types.v2.Proposal.block_id": return x.BlockId != nil - case "cometbft.types.v1.Proposal.timestamp": + case "cometbft.types.v2.Proposal.timestamp": return x.Timestamp != nil - case "cometbft.types.v1.Proposal.signature": + case "cometbft.types.v2.Proposal.signature": return len(x.Signature) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Proposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Proposal")) } - panic(fmt.Errorf("message cometbft.types.v1.Proposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Proposal does not contain field %s", fd.FullName())) } } @@ -7160,25 +7424,25 @@ func (x *fastReflection_Proposal) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Proposal) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Proposal.type": + case "cometbft.types.v2.Proposal.type": x.Type_ = 0 - case "cometbft.types.v1.Proposal.height": + case "cometbft.types.v2.Proposal.height": x.Height = int64(0) - case "cometbft.types.v1.Proposal.round": + case "cometbft.types.v2.Proposal.round": x.Round = int32(0) - case "cometbft.types.v1.Proposal.pol_round": + case "cometbft.types.v2.Proposal.pol_round": x.PolRound = int32(0) - case "cometbft.types.v1.Proposal.block_id": + case "cometbft.types.v2.Proposal.block_id": x.BlockId = nil - case "cometbft.types.v1.Proposal.timestamp": + case "cometbft.types.v2.Proposal.timestamp": x.Timestamp = nil - case "cometbft.types.v1.Proposal.signature": + case "cometbft.types.v2.Proposal.signature": x.Signature = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Proposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Proposal")) } - panic(fmt.Errorf("message cometbft.types.v1.Proposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Proposal does not contain field %s", fd.FullName())) } } @@ -7190,32 +7454,32 @@ func (x *fastReflection_Proposal) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Proposal) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Proposal.type": + case "cometbft.types.v2.Proposal.type": value := x.Type_ return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "cometbft.types.v1.Proposal.height": + case "cometbft.types.v2.Proposal.height": value := x.Height return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.Proposal.round": + case "cometbft.types.v2.Proposal.round": value := x.Round return protoreflect.ValueOfInt32(value) - case "cometbft.types.v1.Proposal.pol_round": + case "cometbft.types.v2.Proposal.pol_round": value := x.PolRound return protoreflect.ValueOfInt32(value) - case "cometbft.types.v1.Proposal.block_id": + case "cometbft.types.v2.Proposal.block_id": value := x.BlockId return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Proposal.timestamp": + case "cometbft.types.v2.Proposal.timestamp": value := x.Timestamp return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Proposal.signature": + case "cometbft.types.v2.Proposal.signature": value := x.Signature return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Proposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Proposal")) } - panic(fmt.Errorf("message cometbft.types.v1.Proposal does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Proposal does not contain field %s", descriptor.FullName())) } } @@ -7231,25 +7495,25 @@ func (x *fastReflection_Proposal) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Proposal) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Proposal.type": + case "cometbft.types.v2.Proposal.type": x.Type_ = (SignedMsgType)(value.Enum()) - case "cometbft.types.v1.Proposal.height": + case "cometbft.types.v2.Proposal.height": x.Height = value.Int() - case "cometbft.types.v1.Proposal.round": + case "cometbft.types.v2.Proposal.round": x.Round = int32(value.Int()) - case "cometbft.types.v1.Proposal.pol_round": + case "cometbft.types.v2.Proposal.pol_round": x.PolRound = int32(value.Int()) - case "cometbft.types.v1.Proposal.block_id": + case "cometbft.types.v2.Proposal.block_id": x.BlockId = value.Message().Interface().(*BlockID) - case "cometbft.types.v1.Proposal.timestamp": + case "cometbft.types.v2.Proposal.timestamp": x.Timestamp = value.Message().Interface().(*timestamppb.Timestamp) - case "cometbft.types.v1.Proposal.signature": + case "cometbft.types.v2.Proposal.signature": x.Signature = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Proposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Proposal")) } - panic(fmt.Errorf("message cometbft.types.v1.Proposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Proposal does not contain field %s", fd.FullName())) } } @@ -7265,31 +7529,31 @@ func (x *fastReflection_Proposal) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Proposal) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Proposal.block_id": + case "cometbft.types.v2.Proposal.block_id": if x.BlockId == nil { x.BlockId = new(BlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) - case "cometbft.types.v1.Proposal.timestamp": + case "cometbft.types.v2.Proposal.timestamp": if x.Timestamp == nil { x.Timestamp = new(timestamppb.Timestamp) } return protoreflect.ValueOfMessage(x.Timestamp.ProtoReflect()) - case "cometbft.types.v1.Proposal.type": - panic(fmt.Errorf("field type of message cometbft.types.v1.Proposal is not mutable")) - case "cometbft.types.v1.Proposal.height": - panic(fmt.Errorf("field height of message cometbft.types.v1.Proposal is not mutable")) - case "cometbft.types.v1.Proposal.round": - panic(fmt.Errorf("field round of message cometbft.types.v1.Proposal is not mutable")) - case "cometbft.types.v1.Proposal.pol_round": - panic(fmt.Errorf("field pol_round of message cometbft.types.v1.Proposal is not mutable")) - case "cometbft.types.v1.Proposal.signature": - panic(fmt.Errorf("field signature of message cometbft.types.v1.Proposal is not mutable")) + case "cometbft.types.v2.Proposal.type": + panic(fmt.Errorf("field type of message cometbft.types.v2.Proposal is not mutable")) + case "cometbft.types.v2.Proposal.height": + panic(fmt.Errorf("field height of message cometbft.types.v2.Proposal is not mutable")) + case "cometbft.types.v2.Proposal.round": + panic(fmt.Errorf("field round of message cometbft.types.v2.Proposal is not mutable")) + case "cometbft.types.v2.Proposal.pol_round": + panic(fmt.Errorf("field pol_round of message cometbft.types.v2.Proposal is not mutable")) + case "cometbft.types.v2.Proposal.signature": + panic(fmt.Errorf("field signature of message cometbft.types.v2.Proposal is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Proposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Proposal")) } - panic(fmt.Errorf("message cometbft.types.v1.Proposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Proposal does not contain field %s", fd.FullName())) } } @@ -7298,27 +7562,27 @@ func (x *fastReflection_Proposal) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Proposal) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Proposal.type": + case "cometbft.types.v2.Proposal.type": return protoreflect.ValueOfEnum(0) - case "cometbft.types.v1.Proposal.height": + case "cometbft.types.v2.Proposal.height": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.Proposal.round": + case "cometbft.types.v2.Proposal.round": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.types.v1.Proposal.pol_round": + case "cometbft.types.v2.Proposal.pol_round": return protoreflect.ValueOfInt32(int32(0)) - case "cometbft.types.v1.Proposal.block_id": + case "cometbft.types.v2.Proposal.block_id": m := new(BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Proposal.timestamp": + case "cometbft.types.v2.Proposal.timestamp": m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Proposal.signature": + case "cometbft.types.v2.Proposal.signature": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Proposal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Proposal")) } - panic(fmt.Errorf("message cometbft.types.v1.Proposal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Proposal does not contain field %s", fd.FullName())) } } @@ -7328,7 +7592,7 @@ func (x *fastReflection_Proposal) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Proposal) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Proposal", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Proposal", d.FullName())) } panic("unreachable") } @@ -7764,8 +8028,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_SignedHeader = File_cometbft_types_v1_types_proto.Messages().ByName("SignedHeader") + file_cometbft_types_v2_types_proto_init() + md_SignedHeader = File_cometbft_types_v2_types_proto.Messages().ByName("SignedHeader") fd_SignedHeader_header = md_SignedHeader.Fields().ByName("header") fd_SignedHeader_commit = md_SignedHeader.Fields().ByName("commit") } @@ -7779,7 +8043,7 @@ func (x *SignedHeader) ProtoReflect() protoreflect.Message { } func (x *SignedHeader) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[11] + mi := &file_cometbft_types_v2_types_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7862,15 +8126,15 @@ func (x *fastReflection_SignedHeader) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_SignedHeader) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.SignedHeader.header": + case "cometbft.types.v2.SignedHeader.header": return x.Header != nil - case "cometbft.types.v1.SignedHeader.commit": + case "cometbft.types.v2.SignedHeader.commit": return x.Commit != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SignedHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SignedHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.SignedHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SignedHeader does not contain field %s", fd.FullName())) } } @@ -7882,15 +8146,15 @@ func (x *fastReflection_SignedHeader) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SignedHeader) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.SignedHeader.header": + case "cometbft.types.v2.SignedHeader.header": x.Header = nil - case "cometbft.types.v1.SignedHeader.commit": + case "cometbft.types.v2.SignedHeader.commit": x.Commit = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SignedHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SignedHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.SignedHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SignedHeader does not contain field %s", fd.FullName())) } } @@ -7902,17 +8166,17 @@ func (x *fastReflection_SignedHeader) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_SignedHeader) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.SignedHeader.header": + case "cometbft.types.v2.SignedHeader.header": value := x.Header return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.SignedHeader.commit": + case "cometbft.types.v2.SignedHeader.commit": value := x.Commit return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SignedHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SignedHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.SignedHeader does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SignedHeader does not contain field %s", descriptor.FullName())) } } @@ -7928,15 +8192,15 @@ func (x *fastReflection_SignedHeader) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SignedHeader) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.SignedHeader.header": + case "cometbft.types.v2.SignedHeader.header": x.Header = value.Message().Interface().(*Header) - case "cometbft.types.v1.SignedHeader.commit": + case "cometbft.types.v2.SignedHeader.commit": x.Commit = value.Message().Interface().(*Commit) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SignedHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SignedHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.SignedHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SignedHeader does not contain field %s", fd.FullName())) } } @@ -7952,21 +8216,21 @@ func (x *fastReflection_SignedHeader) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SignedHeader) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.SignedHeader.header": + case "cometbft.types.v2.SignedHeader.header": if x.Header == nil { x.Header = new(Header) } return protoreflect.ValueOfMessage(x.Header.ProtoReflect()) - case "cometbft.types.v1.SignedHeader.commit": + case "cometbft.types.v2.SignedHeader.commit": if x.Commit == nil { x.Commit = new(Commit) } return protoreflect.ValueOfMessage(x.Commit.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SignedHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SignedHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.SignedHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SignedHeader does not contain field %s", fd.FullName())) } } @@ -7975,17 +8239,17 @@ func (x *fastReflection_SignedHeader) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_SignedHeader) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.SignedHeader.header": + case "cometbft.types.v2.SignedHeader.header": m := new(Header) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.SignedHeader.commit": + case "cometbft.types.v2.SignedHeader.commit": m := new(Commit) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SignedHeader")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SignedHeader")) } - panic(fmt.Errorf("message cometbft.types.v1.SignedHeader does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SignedHeader does not contain field %s", fd.FullName())) } } @@ -7995,7 +8259,7 @@ func (x *fastReflection_SignedHeader) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_SignedHeader) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.SignedHeader", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.SignedHeader", d.FullName())) } panic("unreachable") } @@ -8278,8 +8542,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_LightBlock = File_cometbft_types_v1_types_proto.Messages().ByName("LightBlock") + file_cometbft_types_v2_types_proto_init() + md_LightBlock = File_cometbft_types_v2_types_proto.Messages().ByName("LightBlock") fd_LightBlock_signed_header = md_LightBlock.Fields().ByName("signed_header") fd_LightBlock_validator_set = md_LightBlock.Fields().ByName("validator_set") } @@ -8293,7 +8557,7 @@ func (x *LightBlock) ProtoReflect() protoreflect.Message { } func (x *LightBlock) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[12] + mi := &file_cometbft_types_v2_types_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8376,15 +8640,15 @@ func (x *fastReflection_LightBlock) Range(f func(protoreflect.FieldDescriptor, p // a repeated field is populated if it is non-empty. func (x *fastReflection_LightBlock) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.LightBlock.signed_header": + case "cometbft.types.v2.LightBlock.signed_header": return x.SignedHeader != nil - case "cometbft.types.v1.LightBlock.validator_set": + case "cometbft.types.v2.LightBlock.validator_set": return x.ValidatorSet != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightBlock")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightBlock")) } - panic(fmt.Errorf("message cometbft.types.v1.LightBlock does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightBlock does not contain field %s", fd.FullName())) } } @@ -8396,15 +8660,15 @@ func (x *fastReflection_LightBlock) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LightBlock) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.LightBlock.signed_header": + case "cometbft.types.v2.LightBlock.signed_header": x.SignedHeader = nil - case "cometbft.types.v1.LightBlock.validator_set": + case "cometbft.types.v2.LightBlock.validator_set": x.ValidatorSet = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightBlock")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightBlock")) } - panic(fmt.Errorf("message cometbft.types.v1.LightBlock does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightBlock does not contain field %s", fd.FullName())) } } @@ -8416,17 +8680,17 @@ func (x *fastReflection_LightBlock) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_LightBlock) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.LightBlock.signed_header": + case "cometbft.types.v2.LightBlock.signed_header": value := x.SignedHeader return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.LightBlock.validator_set": + case "cometbft.types.v2.LightBlock.validator_set": value := x.ValidatorSet return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightBlock")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightBlock")) } - panic(fmt.Errorf("message cometbft.types.v1.LightBlock does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightBlock does not contain field %s", descriptor.FullName())) } } @@ -8442,15 +8706,15 @@ func (x *fastReflection_LightBlock) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LightBlock) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.LightBlock.signed_header": + case "cometbft.types.v2.LightBlock.signed_header": x.SignedHeader = value.Message().Interface().(*SignedHeader) - case "cometbft.types.v1.LightBlock.validator_set": + case "cometbft.types.v2.LightBlock.validator_set": x.ValidatorSet = value.Message().Interface().(*ValidatorSet) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightBlock")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightBlock")) } - panic(fmt.Errorf("message cometbft.types.v1.LightBlock does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightBlock does not contain field %s", fd.FullName())) } } @@ -8466,21 +8730,21 @@ func (x *fastReflection_LightBlock) Set(fd protoreflect.FieldDescriptor, value p // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_LightBlock) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.LightBlock.signed_header": + case "cometbft.types.v2.LightBlock.signed_header": if x.SignedHeader == nil { x.SignedHeader = new(SignedHeader) } return protoreflect.ValueOfMessage(x.SignedHeader.ProtoReflect()) - case "cometbft.types.v1.LightBlock.validator_set": + case "cometbft.types.v2.LightBlock.validator_set": if x.ValidatorSet == nil { x.ValidatorSet = new(ValidatorSet) } return protoreflect.ValueOfMessage(x.ValidatorSet.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightBlock")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightBlock")) } - panic(fmt.Errorf("message cometbft.types.v1.LightBlock does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightBlock does not contain field %s", fd.FullName())) } } @@ -8489,17 +8753,17 @@ func (x *fastReflection_LightBlock) Mutable(fd protoreflect.FieldDescriptor) pro // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_LightBlock) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.LightBlock.signed_header": + case "cometbft.types.v2.LightBlock.signed_header": m := new(SignedHeader) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.LightBlock.validator_set": + case "cometbft.types.v2.LightBlock.validator_set": m := new(ValidatorSet) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.LightBlock")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.LightBlock")) } - panic(fmt.Errorf("message cometbft.types.v1.LightBlock does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.LightBlock does not contain field %s", fd.FullName())) } } @@ -8509,7 +8773,7 @@ func (x *fastReflection_LightBlock) NewField(fd protoreflect.FieldDescriptor) pr func (x *fastReflection_LightBlock) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.LightBlock", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.LightBlock", d.FullName())) } panic("unreachable") } @@ -8794,8 +9058,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_BlockMeta = File_cometbft_types_v1_types_proto.Messages().ByName("BlockMeta") + file_cometbft_types_v2_types_proto_init() + md_BlockMeta = File_cometbft_types_v2_types_proto.Messages().ByName("BlockMeta") fd_BlockMeta_block_id = md_BlockMeta.Fields().ByName("block_id") fd_BlockMeta_block_size = md_BlockMeta.Fields().ByName("block_size") fd_BlockMeta_header = md_BlockMeta.Fields().ByName("header") @@ -8811,7 +9075,7 @@ func (x *BlockMeta) ProtoReflect() protoreflect.Message { } func (x *BlockMeta) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[13] + mi := &file_cometbft_types_v2_types_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8906,19 +9170,19 @@ func (x *fastReflection_BlockMeta) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_BlockMeta) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.BlockMeta.block_id": + case "cometbft.types.v2.BlockMeta.block_id": return x.BlockId != nil - case "cometbft.types.v1.BlockMeta.block_size": + case "cometbft.types.v2.BlockMeta.block_size": return x.BlockSize != int64(0) - case "cometbft.types.v1.BlockMeta.header": + case "cometbft.types.v2.BlockMeta.header": return x.Header != nil - case "cometbft.types.v1.BlockMeta.num_txs": + case "cometbft.types.v2.BlockMeta.num_txs": return x.NumTxs != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockMeta")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockMeta")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockMeta does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockMeta does not contain field %s", fd.FullName())) } } @@ -8930,19 +9194,19 @@ func (x *fastReflection_BlockMeta) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockMeta) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.BlockMeta.block_id": + case "cometbft.types.v2.BlockMeta.block_id": x.BlockId = nil - case "cometbft.types.v1.BlockMeta.block_size": + case "cometbft.types.v2.BlockMeta.block_size": x.BlockSize = int64(0) - case "cometbft.types.v1.BlockMeta.header": + case "cometbft.types.v2.BlockMeta.header": x.Header = nil - case "cometbft.types.v1.BlockMeta.num_txs": + case "cometbft.types.v2.BlockMeta.num_txs": x.NumTxs = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockMeta")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockMeta")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockMeta does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockMeta does not contain field %s", fd.FullName())) } } @@ -8954,23 +9218,23 @@ func (x *fastReflection_BlockMeta) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_BlockMeta) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.BlockMeta.block_id": + case "cometbft.types.v2.BlockMeta.block_id": value := x.BlockId return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.BlockMeta.block_size": + case "cometbft.types.v2.BlockMeta.block_size": value := x.BlockSize return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.BlockMeta.header": + case "cometbft.types.v2.BlockMeta.header": value := x.Header return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.BlockMeta.num_txs": + case "cometbft.types.v2.BlockMeta.num_txs": value := x.NumTxs return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockMeta")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockMeta")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockMeta does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockMeta does not contain field %s", descriptor.FullName())) } } @@ -8986,19 +9250,19 @@ func (x *fastReflection_BlockMeta) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockMeta) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.BlockMeta.block_id": + case "cometbft.types.v2.BlockMeta.block_id": x.BlockId = value.Message().Interface().(*BlockID) - case "cometbft.types.v1.BlockMeta.block_size": + case "cometbft.types.v2.BlockMeta.block_size": x.BlockSize = value.Int() - case "cometbft.types.v1.BlockMeta.header": + case "cometbft.types.v2.BlockMeta.header": x.Header = value.Message().Interface().(*Header) - case "cometbft.types.v1.BlockMeta.num_txs": + case "cometbft.types.v2.BlockMeta.num_txs": x.NumTxs = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockMeta")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockMeta")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockMeta does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockMeta does not contain field %s", fd.FullName())) } } @@ -9014,25 +9278,25 @@ func (x *fastReflection_BlockMeta) Set(fd protoreflect.FieldDescriptor, value pr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BlockMeta) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.BlockMeta.block_id": + case "cometbft.types.v2.BlockMeta.block_id": if x.BlockId == nil { x.BlockId = new(BlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) - case "cometbft.types.v1.BlockMeta.header": + case "cometbft.types.v2.BlockMeta.header": if x.Header == nil { x.Header = new(Header) } return protoreflect.ValueOfMessage(x.Header.ProtoReflect()) - case "cometbft.types.v1.BlockMeta.block_size": - panic(fmt.Errorf("field block_size of message cometbft.types.v1.BlockMeta is not mutable")) - case "cometbft.types.v1.BlockMeta.num_txs": - panic(fmt.Errorf("field num_txs of message cometbft.types.v1.BlockMeta is not mutable")) + case "cometbft.types.v2.BlockMeta.block_size": + panic(fmt.Errorf("field block_size of message cometbft.types.v2.BlockMeta is not mutable")) + case "cometbft.types.v2.BlockMeta.num_txs": + panic(fmt.Errorf("field num_txs of message cometbft.types.v2.BlockMeta is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockMeta")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockMeta")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockMeta does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockMeta does not contain field %s", fd.FullName())) } } @@ -9041,21 +9305,21 @@ func (x *fastReflection_BlockMeta) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_BlockMeta) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.BlockMeta.block_id": + case "cometbft.types.v2.BlockMeta.block_id": m := new(BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.BlockMeta.block_size": + case "cometbft.types.v2.BlockMeta.block_size": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.BlockMeta.header": + case "cometbft.types.v2.BlockMeta.header": m := new(Header) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.BlockMeta.num_txs": + case "cometbft.types.v2.BlockMeta.num_txs": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.BlockMeta")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.BlockMeta")) } - panic(fmt.Errorf("message cometbft.types.v1.BlockMeta does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.BlockMeta does not contain field %s", fd.FullName())) } } @@ -9065,7 +9329,7 @@ func (x *fastReflection_BlockMeta) NewField(fd protoreflect.FieldDescriptor) pro func (x *fastReflection_BlockMeta) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.BlockMeta", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.BlockMeta", d.FullName())) } panic("unreachable") } @@ -9403,8 +9667,8 @@ var ( ) func init() { - file_cometbft_types_v1_types_proto_init() - md_TxProof = File_cometbft_types_v1_types_proto.Messages().ByName("TxProof") + file_cometbft_types_v2_types_proto_init() + md_TxProof = File_cometbft_types_v2_types_proto.Messages().ByName("TxProof") fd_TxProof_root_hash = md_TxProof.Fields().ByName("root_hash") fd_TxProof_data = md_TxProof.Fields().ByName("data") fd_TxProof_proof = md_TxProof.Fields().ByName("proof") @@ -9419,7 +9683,7 @@ func (x *TxProof) ProtoReflect() protoreflect.Message { } func (x *TxProof) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_types_proto_msgTypes[14] + mi := &file_cometbft_types_v2_types_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9508,17 +9772,17 @@ func (x *fastReflection_TxProof) Range(f func(protoreflect.FieldDescriptor, prot // a repeated field is populated if it is non-empty. func (x *fastReflection_TxProof) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.TxProof.root_hash": + case "cometbft.types.v2.TxProof.root_hash": return len(x.RootHash) != 0 - case "cometbft.types.v1.TxProof.data": + case "cometbft.types.v2.TxProof.data": return len(x.Data) != 0 - case "cometbft.types.v1.TxProof.proof": + case "cometbft.types.v2.TxProof.proof": return x.Proof != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.TxProof")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.TxProof")) } - panic(fmt.Errorf("message cometbft.types.v1.TxProof does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.TxProof does not contain field %s", fd.FullName())) } } @@ -9530,17 +9794,17 @@ func (x *fastReflection_TxProof) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TxProof) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.TxProof.root_hash": + case "cometbft.types.v2.TxProof.root_hash": x.RootHash = nil - case "cometbft.types.v1.TxProof.data": + case "cometbft.types.v2.TxProof.data": x.Data = nil - case "cometbft.types.v1.TxProof.proof": + case "cometbft.types.v2.TxProof.proof": x.Proof = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.TxProof")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.TxProof")) } - panic(fmt.Errorf("message cometbft.types.v1.TxProof does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.TxProof does not contain field %s", fd.FullName())) } } @@ -9552,20 +9816,20 @@ func (x *fastReflection_TxProof) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TxProof) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.TxProof.root_hash": + case "cometbft.types.v2.TxProof.root_hash": value := x.RootHash return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.TxProof.data": + case "cometbft.types.v2.TxProof.data": value := x.Data return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.TxProof.proof": + case "cometbft.types.v2.TxProof.proof": value := x.Proof return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.TxProof")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.TxProof")) } - panic(fmt.Errorf("message cometbft.types.v1.TxProof does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.TxProof does not contain field %s", descriptor.FullName())) } } @@ -9581,17 +9845,17 @@ func (x *fastReflection_TxProof) Get(descriptor protoreflect.FieldDescriptor) pr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TxProof) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.TxProof.root_hash": + case "cometbft.types.v2.TxProof.root_hash": x.RootHash = value.Bytes() - case "cometbft.types.v1.TxProof.data": + case "cometbft.types.v2.TxProof.data": x.Data = value.Bytes() - case "cometbft.types.v1.TxProof.proof": + case "cometbft.types.v2.TxProof.proof": x.Proof = value.Message().Interface().(*v1.Proof) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.TxProof")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.TxProof")) } - panic(fmt.Errorf("message cometbft.types.v1.TxProof does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.TxProof does not contain field %s", fd.FullName())) } } @@ -9607,20 +9871,20 @@ func (x *fastReflection_TxProof) Set(fd protoreflect.FieldDescriptor, value prot // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TxProof) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.TxProof.proof": + case "cometbft.types.v2.TxProof.proof": if x.Proof == nil { x.Proof = new(v1.Proof) } return protoreflect.ValueOfMessage(x.Proof.ProtoReflect()) - case "cometbft.types.v1.TxProof.root_hash": - panic(fmt.Errorf("field root_hash of message cometbft.types.v1.TxProof is not mutable")) - case "cometbft.types.v1.TxProof.data": - panic(fmt.Errorf("field data of message cometbft.types.v1.TxProof is not mutable")) + case "cometbft.types.v2.TxProof.root_hash": + panic(fmt.Errorf("field root_hash of message cometbft.types.v2.TxProof is not mutable")) + case "cometbft.types.v2.TxProof.data": + panic(fmt.Errorf("field data of message cometbft.types.v2.TxProof is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.TxProof")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.TxProof")) } - panic(fmt.Errorf("message cometbft.types.v1.TxProof does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.TxProof does not contain field %s", fd.FullName())) } } @@ -9629,18 +9893,18 @@ func (x *fastReflection_TxProof) Mutable(fd protoreflect.FieldDescriptor) protor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TxProof) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.TxProof.root_hash": + case "cometbft.types.v2.TxProof.root_hash": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.TxProof.data": + case "cometbft.types.v2.TxProof.data": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.TxProof.proof": + case "cometbft.types.v2.TxProof.proof": m := new(v1.Proof) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.TxProof")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.TxProof")) } - panic(fmt.Errorf("message cometbft.types.v1.TxProof does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.TxProof does not contain field %s", fd.FullName())) } } @@ -9650,7 +9914,7 @@ func (x *fastReflection_TxProof) NewField(fd protoreflect.FieldDescriptor) proto func (x *fastReflection_TxProof) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.TxProof", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.TxProof", d.FullName())) } panic("unreachable") } @@ -9966,7 +10230,7 @@ func (x *fastReflection_TxProof) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/types/v1/types.proto +// source: cometbft/types/v2/types.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -10016,11 +10280,11 @@ func (x SignedMsgType) String() string { } func (SignedMsgType) Descriptor() protoreflect.EnumDescriptor { - return file_cometbft_types_v1_types_proto_enumTypes[0].Descriptor() + return file_cometbft_types_v2_types_proto_enumTypes[0].Descriptor() } func (SignedMsgType) Type() protoreflect.EnumType { - return &file_cometbft_types_v1_types_proto_enumTypes[0] + return &file_cometbft_types_v2_types_proto_enumTypes[0] } func (x SignedMsgType) Number() protoreflect.EnumNumber { @@ -10029,7 +10293,7 @@ func (x SignedMsgType) Number() protoreflect.EnumNumber { // Deprecated: Use SignedMsgType.Descriptor instead. func (SignedMsgType) EnumDescriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{0} } // Header of the parts set for a block. @@ -10045,7 +10309,7 @@ type PartSetHeader struct { func (x *PartSetHeader) Reset() { *x = PartSetHeader{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[0] + mi := &file_cometbft_types_v2_types_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10059,7 +10323,7 @@ func (*PartSetHeader) ProtoMessage() {} // Deprecated: Use PartSetHeader.ProtoReflect.Descriptor instead. func (*PartSetHeader) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{0} } func (x *PartSetHeader) GetTotal() uint32 { @@ -10090,7 +10354,7 @@ type Part struct { func (x *Part) Reset() { *x = Part{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[1] + mi := &file_cometbft_types_v2_types_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10104,7 +10368,7 @@ func (*Part) ProtoMessage() {} // Deprecated: Use Part.ProtoReflect.Descriptor instead. func (*Part) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{1} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{1} } func (x *Part) GetIndex() uint32 { @@ -10141,7 +10405,7 @@ type BlockID struct { func (x *BlockID) Reset() { *x = BlockID{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[2] + mi := &file_cometbft_types_v2_types_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10155,7 +10419,7 @@ func (*BlockID) ProtoMessage() {} // Deprecated: Use BlockID.ProtoReflect.Descriptor instead. func (*BlockID) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{2} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{2} } func (x *BlockID) GetHash() []byte { @@ -10202,7 +10466,7 @@ type Header struct { func (x *Header) Reset() { *x = Header{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[3] + mi := &file_cometbft_types_v2_types_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10216,7 +10480,7 @@ func (*Header) ProtoMessage() {} // Deprecated: Use Header.ProtoReflect.Descriptor instead. func (*Header) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{3} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{3} } func (x *Header) GetVersion() *v11.Consensus { @@ -10332,7 +10596,7 @@ type Data struct { func (x *Data) Reset() { *x = Data{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[4] + mi := &file_cometbft_types_v2_types_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10346,7 +10610,7 @@ func (*Data) ProtoMessage() {} // Deprecated: Use Data.ProtoReflect.Descriptor instead. func (*Data) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{4} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{4} } func (x *Data) GetTxs() [][]byte { @@ -10358,12 +10622,14 @@ func (x *Data) GetTxs() [][]byte { // Vote represents a prevote or precommit vote from validators for // consensus. +// For precommit messages, the message contains vote extensions (replay-protected and non-replay-protected) +// and their signatures. type Vote struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Type_ SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.types.v1.SignedMsgType" json:"type,omitempty"` + Type_ SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.types.v2.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` BlockId *BlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` // zero if vote is nil. @@ -10380,12 +10646,19 @@ type Vote struct { // consensus for the associated block. // Only valid for precommit messages. ExtensionSignature []byte `protobuf:"bytes,10,opt,name=extension_signature,json=extensionSignature,proto3" json:"extension_signature,omitempty"` + // Non-Replay-Protected (NRP) vote extension provided by the application. + // Only valid for precommit messages. + NonRpExtension []byte `protobuf:"bytes,11,opt,name=non_rp_extension,json=nonRpExtension,proto3" json:"non_rp_extension,omitempty"` + // Non-Replay-Protected (NRP) vote extension signature by the validator if + // they participated in consensus for the associated block. + // Only valid for precommit messages. + NonRpExtensionSignature []byte `protobuf:"bytes,12,opt,name=non_rp_extension_signature,json=nonRpExtensionSignature,proto3" json:"non_rp_extension_signature,omitempty"` } func (x *Vote) Reset() { *x = Vote{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[5] + mi := &file_cometbft_types_v2_types_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10399,7 +10672,7 @@ func (*Vote) ProtoMessage() {} // Deprecated: Use Vote.ProtoReflect.Descriptor instead. func (*Vote) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{5} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{5} } func (x *Vote) GetType_() SignedMsgType { @@ -10472,6 +10745,20 @@ func (x *Vote) GetExtensionSignature() []byte { return nil } +func (x *Vote) GetNonRpExtension() []byte { + if x != nil { + return x.NonRpExtension + } + return nil +} + +func (x *Vote) GetNonRpExtensionSignature() []byte { + if x != nil { + return x.NonRpExtensionSignature + } + return nil +} + // Commit contains the evidence that a block was committed by a set of validators. type Commit struct { state protoimpl.MessageState @@ -10487,7 +10774,7 @@ type Commit struct { func (x *Commit) Reset() { *x = Commit{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[6] + mi := &file_cometbft_types_v2_types_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10501,7 +10788,7 @@ func (*Commit) ProtoMessage() {} // Deprecated: Use Commit.ProtoReflect.Descriptor instead. func (*Commit) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{6} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{6} } func (x *Commit) GetHeight() int64 { @@ -10538,7 +10825,7 @@ type CommitSig struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.types.v1.BlockIDFlag" json:"block_id_flag,omitempty"` + BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.types.v2.BlockIDFlag" json:"block_id_flag,omitempty"` ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Timestamp *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` @@ -10547,7 +10834,7 @@ type CommitSig struct { func (x *CommitSig) Reset() { *x = CommitSig{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[7] + mi := &file_cometbft_types_v2_types_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10561,7 +10848,7 @@ func (*CommitSig) ProtoMessage() {} // Deprecated: Use CommitSig.ProtoReflect.Descriptor instead. func (*CommitSig) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{7} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{7} } func (x *CommitSig) GetBlockIdFlag() BlockIDFlag { @@ -10607,7 +10894,7 @@ type ExtendedCommit struct { func (x *ExtendedCommit) Reset() { *x = ExtendedCommit{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[8] + mi := &file_cometbft_types_v2_types_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10621,7 +10908,7 @@ func (*ExtendedCommit) ProtoMessage() {} // Deprecated: Use ExtendedCommit.ProtoReflect.Descriptor instead. func (*ExtendedCommit) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{8} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{8} } func (x *ExtendedCommit) GetHeight() int64 { @@ -10653,14 +10940,17 @@ func (x *ExtendedCommit) GetExtendedSignatures() []*ExtendedCommitSig { } // ExtendedCommitSig retains all the same fields as CommitSig but adds vote -// extension-related fields. We use two signatures to ensure backwards compatibility. +// extension-related fields, where: +// 'extension' and 'extension_signature' are used for replay-protected vote extensions. +// 'non_rp_extension' and 'non_rp_extension_signature' are used for non-replay-protected vote extensions. +// We use two signatures to ensure backwards compatibility. // That is the digest of the original signature is still the same in prior versions type ExtendedCommitSig struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.types.v1.BlockIDFlag" json:"block_id_flag,omitempty"` + BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.types.v2.BlockIDFlag" json:"block_id_flag,omitempty"` ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Timestamp *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` @@ -10668,12 +10958,16 @@ type ExtendedCommitSig struct { Extension []byte `protobuf:"bytes,5,opt,name=extension,proto3" json:"extension,omitempty"` // Vote extension signature ExtensionSignature []byte `protobuf:"bytes,6,opt,name=extension_signature,json=extensionSignature,proto3" json:"extension_signature,omitempty"` + // Non-Replay-Protected vote extension data + NonRpExtension []byte `protobuf:"bytes,7,opt,name=non_rp_extension,json=nonRpExtension,proto3" json:"non_rp_extension,omitempty"` + // Non-Replay-Protected vote extension signature + NonRpExtensionSignature []byte `protobuf:"bytes,8,opt,name=non_rp_extension_signature,json=nonRpExtensionSignature,proto3" json:"non_rp_extension_signature,omitempty"` } func (x *ExtendedCommitSig) Reset() { *x = ExtendedCommitSig{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[9] + mi := &file_cometbft_types_v2_types_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10687,7 +10981,7 @@ func (*ExtendedCommitSig) ProtoMessage() {} // Deprecated: Use ExtendedCommitSig.ProtoReflect.Descriptor instead. func (*ExtendedCommitSig) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{9} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{9} } func (x *ExtendedCommitSig) GetBlockIdFlag() BlockIDFlag { @@ -10732,13 +11026,27 @@ func (x *ExtendedCommitSig) GetExtensionSignature() []byte { return nil } +func (x *ExtendedCommitSig) GetNonRpExtension() []byte { + if x != nil { + return x.NonRpExtension + } + return nil +} + +func (x *ExtendedCommitSig) GetNonRpExtensionSignature() []byte { + if x != nil { + return x.NonRpExtensionSignature + } + return nil +} + // Block proposal. type Proposal struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Type_ SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.types.v1.SignedMsgType" json:"type,omitempty"` + Type_ SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.types.v2.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` PolRound int32 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` @@ -10750,7 +11058,7 @@ type Proposal struct { func (x *Proposal) Reset() { *x = Proposal{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[10] + mi := &file_cometbft_types_v2_types_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10764,7 +11072,7 @@ func (*Proposal) ProtoMessage() {} // Deprecated: Use Proposal.ProtoReflect.Descriptor instead. func (*Proposal) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{10} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{10} } func (x *Proposal) GetType_() SignedMsgType { @@ -10829,7 +11137,7 @@ type SignedHeader struct { func (x *SignedHeader) Reset() { *x = SignedHeader{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[11] + mi := &file_cometbft_types_v2_types_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10843,7 +11151,7 @@ func (*SignedHeader) ProtoMessage() {} // Deprecated: Use SignedHeader.ProtoReflect.Descriptor instead. func (*SignedHeader) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{11} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{11} } func (x *SignedHeader) GetHeader() *Header { @@ -10873,7 +11181,7 @@ type LightBlock struct { func (x *LightBlock) Reset() { *x = LightBlock{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[12] + mi := &file_cometbft_types_v2_types_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10887,7 +11195,7 @@ func (*LightBlock) ProtoMessage() {} // Deprecated: Use LightBlock.ProtoReflect.Descriptor instead. func (*LightBlock) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{12} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{12} } func (x *LightBlock) GetSignedHeader() *SignedHeader { @@ -10919,7 +11227,7 @@ type BlockMeta struct { func (x *BlockMeta) Reset() { *x = BlockMeta{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[13] + mi := &file_cometbft_types_v2_types_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10933,7 +11241,7 @@ func (*BlockMeta) ProtoMessage() {} // Deprecated: Use BlockMeta.ProtoReflect.Descriptor instead. func (*BlockMeta) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{13} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{13} } func (x *BlockMeta) GetBlockId() *BlockID { @@ -10978,7 +11286,7 @@ type TxProof struct { func (x *TxProof) Reset() { *x = TxProof{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_types_proto_msgTypes[14] + mi := &file_cometbft_types_v2_types_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -10992,7 +11300,7 @@ func (*TxProof) ProtoMessage() {} // Deprecated: Use TxProof.ProtoReflect.Descriptor instead. func (*TxProof) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_types_proto_rawDescGZIP(), []int{14} + return file_cometbft_types_v2_types_proto_rawDescGZIP(), []int{14} } func (x *TxProof) GetRootHash() []byte { @@ -11016,16 +11324,16 @@ func (x *TxProof) GetProof() *v1.Proof { return nil } -var File_cometbft_types_v1_types_proto protoreflect.FileDescriptor +var File_cometbft_types_v2_types_proto protoreflect.FileDescriptor -var file_cometbft_types_v1_types_proto_rawDesc = []byte{ +var file_cometbft_types_v2_types_proto_rawDesc = []byte{ 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x1a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x72, 0x79, + 0x76, 0x32, 0x1a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2e, + 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, @@ -11046,7 +11354,7 @@ var file_cometbft_types_v1_types_proto_rawDesc = []byte{ 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x4e, 0x0a, 0x0f, 0x70, 0x61, 0x72, 0x74, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x53, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x74, 0x53, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0xe8, 0x04, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x3e, 0x0a, @@ -11064,7 +11372,7 @@ var file_cometbft_types_v1_types_proto_rawDesc = []byte{ 0x01, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x44, 0x0a, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, + 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6d, @@ -11089,16 +11397,16 @@ var file_cometbft_types_v1_types_proto_rawDesc = []byte{ 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x18, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, 0x22, 0xb9, 0x03, 0x0a, 0x04, 0x56, 0x6f, 0x74, 0x65, + 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, 0x22, 0xa0, 0x04, 0x0a, 0x04, 0x56, 0x6f, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, + 0x76, 0x32, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x46, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, + 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x0f, 0xc8, 0xde, 0x1f, 0x00, 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x42, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, @@ -11117,214 +11425,227 @@ var file_cometbft_types_v1_types_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x13, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x12, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, - 0x75, 0x72, 0x65, 0x22, 0xc2, 0x01, 0x0a, 0x06, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x16, - 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x46, 0x0a, 0x08, - 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, - 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x0f, 0xc8, 0xde, 0x1f, 0x00, - 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, - 0x63, 0x6b, 0x49, 0x64, 0x12, 0x42, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, - 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, - 0x6d, 0x69, 0x74, 0x53, 0x69, 0x67, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0a, 0x73, 0x69, - 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0xde, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6d, - 0x6d, 0x69, 0x74, 0x53, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, - 0x69, 0x64, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, - 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, - 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x46, 0x6c, 0x61, 0x67, 0x52, 0x0b, 0x62, - 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x2b, 0x0a, 0x11, 0x76, 0x61, - 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, - 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x42, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, - 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, - 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, - 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, - 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xe3, 0x01, 0x0a, 0x0e, 0x45, 0x78, - 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x46, 0x0a, 0x08, 0x62, 0x6c, - 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, - 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x0f, 0xc8, 0xde, 0x1f, 0x00, 0xe2, 0xde, - 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, - 0x49, 0x64, 0x12, 0x5b, 0x0a, 0x13, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x73, + 0x75, 0x72, 0x65, 0x12, 0x28, 0x0a, 0x10, 0x6e, 0x6f, 0x6e, 0x5f, 0x72, 0x70, 0x5f, 0x65, 0x78, + 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6e, + 0x6f, 0x6e, 0x52, 0x70, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, + 0x1a, 0x6e, 0x6f, 0x6e, 0x5f, 0x72, 0x70, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, + 0x6e, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x17, 0x6e, 0x6f, 0x6e, 0x52, 0x70, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, + 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xc2, 0x01, 0x0a, 0x06, 0x43, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, + 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, + 0x75, 0x6e, 0x64, 0x12, 0x46, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, + 0x44, 0x42, 0x0f, 0xc8, 0xde, 0x1f, 0x00, 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, + 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x42, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x24, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, - 0x69, 0x74, 0x53, 0x69, 0x67, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x12, 0x65, 0x78, 0x74, - 0x65, 0x6e, 0x64, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, - 0xb5, 0x02, 0x0a, 0x11, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, - 0x69, 0x74, 0x53, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, - 0x64, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, - 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x46, 0x6c, 0x61, 0x67, 0x52, 0x0b, 0x62, 0x6c, - 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x2b, 0x0a, 0x11, 0x76, 0x61, 0x6c, - 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x42, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, - 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, - 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, - 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, - 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, - 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x65, 0x78, 0x74, - 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x13, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, - 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x12, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x69, - 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xb5, 0x02, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70, - 0x6f, 0x73, 0x61, 0x6c, 0x12, 0x34, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, 0x73, 0x67, - 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x6f, 0x6c, 0x5f, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x6c, - 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x46, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, - 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, - 0x6b, 0x49, 0x44, 0x42, 0x0f, 0xc8, 0xde, 0x1f, 0x00, 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, - 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x42, 0x0a, - 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, + 0x1c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, + 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x69, 0x67, 0x42, 0x04, 0xc8, + 0xde, 0x1f, 0x00, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, + 0xde, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x69, 0x67, 0x12, 0x42, 0x0a, + 0x0d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, + 0x46, 0x6c, 0x61, 0x67, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x46, 0x6c, 0x61, + 0x67, 0x12, 0x2b, 0x0a, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, 0x76, 0x61, + 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x42, + 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, + 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, + 0x6d, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x22, 0xe3, 0x01, 0x0a, 0x0e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6d, + 0x6d, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, + 0x64, 0x12, 0x46, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, + 0x0f, 0xc8, 0xde, 0x1f, 0x00, 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, + 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x5b, 0x0a, 0x13, 0x65, 0x78, 0x74, + 0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, + 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x69, 0x67, 0x42, 0x04, 0xc8, 0xde, + 0x1f, 0x00, 0x52, 0x12, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e, + 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0x9c, 0x03, 0x0a, 0x11, 0x45, 0x78, 0x74, 0x65, 0x6e, + 0x64, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x53, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x0d, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x46, + 0x6c, 0x61, 0x67, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x46, 0x6c, 0x61, 0x67, + 0x12, 0x2b, 0x0a, 0x11, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, 0x76, 0x61, 0x6c, + 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x42, 0x0a, + 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x00, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, - 0x74, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, - 0x31, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x12, 0x31, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x06, 0x63, - 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x22, 0x98, 0x01, 0x0a, 0x0a, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x42, - 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x44, 0x0a, 0x0d, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, - 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x0c, 0x73, 0x69, - 0x67, 0x6e, 0x65, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x0d, 0x76, 0x61, - 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x53, - 0x65, 0x74, 0x52, 0x0c, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x53, 0x65, 0x74, - 0x22, 0xc4, 0x01, 0x0a, 0x09, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x46, - 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x0f, 0xc8, 0xde, - 0x1f, 0x00, 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, - 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, - 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, - 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x37, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x17, - 0x0a, 0x07, 0x6e, 0x75, 0x6d, 0x5f, 0x74, 0x78, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x06, 0x6e, 0x75, 0x6d, 0x54, 0x78, 0x73, 0x22, 0x6b, 0x0a, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, - 0x6f, 0x66, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x72, 0x6f, 0x6f, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, - 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x12, 0x2f, 0x0a, 0x05, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x63, 0x72, - 0x79, 0x70, 0x74, 0x6f, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x05, 0x70, - 0x72, 0x6f, 0x6f, 0x66, 0x2a, 0xd7, 0x01, 0x0a, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, - 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2c, 0x0a, 0x17, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, - 0x5f, 0x4d, 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, - 0x4e, 0x10, 0x00, 0x1a, 0x0f, 0x8a, 0x9d, 0x20, 0x0b, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, + 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, + 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, + 0x13, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, + 0x74, 0x75, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x12, 0x65, 0x78, 0x74, 0x65, + 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x28, + 0x0a, 0x10, 0x6e, 0x6f, 0x6e, 0x5f, 0x72, 0x70, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, + 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6e, 0x6f, 0x6e, 0x52, 0x70, 0x45, + 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x1a, 0x6e, 0x6f, 0x6e, 0x5f, + 0x72, 0x70, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x67, + 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x17, 0x6e, 0x6f, + 0x6e, 0x52, 0x70, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x67, 0x6e, + 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xb5, 0x02, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, + 0x61, 0x6c, 0x12, 0x34, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x54, 0x79, + 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x6f, 0x6c, 0x5f, 0x72, 0x6f, + 0x75, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6f, 0x6c, 0x52, 0x6f, + 0x75, 0x6e, 0x64, 0x12, 0x46, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, + 0x44, 0x42, 0x0f, 0xc8, 0xde, 0x1f, 0x00, 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, + 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x42, 0x0a, 0x09, 0x74, + 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x08, 0xc8, 0xde, 0x1f, 0x00, + 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, + 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x74, 0x0a, + 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x31, 0x0a, + 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, + 0x32, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x12, 0x31, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x06, 0x63, 0x6f, 0x6d, + 0x6d, 0x69, 0x74, 0x22, 0x98, 0x01, 0x0a, 0x0a, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x42, 0x6c, 0x6f, + 0x63, 0x6b, 0x12, 0x44, 0x0a, 0x0d, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, + 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x69, + 0x67, 0x6e, 0x65, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x0c, 0x73, 0x69, 0x67, 0x6e, + 0x65, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x0d, 0x76, 0x61, 0x6c, 0x69, + 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, + 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x53, 0x65, 0x74, + 0x52, 0x0c, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x53, 0x65, 0x74, 0x22, 0xc4, + 0x01, 0x0a, 0x09, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x46, 0x0a, 0x08, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, + 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, + 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x0f, 0xc8, 0xde, 0x1f, 0x00, + 0xe2, 0xde, 0x1f, 0x07, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, + 0x63, 0x6b, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, + 0x69, 0x7a, 0x65, 0x12, 0x37, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x04, + 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, + 0x6e, 0x75, 0x6d, 0x5f, 0x74, 0x78, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, + 0x75, 0x6d, 0x54, 0x78, 0x73, 0x22, 0x6b, 0x0a, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x6f, 0x66, + 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x08, 0x72, 0x6f, 0x6f, 0x74, 0x48, 0x61, 0x73, 0x68, 0x12, 0x12, 0x0a, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x12, 0x2f, 0x0a, 0x05, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x63, 0x72, 0x79, 0x70, + 0x74, 0x6f, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x05, 0x70, 0x72, 0x6f, + 0x6f, 0x66, 0x2a, 0xd7, 0x01, 0x0a, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2c, 0x0a, 0x17, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x5f, 0x4d, - 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x52, 0x45, 0x56, 0x4f, 0x54, 0x45, 0x10, - 0x01, 0x1a, 0x0f, 0x8a, 0x9d, 0x20, 0x0b, 0x50, 0x72, 0x65, 0x76, 0x6f, 0x74, 0x65, 0x54, 0x79, - 0x70, 0x65, 0x12, 0x30, 0x0a, 0x19, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x5f, 0x4d, 0x53, 0x47, - 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x52, 0x45, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x10, - 0x02, 0x1a, 0x11, 0x8a, 0x9d, 0x20, 0x0d, 0x50, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x18, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x5f, 0x4d, - 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, - 0x10, 0x20, 0x1a, 0x10, 0x8a, 0x9d, 0x20, 0x0c, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, - 0x54, 0x79, 0x70, 0x65, 0x1a, 0x08, 0x88, 0xa3, 0x1e, 0x00, 0xa8, 0xa4, 0x1e, 0x01, 0x42, 0xb5, - 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, - 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, - 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x11, 0x43, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, - 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, - 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0xea, 0x02, 0x13, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, 0x3a, 0x54, 0x79, 0x70, - 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x53, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, + 0x00, 0x1a, 0x0f, 0x8a, 0x9d, 0x20, 0x0b, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x2c, 0x0a, 0x17, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x5f, 0x4d, 0x53, 0x47, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x52, 0x45, 0x56, 0x4f, 0x54, 0x45, 0x10, 0x01, 0x1a, + 0x0f, 0x8a, 0x9d, 0x20, 0x0b, 0x50, 0x72, 0x65, 0x76, 0x6f, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x30, 0x0a, 0x19, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x5f, 0x4d, 0x53, 0x47, 0x5f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x50, 0x52, 0x45, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x10, 0x02, 0x1a, + 0x11, 0x8a, 0x9d, 0x20, 0x0d, 0x50, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x18, 0x53, 0x49, 0x47, 0x4e, 0x45, 0x44, 0x5f, 0x4d, 0x53, 0x47, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x10, 0x20, + 0x1a, 0x10, 0x8a, 0x9d, 0x20, 0x0c, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x54, 0x79, + 0x70, 0x65, 0x1a, 0x08, 0x88, 0xa3, 0x1e, 0x00, 0xa8, 0xa4, 0x1e, 0x01, 0x42, 0xb5, 0x01, 0x0a, + 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x42, 0x0a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, + 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x76, 0x32, + 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x11, 0x43, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x32, 0xe2, 0x02, + 0x1d, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, + 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, + 0x13, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, + 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_cometbft_types_v1_types_proto_rawDescOnce sync.Once - file_cometbft_types_v1_types_proto_rawDescData = file_cometbft_types_v1_types_proto_rawDesc + file_cometbft_types_v2_types_proto_rawDescOnce sync.Once + file_cometbft_types_v2_types_proto_rawDescData = file_cometbft_types_v2_types_proto_rawDesc ) -func file_cometbft_types_v1_types_proto_rawDescGZIP() []byte { - file_cometbft_types_v1_types_proto_rawDescOnce.Do(func() { - file_cometbft_types_v1_types_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v1_types_proto_rawDescData) +func file_cometbft_types_v2_types_proto_rawDescGZIP() []byte { + file_cometbft_types_v2_types_proto_rawDescOnce.Do(func() { + file_cometbft_types_v2_types_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v2_types_proto_rawDescData) }) - return file_cometbft_types_v1_types_proto_rawDescData + return file_cometbft_types_v2_types_proto_rawDescData } -var file_cometbft_types_v1_types_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_cometbft_types_v1_types_proto_msgTypes = make([]protoimpl.MessageInfo, 15) -var file_cometbft_types_v1_types_proto_goTypes = []interface{}{ - (SignedMsgType)(0), // 0: cometbft.types.v1.SignedMsgType - (*PartSetHeader)(nil), // 1: cometbft.types.v1.PartSetHeader - (*Part)(nil), // 2: cometbft.types.v1.Part - (*BlockID)(nil), // 3: cometbft.types.v1.BlockID - (*Header)(nil), // 4: cometbft.types.v1.Header - (*Data)(nil), // 5: cometbft.types.v1.Data - (*Vote)(nil), // 6: cometbft.types.v1.Vote - (*Commit)(nil), // 7: cometbft.types.v1.Commit - (*CommitSig)(nil), // 8: cometbft.types.v1.CommitSig - (*ExtendedCommit)(nil), // 9: cometbft.types.v1.ExtendedCommit - (*ExtendedCommitSig)(nil), // 10: cometbft.types.v1.ExtendedCommitSig - (*Proposal)(nil), // 11: cometbft.types.v1.Proposal - (*SignedHeader)(nil), // 12: cometbft.types.v1.SignedHeader - (*LightBlock)(nil), // 13: cometbft.types.v1.LightBlock - (*BlockMeta)(nil), // 14: cometbft.types.v1.BlockMeta - (*TxProof)(nil), // 15: cometbft.types.v1.TxProof +var file_cometbft_types_v2_types_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_cometbft_types_v2_types_proto_msgTypes = make([]protoimpl.MessageInfo, 15) +var file_cometbft_types_v2_types_proto_goTypes = []interface{}{ + (SignedMsgType)(0), // 0: cometbft.types.v2.SignedMsgType + (*PartSetHeader)(nil), // 1: cometbft.types.v2.PartSetHeader + (*Part)(nil), // 2: cometbft.types.v2.Part + (*BlockID)(nil), // 3: cometbft.types.v2.BlockID + (*Header)(nil), // 4: cometbft.types.v2.Header + (*Data)(nil), // 5: cometbft.types.v2.Data + (*Vote)(nil), // 6: cometbft.types.v2.Vote + (*Commit)(nil), // 7: cometbft.types.v2.Commit + (*CommitSig)(nil), // 8: cometbft.types.v2.CommitSig + (*ExtendedCommit)(nil), // 9: cometbft.types.v2.ExtendedCommit + (*ExtendedCommitSig)(nil), // 10: cometbft.types.v2.ExtendedCommitSig + (*Proposal)(nil), // 11: cometbft.types.v2.Proposal + (*SignedHeader)(nil), // 12: cometbft.types.v2.SignedHeader + (*LightBlock)(nil), // 13: cometbft.types.v2.LightBlock + (*BlockMeta)(nil), // 14: cometbft.types.v2.BlockMeta + (*TxProof)(nil), // 15: cometbft.types.v2.TxProof (*v1.Proof)(nil), // 16: cometbft.crypto.v1.Proof (*v11.Consensus)(nil), // 17: cometbft.version.v1.Consensus (*timestamppb.Timestamp)(nil), // 18: google.protobuf.Timestamp - (BlockIDFlag)(0), // 19: cometbft.types.v1.BlockIDFlag - (*ValidatorSet)(nil), // 20: cometbft.types.v1.ValidatorSet + (BlockIDFlag)(0), // 19: cometbft.types.v2.BlockIDFlag + (*ValidatorSet)(nil), // 20: cometbft.types.v2.ValidatorSet } -var file_cometbft_types_v1_types_proto_depIdxs = []int32{ - 16, // 0: cometbft.types.v1.Part.proof:type_name -> cometbft.crypto.v1.Proof - 1, // 1: cometbft.types.v1.BlockID.part_set_header:type_name -> cometbft.types.v1.PartSetHeader - 17, // 2: cometbft.types.v1.Header.version:type_name -> cometbft.version.v1.Consensus - 18, // 3: cometbft.types.v1.Header.time:type_name -> google.protobuf.Timestamp - 3, // 4: cometbft.types.v1.Header.last_block_id:type_name -> cometbft.types.v1.BlockID - 0, // 5: cometbft.types.v1.Vote.type:type_name -> cometbft.types.v1.SignedMsgType - 3, // 6: cometbft.types.v1.Vote.block_id:type_name -> cometbft.types.v1.BlockID - 18, // 7: cometbft.types.v1.Vote.timestamp:type_name -> google.protobuf.Timestamp - 3, // 8: cometbft.types.v1.Commit.block_id:type_name -> cometbft.types.v1.BlockID - 8, // 9: cometbft.types.v1.Commit.signatures:type_name -> cometbft.types.v1.CommitSig - 19, // 10: cometbft.types.v1.CommitSig.block_id_flag:type_name -> cometbft.types.v1.BlockIDFlag - 18, // 11: cometbft.types.v1.CommitSig.timestamp:type_name -> google.protobuf.Timestamp - 3, // 12: cometbft.types.v1.ExtendedCommit.block_id:type_name -> cometbft.types.v1.BlockID - 10, // 13: cometbft.types.v1.ExtendedCommit.extended_signatures:type_name -> cometbft.types.v1.ExtendedCommitSig - 19, // 14: cometbft.types.v1.ExtendedCommitSig.block_id_flag:type_name -> cometbft.types.v1.BlockIDFlag - 18, // 15: cometbft.types.v1.ExtendedCommitSig.timestamp:type_name -> google.protobuf.Timestamp - 0, // 16: cometbft.types.v1.Proposal.type:type_name -> cometbft.types.v1.SignedMsgType - 3, // 17: cometbft.types.v1.Proposal.block_id:type_name -> cometbft.types.v1.BlockID - 18, // 18: cometbft.types.v1.Proposal.timestamp:type_name -> google.protobuf.Timestamp - 4, // 19: cometbft.types.v1.SignedHeader.header:type_name -> cometbft.types.v1.Header - 7, // 20: cometbft.types.v1.SignedHeader.commit:type_name -> cometbft.types.v1.Commit - 12, // 21: cometbft.types.v1.LightBlock.signed_header:type_name -> cometbft.types.v1.SignedHeader - 20, // 22: cometbft.types.v1.LightBlock.validator_set:type_name -> cometbft.types.v1.ValidatorSet - 3, // 23: cometbft.types.v1.BlockMeta.block_id:type_name -> cometbft.types.v1.BlockID - 4, // 24: cometbft.types.v1.BlockMeta.header:type_name -> cometbft.types.v1.Header - 16, // 25: cometbft.types.v1.TxProof.proof:type_name -> cometbft.crypto.v1.Proof +var file_cometbft_types_v2_types_proto_depIdxs = []int32{ + 16, // 0: cometbft.types.v2.Part.proof:type_name -> cometbft.crypto.v1.Proof + 1, // 1: cometbft.types.v2.BlockID.part_set_header:type_name -> cometbft.types.v2.PartSetHeader + 17, // 2: cometbft.types.v2.Header.version:type_name -> cometbft.version.v1.Consensus + 18, // 3: cometbft.types.v2.Header.time:type_name -> google.protobuf.Timestamp + 3, // 4: cometbft.types.v2.Header.last_block_id:type_name -> cometbft.types.v2.BlockID + 0, // 5: cometbft.types.v2.Vote.type:type_name -> cometbft.types.v2.SignedMsgType + 3, // 6: cometbft.types.v2.Vote.block_id:type_name -> cometbft.types.v2.BlockID + 18, // 7: cometbft.types.v2.Vote.timestamp:type_name -> google.protobuf.Timestamp + 3, // 8: cometbft.types.v2.Commit.block_id:type_name -> cometbft.types.v2.BlockID + 8, // 9: cometbft.types.v2.Commit.signatures:type_name -> cometbft.types.v2.CommitSig + 19, // 10: cometbft.types.v2.CommitSig.block_id_flag:type_name -> cometbft.types.v2.BlockIDFlag + 18, // 11: cometbft.types.v2.CommitSig.timestamp:type_name -> google.protobuf.Timestamp + 3, // 12: cometbft.types.v2.ExtendedCommit.block_id:type_name -> cometbft.types.v2.BlockID + 10, // 13: cometbft.types.v2.ExtendedCommit.extended_signatures:type_name -> cometbft.types.v2.ExtendedCommitSig + 19, // 14: cometbft.types.v2.ExtendedCommitSig.block_id_flag:type_name -> cometbft.types.v2.BlockIDFlag + 18, // 15: cometbft.types.v2.ExtendedCommitSig.timestamp:type_name -> google.protobuf.Timestamp + 0, // 16: cometbft.types.v2.Proposal.type:type_name -> cometbft.types.v2.SignedMsgType + 3, // 17: cometbft.types.v2.Proposal.block_id:type_name -> cometbft.types.v2.BlockID + 18, // 18: cometbft.types.v2.Proposal.timestamp:type_name -> google.protobuf.Timestamp + 4, // 19: cometbft.types.v2.SignedHeader.header:type_name -> cometbft.types.v2.Header + 7, // 20: cometbft.types.v2.SignedHeader.commit:type_name -> cometbft.types.v2.Commit + 12, // 21: cometbft.types.v2.LightBlock.signed_header:type_name -> cometbft.types.v2.SignedHeader + 20, // 22: cometbft.types.v2.LightBlock.validator_set:type_name -> cometbft.types.v2.ValidatorSet + 3, // 23: cometbft.types.v2.BlockMeta.block_id:type_name -> cometbft.types.v2.BlockID + 4, // 24: cometbft.types.v2.BlockMeta.header:type_name -> cometbft.types.v2.Header + 16, // 25: cometbft.types.v2.TxProof.proof:type_name -> cometbft.crypto.v1.Proof 26, // [26:26] is the sub-list for method output_type 26, // [26:26] is the sub-list for method input_type 26, // [26:26] is the sub-list for extension type_name @@ -11332,14 +11653,14 @@ var file_cometbft_types_v1_types_proto_depIdxs = []int32{ 0, // [0:26] is the sub-list for field type_name } -func init() { file_cometbft_types_v1_types_proto_init() } -func file_cometbft_types_v1_types_proto_init() { - if File_cometbft_types_v1_types_proto != nil { +func init() { file_cometbft_types_v2_types_proto_init() } +func file_cometbft_types_v2_types_proto_init() { + if File_cometbft_types_v2_types_proto != nil { return } - file_cometbft_types_v1_validator_proto_init() + file_cometbft_types_v2_validator_proto_init() if !protoimpl.UnsafeEnabled { - file_cometbft_types_v1_types_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PartSetHeader); i { case 0: return &v.state @@ -11351,7 +11672,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Part); i { case 0: return &v.state @@ -11363,7 +11684,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BlockID); i { case 0: return &v.state @@ -11375,7 +11696,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Header); i { case 0: return &v.state @@ -11387,7 +11708,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Data); i { case 0: return &v.state @@ -11399,7 +11720,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Vote); i { case 0: return &v.state @@ -11411,7 +11732,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Commit); i { case 0: return &v.state @@ -11423,7 +11744,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CommitSig); i { case 0: return &v.state @@ -11435,7 +11756,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ExtendedCommit); i { case 0: return &v.state @@ -11447,7 +11768,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ExtendedCommitSig); i { case 0: return &v.state @@ -11459,7 +11780,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Proposal); i { case 0: return &v.state @@ -11471,7 +11792,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SignedHeader); i { case 0: return &v.state @@ -11483,7 +11804,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LightBlock); i { case 0: return &v.state @@ -11495,7 +11816,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BlockMeta); i { case 0: return &v.state @@ -11507,7 +11828,7 @@ func file_cometbft_types_v1_types_proto_init() { return nil } } - file_cometbft_types_v1_types_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_types_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TxProof); i { case 0: return &v.state @@ -11524,19 +11845,19 @@ func file_cometbft_types_v1_types_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_types_v1_types_proto_rawDesc, + RawDescriptor: file_cometbft_types_v2_types_proto_rawDesc, NumEnums: 1, NumMessages: 15, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cometbft_types_v1_types_proto_goTypes, - DependencyIndexes: file_cometbft_types_v1_types_proto_depIdxs, - EnumInfos: file_cometbft_types_v1_types_proto_enumTypes, - MessageInfos: file_cometbft_types_v1_types_proto_msgTypes, + GoTypes: file_cometbft_types_v2_types_proto_goTypes, + DependencyIndexes: file_cometbft_types_v2_types_proto_depIdxs, + EnumInfos: file_cometbft_types_v2_types_proto_enumTypes, + MessageInfos: file_cometbft_types_v2_types_proto_msgTypes, }.Build() - File_cometbft_types_v1_types_proto = out.File - file_cometbft_types_v1_types_proto_rawDesc = nil - file_cometbft_types_v1_types_proto_goTypes = nil - file_cometbft_types_v1_types_proto_depIdxs = nil + File_cometbft_types_v2_types_proto = out.File + file_cometbft_types_v2_types_proto_rawDesc = nil + file_cometbft_types_v2_types_proto_goTypes = nil + file_cometbft_types_v2_types_proto_depIdxs = nil } diff --git a/api/cometbft/types/v1/validator.pulsar.go b/api/cometbft/types/v2/validator.pulsar.go similarity index 88% rename from api/cometbft/types/v1/validator.pulsar.go rename to api/cometbft/types/v2/validator.pulsar.go index b5457d4f09..4434551844 100644 --- a/api/cometbft/types/v1/validator.pulsar.go +++ b/api/cometbft/types/v2/validator.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package typesv1 +package typesv2 import ( v1 "cosmossdk.io/api/cometbft/crypto/v1" @@ -73,8 +73,8 @@ var ( ) func init() { - file_cometbft_types_v1_validator_proto_init() - md_ValidatorSet = File_cometbft_types_v1_validator_proto.Messages().ByName("ValidatorSet") + file_cometbft_types_v2_validator_proto_init() + md_ValidatorSet = File_cometbft_types_v2_validator_proto.Messages().ByName("ValidatorSet") fd_ValidatorSet_validators = md_ValidatorSet.Fields().ByName("validators") fd_ValidatorSet_proposer = md_ValidatorSet.Fields().ByName("proposer") fd_ValidatorSet_total_voting_power = md_ValidatorSet.Fields().ByName("total_voting_power") @@ -89,7 +89,7 @@ func (x *ValidatorSet) ProtoReflect() protoreflect.Message { } func (x *ValidatorSet) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_validator_proto_msgTypes[0] + mi := &file_cometbft_types_v2_validator_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -178,17 +178,17 @@ func (x *fastReflection_ValidatorSet) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_ValidatorSet) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.ValidatorSet.validators": + case "cometbft.types.v2.ValidatorSet.validators": return len(x.Validators) != 0 - case "cometbft.types.v1.ValidatorSet.proposer": + case "cometbft.types.v2.ValidatorSet.proposer": return x.Proposer != nil - case "cometbft.types.v1.ValidatorSet.total_voting_power": + case "cometbft.types.v2.ValidatorSet.total_voting_power": return x.TotalVotingPower != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorSet")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorSet")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorSet does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorSet does not contain field %s", fd.FullName())) } } @@ -200,17 +200,17 @@ func (x *fastReflection_ValidatorSet) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorSet) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.ValidatorSet.validators": + case "cometbft.types.v2.ValidatorSet.validators": x.Validators = nil - case "cometbft.types.v1.ValidatorSet.proposer": + case "cometbft.types.v2.ValidatorSet.proposer": x.Proposer = nil - case "cometbft.types.v1.ValidatorSet.total_voting_power": + case "cometbft.types.v2.ValidatorSet.total_voting_power": x.TotalVotingPower = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorSet")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorSet")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorSet does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorSet does not contain field %s", fd.FullName())) } } @@ -222,23 +222,23 @@ func (x *fastReflection_ValidatorSet) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_ValidatorSet) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.ValidatorSet.validators": + case "cometbft.types.v2.ValidatorSet.validators": if len(x.Validators) == 0 { return protoreflect.ValueOfList(&_ValidatorSet_1_list{}) } listValue := &_ValidatorSet_1_list{list: &x.Validators} return protoreflect.ValueOfList(listValue) - case "cometbft.types.v1.ValidatorSet.proposer": + case "cometbft.types.v2.ValidatorSet.proposer": value := x.Proposer return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.ValidatorSet.total_voting_power": + case "cometbft.types.v2.ValidatorSet.total_voting_power": value := x.TotalVotingPower return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorSet")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorSet")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorSet does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorSet does not contain field %s", descriptor.FullName())) } } @@ -254,19 +254,19 @@ func (x *fastReflection_ValidatorSet) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorSet) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.ValidatorSet.validators": + case "cometbft.types.v2.ValidatorSet.validators": lv := value.List() clv := lv.(*_ValidatorSet_1_list) x.Validators = *clv.list - case "cometbft.types.v1.ValidatorSet.proposer": + case "cometbft.types.v2.ValidatorSet.proposer": x.Proposer = value.Message().Interface().(*Validator) - case "cometbft.types.v1.ValidatorSet.total_voting_power": + case "cometbft.types.v2.ValidatorSet.total_voting_power": x.TotalVotingPower = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorSet")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorSet")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorSet does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorSet does not contain field %s", fd.FullName())) } } @@ -282,24 +282,24 @@ func (x *fastReflection_ValidatorSet) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_ValidatorSet) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ValidatorSet.validators": + case "cometbft.types.v2.ValidatorSet.validators": if x.Validators == nil { x.Validators = []*Validator{} } value := &_ValidatorSet_1_list{list: &x.Validators} return protoreflect.ValueOfList(value) - case "cometbft.types.v1.ValidatorSet.proposer": + case "cometbft.types.v2.ValidatorSet.proposer": if x.Proposer == nil { x.Proposer = new(Validator) } return protoreflect.ValueOfMessage(x.Proposer.ProtoReflect()) - case "cometbft.types.v1.ValidatorSet.total_voting_power": - panic(fmt.Errorf("field total_voting_power of message cometbft.types.v1.ValidatorSet is not mutable")) + case "cometbft.types.v2.ValidatorSet.total_voting_power": + panic(fmt.Errorf("field total_voting_power of message cometbft.types.v2.ValidatorSet is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorSet")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorSet")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorSet does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorSet does not contain field %s", fd.FullName())) } } @@ -308,19 +308,19 @@ func (x *fastReflection_ValidatorSet) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_ValidatorSet) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.ValidatorSet.validators": + case "cometbft.types.v2.ValidatorSet.validators": list := []*Validator{} return protoreflect.ValueOfList(&_ValidatorSet_1_list{list: &list}) - case "cometbft.types.v1.ValidatorSet.proposer": + case "cometbft.types.v2.ValidatorSet.proposer": m := new(Validator) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.ValidatorSet.total_voting_power": + case "cometbft.types.v2.ValidatorSet.total_voting_power": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.ValidatorSet")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.ValidatorSet")) } - panic(fmt.Errorf("message cometbft.types.v1.ValidatorSet does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.ValidatorSet does not contain field %s", fd.FullName())) } } @@ -330,7 +330,7 @@ func (x *fastReflection_ValidatorSet) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_ValidatorSet) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.ValidatorSet", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.ValidatorSet", d.FullName())) } panic("unreachable") } @@ -646,8 +646,8 @@ var ( ) func init() { - file_cometbft_types_v1_validator_proto_init() - md_Validator = File_cometbft_types_v1_validator_proto.Messages().ByName("Validator") + file_cometbft_types_v2_validator_proto_init() + md_Validator = File_cometbft_types_v2_validator_proto.Messages().ByName("Validator") fd_Validator_address = md_Validator.Fields().ByName("address") fd_Validator_pub_key = md_Validator.Fields().ByName("pub_key") fd_Validator_voting_power = md_Validator.Fields().ByName("voting_power") @@ -665,7 +665,7 @@ func (x *Validator) ProtoReflect() protoreflect.Message { } func (x *Validator) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_validator_proto_msgTypes[1] + mi := &file_cometbft_types_v2_validator_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -772,23 +772,23 @@ func (x *fastReflection_Validator) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_Validator) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.Validator.address": + case "cometbft.types.v2.Validator.address": return len(x.Address) != 0 - case "cometbft.types.v1.Validator.pub_key": + case "cometbft.types.v2.Validator.pub_key": return x.PubKey != nil - case "cometbft.types.v1.Validator.voting_power": + case "cometbft.types.v2.Validator.voting_power": return x.VotingPower != int64(0) - case "cometbft.types.v1.Validator.proposer_priority": + case "cometbft.types.v2.Validator.proposer_priority": return x.ProposerPriority != int64(0) - case "cometbft.types.v1.Validator.pub_key_bytes": + case "cometbft.types.v2.Validator.pub_key_bytes": return len(x.PubKeyBytes) != 0 - case "cometbft.types.v1.Validator.pub_key_type": + case "cometbft.types.v2.Validator.pub_key_type": return x.PubKeyType != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Validator")) } - panic(fmt.Errorf("message cometbft.types.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Validator does not contain field %s", fd.FullName())) } } @@ -800,23 +800,23 @@ func (x *fastReflection_Validator) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Validator) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.Validator.address": + case "cometbft.types.v2.Validator.address": x.Address = nil - case "cometbft.types.v1.Validator.pub_key": + case "cometbft.types.v2.Validator.pub_key": x.PubKey = nil - case "cometbft.types.v1.Validator.voting_power": + case "cometbft.types.v2.Validator.voting_power": x.VotingPower = int64(0) - case "cometbft.types.v1.Validator.proposer_priority": + case "cometbft.types.v2.Validator.proposer_priority": x.ProposerPriority = int64(0) - case "cometbft.types.v1.Validator.pub_key_bytes": + case "cometbft.types.v2.Validator.pub_key_bytes": x.PubKeyBytes = nil - case "cometbft.types.v1.Validator.pub_key_type": + case "cometbft.types.v2.Validator.pub_key_type": x.PubKeyType = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Validator")) } - panic(fmt.Errorf("message cometbft.types.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Validator does not contain field %s", fd.FullName())) } } @@ -828,29 +828,29 @@ func (x *fastReflection_Validator) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Validator) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.Validator.address": + case "cometbft.types.v2.Validator.address": value := x.Address return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Validator.pub_key": + case "cometbft.types.v2.Validator.pub_key": value := x.PubKey return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.Validator.voting_power": + case "cometbft.types.v2.Validator.voting_power": value := x.VotingPower return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.Validator.proposer_priority": + case "cometbft.types.v2.Validator.proposer_priority": value := x.ProposerPriority return protoreflect.ValueOfInt64(value) - case "cometbft.types.v1.Validator.pub_key_bytes": + case "cometbft.types.v2.Validator.pub_key_bytes": value := x.PubKeyBytes return protoreflect.ValueOfBytes(value) - case "cometbft.types.v1.Validator.pub_key_type": + case "cometbft.types.v2.Validator.pub_key_type": value := x.PubKeyType return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Validator")) } - panic(fmt.Errorf("message cometbft.types.v1.Validator does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Validator does not contain field %s", descriptor.FullName())) } } @@ -866,23 +866,23 @@ func (x *fastReflection_Validator) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Validator) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.Validator.address": + case "cometbft.types.v2.Validator.address": x.Address = value.Bytes() - case "cometbft.types.v1.Validator.pub_key": + case "cometbft.types.v2.Validator.pub_key": x.PubKey = value.Message().Interface().(*v1.PublicKey) - case "cometbft.types.v1.Validator.voting_power": + case "cometbft.types.v2.Validator.voting_power": x.VotingPower = value.Int() - case "cometbft.types.v1.Validator.proposer_priority": + case "cometbft.types.v2.Validator.proposer_priority": x.ProposerPriority = value.Int() - case "cometbft.types.v1.Validator.pub_key_bytes": + case "cometbft.types.v2.Validator.pub_key_bytes": x.PubKeyBytes = value.Bytes() - case "cometbft.types.v1.Validator.pub_key_type": + case "cometbft.types.v2.Validator.pub_key_type": x.PubKeyType = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Validator")) } - panic(fmt.Errorf("message cometbft.types.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Validator does not contain field %s", fd.FullName())) } } @@ -898,26 +898,26 @@ func (x *fastReflection_Validator) Set(fd protoreflect.FieldDescriptor, value pr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Validator) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Validator.pub_key": + case "cometbft.types.v2.Validator.pub_key": if x.PubKey == nil { x.PubKey = new(v1.PublicKey) } return protoreflect.ValueOfMessage(x.PubKey.ProtoReflect()) - case "cometbft.types.v1.Validator.address": - panic(fmt.Errorf("field address of message cometbft.types.v1.Validator is not mutable")) - case "cometbft.types.v1.Validator.voting_power": - panic(fmt.Errorf("field voting_power of message cometbft.types.v1.Validator is not mutable")) - case "cometbft.types.v1.Validator.proposer_priority": - panic(fmt.Errorf("field proposer_priority of message cometbft.types.v1.Validator is not mutable")) - case "cometbft.types.v1.Validator.pub_key_bytes": - panic(fmt.Errorf("field pub_key_bytes of message cometbft.types.v1.Validator is not mutable")) - case "cometbft.types.v1.Validator.pub_key_type": - panic(fmt.Errorf("field pub_key_type of message cometbft.types.v1.Validator is not mutable")) + case "cometbft.types.v2.Validator.address": + panic(fmt.Errorf("field address of message cometbft.types.v2.Validator is not mutable")) + case "cometbft.types.v2.Validator.voting_power": + panic(fmt.Errorf("field voting_power of message cometbft.types.v2.Validator is not mutable")) + case "cometbft.types.v2.Validator.proposer_priority": + panic(fmt.Errorf("field proposer_priority of message cometbft.types.v2.Validator is not mutable")) + case "cometbft.types.v2.Validator.pub_key_bytes": + panic(fmt.Errorf("field pub_key_bytes of message cometbft.types.v2.Validator is not mutable")) + case "cometbft.types.v2.Validator.pub_key_type": + panic(fmt.Errorf("field pub_key_type of message cometbft.types.v2.Validator is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Validator")) } - panic(fmt.Errorf("message cometbft.types.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Validator does not contain field %s", fd.FullName())) } } @@ -926,24 +926,24 @@ func (x *fastReflection_Validator) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Validator) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.Validator.address": + case "cometbft.types.v2.Validator.address": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Validator.pub_key": + case "cometbft.types.v2.Validator.pub_key": m := new(v1.PublicKey) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.Validator.voting_power": + case "cometbft.types.v2.Validator.voting_power": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.Validator.proposer_priority": + case "cometbft.types.v2.Validator.proposer_priority": return protoreflect.ValueOfInt64(int64(0)) - case "cometbft.types.v1.Validator.pub_key_bytes": + case "cometbft.types.v2.Validator.pub_key_bytes": return protoreflect.ValueOfBytes(nil) - case "cometbft.types.v1.Validator.pub_key_type": + case "cometbft.types.v2.Validator.pub_key_type": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.Validator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.Validator")) } - panic(fmt.Errorf("message cometbft.types.v1.Validator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.Validator does not contain field %s", fd.FullName())) } } @@ -953,7 +953,7 @@ func (x *fastReflection_Validator) NewField(fd protoreflect.FieldDescriptor) pro func (x *fastReflection_Validator) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.Validator", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.Validator", d.FullName())) } panic("unreachable") } @@ -1369,8 +1369,8 @@ var ( ) func init() { - file_cometbft_types_v1_validator_proto_init() - md_SimpleValidator = File_cometbft_types_v1_validator_proto.Messages().ByName("SimpleValidator") + file_cometbft_types_v2_validator_proto_init() + md_SimpleValidator = File_cometbft_types_v2_validator_proto.Messages().ByName("SimpleValidator") fd_SimpleValidator_pub_key = md_SimpleValidator.Fields().ByName("pub_key") fd_SimpleValidator_voting_power = md_SimpleValidator.Fields().ByName("voting_power") } @@ -1384,7 +1384,7 @@ func (x *SimpleValidator) ProtoReflect() protoreflect.Message { } func (x *SimpleValidator) slowProtoReflect() protoreflect.Message { - mi := &file_cometbft_types_v1_validator_proto_msgTypes[2] + mi := &file_cometbft_types_v2_validator_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1467,15 +1467,15 @@ func (x *fastReflection_SimpleValidator) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_SimpleValidator) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "cometbft.types.v1.SimpleValidator.pub_key": + case "cometbft.types.v2.SimpleValidator.pub_key": return x.PubKey != nil - case "cometbft.types.v1.SimpleValidator.voting_power": + case "cometbft.types.v2.SimpleValidator.voting_power": return x.VotingPower != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SimpleValidator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SimpleValidator")) } - panic(fmt.Errorf("message cometbft.types.v1.SimpleValidator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SimpleValidator does not contain field %s", fd.FullName())) } } @@ -1487,15 +1487,15 @@ func (x *fastReflection_SimpleValidator) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SimpleValidator) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "cometbft.types.v1.SimpleValidator.pub_key": + case "cometbft.types.v2.SimpleValidator.pub_key": x.PubKey = nil - case "cometbft.types.v1.SimpleValidator.voting_power": + case "cometbft.types.v2.SimpleValidator.voting_power": x.VotingPower = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SimpleValidator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SimpleValidator")) } - panic(fmt.Errorf("message cometbft.types.v1.SimpleValidator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SimpleValidator does not contain field %s", fd.FullName())) } } @@ -1507,17 +1507,17 @@ func (x *fastReflection_SimpleValidator) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_SimpleValidator) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "cometbft.types.v1.SimpleValidator.pub_key": + case "cometbft.types.v2.SimpleValidator.pub_key": value := x.PubKey return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cometbft.types.v1.SimpleValidator.voting_power": + case "cometbft.types.v2.SimpleValidator.voting_power": value := x.VotingPower return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SimpleValidator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SimpleValidator")) } - panic(fmt.Errorf("message cometbft.types.v1.SimpleValidator does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SimpleValidator does not contain field %s", descriptor.FullName())) } } @@ -1533,15 +1533,15 @@ func (x *fastReflection_SimpleValidator) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SimpleValidator) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "cometbft.types.v1.SimpleValidator.pub_key": + case "cometbft.types.v2.SimpleValidator.pub_key": x.PubKey = value.Message().Interface().(*v1.PublicKey) - case "cometbft.types.v1.SimpleValidator.voting_power": + case "cometbft.types.v2.SimpleValidator.voting_power": x.VotingPower = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SimpleValidator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SimpleValidator")) } - panic(fmt.Errorf("message cometbft.types.v1.SimpleValidator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SimpleValidator does not contain field %s", fd.FullName())) } } @@ -1557,18 +1557,18 @@ func (x *fastReflection_SimpleValidator) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SimpleValidator) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.SimpleValidator.pub_key": + case "cometbft.types.v2.SimpleValidator.pub_key": if x.PubKey == nil { x.PubKey = new(v1.PublicKey) } return protoreflect.ValueOfMessage(x.PubKey.ProtoReflect()) - case "cometbft.types.v1.SimpleValidator.voting_power": - panic(fmt.Errorf("field voting_power of message cometbft.types.v1.SimpleValidator is not mutable")) + case "cometbft.types.v2.SimpleValidator.voting_power": + panic(fmt.Errorf("field voting_power of message cometbft.types.v2.SimpleValidator is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SimpleValidator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SimpleValidator")) } - panic(fmt.Errorf("message cometbft.types.v1.SimpleValidator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SimpleValidator does not contain field %s", fd.FullName())) } } @@ -1577,16 +1577,16 @@ func (x *fastReflection_SimpleValidator) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_SimpleValidator) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cometbft.types.v1.SimpleValidator.pub_key": + case "cometbft.types.v2.SimpleValidator.pub_key": m := new(v1.PublicKey) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cometbft.types.v1.SimpleValidator.voting_power": + case "cometbft.types.v2.SimpleValidator.voting_power": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v1.SimpleValidator")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: cometbft.types.v2.SimpleValidator")) } - panic(fmt.Errorf("message cometbft.types.v1.SimpleValidator does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message cometbft.types.v2.SimpleValidator does not contain field %s", fd.FullName())) } } @@ -1596,7 +1596,7 @@ func (x *fastReflection_SimpleValidator) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_SimpleValidator) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v1.SimpleValidator", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in cometbft.types.v2.SimpleValidator", d.FullName())) } panic("unreachable") } @@ -1849,7 +1849,7 @@ func (x *fastReflection_SimpleValidator) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: cometbft/types/v1/validator.proto +// source: cometbft/types/v2/validator.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -1899,11 +1899,11 @@ func (x BlockIDFlag) String() string { } func (BlockIDFlag) Descriptor() protoreflect.EnumDescriptor { - return file_cometbft_types_v1_validator_proto_enumTypes[0].Descriptor() + return file_cometbft_types_v2_validator_proto_enumTypes[0].Descriptor() } func (BlockIDFlag) Type() protoreflect.EnumType { - return &file_cometbft_types_v1_validator_proto_enumTypes[0] + return &file_cometbft_types_v2_validator_proto_enumTypes[0] } func (x BlockIDFlag) Number() protoreflect.EnumNumber { @@ -1912,7 +1912,7 @@ func (x BlockIDFlag) Number() protoreflect.EnumNumber { // Deprecated: Use BlockIDFlag.Descriptor instead. func (BlockIDFlag) EnumDescriptor() ([]byte, []int) { - return file_cometbft_types_v1_validator_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_validator_proto_rawDescGZIP(), []int{0} } // ValidatorSet defines a set of validators. @@ -1929,7 +1929,7 @@ type ValidatorSet struct { func (x *ValidatorSet) Reset() { *x = ValidatorSet{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_validator_proto_msgTypes[0] + mi := &file_cometbft_types_v2_validator_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1943,7 +1943,7 @@ func (*ValidatorSet) ProtoMessage() {} // Deprecated: Use ValidatorSet.ProtoReflect.Descriptor instead. func (*ValidatorSet) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_validator_proto_rawDescGZIP(), []int{0} + return file_cometbft_types_v2_validator_proto_rawDescGZIP(), []int{0} } func (x *ValidatorSet) GetValidators() []*Validator { @@ -1985,7 +1985,7 @@ type Validator struct { func (x *Validator) Reset() { *x = Validator{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_validator_proto_msgTypes[1] + mi := &file_cometbft_types_v2_validator_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1999,7 +1999,7 @@ func (*Validator) ProtoMessage() {} // Deprecated: Use Validator.ProtoReflect.Descriptor instead. func (*Validator) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_validator_proto_rawDescGZIP(), []int{1} + return file_cometbft_types_v2_validator_proto_rawDescGZIP(), []int{1} } func (x *Validator) GetAddress() []byte { @@ -2060,7 +2060,7 @@ type SimpleValidator struct { func (x *SimpleValidator) Reset() { *x = SimpleValidator{} if protoimpl.UnsafeEnabled { - mi := &file_cometbft_types_v1_validator_proto_msgTypes[2] + mi := &file_cometbft_types_v2_validator_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2074,7 +2074,7 @@ func (*SimpleValidator) ProtoMessage() {} // Deprecated: Use SimpleValidator.ProtoReflect.Descriptor instead. func (*SimpleValidator) Descriptor() ([]byte, []int) { - return file_cometbft_types_v1_validator_proto_rawDescGZIP(), []int{2} + return file_cometbft_types_v2_validator_proto_rawDescGZIP(), []int{2} } func (x *SimpleValidator) GetPubKey() *v1.PublicKey { @@ -2091,23 +2091,23 @@ func (x *SimpleValidator) GetVotingPower() int64 { return 0 } -var File_cometbft_types_v1_validator_proto protoreflect.FileDescriptor +var File_cometbft_types_v2_validator_proto protoreflect.FileDescriptor -var file_cometbft_types_v1_validator_proto_rawDesc = []byte{ +var file_cometbft_types_v2_validator_proto_rawDesc = []byte{ 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, + 0x2f, 0x76, 0x32, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, + 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x65, 0x79, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb4, 0x01, 0x0a, 0x0c, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x53, 0x65, 0x74, 0x12, 0x3c, 0x0a, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x0a, + 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x38, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x76, 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, @@ -2149,46 +2149,46 @@ var file_cometbft_types_v1_validator_proto_rawDesc = []byte{ 0x5f, 0x4e, 0x49, 0x4c, 0x10, 0x03, 0x1a, 0x12, 0x8a, 0x9d, 0x20, 0x0e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x46, 0x6c, 0x61, 0x67, 0x4e, 0x69, 0x6c, 0x1a, 0x08, 0x88, 0xa3, 0x1e, 0x00, 0xa8, 0xa4, 0x1e, 0x01, 0x42, 0xb9, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x0e, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x42, 0x0e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, + 0x73, 0x2f, 0x76, 0x32, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x43, 0x54, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x54, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, + 0x70, 0x65, 0x73, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x11, 0x43, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, + 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x1d, 0x43, 0x6f, 0x6d, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x31, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_cometbft_types_v1_validator_proto_rawDescOnce sync.Once - file_cometbft_types_v1_validator_proto_rawDescData = file_cometbft_types_v1_validator_proto_rawDesc + file_cometbft_types_v2_validator_proto_rawDescOnce sync.Once + file_cometbft_types_v2_validator_proto_rawDescData = file_cometbft_types_v2_validator_proto_rawDesc ) -func file_cometbft_types_v1_validator_proto_rawDescGZIP() []byte { - file_cometbft_types_v1_validator_proto_rawDescOnce.Do(func() { - file_cometbft_types_v1_validator_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v1_validator_proto_rawDescData) +func file_cometbft_types_v2_validator_proto_rawDescGZIP() []byte { + file_cometbft_types_v2_validator_proto_rawDescOnce.Do(func() { + file_cometbft_types_v2_validator_proto_rawDescData = protoimpl.X.CompressGZIP(file_cometbft_types_v2_validator_proto_rawDescData) }) - return file_cometbft_types_v1_validator_proto_rawDescData + return file_cometbft_types_v2_validator_proto_rawDescData } -var file_cometbft_types_v1_validator_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_cometbft_types_v1_validator_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_cometbft_types_v1_validator_proto_goTypes = []interface{}{ - (BlockIDFlag)(0), // 0: cometbft.types.v1.BlockIDFlag - (*ValidatorSet)(nil), // 1: cometbft.types.v1.ValidatorSet - (*Validator)(nil), // 2: cometbft.types.v1.Validator - (*SimpleValidator)(nil), // 3: cometbft.types.v1.SimpleValidator +var file_cometbft_types_v2_validator_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_cometbft_types_v2_validator_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_cometbft_types_v2_validator_proto_goTypes = []interface{}{ + (BlockIDFlag)(0), // 0: cometbft.types.v2.BlockIDFlag + (*ValidatorSet)(nil), // 1: cometbft.types.v2.ValidatorSet + (*Validator)(nil), // 2: cometbft.types.v2.Validator + (*SimpleValidator)(nil), // 3: cometbft.types.v2.SimpleValidator (*v1.PublicKey)(nil), // 4: cometbft.crypto.v1.PublicKey } -var file_cometbft_types_v1_validator_proto_depIdxs = []int32{ - 2, // 0: cometbft.types.v1.ValidatorSet.validators:type_name -> cometbft.types.v1.Validator - 2, // 1: cometbft.types.v1.ValidatorSet.proposer:type_name -> cometbft.types.v1.Validator - 4, // 2: cometbft.types.v1.Validator.pub_key:type_name -> cometbft.crypto.v1.PublicKey - 4, // 3: cometbft.types.v1.SimpleValidator.pub_key:type_name -> cometbft.crypto.v1.PublicKey +var file_cometbft_types_v2_validator_proto_depIdxs = []int32{ + 2, // 0: cometbft.types.v2.ValidatorSet.validators:type_name -> cometbft.types.v2.Validator + 2, // 1: cometbft.types.v2.ValidatorSet.proposer:type_name -> cometbft.types.v2.Validator + 4, // 2: cometbft.types.v2.Validator.pub_key:type_name -> cometbft.crypto.v1.PublicKey + 4, // 3: cometbft.types.v2.SimpleValidator.pub_key:type_name -> cometbft.crypto.v1.PublicKey 4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name @@ -2196,13 +2196,13 @@ var file_cometbft_types_v1_validator_proto_depIdxs = []int32{ 0, // [0:4] is the sub-list for field type_name } -func init() { file_cometbft_types_v1_validator_proto_init() } -func file_cometbft_types_v1_validator_proto_init() { - if File_cometbft_types_v1_validator_proto != nil { +func init() { file_cometbft_types_v2_validator_proto_init() } +func file_cometbft_types_v2_validator_proto_init() { + if File_cometbft_types_v2_validator_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_cometbft_types_v1_validator_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_validator_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ValidatorSet); i { case 0: return &v.state @@ -2214,7 +2214,7 @@ func file_cometbft_types_v1_validator_proto_init() { return nil } } - file_cometbft_types_v1_validator_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_validator_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Validator); i { case 0: return &v.state @@ -2226,7 +2226,7 @@ func file_cometbft_types_v1_validator_proto_init() { return nil } } - file_cometbft_types_v1_validator_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_cometbft_types_v2_validator_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SimpleValidator); i { case 0: return &v.state @@ -2243,19 +2243,19 @@ func file_cometbft_types_v1_validator_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_cometbft_types_v1_validator_proto_rawDesc, + RawDescriptor: file_cometbft_types_v2_validator_proto_rawDesc, NumEnums: 1, NumMessages: 3, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_cometbft_types_v1_validator_proto_goTypes, - DependencyIndexes: file_cometbft_types_v1_validator_proto_depIdxs, - EnumInfos: file_cometbft_types_v1_validator_proto_enumTypes, - MessageInfos: file_cometbft_types_v1_validator_proto_msgTypes, + GoTypes: file_cometbft_types_v2_validator_proto_goTypes, + DependencyIndexes: file_cometbft_types_v2_validator_proto_depIdxs, + EnumInfos: file_cometbft_types_v2_validator_proto_enumTypes, + MessageInfos: file_cometbft_types_v2_validator_proto_msgTypes, }.Build() - File_cometbft_types_v1_validator_proto = out.File - file_cometbft_types_v1_validator_proto_rawDesc = nil - file_cometbft_types_v1_validator_proto_goTypes = nil - file_cometbft_types_v1_validator_proto_depIdxs = nil + File_cometbft_types_v2_validator_proto = out.File + file_cometbft_types_v2_validator_proto_rawDesc = nil + file_cometbft_types_v2_validator_proto_goTypes = nil + file_cometbft_types_v2_validator_proto_depIdxs = nil } diff --git a/api/cosmos/base/abci/v1beta1/abci.pulsar.go b/api/cosmos/base/abci/v1beta1/abci.pulsar.go index 3786447522..92d1201286 100644 --- a/api/cosmos/base/abci/v1beta1/abci.pulsar.go +++ b/api/cosmos/base/abci/v1beta1/abci.pulsar.go @@ -2,8 +2,8 @@ package abciv1beta1 import ( - v1 "cosmossdk.io/api/cometbft/abci/v1" - v11 "cosmossdk.io/api/cometbft/types/v1" + v2 "cosmossdk.io/api/cometbft/abci/v2" + v21 "cosmossdk.io/api/cometbft/types/v2" fmt "fmt" _ "github.com/cosmos/cosmos-proto" runtime "github.com/cosmos/cosmos-proto/runtime" @@ -71,7 +71,7 @@ func (x *_TxResponse_7_list) IsValid() bool { var _ protoreflect.List = (*_TxResponse_13_list)(nil) type _TxResponse_13_list struct { - list *[]*v1.Event + list *[]*v2.Event } func (x *_TxResponse_13_list) Len() int { @@ -87,18 +87,18 @@ func (x *_TxResponse_13_list) Get(i int) protoreflect.Value { func (x *_TxResponse_13_list) Set(i int, value protoreflect.Value) { valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v1.Event) + concreteValue := valueUnwrapped.Interface().(*v2.Event) (*x.list)[i] = concreteValue } func (x *_TxResponse_13_list) Append(value protoreflect.Value) { valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v1.Event) + concreteValue := valueUnwrapped.Interface().(*v2.Event) *x.list = append(*x.list, concreteValue) } func (x *_TxResponse_13_list) AppendMutable() protoreflect.Value { - v := new(v1.Event) + v := new(v2.Event) *x.list = append(*x.list, v) return protoreflect.ValueOfMessage(v.ProtoReflect()) } @@ -111,7 +111,7 @@ func (x *_TxResponse_13_list) Truncate(n int) { } func (x *_TxResponse_13_list) NewElement() protoreflect.Value { - v := new(v1.Event) + v := new(v2.Event) return protoreflect.ValueOfMessage(v.ProtoReflect()) } @@ -524,7 +524,7 @@ func (x *fastReflection_TxResponse) Mutable(fd protoreflect.FieldDescriptor) pro return protoreflect.ValueOfMessage(x.Tx.ProtoReflect()) case "cosmos.base.abci.v1beta1.TxResponse.events": if x.Events == nil { - x.Events = []*v1.Event{} + x.Events = []*v2.Event{} } value := &_TxResponse_13_list{list: &x.Events} return protoreflect.ValueOfList(value) @@ -588,7 +588,7 @@ func (x *fastReflection_TxResponse) NewField(fd protoreflect.FieldDescriptor) pr case "cosmos.base.abci.v1beta1.TxResponse.timestamp": return protoreflect.ValueOfString("") case "cosmos.base.abci.v1beta1.TxResponse.events": - list := []*v1.Event{} + list := []*v2.Event{} return protoreflect.ValueOfList(&_TxResponse_13_list{list: &list}) default: if fd.IsExtension() { @@ -1264,7 +1264,7 @@ func (x *fastReflection_TxResponse) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Events = append(x.Events, &v1.Event{}) + x.Events = append(x.Events, &v2.Event{}) if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Events[len(x.Events)-1]); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } @@ -3407,7 +3407,7 @@ func (x *fastReflection_GasInfo) ProtoMethods() *protoiface.Methods { var _ protoreflect.List = (*_Result_3_list)(nil) type _Result_3_list struct { - list *[]*v1.Event + list *[]*v2.Event } func (x *_Result_3_list) Len() int { @@ -3423,18 +3423,18 @@ func (x *_Result_3_list) Get(i int) protoreflect.Value { func (x *_Result_3_list) Set(i int, value protoreflect.Value) { valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v1.Event) + concreteValue := valueUnwrapped.Interface().(*v2.Event) (*x.list)[i] = concreteValue } func (x *_Result_3_list) Append(value protoreflect.Value) { valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v1.Event) + concreteValue := valueUnwrapped.Interface().(*v2.Event) *x.list = append(*x.list, concreteValue) } func (x *_Result_3_list) AppendMutable() protoreflect.Value { - v := new(v1.Event) + v := new(v2.Event) *x.list = append(*x.list, v) return protoreflect.ValueOfMessage(v.ProtoReflect()) } @@ -3447,7 +3447,7 @@ func (x *_Result_3_list) Truncate(n int) { } func (x *_Result_3_list) NewElement() protoreflect.Value { - v := new(v1.Event) + v := new(v2.Event) return protoreflect.ValueOfMessage(v.ProtoReflect()) } @@ -3747,7 +3747,7 @@ func (x *fastReflection_Result) Mutable(fd protoreflect.FieldDescriptor) protore switch fd.FullName() { case "cosmos.base.abci.v1beta1.Result.events": if x.Events == nil { - x.Events = []*v1.Event{} + x.Events = []*v2.Event{} } value := &_Result_3_list{list: &x.Events} return protoreflect.ValueOfList(value) @@ -3779,7 +3779,7 @@ func (x *fastReflection_Result) NewField(fd protoreflect.FieldDescriptor) protor case "cosmos.base.abci.v1beta1.Result.log": return protoreflect.ValueOfString("") case "cosmos.base.abci.v1beta1.Result.events": - list := []*v1.Event{} + list := []*v2.Event{} return protoreflect.ValueOfList(&_Result_3_list{list: &list}) case "cosmos.base.abci.v1beta1.Result.msg_responses": list := []*anypb.Any{} @@ -4092,7 +4092,7 @@ func (x *fastReflection_Result) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Events = append(x.Events, &v1.Event{}) + x.Events = append(x.Events, &v2.Event{}) if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Events[len(x.Events)-1]); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } @@ -6535,7 +6535,7 @@ func (x *fastReflection_SearchTxsResult) ProtoMethods() *protoiface.Methods { var _ protoreflect.List = (*_SearchBlocksResult_6_list)(nil) type _SearchBlocksResult_6_list struct { - list *[]*v11.Block + list *[]*v21.Block } func (x *_SearchBlocksResult_6_list) Len() int { @@ -6551,18 +6551,18 @@ func (x *_SearchBlocksResult_6_list) Get(i int) protoreflect.Value { func (x *_SearchBlocksResult_6_list) Set(i int, value protoreflect.Value) { valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v11.Block) + concreteValue := valueUnwrapped.Interface().(*v21.Block) (*x.list)[i] = concreteValue } func (x *_SearchBlocksResult_6_list) Append(value protoreflect.Value) { valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v11.Block) + concreteValue := valueUnwrapped.Interface().(*v21.Block) *x.list = append(*x.list, concreteValue) } func (x *_SearchBlocksResult_6_list) AppendMutable() protoreflect.Value { - v := new(v11.Block) + v := new(v21.Block) *x.list = append(*x.list, v) return protoreflect.ValueOfMessage(v.ProtoReflect()) } @@ -6575,7 +6575,7 @@ func (x *_SearchBlocksResult_6_list) Truncate(n int) { } func (x *_SearchBlocksResult_6_list) NewElement() protoreflect.Value { - v := new(v11.Block) + v := new(v21.Block) return protoreflect.ValueOfMessage(v.ProtoReflect()) } @@ -6853,7 +6853,7 @@ func (x *fastReflection_SearchBlocksResult) Mutable(fd protoreflect.FieldDescrip switch fd.FullName() { case "cosmos.base.abci.v1beta1.SearchBlocksResult.blocks": if x.Blocks == nil { - x.Blocks = []*v11.Block{} + x.Blocks = []*v21.Block{} } value := &_SearchBlocksResult_6_list{list: &x.Blocks} return protoreflect.ValueOfList(value) @@ -6891,7 +6891,7 @@ func (x *fastReflection_SearchBlocksResult) NewField(fd protoreflect.FieldDescri case "cosmos.base.abci.v1beta1.SearchBlocksResult.limit": return protoreflect.ValueOfInt64(int64(0)) case "cosmos.base.abci.v1beta1.SearchBlocksResult.blocks": - list := []*v11.Block{} + list := []*v21.Block{} return protoreflect.ValueOfList(&_SearchBlocksResult_6_list{list: &list}) default: if fd.IsExtension() { @@ -7226,7 +7226,7 @@ func (x *fastReflection_SearchBlocksResult) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Blocks = append(x.Blocks, &v11.Block{}) + x.Blocks = append(x.Blocks, &v21.Block{}) if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Blocks[len(x.Blocks)-1]); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } @@ -7317,7 +7317,7 @@ type TxResponse struct { // these events include those emitted by processing all the messages and those // emitted from the ante. Whereas Logs contains the events, with // additional metadata, emitted only by processing the messages. - Events []*v1.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events,omitempty"` + Events []*v2.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events,omitempty"` } func (x *TxResponse) Reset() { @@ -7424,7 +7424,7 @@ func (x *TxResponse) GetTimestamp() string { return "" } -func (x *TxResponse) GetEvents() []*v1.Event { +func (x *TxResponse) GetEvents() []*v2.Event { if x != nil { return x.Events } @@ -7638,7 +7638,7 @@ type Result struct { Log string `protobuf:"bytes,2,opt,name=log,proto3" json:"log,omitempty"` // Events contains a slice of Event objects that were emitted during message // or handler execution. - Events []*v1.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events,omitempty"` + Events []*v2.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events,omitempty"` // msg_responses contains the Msg handler responses type packed in Anys. MsgResponses []*anypb.Any `protobuf:"bytes,4,rep,name=msg_responses,json=msgResponses,proto3" json:"msg_responses,omitempty"` } @@ -7678,7 +7678,7 @@ func (x *Result) GetLog() string { return "" } -func (x *Result) GetEvents() []*v1.Event { +func (x *Result) GetEvents() []*v2.Event { if x != nil { return x.Events } @@ -7933,7 +7933,7 @@ type SearchBlocksResult struct { // Max count blocks per page Limit int64 `protobuf:"varint,5,opt,name=limit,proto3" json:"limit,omitempty"` // List of blocks in current page - Blocks []*v11.Block `protobuf:"bytes,6,rep,name=blocks,proto3" json:"blocks,omitempty"` + Blocks []*v21.Block `protobuf:"bytes,6,rep,name=blocks,proto3" json:"blocks,omitempty"` } func (x *SearchBlocksResult) Reset() { @@ -7991,7 +7991,7 @@ func (x *SearchBlocksResult) GetLimit() int64 { return 0 } -func (x *SearchBlocksResult) GetBlocks() []*v11.Block { +func (x *SearchBlocksResult) GetBlocks() []*v21.Block { if x != nil { return x.Blocks } @@ -8007,9 +8007,9 @@ var file_cosmos_base_abci_v1beta1_abci_proto_rawDesc = []byte{ 0x73, 0x65, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, - 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, + 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, @@ -8040,7 +8040,7 @@ var file_cosmos_base_abci_v1beta1_abci_proto_rawDesc = []byte{ 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x48, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x17, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xb4, 0x2d, 0x0f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x20, 0x30, 0x2e, 0x34, 0x35, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3a, 0x04, 0x88, 0xa0, 0x1f, 0x00, 0x22, 0xa9, 0x01, 0x0a, 0x0e, @@ -8074,7 +8074,7 @@ var file_cosmos_base_abci_v1beta1_abci_proto_rawDesc = []byte{ 0x18, 0x01, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x35, 0x0a, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x4e, 0x0a, 0x0d, 0x6d, 0x73, 0x67, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, @@ -8131,7 +8131,7 @@ var file_cosmos_base_abci_v1beta1_abci_proto_rawDesc = []byte{ 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x30, 0x0a, 0x06, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x06, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x06, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x3a, 0x04, 0x80, 0xdc, 0x20, 0x01, 0x42, 0xe7, 0x01, 0xd8, 0xe1, 0x1e, 0x00, 0x0a, 0x1c, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, @@ -8176,23 +8176,23 @@ var file_cosmos_base_abci_v1beta1_abci_proto_goTypes = []interface{}{ (*SearchTxsResult)(nil), // 9: cosmos.base.abci.v1beta1.SearchTxsResult (*SearchBlocksResult)(nil), // 10: cosmos.base.abci.v1beta1.SearchBlocksResult (*anypb.Any)(nil), // 11: google.protobuf.Any - (*v1.Event)(nil), // 12: cometbft.abci.v1.Event - (*v11.Block)(nil), // 13: cometbft.types.v1.Block + (*v2.Event)(nil), // 12: cometbft.abci.v2.Event + (*v21.Block)(nil), // 13: cometbft.types.v2.Block } var file_cosmos_base_abci_v1beta1_abci_proto_depIdxs = []int32{ 1, // 0: cosmos.base.abci.v1beta1.TxResponse.logs:type_name -> cosmos.base.abci.v1beta1.ABCIMessageLog 11, // 1: cosmos.base.abci.v1beta1.TxResponse.tx:type_name -> google.protobuf.Any - 12, // 2: cosmos.base.abci.v1beta1.TxResponse.events:type_name -> cometbft.abci.v1.Event + 12, // 2: cosmos.base.abci.v1beta1.TxResponse.events:type_name -> cometbft.abci.v2.Event 2, // 3: cosmos.base.abci.v1beta1.ABCIMessageLog.events:type_name -> cosmos.base.abci.v1beta1.StringEvent 3, // 4: cosmos.base.abci.v1beta1.StringEvent.attributes:type_name -> cosmos.base.abci.v1beta1.Attribute - 12, // 5: cosmos.base.abci.v1beta1.Result.events:type_name -> cometbft.abci.v1.Event + 12, // 5: cosmos.base.abci.v1beta1.Result.events:type_name -> cometbft.abci.v2.Event 11, // 6: cosmos.base.abci.v1beta1.Result.msg_responses:type_name -> google.protobuf.Any 4, // 7: cosmos.base.abci.v1beta1.SimulationResponse.gas_info:type_name -> cosmos.base.abci.v1beta1.GasInfo 5, // 8: cosmos.base.abci.v1beta1.SimulationResponse.result:type_name -> cosmos.base.abci.v1beta1.Result 7, // 9: cosmos.base.abci.v1beta1.TxMsgData.data:type_name -> cosmos.base.abci.v1beta1.MsgData 11, // 10: cosmos.base.abci.v1beta1.TxMsgData.msg_responses:type_name -> google.protobuf.Any 0, // 11: cosmos.base.abci.v1beta1.SearchTxsResult.txs:type_name -> cosmos.base.abci.v1beta1.TxResponse - 13, // 12: cosmos.base.abci.v1beta1.SearchBlocksResult.blocks:type_name -> cometbft.types.v1.Block + 13, // 12: cosmos.base.abci.v1beta1.SearchBlocksResult.blocks:type_name -> cometbft.types.v2.Block 13, // [13:13] is the sub-list for method output_type 13, // [13:13] is the sub-list for method input_type 13, // [13:13] is the sub-list for extension type_name diff --git a/api/cosmos/base/tendermint/v1beta1/query.pulsar.go b/api/cosmos/base/tendermint/v1beta1/query.pulsar.go index ca8220650f..6dd871a9d4 100644 --- a/api/cosmos/base/tendermint/v1beta1/query.pulsar.go +++ b/api/cosmos/base/tendermint/v1beta1/query.pulsar.go @@ -3,8 +3,8 @@ package tendermintv1beta1 import ( _ "cosmossdk.io/api/amino" - v11 "cosmossdk.io/api/cometbft/p2p/v1" - v1 "cosmossdk.io/api/cometbft/types/v1" + v1 "cosmossdk.io/api/cometbft/p2p/v1" + v2 "cosmossdk.io/api/cometbft/types/v2" v1beta1 "cosmossdk.io/api/cosmos/base/query/v1beta1" fmt "fmt" _ "github.com/cosmos/cosmos-proto" @@ -3366,9 +3366,9 @@ func (x *fastReflection_GetBlockByHeightResponse) Get(descriptor protoreflect.Fi func (x *fastReflection_GetBlockByHeightResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block_id": - x.BlockId = value.Message().Interface().(*v1.BlockID) + x.BlockId = value.Message().Interface().(*v2.BlockID) case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block": - x.Block = value.Message().Interface().(*v1.Block) + x.Block = value.Message().Interface().(*v2.Block) case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.sdk_block": x.SdkBlock = value.Message().Interface().(*Block) default: @@ -3393,12 +3393,12 @@ func (x *fastReflection_GetBlockByHeightResponse) Mutable(fd protoreflect.FieldD switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block_id": if x.BlockId == nil { - x.BlockId = new(v1.BlockID) + x.BlockId = new(v2.BlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block": if x.Block == nil { - x.Block = new(v1.Block) + x.Block = new(v2.Block) } return protoreflect.ValueOfMessage(x.Block.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.sdk_block": @@ -3420,10 +3420,10 @@ func (x *fastReflection_GetBlockByHeightResponse) Mutable(fd protoreflect.FieldD func (x *fastReflection_GetBlockByHeightResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block_id": - m := new(v1.BlockID) + m := new(v2.BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block": - m := new(v1.Block) + m := new(v2.Block) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.sdk_block": m := new(Block) @@ -3659,7 +3659,7 @@ func (x *fastReflection_GetBlockByHeightResponse) ProtoMethods() *protoiface.Met return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.BlockId == nil { - x.BlockId = &v1.BlockID{} + x.BlockId = &v2.BlockID{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.BlockId); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -3695,7 +3695,7 @@ func (x *fastReflection_GetBlockByHeightResponse) ProtoMethods() *protoiface.Met return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Block == nil { - x.Block = &v1.Block{} + x.Block = &v2.Block{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Block); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -4315,9 +4315,9 @@ func (x *fastReflection_GetLatestBlockResponse) Get(descriptor protoreflect.Fiel func (x *fastReflection_GetLatestBlockResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block_id": - x.BlockId = value.Message().Interface().(*v1.BlockID) + x.BlockId = value.Message().Interface().(*v2.BlockID) case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block": - x.Block = value.Message().Interface().(*v1.Block) + x.Block = value.Message().Interface().(*v2.Block) case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.sdk_block": x.SdkBlock = value.Message().Interface().(*Block) default: @@ -4342,12 +4342,12 @@ func (x *fastReflection_GetLatestBlockResponse) Mutable(fd protoreflect.FieldDes switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block_id": if x.BlockId == nil { - x.BlockId = new(v1.BlockID) + x.BlockId = new(v2.BlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block": if x.Block == nil { - x.Block = new(v1.Block) + x.Block = new(v2.Block) } return protoreflect.ValueOfMessage(x.Block.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.sdk_block": @@ -4369,10 +4369,10 @@ func (x *fastReflection_GetLatestBlockResponse) Mutable(fd protoreflect.FieldDes func (x *fastReflection_GetLatestBlockResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block_id": - m := new(v1.BlockID) + m := new(v2.BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block": - m := new(v1.Block) + m := new(v2.Block) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.sdk_block": m := new(Block) @@ -4608,7 +4608,7 @@ func (x *fastReflection_GetLatestBlockResponse) ProtoMethods() *protoiface.Metho return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.BlockId == nil { - x.BlockId = &v1.BlockID{} + x.BlockId = &v2.BlockID{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.BlockId); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -4644,7 +4644,7 @@ func (x *fastReflection_GetLatestBlockResponse) ProtoMethods() *protoiface.Metho return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Block == nil { - x.Block = &v1.Block{} + x.Block = &v2.Block{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Block); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -6015,7 +6015,7 @@ func (x *fastReflection_GetNodeInfoResponse) Get(descriptor protoreflect.FieldDe func (x *fastReflection_GetNodeInfoResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetNodeInfoResponse.default_node_info": - x.DefaultNodeInfo = value.Message().Interface().(*v11.DefaultNodeInfo) + x.DefaultNodeInfo = value.Message().Interface().(*v1.DefaultNodeInfo) case "cosmos.base.tendermint.v1beta1.GetNodeInfoResponse.application_version": x.ApplicationVersion = value.Message().Interface().(*VersionInfo) default: @@ -6040,7 +6040,7 @@ func (x *fastReflection_GetNodeInfoResponse) Mutable(fd protoreflect.FieldDescri switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetNodeInfoResponse.default_node_info": if x.DefaultNodeInfo == nil { - x.DefaultNodeInfo = new(v11.DefaultNodeInfo) + x.DefaultNodeInfo = new(v1.DefaultNodeInfo) } return protoreflect.ValueOfMessage(x.DefaultNodeInfo.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetNodeInfoResponse.application_version": @@ -6062,7 +6062,7 @@ func (x *fastReflection_GetNodeInfoResponse) Mutable(fd protoreflect.FieldDescri func (x *fastReflection_GetNodeInfoResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.GetNodeInfoResponse.default_node_info": - m := new(v11.DefaultNodeInfo) + m := new(v1.DefaultNodeInfo) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.GetNodeInfoResponse.application_version": m := new(VersionInfo) @@ -6280,7 +6280,7 @@ func (x *fastReflection_GetNodeInfoResponse) ProtoMethods() *protoiface.Methods return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.DefaultNodeInfo == nil { - x.DefaultNodeInfo = &v11.DefaultNodeInfo{} + x.DefaultNodeInfo = &v1.DefaultNodeInfo{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.DefaultNodeInfo); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -10687,9 +10687,9 @@ type GetBlockByHeightResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BlockId *v1.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + BlockId *v2.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` // Deprecated: please use `sdk_block` instead - Block *v1.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + Block *v2.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` SdkBlock *Block `protobuf:"bytes,3,opt,name=sdk_block,json=sdkBlock,proto3" json:"sdk_block,omitempty"` } @@ -10713,14 +10713,14 @@ func (*GetBlockByHeightResponse) Descriptor() ([]byte, []int) { return file_cosmos_base_tendermint_v1beta1_query_proto_rawDescGZIP(), []int{6} } -func (x *GetBlockByHeightResponse) GetBlockId() *v1.BlockID { +func (x *GetBlockByHeightResponse) GetBlockId() *v2.BlockID { if x != nil { return x.BlockId } return nil } -func (x *GetBlockByHeightResponse) GetBlock() *v1.Block { +func (x *GetBlockByHeightResponse) GetBlock() *v2.Block { if x != nil { return x.Block } @@ -10767,9 +10767,9 @@ type GetLatestBlockResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BlockId *v1.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + BlockId *v2.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` // Deprecated: please use `sdk_block` instead - Block *v1.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + Block *v2.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` SdkBlock *Block `protobuf:"bytes,3,opt,name=sdk_block,json=sdkBlock,proto3" json:"sdk_block,omitempty"` } @@ -10793,14 +10793,14 @@ func (*GetLatestBlockResponse) Descriptor() ([]byte, []int) { return file_cosmos_base_tendermint_v1beta1_query_proto_rawDescGZIP(), []int{8} } -func (x *GetLatestBlockResponse) GetBlockId() *v1.BlockID { +func (x *GetLatestBlockResponse) GetBlockId() *v2.BlockID { if x != nil { return x.BlockId } return nil } -func (x *GetLatestBlockResponse) GetBlock() *v1.Block { +func (x *GetLatestBlockResponse) GetBlock() *v2.Block { if x != nil { return x.Block } @@ -10910,8 +10910,8 @@ type GetNodeInfoResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DefaultNodeInfo *v11.DefaultNodeInfo `protobuf:"bytes,1,opt,name=default_node_info,json=defaultNodeInfo,proto3" json:"default_node_info,omitempty"` - ApplicationVersion *VersionInfo `protobuf:"bytes,2,opt,name=application_version,json=applicationVersion,proto3" json:"application_version,omitempty"` + DefaultNodeInfo *v1.DefaultNodeInfo `protobuf:"bytes,1,opt,name=default_node_info,json=defaultNodeInfo,proto3" json:"default_node_info,omitempty"` + ApplicationVersion *VersionInfo `protobuf:"bytes,2,opt,name=application_version,json=applicationVersion,proto3" json:"application_version,omitempty"` } func (x *GetNodeInfoResponse) Reset() { @@ -10934,7 +10934,7 @@ func (*GetNodeInfoResponse) Descriptor() ([]byte, []int) { return file_cosmos_base_tendermint_v1beta1_query_proto_rawDescGZIP(), []int{12} } -func (x *GetNodeInfoResponse) GetDefaultNodeInfo() *v11.DefaultNodeInfo { +func (x *GetNodeInfoResponse) GetDefaultNodeInfo() *v1.DefaultNodeInfo { if x != nil { return x.DefaultNodeInfo } @@ -11367,7 +11367,7 @@ var file_cosmos_base_tendermint_v1beta1_query_proto_rawDesc = []byte{ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x70, 0x32, 0x70, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, + 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, @@ -11376,7 +11376,7 @@ var file_cosmos_base_tendermint_v1beta1_query_proto_rawDesc = []byte{ 0x74, 0x61, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x62, 0x6c, + 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x80, 0x01, 0x0a, 0x1e, 0x47, 0x65, 0x74, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x53, 0x65, 0x74, @@ -11440,10 +11440,10 @@ var file_cosmos_base_tendermint_v1beta1_query_proto_rawDesc = []byte{ 0x69, 0x67, 0x68, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, + 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x05, 0x62, 0x6c, + 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x57, 0x0a, 0x09, 0x73, 0x64, 0x6b, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2e, @@ -11455,10 +11455,10 @@ var file_cosmos_base_tendermint_v1beta1_query_proto_rawDesc = []byte{ 0x65, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, + 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, - 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, + 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x57, 0x0a, 0x09, 0x73, 0x64, 0x6b, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, @@ -11681,10 +11681,10 @@ var file_cosmos_base_tendermint_v1beta1_query_proto_goTypes = []interface{}{ (*v1beta1.PageRequest)(nil), // 19: cosmos.base.query.v1beta1.PageRequest (*v1beta1.PageResponse)(nil), // 20: cosmos.base.query.v1beta1.PageResponse (*anypb.Any)(nil), // 21: google.protobuf.Any - (*v1.BlockID)(nil), // 22: cometbft.types.v1.BlockID - (*v1.Block)(nil), // 23: cometbft.types.v1.Block + (*v2.BlockID)(nil), // 22: cometbft.types.v2.BlockID + (*v2.Block)(nil), // 23: cometbft.types.v2.Block (*Block)(nil), // 24: cosmos.base.tendermint.v1beta1.Block - (*v11.DefaultNodeInfo)(nil), // 25: cometbft.p2p.v1.DefaultNodeInfo + (*v1.DefaultNodeInfo)(nil), // 25: cometbft.p2p.v1.DefaultNodeInfo } var file_cosmos_base_tendermint_v1beta1_query_proto_depIdxs = []int32{ 19, // 0: cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest.pagination:type_name -> cosmos.base.query.v1beta1.PageRequest @@ -11694,11 +11694,11 @@ var file_cosmos_base_tendermint_v1beta1_query_proto_depIdxs = []int32{ 4, // 4: cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse.validators:type_name -> cosmos.base.tendermint.v1beta1.Validator 20, // 5: cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse.pagination:type_name -> cosmos.base.query.v1beta1.PageResponse 21, // 6: cosmos.base.tendermint.v1beta1.Validator.pub_key:type_name -> google.protobuf.Any - 22, // 7: cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block_id:type_name -> cometbft.types.v1.BlockID - 23, // 8: cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block:type_name -> cometbft.types.v1.Block + 22, // 7: cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block_id:type_name -> cometbft.types.v2.BlockID + 23, // 8: cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.block:type_name -> cometbft.types.v2.Block 24, // 9: cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse.sdk_block:type_name -> cosmos.base.tendermint.v1beta1.Block - 22, // 10: cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block_id:type_name -> cometbft.types.v1.BlockID - 23, // 11: cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block:type_name -> cometbft.types.v1.Block + 22, // 10: cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block_id:type_name -> cometbft.types.v2.BlockID + 23, // 11: cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.block:type_name -> cometbft.types.v2.Block 24, // 12: cosmos.base.tendermint.v1beta1.GetLatestBlockResponse.sdk_block:type_name -> cosmos.base.tendermint.v1beta1.Block 25, // 13: cosmos.base.tendermint.v1beta1.GetNodeInfoResponse.default_node_info:type_name -> cometbft.p2p.v1.DefaultNodeInfo 13, // 14: cosmos.base.tendermint.v1beta1.GetNodeInfoResponse.application_version:type_name -> cosmos.base.tendermint.v1beta1.VersionInfo diff --git a/api/cosmos/base/tendermint/v1beta1/types.pulsar.go b/api/cosmos/base/tendermint/v1beta1/types.pulsar.go index e2d215617b..1df3adaefc 100644 --- a/api/cosmos/base/tendermint/v1beta1/types.pulsar.go +++ b/api/cosmos/base/tendermint/v1beta1/types.pulsar.go @@ -3,8 +3,8 @@ package tendermintv1beta1 import ( _ "cosmossdk.io/api/amino" - v1 "cosmossdk.io/api/cometbft/types/v1" - v11 "cosmossdk.io/api/cometbft/version/v1" + v2 "cosmossdk.io/api/cometbft/types/v2" + v1 "cosmossdk.io/api/cometbft/version/v1" fmt "fmt" runtime "github.com/cosmos/cosmos-proto/runtime" _ "github.com/cosmos/gogoproto/gogoproto" @@ -221,11 +221,11 @@ func (x *fastReflection_Block) Set(fd protoreflect.FieldDescriptor, value protor case "cosmos.base.tendermint.v1beta1.Block.header": x.Header = value.Message().Interface().(*Header) case "cosmos.base.tendermint.v1beta1.Block.data": - x.Data = value.Message().Interface().(*v1.Data) + x.Data = value.Message().Interface().(*v2.Data) case "cosmos.base.tendermint.v1beta1.Block.evidence": - x.Evidence = value.Message().Interface().(*v1.EvidenceList) + x.Evidence = value.Message().Interface().(*v2.EvidenceList) case "cosmos.base.tendermint.v1beta1.Block.last_commit": - x.LastCommit = value.Message().Interface().(*v1.Commit) + x.LastCommit = value.Message().Interface().(*v2.Commit) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.base.tendermint.v1beta1.Block")) @@ -253,17 +253,17 @@ func (x *fastReflection_Block) Mutable(fd protoreflect.FieldDescriptor) protoref return protoreflect.ValueOfMessage(x.Header.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Block.data": if x.Data == nil { - x.Data = new(v1.Data) + x.Data = new(v2.Data) } return protoreflect.ValueOfMessage(x.Data.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Block.evidence": if x.Evidence == nil { - x.Evidence = new(v1.EvidenceList) + x.Evidence = new(v2.EvidenceList) } return protoreflect.ValueOfMessage(x.Evidence.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Block.last_commit": if x.LastCommit == nil { - x.LastCommit = new(v1.Commit) + x.LastCommit = new(v2.Commit) } return protoreflect.ValueOfMessage(x.LastCommit.ProtoReflect()) default: @@ -283,13 +283,13 @@ func (x *fastReflection_Block) NewField(fd protoreflect.FieldDescriptor) protore m := new(Header) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Block.data": - m := new(v1.Data) + m := new(v2.Data) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Block.evidence": - m := new(v1.EvidenceList) + m := new(v2.EvidenceList) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Block.last_commit": - m := new(v1.Commit) + m := new(v2.Commit) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { @@ -576,7 +576,7 @@ func (x *fastReflection_Block) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Data == nil { - x.Data = &v1.Data{} + x.Data = &v2.Data{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Data); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -612,7 +612,7 @@ func (x *fastReflection_Block) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Evidence == nil { - x.Evidence = &v1.EvidenceList{} + x.Evidence = &v2.EvidenceList{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Evidence); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -648,7 +648,7 @@ func (x *fastReflection_Block) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.LastCommit == nil { - x.LastCommit = &v1.Commit{} + x.LastCommit = &v2.Commit{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.LastCommit); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -1041,7 +1041,7 @@ func (x *fastReflection_Header) Get(descriptor protoreflect.FieldDescriptor) pro func (x *fastReflection_Header) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.Header.version": - x.Version = value.Message().Interface().(*v11.Consensus) + x.Version = value.Message().Interface().(*v1.Consensus) case "cosmos.base.tendermint.v1beta1.Header.chain_id": x.ChainId = value.Interface().(string) case "cosmos.base.tendermint.v1beta1.Header.height": @@ -1049,7 +1049,7 @@ func (x *fastReflection_Header) Set(fd protoreflect.FieldDescriptor, value proto case "cosmos.base.tendermint.v1beta1.Header.time": x.Time = value.Message().Interface().(*timestamppb.Timestamp) case "cosmos.base.tendermint.v1beta1.Header.last_block_id": - x.LastBlockId = value.Message().Interface().(*v1.BlockID) + x.LastBlockId = value.Message().Interface().(*v2.BlockID) case "cosmos.base.tendermint.v1beta1.Header.last_commit_hash": x.LastCommitHash = value.Bytes() case "cosmos.base.tendermint.v1beta1.Header.data_hash": @@ -1090,7 +1090,7 @@ func (x *fastReflection_Header) Mutable(fd protoreflect.FieldDescriptor) protore switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.Header.version": if x.Version == nil { - x.Version = new(v11.Consensus) + x.Version = new(v1.Consensus) } return protoreflect.ValueOfMessage(x.Version.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Header.time": @@ -1100,7 +1100,7 @@ func (x *fastReflection_Header) Mutable(fd protoreflect.FieldDescriptor) protore return protoreflect.ValueOfMessage(x.Time.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Header.last_block_id": if x.LastBlockId == nil { - x.LastBlockId = new(v1.BlockID) + x.LastBlockId = new(v2.BlockID) } return protoreflect.ValueOfMessage(x.LastBlockId.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Header.chain_id": @@ -1139,7 +1139,7 @@ func (x *fastReflection_Header) Mutable(fd protoreflect.FieldDescriptor) protore func (x *fastReflection_Header) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.base.tendermint.v1beta1.Header.version": - m := new(v11.Consensus) + m := new(v1.Consensus) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Header.chain_id": return protoreflect.ValueOfString("") @@ -1149,7 +1149,7 @@ func (x *fastReflection_Header) NewField(fd protoreflect.FieldDescriptor) protor m := new(timestamppb.Timestamp) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Header.last_block_id": - m := new(v1.BlockID) + m := new(v2.BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.base.tendermint.v1beta1.Header.last_commit_hash": return protoreflect.ValueOfBytes(nil) @@ -1518,7 +1518,7 @@ func (x *fastReflection_Header) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Version == nil { - x.Version = &v11.Consensus{} + x.Version = &v1.Consensus{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Version); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -1641,7 +1641,7 @@ func (x *fastReflection_Header) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.LastBlockId == nil { - x.LastBlockId = &v1.BlockID{} + x.LastBlockId = &v2.BlockID{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.LastBlockId); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -2007,9 +2007,9 @@ type Block struct { unknownFields protoimpl.UnknownFields Header *Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` - Data *v1.Data `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - Evidence *v1.EvidenceList `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence,omitempty"` - LastCommit *v1.Commit `protobuf:"bytes,4,opt,name=last_commit,json=lastCommit,proto3" json:"last_commit,omitempty"` + Data *v2.Data `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Evidence *v2.EvidenceList `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence,omitempty"` + LastCommit *v2.Commit `protobuf:"bytes,4,opt,name=last_commit,json=lastCommit,proto3" json:"last_commit,omitempty"` } func (x *Block) Reset() { @@ -2039,21 +2039,21 @@ func (x *Block) GetHeader() *Header { return nil } -func (x *Block) GetData() *v1.Data { +func (x *Block) GetData() *v2.Data { if x != nil { return x.Data } return nil } -func (x *Block) GetEvidence() *v1.EvidenceList { +func (x *Block) GetEvidence() *v2.EvidenceList { if x != nil { return x.Evidence } return nil } -func (x *Block) GetLastCommit() *v1.Commit { +func (x *Block) GetLastCommit() *v2.Commit { if x != nil { return x.LastCommit } @@ -2067,12 +2067,12 @@ type Header struct { unknownFields protoimpl.UnknownFields // basic block info - Version *v11.Consensus `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` + Version *v1.Consensus `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` Time *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=time,proto3" json:"time,omitempty"` // prev block info - LastBlockId *v1.BlockID `protobuf:"bytes,5,opt,name=last_block_id,json=lastBlockId,proto3" json:"last_block_id,omitempty"` + LastBlockId *v2.BlockID `protobuf:"bytes,5,opt,name=last_block_id,json=lastBlockId,proto3" json:"last_block_id,omitempty"` // hashes of block data LastCommitHash []byte `protobuf:"bytes,6,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` // commit from validators from the last block DataHash []byte `protobuf:"bytes,7,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` // transactions @@ -2110,7 +2110,7 @@ func (*Header) Descriptor() ([]byte, []int) { return file_cosmos_base_tendermint_v1beta1_types_proto_rawDescGZIP(), []int{1} } -func (x *Header) GetVersion() *v11.Consensus { +func (x *Header) GetVersion() *v1.Consensus { if x != nil { return x.Version } @@ -2138,7 +2138,7 @@ func (x *Header) GetTime() *timestamppb.Timestamp { return nil } -func (x *Header) GetLastBlockId() *v1.BlockID { +func (x *Header) GetLastBlockId() *v2.BlockID { if x != nil { return x.LastBlockId } @@ -2218,9 +2218,9 @@ var file_cosmos_base_tendermint_v1beta1_types_proto_rawDesc = []byte{ 0x6d, 0x69, 0x6e, 0x74, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x2e, 0x70, 0x72, + 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, @@ -2233,16 +2233,16 @@ var file_cosmos_base_tendermint_v1beta1_types_proto_rawDesc = []byte{ 0x74, 0x61, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x36, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x46, 0x0a, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x76, 0x69, 0x64, + 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x3a, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, - 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x0a, 0x6c, + 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x22, 0xf7, 0x04, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x43, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, @@ -2259,7 +2259,7 @@ var file_cosmos_base_tendermint_v1beta1_types_proto_rawDesc = []byte{ 0x2a, 0x01, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x49, 0x0a, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x09, 0xc8, 0xde, 0x1f, + 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6c, @@ -2319,21 +2319,21 @@ var file_cosmos_base_tendermint_v1beta1_types_proto_msgTypes = make([]protoimpl. var file_cosmos_base_tendermint_v1beta1_types_proto_goTypes = []interface{}{ (*Block)(nil), // 0: cosmos.base.tendermint.v1beta1.Block (*Header)(nil), // 1: cosmos.base.tendermint.v1beta1.Header - (*v1.Data)(nil), // 2: cometbft.types.v1.Data - (*v1.EvidenceList)(nil), // 3: cometbft.types.v1.EvidenceList - (*v1.Commit)(nil), // 4: cometbft.types.v1.Commit - (*v11.Consensus)(nil), // 5: cometbft.version.v1.Consensus + (*v2.Data)(nil), // 2: cometbft.types.v2.Data + (*v2.EvidenceList)(nil), // 3: cometbft.types.v2.EvidenceList + (*v2.Commit)(nil), // 4: cometbft.types.v2.Commit + (*v1.Consensus)(nil), // 5: cometbft.version.v1.Consensus (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp - (*v1.BlockID)(nil), // 7: cometbft.types.v1.BlockID + (*v2.BlockID)(nil), // 7: cometbft.types.v2.BlockID } var file_cosmos_base_tendermint_v1beta1_types_proto_depIdxs = []int32{ 1, // 0: cosmos.base.tendermint.v1beta1.Block.header:type_name -> cosmos.base.tendermint.v1beta1.Header - 2, // 1: cosmos.base.tendermint.v1beta1.Block.data:type_name -> cometbft.types.v1.Data - 3, // 2: cosmos.base.tendermint.v1beta1.Block.evidence:type_name -> cometbft.types.v1.EvidenceList - 4, // 3: cosmos.base.tendermint.v1beta1.Block.last_commit:type_name -> cometbft.types.v1.Commit + 2, // 1: cosmos.base.tendermint.v1beta1.Block.data:type_name -> cometbft.types.v2.Data + 3, // 2: cosmos.base.tendermint.v1beta1.Block.evidence:type_name -> cometbft.types.v2.EvidenceList + 4, // 3: cosmos.base.tendermint.v1beta1.Block.last_commit:type_name -> cometbft.types.v2.Commit 5, // 4: cosmos.base.tendermint.v1beta1.Header.version:type_name -> cometbft.version.v1.Consensus 6, // 5: cosmos.base.tendermint.v1beta1.Header.time:type_name -> google.protobuf.Timestamp - 7, // 6: cosmos.base.tendermint.v1beta1.Header.last_block_id:type_name -> cometbft.types.v1.BlockID + 7, // 6: cosmos.base.tendermint.v1beta1.Header.last_block_id:type_name -> cometbft.types.v2.BlockID 7, // [7:7] is the sub-list for method output_type 7, // [7:7] is the sub-list for method input_type 7, // [7:7] is the sub-list for extension type_name diff --git a/api/cosmos/consensus/v1/query.pulsar.go b/api/cosmos/consensus/v1/query.pulsar.go index 9e45243461..32a376e471 100644 --- a/api/cosmos/consensus/v1/query.pulsar.go +++ b/api/cosmos/consensus/v1/query.pulsar.go @@ -2,7 +2,7 @@ package consensusv1 import ( - v1 "cosmossdk.io/api/cometbft/types/v1" + v2 "cosmossdk.io/api/cometbft/types/v2" fmt "fmt" _ "github.com/cosmos/cosmos-proto" runtime "github.com/cosmos/cosmos-proto/runtime" @@ -528,7 +528,7 @@ func (x *fastReflection_QueryParamsResponse) Get(descriptor protoreflect.FieldDe func (x *fastReflection_QueryParamsResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "cosmos.consensus.v1.QueryParamsResponse.params": - x.Params = value.Message().Interface().(*v1.ConsensusParams) + x.Params = value.Message().Interface().(*v2.ConsensusParams) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.consensus.v1.QueryParamsResponse")) @@ -551,7 +551,7 @@ func (x *fastReflection_QueryParamsResponse) Mutable(fd protoreflect.FieldDescri switch fd.FullName() { case "cosmos.consensus.v1.QueryParamsResponse.params": if x.Params == nil { - x.Params = new(v1.ConsensusParams) + x.Params = new(v2.ConsensusParams) } return protoreflect.ValueOfMessage(x.Params.ProtoReflect()) default: @@ -568,7 +568,7 @@ func (x *fastReflection_QueryParamsResponse) Mutable(fd protoreflect.FieldDescri func (x *fastReflection_QueryParamsResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.consensus.v1.QueryParamsResponse.params": - m := new(v1.ConsensusParams) + m := new(v2.ConsensusParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { @@ -765,7 +765,7 @@ func (x *fastReflection_QueryParamsResponse) ProtoMethods() *protoiface.Methods return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Params == nil { - x.Params = &v1.ConsensusParams{} + x.Params = &v2.ConsensusParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Params); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -855,7 +855,7 @@ type QueryParamsResponse struct { // params are the tendermint consensus params stored in the consensus module. // Please note that `params.version` is not populated in this response, it is // tracked separately in the x/upgrade module. - Params *v1.ConsensusParams `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"` + Params *v2.ConsensusParams `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"` } func (x *QueryParamsResponse) Reset() { @@ -878,7 +878,7 @@ func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return file_cosmos_consensus_v1_query_proto_rawDescGZIP(), []int{1} } -func (x *QueryParamsResponse) GetParams() *v1.ConsensusParams { +func (x *QueryParamsResponse) GetParams() *v2.ConsensusParams { if x != nil { return x.Params } @@ -894,14 +894,14 @@ var file_cosmos_consensus_v1_query_proto_rawDesc = []byte{ 0x73, 0x75, 0x73, 0x2e, 0x76, 0x31, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, + 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x14, 0x0a, 0x12, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x51, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x75, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x32, 0x9d, 0x01, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x93, 0x01, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x27, 0x2e, @@ -945,10 +945,10 @@ var file_cosmos_consensus_v1_query_proto_msgTypes = make([]protoimpl.MessageInfo var file_cosmos_consensus_v1_query_proto_goTypes = []interface{}{ (*QueryParamsRequest)(nil), // 0: cosmos.consensus.v1.QueryParamsRequest (*QueryParamsResponse)(nil), // 1: cosmos.consensus.v1.QueryParamsResponse - (*v1.ConsensusParams)(nil), // 2: cometbft.types.v1.ConsensusParams + (*v2.ConsensusParams)(nil), // 2: cometbft.types.v2.ConsensusParams } var file_cosmos_consensus_v1_query_proto_depIdxs = []int32{ - 2, // 0: cosmos.consensus.v1.QueryParamsResponse.params:type_name -> cometbft.types.v1.ConsensusParams + 2, // 0: cosmos.consensus.v1.QueryParamsResponse.params:type_name -> cometbft.types.v2.ConsensusParams 0, // 1: cosmos.consensus.v1.Query.Params:input_type -> cosmos.consensus.v1.QueryParamsRequest 1, // 2: cosmos.consensus.v1.Query.Params:output_type -> cosmos.consensus.v1.QueryParamsResponse 2, // [2:3] is the sub-list for method output_type diff --git a/api/cosmos/consensus/v1/tx.pulsar.go b/api/cosmos/consensus/v1/tx.pulsar.go index d5afb27a9b..59851a56eb 100644 --- a/api/cosmos/consensus/v1/tx.pulsar.go +++ b/api/cosmos/consensus/v1/tx.pulsar.go @@ -3,7 +3,7 @@ package consensusv1 import ( _ "cosmossdk.io/api/amino" - v1 "cosmossdk.io/api/cometbft/types/v1" + v2 "cosmossdk.io/api/cometbft/types/v2" _ "cosmossdk.io/api/cosmos/msg/v1" fmt "fmt" _ "github.com/cosmos/cosmos-proto" @@ -265,17 +265,17 @@ func (x *fastReflection_MsgUpdateParams) Set(fd protoreflect.FieldDescriptor, va case "cosmos.consensus.v1.MsgUpdateParams.authority": x.Authority = value.Interface().(string) case "cosmos.consensus.v1.MsgUpdateParams.block": - x.Block = value.Message().Interface().(*v1.BlockParams) + x.Block = value.Message().Interface().(*v2.BlockParams) case "cosmos.consensus.v1.MsgUpdateParams.evidence": - x.Evidence = value.Message().Interface().(*v1.EvidenceParams) + x.Evidence = value.Message().Interface().(*v2.EvidenceParams) case "cosmos.consensus.v1.MsgUpdateParams.validator": - x.Validator = value.Message().Interface().(*v1.ValidatorParams) + x.Validator = value.Message().Interface().(*v2.ValidatorParams) case "cosmos.consensus.v1.MsgUpdateParams.abci": - x.Abci = value.Message().Interface().(*v1.ABCIParams) + x.Abci = value.Message().Interface().(*v2.ABCIParams) case "cosmos.consensus.v1.MsgUpdateParams.synchrony": - x.Synchrony = value.Message().Interface().(*v1.SynchronyParams) + x.Synchrony = value.Message().Interface().(*v2.SynchronyParams) case "cosmos.consensus.v1.MsgUpdateParams.feature": - x.Feature = value.Message().Interface().(*v1.FeatureParams) + x.Feature = value.Message().Interface().(*v2.FeatureParams) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.consensus.v1.MsgUpdateParams")) @@ -298,32 +298,32 @@ func (x *fastReflection_MsgUpdateParams) Mutable(fd protoreflect.FieldDescriptor switch fd.FullName() { case "cosmos.consensus.v1.MsgUpdateParams.block": if x.Block == nil { - x.Block = new(v1.BlockParams) + x.Block = new(v2.BlockParams) } return protoreflect.ValueOfMessage(x.Block.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.evidence": if x.Evidence == nil { - x.Evidence = new(v1.EvidenceParams) + x.Evidence = new(v2.EvidenceParams) } return protoreflect.ValueOfMessage(x.Evidence.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.validator": if x.Validator == nil { - x.Validator = new(v1.ValidatorParams) + x.Validator = new(v2.ValidatorParams) } return protoreflect.ValueOfMessage(x.Validator.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.abci": if x.Abci == nil { - x.Abci = new(v1.ABCIParams) + x.Abci = new(v2.ABCIParams) } return protoreflect.ValueOfMessage(x.Abci.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.synchrony": if x.Synchrony == nil { - x.Synchrony = new(v1.SynchronyParams) + x.Synchrony = new(v2.SynchronyParams) } return protoreflect.ValueOfMessage(x.Synchrony.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.feature": if x.Feature == nil { - x.Feature = new(v1.FeatureParams) + x.Feature = new(v2.FeatureParams) } return protoreflect.ValueOfMessage(x.Feature.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.authority": @@ -344,22 +344,22 @@ func (x *fastReflection_MsgUpdateParams) NewField(fd protoreflect.FieldDescripto case "cosmos.consensus.v1.MsgUpdateParams.authority": return protoreflect.ValueOfString("") case "cosmos.consensus.v1.MsgUpdateParams.block": - m := new(v1.BlockParams) + m := new(v2.BlockParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.evidence": - m := new(v1.EvidenceParams) + m := new(v2.EvidenceParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.validator": - m := new(v1.ValidatorParams) + m := new(v2.ValidatorParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.abci": - m := new(v1.ABCIParams) + m := new(v2.ABCIParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.synchrony": - m := new(v1.SynchronyParams) + m := new(v2.SynchronyParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.consensus.v1.MsgUpdateParams.feature": - m := new(v1.FeatureParams) + m := new(v2.FeatureParams) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { @@ -689,7 +689,7 @@ func (x *fastReflection_MsgUpdateParams) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Block == nil { - x.Block = &v1.BlockParams{} + x.Block = &v2.BlockParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Block); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -725,7 +725,7 @@ func (x *fastReflection_MsgUpdateParams) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Evidence == nil { - x.Evidence = &v1.EvidenceParams{} + x.Evidence = &v2.EvidenceParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Evidence); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -761,7 +761,7 @@ func (x *fastReflection_MsgUpdateParams) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Validator == nil { - x.Validator = &v1.ValidatorParams{} + x.Validator = &v2.ValidatorParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Validator); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -797,7 +797,7 @@ func (x *fastReflection_MsgUpdateParams) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Abci == nil { - x.Abci = &v1.ABCIParams{} + x.Abci = &v2.ABCIParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Abci); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -833,7 +833,7 @@ func (x *fastReflection_MsgUpdateParams) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Synchrony == nil { - x.Synchrony = &v1.SynchronyParams{} + x.Synchrony = &v2.SynchronyParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Synchrony); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -869,7 +869,7 @@ func (x *fastReflection_MsgUpdateParams) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Feature == nil { - x.Feature = &v1.FeatureParams{} + x.Feature = &v2.FeatureParams{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Feature); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -1292,13 +1292,13 @@ type MsgUpdateParams struct { // separarately in x/upgrade. // // NOTE: All parameters must be supplied. - Block *v1.BlockParams `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` - Evidence *v1.EvidenceParams `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence,omitempty"` - Validator *v1.ValidatorParams `protobuf:"bytes,4,opt,name=validator,proto3" json:"validator,omitempty"` + Block *v2.BlockParams `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + Evidence *v2.EvidenceParams `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence,omitempty"` + Validator *v2.ValidatorParams `protobuf:"bytes,4,opt,name=validator,proto3" json:"validator,omitempty"` // Deprecated: Do not use. - Abci *v1.ABCIParams `protobuf:"bytes,5,opt,name=abci,proto3" json:"abci,omitempty"` - Synchrony *v1.SynchronyParams `protobuf:"bytes,6,opt,name=synchrony,proto3" json:"synchrony,omitempty"` - Feature *v1.FeatureParams `protobuf:"bytes,7,opt,name=feature,proto3" json:"feature,omitempty"` + Abci *v2.ABCIParams `protobuf:"bytes,5,opt,name=abci,proto3" json:"abci,omitempty"` + Synchrony *v2.SynchronyParams `protobuf:"bytes,6,opt,name=synchrony,proto3" json:"synchrony,omitempty"` + Feature *v2.FeatureParams `protobuf:"bytes,7,opt,name=feature,proto3" json:"feature,omitempty"` } func (x *MsgUpdateParams) Reset() { @@ -1328,21 +1328,21 @@ func (x *MsgUpdateParams) GetAuthority() string { return "" } -func (x *MsgUpdateParams) GetBlock() *v1.BlockParams { +func (x *MsgUpdateParams) GetBlock() *v2.BlockParams { if x != nil { return x.Block } return nil } -func (x *MsgUpdateParams) GetEvidence() *v1.EvidenceParams { +func (x *MsgUpdateParams) GetEvidence() *v2.EvidenceParams { if x != nil { return x.Evidence } return nil } -func (x *MsgUpdateParams) GetValidator() *v1.ValidatorParams { +func (x *MsgUpdateParams) GetValidator() *v2.ValidatorParams { if x != nil { return x.Validator } @@ -1350,21 +1350,21 @@ func (x *MsgUpdateParams) GetValidator() *v1.ValidatorParams { } // Deprecated: Do not use. -func (x *MsgUpdateParams) GetAbci() *v1.ABCIParams { +func (x *MsgUpdateParams) GetAbci() *v2.ABCIParams { if x != nil { return x.Abci } return nil } -func (x *MsgUpdateParams) GetSynchrony() *v1.SynchronyParams { +func (x *MsgUpdateParams) GetSynchrony() *v2.SynchronyParams { if x != nil { return x.Synchrony } return nil } -func (x *MsgUpdateParams) GetFeature() *v1.FeatureParams { +func (x *MsgUpdateParams) GetFeature() *v2.FeatureParams { if x != nil { return x.Feature } @@ -1410,7 +1410,7 @@ var file_cosmos_consensus_v1_tx_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x73, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x6d, 0x65, - 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, + 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xad, 0x04, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, @@ -1418,29 +1418,29 @@ var file_cosmos_consensus_v1_tx_proto_rawDesc = []byte{ 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x50, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x3d, 0x0a, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, + 0x76, 0x32, 0x2e, 0x45, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x08, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x40, 0x0a, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x61, 0x72, 0x61, + 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x48, 0x0a, 0x04, 0x61, 0x62, 0x63, 0x69, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x42, 0x43, 0x49, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x15, 0xda, 0xb4, 0x2d, 0x0f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x20, 0x30, 0x2e, 0x35, 0x30, 0x18, 0x01, 0x52, 0x04, 0x61, 0x62, 0x63, 0x69, 0x12, 0x55, 0x0a, 0x09, 0x73, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, - 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x53, + 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x13, 0xda, 0xb4, 0x2d, 0x0f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x20, 0x30, 0x2e, 0x35, 0x34, 0x52, 0x09, 0x73, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x79, 0x12, 0x4f, 0x0a, 0x07, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, + 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x13, 0xda, 0xb4, 0x2d, 0x0f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x20, 0x30, 0x2e, 0x35, 0x34, 0x52, 0x07, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3a, 0x39, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x8a, @@ -1488,20 +1488,20 @@ var file_cosmos_consensus_v1_tx_proto_msgTypes = make([]protoimpl.MessageInfo, 2 var file_cosmos_consensus_v1_tx_proto_goTypes = []interface{}{ (*MsgUpdateParams)(nil), // 0: cosmos.consensus.v1.MsgUpdateParams (*MsgUpdateParamsResponse)(nil), // 1: cosmos.consensus.v1.MsgUpdateParamsResponse - (*v1.BlockParams)(nil), // 2: cometbft.types.v1.BlockParams - (*v1.EvidenceParams)(nil), // 3: cometbft.types.v1.EvidenceParams - (*v1.ValidatorParams)(nil), // 4: cometbft.types.v1.ValidatorParams - (*v1.ABCIParams)(nil), // 5: cometbft.types.v1.ABCIParams - (*v1.SynchronyParams)(nil), // 6: cometbft.types.v1.SynchronyParams - (*v1.FeatureParams)(nil), // 7: cometbft.types.v1.FeatureParams + (*v2.BlockParams)(nil), // 2: cometbft.types.v2.BlockParams + (*v2.EvidenceParams)(nil), // 3: cometbft.types.v2.EvidenceParams + (*v2.ValidatorParams)(nil), // 4: cometbft.types.v2.ValidatorParams + (*v2.ABCIParams)(nil), // 5: cometbft.types.v2.ABCIParams + (*v2.SynchronyParams)(nil), // 6: cometbft.types.v2.SynchronyParams + (*v2.FeatureParams)(nil), // 7: cometbft.types.v2.FeatureParams } var file_cosmos_consensus_v1_tx_proto_depIdxs = []int32{ - 2, // 0: cosmos.consensus.v1.MsgUpdateParams.block:type_name -> cometbft.types.v1.BlockParams - 3, // 1: cosmos.consensus.v1.MsgUpdateParams.evidence:type_name -> cometbft.types.v1.EvidenceParams - 4, // 2: cosmos.consensus.v1.MsgUpdateParams.validator:type_name -> cometbft.types.v1.ValidatorParams - 5, // 3: cosmos.consensus.v1.MsgUpdateParams.abci:type_name -> cometbft.types.v1.ABCIParams - 6, // 4: cosmos.consensus.v1.MsgUpdateParams.synchrony:type_name -> cometbft.types.v1.SynchronyParams - 7, // 5: cosmos.consensus.v1.MsgUpdateParams.feature:type_name -> cometbft.types.v1.FeatureParams + 2, // 0: cosmos.consensus.v1.MsgUpdateParams.block:type_name -> cometbft.types.v2.BlockParams + 3, // 1: cosmos.consensus.v1.MsgUpdateParams.evidence:type_name -> cometbft.types.v2.EvidenceParams + 4, // 2: cosmos.consensus.v1.MsgUpdateParams.validator:type_name -> cometbft.types.v2.ValidatorParams + 5, // 3: cosmos.consensus.v1.MsgUpdateParams.abci:type_name -> cometbft.types.v2.ABCIParams + 6, // 4: cosmos.consensus.v1.MsgUpdateParams.synchrony:type_name -> cometbft.types.v2.SynchronyParams + 7, // 5: cosmos.consensus.v1.MsgUpdateParams.feature:type_name -> cometbft.types.v2.FeatureParams 0, // 6: cosmos.consensus.v1.Msg.UpdateParams:input_type -> cosmos.consensus.v1.MsgUpdateParams 1, // 7: cosmos.consensus.v1.Msg.UpdateParams:output_type -> cosmos.consensus.v1.MsgUpdateParamsResponse 7, // [7:8] is the sub-list for method output_type diff --git a/api/cosmos/staking/v1beta1/staking.pulsar.go b/api/cosmos/staking/v1beta1/staking.pulsar.go index 424b6408ab..d63b14f149 100644 --- a/api/cosmos/staking/v1beta1/staking.pulsar.go +++ b/api/cosmos/staking/v1beta1/staking.pulsar.go @@ -3,8 +3,8 @@ package stakingv1beta1 import ( _ "cosmossdk.io/api/amino" - v11 "cosmossdk.io/api/cometbft/abci/v1" - v1 "cosmossdk.io/api/cometbft/types/v1" + v21 "cosmossdk.io/api/cometbft/abci/v2" + v2 "cosmossdk.io/api/cometbft/types/v2" v1beta1 "cosmossdk.io/api/cosmos/base/v1beta1" fmt "fmt" _ "github.com/cosmos/cosmos-proto" @@ -247,7 +247,7 @@ func (x *fastReflection_HistoricalInfo) Get(descriptor protoreflect.FieldDescrip func (x *fastReflection_HistoricalInfo) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "cosmos.staking.v1beta1.HistoricalInfo.header": - x.Header = value.Message().Interface().(*v1.Header) + x.Header = value.Message().Interface().(*v2.Header) case "cosmos.staking.v1beta1.HistoricalInfo.valset": lv := value.List() clv := lv.(*_HistoricalInfo_2_list) @@ -274,7 +274,7 @@ func (x *fastReflection_HistoricalInfo) Mutable(fd protoreflect.FieldDescriptor) switch fd.FullName() { case "cosmos.staking.v1beta1.HistoricalInfo.header": if x.Header == nil { - x.Header = new(v1.Header) + x.Header = new(v2.Header) } return protoreflect.ValueOfMessage(x.Header.ProtoReflect()) case "cosmos.staking.v1beta1.HistoricalInfo.valset": @@ -297,7 +297,7 @@ func (x *fastReflection_HistoricalInfo) Mutable(fd protoreflect.FieldDescriptor) func (x *fastReflection_HistoricalInfo) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.staking.v1beta1.HistoricalInfo.header": - m := new(v1.Header) + m := new(v2.Header) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.staking.v1beta1.HistoricalInfo.valset": list := []*Validator{} @@ -519,7 +519,7 @@ func (x *fastReflection_HistoricalInfo) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Header == nil { - x.Header = &v1.Header{} + x.Header = &v2.Header{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Header); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -12188,7 +12188,7 @@ func (x *fastReflection_Pool) ProtoMethods() *protoiface.Methods { var _ protoreflect.List = (*_ValidatorUpdates_1_list)(nil) type _ValidatorUpdates_1_list struct { - list *[]*v11.ValidatorUpdate + list *[]*v21.ValidatorUpdate } func (x *_ValidatorUpdates_1_list) Len() int { @@ -12204,18 +12204,18 @@ func (x *_ValidatorUpdates_1_list) Get(i int) protoreflect.Value { func (x *_ValidatorUpdates_1_list) Set(i int, value protoreflect.Value) { valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v11.ValidatorUpdate) + concreteValue := valueUnwrapped.Interface().(*v21.ValidatorUpdate) (*x.list)[i] = concreteValue } func (x *_ValidatorUpdates_1_list) Append(value protoreflect.Value) { valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v11.ValidatorUpdate) + concreteValue := valueUnwrapped.Interface().(*v21.ValidatorUpdate) *x.list = append(*x.list, concreteValue) } func (x *_ValidatorUpdates_1_list) AppendMutable() protoreflect.Value { - v := new(v11.ValidatorUpdate) + v := new(v21.ValidatorUpdate) *x.list = append(*x.list, v) return protoreflect.ValueOfMessage(v.ProtoReflect()) } @@ -12228,7 +12228,7 @@ func (x *_ValidatorUpdates_1_list) Truncate(n int) { } func (x *_ValidatorUpdates_1_list) NewElement() protoreflect.Value { - v := new(v11.ValidatorUpdate) + v := new(v21.ValidatorUpdate) return protoreflect.ValueOfMessage(v.ProtoReflect()) } @@ -12421,7 +12421,7 @@ func (x *fastReflection_ValidatorUpdates) Mutable(fd protoreflect.FieldDescripto switch fd.FullName() { case "cosmos.staking.v1beta1.ValidatorUpdates.updates": if x.Updates == nil { - x.Updates = []*v11.ValidatorUpdate{} + x.Updates = []*v21.ValidatorUpdate{} } value := &_ValidatorUpdates_1_list{list: &x.Updates} return protoreflect.ValueOfList(value) @@ -12439,7 +12439,7 @@ func (x *fastReflection_ValidatorUpdates) Mutable(fd protoreflect.FieldDescripto func (x *fastReflection_ValidatorUpdates) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.staking.v1beta1.ValidatorUpdates.updates": - list := []*v11.ValidatorUpdate{} + list := []*v21.ValidatorUpdate{} return protoreflect.ValueOfList(&_ValidatorUpdates_1_list{list: &list}) default: if fd.IsExtension() { @@ -12639,7 +12639,7 @@ func (x *fastReflection_ValidatorUpdates) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Updates = append(x.Updates, &v11.ValidatorUpdate{}) + x.Updates = append(x.Updates, &v21.ValidatorUpdate{}) if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Updates[len(x.Updates)-1]); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } @@ -12811,7 +12811,7 @@ type HistoricalInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Header *v1.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` + Header *v2.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` Valset []*Validator `protobuf:"bytes,2,rep,name=valset,proto3" json:"valset,omitempty"` } @@ -12835,7 +12835,7 @@ func (*HistoricalInfo) Descriptor() ([]byte, []int) { return file_cosmos_staking_v1beta1_staking_proto_rawDescGZIP(), []int{0} } -func (x *HistoricalInfo) GetHeader() *v1.Header { +func (x *HistoricalInfo) GetHeader() *v2.Header { if x != nil { return x.Header } @@ -13998,7 +13998,7 @@ type ValidatorUpdates struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Updates []*v11.ValidatorUpdate `protobuf:"bytes,1,rep,name=updates,proto3" json:"updates,omitempty"` + Updates []*v21.ValidatorUpdate `protobuf:"bytes,1,rep,name=updates,proto3" json:"updates,omitempty"` } func (x *ValidatorUpdates) Reset() { @@ -14021,7 +14021,7 @@ func (*ValidatorUpdates) Descriptor() ([]byte, []int) { return file_cosmos_staking_v1beta1_staking_proto_rawDescGZIP(), []int{20} } -func (x *ValidatorUpdates) GetUpdates() []*v11.ValidatorUpdate { +func (x *ValidatorUpdates) GetUpdates() []*v21.ValidatorUpdate { if x != nil { return x.Updates } @@ -14048,13 +14048,13 @@ var file_cosmos_staking_v1beta1_staking_proto_rawDesc = []byte{ 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, - 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x31, 0x2f, + 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x94, 0x01, 0x0a, 0x0e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x69, 0x63, 0x61, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x3c, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, - 0x76, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, + 0x76, 0x32, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, @@ -14388,7 +14388,7 @@ var file_cosmos_staking_v1beta1_staking_proto_rawDesc = []byte{ 0x1f, 0x01, 0x22, 0x5a, 0x0a, 0x10, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x12, 0x46, 0x0a, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, - 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, + 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x2a, 0xb6, 0x01, 0x0a, 0x0a, 0x42, 0x6f, 0x6e, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2c, 0x0a, @@ -14463,15 +14463,15 @@ var file_cosmos_staking_v1beta1_staking_proto_goTypes = []interface{}{ (*RedelegationResponse)(nil), // 20: cosmos.staking.v1beta1.RedelegationResponse (*Pool)(nil), // 21: cosmos.staking.v1beta1.Pool (*ValidatorUpdates)(nil), // 22: cosmos.staking.v1beta1.ValidatorUpdates - (*v1.Header)(nil), // 23: cometbft.types.v1.Header + (*v2.Header)(nil), // 23: cometbft.types.v2.Header (*timestamppb.Timestamp)(nil), // 24: google.protobuf.Timestamp (*anypb.Any)(nil), // 25: google.protobuf.Any (*durationpb.Duration)(nil), // 26: google.protobuf.Duration (*v1beta1.Coin)(nil), // 27: cosmos.base.v1beta1.Coin - (*v11.ValidatorUpdate)(nil), // 28: cometbft.abci.v1.ValidatorUpdate + (*v21.ValidatorUpdate)(nil), // 28: cometbft.abci.v2.ValidatorUpdate } var file_cosmos_staking_v1beta1_staking_proto_depIdxs = []int32{ - 23, // 0: cosmos.staking.v1beta1.HistoricalInfo.header:type_name -> cometbft.types.v1.Header + 23, // 0: cosmos.staking.v1beta1.HistoricalInfo.header:type_name -> cometbft.types.v2.Header 6, // 1: cosmos.staking.v1beta1.HistoricalInfo.valset:type_name -> cosmos.staking.v1beta1.Validator 3, // 2: cosmos.staking.v1beta1.Commission.commission_rates:type_name -> cosmos.staking.v1beta1.CommissionRates 24, // 3: cosmos.staking.v1beta1.Commission.update_time:type_name -> google.protobuf.Timestamp @@ -14492,7 +14492,7 @@ var file_cosmos_staking_v1beta1_staking_proto_depIdxs = []int32{ 15, // 18: cosmos.staking.v1beta1.RedelegationEntryResponse.redelegation_entry:type_name -> cosmos.staking.v1beta1.RedelegationEntry 16, // 19: cosmos.staking.v1beta1.RedelegationResponse.redelegation:type_name -> cosmos.staking.v1beta1.Redelegation 19, // 20: cosmos.staking.v1beta1.RedelegationResponse.entries:type_name -> cosmos.staking.v1beta1.RedelegationEntryResponse - 28, // 21: cosmos.staking.v1beta1.ValidatorUpdates.updates:type_name -> cometbft.abci.v1.ValidatorUpdate + 28, // 21: cosmos.staking.v1beta1.ValidatorUpdates.updates:type_name -> cometbft.abci.v2.ValidatorUpdate 22, // [22:22] is the sub-list for method output_type 22, // [22:22] is the sub-list for method input_type 22, // [22:22] is the sub-list for extension type_name diff --git a/api/cosmos/store/streaming/abci/grpc.pulsar.go b/api/cosmos/store/streaming/abci/grpc.pulsar.go index 39ce4b5046..99a2916908 100644 --- a/api/cosmos/store/streaming/abci/grpc.pulsar.go +++ b/api/cosmos/store/streaming/abci/grpc.pulsar.go @@ -2,7 +2,7 @@ package abci import ( - v1 "cosmossdk.io/api/cometbft/abci/v1" + v2 "cosmossdk.io/api/cometbft/abci/v2" v1beta1 "cosmossdk.io/api/cosmos/store/v1beta1" fmt "fmt" runtime "github.com/cosmos/cosmos-proto/runtime" @@ -186,9 +186,9 @@ func (x *fastReflection_ListenFinalizeBlockRequest) Get(descriptor protoreflect. func (x *fastReflection_ListenFinalizeBlockRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "cosmos.store.streaming.abci.ListenFinalizeBlockRequest.req": - x.Req = value.Message().Interface().(*v1.FinalizeBlockRequest) + x.Req = value.Message().Interface().(*v2.FinalizeBlockRequest) case "cosmos.store.streaming.abci.ListenFinalizeBlockRequest.res": - x.Res = value.Message().Interface().(*v1.FinalizeBlockResponse) + x.Res = value.Message().Interface().(*v2.FinalizeBlockResponse) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.store.streaming.abci.ListenFinalizeBlockRequest")) @@ -211,12 +211,12 @@ func (x *fastReflection_ListenFinalizeBlockRequest) Mutable(fd protoreflect.Fiel switch fd.FullName() { case "cosmos.store.streaming.abci.ListenFinalizeBlockRequest.req": if x.Req == nil { - x.Req = new(v1.FinalizeBlockRequest) + x.Req = new(v2.FinalizeBlockRequest) } return protoreflect.ValueOfMessage(x.Req.ProtoReflect()) case "cosmos.store.streaming.abci.ListenFinalizeBlockRequest.res": if x.Res == nil { - x.Res = new(v1.FinalizeBlockResponse) + x.Res = new(v2.FinalizeBlockResponse) } return protoreflect.ValueOfMessage(x.Res.ProtoReflect()) default: @@ -233,10 +233,10 @@ func (x *fastReflection_ListenFinalizeBlockRequest) Mutable(fd protoreflect.Fiel func (x *fastReflection_ListenFinalizeBlockRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.store.streaming.abci.ListenFinalizeBlockRequest.req": - m := new(v1.FinalizeBlockRequest) + m := new(v2.FinalizeBlockRequest) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.store.streaming.abci.ListenFinalizeBlockRequest.res": - m := new(v1.FinalizeBlockResponse) + m := new(v2.FinalizeBlockResponse) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { @@ -451,7 +451,7 @@ func (x *fastReflection_ListenFinalizeBlockRequest) ProtoMethods() *protoiface.M return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Req == nil { - x.Req = &v1.FinalizeBlockRequest{} + x.Req = &v2.FinalizeBlockRequest{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Req); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -487,7 +487,7 @@ func (x *fastReflection_ListenFinalizeBlockRequest) ProtoMethods() *protoiface.M return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Res == nil { - x.Res = &v1.FinalizeBlockResponse{} + x.Res = &v2.FinalizeBlockResponse{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Res); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -1127,7 +1127,7 @@ func (x *fastReflection_ListenCommitRequest) Set(fd protoreflect.FieldDescriptor case "cosmos.store.streaming.abci.ListenCommitRequest.block_height": x.BlockHeight = value.Int() case "cosmos.store.streaming.abci.ListenCommitRequest.res": - x.Res = value.Message().Interface().(*v1.CommitResponse) + x.Res = value.Message().Interface().(*v2.CommitResponse) case "cosmos.store.streaming.abci.ListenCommitRequest.change_set": lv := value.List() clv := lv.(*_ListenCommitRequest_3_list) @@ -1154,7 +1154,7 @@ func (x *fastReflection_ListenCommitRequest) Mutable(fd protoreflect.FieldDescri switch fd.FullName() { case "cosmos.store.streaming.abci.ListenCommitRequest.res": if x.Res == nil { - x.Res = new(v1.CommitResponse) + x.Res = new(v2.CommitResponse) } return protoreflect.ValueOfMessage(x.Res.ProtoReflect()) case "cosmos.store.streaming.abci.ListenCommitRequest.change_set": @@ -1181,7 +1181,7 @@ func (x *fastReflection_ListenCommitRequest) NewField(fd protoreflect.FieldDescr case "cosmos.store.streaming.abci.ListenCommitRequest.block_height": return protoreflect.ValueOfInt64(int64(0)) case "cosmos.store.streaming.abci.ListenCommitRequest.res": - m := new(v1.CommitResponse) + m := new(v2.CommitResponse) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.store.streaming.abci.ListenCommitRequest.change_set": list := []*v1beta1.StoreKVPair{} @@ -1430,7 +1430,7 @@ func (x *fastReflection_ListenCommitRequest) ProtoMethods() *protoiface.Methods return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Res == nil { - x.Res = &v1.CommitResponse{} + x.Res = &v2.CommitResponse{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Res); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -1880,8 +1880,8 @@ type ListenFinalizeBlockRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Req *v1.FinalizeBlockRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` - Res *v1.FinalizeBlockResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Req *v2.FinalizeBlockRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` + Res *v2.FinalizeBlockResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` } func (x *ListenFinalizeBlockRequest) Reset() { @@ -1904,14 +1904,14 @@ func (*ListenFinalizeBlockRequest) Descriptor() ([]byte, []int) { return file_cosmos_store_streaming_abci_grpc_proto_rawDescGZIP(), []int{0} } -func (x *ListenFinalizeBlockRequest) GetReq() *v1.FinalizeBlockRequest { +func (x *ListenFinalizeBlockRequest) GetReq() *v2.FinalizeBlockRequest { if x != nil { return x.Req } return nil } -func (x *ListenFinalizeBlockRequest) GetRes() *v1.FinalizeBlockResponse { +func (x *ListenFinalizeBlockRequest) GetRes() *v2.FinalizeBlockResponse { if x != nil { return x.Res } @@ -1953,7 +1953,7 @@ type ListenCommitRequest struct { // explicitly pass in block height as ResponseCommit does not contain this info BlockHeight int64 `protobuf:"varint,1,opt,name=block_height,json=blockHeight,proto3" json:"block_height,omitempty"` - Res *v1.CommitResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Res *v2.CommitResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` ChangeSet []*v1beta1.StoreKVPair `protobuf:"bytes,3,rep,name=change_set,json=changeSet,proto3" json:"change_set,omitempty"` } @@ -1984,7 +1984,7 @@ func (x *ListenCommitRequest) GetBlockHeight() int64 { return 0 } -func (x *ListenCommitRequest) GetRes() *v1.CommitResponse { +func (x *ListenCommitRequest) GetRes() *v2.CommitResponse { if x != nil { return x.Res } @@ -2033,18 +2033,18 @@ var file_cosmos_store_streaming_abci_grpc_proto_rawDesc = []byte{ 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x1a, 0x1c, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, - 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, + 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x91, 0x01, 0x0a, 0x1a, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x03, 0x72, 0x65, 0x71, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, - 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, + 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x03, 0x72, 0x65, 0x71, 0x12, 0x39, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, 0x69, 0x2e, - 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, + 0x76, 0x32, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x1d, 0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xae, 0x01, 0x0a, @@ -2053,7 +2053,7 @@ var file_cosmos_store_streaming_abci_grpc_proto_rawDesc = []byte{ 0x69, 0x67, 0x68, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x32, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, - 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, + 0x61, 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x03, 0x72, 0x65, 0x73, 0x12, 0x40, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x76, @@ -2114,15 +2114,15 @@ var file_cosmos_store_streaming_abci_grpc_proto_goTypes = []interface{}{ (*ListenFinalizeBlockResponse)(nil), // 1: cosmos.store.streaming.abci.ListenFinalizeBlockResponse (*ListenCommitRequest)(nil), // 2: cosmos.store.streaming.abci.ListenCommitRequest (*ListenCommitResponse)(nil), // 3: cosmos.store.streaming.abci.ListenCommitResponse - (*v1.FinalizeBlockRequest)(nil), // 4: cometbft.abci.v1.FinalizeBlockRequest - (*v1.FinalizeBlockResponse)(nil), // 5: cometbft.abci.v1.FinalizeBlockResponse - (*v1.CommitResponse)(nil), // 6: cometbft.abci.v1.CommitResponse + (*v2.FinalizeBlockRequest)(nil), // 4: cometbft.abci.v2.FinalizeBlockRequest + (*v2.FinalizeBlockResponse)(nil), // 5: cometbft.abci.v2.FinalizeBlockResponse + (*v2.CommitResponse)(nil), // 6: cometbft.abci.v2.CommitResponse (*v1beta1.StoreKVPair)(nil), // 7: cosmos.store.v1beta1.StoreKVPair } var file_cosmos_store_streaming_abci_grpc_proto_depIdxs = []int32{ - 4, // 0: cosmos.store.streaming.abci.ListenFinalizeBlockRequest.req:type_name -> cometbft.abci.v1.FinalizeBlockRequest - 5, // 1: cosmos.store.streaming.abci.ListenFinalizeBlockRequest.res:type_name -> cometbft.abci.v1.FinalizeBlockResponse - 6, // 2: cosmos.store.streaming.abci.ListenCommitRequest.res:type_name -> cometbft.abci.v1.CommitResponse + 4, // 0: cosmos.store.streaming.abci.ListenFinalizeBlockRequest.req:type_name -> cometbft.abci.v2.FinalizeBlockRequest + 5, // 1: cosmos.store.streaming.abci.ListenFinalizeBlockRequest.res:type_name -> cometbft.abci.v2.FinalizeBlockResponse + 6, // 2: cosmos.store.streaming.abci.ListenCommitRequest.res:type_name -> cometbft.abci.v2.CommitResponse 7, // 3: cosmos.store.streaming.abci.ListenCommitRequest.change_set:type_name -> cosmos.store.v1beta1.StoreKVPair 0, // 4: cosmos.store.streaming.abci.ABCIListenerService.ListenFinalizeBlock:input_type -> cosmos.store.streaming.abci.ListenFinalizeBlockRequest 2, // 5: cosmos.store.streaming.abci.ABCIListenerService.ListenCommit:input_type -> cosmos.store.streaming.abci.ListenCommitRequest diff --git a/api/cosmos/store/v1beta1/listening.pulsar.go b/api/cosmos/store/v1beta1/listening.pulsar.go index b9846236e0..ae0a55c7a0 100644 --- a/api/cosmos/store/v1beta1/listening.pulsar.go +++ b/api/cosmos/store/v1beta1/listening.pulsar.go @@ -2,7 +2,7 @@ package storev1beta1 import ( - v1 "cosmossdk.io/api/cometbft/abci/v1" + v2 "cosmossdk.io/api/cometbft/abci/v2" fmt "fmt" _ "github.com/cosmos/cosmos-proto" runtime "github.com/cosmos/cosmos-proto/runtime" @@ -807,11 +807,11 @@ func (x *fastReflection_BlockMetadata) Get(descriptor protoreflect.FieldDescript func (x *fastReflection_BlockMetadata) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { case "cosmos.store.v1beta1.BlockMetadata.response_commit": - x.ResponseCommit = value.Message().Interface().(*v1.CommitResponse) + x.ResponseCommit = value.Message().Interface().(*v2.CommitResponse) case "cosmos.store.v1beta1.BlockMetadata.request_finalize_block": - x.RequestFinalizeBlock = value.Message().Interface().(*v1.FinalizeBlockRequest) + x.RequestFinalizeBlock = value.Message().Interface().(*v2.FinalizeBlockRequest) case "cosmos.store.v1beta1.BlockMetadata.response_finalize_block": - x.ResponseFinalizeBlock = value.Message().Interface().(*v1.FinalizeBlockResponse) + x.ResponseFinalizeBlock = value.Message().Interface().(*v2.FinalizeBlockResponse) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.store.v1beta1.BlockMetadata")) @@ -834,17 +834,17 @@ func (x *fastReflection_BlockMetadata) Mutable(fd protoreflect.FieldDescriptor) switch fd.FullName() { case "cosmos.store.v1beta1.BlockMetadata.response_commit": if x.ResponseCommit == nil { - x.ResponseCommit = new(v1.CommitResponse) + x.ResponseCommit = new(v2.CommitResponse) } return protoreflect.ValueOfMessage(x.ResponseCommit.ProtoReflect()) case "cosmos.store.v1beta1.BlockMetadata.request_finalize_block": if x.RequestFinalizeBlock == nil { - x.RequestFinalizeBlock = new(v1.FinalizeBlockRequest) + x.RequestFinalizeBlock = new(v2.FinalizeBlockRequest) } return protoreflect.ValueOfMessage(x.RequestFinalizeBlock.ProtoReflect()) case "cosmos.store.v1beta1.BlockMetadata.response_finalize_block": if x.ResponseFinalizeBlock == nil { - x.ResponseFinalizeBlock = new(v1.FinalizeBlockResponse) + x.ResponseFinalizeBlock = new(v2.FinalizeBlockResponse) } return protoreflect.ValueOfMessage(x.ResponseFinalizeBlock.ProtoReflect()) default: @@ -861,13 +861,13 @@ func (x *fastReflection_BlockMetadata) Mutable(fd protoreflect.FieldDescriptor) func (x *fastReflection_BlockMetadata) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { case "cosmos.store.v1beta1.BlockMetadata.response_commit": - m := new(v1.CommitResponse) + m := new(v2.CommitResponse) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.store.v1beta1.BlockMetadata.request_finalize_block": - m := new(v1.FinalizeBlockRequest) + m := new(v2.FinalizeBlockRequest) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.store.v1beta1.BlockMetadata.response_finalize_block": - m := new(v1.FinalizeBlockResponse) + m := new(v2.FinalizeBlockResponse) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { @@ -1100,7 +1100,7 @@ func (x *fastReflection_BlockMetadata) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.ResponseCommit == nil { - x.ResponseCommit = &v1.CommitResponse{} + x.ResponseCommit = &v2.CommitResponse{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.ResponseCommit); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -1136,7 +1136,7 @@ func (x *fastReflection_BlockMetadata) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.RequestFinalizeBlock == nil { - x.RequestFinalizeBlock = &v1.FinalizeBlockRequest{} + x.RequestFinalizeBlock = &v2.FinalizeBlockRequest{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.RequestFinalizeBlock); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -1172,7 +1172,7 @@ func (x *fastReflection_BlockMetadata) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.ResponseFinalizeBlock == nil { - x.ResponseFinalizeBlock = &v1.FinalizeBlockResponse{} + x.ResponseFinalizeBlock = &v2.FinalizeBlockResponse{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.ResponseFinalizeBlock); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -1295,9 +1295,9 @@ type BlockMetadata struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ResponseCommit *v1.CommitResponse `protobuf:"bytes,6,opt,name=response_commit,json=responseCommit,proto3" json:"response_commit,omitempty"` - RequestFinalizeBlock *v1.FinalizeBlockRequest `protobuf:"bytes,7,opt,name=request_finalize_block,json=requestFinalizeBlock,proto3" json:"request_finalize_block,omitempty"` - ResponseFinalizeBlock *v1.FinalizeBlockResponse `protobuf:"bytes,8,opt,name=response_finalize_block,json=responseFinalizeBlock,proto3" json:"response_finalize_block,omitempty"` // TODO: should we renumber this? + ResponseCommit *v2.CommitResponse `protobuf:"bytes,6,opt,name=response_commit,json=responseCommit,proto3" json:"response_commit,omitempty"` + RequestFinalizeBlock *v2.FinalizeBlockRequest `protobuf:"bytes,7,opt,name=request_finalize_block,json=requestFinalizeBlock,proto3" json:"request_finalize_block,omitempty"` + ResponseFinalizeBlock *v2.FinalizeBlockResponse `protobuf:"bytes,8,opt,name=response_finalize_block,json=responseFinalizeBlock,proto3" json:"response_finalize_block,omitempty"` // TODO: should we renumber this? } func (x *BlockMetadata) Reset() { @@ -1320,21 +1320,21 @@ func (*BlockMetadata) Descriptor() ([]byte, []int) { return file_cosmos_store_v1beta1_listening_proto_rawDescGZIP(), []int{1} } -func (x *BlockMetadata) GetResponseCommit() *v1.CommitResponse { +func (x *BlockMetadata) GetResponseCommit() *v2.CommitResponse { if x != nil { return x.ResponseCommit } return nil } -func (x *BlockMetadata) GetRequestFinalizeBlock() *v1.FinalizeBlockRequest { +func (x *BlockMetadata) GetRequestFinalizeBlock() *v2.FinalizeBlockRequest { if x != nil { return x.RequestFinalizeBlock } return nil } -func (x *BlockMetadata) GetResponseFinalizeBlock() *v1.FinalizeBlockResponse { +func (x *BlockMetadata) GetResponseFinalizeBlock() *v2.FinalizeBlockResponse { if x != nil { return x.ResponseFinalizeBlock } @@ -1348,7 +1348,7 @@ var file_cosmos_store_v1beta1_listening_proto_rawDesc = []byte{ 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1c, 0x63, 0x6f, - 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x74, + 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7f, 0x0a, 0x0b, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x4b, 0x56, @@ -1363,18 +1363,18 @@ var file_cosmos_store_v1beta1_listening_proto_rawDesc = []byte{ 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x49, 0x0a, 0x0f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, 0x63, - 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0e, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x12, 0x5c, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, - 0x62, 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, + 0x62, 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x14, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x5f, 0x0a, 0x17, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x61, 0x62, - 0x63, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, + 0x63, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x15, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, @@ -1411,14 +1411,14 @@ var file_cosmos_store_v1beta1_listening_proto_msgTypes = make([]protoimpl.Messag var file_cosmos_store_v1beta1_listening_proto_goTypes = []interface{}{ (*StoreKVPair)(nil), // 0: cosmos.store.v1beta1.StoreKVPair (*BlockMetadata)(nil), // 1: cosmos.store.v1beta1.BlockMetadata - (*v1.CommitResponse)(nil), // 2: cometbft.abci.v1.CommitResponse - (*v1.FinalizeBlockRequest)(nil), // 3: cometbft.abci.v1.FinalizeBlockRequest - (*v1.FinalizeBlockResponse)(nil), // 4: cometbft.abci.v1.FinalizeBlockResponse + (*v2.CommitResponse)(nil), // 2: cometbft.abci.v2.CommitResponse + (*v2.FinalizeBlockRequest)(nil), // 3: cometbft.abci.v2.FinalizeBlockRequest + (*v2.FinalizeBlockResponse)(nil), // 4: cometbft.abci.v2.FinalizeBlockResponse } var file_cosmos_store_v1beta1_listening_proto_depIdxs = []int32{ - 2, // 0: cosmos.store.v1beta1.BlockMetadata.response_commit:type_name -> cometbft.abci.v1.CommitResponse - 3, // 1: cosmos.store.v1beta1.BlockMetadata.request_finalize_block:type_name -> cometbft.abci.v1.FinalizeBlockRequest - 4, // 2: cosmos.store.v1beta1.BlockMetadata.response_finalize_block:type_name -> cometbft.abci.v1.FinalizeBlockResponse + 2, // 0: cosmos.store.v1beta1.BlockMetadata.response_commit:type_name -> cometbft.abci.v2.CommitResponse + 3, // 1: cosmos.store.v1beta1.BlockMetadata.request_finalize_block:type_name -> cometbft.abci.v2.FinalizeBlockRequest + 4, // 2: cosmos.store.v1beta1.BlockMetadata.response_finalize_block:type_name -> cometbft.abci.v2.FinalizeBlockResponse 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name diff --git a/api/cosmos/tx/v1beta1/service.pulsar.go b/api/cosmos/tx/v1beta1/service.pulsar.go index 53b9cd25ef..cf485deb17 100644 --- a/api/cosmos/tx/v1beta1/service.pulsar.go +++ b/api/cosmos/tx/v1beta1/service.pulsar.go @@ -2,7 +2,7 @@ package txv1beta1 import ( - v1 "cosmossdk.io/api/cometbft/types/v1" + v2 "cosmossdk.io/api/cometbft/types/v2" v1beta11 "cosmossdk.io/api/cosmos/base/abci/v1beta1" v1beta1 "cosmossdk.io/api/cosmos/base/query/v1beta1" fmt "fmt" @@ -5140,9 +5140,9 @@ func (x *fastReflection_GetBlockWithTxsResponse) Set(fd protoreflect.FieldDescri clv := lv.(*_GetBlockWithTxsResponse_1_list) x.Txs = *clv.list case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.block_id": - x.BlockId = value.Message().Interface().(*v1.BlockID) + x.BlockId = value.Message().Interface().(*v2.BlockID) case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.block": - x.Block = value.Message().Interface().(*v1.Block) + x.Block = value.Message().Interface().(*v2.Block) case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.pagination": x.Pagination = value.Message().Interface().(*v1beta1.PageResponse) default: @@ -5173,12 +5173,12 @@ func (x *fastReflection_GetBlockWithTxsResponse) Mutable(fd protoreflect.FieldDe return protoreflect.ValueOfList(value) case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.block_id": if x.BlockId == nil { - x.BlockId = new(v1.BlockID) + x.BlockId = new(v2.BlockID) } return protoreflect.ValueOfMessage(x.BlockId.ProtoReflect()) case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.block": if x.Block == nil { - x.Block = new(v1.Block) + x.Block = new(v2.Block) } return protoreflect.ValueOfMessage(x.Block.ProtoReflect()) case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.pagination": @@ -5203,10 +5203,10 @@ func (x *fastReflection_GetBlockWithTxsResponse) NewField(fd protoreflect.FieldD list := []*Tx{} return protoreflect.ValueOfList(&_GetBlockWithTxsResponse_1_list{list: &list}) case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.block_id": - m := new(v1.BlockID) + m := new(v2.BlockID) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.block": - m := new(v1.Block) + m := new(v2.Block) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cosmos.tx.v1beta1.GetBlockWithTxsResponse.pagination": m := new(v1beta1.PageResponse) @@ -5498,7 +5498,7 @@ func (x *fastReflection_GetBlockWithTxsResponse) ProtoMethods() *protoiface.Meth return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.BlockId == nil { - x.BlockId = &v1.BlockID{} + x.BlockId = &v2.BlockID{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.BlockId); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -5534,7 +5534,7 @@ func (x *fastReflection_GetBlockWithTxsResponse) ProtoMethods() *protoiface.Meth return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } if x.Block == nil { - x.Block = &v1.Block{} + x.Block = &v2.Block{} } if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Block); err != nil { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err @@ -9624,8 +9624,8 @@ type GetBlockWithTxsResponse struct { // txs are the transactions in the block. Txs []*Tx `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` - BlockId *v1.BlockID `protobuf:"bytes,2,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` - Block *v1.Block `protobuf:"bytes,3,opt,name=block,proto3" json:"block,omitempty"` + BlockId *v2.BlockID `protobuf:"bytes,2,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + Block *v2.Block `protobuf:"bytes,3,opt,name=block,proto3" json:"block,omitempty"` // pagination defines a pagination for the response. Pagination *v1beta1.PageResponse `protobuf:"bytes,4,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -9657,14 +9657,14 @@ func (x *GetBlockWithTxsResponse) GetTxs() []*Tx { return nil } -func (x *GetBlockWithTxsResponse) GetBlockId() *v1.BlockID { +func (x *GetBlockWithTxsResponse) GetBlockId() *v2.BlockID { if x != nil { return x.BlockId } return nil } -func (x *GetBlockWithTxsResponse) GetBlock() *v1.Block { +func (x *GetBlockWithTxsResponse) GetBlock() *v2.Block { if x != nil { return x.Block } @@ -9994,9 +9994,9 @@ var file_cosmos_tx_v1beta1_service_proto_rawDesc = []byte{ 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, - 0x76, 0x31, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, + 0x76, 0x32, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, - 0x31, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, + 0x32, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x88, 0x02, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x54, 0x78, 0x73, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, @@ -10083,11 +10083,11 @@ var file_cosmos_tx_v1beta1_service_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x74, 0x78, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x54, 0x78, 0x52, 0x03, 0x74, 0x78, 0x73, 0x12, 0x35, 0x0a, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, - 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, + 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x44, 0x52, 0x07, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6d, 0x65, 0x74, 0x62, 0x66, 0x74, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, + 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x47, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, @@ -10282,8 +10282,8 @@ var file_cosmos_tx_v1beta1_service_proto_goTypes = []interface{}{ (*v1beta1.PageResponse)(nil), // 23: cosmos.base.query.v1beta1.PageResponse (*v1beta11.GasInfo)(nil), // 24: cosmos.base.abci.v1beta1.GasInfo (*v1beta11.Result)(nil), // 25: cosmos.base.abci.v1beta1.Result - (*v1.BlockID)(nil), // 26: cometbft.types.v1.BlockID - (*v1.Block)(nil), // 27: cometbft.types.v1.Block + (*v2.BlockID)(nil), // 26: cometbft.types.v2.BlockID + (*v2.Block)(nil), // 27: cometbft.types.v2.Block } var file_cosmos_tx_v1beta1_service_proto_depIdxs = []int32{ 20, // 0: cosmos.tx.v1beta1.GetTxsEventRequest.pagination:type_name -> cosmos.base.query.v1beta1.PageRequest @@ -10300,8 +10300,8 @@ var file_cosmos_tx_v1beta1_service_proto_depIdxs = []int32{ 22, // 11: cosmos.tx.v1beta1.GetTxResponse.tx_response:type_name -> cosmos.base.abci.v1beta1.TxResponse 20, // 12: cosmos.tx.v1beta1.GetBlockWithTxsRequest.pagination:type_name -> cosmos.base.query.v1beta1.PageRequest 21, // 13: cosmos.tx.v1beta1.GetBlockWithTxsResponse.txs:type_name -> cosmos.tx.v1beta1.Tx - 26, // 14: cosmos.tx.v1beta1.GetBlockWithTxsResponse.block_id:type_name -> cometbft.types.v1.BlockID - 27, // 15: cosmos.tx.v1beta1.GetBlockWithTxsResponse.block:type_name -> cometbft.types.v1.Block + 26, // 14: cosmos.tx.v1beta1.GetBlockWithTxsResponse.block_id:type_name -> cometbft.types.v2.BlockID + 27, // 15: cosmos.tx.v1beta1.GetBlockWithTxsResponse.block:type_name -> cometbft.types.v2.Block 23, // 16: cosmos.tx.v1beta1.GetBlockWithTxsResponse.pagination:type_name -> cosmos.base.query.v1beta1.PageResponse 21, // 17: cosmos.tx.v1beta1.TxDecodeResponse.tx:type_name -> cosmos.tx.v1beta1.Tx 21, // 18: cosmos.tx.v1beta1.TxEncodeRequest.tx:type_name -> cosmos.tx.v1beta1.Tx diff --git a/baseapp/abci.go b/baseapp/abci.go index 1c5d4accda..ca4e4408d7 100644 --- a/baseapp/abci.go +++ b/baseapp/abci.go @@ -8,8 +8,8 @@ import ( "time" "github.com/cockroachdb/errors" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" "google.golang.org/grpc/codes" grpcstatus "google.golang.org/grpc/status" @@ -286,7 +286,7 @@ func (app *BaseApp) OfferSnapshot(req *abci.OfferSnapshotRequest) (*abci.OfferSn return &abci.OfferSnapshotResponse{Result: abci.OFFER_SNAPSHOT_RESULT_REJECT}, nil default: - // CometBFT errors are defined here: https://github.com/cometbft/cometbft/blob/main/statesync/syncer.go + // CometBFT errors are defined here: https://github.com/cometbft/cometbft/v2/blob/main/statesync/syncer.go // It may happen that in case of a CometBFT error, such as a timeout (which occurs after two minutes), // the process is aborted. This is done intentionally because deleting the database programmatically // can lead to more complicated situations. @@ -389,7 +389,7 @@ func (app *BaseApp) CheckTx(req *abci.CheckTxRequest) (*abci.CheckTxResponse, er // provided by the client's request. // // Ref: https://github.com/cosmos/cosmos-sdk/blob/main/docs/architecture/adr-060-abci-1.0.md -// Ref: https://github.com/cometbft/cometbft/blob/main/spec/abci/abci%2B%2B_basic_concepts.md +// Ref: https://github.com/cometbft/cometbft/v2/blob/main/spec/abci/abci%2B%2B_basic_concepts.md func (app *BaseApp) PrepareProposal(req *abci.PrepareProposalRequest) (resp *abci.PrepareProposalResponse, err error) { if app.abciHandlers.PrepareProposalHandler == nil { return nil, errors.New("PrepareProposal handler not set") @@ -409,7 +409,7 @@ func (app *BaseApp) PrepareProposal(req *abci.PrepareProposalRequest) (resp *abc // CometBFT must never call PrepareProposal with a height of 0. // - // Ref: https://github.com/cometbft/cometbft/blob/059798a4f5b0c9f52aa8655fa619054a0154088c/spec/core/state.md?plain=1#L37-L38 + // Ref: https://github.com/cometbft/cometbft/v2/blob/059798a4f5b0c9f52aa8655fa619054a0154088c/spec/core/state.md?plain=1#L37-L38 if req.Height < 1 { return nil, errors.New("PrepareProposal called with invalid height") } @@ -468,14 +468,14 @@ func (app *BaseApp) PrepareProposal(req *abci.PrepareProposalRequest) (resp *abc // handler, it will be recovered and we will reject the proposal. // // Ref: https://github.com/cosmos/cosmos-sdk/blob/main/docs/architecture/adr-060-abci-1.0.md -// Ref: https://github.com/cometbft/cometbft/blob/main/spec/abci/abci%2B%2B_basic_concepts.md +// Ref: https://github.com/cometbft/cometbft/v2/blob/main/spec/abci/abci%2B%2B_basic_concepts.md func (app *BaseApp) ProcessProposal(req *abci.ProcessProposalRequest) (resp *abci.ProcessProposalResponse, err error) { if app.abciHandlers.ProcessProposalHandler == nil { return nil, errors.New("ProcessProposal handler not set") } // CometBFT must never call ProcessProposal with a height of 0. - // Ref: https://github.com/cometbft/cometbft/blob/059798a4f5b0c9f52aa8655fa619054a0154088c/spec/core/state.md?plain=1#L37-L38 + // Ref: https://github.com/cometbft/cometbft/v2/blob/059798a4f5b0c9f52aa8655fa619054a0154088c/spec/core/state.md?plain=1#L37-L38 if req.Height < 1 { return nil, errors.New("ProcessProposal called with invalid height") } @@ -868,6 +868,7 @@ func (app *BaseApp) internalFinalizeBlock(ctx context.Context, req *abci.Finaliz TxResults: txResults, ValidatorUpdates: endBlock.ValidatorUpdates, ConsensusParamUpdates: &cp, + NextBlockDelay: app.nextBlockDelay, }, nil } @@ -876,7 +877,7 @@ func (app *BaseApp) internalFinalizeBlock(ctx context.Context, req *abci.Finaliz // by the transactions in the proposal, finally followed by the application's // EndBlock (if defined). // -// For each raw transaction, i.e. a byte slice, BaseApp will only execute it if +// For each raw transaction, i.e., a byte slice, BaseApp will only execute it if // it adheres to the sdk.Tx interface. Otherwise, the raw transaction will be // skipped. This is to support compatibility with proposers injecting vote // extensions into the proposal, which should not themselves be executed in cases diff --git a/baseapp/abci_test.go b/baseapp/abci_test.go index 7ad0bb82eb..0c384fe981 100644 --- a/baseapp/abci_test.go +++ b/baseapp/abci_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" cmtprotocrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - "github.com/cometbft/cometbft/crypto/secp256k1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + "github.com/cometbft/cometbft/v2/crypto/secp256k1" dbm "github.com/cosmos/cosmos-db" protoio "github.com/cosmos/gogoproto/io" "github.com/cosmos/gogoproto/jsonpb" diff --git a/baseapp/abci_utils.go b/baseapp/abci_utils.go index df45566e13..e4cd7f7bd9 100644 --- a/baseapp/abci_utils.go +++ b/baseapp/abci_utils.go @@ -7,11 +7,11 @@ import ( "slices" "github.com/cockroachdb/errors" - abci "github.com/cometbft/cometbft/abci/types" cmtprotocrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + cryptoenc "github.com/cometbft/cometbft/v2/crypto/encoding" + cmttypes "github.com/cometbft/cometbft/v2/types" protoio "github.com/cosmos/gogoproto/io" "github.com/cosmos/gogoproto/proto" @@ -156,7 +156,7 @@ func ValidateVoteExtensions( // validateExtendedCommitAgainstLastCommit validates an ExtendedCommitInfo against a LastCommit. Specifically, // it checks that the ExtendedCommit + LastCommit (for the same height), are consistent with each other + that // they are ordered correctly (by voting power) in accordance with -// [comet](https://github.com/cometbft/cometbft/blob/4ce0277b35f31985bbf2c25d3806a184a4510010/types/validator_set.go#L784). +// [comet](https://github.com/cometbft/cometbft/v2/blob/4ce0277b35f31985bbf2c25d3806a184a4510010/types/validator_set.go#L784). func validateExtendedCommitAgainstLastCommit(ec abci.ExtendedCommitInfo, lc comet.CommitInfo) error { // check that the rounds are the same if ec.Round != lc.Round() { diff --git a/baseapp/abci_utils_test.go b/baseapp/abci_utils_test.go index ada9cc70dd..fa7032ab5d 100644 --- a/baseapp/abci_utils_test.go +++ b/baseapp/abci_utils_test.go @@ -5,11 +5,11 @@ import ( "sort" "testing" - abci "github.com/cometbft/cometbft/abci/types" cmtprotocrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmtsecp256k1 "github.com/cometbft/cometbft/crypto/secp256k1" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmtsecp256k1 "github.com/cometbft/cometbft/v2/crypto/secp256k1" + cmttypes "github.com/cometbft/cometbft/v2/types" dbm "github.com/cosmos/cosmos-db" protoio "github.com/cosmos/gogoproto/io" "github.com/cosmos/gogoproto/proto" diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index c5245e88e4..90598d7a55 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -8,11 +8,12 @@ import ( "slices" "strconv" "sync" + "time" "github.com/cockroachdb/errors" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - "github.com/cometbft/cometbft/crypto/tmhash" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + "github.com/cometbft/cometbft/v2/crypto/tmhash" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" protov2 "google.golang.org/protobuf/proto" @@ -55,6 +56,10 @@ const ( execModeVoteExtension = sdk.ExecModeVoteExtension // Extend or verify a pre-commit vote execModeVerifyVoteExtension = sdk.ExecModeVerifyVoteExtension // Verify a vote extension execModeFinalize = sdk.ExecModeFinalize // Finalize a block proposal + + // defaultNextBlockDelay is chosen following documentation in CometBFT: + // https://github.com/cometbft/cometbft/blob/88ef3d267de491db98a654be0af6d791e8724ed0/spec/abci/abci%2B%2B_methods.md?plain=1#L689 + defaultNextBlockDelay = time.Second ) var _ servertypes.ABCI = (*BaseApp)(nil) @@ -108,6 +113,10 @@ type BaseApp struct { // flag for sealing options and parameters to a BaseApp sealed bool + // nextBlockDelay is the delay to wait until the next block after ABCI has committed. + // This gives the application more time to receive precommits. + nextBlockDelay time.Duration + // block height at which to halt the chain and gracefully shutdown haltHeight uint64 @@ -173,7 +182,7 @@ func NewBaseApp( logger: logger.With(log.ModuleKey, "baseapp"), name: name, db: db, - cms: store.NewCommitMultiStore(db, logger, storemetrics.NewNoOpMetrics()), // by default we use a no-op metric gather in store + cms: store.NewCommitMultiStore(db, logger, storemetrics.NewNoOpMetrics()), // by default, we use a no-op metric gather in store storeLoader: DefaultStoreLoader, grpcQueryRouter: NewGRPCQueryRouter(), msgServiceRouter: NewMsgServiceRouter(), @@ -181,6 +190,7 @@ func NewBaseApp( fauxMerkleMode: false, sigverifyTx: true, gasConfig: config.GasConfig{QueryGasLimit: math.MaxUint64}, + nextBlockDelay: defaultNextBlockDelay, } for _, option := range options { diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index 772a0e9ae4..f03fcc7e38 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go index 63d01d5108..1fe21e530f 100644 --- a/baseapp/block_gas_test.go +++ b/baseapp/block_gas_test.go @@ -5,8 +5,8 @@ import ( "math" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtjson "github.com/cometbft/cometbft/libs/json" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmtjson "github.com/cometbft/cometbft/v2/libs/json" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" diff --git a/baseapp/genesis.go b/baseapp/genesis.go index 4662d1187b..7b9ca60efe 100644 --- a/baseapp/genesis.go +++ b/baseapp/genesis.go @@ -3,7 +3,7 @@ package baseapp import ( "errors" - "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/core/genesis" ) diff --git a/baseapp/grpcrouter.go b/baseapp/grpcrouter.go index a34cc52042..6100c3d619 100644 --- a/baseapp/grpcrouter.go +++ b/baseapp/grpcrouter.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" gogogrpc "github.com/cosmos/gogoproto/grpc" "google.golang.org/grpc" "google.golang.org/grpc/encoding" diff --git a/baseapp/grpcrouter_helpers.go b/baseapp/grpcrouter_helpers.go index 6f97b71972..131d542d88 100644 --- a/baseapp/grpcrouter_helpers.go +++ b/baseapp/grpcrouter_helpers.go @@ -4,7 +4,7 @@ import ( gocontext "context" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" gogogrpc "github.com/cosmos/gogoproto/grpc" "google.golang.org/grpc" diff --git a/baseapp/info.go b/baseapp/info.go index 9fe1a3e4b2..d54306ccc6 100644 --- a/baseapp/info.go +++ b/baseapp/info.go @@ -3,7 +3,7 @@ package baseapp import ( "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/core/comet" ) diff --git a/baseapp/msg_service_router_test.go b/baseapp/msg_service_router_test.go index 22d4180e99..afcd7cf49c 100644 --- a/baseapp/msg_service_router_test.go +++ b/baseapp/msg_service_router_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" diff --git a/baseapp/oe/optimistic_execution.go b/baseapp/oe/optimistic_execution.go index 8f5d44eff1..83c5f4e67a 100644 --- a/baseapp/oe/optimistic_execution.go +++ b/baseapp/oe/optimistic_execution.go @@ -8,7 +8,7 @@ import ( "sync" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/log" ) diff --git a/baseapp/oe/optimistic_execution_test.go b/baseapp/oe/optimistic_execution_test.go index b7ec6b4fd8..9c6f8f9c9f 100644 --- a/baseapp/oe/optimistic_execution_test.go +++ b/baseapp/oe/optimistic_execution_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/assert" "cosmossdk.io/log" diff --git a/baseapp/options.go b/baseapp/options.go index 94cf813340..574c510acd 100644 --- a/baseapp/options.go +++ b/baseapp/options.go @@ -4,6 +4,7 @@ import ( "fmt" "io" "math" + "time" dbm "github.com/cosmos/cosmos-db" @@ -333,6 +334,20 @@ func (app *BaseApp) SetMempool(mempool mempool.Mempool) { app.mempool = mempool } +// SetNextBlockDelay sets the next block delay for the baseapp. +// +// The application is initialized with a default value of 1s. +// +// More information on this value and how it affects CometBFT can be found here: +// https://github.com/cometbft/cometbft/blob/88ef3d267de491db98a654be0af6d791e8724ed0/spec/abci/abci%2B%2B_methods.md?plain=1#L689 +func (app *BaseApp) SetNextBlockDelay(delay time.Duration) { + if app.sealed { + panic("SetNextBlockDelay() on sealed BaseApp") + } + + app.nextBlockDelay = delay +} + // SetProcessProposal sets the process proposal function for the BaseApp. func (app *BaseApp) SetProcessProposal(handler sdk.ProcessProposalHandler) { if app.sealed { diff --git a/baseapp/params.go b/baseapp/params.go index 6c1b3fd90c..6d281d19e6 100644 --- a/baseapp/params.go +++ b/baseapp/params.go @@ -3,7 +3,7 @@ package baseapp import ( "context" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" ) // ParamStore defines the interface the parameter store used by the BaseApp must diff --git a/baseapp/params_legacy.go b/baseapp/params_legacy.go index 95fbc3d5e9..9cb86b266a 100644 --- a/baseapp/params_legacy.go +++ b/baseapp/params_legacy.go @@ -38,7 +38,7 @@ import ( "errors" "fmt" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/baseapp/snapshot_test.go b/baseapp/snapshot_test.go index 14973c12fe..adb15b4ef0 100644 --- a/baseapp/snapshot_test.go +++ b/baseapp/snapshot_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" pruningtypes "cosmossdk.io/store/pruning/types" diff --git a/baseapp/state/manager.go b/baseapp/state/manager.go index 6d49702124..dddaf8e32f 100644 --- a/baseapp/state/manager.go +++ b/baseapp/state/manager.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "cosmossdk.io/core/header" "cosmossdk.io/log" diff --git a/baseapp/streaming_test.go b/baseapp/streaming_test.go index f95242e603..649e82ae56 100644 --- a/baseapp/streaming_test.go +++ b/baseapp/streaming_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - abci "github.com/cometbft/cometbft/abci/types" - tmproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + tmproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" storetypes "cosmossdk.io/store/types" diff --git a/baseapp/test_helpers.go b/baseapp/test_helpers.go index 2ae9a3e597..e33fdf092f 100644 --- a/baseapp/test_helpers.go +++ b/baseapp/test_helpers.go @@ -1,7 +1,7 @@ package baseapp import ( - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" errorsmod "cosmossdk.io/errors" diff --git a/baseapp/utils_test.go b/baseapp/utils_test.go index 1707c9090c..011fd31fa4 100644 --- a/baseapp/utils_test.go +++ b/baseapp/utils_test.go @@ -13,8 +13,8 @@ import ( "testing" "unsafe" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttypes "github.com/cometbft/cometbft/v2/types" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" diff --git a/client/broadcast.go b/client/broadcast.go index 5995ad2042..4dd91a5594 100644 --- a/client/broadcast.go +++ b/client/broadcast.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/mempool" - cmttypes "github.com/cometbft/cometbft/types" + "github.com/cometbft/cometbft/v2/mempool" + cmttypes "github.com/cometbft/cometbft/v2/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/client/broadcast_test.go b/client/broadcast_test.go index 10f5ef0ca0..f4b092079d 100644 --- a/client/broadcast_test.go +++ b/client/broadcast_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/mempool" + "github.com/cometbft/cometbft/v2/crypto/tmhash" + "github.com/cometbft/cometbft/v2/mempool" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/client/cometbft.go b/client/cometbft.go index fcf9ca64b0..63dfa21280 100644 --- a/client/cometbft.go +++ b/client/cometbft.go @@ -3,8 +3,8 @@ package client import ( "context" - rpcclient "github.com/cometbft/cometbft/rpc/client" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + rpcclient "github.com/cometbft/cometbft/v2/rpc/client" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" ) // CometRPC defines the interface of a CometBFT RPC client needed for diff --git a/client/grpc/cmtservice/block.go b/client/grpc/cmtservice/block.go index f27ebd7b0c..ebec64bd51 100644 --- a/client/grpc/cmtservice/block.go +++ b/client/grpc/cmtservice/block.go @@ -3,8 +3,8 @@ package cmtservice import ( "context" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" "github.com/cosmos/cosmos-sdk/client" ) diff --git a/client/grpc/cmtservice/query.pb.go b/client/grpc/cmtservice/query.pb.go index 0b300cfea3..2c7ba618cd 100644 --- a/client/grpc/cmtservice/query.pb.go +++ b/client/grpc/cmtservice/query.pb.go @@ -6,8 +6,8 @@ package cmtservice import ( context "context" fmt "fmt" - v11 "github.com/cometbft/cometbft/api/cometbft/p2p/v1" - v1 "github.com/cometbft/cometbft/api/cometbft/types/v1" + v1 "github.com/cometbft/cometbft/api/cometbft/p2p/v1" + v2 "github.com/cometbft/cometbft/api/cometbft/types/v2" _ "github.com/cosmos/cosmos-proto" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -375,9 +375,9 @@ func (m *GetBlockByHeightRequest) GetHeight() int64 { // GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. type GetBlockByHeightResponse struct { - BlockId *v1.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + BlockId *v2.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` // Deprecated: please use `sdk_block` instead - Block *v1.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + Block *v2.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` SdkBlock *Block `protobuf:"bytes,3,opt,name=sdk_block,json=sdkBlock,proto3" json:"sdk_block,omitempty"` } @@ -414,14 +414,14 @@ func (m *GetBlockByHeightResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetBlockByHeightResponse proto.InternalMessageInfo -func (m *GetBlockByHeightResponse) GetBlockId() *v1.BlockID { +func (m *GetBlockByHeightResponse) GetBlockId() *v2.BlockID { if m != nil { return m.BlockId } return nil } -func (m *GetBlockByHeightResponse) GetBlock() *v1.Block { +func (m *GetBlockByHeightResponse) GetBlock() *v2.Block { if m != nil { return m.Block } @@ -474,9 +474,9 @@ var xxx_messageInfo_GetLatestBlockRequest proto.InternalMessageInfo // GetLatestBlockResponse is the response type for the Query/GetLatestBlock RPC method. type GetLatestBlockResponse struct { - BlockId *v1.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + BlockId *v2.BlockID `protobuf:"bytes,1,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` // Deprecated: please use `sdk_block` instead - Block *v1.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + Block *v2.Block `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` SdkBlock *Block `protobuf:"bytes,3,opt,name=sdk_block,json=sdkBlock,proto3" json:"sdk_block,omitempty"` } @@ -513,14 +513,14 @@ func (m *GetLatestBlockResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetLatestBlockResponse proto.InternalMessageInfo -func (m *GetLatestBlockResponse) GetBlockId() *v1.BlockID { +func (m *GetLatestBlockResponse) GetBlockId() *v2.BlockID { if m != nil { return m.BlockId } return nil } -func (m *GetLatestBlockResponse) GetBlock() *v1.Block { +func (m *GetLatestBlockResponse) GetBlock() *v2.Block { if m != nil { return m.Block } @@ -655,8 +655,8 @@ var xxx_messageInfo_GetNodeInfoRequest proto.InternalMessageInfo // GetNodeInfoResponse is the response type for the Query/GetNodeInfo RPC method. type GetNodeInfoResponse struct { - DefaultNodeInfo *v11.DefaultNodeInfo `protobuf:"bytes,1,opt,name=default_node_info,json=defaultNodeInfo,proto3" json:"default_node_info,omitempty"` - ApplicationVersion *VersionInfo `protobuf:"bytes,2,opt,name=application_version,json=applicationVersion,proto3" json:"application_version,omitempty"` + DefaultNodeInfo *v1.DefaultNodeInfo `protobuf:"bytes,1,opt,name=default_node_info,json=defaultNodeInfo,proto3" json:"default_node_info,omitempty"` + ApplicationVersion *VersionInfo `protobuf:"bytes,2,opt,name=application_version,json=applicationVersion,proto3" json:"application_version,omitempty"` } func (m *GetNodeInfoResponse) Reset() { *m = GetNodeInfoResponse{} } @@ -692,7 +692,7 @@ func (m *GetNodeInfoResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetNodeInfoResponse proto.InternalMessageInfo -func (m *GetNodeInfoResponse) GetDefaultNodeInfo() *v11.DefaultNodeInfo { +func (m *GetNodeInfoResponse) GetDefaultNodeInfo() *v1.DefaultNodeInfo { if m != nil { return m.DefaultNodeInfo } @@ -1191,97 +1191,98 @@ func init() { } var fileDescriptor_40c93fb3ef485c5d = []byte{ - // 1437 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x4d, 0x6f, 0x1b, 0xc5, - 0x1b, 0xcf, 0xda, 0x69, 0x6c, 0x3f, 0xe9, 0xff, 0xdf, 0x64, 0x12, 0x5a, 0xd7, 0xb4, 0x6e, 0xb0, - 0x44, 0x9b, 0xb6, 0x64, 0xb7, 0x76, 0xda, 0xb4, 0x87, 0x52, 0x94, 0x34, 0x25, 0x0d, 0xb4, 0x25, - 0x6c, 0x10, 0x48, 0x08, 0x69, 0xb5, 0xf6, 0x8e, 0x37, 0xab, 0xd8, 0x3b, 0xd3, 0x9d, 0xb1, 0xc1, - 0x42, 0x48, 0x88, 0x0f, 0x80, 0x90, 0xf8, 0x0a, 0x1c, 0xe0, 0xc6, 0xa1, 0x82, 0x13, 0x95, 0xe0, - 0x54, 0x71, 0xaa, 0x8a, 0x84, 0xaa, 0x1e, 0x10, 0x6a, 0x91, 0xf8, 0x1a, 0x68, 0x5e, 0xd6, 0xde, - 0xcd, 0x4b, 0xed, 0xf4, 0x06, 0x17, 0x6b, 0xf6, 0x79, 0xfd, 0xfd, 0x9e, 0x67, 0xe6, 0x99, 0x31, - 0x9c, 0x6b, 0x10, 0xd6, 0x26, 0xcc, 0xaa, 0xbb, 0x0c, 0x5b, 0x1c, 0x87, 0x1e, 0x8e, 0xda, 0x41, - 0xc8, 0xad, 0x6e, 0xb5, 0x8e, 0xb9, 0x5b, 0xb5, 0xee, 0x76, 0x70, 0xd4, 0x33, 0x69, 0x44, 0x38, - 0x41, 0x65, 0x65, 0x6b, 0x0a, 0x5b, 0x73, 0x60, 0x6b, 0x6a, 0xdb, 0xd2, 0xac, 0x4f, 0x7c, 0x22, - 0x4d, 0x2d, 0xb1, 0x52, 0x5e, 0xa5, 0xe3, 0x3e, 0x21, 0x7e, 0x0b, 0x5b, 0xf2, 0xab, 0xde, 0x69, - 0x5a, 0x6e, 0xa8, 0x03, 0x96, 0x4e, 0x68, 0x95, 0x4b, 0x03, 0xcb, 0x0d, 0x43, 0xc2, 0x5d, 0x1e, - 0x90, 0x90, 0x69, 0xed, 0xcb, 0x0d, 0xd2, 0xc6, 0xbc, 0xde, 0xe4, 0x16, 0xad, 0x51, 0xab, 0x5b, - 0xb5, 0x78, 0x8f, 0xe2, 0x58, 0x79, 0xb2, 0xaf, 0x94, 0xd2, 0x9d, 0xea, 0x14, 0x2d, 0xc9, 0xa1, - 0xcf, 0x88, 0xba, 0x7e, 0x10, 0xca, 0x44, 0x7b, 0xd9, 0xee, 0x51, 0x82, 0x64, 0xdc, 0xe3, 0xca, - 0xd6, 0x51, 0x2c, 0x75, 0x3d, 0xf6, 0x45, 0x54, 0x6f, 0x91, 0xc6, 0xb6, 0x56, 0x4f, 0xbb, 0xed, - 0x20, 0x24, 0x96, 0xfc, 0x55, 0xa2, 0xca, 0xe7, 0x06, 0x94, 0xd7, 0x30, 0x7f, 0xdf, 0x6d, 0x05, - 0x9e, 0xcb, 0x49, 0xb4, 0x89, 0xf9, 0x4a, 0xef, 0x26, 0x0e, 0xfc, 0x2d, 0x6e, 0xe3, 0xbb, 0x1d, - 0xcc, 0x38, 0x3a, 0x0a, 0x13, 0x5b, 0x52, 0x50, 0x34, 0xe6, 0x8c, 0xf9, 0xac, 0xad, 0xbf, 0xd0, - 0x9b, 0x00, 0x03, 0x1e, 0xc5, 0xcc, 0x9c, 0x31, 0x3f, 0x59, 0x3b, 0x6d, 0x26, 0xfb, 0xa3, 0x1a, - 0xa7, 0x39, 0x98, 0x1b, 0xae, 0x8f, 0x75, 0x4c, 0x3b, 0xe1, 0x59, 0x79, 0x6c, 0xc0, 0xa9, 0x7d, - 0x21, 0x30, 0x4a, 0x42, 0x86, 0xd1, 0x2b, 0x70, 0x58, 0x12, 0x71, 0x52, 0x48, 0x26, 0xa5, 0x4c, - 0x99, 0xa2, 0x75, 0x80, 0x6e, 0x1c, 0x82, 0x15, 0x33, 0x73, 0xd9, 0xf9, 0xc9, 0xda, 0x59, 0xf3, - 0xf9, 0xdb, 0xc5, 0xec, 0x27, 0xb5, 0x13, 0xce, 0x68, 0x2d, 0xc5, 0x2c, 0x2b, 0x99, 0x9d, 0x19, - 0xca, 0x4c, 0x41, 0x4d, 0x51, 0x6b, 0xc2, 0x89, 0x35, 0xcc, 0x6f, 0xb9, 0x1c, 0xb3, 0x14, 0xbf, - 0xb8, 0xb4, 0xe9, 0x12, 0x1a, 0x2f, 0x5c, 0xc2, 0xdf, 0x0d, 0x38, 0xb9, 0x4f, 0xa2, 0x7f, 0x77, - 0x01, 0xef, 0x1b, 0x50, 0xe8, 0xa7, 0x40, 0x35, 0xc8, 0xb9, 0x9e, 0x17, 0x61, 0xc6, 0x24, 0xfe, - 0xc2, 0x4a, 0xf1, 0xd1, 0xbd, 0x85, 0x59, 0x1d, 0x76, 0x59, 0x69, 0x36, 0x79, 0x14, 0x84, 0xbe, - 0x1d, 0x1b, 0xa2, 0x05, 0xc8, 0xd1, 0x4e, 0xdd, 0xd9, 0xc6, 0x3d, 0xbd, 0x45, 0x67, 0x4d, 0x75, - 0xe2, 0xcd, 0x78, 0x18, 0x98, 0xcb, 0x61, 0xcf, 0x9e, 0xa0, 0x9d, 0xfa, 0xdb, 0xb8, 0x27, 0xea, - 0xd4, 0x25, 0x3c, 0x08, 0x7d, 0x87, 0x92, 0x8f, 0x71, 0x24, 0xb1, 0x67, 0xed, 0x49, 0x25, 0xdb, - 0x10, 0x22, 0x74, 0x1e, 0xa6, 0x69, 0x44, 0x28, 0x61, 0x38, 0x72, 0x68, 0x14, 0x90, 0x28, 0xe0, - 0xbd, 0xe2, 0xb8, 0xb4, 0x9b, 0x8a, 0x15, 0x1b, 0x5a, 0x5e, 0xa9, 0xc2, 0xb1, 0x35, 0xcc, 0x57, - 0x44, 0x99, 0x47, 0x3c, 0x57, 0x95, 0x27, 0x06, 0x14, 0x77, 0xfb, 0xe8, 0x3e, 0x5e, 0x82, 0xbc, - 0xea, 0x63, 0xe0, 0xe9, 0xfd, 0x52, 0x32, 0xe3, 0x43, 0x6f, 0xaa, 0x29, 0xd1, 0xad, 0x9a, 0xd2, - 0x77, 0x7d, 0xd5, 0xce, 0x49, 0xdb, 0x75, 0x0f, 0x99, 0x70, 0x48, 0x2e, 0x75, 0x0d, 0x8a, 0xfb, - 0xf9, 0xd8, 0xca, 0x0c, 0x7d, 0x00, 0x05, 0xe6, 0x6d, 0x3b, 0xca, 0x47, 0xf5, 0xef, 0xd5, 0x61, - 0x5b, 0x41, 0x01, 0x9e, 0x79, 0x72, 0x6f, 0xe1, 0x88, 0xb2, 0x5c, 0x60, 0xde, 0xf6, 0xdc, 0x05, - 0xf3, 0xe2, 0x65, 0x3b, 0xcf, 0xbc, 0x6d, 0xa9, 0xae, 0x1c, 0x83, 0x97, 0xfa, 0x1b, 0x55, 0x65, - 0x54, 0xd5, 0x10, 0x53, 0xe0, 0xe8, 0x4e, 0xcd, 0x7f, 0x84, 0xf3, 0x0c, 0x4c, 0xaf, 0x61, 0xbe, - 0xd9, 0x0b, 0x1b, 0x62, 0x67, 0x6a, 0xbe, 0x26, 0xa0, 0xa4, 0x50, 0x53, 0x2d, 0x42, 0x8e, 0x29, - 0x91, 0x64, 0x9a, 0xb7, 0xe3, 0xcf, 0xca, 0xac, 0xb4, 0xbf, 0x43, 0x3c, 0xbc, 0x1e, 0x36, 0x49, - 0x1c, 0xe5, 0x67, 0x03, 0x66, 0x52, 0x62, 0x1d, 0xe7, 0x16, 0x4c, 0x7b, 0xb8, 0xe9, 0x76, 0x5a, - 0xdc, 0x09, 0x89, 0x87, 0x9d, 0x20, 0x6c, 0x12, 0x5d, 0xbb, 0xb9, 0x41, 0x1d, 0x68, 0x8d, 0x8a, - 0x2a, 0xac, 0x2a, 0xcb, 0x7e, 0x90, 0x23, 0x5e, 0x5a, 0x80, 0x3e, 0x82, 0x19, 0x97, 0xd2, 0x56, - 0xd0, 0x90, 0x87, 0xd2, 0xe9, 0xe2, 0x88, 0x0d, 0x46, 0xfe, 0xf9, 0xa1, 0x23, 0x42, 0x99, 0xcb, - 0xd0, 0x28, 0x11, 0x47, 0xcb, 0x2b, 0x3f, 0x65, 0x60, 0x32, 0x61, 0x83, 0x10, 0x8c, 0x87, 0x6e, - 0x1b, 0xab, 0x23, 0x6e, 0xcb, 0x35, 0x3a, 0x0e, 0x79, 0x97, 0x52, 0x47, 0xca, 0x33, 0x52, 0x9e, - 0x73, 0x29, 0xbd, 0x23, 0x54, 0x45, 0xc8, 0xc5, 0x80, 0xb2, 0x4a, 0xa3, 0x3f, 0xd1, 0x49, 0x00, - 0x3f, 0xe0, 0x4e, 0x83, 0xb4, 0xdb, 0x01, 0x97, 0x27, 0xb4, 0x60, 0x17, 0xfc, 0x80, 0x5f, 0x97, - 0x02, 0xa1, 0xae, 0x77, 0x82, 0x96, 0xe7, 0x70, 0xd7, 0x67, 0xc5, 0x43, 0x4a, 0x2d, 0x25, 0xef, - 0xb9, 0x3e, 0x93, 0xde, 0xa4, 0xcf, 0x75, 0x42, 0x7b, 0x13, 0x8d, 0x14, 0xdd, 0x88, 0xbd, 0x3d, - 0x4c, 0x59, 0x31, 0x27, 0xa7, 0xe5, 0xe9, 0x61, 0xa5, 0xb8, 0x4d, 0xbc, 0x4e, 0x0b, 0xeb, 0x2c, - 0xab, 0x98, 0x32, 0xb4, 0x0c, 0x48, 0x5f, 0xe7, 0x62, 0xef, 0xc5, 0xd9, 0xf2, 0x72, 0xba, 0xed, - 0xb1, 0xad, 0x16, 0xed, 0x29, 0x25, 0xd8, 0xf4, 0xb6, 0xe3, 0xfa, 0xdd, 0x84, 0x09, 0x15, 0x57, - 0x54, 0x8e, 0xba, 0x7c, 0x2b, 0xae, 0x9c, 0x58, 0x27, 0xcb, 0x93, 0x49, 0x97, 0x67, 0x0a, 0xb2, - 0xac, 0xd3, 0xd6, 0x45, 0x13, 0xcb, 0xca, 0x16, 0x4c, 0x2d, 0xaf, 0x5c, 0x5f, 0x7f, 0x57, 0xcc, - 0xe6, 0x78, 0x4a, 0x21, 0x18, 0xf7, 0x5c, 0xee, 0xca, 0x98, 0x87, 0x6d, 0xb9, 0xee, 0xe7, 0xc9, - 0x24, 0xf2, 0x0c, 0xa6, 0x59, 0x36, 0xf5, 0x4a, 0x98, 0x85, 0x43, 0x34, 0x22, 0x5d, 0x2c, 0xeb, - 0x9f, 0xb7, 0xd5, 0x47, 0xe5, 0xcb, 0x0c, 0x4c, 0x27, 0x52, 0xe9, 0x5d, 0x8b, 0x60, 0xbc, 0x41, - 0x3c, 0xd5, 0xf9, 0xff, 0xd9, 0x72, 0x2d, 0x50, 0xb6, 0x88, 0x1f, 0xa3, 0x6c, 0x11, 0x5f, 0x58, - 0xc9, 0xed, 0xac, 0x1a, 0x2a, 0xd7, 0x22, 0x4b, 0x10, 0x7a, 0xf8, 0x13, 0xd9, 0xc6, 0xac, 0xad, - 0x3e, 0x84, 0xaf, 0x98, 0xfb, 0x13, 0x12, 0xba, 0x58, 0x0a, 0xbb, 0xae, 0xdb, 0xea, 0xe0, 0x62, - 0x4e, 0xca, 0xd4, 0x07, 0xba, 0x01, 0x05, 0x1a, 0x11, 0xd2, 0x74, 0x08, 0x65, 0xb2, 0xf6, 0x93, - 0xb5, 0xf9, 0x61, 0xad, 0xdc, 0x10, 0x0e, 0xef, 0x50, 0x66, 0xe7, 0xa9, 0x5e, 0x25, 0x4a, 0x50, - 0x48, 0x95, 0xe0, 0x04, 0x14, 0x04, 0x15, 0x46, 0xdd, 0x06, 0x2e, 0x82, 0xda, 0x48, 0x7d, 0xc1, - 0x5b, 0xe3, 0xf9, 0xcc, 0x54, 0xb6, 0x72, 0x1d, 0x72, 0x3a, 0xa2, 0xe0, 0x27, 0x06, 0x54, 0xdc, - 0x45, 0xb1, 0x8e, 0x99, 0x64, 0x06, 0x4c, 0xe2, 0xbe, 0x64, 0x07, 0x7d, 0xa9, 0x6c, 0x40, 0x3e, - 0x86, 0x85, 0x56, 0x21, 0x2b, 0xd8, 0x18, 0x72, 0x63, 0x9e, 0x19, 0x91, 0xcd, 0x4a, 0xe1, 0xc1, - 0x1f, 0xa7, 0xc6, 0xbe, 0xfd, 0xfb, 0xfb, 0x73, 0x86, 0x2d, 0xdc, 0x6b, 0xbf, 0x00, 0xe4, 0x36, - 0x71, 0xd4, 0x0d, 0x1a, 0x18, 0x7d, 0x67, 0xc0, 0x64, 0x62, 0xd6, 0xa0, 0xda, 0xb0, 0xa0, 0xbb, - 0xe7, 0x55, 0x69, 0xf1, 0x40, 0x3e, 0x6a, 0x5b, 0x54, 0xaa, 0x5f, 0xfc, 0xf6, 0xd7, 0xd7, 0x99, - 0xf3, 0xe8, 0xac, 0x35, 0xe4, 0x95, 0xdc, 0x1f, 0x75, 0xe8, 0x1b, 0x03, 0x60, 0x30, 0x5e, 0x51, - 0x75, 0x84, 0xb4, 0xe9, 0xf9, 0x5c, 0xaa, 0x1d, 0xc4, 0x45, 0x03, 0xb5, 0x24, 0xd0, 0xb3, 0xe8, - 0xcc, 0x30, 0xa0, 0x7a, 0xa8, 0xa3, 0x1f, 0x0c, 0xf8, 0x7f, 0xfa, 0xd2, 0x43, 0x97, 0x46, 0xc8, - 0xbb, 0xfb, 0xfa, 0x2c, 0x2d, 0x1d, 0xd4, 0x4d, 0x43, 0xbe, 0x24, 0x21, 0x5b, 0x68, 0x61, 0x18, - 0x64, 0x79, 0x2d, 0x32, 0xab, 0x25, 0x63, 0xa0, 0xfb, 0x06, 0x4c, 0xed, 0x7c, 0xa3, 0xa0, 0xcb, - 0x23, 0x60, 0xd8, 0xeb, 0x25, 0x54, 0xba, 0x72, 0x70, 0x47, 0x0d, 0xff, 0xb2, 0x84, 0x5f, 0x45, - 0xd6, 0x88, 0xf0, 0x3f, 0x55, 0x47, 0xf2, 0x33, 0xf4, 0xc8, 0x48, 0x3c, 0x44, 0x92, 0x2f, 0x66, - 0x74, 0x75, 0xe4, 0x4a, 0xee, 0xf1, 0xa2, 0x2f, 0xbd, 0xfe, 0x82, 0xde, 0x9a, 0xcf, 0x55, 0xc9, - 0x67, 0x09, 0x5d, 0x1c, 0xc6, 0x67, 0xf0, 0xd8, 0xc6, 0xbc, 0xdf, 0x95, 0x27, 0x86, 0x7c, 0x6d, - 0xee, 0xf5, 0x4f, 0x0a, 0x5d, 0x1b, 0x01, 0xd8, 0x73, 0xfe, 0x05, 0x96, 0xde, 0x78, 0x61, 0x7f, - 0x4d, 0xed, 0x9a, 0xa4, 0x76, 0x05, 0x2d, 0x1d, 0x8c, 0x5a, 0xbf, 0x63, 0x3f, 0x1a, 0x50, 0xe8, - 0x5f, 0x19, 0xe8, 0xc2, 0x30, 0x38, 0x3b, 0x2f, 0xb2, 0x52, 0xf5, 0x00, 0x1e, 0x1a, 0xf2, 0x8d, - 0x5f, 0x77, 0x5d, 0xc0, 0x4b, 0x92, 0xc5, 0x6b, 0xe8, 0xdc, 0x30, 0x16, 0x6e, 0xbd, 0x11, 0x38, - 0xf2, 0x5f, 0xce, 0xca, 0xed, 0x07, 0x4f, 0xcb, 0xc6, 0xc3, 0xa7, 0x65, 0xe3, 0xcf, 0xa7, 0x65, - 0xe3, 0xab, 0x67, 0xe5, 0xb1, 0x87, 0xcf, 0xca, 0x63, 0x8f, 0x9f, 0x95, 0xc7, 0x3e, 0x5c, 0xf4, - 0x03, 0xbe, 0xd5, 0xa9, 0x8b, 0x17, 0x59, 0x1c, 0x6f, 0x90, 0xce, 0x6a, 0xb4, 0x02, 0x1c, 0x72, - 0xcb, 0x8f, 0x68, 0xc3, 0x6a, 0xb4, 0x39, 0x53, 0x73, 0xb8, 0x3e, 0x21, 0xff, 0xb8, 0x2c, 0xfe, - 0x13, 0x00, 0x00, 0xff, 0xff, 0xfb, 0xad, 0x63, 0x50, 0x37, 0x11, 0x00, 0x00, + // 1443 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x5f, 0x6f, 0x1b, 0xc5, + 0x16, 0xcf, 0xda, 0x69, 0x6c, 0x1f, 0xf7, 0xde, 0x26, 0x93, 0xdc, 0xd6, 0xf5, 0x6d, 0xdd, 0x5c, + 0x4b, 0xb7, 0x4d, 0x5b, 0xb2, 0x5b, 0x3b, 0x6d, 0xda, 0x87, 0x52, 0x94, 0x34, 0x25, 0x0d, 0xb4, + 0x25, 0x6c, 0x10, 0x48, 0x08, 0x69, 0xb5, 0xf6, 0x8e, 0x37, 0xab, 0xd8, 0x3b, 0xd3, 0x9d, 0xb1, + 0xc1, 0x42, 0x48, 0x88, 0x0f, 0x80, 0x90, 0xf8, 0x0a, 0x3c, 0xc0, 0x1b, 0x0f, 0x15, 0x3c, 0x51, + 0x09, 0x9e, 0x2a, 0x9e, 0xaa, 0x22, 0xa1, 0xaa, 0x0f, 0x08, 0xb5, 0x48, 0x7c, 0x0d, 0x34, 0x7f, + 0xd6, 0xde, 0x6d, 0x92, 0xda, 0xe9, 0x1b, 0xbc, 0x58, 0xb3, 0xe7, 0xef, 0xef, 0x77, 0xce, 0xcc, + 0x99, 0x31, 0x9c, 0x6b, 0x12, 0xd6, 0x21, 0xcc, 0x6a, 0xb8, 0x0c, 0x5b, 0x1c, 0x87, 0x1e, 0x8e, + 0x3a, 0x41, 0xc8, 0xad, 0x5e, 0xad, 0x81, 0xb9, 0x5b, 0xb3, 0xee, 0x76, 0x71, 0xd4, 0x37, 0x69, + 0x44, 0x38, 0x41, 0x15, 0x65, 0x6b, 0x0a, 0x5b, 0x73, 0x68, 0x6b, 0x6a, 0xdb, 0xf2, 0x9c, 0x4f, + 0x7c, 0x22, 0x4d, 0x2d, 0xb1, 0x52, 0x5e, 0xe5, 0xe3, 0x3e, 0x21, 0x7e, 0x1b, 0x5b, 0xf2, 0xab, + 0xd1, 0x6d, 0x59, 0x6e, 0xa8, 0x03, 0x96, 0x4f, 0x68, 0x95, 0x4b, 0x03, 0xcb, 0x0d, 0x43, 0xc2, + 0x5d, 0x1e, 0x90, 0x90, 0x69, 0xed, 0x7f, 0x9b, 0xa4, 0x83, 0x79, 0xa3, 0xc5, 0x2d, 0x5a, 0xa7, + 0x56, 0xaf, 0x66, 0xf1, 0x3e, 0xc5, 0xb1, 0xf2, 0xe4, 0x40, 0x29, 0xa5, 0x56, 0xaf, 0x9e, 0x52, + 0xa7, 0x68, 0x49, 0x0e, 0x03, 0x46, 0xd4, 0xf5, 0x83, 0x50, 0x26, 0xda, 0xcb, 0x76, 0x8f, 0x12, + 0x24, 0xe3, 0x1e, 0x57, 0xb6, 0x8e, 0x62, 0xa9, 0xeb, 0xb1, 0x2f, 0xa2, 0x46, 0x9b, 0x34, 0x77, + 0xb4, 0x7a, 0xc6, 0xed, 0x04, 0x21, 0xb1, 0xe4, 0xaf, 0x12, 0x55, 0x3f, 0x35, 0xa0, 0xb2, 0x8e, + 0xf9, 0xbb, 0x6e, 0x3b, 0xf0, 0x5c, 0x4e, 0xa2, 0x2d, 0xcc, 0x57, 0xfb, 0x37, 0x71, 0xe0, 0x6f, + 0x73, 0x1b, 0xdf, 0xed, 0x62, 0xc6, 0xd1, 0x51, 0x98, 0xda, 0x96, 0x82, 0x92, 0x31, 0x6f, 0x2c, + 0x64, 0x6d, 0xfd, 0x85, 0x5e, 0x07, 0x18, 0xf2, 0x28, 0x65, 0xe6, 0x8d, 0x85, 0x62, 0xfd, 0xb4, + 0x99, 0xec, 0x8f, 0x6a, 0x9c, 0xe6, 0x60, 0x6e, 0xba, 0x3e, 0xd6, 0x31, 0xed, 0x84, 0x67, 0xf5, + 0xb1, 0x01, 0xa7, 0xf6, 0x85, 0xc0, 0x28, 0x09, 0x19, 0x46, 0xff, 0x83, 0xc3, 0x92, 0x88, 0x93, + 0x42, 0x52, 0x94, 0x32, 0x65, 0x8a, 0x36, 0x00, 0x7a, 0x71, 0x08, 0x56, 0xca, 0xcc, 0x67, 0x17, + 0x8a, 0xf5, 0xb3, 0xe6, 0x8b, 0xb7, 0x8b, 0x39, 0x48, 0x6a, 0x27, 0x9c, 0xd1, 0x7a, 0x8a, 0x59, + 0x56, 0x32, 0x3b, 0x33, 0x92, 0x99, 0x82, 0x9a, 0xa2, 0xd6, 0x82, 0x13, 0xeb, 0x98, 0xdf, 0x72, + 0x39, 0x66, 0x29, 0x7e, 0x71, 0x69, 0xd3, 0x25, 0x34, 0x5e, 0xba, 0x84, 0xbf, 0x1a, 0x70, 0x72, + 0x9f, 0x44, 0x7f, 0xef, 0x02, 0xde, 0x37, 0xa0, 0x30, 0x48, 0x81, 0xea, 0x90, 0x73, 0x3d, 0x2f, + 0xc2, 0x8c, 0x49, 0xfc, 0x85, 0xd5, 0xd2, 0xa3, 0x7b, 0x8b, 0x73, 0x3a, 0xec, 0x8a, 0xd2, 0x6c, + 0xf1, 0x28, 0x08, 0x7d, 0x3b, 0x36, 0x44, 0x8b, 0x90, 0xa3, 0xdd, 0x86, 0xb3, 0x83, 0xfb, 0x7a, + 0x8b, 0xce, 0x99, 0xea, 0xc4, 0x9b, 0xf1, 0x30, 0x30, 0x57, 0xc2, 0xbe, 0x3d, 0x45, 0xbb, 0x8d, + 0x37, 0x71, 0x5f, 0xd4, 0xa9, 0x47, 0x78, 0x10, 0xfa, 0x0e, 0x25, 0x1f, 0xe2, 0x48, 0x62, 0xcf, + 0xda, 0x45, 0x25, 0xdb, 0x14, 0x22, 0x74, 0x1e, 0x66, 0x68, 0x44, 0x28, 0x61, 0x38, 0x72, 0x68, + 0x14, 0x90, 0x28, 0xe0, 0xfd, 0xd2, 0xa4, 0xb4, 0x9b, 0x8e, 0x15, 0x9b, 0x5a, 0x5e, 0xad, 0xc1, + 0xb1, 0x75, 0xcc, 0x57, 0x45, 0x99, 0xc7, 0x3c, 0x57, 0xd5, 0x27, 0x06, 0x94, 0x76, 0xfb, 0xe8, + 0x3e, 0x5e, 0x82, 0xbc, 0xea, 0x63, 0xe0, 0xe9, 0xfd, 0x52, 0x36, 0xe3, 0x43, 0x6f, 0xaa, 0x29, + 0xd1, 0xab, 0x9b, 0xd2, 0x77, 0x63, 0xcd, 0xce, 0x49, 0xdb, 0x0d, 0x0f, 0x99, 0x70, 0x48, 0x2e, + 0x75, 0x0d, 0x4a, 0xfb, 0xf9, 0xd8, 0xca, 0x0c, 0xbd, 0x07, 0x05, 0xe6, 0xed, 0x38, 0xca, 0x47, + 0xf5, 0xef, 0xff, 0xa3, 0xb6, 0x82, 0x02, 0x3c, 0xfb, 0xe4, 0xde, 0xe2, 0x11, 0x65, 0xb9, 0xc8, + 0xbc, 0x9d, 0xf9, 0x0b, 0xe6, 0xc5, 0xcb, 0x76, 0x9e, 0x79, 0x3b, 0x52, 0x5d, 0x3d, 0x06, 0xff, + 0x19, 0x6c, 0x54, 0x95, 0x51, 0x55, 0x43, 0x4c, 0x81, 0xa3, 0xcf, 0x6b, 0xfe, 0x21, 0x9c, 0x67, + 0x61, 0x66, 0x1d, 0xf3, 0xad, 0x7e, 0xd8, 0x14, 0x3b, 0x53, 0xf3, 0x35, 0x01, 0x25, 0x85, 0x9a, + 0x6a, 0x09, 0x72, 0x4c, 0x89, 0x24, 0xd3, 0xbc, 0x1d, 0x7f, 0x56, 0xe7, 0xa4, 0xfd, 0x1d, 0xe2, + 0xe1, 0x8d, 0xb0, 0x45, 0xe2, 0x28, 0x3f, 0x1a, 0x30, 0x9b, 0x12, 0xeb, 0x38, 0xb7, 0x60, 0xc6, + 0xc3, 0x2d, 0xb7, 0xdb, 0xe6, 0x4e, 0x48, 0x3c, 0xec, 0x04, 0x61, 0x8b, 0xe8, 0xda, 0xcd, 0x0f, + 0xeb, 0x40, 0xeb, 0xd4, 0xec, 0xd5, 0xcc, 0x35, 0x65, 0x39, 0x08, 0x72, 0xc4, 0x4b, 0x0b, 0xd0, + 0x07, 0x30, 0xeb, 0x52, 0xda, 0x0e, 0x9a, 0xf2, 0x50, 0x3a, 0x3d, 0x1c, 0xb1, 0xe1, 0xc8, 0x3f, + 0x3f, 0x72, 0x44, 0x28, 0x73, 0x19, 0x1a, 0x25, 0xe2, 0x68, 0x79, 0xf5, 0x87, 0x0c, 0x14, 0x13, + 0x36, 0x08, 0xc1, 0x64, 0xe8, 0x76, 0xb0, 0x3a, 0xe2, 0xb6, 0x5c, 0xa3, 0xe3, 0x90, 0x77, 0x29, + 0x75, 0xa4, 0x3c, 0x23, 0xe5, 0x39, 0x97, 0xd2, 0x3b, 0x42, 0x55, 0x82, 0x5c, 0x0c, 0x28, 0xab, + 0x34, 0xfa, 0x13, 0x9d, 0x04, 0xf0, 0x03, 0xee, 0x34, 0x49, 0xa7, 0x13, 0x70, 0x79, 0x42, 0x0b, + 0x76, 0xc1, 0x0f, 0xf8, 0x75, 0x29, 0x10, 0xea, 0x46, 0x37, 0x68, 0x7b, 0x0e, 0x77, 0x7d, 0x56, + 0x3a, 0xa4, 0xd4, 0x52, 0xf2, 0x8e, 0xeb, 0x33, 0xe9, 0x4d, 0x06, 0x5c, 0xa7, 0xb4, 0x37, 0xd1, + 0x48, 0xd1, 0x8d, 0xd8, 0xdb, 0xc3, 0x94, 0x95, 0x72, 0x72, 0x5a, 0x9e, 0x1e, 0x55, 0x8a, 0xdb, + 0xc4, 0xeb, 0xb6, 0xb1, 0xce, 0xb2, 0x86, 0x29, 0x43, 0x2b, 0x80, 0xf4, 0x75, 0x2e, 0xf6, 0x5e, + 0x9c, 0x2d, 0x2f, 0xa7, 0xdb, 0x1e, 0xdb, 0x6a, 0xc9, 0x9e, 0x56, 0x82, 0x2d, 0x6f, 0x27, 0xae, + 0xdf, 0x4d, 0x98, 0x52, 0x71, 0x45, 0xe5, 0xa8, 0xcb, 0xb7, 0xe3, 0xca, 0x89, 0x75, 0xb2, 0x3c, + 0x99, 0x74, 0x79, 0xa6, 0x21, 0xcb, 0xba, 0x1d, 0x5d, 0x34, 0xb1, 0xac, 0x6e, 0xc3, 0xf4, 0xca, + 0xea, 0xf5, 0x8d, 0xb7, 0xc5, 0x6c, 0x8e, 0xa7, 0x14, 0x82, 0x49, 0xcf, 0xe5, 0xae, 0x8c, 0x79, + 0xd8, 0x96, 0xeb, 0x41, 0x9e, 0x4c, 0x22, 0xcf, 0x70, 0x9a, 0x65, 0x53, 0xaf, 0x84, 0x39, 0x38, + 0x44, 0x23, 0xd2, 0xc3, 0xb2, 0xfe, 0x79, 0x5b, 0x7d, 0x54, 0x3f, 0xcf, 0xc0, 0x4c, 0x22, 0x95, + 0xde, 0xb5, 0x08, 0x26, 0x9b, 0xc4, 0x53, 0x9d, 0xff, 0x97, 0x2d, 0xd7, 0x02, 0x65, 0x9b, 0xf8, + 0x31, 0xca, 0x36, 0xf1, 0x85, 0x95, 0xdc, 0xce, 0xaa, 0xa1, 0x72, 0x2d, 0xb2, 0x04, 0xa1, 0x87, + 0x3f, 0x92, 0x6d, 0xcc, 0xda, 0xea, 0x43, 0xf8, 0x8a, 0xb9, 0x3f, 0x25, 0xa1, 0x8b, 0xa5, 0xb0, + 0xeb, 0xb9, 0xed, 0x2e, 0x2e, 0xe5, 0xa4, 0x4c, 0x7d, 0xa0, 0x1b, 0x50, 0xa0, 0x11, 0x21, 0x2d, + 0x87, 0x50, 0x26, 0x6b, 0x5f, 0xac, 0x2f, 0x8c, 0x6a, 0xe5, 0xa6, 0x70, 0x78, 0x8b, 0x32, 0x3b, + 0x4f, 0xf5, 0x2a, 0x51, 0x82, 0x42, 0xaa, 0x04, 0x27, 0xa0, 0x20, 0xa8, 0x30, 0xea, 0x36, 0x71, + 0x09, 0xd4, 0x46, 0x1a, 0x08, 0xde, 0x98, 0xcc, 0x67, 0xa6, 0xb3, 0xd5, 0xeb, 0x90, 0xd3, 0x11, + 0x05, 0x3f, 0x31, 0xa0, 0xe2, 0x2e, 0x8a, 0x75, 0xcc, 0x24, 0x33, 0x64, 0x12, 0xf7, 0x25, 0x3b, + 0xec, 0x4b, 0x75, 0x13, 0xf2, 0x31, 0x2c, 0xb4, 0x06, 0x59, 0xc1, 0xc6, 0x90, 0x1b, 0xf3, 0xcc, + 0x98, 0x6c, 0x56, 0x0b, 0x0f, 0x7e, 0x3b, 0x35, 0xf1, 0xf5, 0x9f, 0xdf, 0x9e, 0x33, 0x6c, 0xe1, + 0x5e, 0xff, 0x09, 0x20, 0xb7, 0x85, 0xa3, 0x5e, 0xd0, 0xc4, 0xe8, 0x1b, 0x03, 0x8a, 0x89, 0x59, + 0x83, 0xea, 0xa3, 0x82, 0xee, 0x9e, 0x57, 0xe5, 0xa5, 0x03, 0xf9, 0xa8, 0x6d, 0x51, 0xad, 0x7d, + 0xf6, 0xcb, 0x1f, 0x5f, 0x66, 0xce, 0xa3, 0xb3, 0xd6, 0x88, 0x57, 0xf2, 0x60, 0xd4, 0xa1, 0xaf, + 0x0c, 0x80, 0xe1, 0x78, 0x45, 0xb5, 0x31, 0xd2, 0xa6, 0xe7, 0x73, 0xb9, 0x7e, 0x10, 0x17, 0x0d, + 0xd4, 0x92, 0x40, 0xcf, 0xa2, 0x33, 0xa3, 0x80, 0xea, 0xa1, 0x8e, 0xbe, 0x33, 0xe0, 0xdf, 0xe9, + 0x4b, 0x0f, 0x5d, 0x1a, 0x23, 0xef, 0xee, 0xeb, 0xb3, 0xbc, 0x7c, 0x50, 0x37, 0x0d, 0xf9, 0x92, + 0x84, 0x6c, 0xa1, 0xc5, 0x51, 0x90, 0xe5, 0xb5, 0xc8, 0xac, 0xb6, 0x8c, 0x81, 0xee, 0x1b, 0x30, + 0xfd, 0xfc, 0x1b, 0x05, 0x5d, 0x1e, 0x03, 0xc3, 0x5e, 0x2f, 0xa1, 0xf2, 0x95, 0x83, 0x3b, 0x6a, + 0xf8, 0x97, 0x25, 0xfc, 0x1a, 0xb2, 0xc6, 0x84, 0xff, 0xb1, 0x3a, 0x92, 0x9f, 0xa0, 0x47, 0x46, + 0xe2, 0x21, 0x92, 0x7c, 0x31, 0xa3, 0xab, 0x63, 0x57, 0x72, 0x8f, 0x17, 0x7d, 0xf9, 0xd5, 0x97, + 0xf4, 0xd6, 0x7c, 0xae, 0x4a, 0x3e, 0xcb, 0xe8, 0xe2, 0x28, 0x3e, 0xc3, 0xc7, 0x36, 0xe6, 0x83, + 0xae, 0x3c, 0x31, 0xe4, 0x6b, 0x73, 0xaf, 0x7f, 0x52, 0xe8, 0xda, 0x18, 0xc0, 0x5e, 0xf0, 0x2f, + 0xb0, 0xfc, 0xda, 0x4b, 0xfb, 0x6b, 0x6a, 0xd7, 0x24, 0xb5, 0x2b, 0x68, 0xf9, 0x60, 0xd4, 0x06, + 0x1d, 0xfb, 0xde, 0x80, 0xc2, 0xe0, 0xca, 0x40, 0x17, 0x46, 0xc1, 0x79, 0xfe, 0x22, 0x2b, 0xd7, + 0x0e, 0xe0, 0xa1, 0x21, 0xdf, 0xf8, 0x79, 0xd7, 0x05, 0xbc, 0x2c, 0x59, 0xbc, 0x82, 0xce, 0x8d, + 0x62, 0xe1, 0x36, 0x9a, 0x81, 0x23, 0xff, 0xe5, 0xac, 0xde, 0x7e, 0xf0, 0xb4, 0x62, 0x3c, 0x7c, + 0x5a, 0x31, 0x7e, 0x7f, 0x5a, 0x31, 0xbe, 0x78, 0x56, 0x99, 0x78, 0xf8, 0xac, 0x32, 0xf1, 0xf8, + 0x59, 0x65, 0xe2, 0xfd, 0x25, 0x3f, 0xe0, 0xdb, 0xdd, 0x86, 0x78, 0x91, 0xc5, 0xf1, 0x86, 0xe9, + 0xac, 0x66, 0x3b, 0xc0, 0x21, 0xb7, 0xfc, 0x88, 0x36, 0xad, 0x66, 0x87, 0x33, 0x35, 0x87, 0x1b, + 0x53, 0xf2, 0x8f, 0xcb, 0xd2, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x30, 0xfb, 0x01, 0xed, 0x37, + 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3618,7 +3619,7 @@ func (m *GetBlockByHeightResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.BlockId == nil { - m.BlockId = &v1.BlockID{} + m.BlockId = &v2.BlockID{} } if err := m.BlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3654,7 +3655,7 @@ func (m *GetBlockByHeightResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Block == nil { - m.Block = &v1.Block{} + m.Block = &v2.Block{} } if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3826,7 +3827,7 @@ func (m *GetLatestBlockResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.BlockId == nil { - m.BlockId = &v1.BlockID{} + m.BlockId = &v2.BlockID{} } if err := m.BlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3862,7 +3863,7 @@ func (m *GetLatestBlockResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Block == nil { - m.Block = &v1.Block{} + m.Block = &v2.Block{} } if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4154,7 +4155,7 @@ func (m *GetNodeInfoResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.DefaultNodeInfo == nil { - m.DefaultNodeInfo = &v11.DefaultNodeInfo{} + m.DefaultNodeInfo = &v1.DefaultNodeInfo{} } if err := m.DefaultNodeInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/client/grpc/cmtservice/service.go b/client/grpc/cmtservice/service.go index 6b543ad340..3927f0adcc 100644 --- a/client/grpc/cmtservice/service.go +++ b/client/grpc/cmtservice/service.go @@ -3,7 +3,7 @@ package cmtservice import ( "context" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" gogogrpc "github.com/cosmos/gogoproto/grpc" "github.com/grpc-ecosystem/grpc-gateway/runtime" "google.golang.org/grpc/codes" diff --git a/client/grpc/cmtservice/status.go b/client/grpc/cmtservice/status.go index ea32e00b79..3ad35dbef0 100644 --- a/client/grpc/cmtservice/status.go +++ b/client/grpc/cmtservice/status.go @@ -3,7 +3,7 @@ package cmtservice import ( "context" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" "github.com/cosmos/cosmos-sdk/client" ) diff --git a/client/grpc/cmtservice/types.go b/client/grpc/cmtservice/types.go index a94c0fd8ba..054720ae32 100644 --- a/client/grpc/cmtservice/types.go +++ b/client/grpc/cmtservice/types.go @@ -1,7 +1,7 @@ package cmtservice import ( - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" ) // ToABCIRequestQuery converts a gRPC ABCIQueryRequest type to an ABCI diff --git a/client/grpc/cmtservice/types.pb.go b/client/grpc/cmtservice/types.pb.go index 6d1a3cbb60..a43e7157dc 100644 --- a/client/grpc/cmtservice/types.pb.go +++ b/client/grpc/cmtservice/types.pb.go @@ -5,8 +5,8 @@ package cmtservice import ( fmt "fmt" - v1 "github.com/cometbft/cometbft/api/cometbft/types/v1" - v11 "github.com/cometbft/cometbft/api/cometbft/version/v1" + v2 "github.com/cometbft/cometbft/api/cometbft/types/v2" + v1 "github.com/cometbft/cometbft/api/cometbft/version/v1" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" @@ -34,9 +34,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // field converted to bech32 string. type Block struct { Header Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header"` - Data v1.Data `protobuf:"bytes,2,opt,name=data,proto3" json:"data"` - Evidence v1.EvidenceList `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence"` - LastCommit *v1.Commit `protobuf:"bytes,4,opt,name=last_commit,json=lastCommit,proto3" json:"last_commit,omitempty"` + Data v2.Data `protobuf:"bytes,2,opt,name=data,proto3" json:"data"` + Evidence v2.EvidenceList `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence"` + LastCommit *v2.Commit `protobuf:"bytes,4,opt,name=last_commit,json=lastCommit,proto3" json:"last_commit,omitempty"` } func (m *Block) Reset() { *m = Block{} } @@ -79,21 +79,21 @@ func (m *Block) GetHeader() Header { return Header{} } -func (m *Block) GetData() v1.Data { +func (m *Block) GetData() v2.Data { if m != nil { return m.Data } - return v1.Data{} + return v2.Data{} } -func (m *Block) GetEvidence() v1.EvidenceList { +func (m *Block) GetEvidence() v2.EvidenceList { if m != nil { return m.Evidence } - return v1.EvidenceList{} + return v2.EvidenceList{} } -func (m *Block) GetLastCommit() *v1.Commit { +func (m *Block) GetLastCommit() *v2.Commit { if m != nil { return m.LastCommit } @@ -103,12 +103,12 @@ func (m *Block) GetLastCommit() *v1.Commit { // Header defines the structure of a Tendermint block header. type Header struct { // basic block info - Version v11.Consensus `protobuf:"bytes,1,opt,name=version,proto3" json:"version"` - ChainID string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` - Time time.Time `protobuf:"bytes,4,opt,name=time,proto3,stdtime" json:"time"` + Version v1.Consensus `protobuf:"bytes,1,opt,name=version,proto3" json:"version"` + ChainID string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` + Time time.Time `protobuf:"bytes,4,opt,name=time,proto3,stdtime" json:"time"` // prev block info - LastBlockId v1.BlockID `protobuf:"bytes,5,opt,name=last_block_id,json=lastBlockId,proto3" json:"last_block_id"` + LastBlockId v2.BlockID `protobuf:"bytes,5,opt,name=last_block_id,json=lastBlockId,proto3" json:"last_block_id"` // hashes of block data LastCommitHash []byte `protobuf:"bytes,6,opt,name=last_commit_hash,json=lastCommitHash,proto3" json:"last_commit_hash,omitempty"` DataHash []byte `protobuf:"bytes,7,opt,name=data_hash,json=dataHash,proto3" json:"data_hash,omitempty"` @@ -159,11 +159,11 @@ func (m *Header) XXX_DiscardUnknown() { var xxx_messageInfo_Header proto.InternalMessageInfo -func (m *Header) GetVersion() v11.Consensus { +func (m *Header) GetVersion() v1.Consensus { if m != nil { return m.Version } - return v11.Consensus{} + return v1.Consensus{} } func (m *Header) GetChainID() string { @@ -187,11 +187,11 @@ func (m *Header) GetTime() time.Time { return time.Time{} } -func (m *Header) GetLastBlockId() v1.BlockID { +func (m *Header) GetLastBlockId() v2.BlockID { if m != nil { return m.LastBlockId } - return v1.BlockID{} + return v2.BlockID{} } func (m *Header) GetLastCommitHash() []byte { @@ -267,48 +267,49 @@ func init() { } var fileDescriptor_bb9931519c08e0d6 = []byte{ - // 654 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xcb, 0x6e, 0xd3, 0x40, - 0x14, 0x86, 0xe3, 0x36, 0xcd, 0x65, 0xd2, 0xf4, 0x62, 0x55, 0x90, 0x06, 0xe1, 0x54, 0x45, 0x94, - 0x52, 0x09, 0x0f, 0xa5, 0x12, 0x0b, 0x24, 0x16, 0xa4, 0x05, 0x35, 0x12, 0x6c, 0x2c, 0xc4, 0x82, - 0x4d, 0x34, 0xb6, 0xa7, 0xf6, 0xa8, 0xb1, 0xc7, 0xf2, 0x4c, 0x2c, 0x78, 0x09, 0xd4, 0xc7, 0x60, - 0xc9, 0x63, 0x74, 0xd9, 0x25, 0xab, 0x82, 0xd2, 0x05, 0x8f, 0xc0, 0x16, 0xcd, 0x99, 0x71, 0x92, - 0x5e, 0xc4, 0x26, 0xb1, 0xff, 0xf3, 0x9d, 0x3f, 0x73, 0xfe, 0x33, 0x0a, 0xda, 0x0b, 0xb8, 0x48, - 0xb8, 0xc0, 0x3e, 0x11, 0x14, 0x4b, 0x9a, 0x86, 0x34, 0x4f, 0x58, 0x2a, 0x71, 0xb1, 0xef, 0x53, - 0x49, 0xf6, 0xb1, 0xfc, 0x9a, 0x51, 0xe1, 0x66, 0x39, 0x97, 0xdc, 0x76, 0x34, 0xeb, 0x2a, 0xd6, - 0x9d, 0xb1, 0xae, 0x61, 0xbb, 0x1b, 0x11, 0x8f, 0x38, 0xa0, 0x58, 0x3d, 0xe9, 0xae, 0xee, 0xc3, - 0x80, 0x27, 0x54, 0xfa, 0x27, 0x52, 0x7b, 0xe1, 0xe2, 0x9a, 0x69, 0x77, 0xeb, 0x76, 0x99, 0x16, - 0x2c, 0xa4, 0x69, 0x40, 0x0d, 0xd1, 0x9b, 0x12, 0x05, 0xcd, 0x05, 0xe3, 0xe9, 0x4d, 0x8b, 0x5e, - 0xc4, 0x79, 0x34, 0xa2, 0x18, 0xde, 0xfc, 0xf1, 0x09, 0x96, 0x2c, 0xa1, 0x42, 0x92, 0x24, 0x33, - 0xc0, 0x3a, 0x49, 0x58, 0xca, 0x31, 0x7c, 0x6a, 0x69, 0xfb, 0xdb, 0x02, 0x5a, 0xea, 0x8f, 0x78, - 0x70, 0x6a, 0x0f, 0x50, 0x2d, 0xa6, 0x24, 0xa4, 0x79, 0xc7, 0xda, 0xb2, 0x76, 0x5b, 0x2f, 0x76, - 0xdc, 0xff, 0x8f, 0xe9, 0x1e, 0x03, 0xdd, 0x6f, 0x9e, 0x5f, 0xf6, 0x2a, 0xdf, 0xff, 0xfc, 0xd8, - 0xb3, 0x3c, 0x63, 0x60, 0xbf, 0x44, 0xd5, 0x90, 0x48, 0xd2, 0x59, 0x00, 0xa3, 0xfb, 0x6e, 0x79, - 0x70, 0x57, 0x9f, 0xb6, 0xd8, 0x77, 0x8f, 0x88, 0x24, 0xf3, 0x9d, 0xc0, 0xdb, 0xef, 0x50, 0xa3, - 0x9c, 0xb9, 0xb3, 0x08, 0xbd, 0xbd, 0x3b, 0x7a, 0xdf, 0x1a, 0xe4, 0x3d, 0x13, 0x72, 0xde, 0x63, - 0xda, 0x6b, 0xbf, 0x42, 0xad, 0x11, 0x11, 0x72, 0x18, 0xf0, 0x24, 0x61, 0xb2, 0x53, 0x05, 0xab, - 0xcd, 0x3b, 0xac, 0x0e, 0x01, 0xf0, 0x90, 0xa2, 0xf5, 0xf3, 0xf6, 0xdf, 0x2a, 0xaa, 0xe9, 0xc9, - 0xec, 0x43, 0x54, 0x37, 0x49, 0x9b, 0x48, 0x9c, 0x99, 0x85, 0x29, 0x68, 0x93, 0x54, 0xd0, 0x54, - 0x8c, 0xc5, 0xfc, 0x61, 0xca, 0x4e, 0x7b, 0x07, 0x35, 0x82, 0x98, 0xb0, 0x74, 0xc8, 0x42, 0xc8, - 0xa3, 0xd9, 0x6f, 0x4d, 0x2e, 0x7b, 0xf5, 0x43, 0xa5, 0x0d, 0x8e, 0xbc, 0x3a, 0x14, 0x07, 0xa1, - 0x7d, 0x4f, 0xc5, 0xcf, 0xa2, 0x58, 0xc2, 0xe4, 0x8b, 0x9e, 0x79, 0xb3, 0x5f, 0xa3, 0xaa, 0x5a, - 0xa3, 0x19, 0xa2, 0xeb, 0xea, 0x1d, 0xbb, 0xe5, 0x8e, 0xdd, 0x8f, 0xe5, 0x8e, 0xfb, 0x6d, 0xf5, - 0xeb, 0x67, 0xbf, 0x7a, 0x96, 0x89, 0x54, 0xb5, 0xd9, 0x03, 0xd4, 0x86, 0x28, 0x7c, 0xb5, 0x63, - 0x75, 0x86, 0x25, 0xe3, 0x73, 0x3b, 0x0c, 0xb8, 0x06, 0x83, 0xa3, 0xf9, 0x29, 0x20, 0x46, 0xad, - 0x87, 0xf6, 0x2e, 0x5a, 0x9b, 0x4b, 0x75, 0x18, 0x13, 0x11, 0x77, 0x6a, 0x5b, 0xd6, 0xee, 0xb2, - 0xb7, 0x32, 0xcb, 0xef, 0x98, 0x88, 0xd8, 0x7e, 0x80, 0x9a, 0x6a, 0x9f, 0x1a, 0xa9, 0x03, 0xd2, - 0x50, 0x02, 0x14, 0x9f, 0xa0, 0xd5, 0x82, 0x8c, 0x58, 0x48, 0x24, 0xcf, 0x85, 0x46, 0x1a, 0xda, - 0x65, 0x26, 0x03, 0xf8, 0x1c, 0x6d, 0xa4, 0xf4, 0x8b, 0x1c, 0xde, 0xa4, 0x9b, 0x40, 0xdb, 0xaa, - 0xf6, 0xe9, 0x7a, 0xc7, 0x63, 0xb4, 0x12, 0x94, 0xcb, 0xd0, 0x2c, 0x02, 0xb6, 0x3d, 0x55, 0x01, - 0xdb, 0x44, 0x0d, 0x92, 0x65, 0x1a, 0x68, 0x01, 0x50, 0x27, 0x59, 0x06, 0xa5, 0x3d, 0xb4, 0x0e, - 0x33, 0xe6, 0x54, 0x8c, 0x47, 0xd2, 0x98, 0x2c, 0x03, 0xb3, 0xaa, 0x0a, 0x9e, 0xd6, 0x81, 0x7d, - 0x84, 0xda, 0xe5, 0x8d, 0xd3, 0x5c, 0x1b, 0xb8, 0xe5, 0x52, 0x04, 0xe8, 0x29, 0x5a, 0xcb, 0x72, - 0x9e, 0x71, 0x41, 0xf3, 0x21, 0x09, 0xc3, 0x9c, 0x0a, 0xd1, 0x59, 0x51, 0xd7, 0xc0, 0x5b, 0x2d, - 0xf5, 0x37, 0x5a, 0xee, 0x7f, 0x38, 0x9f, 0x38, 0xd6, 0xc5, 0xc4, 0xb1, 0x7e, 0x4f, 0x1c, 0xeb, - 0xec, 0xca, 0xa9, 0x5c, 0x5c, 0x39, 0x95, 0x9f, 0x57, 0x4e, 0xe5, 0xf3, 0x41, 0xc4, 0x64, 0x3c, - 0xf6, 0xd5, 0xce, 0xb0, 0xf9, 0x9f, 0xd2, 0x5f, 0xcf, 0x44, 0x78, 0x8a, 0x83, 0x11, 0xa3, 0xa9, - 0xc4, 0x51, 0x9e, 0x05, 0x38, 0x48, 0xa4, 0xa0, 0x79, 0xc1, 0x02, 0xea, 0xd7, 0xe0, 0x8a, 0x1c, - 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x71, 0x63, 0x17, 0x59, 0xda, 0x04, 0x00, 0x00, + // 661 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xcd, 0x6e, 0xd3, 0x40, + 0x14, 0x85, 0xe3, 0x36, 0xcd, 0xcf, 0xa4, 0xe9, 0x8f, 0x55, 0x41, 0x1a, 0x84, 0x53, 0x15, 0x51, + 0x4a, 0x25, 0x66, 0x68, 0x2b, 0xb1, 0x40, 0x62, 0x41, 0x52, 0x50, 0x23, 0xc1, 0x26, 0x42, 0x2c, + 0xd8, 0x44, 0x13, 0x7b, 0x6a, 0x8f, 0x1a, 0x7b, 0x2c, 0xcf, 0xc4, 0x82, 0x97, 0x40, 0x7d, 0x0c, + 0x96, 0x3c, 0x46, 0x97, 0x5d, 0xb2, 0x2a, 0x28, 0x5d, 0xf0, 0x08, 0x6c, 0xd1, 0xdc, 0x19, 0x37, + 0x29, 0xad, 0xd8, 0x24, 0xf6, 0xb9, 0xdf, 0x3d, 0x99, 0x7b, 0xee, 0x28, 0x68, 0xcf, 0x17, 0x32, + 0x16, 0x92, 0x8c, 0xa8, 0x64, 0x44, 0xb1, 0x24, 0x60, 0x59, 0xcc, 0x13, 0x45, 0xf2, 0xfd, 0x11, + 0x53, 0x74, 0x9f, 0xa8, 0x2f, 0x29, 0x93, 0x38, 0xcd, 0x84, 0x12, 0xae, 0x67, 0x58, 0xac, 0x59, + 0x3c, 0x63, 0xb1, 0x65, 0xdb, 0x1b, 0xa1, 0x08, 0x05, 0xa0, 0x44, 0x3f, 0x99, 0xae, 0xf6, 0x43, + 0x5f, 0xc4, 0x4c, 0x8d, 0x4e, 0x94, 0xf1, 0x22, 0xf9, 0xc1, 0xbc, 0x69, 0x7b, 0xeb, 0x76, 0x99, + 0xe5, 0x3c, 0x60, 0x89, 0xcf, 0x2c, 0xd1, 0xb9, 0x26, 0x72, 0x96, 0x49, 0x2e, 0x12, 0x92, 0xdf, + 0x38, 0x57, 0xbb, 0x13, 0x0a, 0x11, 0x8e, 0x19, 0x81, 0xb7, 0xd1, 0xe4, 0x84, 0x28, 0x1e, 0x33, + 0xa9, 0x68, 0x9c, 0x5a, 0x60, 0x9d, 0xc6, 0x3c, 0x11, 0x04, 0x3e, 0x8d, 0xb4, 0xfd, 0x75, 0x01, + 0x2d, 0x75, 0xc7, 0xc2, 0x3f, 0x75, 0xfb, 0xa8, 0x12, 0x31, 0x1a, 0xb0, 0xac, 0xe5, 0x6c, 0x39, + 0xbb, 0x8d, 0x83, 0x1d, 0xfc, 0xff, 0x31, 0xf1, 0x31, 0xd0, 0xdd, 0xfa, 0xf9, 0x65, 0xa7, 0xf4, + 0xed, 0xf7, 0xf7, 0x3d, 0x67, 0x60, 0x0d, 0xdc, 0x17, 0xa8, 0x1c, 0x50, 0x45, 0x5b, 0x0b, 0x60, + 0x74, 0x1f, 0x17, 0x07, 0xc7, 0xe6, 0xb4, 0xf9, 0x01, 0x3e, 0xa2, 0x8a, 0xce, 0x77, 0x02, 0xef, + 0xbe, 0x45, 0xb5, 0x62, 0xe6, 0xd6, 0x22, 0xf4, 0x76, 0xee, 0xe8, 0x7d, 0x63, 0x91, 0x77, 0x5c, + 0xaa, 0x79, 0x8f, 0xeb, 0x5e, 0xf7, 0x25, 0x6a, 0x8c, 0xa9, 0x54, 0x43, 0x5f, 0xc4, 0x31, 0x57, + 0xad, 0x32, 0x58, 0x6d, 0xde, 0x61, 0xd5, 0x03, 0x60, 0x80, 0x34, 0x6d, 0x9e, 0xb7, 0xff, 0x94, + 0x51, 0xc5, 0x4c, 0xe6, 0xf6, 0x50, 0xd5, 0x26, 0x6d, 0x23, 0xf1, 0x66, 0x16, 0xb6, 0x80, 0xf3, + 0x7d, 0xdc, 0x13, 0x89, 0x64, 0x89, 0x9c, 0xc8, 0xf9, 0xc3, 0x14, 0x9d, 0xee, 0x0e, 0xaa, 0xf9, + 0x11, 0xe5, 0xc9, 0x90, 0x07, 0x90, 0x47, 0xbd, 0xdb, 0x98, 0x5e, 0x76, 0xaa, 0x3d, 0xad, 0xf5, + 0x8f, 0x06, 0x55, 0x28, 0xf6, 0x03, 0xf7, 0x9e, 0x8e, 0x9f, 0x87, 0x91, 0x82, 0xc9, 0x17, 0x07, + 0xf6, 0xcd, 0x7d, 0x85, 0xca, 0x7a, 0x8d, 0x76, 0x88, 0x36, 0x36, 0x3b, 0xc6, 0xc5, 0x8e, 0xf1, + 0x87, 0x62, 0xc7, 0xdd, 0xa6, 0xfe, 0xf5, 0xb3, 0x9f, 0x1d, 0xc7, 0x46, 0xaa, 0xdb, 0xdc, 0x3e, + 0x6a, 0x42, 0x14, 0x23, 0xbd, 0x63, 0x7d, 0x86, 0x25, 0xeb, 0x73, 0x3b, 0x0c, 0xb8, 0x06, 0xfd, + 0xa3, 0xf9, 0x29, 0x20, 0x46, 0xa3, 0x07, 0xee, 0x2e, 0x5a, 0x9b, 0x4b, 0x75, 0x18, 0x51, 0x19, + 0xb5, 0x2a, 0x5b, 0xce, 0xee, 0xf2, 0x60, 0x65, 0x96, 0xdf, 0x31, 0x95, 0x91, 0xfb, 0x00, 0xd5, + 0xf5, 0x3e, 0x0d, 0x52, 0x05, 0xa4, 0xa6, 0x05, 0x28, 0x3e, 0x41, 0xab, 0x39, 0x1d, 0xf3, 0x80, + 0x2a, 0x91, 0x49, 0x83, 0xd4, 0x8c, 0xcb, 0x4c, 0x06, 0xf0, 0x39, 0xda, 0x48, 0xd8, 0x67, 0x35, + 0xfc, 0x97, 0xae, 0x03, 0xed, 0xea, 0xda, 0xc7, 0x9b, 0x1d, 0x8f, 0xd1, 0x8a, 0x5f, 0x2c, 0xc3, + 0xb0, 0x08, 0xd8, 0xe6, 0xb5, 0x0a, 0xd8, 0x26, 0xaa, 0xd1, 0x34, 0x35, 0x40, 0x03, 0x80, 0x2a, + 0x4d, 0x53, 0x28, 0xed, 0xa1, 0x75, 0x98, 0x31, 0x63, 0x72, 0x32, 0x56, 0xd6, 0x64, 0x19, 0x98, + 0x55, 0x5d, 0x18, 0x18, 0x1d, 0xd8, 0x47, 0xa8, 0x59, 0xdc, 0x38, 0xc3, 0x35, 0x81, 0x5b, 0x2e, + 0x44, 0x80, 0x9e, 0xa2, 0xb5, 0x34, 0x13, 0xa9, 0x90, 0x2c, 0x1b, 0xd2, 0x20, 0xc8, 0x98, 0x94, + 0xad, 0x15, 0x7d, 0x0d, 0x06, 0xab, 0x85, 0xfe, 0xda, 0xc8, 0xdd, 0xf7, 0xe7, 0x53, 0xcf, 0xb9, + 0x98, 0x7a, 0xce, 0xaf, 0xa9, 0xe7, 0x9c, 0x5d, 0x79, 0xa5, 0x8b, 0x2b, 0xaf, 0xf4, 0xe3, 0xca, + 0x2b, 0x7d, 0x3a, 0x0c, 0xb9, 0x8a, 0x26, 0x23, 0xbd, 0x33, 0x62, 0xff, 0xa7, 0xcc, 0xd7, 0x33, + 0x19, 0x9c, 0x12, 0x7f, 0xcc, 0x59, 0xa2, 0x48, 0x98, 0xa5, 0x3e, 0xf1, 0x63, 0x25, 0x59, 0x96, + 0x73, 0x9f, 0x8d, 0x2a, 0x70, 0x45, 0x0e, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x63, 0x5f, 0x19, + 0xcc, 0xda, 0x04, 0x00, 0x00, } func (m *Block) Marshal() (dAtA []byte, err error) { @@ -754,7 +755,7 @@ func (m *Block) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.LastCommit == nil { - m.LastCommit = &v1.Commit{} + m.LastCommit = &v2.Commit{} } if err := m.LastCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/client/grpc/cmtservice/util.go b/client/grpc/cmtservice/util.go index 6b18e3fdb6..b3b729e506 100644 --- a/client/grpc/cmtservice/util.go +++ b/client/grpc/cmtservice/util.go @@ -1,7 +1,7 @@ package cmtservice import ( - cmtprototypes "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtprototypes "github.com/cometbft/cometbft/api/cometbft/types/v2" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/client/grpc/cmtservice/validator.go b/client/grpc/cmtservice/validator.go index 5b81d2bc4c..08de91245d 100644 --- a/client/grpc/cmtservice/validator.go +++ b/client/grpc/cmtservice/validator.go @@ -3,7 +3,7 @@ package cmtservice import ( "context" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" "github.com/cosmos/cosmos-sdk/client" ) diff --git a/client/grpc_query.go b/client/grpc_query.go index 532139175f..ab02e6e30c 100644 --- a/client/grpc_query.go +++ b/client/grpc_query.go @@ -6,7 +6,7 @@ import ( "reflect" "strconv" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" gogogrpc "github.com/cosmos/gogoproto/grpc" "google.golang.org/grpc" "google.golang.org/grpc/encoding" diff --git a/client/grpc_query_test.go b/client/grpc_query_test.go index 196a9f5381..e392099ef6 100644 --- a/client/grpc_query_test.go +++ b/client/grpc_query_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtjson "github.com/cometbft/cometbft/libs/json" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmtjson "github.com/cometbft/cometbft/v2/libs/json" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/suite" "google.golang.org/grpc" diff --git a/client/query.go b/client/query.go index 03fd17c94c..5327d8f16e 100644 --- a/client/query.go +++ b/client/query.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/cockroachdb/errors" - abci "github.com/cometbft/cometbft/abci/types" - rpcclient "github.com/cometbft/cometbft/rpc/client" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclient "github.com/cometbft/cometbft/v2/rpc/client" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/client/query_test.go b/client/query_test.go index 1433f1ec4d..bf74e9d035 100644 --- a/client/query_test.go +++ b/client/query_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/client" diff --git a/client/rpc/block.go b/client/rpc/block.go index 8f5d443070..465dbcc080 100644 --- a/client/rpc/block.go +++ b/client/rpc/block.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - cmt "github.com/cometbft/cometbft/api/cometbft/types/v1" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + cmt "github.com/cometbft/cometbft/api/cometbft/types/v2" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/client/rpc/rpc_test.go b/client/rpc/rpc_test.go index eb193794fa..80fd379887 100644 --- a/client/rpc/rpc_test.go +++ b/client/rpc/rpc_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "google.golang.org/grpc" diff --git a/client/rpc/tx.go b/client/rpc/tx.go index 0e97d1a9af..b611103eee 100644 --- a/client/rpc/tx.go +++ b/client/rpc/tx.go @@ -9,9 +9,9 @@ import ( "strings" "time" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - coretypes "github.com/cometbft/cometbft/rpc/core/types" - tmtypes "github.com/cometbft/cometbft/types" + rpchttp "github.com/cometbft/cometbft/v2/rpc/client/http" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" + tmtypes "github.com/cometbft/cometbft/v2/types" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" diff --git a/client/test_helpers.go b/client/test_helpers.go index edea981e9b..cea9ccee02 100644 --- a/client/test_helpers.go +++ b/client/test_helpers.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/cometbft/cometbft/libs/bytes" - rpcclient "github.com/cometbft/cometbft/rpc/client" - "github.com/cometbft/cometbft/rpc/client/mock" - coretypes "github.com/cometbft/cometbft/rpc/core/types" - cmttypes "github.com/cometbft/cometbft/types" + "github.com/cometbft/cometbft/v2/libs/bytes" + rpcclient "github.com/cometbft/cometbft/v2/rpc/client" + "github.com/cometbft/cometbft/v2/rpc/client/mock" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" + cmttypes "github.com/cometbft/cometbft/v2/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/client/utils.go b/client/utils.go index aed2991fbe..08a11f54cf 100644 --- a/client/utils.go +++ b/client/utils.go @@ -3,7 +3,7 @@ package client import ( "encoding/base64" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" + rpchttp "github.com/cometbft/cometbft/v2/rpc/client/http" "github.com/spf13/pflag" errorsmod "cosmossdk.io/errors" diff --git a/client/v2/go.mod b/client/v2/go.mod index 98295128ea..89aecdf403 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -45,9 +45,9 @@ require ( github.com/cockroachdb/pebble v1.1.5 // indirect github.com/cockroachdb/redact v1.1.6 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb // indirect - github.com/cometbft/cometbft v1.0.1 // indirect github.com/cometbft/cometbft-db v1.0.4 // indirect github.com/cometbft/cometbft/api v1.0.0 // indirect + github.com/cometbft/cometbft/v2 v2.0.0-main // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.1.3 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect @@ -59,26 +59,26 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.5.1 // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/emicklei/dot v1.8.0 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/btree v1.1.3 // indirect - github.com/google/flatbuffers v25.1.24+incompatible // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/uuid v1.6.0 // indirect @@ -96,6 +96,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/yamux v0.1.2 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect + github.com/holiman/uint256 v1.3.2 // indirect github.com/huandu/skiplist v1.2.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect @@ -107,6 +108,7 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/linxGnu/grocksdb v1.10.1 // indirect + github.com/lmittmann/tint v1.0.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -134,7 +136,7 @@ require ( github.com/spf13/cast v1.9.2 // indirect github.com/spf13/viper v1.20.1 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/supranational/blst v0.3.13 // indirect + github.com/supranational/blst v0.3.14 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect @@ -142,7 +144,10 @@ require ( github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.4.0 // indirect - go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect go.uber.org/mock v0.5.2 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.17.0 // indirect @@ -170,3 +175,7 @@ replace ( cosmossdk.io/x/tx => ../../x/tx github.com/cosmos/cosmos-sdk => ../.. ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/client/v2/go.sum b/client/v2/go.sum index f581b62a65..34e8e43c22 100644 --- a/client/v2/go.sum +++ b/client/v2/go.sum @@ -26,8 +26,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -124,12 +124,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -171,8 +171,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.5.1 h1:7DCIXrQjo1LKmM96YD+hLVJ2EEsyyoWxJfpdd56HLps= -github.com/dgraph-io/badger/v4 v4.5.1/go.mod h1:qn3Be0j3TfV4kPbVoK0arXCD1/nr1ftth6sbL5jxdoA= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -201,6 +201,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -232,13 +234,10 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -277,9 +276,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= @@ -309,14 +305,13 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v25.1.24+incompatible h1:4wPqL3K7GzBd1CwyhSd3usxLKOaJN/AC6puCca6Jm7o= -github.com/google/flatbuffers v25.1.24+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -397,6 +392,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -462,6 +459,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= @@ -690,8 +689,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= -github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo= +github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= @@ -722,8 +721,6 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= @@ -785,8 +782,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -809,7 +804,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -921,8 +915,6 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= -golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -963,7 +955,6 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= diff --git a/client/v2/internal/testpbgogo/msg.proto b/client/v2/internal/testpbgogo/msg.proto index e11c5660b1..65f978f0bd 100644 --- a/client/v2/internal/testpbgogo/msg.proto +++ b/client/v2/internal/testpbgogo/msg.proto @@ -17,10 +17,10 @@ service MsgGogoOnly { message MsgRequestGogoOnly { option (cosmos.msg.v1.signer) = "an_address"; - string str = 3; - cosmos.base.v1beta1.Coin a_coin = 18 [(gogoproto.nullable) = false]; - string an_address = 19 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - string a_validator_address = 33 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"]; + string str = 3; + cosmos.base.v1beta1.Coin a_coin = 18 [(gogoproto.nullable) = false]; + string an_address = 19 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string a_validator_address = 33 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"]; } message MsgResponseGoGoOnly { diff --git a/client/v2/internal/testpbpulsar/msg.proto b/client/v2/internal/testpbpulsar/msg.proto index 230d196da2..ce1f35a12a 100644 --- a/client/v2/internal/testpbpulsar/msg.proto +++ b/client/v2/internal/testpbpulsar/msg.proto @@ -31,17 +31,17 @@ message MsgRequest { int32 i32 = 7; int64 i64 = 10; bool a_bool = 15; - testpbpulsar.Enum an_enum = 16; - testpbpulsar.AMessage a_message = 17; + testpbpulsar.Enum an_enum = 16; + testpbpulsar.AMessage a_message = 17; cosmos.base.v1beta1.Coin a_coin = 18; string an_address = 19 [(cosmos_proto.scalar) = "cosmos.AddressString"]; cosmos.base.query.v1beta1.PageRequest page = 20; repeated bool bools = 21; repeated uint32 uints = 22; repeated string strings = 23; - repeated testpbpulsar.Enum enums = 24; + repeated testpbpulsar.Enum enums = 24; repeated google.protobuf.Duration durations = 25; - repeated testpbpulsar.AMessage some_messages = 26; + repeated testpbpulsar.AMessage some_messages = 26; int32 positional1 = 27; string positional2 = 28; diff --git a/codec/amino.go b/codec/amino.go index ea5ab67abf..a920febf87 100644 --- a/codec/amino.go +++ b/codec/amino.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - cmttypes "github.com/cometbft/cometbft/types" + cmttypes "github.com/cometbft/cometbft/v2/types" amino "github.com/tendermint/go-amino" "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/crypto/armor.go b/crypto/armor.go index f3333c5552..56feef1485 100644 --- a/crypto/armor.go +++ b/crypto/armor.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "golang.org/x/crypto/argon2" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/openpgp/armor" //nolint:staticcheck //TODO: remove this dependency diff --git a/crypto/armor_test.go b/crypto/armor_test.go index 1b98f5add8..d51030a57e 100644 --- a/crypto/armor_test.go +++ b/crypto/armor_test.go @@ -7,7 +7,7 @@ import ( "io" "testing" - cmtcrypto "github.com/cometbft/cometbft/crypto" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/crypto/codec/cmt.go b/crypto/codec/cmt.go index a1d2bff13a..3060370e21 100644 --- a/crypto/codec/cmt.go +++ b/crypto/codec/cmt.go @@ -2,8 +2,8 @@ package codec import ( cmtprotocrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" - cmtcrypto "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/encoding" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" + "github.com/cometbft/cometbft/v2/crypto/encoding" "cosmossdk.io/errors" diff --git a/crypto/hd/fundraiser_test.go b/crypto/hd/fundraiser_test.go index 37cb1eff16..c660230108 100644 --- a/crypto/hd/fundraiser_test.go +++ b/crypto/hd/fundraiser_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "github.com/cosmos/go-bip39" "github.com/stretchr/testify/require" diff --git a/crypto/keyring/keyring_test.go b/crypto/keyring/keyring_test.go index 85f0fbf671..0bacf6b823 100644 --- a/crypto/keyring/keyring_test.go +++ b/crypto/keyring/keyring_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/99designs/keyring" - cmtcrypto "github.com/cometbft/cometbft/crypto" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" "github.com/stretchr/testify/require" "golang.org/x/crypto/bcrypt" diff --git a/crypto/keys/ed25519/doc.go b/crypto/keys/ed25519/doc.go index 7e731ec3f5..e538a66003 100644 --- a/crypto/keys/ed25519/doc.go +++ b/crypto/keys/ed25519/doc.go @@ -4,7 +4,7 @@ package ed25519 This package contains a wrapper around crypto/ed22519 to make it comply with the crypto interfaces. This package employs zip215 rules. We use https://github.com/hdevalence/ed25519consensus verification function. Ths is done in order to keep compatibility with Tendermints ed25519 implementation. - - https://github.com/cometbft/cometbft/blob/master/crypto/ed25519/ed25519.go#L155 + - https://github.com/cometbft/cometbft/v2/blob/master/crypto/ed25519/ed25519.go#L155 This package works with correctly generated signatures. To read more about what this means see https://hdevalence.ca/blog/2020-10-04-its-25519am diff --git a/crypto/keys/ed25519/ed25519.go b/crypto/keys/ed25519/ed25519.go index 7f1aaa6417..6004c4bb36 100644 --- a/crypto/keys/ed25519/ed25519.go +++ b/crypto/keys/ed25519/ed25519.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/cometbft/cometbft/v2/crypto" + "github.com/cometbft/cometbft/v2/crypto/tmhash" "github.com/hdevalence/ed25519consensus" errorsmod "cosmossdk.io/errors" diff --git a/crypto/keys/ed25519/ed25519_test.go b/crypto/keys/ed25519/ed25519_test.go index 70956aa48c..2fbee6289c 100644 --- a/crypto/keys/ed25519/ed25519_test.go +++ b/crypto/keys/ed25519/ed25519_test.go @@ -5,8 +5,8 @@ import ( "encoding/base64" "testing" - "github.com/cometbft/cometbft/crypto" - tmed25519 "github.com/cometbft/cometbft/crypto/ed25519" + "github.com/cometbft/cometbft/v2/crypto" + tmed25519 "github.com/cometbft/cometbft/v2/crypto/ed25519" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/crypto/keys/internal/ecdsa/privkey_internal_test.go b/crypto/keys/internal/ecdsa/privkey_internal_test.go index 4dced3c989..5106b42600 100644 --- a/crypto/keys/internal/ecdsa/privkey_internal_test.go +++ b/crypto/keys/internal/ecdsa/privkey_internal_test.go @@ -7,7 +7,7 @@ import ( "math/big" "testing" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "github.com/stretchr/testify/suite" ) diff --git a/crypto/keys/internal/ecdsa/pubkey.go b/crypto/keys/internal/ecdsa/pubkey.go index 1141baebec..3067703276 100644 --- a/crypto/keys/internal/ecdsa/pubkey.go +++ b/crypto/keys/internal/ecdsa/pubkey.go @@ -7,7 +7,7 @@ import ( "fmt" "math/big" - cmtcrypto "github.com/cometbft/cometbft/crypto" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" errorsmod "cosmossdk.io/errors" diff --git a/crypto/keys/multisig/multisig.go b/crypto/keys/multisig/multisig.go index dbe8688140..005711edaa 100644 --- a/crypto/keys/multisig/multisig.go +++ b/crypto/keys/multisig/multisig.go @@ -3,7 +3,7 @@ package multisig import ( fmt "fmt" - cmtcrypto "github.com/cometbft/cometbft/crypto" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" diff --git a/crypto/keys/secp256k1/secp256k1.go b/crypto/keys/secp256k1/secp256k1.go index f520bde4d6..77efd61a48 100644 --- a/crypto/keys/secp256k1/secp256k1.go +++ b/crypto/keys/secp256k1/secp256k1.go @@ -8,7 +8,7 @@ import ( "io" "math/big" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4" "golang.org/x/crypto/ripemd160" //nolint // using just for backwards compat diff --git a/crypto/keys/secp256k1/secp256k1_cgo.go b/crypto/keys/secp256k1/secp256k1_cgo.go index 093a4de8ec..ac69c41637 100644 --- a/crypto/keys/secp256k1/secp256k1_cgo.go +++ b/crypto/keys/secp256k1/secp256k1_cgo.go @@ -4,7 +4,7 @@ package secp256k1 import ( - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1/internal/secp256k1" ) diff --git a/crypto/keys/secp256k1/secp256k1_nocgo.go b/crypto/keys/secp256k1/secp256k1_nocgo.go index bad10212b6..e9b435e1be 100644 --- a/crypto/keys/secp256k1/secp256k1_nocgo.go +++ b/crypto/keys/secp256k1/secp256k1_nocgo.go @@ -6,7 +6,7 @@ package secp256k1 import ( "errors" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" secp256k1 "github.com/decred/dcrd/dcrec/secp256k1/v4" "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" ) diff --git a/crypto/keys/secp256k1/secp256k1_test.go b/crypto/keys/secp256k1/secp256k1_test.go index da5b293072..9420f3b7fe 100644 --- a/crypto/keys/secp256k1/secp256k1_test.go +++ b/crypto/keys/secp256k1/secp256k1_test.go @@ -7,8 +7,8 @@ import ( "math/big" "testing" - "github.com/cometbft/cometbft/crypto" - tmsecp256k1 "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cometbft/cometbft/v2/crypto" + tmsecp256k1 "github.com/cometbft/cometbft/v2/crypto/secp256k1" "github.com/cosmos/btcutil/base58" secp "github.com/decred/dcrd/dcrec/secp256k1/v4" btcecdsa "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" diff --git a/crypto/keys/secp256r1/privkey_internal_test.go b/crypto/keys/secp256r1/privkey_internal_test.go index 52ea3239da..615b5661f2 100644 --- a/crypto/keys/secp256r1/privkey_internal_test.go +++ b/crypto/keys/secp256r1/privkey_internal_test.go @@ -3,7 +3,7 @@ package secp256r1 import ( "testing" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/crypto/keys/secp256r1/pubkey.go b/crypto/keys/secp256r1/pubkey.go index 50dc2278ef..bc8bb5dfb5 100644 --- a/crypto/keys/secp256r1/pubkey.go +++ b/crypto/keys/secp256r1/pubkey.go @@ -3,7 +3,7 @@ package secp256r1 import ( "encoding/base64" - cmtcrypto "github.com/cometbft/cometbft/crypto" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" "github.com/cosmos/gogoproto/proto" ecdsa "github.com/cosmos/cosmos-sdk/crypto/keys/internal/ecdsa" diff --git a/crypto/ledger/ledger_mock.go b/crypto/ledger/ledger_mock.go index b67b53b053..ac273c958e 100644 --- a/crypto/ledger/ledger_mock.go +++ b/crypto/ledger/ledger_mock.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "github.com/cosmos/go-bip39" secp "github.com/decred/dcrd/dcrec/secp256k1/v4" "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" diff --git a/crypto/types/types.go b/crypto/types/types.go index 12fc6e3954..d5980bc2be 100644 --- a/crypto/types/types.go +++ b/crypto/types/types.go @@ -1,7 +1,7 @@ package types import ( - cmtcrypto "github.com/cometbft/cometbft/crypto" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" proto "github.com/cosmos/gogoproto/proto" ) diff --git a/go.mod b/go.mod index 18076aeaa4..29b5955ceb 100644 --- a/go.mod +++ b/go.mod @@ -18,8 +18,8 @@ require ( github.com/chzyer/readline v1.5.1 github.com/cockroachdb/apd/v2 v2.0.2 github.com/cockroachdb/errors v1.12.0 - github.com/cometbft/cometbft v1.0.1 github.com/cometbft/cometbft/api v1.0.0 + github.com/cometbft/cometbft/v2 v2.0.0-main github.com/cosmos/btcutil v1.0.5 github.com/cosmos/cosmos-db v1.1.3 github.com/cosmos/cosmos-proto v1.0.0-beta.5 @@ -105,20 +105,19 @@ require ( github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.5.1 // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/emicklei/dot v1.8.0 // indirect github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect github.com/go-jose/go-jose/v4 v4.0.5 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect @@ -128,7 +127,7 @@ require ( github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/btree v1.1.3 // indirect - github.com/google/flatbuffers v25.1.24+incompatible // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.8 // indirect github.com/google/uuid v1.6.0 // indirect @@ -143,6 +142,7 @@ require ( github.com/hashicorp/go-version v1.7.0 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/yamux v0.1.2 // indirect + github.com/holiman/uint256 v1.3.2 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect @@ -153,6 +153,7 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/linxGnu/grocksdb v1.10.1 // indirect + github.com/lmittmann/tint v1.0.7 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/minio/highwayhash v1.0.3 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -178,7 +179,7 @@ require ( github.com/spf13/afero v1.12.0 // indirect github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/supranational/blst v0.3.13 // indirect + github.com/supranational/blst v0.3.14 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tidwall/btree v1.7.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect @@ -205,7 +206,7 @@ require ( golang.org/x/sys v0.33.0 // indirect golang.org/x/term v0.32.0 // indirect golang.org/x/text v0.25.0 // indirect - golang.org/x/time v0.8.0 // indirect + golang.org/x/time v0.9.0 // indirect google.golang.org/api v0.215.0 // indirect google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect @@ -256,3 +257,7 @@ retract ( // do not use v0.43.0 ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/go.sum b/go.sum index b7e4d4c8f3..edfe0350b2 100644 --- a/go.sum +++ b/go.sum @@ -779,12 +779,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -828,8 +828,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.5.1 h1:7DCIXrQjo1LKmM96YD+hLVJ2EEsyyoWxJfpdd56HLps= -github.com/dgraph-io/badger/v4 v4.5.1/go.mod h1:qn3Be0j3TfV4kPbVoK0arXCD1/nr1ftth6sbL5jxdoA= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= @@ -875,6 +875,8 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+ github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8= github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -919,15 +921,11 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -953,8 +951,9 @@ github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= +github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -1021,8 +1020,8 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/flatbuffers v25.1.24+incompatible h1:4wPqL3K7GzBd1CwyhSd3usxLKOaJN/AC6puCca6Jm7o= -github.com/google/flatbuffers v25.1.24+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -1173,6 +1172,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -1256,6 +1257,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o= @@ -1514,8 +1517,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= -github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo= +github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= @@ -1981,8 +1984,8 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= -golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= +golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/math/unsafe/rand.go b/math/unsafe/rand.go index 66d48ae4dc..f4faa1f6ab 100644 --- a/math/unsafe/rand.go +++ b/math/unsafe/rand.go @@ -136,7 +136,7 @@ func (r *Rand) Bytes(n int) []byte { // NOTE: This relies on the os's random number generator. // For real security, we should salt that with some seed. -// See github.com/cometbft/cometbft/crypto for a more secure reader. +// See github.com/cometbft/cometbft/v2/crypto for a more secure reader. func cRandBytes(numBytes int) []byte { b := make([]byte, numBytes) _, err := crand.Read(b) diff --git a/proto/cometbft/abci/v1/service.proto b/proto/cometbft/abci/v2/service.proto similarity index 96% rename from proto/cometbft/abci/v1/service.proto rename to proto/cometbft/abci/v2/service.proto index 535dbc8358..956d922462 100644 --- a/proto/cometbft/abci/v1/service.proto +++ b/proto/cometbft/abci/v2/service.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package cometbft.abci.v1; +package cometbft.abci.v2; -import "cometbft/abci/v1/types.proto"; +import "cometbft/abci/v2/types.proto"; -option go_package = "github.com/cometbft/cometbft/api/cometbft/abci/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/abci/v2"; // ABCIService is a service for an ABCI application. service ABCIService { diff --git a/proto/cometbft/abci/v1/types.proto b/proto/cometbft/abci/v2/types.proto similarity index 92% rename from proto/cometbft/abci/v1/types.proto rename to proto/cometbft/abci/v2/types.proto index 537581fe19..cfeb808df1 100644 --- a/proto/cometbft/abci/v1/types.proto +++ b/proto/cometbft/abci/v2/types.proto @@ -1,13 +1,14 @@ syntax = "proto3"; -package cometbft.abci.v1; +package cometbft.abci.v2; import "cometbft/crypto/v1/proof.proto"; -import "cometbft/types/v1/params.proto"; -import "cometbft/types/v1/validator.proto"; +import "cometbft/types/v2/params.proto"; +import "cometbft/types/v2/validator.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; +import "google/protobuf/duration.proto"; -option go_package = "github.com/cometbft/cometbft/api/cometbft/abci/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/abci/v2"; // ---------------------------------------- // Request types @@ -56,7 +57,7 @@ message InfoRequest { message InitChainRequest { google.protobuf.Timestamp time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 2; - cometbft.types.v1.ConsensusParams consensus_params = 3; + cometbft.types.v2.ConsensusParams consensus_params = 3; repeated ValidatorUpdate validators = 4 [(gogoproto.nullable) = false]; bytes app_state_bytes = 5; int64 initial_height = 6; @@ -169,13 +170,18 @@ message ExtendVoteRequest { // VerifyVoteExtensionRequest is a request for the application to verify a vote extension // produced by a different validator. +// The request contains two vote extension fields: one that is replay-protected ('vote_extension') +// and one that is not ('non_rp_vote_extension'). message VerifyVoteExtensionRequest { // the hash of the block that this received vote corresponds to bytes hash = 1; // the validator that signed the vote extension bytes validator_address = 2; int64 height = 3; - bytes vote_extension = 4; + // replay-protected vote extension + bytes vote_extension = 4; + // non-replay-protected vote extension + bytes non_rp_vote_extension = 5; } // FinalizeBlockRequest is a request to finalize the block. @@ -244,12 +250,15 @@ message InfoResponse { int64 last_block_height = 4; bytes last_block_app_hash = 5; + + map lane_priorities = 6; + string default_lane = 7; } // InitChainResponse contains the ABCI application's hash and updates to the // validator set and/or the consensus params, if any. message InitChainResponse { - cometbft.types.v1.ConsensusParams consensus_params = 1; + cometbft.types.v2.ConsensusParams consensus_params = 1; repeated ValidatorUpdate validators = 2 [(gogoproto.nullable) = false]; bytes app_hash = 3; } @@ -286,6 +295,8 @@ message CheckTxResponse { // removed). reserved 9 to 11; reserved "sender", "priority", "mempool_error"; + + string lane_id = 12; } // CommitResponse indicates how much blocks should CometBFT retain. @@ -378,8 +389,11 @@ enum ProcessProposalStatus { // ExtendVoteResponse contains the vote extension that the application would like to // attach to its next precommit vote. +// Information in `vote_extension` will be replay-protected. +// Information in `non_rp_extension` will not be replay-protected. message ExtendVoteResponse { - bytes vote_extension = 1; + bytes vote_extension = 1; // this extension's signature is replay-protected + bytes non_rp_extension = 2; // this extension's signature is _not_ replay-protected } // VerifyVoteExtensionResponse indicates the ABCI application's decision @@ -416,11 +430,14 @@ message FinalizeBlockResponse { // a list of updates to the validator set. These will reflect the validator set at current height + 2. repeated ValidatorUpdate validator_updates = 3 [(gogoproto.nullable) = false]; // updates to the consensus params, if any. - cometbft.types.v1.ConsensusParams consensus_param_updates = 4; + cometbft.types.v2.ConsensusParams consensus_param_updates = 4; // app_hash is the hash of the applications' state which is used to confirm // that execution of the transactions was deterministic. // It is up to the application to decide which algorithm to use. bytes app_hash = 5; + // delay between the time when this block is committed and the next height is started. + // previously `timeout_commit` in config.toml + google.protobuf.Duration next_block_delay = 6 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; } // ---------------------------------------- @@ -507,7 +524,7 @@ message ValidatorUpdate { // VoteInfo contains the information about the vote. message VoteInfo { Validator validator = 1 [(gogoproto.nullable) = false]; - cometbft.types.v1.BlockIDFlag block_id_flag = 3; + cometbft.types.v2.BlockIDFlag block_id_flag = 3; reserved 2; // signed_last_block } @@ -521,7 +538,11 @@ message ExtendedVoteInfo { // Vote extension signature created by CometBFT bytes extension_signature = 4; // block_id_flag indicates whether the validator voted for a block, nil, or did not vote at all - cometbft.types.v1.BlockIDFlag block_id_flag = 5; + cometbft.types.v2.BlockIDFlag block_id_flag = 5; + // Non-deterministic non-replay-protected extension provided by the sending validator's application. + bytes non_rp_vote_extension = 6; + // Signature on non-replay-protected extension created by CometBFT + bytes non_rp_extension_signature = 7; reserved 2; // signed_last_block } diff --git a/proto/cometbft/types/v1/block.proto b/proto/cometbft/types/v2/block.proto similarity index 78% rename from proto/cometbft/types/v1/block.proto rename to proto/cometbft/types/v2/block.proto index 6748263fd0..5f8f470ede 100644 --- a/proto/cometbft/types/v1/block.proto +++ b/proto/cometbft/types/v2/block.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package cometbft.types.v1; +package cometbft.types.v2; -option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v2"; -import "cometbft/types/v1/types.proto"; -import "cometbft/types/v1/evidence.proto"; +import "cometbft/types/v2/types.proto"; +import "cometbft/types/v2/evidence.proto"; import "gogoproto/gogo.proto"; // Block defines the structure of a block in the CometBFT blockchain. diff --git a/proto/cometbft/types/v1/canonical.proto b/proto/cometbft/types/v2/canonical.proto similarity index 96% rename from proto/cometbft/types/v1/canonical.proto rename to proto/cometbft/types/v2/canonical.proto index 20ff75a227..7af214be68 100644 --- a/proto/cometbft/types/v1/canonical.proto +++ b/proto/cometbft/types/v2/canonical.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package cometbft.types.v1; +package cometbft.types.v2; -option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v2"; import "gogoproto/gogo.proto"; -import "cometbft/types/v1/types.proto"; +import "cometbft/types/v2/types.proto"; import "google/protobuf/timestamp.proto"; // CanonicalBlockID is a canonical representation of a BlockID, which gets diff --git a/proto/cometbft/types/v1/events.proto b/proto/cometbft/types/v2/events.proto similarity index 86% rename from proto/cometbft/types/v1/events.proto rename to proto/cometbft/types/v2/events.proto index 21e265664b..b496677884 100644 --- a/proto/cometbft/types/v1/events.proto +++ b/proto/cometbft/types/v2/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package cometbft.types.v1; +package cometbft.types.v2; -option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v2"; // EventDataRoundState is emitted with each new round step. message EventDataRoundState { diff --git a/proto/cometbft/types/v1/evidence.proto b/proto/cometbft/types/v2/evidence.proto similarity index 92% rename from proto/cometbft/types/v1/evidence.proto rename to proto/cometbft/types/v2/evidence.proto index a77cea8d8f..8350b92a76 100644 --- a/proto/cometbft/types/v1/evidence.proto +++ b/proto/cometbft/types/v2/evidence.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package cometbft.types.v1; +package cometbft.types.v2; -option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v2"; -import "cometbft/types/v1/types.proto"; -import "cometbft/types/v1/validator.proto"; +import "cometbft/types/v2/types.proto"; +import "cometbft/types/v2/validator.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/cometbft/types/v1/params.proto b/proto/cometbft/types/v2/params.proto similarity index 99% rename from proto/cometbft/types/v1/params.proto rename to proto/cometbft/types/v2/params.proto index 3bf19aa0f2..a9e94e6201 100644 --- a/proto/cometbft/types/v1/params.proto +++ b/proto/cometbft/types/v2/params.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package cometbft.types.v1; +package cometbft.types.v2; -option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v2"; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; diff --git a/proto/cometbft/types/v1/types.proto b/proto/cometbft/types/v2/types.proto similarity index 86% rename from proto/cometbft/types/v1/types.proto rename to proto/cometbft/types/v2/types.proto index a236d4c75e..0112046a39 100644 --- a/proto/cometbft/types/v1/types.proto +++ b/proto/cometbft/types/v2/types.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package cometbft.types.v1; +package cometbft.types.v2; -option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v2"; import "cometbft/crypto/v1/proof.proto"; -import "cometbft/types/v1/validator.proto"; +import "cometbft/types/v2/validator.proto"; import "cometbft/version/v1/types.proto"; import "gogoproto/gogo.proto"; @@ -81,6 +81,8 @@ message Data { // Vote represents a prevote or precommit vote from validators for // consensus. +// For precommit messages, the message contains vote extensions (replay-protected and non-replay-protected) +// and their signatures. message Vote { SignedMsgType type = 1; int64 height = 2; @@ -99,6 +101,13 @@ message Vote { // consensus for the associated block. // Only valid for precommit messages. bytes extension_signature = 10; + // Non-Replay-Protected (NRP) vote extension provided by the application. + // Only valid for precommit messages. + bytes non_rp_extension = 11; + // Non-Replay-Protected (NRP) vote extension signature by the validator if + // they participated in consensus for the associated block. + // Only valid for precommit messages. + bytes non_rp_extension_signature = 12; } // Commit contains the evidence that a block was committed by a set of validators. @@ -126,7 +135,10 @@ message ExtendedCommit { } // ExtendedCommitSig retains all the same fields as CommitSig but adds vote -// extension-related fields. We use two signatures to ensure backwards compatibility. +// extension-related fields, where: +// 'extension' and 'extension_signature' are used for replay-protected vote extensions. +// 'non_rp_extension' and 'non_rp_extension_signature' are used for non-replay-protected vote extensions. +// We use two signatures to ensure backwards compatibility. // That is the digest of the original signature is still the same in prior versions message ExtendedCommitSig { BlockIDFlag block_id_flag = 1; @@ -137,6 +149,10 @@ message ExtendedCommitSig { bytes extension = 5; // Vote extension signature bytes extension_signature = 6; + // Non-Replay-Protected vote extension data + bytes non_rp_extension = 7; + // Non-Replay-Protected vote extension signature + bytes non_rp_extension_signature = 8; } // Block proposal. diff --git a/proto/cometbft/types/v1/validator.proto b/proto/cometbft/types/v2/validator.proto similarity index 97% rename from proto/cometbft/types/v1/validator.proto rename to proto/cometbft/types/v2/validator.proto index a5503e2d2d..11f866a1b1 100644 --- a/proto/cometbft/types/v1/validator.proto +++ b/proto/cometbft/types/v2/validator.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package cometbft.types.v1; +package cometbft.types.v2; -option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v1"; +option go_package = "github.com/cometbft/cometbft/api/cometbft/types/v2"; import "cometbft/crypto/v1/keys.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/cosmos/base/abci/v1beta1/abci.proto b/proto/cosmos/base/abci/v1beta1/abci.proto index 63a09e7309..7438d5e00d 100644 --- a/proto/cosmos/base/abci/v1beta1/abci.proto +++ b/proto/cosmos/base/abci/v1beta1/abci.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package cosmos.base.abci.v1beta1; import "gogoproto/gogo.proto"; -import "cometbft/abci/v1/types.proto"; -import "cometbft/types/v1/block.proto"; +import "cometbft/abci/v2/types.proto"; +import "cometbft/types/v2/block.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; @@ -45,7 +45,7 @@ message TxResponse { // these events include those emitted by processing all the messages and those // emitted from the ante. Whereas Logs contains the events, with // additional metadata, emitted only by processing the messages. - repeated cometbft.abci.v1.Event events = 13 + repeated cometbft.abci.v2.Event events = 13 [(gogoproto.nullable) = false, (cosmos_proto.field_added_in) = "cosmos-sdk 0.45"]; } @@ -101,7 +101,7 @@ message Result { // Events contains a slice of Event objects that were emitted during message // or handler execution. - repeated cometbft.abci.v1.Event events = 3 [(gogoproto.nullable) = false]; + repeated cometbft.abci.v2.Event events = 3 [(gogoproto.nullable) = false]; // msg_responses contains the Msg handler responses type packed in Anys. repeated google.protobuf.Any msg_responses = 4 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.46"]; @@ -169,5 +169,5 @@ message SearchBlocksResult { // Max count blocks per page int64 limit = 5; // List of blocks in current page - repeated cometbft.types.v1.Block blocks = 6; + repeated cometbft.types.v2.Block blocks = 6; } diff --git a/proto/cosmos/base/tendermint/v1beta1/query.proto b/proto/cosmos/base/tendermint/v1beta1/query.proto index 50db7c6913..aada561f3b 100644 --- a/proto/cosmos/base/tendermint/v1beta1/query.proto +++ b/proto/cosmos/base/tendermint/v1beta1/query.proto @@ -5,11 +5,11 @@ import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/api/annotations.proto"; import "cometbft/p2p/v1/types.proto"; -import "cometbft/types/v1/types.proto"; +import "cometbft/types/v2/types.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/base/tendermint/v1beta1/types.proto"; import "cosmos_proto/cosmos.proto"; -import "cometbft/types/v1/block.proto"; +import "cometbft/types/v2/block.proto"; import "amino/amino.proto"; option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"; @@ -99,10 +99,10 @@ message GetBlockByHeightRequest { // GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. message GetBlockByHeightResponse { - cometbft.types.v1.BlockID block_id = 1; + cometbft.types.v2.BlockID block_id = 1; // Deprecated: please use `sdk_block` instead - cometbft.types.v1.Block block = 2; + cometbft.types.v2.Block block = 2; Block sdk_block = 3 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; } @@ -112,10 +112,10 @@ message GetLatestBlockRequest {} // GetLatestBlockResponse is the response type for the Query/GetLatestBlock RPC method. message GetLatestBlockResponse { - cometbft.types.v1.BlockID block_id = 1; + cometbft.types.v2.BlockID block_id = 1; // Deprecated: please use `sdk_block` instead - cometbft.types.v1.Block block = 2; + cometbft.types.v2.Block block = 2; Block sdk_block = 3 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.47"]; } diff --git a/proto/cosmos/base/tendermint/v1beta1/types.proto b/proto/cosmos/base/tendermint/v1beta1/types.proto index 2fc3ba6ad2..c984c1b2be 100644 --- a/proto/cosmos/base/tendermint/v1beta1/types.proto +++ b/proto/cosmos/base/tendermint/v1beta1/types.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package cosmos.base.tendermint.v1beta1; import "gogoproto/gogo.proto"; -import "cometbft/types/v1/types.proto"; -import "cometbft/types/v1/evidence.proto"; +import "cometbft/types/v2/types.proto"; +import "cometbft/types/v2/evidence.proto"; import "cometbft/version/v1/types.proto"; import "google/protobuf/timestamp.proto"; import "amino/amino.proto"; @@ -14,9 +14,9 @@ option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"; // field converted to bech32 string. message Block { Header header = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - cometbft.types.v1.Data data = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - cometbft.types.v1.EvidenceList evidence = 3 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - cometbft.types.v1.Commit last_commit = 4; + cometbft.types.v2.Data data = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + cometbft.types.v2.EvidenceList evidence = 3 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + cometbft.types.v2.Commit last_commit = 4; } // Header defines the structure of a Tendermint block header. @@ -29,7 +29,7 @@ message Header { [(gogoproto.nullable) = false, (amino.dont_omitempty) = true, (gogoproto.stdtime) = true]; // prev block info - cometbft.types.v1.BlockID last_block_id = 5 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + cometbft.types.v2.BlockID last_block_id = 5 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; // hashes of block data bytes last_commit_hash = 6; // commit from validators from the last block diff --git a/proto/cosmos/consensus/v1/query.proto b/proto/cosmos/consensus/v1/query.proto index db1a8d3c29..e1e0401eae 100644 --- a/proto/cosmos/consensus/v1/query.proto +++ b/proto/cosmos/consensus/v1/query.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package cosmos.consensus.v1; import "google/api/annotations.proto"; -import "cometbft/types/v1/params.proto"; +import "cometbft/types/v2/params.proto"; import "cosmos_proto/cosmos.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/consensus/types"; @@ -24,5 +24,5 @@ message QueryParamsResponse { // params are the tendermint consensus params stored in the consensus module. // Please note that `params.version` is not populated in this response, it is // tracked separately in the x/upgrade module. - cometbft.types.v1.ConsensusParams params = 1; + cometbft.types.v2.ConsensusParams params = 1; } diff --git a/proto/cosmos/consensus/v1/tx.proto b/proto/cosmos/consensus/v1/tx.proto index 2199052771..4379a130de 100644 --- a/proto/cosmos/consensus/v1/tx.proto +++ b/proto/cosmos/consensus/v1/tx.proto @@ -4,7 +4,7 @@ package cosmos.consensus.v1; import "amino/amino.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/msg/v1/msg.proto"; -import "cometbft/types/v1/params.proto"; +import "cometbft/types/v2/params.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/consensus/types"; @@ -32,14 +32,14 @@ message MsgUpdateParams { // separarately in x/upgrade. // // NOTE: All parameters must be supplied. - cometbft.types.v1.BlockParams block = 2; - cometbft.types.v1.EvidenceParams evidence = 3; - cometbft.types.v1.ValidatorParams validator = 4; + cometbft.types.v2.BlockParams block = 2; + cometbft.types.v2.EvidenceParams evidence = 3; + cometbft.types.v2.ValidatorParams validator = 4; - cometbft.types.v1.ABCIParams abci = 5 [deprecated = true, (cosmos_proto.field_added_in) = "cosmos-sdk 0.50"]; + cometbft.types.v2.ABCIParams abci = 5 [deprecated = true, (cosmos_proto.field_added_in) = "cosmos-sdk 0.50"]; - cometbft.types.v1.SynchronyParams synchrony = 6 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.54"]; - cometbft.types.v1.FeatureParams feature = 7 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.54"]; + cometbft.types.v2.SynchronyParams synchrony = 6 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.54"]; + cometbft.types.v2.FeatureParams feature = 7 [(cosmos_proto.field_added_in) = "cosmos-sdk 0.54"]; } // MsgUpdateParamsResponse defines the response structure for executing a diff --git a/proto/cosmos/staking/v1beta1/staking.proto b/proto/cosmos/staking/v1beta1/staking.proto index f7375d25e5..0625e3c9d5 100644 --- a/proto/cosmos/staking/v1beta1/staking.proto +++ b/proto/cosmos/staking/v1beta1/staking.proto @@ -9,8 +9,8 @@ import "google/protobuf/timestamp.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; import "amino/amino.proto"; -import "cometbft/types/v1/types.proto"; -import "cometbft/abci/v1/types.proto"; +import "cometbft/types/v2/types.proto"; +import "cometbft/abci/v2/types.proto"; option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; @@ -19,7 +19,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types"; // recent HistoricalInfo // (`n` is set by the staking module's `historical_entries` parameter). message HistoricalInfo { - cometbft.types.v1.Header header = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + cometbft.types.v2.Header header = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; repeated Validator valset = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } @@ -389,5 +389,5 @@ enum Infraction { // ValidatorUpdates defines an array of abci.ValidatorUpdate objects. // TODO: explore moving this to proto/cosmos/base to separate modules from tendermint dependence message ValidatorUpdates { - repeated cometbft.abci.v1.ValidatorUpdate updates = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + repeated cometbft.abci.v2.ValidatorUpdate updates = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } diff --git a/proto/cosmos/store/streaming/abci/grpc.proto b/proto/cosmos/store/streaming/abci/grpc.proto index 1a65158a94..0f62815209 100644 --- a/proto/cosmos/store/streaming/abci/grpc.proto +++ b/proto/cosmos/store/streaming/abci/grpc.proto @@ -2,15 +2,15 @@ syntax = "proto3"; package cosmos.store.streaming.abci; -import "cometbft/abci/v1/types.proto"; +import "cometbft/abci/v2/types.proto"; import "cosmos/store/v1beta1/listening.proto"; option go_package = "cosmossdk.io/store/streaming/abci"; // ListenEndBlockRequest is the request type for the ListenEndBlock RPC method message ListenFinalizeBlockRequest { - cometbft.abci.v1.FinalizeBlockRequest req = 1; - cometbft.abci.v1.FinalizeBlockResponse res = 2; + cometbft.abci.v2.FinalizeBlockRequest req = 1; + cometbft.abci.v2.FinalizeBlockResponse res = 2; } // ListenEndBlockResponse is the response type for the ListenEndBlock RPC method @@ -20,7 +20,7 @@ message ListenFinalizeBlockResponse {} message ListenCommitRequest { // explicitly pass in block height as ResponseCommit does not contain this info int64 block_height = 1; - cometbft.abci.v1.CommitResponse res = 2; + cometbft.abci.v2.CommitResponse res = 2; repeated cosmos.store.v1beta1.StoreKVPair change_set = 3; } diff --git a/proto/cosmos/store/v1beta1/listening.proto b/proto/cosmos/store/v1beta1/listening.proto index 04d5b234c8..4ff386ea00 100644 --- a/proto/cosmos/store/v1beta1/listening.proto +++ b/proto/cosmos/store/v1beta1/listening.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package cosmos.store.v1beta1; -import "cometbft/abci/v1/types.proto"; +import "cometbft/abci/v2/types.proto"; import "cosmos_proto/cosmos.proto"; option go_package = "cosmossdk.io/store/types"; @@ -20,9 +20,9 @@ message StoreKVPair { // BlockMetadata contains all the abci event data of a block // the file streamer dump them into files together with the state changes. message BlockMetadata { - cometbft.abci.v1.CommitResponse response_commit = 6; - cometbft.abci.v1.FinalizeBlockRequest request_finalize_block = 7; - cometbft.abci.v1.FinalizeBlockResponse response_finalize_block = 8; // TODO: should we renumber this? + cometbft.abci.v2.CommitResponse response_commit = 6; + cometbft.abci.v2.FinalizeBlockRequest request_finalize_block = 7; + cometbft.abci.v2.FinalizeBlockResponse response_finalize_block = 8; // TODO: should we renumber this? reserved 1, 2, 3, 4, 5; // reserved for from previous use in comet <= 0.37 } diff --git a/proto/cosmos/tx/v1beta1/service.proto b/proto/cosmos/tx/v1beta1/service.proto index b60a3b6338..260b378f8a 100644 --- a/proto/cosmos/tx/v1beta1/service.proto +++ b/proto/cosmos/tx/v1beta1/service.proto @@ -5,8 +5,8 @@ import "google/api/annotations.proto"; import "cosmos/base/abci/v1beta1/abci.proto"; import "cosmos/tx/v1beta1/tx.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "cometbft/types/v1/block.proto"; -import "cometbft/types/v1/types.proto"; +import "cometbft/types/v2/block.proto"; +import "cometbft/types/v2/types.proto"; import "cosmos_proto/cosmos.proto"; option go_package = "github.com/cosmos/cosmos-sdk/types/tx"; @@ -207,8 +207,8 @@ message GetBlockWithTxsResponse { option (cosmos_proto.message_added_in) = "cosmos-sdk 0.45.2"; // txs are the transactions in the block. repeated cosmos.tx.v1beta1.Tx txs = 1; - cometbft.types.v1.BlockID block_id = 2; - cometbft.types.v1.Block block = 3; + cometbft.types.v2.BlockID block_id = 2; + cometbft.types.v2.Block block = 3; // pagination defines a pagination for the response. cosmos.base.query.v1beta1.PageResponse pagination = 4; } diff --git a/runtime/app.go b/runtime/app.go index cdc0cc1479..1f3ea9b7fa 100644 --- a/runtime/app.go +++ b/runtime/app.go @@ -5,7 +5,7 @@ import ( "fmt" "slices" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1" appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1" diff --git a/runtime/types.go b/runtime/types.go index add474356e..9e39c774e5 100644 --- a/runtime/types.go +++ b/runtime/types.go @@ -1,7 +1,7 @@ package runtime import ( - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server/types" diff --git a/server/api/server.go b/server/api/server.go index 9c5ced32fb..5b6b962bb8 100644 --- a/server/api/server.go +++ b/server/api/server.go @@ -9,7 +9,7 @@ import ( "sync" "time" - cmtrpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" + cmtrpcserver "github.com/cometbft/cometbft/v2/rpc/jsonrpc/server" gateway "github.com/cosmos/gogogateway" "github.com/golang/protobuf/proto" //nolint:staticcheck // grpc-gateway uses deprecated golang/protobuf "github.com/gorilla/handlers" diff --git a/server/cmd/execute.go b/server/cmd/execute.go index fb69303252..c950337b34 100644 --- a/server/cmd/execute.go +++ b/server/cmd/execute.go @@ -3,7 +3,7 @@ package cmd import ( "context" - cmtcli "github.com/cometbft/cometbft/libs/cli" + cmtcli "github.com/cometbft/cometbft/v2/libs/cli" "github.com/rs/zerolog" "github.com/spf13/cobra" diff --git a/server/cmt_abci.go b/server/cmt_abci.go index 865523233d..0ca2e53f18 100644 --- a/server/cmt_abci.go +++ b/server/cmt_abci.go @@ -3,7 +3,7 @@ package server import ( "context" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" ) diff --git a/server/cmt_cmds.go b/server/cmt_cmds.go index e023a6aca1..93e3df76d6 100644 --- a/server/cmt_cmds.go +++ b/server/cmt_cmds.go @@ -7,12 +7,12 @@ import ( "strconv" "strings" - cmtcfg "github.com/cometbft/cometbft/config" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/node" - "github.com/cometbft/cometbft/p2p" - pvm "github.com/cometbft/cometbft/privval" - cmtversion "github.com/cometbft/cometbft/version" + cmtcfg "github.com/cometbft/cometbft/v2/config" + cmtjson "github.com/cometbft/cometbft/v2/libs/json" + "github.com/cometbft/cometbft/v2/node" + "github.com/cometbft/cometbft/v2/p2p" + pvm "github.com/cometbft/cometbft/v2/privval" + cmtversion "github.com/cometbft/cometbft/v2/version" "github.com/spf13/cobra" "sigs.k8s.io/yaml" diff --git a/server/export_test.go b/server/export_test.go index ce24a2db23..137cdcda11 100644 --- a/server/export_test.go +++ b/server/export_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmtcfg "github.com/cometbft/cometbft/config" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmtcfg "github.com/cometbft/cometbft/v2/config" + cmttypes "github.com/cometbft/cometbft/v2/types" dbm "github.com/cosmos/cosmos-db" "github.com/rs/zerolog" "github.com/spf13/viper" diff --git a/server/log/cmt_logger.go b/server/log/cmt_logger.go index 832e9d5213..6125caabaf 100644 --- a/server/log/cmt_logger.go +++ b/server/log/cmt_logger.go @@ -1,7 +1,7 @@ package server import ( - cmtlog "github.com/cometbft/cometbft/libs/log" + cmtlog "github.com/cometbft/cometbft/v2/libs/log" "cosmossdk.io/log" ) diff --git a/server/mock/app.go b/server/mock/app.go index 576018e331..e14d16bb90 100644 --- a/server/mock/app.go +++ b/server/mock/app.go @@ -7,7 +7,7 @@ import ( "fmt" "path/filepath" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" db "github.com/cosmos/cosmos-db" "google.golang.org/grpc" "google.golang.org/protobuf/proto" diff --git a/server/mock/app_test.go b/server/mock/app_test.go index bad428eb8b..346601efb4 100644 --- a/server/mock/app_test.go +++ b/server/mock/app_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "cosmossdk.io/log" diff --git a/server/rollback.go b/server/rollback.go index ccd7e32139..d4fc18808c 100644 --- a/server/rollback.go +++ b/server/rollback.go @@ -3,7 +3,7 @@ package server import ( "fmt" - cmtcmd "github.com/cometbft/cometbft/cmd/cometbft/commands" + cmtcmd "github.com/cometbft/cometbft/v2/cmd/cometbft/commands" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/server/start.go b/server/start.go index 25eff78ee0..0f46708498 100644 --- a/server/start.go +++ b/server/start.go @@ -14,21 +14,21 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/abci/server" - cmtstate "github.com/cometbft/cometbft/api/cometbft/state/v1" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmtcmd "github.com/cometbft/cometbft/cmd/cometbft/commands" - cmtcfg "github.com/cometbft/cometbft/config" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/node" - "github.com/cometbft/cometbft/p2p" - pvm "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - "github.com/cometbft/cometbft/rpc/client/local" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - cmttypes "github.com/cometbft/cometbft/types" + cmtstate "github.com/cometbft/cometbft/api/cometbft/state/v2" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + "github.com/cometbft/cometbft/v2/abci/server" + cmtcmd "github.com/cometbft/cometbft/v2/cmd/cometbft/commands" + cmtcfg "github.com/cometbft/cometbft/v2/config" + cmtjson "github.com/cometbft/cometbft/v2/libs/json" + "github.com/cometbft/cometbft/v2/node" + "github.com/cometbft/cometbft/v2/p2p" + pvm "github.com/cometbft/cometbft/v2/privval" + "github.com/cometbft/cometbft/v2/proxy" + rpchttp "github.com/cometbft/cometbft/v2/rpc/client/http" + "github.com/cometbft/cometbft/v2/rpc/client/local" + sm "github.com/cometbft/cometbft/v2/state" + "github.com/cometbft/cometbft/v2/store" + cmttypes "github.com/cometbft/cometbft/v2/types" dbm "github.com/cosmos/cosmos-db" "github.com/hashicorp/go-metrics" "github.com/spf13/cobra" @@ -906,7 +906,7 @@ func testnetify(ctx *Context, testnetAppCreator types.AppCreator, db dbm.DB, tra Signature: []byte{}, } - // Sign the vote, and copy the proto changes from the act of signing to the vote itself + // Sign the vote and copy the proto changes from the act of signing to the vote itself voteProto := vote.ToProto() err = privValidator.SignVote(newChainID, voteProto, false) if err != nil { @@ -933,7 +933,7 @@ func testnetify(ctx *Context, testnetAppCreator types.AppCreator, db dbm.DB, tra return nil, err } - // Create ValidatorSet struct containing just our valdiator. + // Create ValidatorSet struct containing just our validator. newVal := &cmttypes.Validator{ Address: validatorAddress, PubKey: userPubKey, diff --git a/server/types/abci.go b/server/types/abci.go index 12945df5e9..33ea82b15e 100644 --- a/server/types/abci.go +++ b/server/types/abci.go @@ -3,7 +3,7 @@ package types import ( "context" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" ) // ABCI is an interface that enables any finite, deterministic state machine diff --git a/server/types/app.go b/server/types/app.go index 864b593216..c00eacea01 100644 --- a/server/types/app.go +++ b/server/types/app.go @@ -4,8 +4,8 @@ import ( "encoding/json" "io" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttypes "github.com/cometbft/cometbft/v2/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/grpc" "github.com/spf13/cobra" diff --git a/server/util.go b/server/util.go index 1622af08a7..8bab2ce7e1 100644 --- a/server/util.go +++ b/server/util.go @@ -12,10 +12,9 @@ import ( "path/filepath" "strings" "syscall" - "time" - cmtcmd "github.com/cometbft/cometbft/cmd/cometbft/commands" - cmtcfg "github.com/cometbft/cometbft/config" + cmtcmd "github.com/cometbft/cometbft/v2/cmd/cometbft/commands" + cmtcfg "github.com/cometbft/cometbft/v2/config" dbm "github.com/cosmos/cosmos-db" "github.com/rs/zerolog" "github.com/spf13/cast" @@ -263,11 +262,6 @@ func interceptConfigs(rootViper *viper.Viper, customAppTemplate string, customCo } defaultCometCfg := cmtcfg.DefaultConfig() - // The SDK is opinionated about those comet values, so we set them here. - // We verify first that the user has not changed them for not overriding them. - if conf.Consensus.TimeoutCommit == defaultCometCfg.Consensus.TimeoutCommit { - conf.Consensus.TimeoutCommit = 5 * time.Second - } if conf.RPC.PprofListenAddress == defaultCometCfg.RPC.PprofListenAddress { conf.RPC.PprofListenAddress = "localhost:6060" } diff --git a/server/util_test.go b/server/util_test.go index a5f22758df..11bcb3814b 100644 --- a/server/util_test.go +++ b/server/util_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - cmtcfg "github.com/cometbft/cometbft/config" + cmtcfg "github.com/cometbft/cometbft/v2/config" db "github.com/cosmos/cosmos-db" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/simapp/abci.go b/simapp/abci.go index a6c982b239..5b0d874add 100644 --- a/simapp/abci.go +++ b/simapp/abci.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/simapp/app.go b/simapp/app.go index b8231b827b..3b3eb0e26a 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -8,7 +8,7 @@ import ( "io" "maps" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" "github.com/spf13/cast" diff --git a/simapp/app_test.go b/simapp/app_test.go index 09112c0a7d..0c2379c507 100644 --- a/simapp/app_test.go +++ b/simapp/app_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" diff --git a/simapp/export.go b/simapp/export.go index 70f4556312..b69ade6e6c 100644 --- a/simapp/export.go +++ b/simapp/export.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" storetypes "cosmossdk.io/store/types" diff --git a/simapp/genesis_account_test.go b/simapp/genesis_account_test.go index eccb8cc66c..8dd9d9b324 100644 --- a/simapp/genesis_account_test.go +++ b/simapp/genesis_account_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "github.com/stretchr/testify/require" "cosmossdk.io/simapp" diff --git a/simapp/go.mod b/simapp/go.mod index f9578e64d5..adcdc26440 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -4,17 +4,14 @@ go 1.23.5 require ( cosmossdk.io/api v0.9.2 - cosmossdk.io/client/v2 v2.0.0-beta.9 cosmossdk.io/collections v1.2.1 // indirect cosmossdk.io/core v1.0.0 cosmossdk.io/depinject v1.2.1 cosmossdk.io/log v1.6.0 cosmossdk.io/math v1.5.3 - cosmossdk.io/store v1.1.2 - cosmossdk.io/tools/confix v0.1.2 cosmossdk.io/x/tx v0.14.0 - github.com/cometbft/cometbft v1.0.1 github.com/cometbft/cometbft/api v1.0.0 + github.com/cometbft/cometbft/v2 v2.0.0-main github.com/cosmos/cosmos-db v1.1.3 // this version is not used as it is always replaced by the latest Cosmos SDK version github.com/cosmos/cosmos-sdk v0.53.0 @@ -28,6 +25,12 @@ require ( google.golang.org/protobuf v1.36.6 ) +require ( + cosmossdk.io/client/v2 v2.0.0-00010101000000-000000000000 + cosmossdk.io/store v1.1.2 + cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000 +) + require ( cel.dev/expr v0.24.0 // indirect cloud.google.com/go v0.121.2 // indirect @@ -80,31 +83,29 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.5.1 // indirect - github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect + github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.8.0 // indirect github.com/emicklei/dot v1.8.0 // indirect github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect github.com/go-jose/go-jose/v4 v4.0.5 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/btree v1.1.3 // indirect - github.com/google/flatbuffers v25.1.24+incompatible // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.9 // indirect @@ -129,6 +130,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/yamux v0.1.2 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect + github.com/holiman/uint256 v1.3.2 // indirect github.com/huandu/skiplist v1.2.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect @@ -141,6 +143,7 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/linxGnu/grocksdb v1.10.1 // indirect + github.com/lmittmann/tint v1.0.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -181,7 +184,6 @@ require ( github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.4.0 // indirect - go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect @@ -244,3 +246,7 @@ replace ( // replace broken goleveldb github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/simapp/go.sum b/simapp/go.sum index bd568316ea..8ea2196867 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -780,12 +780,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -835,13 +835,13 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.5.1 h1:7DCIXrQjo1LKmM96YD+hLVJ2EEsyyoWxJfpdd56HLps= -github.com/dgraph-io/badger/v4 v4.5.1/go.mod h1:qn3Be0j3TfV4kPbVoK0arXCD1/nr1ftth6sbL5jxdoA= -github.com/dgraph-io/ristretto/v2 v2.2.0 h1:bkY3XzJcXoMuELV8F+vS8kzNgicwQFAaGINAEJdWGOM= -github.com/dgraph-io/ristretto/v2 v2.2.0/go.mod h1:RZrm63UmcBAaYWC1DotLYBmTvgkrs0+XhBd7Npn7/zI= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= +github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= +github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa512G+w+Pxci9hJPB8oMnkcP3iZF38= -github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -883,6 +883,8 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+ github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8= github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -926,15 +928,11 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -960,8 +958,9 @@ github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= +github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -984,8 +983,6 @@ github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -1027,8 +1024,8 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/flatbuffers v25.1.24+incompatible h1:4wPqL3K7GzBd1CwyhSd3usxLKOaJN/AC6puCca6Jm7o= -github.com/google/flatbuffers v25.1.24+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -1179,6 +1176,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -1262,6 +1261,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o= @@ -1568,7 +1569,6 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= diff --git a/simapp/sim_test.go b/simapp/sim_test.go index 007c06a78c..a4a4633a90 100644 --- a/simapp/sim_test.go +++ b/simapp/sim_test.go @@ -12,8 +12,8 @@ import ( "sync" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/simapp/simd/cmd/commands.go b/simapp/simd/cmd/commands.go index a38d398a1a..c07be74393 100644 --- a/simapp/simd/cmd/commands.go +++ b/simapp/simd/cmd/commands.go @@ -4,7 +4,7 @@ import ( "errors" "io" - cmtcfg "github.com/cometbft/cometbft/config" + cmtcfg "github.com/cometbft/cometbft/v2/config" dbm "github.com/cosmos/cosmos-db" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/simapp/simd/cmd/testnet.go b/simapp/simd/cmd/testnet.go index ba923d8a36..b1664d7357 100644 --- a/simapp/simd/cmd/testnet.go +++ b/simapp/simd/cmd/testnet.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" - cmtconfig "github.com/cometbft/cometbft/config" - cmttime "github.com/cometbft/cometbft/types/time" + cmtconfig "github.com/cometbft/cometbft/v2/config" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -51,8 +51,11 @@ var ( flagAPIAddress = "api.address" flagPrintMnemonic = "print-mnemonic" flagStakingDenom = "staking-denom" - flagCommitTimeout = "commit-timeout" - flagSingleHost = "single-host" + // flagCommitTimeout is a deprecated flag whose value will not be used. + // + // Deprecated: set NextBlockDelay on the app with baseapp.SetNextBlockDelay() + flagCommitTimeout = "commit-timeout" + flagSingleHost = "single-host" ) type initArgs struct { @@ -81,6 +84,7 @@ type startArgs struct { outputDir string printMnemonic bool rpcAddress string + // Deprecated: use baseapp.SetNextBlockDelay() instead. timeoutCommit time.Duration } @@ -156,7 +160,6 @@ Example: args.algo, _ = cmd.Flags().GetString(flags.FlagKeyType) args.bondTokenDenom, _ = cmd.Flags().GetString(flagStakingDenom) args.singleMachine, _ = cmd.Flags().GetBool(flagSingleHost) - config.Consensus.TimeoutCommit, err = cmd.Flags().GetDuration(flagCommitTimeout) if err != nil { return err } diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index 7089029f29..bdf2a76515 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -6,9 +6,9 @@ import ( "os" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmttypes "github.com/cometbft/cometbft/types" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmtjson "github.com/cometbft/cometbft/v2/libs/json" + cmttypes "github.com/cometbft/cometbft/v2/types" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" diff --git a/store/go.mod b/store/go.mod index d499586c2c..1913dde68a 100644 --- a/store/go.mod +++ b/store/go.mod @@ -6,8 +6,8 @@ require ( cosmossdk.io/errors v1.0.2 cosmossdk.io/log v1.6.0 cosmossdk.io/math v1.5.3 - github.com/cometbft/cometbft v1.0.1 github.com/cometbft/cometbft/api v1.0.0 + github.com/cometbft/cometbft/v2 v2.0.0-main github.com/cosmos/cosmos-db v1.1.3 github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/gogoproto v1.7.0 @@ -85,3 +85,7 @@ require ( // // ) replace github.com/cosmos/cosmos-db => github.com/cosmos/cosmos-db v0.0.0-20250505172547-38785e92904d + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/store/go.sum b/store/go.sum index cf469a5803..319fa5fd51 100644 --- a/store/go.sum +++ b/store/go.sum @@ -50,10 +50,10 @@ github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4 github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cosmos/cosmos-db v0.0.0-20250505172547-38785e92904d h1:ZYfTpw8TKV9ml5OLwVVXwqrclzm1jESoI+Sf34WXo0Y= github.com/cosmos/cosmos-db v0.0.0-20250505172547-38785e92904d/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw= diff --git a/store/internal/maps/maps.go b/store/internal/maps/maps.go index bd6f9b3c3b..8077c20dce 100644 --- a/store/internal/maps/maps.go +++ b/store/internal/maps/maps.go @@ -4,8 +4,8 @@ import ( "encoding/binary" cmtprotocrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/cometbft/cometbft/v2/crypto/merkle" + "github.com/cometbft/cometbft/v2/crypto/tmhash" "cosmossdk.io/store/internal/kv" "cosmossdk.io/store/internal/tree" diff --git a/store/prefix/store.go b/store/prefix/store.go index a7f789c43f..86e7635bad 100644 --- a/store/prefix/store.go +++ b/store/prefix/store.go @@ -81,7 +81,7 @@ func (s Store) Delete(key []byte) { } // Iterator implements KVStore -// Check https://github.com/cometbft/cometbft/blob/master/libs/db/prefix_db.go#L106 +// Check https://github.com/cometbft/cometbft/v2/blob/master/libs/db/prefix_db.go#L106 func (s Store) Iterator(start, end []byte) types.Iterator { newStart := cloneAppend(s.prefix, start) @@ -98,7 +98,7 @@ func (s Store) Iterator(start, end []byte) types.Iterator { } // ReverseIterator implements KVStore -// Check https://github.com/cometbft/cometbft/blob/master/libs/db/prefix_db.go#L129 +// Check https://github.com/cometbft/cometbft/v2/blob/master/libs/db/prefix_db.go#L129 func (s Store) ReverseIterator(start, end []byte) types.Iterator { newstart := cloneAppend(s.prefix, start) @@ -192,7 +192,7 @@ func (pi *prefixIterator) Error() error { return nil } -// stripPrefix is copied from github.com/cometbft/cometbft/libs/db/prefix_db.go +// stripPrefix is copied from github.com/cometbft/cometbft/v2/libs/db/prefix_db.go func stripPrefix(key, prefix []byte) []byte { if len(key) < len(prefix) || !bytes.Equal(key[:len(prefix)], prefix) { panic("should not happen") diff --git a/store/prefix/store_test.go b/store/prefix/store_test.go index 7388357704..0b806a97bf 100644 --- a/store/prefix/store_test.go +++ b/store/prefix/store_test.go @@ -238,7 +238,7 @@ func TestPrefixStoreReverseIteratorEdgeCase(t *testing.T) { iter.Close() } -// Tests below are ported from https://github.com/cometbft/cometbft/blob/master/libs/db/prefix_db_test.go +// Tests below are ported from https://github.com/cometbft/cometbft/v2/blob/master/libs/db/prefix_db_test.go func mockStoreWithStuff() types.KVStore { db := dbm.NewMemDB() diff --git a/store/rootmulti/proof.go b/store/rootmulti/proof.go index a1524adb6c..ba6c55524f 100644 --- a/store/rootmulti/proof.go +++ b/store/rootmulti/proof.go @@ -1,7 +1,7 @@ package rootmulti import ( - "github.com/cometbft/cometbft/crypto/merkle" + "github.com/cometbft/cometbft/v2/crypto/merkle" storetypes "cosmossdk.io/store/types" ) diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index 9ecf9f875f..3b2c9e7540 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -12,7 +12,7 @@ import ( "sync" "sync/atomic" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" dbm "github.com/cosmos/cosmos-db" protoio "github.com/cosmos/gogoproto/io" gogotypes "github.com/cosmos/gogoproto/types" diff --git a/store/snapshots/types/convert.go b/store/snapshots/types/convert.go index 52c966821c..4cb161394c 100644 --- a/store/snapshots/types/convert.go +++ b/store/snapshots/types/convert.go @@ -1,7 +1,7 @@ package types import ( - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" proto "github.com/cosmos/gogoproto/proto" "cosmossdk.io/errors" diff --git a/store/streaming/abci/examples/file/file.go b/store/streaming/abci/examples/file/file.go index a6473bca7e..427ab92916 100644 --- a/store/streaming/abci/examples/file/file.go +++ b/store/streaming/abci/examples/file/file.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/hashicorp/go-plugin" streamingabci "cosmossdk.io/store/streaming/abci" diff --git a/store/streaming/abci/examples/stdout/stdout.go b/store/streaming/abci/examples/stdout/stdout.go index d24e33a421..6a353d9c2c 100644 --- a/store/streaming/abci/examples/stdout/stdout.go +++ b/store/streaming/abci/examples/stdout/stdout.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/hashicorp/go-plugin" streamingabci "cosmossdk.io/store/streaming/abci" diff --git a/store/streaming/abci/grpc.go b/store/streaming/abci/grpc.go index a0c1add64e..9a281c672b 100644 --- a/store/streaming/abci/grpc.go +++ b/store/streaming/abci/grpc.go @@ -4,7 +4,7 @@ import ( "context" "os" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/hashicorp/go-plugin" storetypes "cosmossdk.io/store/types" diff --git a/store/streaming/abci/grpc.pb.go b/store/streaming/abci/grpc.pb.go index ab66a82f29..3d2c954cf7 100644 --- a/store/streaming/abci/grpc.pb.go +++ b/store/streaming/abci/grpc.pb.go @@ -7,7 +7,7 @@ import ( context "context" types "cosmossdk.io/store/types" fmt "fmt" - v1 "github.com/cometbft/cometbft/api/cometbft/abci/v1" + v2 "github.com/cometbft/cometbft/api/cometbft/abci/v2" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" @@ -31,8 +31,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // ListenEndBlockRequest is the request type for the ListenEndBlock RPC method type ListenFinalizeBlockRequest struct { - Req *v1.FinalizeBlockRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` - Res *v1.FinalizeBlockResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Req *v2.FinalizeBlockRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` + Res *v2.FinalizeBlockResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` } func (m *ListenFinalizeBlockRequest) Reset() { *m = ListenFinalizeBlockRequest{} } @@ -68,14 +68,14 @@ func (m *ListenFinalizeBlockRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListenFinalizeBlockRequest proto.InternalMessageInfo -func (m *ListenFinalizeBlockRequest) GetReq() *v1.FinalizeBlockRequest { +func (m *ListenFinalizeBlockRequest) GetReq() *v2.FinalizeBlockRequest { if m != nil { return m.Req } return nil } -func (m *ListenFinalizeBlockRequest) GetRes() *v1.FinalizeBlockResponse { +func (m *ListenFinalizeBlockRequest) GetRes() *v2.FinalizeBlockResponse { if m != nil { return m.Res } @@ -123,7 +123,7 @@ var xxx_messageInfo_ListenFinalizeBlockResponse proto.InternalMessageInfo type ListenCommitRequest struct { // explicitly pass in block height as ResponseCommit does not contain this info BlockHeight int64 `protobuf:"varint,1,opt,name=block_height,json=blockHeight,proto3" json:"block_height,omitempty"` - Res *v1.CommitResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Res *v2.CommitResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` ChangeSet []*types.StoreKVPair `protobuf:"bytes,3,rep,name=change_set,json=changeSet,proto3" json:"change_set,omitempty"` } @@ -167,7 +167,7 @@ func (m *ListenCommitRequest) GetBlockHeight() int64 { return 0 } -func (m *ListenCommitRequest) GetRes() *v1.CommitResponse { +func (m *ListenCommitRequest) GetRes() *v2.CommitResponse { if m != nil { return m.Res } @@ -231,32 +231,32 @@ func init() { var fileDescriptor_7b98083eb9315fb6 = []byte{ // 414 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4f, 0x8f, 0xd2, 0x40, - 0x18, 0xc6, 0x29, 0x4d, 0x4c, 0x1c, 0x38, 0x0d, 0xc6, 0x90, 0xa2, 0x0d, 0x34, 0x06, 0x39, 0x4d, - 0x6d, 0x3d, 0x88, 0xf1, 0xa2, 0x90, 0x18, 0x8d, 0x1e, 0x4c, 0x49, 0x3c, 0x78, 0x21, 0x6d, 0x7d, - 0x2d, 0x13, 0x68, 0xa7, 0xcc, 0x8c, 0x4d, 0xf4, 0x13, 0x78, 0x74, 0x0f, 0xfb, 0x35, 0xf6, 0x73, - 0xec, 0x91, 0xe3, 0x1e, 0x37, 0xf0, 0x45, 0x36, 0x9d, 0x59, 0x08, 0xcd, 0xb2, 0x7f, 0x38, 0xf6, - 0x9d, 0xe7, 0xf7, 0xbc, 0x4f, 0xe7, 0x7d, 0x07, 0xf5, 0x63, 0x26, 0x52, 0x26, 0x5c, 0x21, 0x19, - 0x07, 0x57, 0x48, 0x0e, 0x61, 0x4a, 0xb3, 0xc4, 0x0d, 0xa3, 0x98, 0xba, 0x09, 0xcf, 0x63, 0x92, - 0x73, 0x26, 0x19, 0xee, 0x68, 0x1d, 0x51, 0x3a, 0xb2, 0xd3, 0x91, 0x52, 0x67, 0x3d, 0x8b, 0x59, - 0x0a, 0x32, 0xfa, 0x25, 0x35, 0x56, 0x78, 0xae, 0xfc, 0x93, 0x83, 0xd0, 0xa8, 0xf5, 0xa2, 0xd2, - 0xa2, 0xf0, 0x22, 0x90, 0xa1, 0xe7, 0x2e, 0xa8, 0x90, 0x90, 0x95, 0x16, 0x4a, 0xe5, 0x9c, 0x18, - 0xc8, 0xfa, 0xaa, 0x6a, 0x1f, 0x69, 0x16, 0x2e, 0xe8, 0x5f, 0x18, 0x2d, 0x58, 0x3c, 0x0f, 0x60, - 0xf9, 0x1b, 0x84, 0xc4, 0x43, 0x64, 0x72, 0x58, 0xb6, 0x8d, 0xae, 0x31, 0x68, 0xf8, 0x7d, 0xb2, - 0x6d, 0xa8, 0xfa, 0x93, 0xc2, 0x23, 0x87, 0xa0, 0xa0, 0x44, 0xf0, 0xdb, 0x92, 0x14, 0xed, 0xba, - 0x22, 0x5f, 0xde, 0x4b, 0x8a, 0x9c, 0x65, 0x02, 0x4a, 0x54, 0x38, 0xcf, 0x51, 0xe7, 0x60, 0x24, - 0xad, 0x71, 0xce, 0x0c, 0xd4, 0xd2, 0xe7, 0x63, 0x96, 0xa6, 0x54, 0x6e, 0xb3, 0xf6, 0x50, 0x33, - 0x2a, 0x85, 0xd3, 0x19, 0xd0, 0x64, 0x26, 0x55, 0x68, 0x33, 0x68, 0xa8, 0xda, 0x27, 0x55, 0xc2, - 0xfe, 0x7e, 0xa8, 0xee, 0xcd, 0x50, 0x5b, 0xc3, 0xbd, 0x34, 0xf8, 0x3d, 0x42, 0xf1, 0x2c, 0xcc, - 0x12, 0x98, 0x0a, 0x90, 0x6d, 0xb3, 0x6b, 0x0e, 0x1a, 0x7e, 0x8f, 0x54, 0xe6, 0x72, 0x7d, 0xb9, - 0x64, 0x52, 0x7e, 0x7d, 0xf9, 0xfe, 0x2d, 0xa4, 0x3c, 0x78, 0xac, 0xa1, 0x09, 0x48, 0xe7, 0x29, - 0x7a, 0x52, 0xcd, 0xab, 0xed, 0xfd, 0xd3, 0x3a, 0x6a, 0x7d, 0x18, 0x8d, 0x3f, 0xeb, 0x43, 0xe0, - 0x13, 0xe0, 0x05, 0x8d, 0x01, 0xff, 0xdb, 0xfd, 0x60, 0xe5, 0x02, 0xf0, 0x1b, 0x72, 0xc7, 0x36, - 0x90, 0xdb, 0xa7, 0x68, 0x0d, 0x8f, 0x07, 0x75, 0x44, 0x2c, 0x50, 0x73, 0x3f, 0x3a, 0x7e, 0xf5, - 0x00, 0xa7, 0xca, 0x54, 0x2c, 0xef, 0x08, 0x42, 0x37, 0x1d, 0xbd, 0x3b, 0x5f, 0xdb, 0xc6, 0x6a, - 0x6d, 0x1b, 0x97, 0x6b, 0xdb, 0xf8, 0xbf, 0xb1, 0x6b, 0xab, 0x8d, 0x5d, 0xbb, 0xd8, 0xd8, 0xb5, - 0x1f, 0x3d, 0xed, 0x25, 0x7e, 0xce, 0x09, 0x65, 0x07, 0x1f, 0x4f, 0xf4, 0x48, 0xed, 0xf5, 0xeb, - 0xab, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb7, 0xf4, 0x63, 0xc3, 0x62, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcf, 0x6e, 0xda, 0x40, + 0x10, 0xc6, 0x31, 0x96, 0x2a, 0x75, 0xe1, 0xb4, 0x54, 0x15, 0x32, 0xad, 0x05, 0x56, 0x45, 0x39, + 0xad, 0x8b, 0x7b, 0x28, 0x55, 0x2f, 0x2d, 0x48, 0x55, 0xab, 0xf6, 0x50, 0x19, 0xa9, 0x87, 0x5e, + 0x90, 0xed, 0x4e, 0xcd, 0x0a, 0xec, 0x35, 0xbb, 0x5b, 0x4b, 0xc9, 0x13, 0xe4, 0x98, 0x1c, 0xf2, + 0x1a, 0x79, 0x8e, 0x1c, 0x39, 0xe6, 0x18, 0xc1, 0x8b, 0x44, 0xde, 0x0d, 0x08, 0x2b, 0xe4, 0x0f, + 0x47, 0xcf, 0x7e, 0xbf, 0x6f, 0x3e, 0xef, 0xcc, 0xa2, 0x6e, 0xc4, 0x44, 0xc2, 0x84, 0x2b, 0x24, + 0xe3, 0xe0, 0x0a, 0xc9, 0x21, 0x48, 0x68, 0x1a, 0xbb, 0x41, 0x18, 0x51, 0x37, 0xe6, 0x59, 0x44, + 0x32, 0xce, 0x24, 0xc3, 0x2d, 0xad, 0x23, 0x4a, 0x47, 0xb6, 0x3a, 0x52, 0xe8, 0xac, 0x57, 0x11, + 0x4b, 0x40, 0x86, 0xff, 0xa4, 0xc6, 0x72, 0xcf, 0x95, 0x47, 0x19, 0x08, 0x8d, 0x5a, 0x6f, 0x4a, + 0x2d, 0xf2, 0x7e, 0x08, 0x32, 0xe8, 0xbb, 0x73, 0x2a, 0x24, 0xa4, 0x85, 0x85, 0x52, 0x39, 0x67, + 0x06, 0xb2, 0x7e, 0xaa, 0xda, 0x57, 0x9a, 0x06, 0x73, 0x7a, 0x0c, 0xc3, 0x39, 0x8b, 0x66, 0x3e, + 0x2c, 0xfe, 0x83, 0x90, 0x78, 0x80, 0x4c, 0x0e, 0x8b, 0xa6, 0xd1, 0x36, 0x7a, 0x35, 0xaf, 0x4b, + 0x36, 0x0d, 0x55, 0x7f, 0x92, 0x7b, 0x64, 0x1f, 0xe4, 0x17, 0x08, 0xfe, 0x58, 0x90, 0xa2, 0x59, + 0x55, 0xe4, 0xdb, 0x47, 0x49, 0x91, 0xb1, 0x54, 0x40, 0x81, 0x0a, 0xe7, 0x35, 0x6a, 0xed, 0x8d, + 0xa4, 0x35, 0xce, 0x85, 0x81, 0x1a, 0xfa, 0x7c, 0xc4, 0x92, 0x84, 0xca, 0x4d, 0xd6, 0x0e, 0xaa, + 0x87, 0x85, 0x70, 0x32, 0x05, 0x1a, 0x4f, 0xa5, 0x0a, 0x6d, 0xfa, 0x35, 0x55, 0xfb, 0xa6, 0x4a, + 0xd8, 0xdb, 0x0d, 0xd5, 0xbe, 0x1b, 0x6a, 0x63, 0xb8, 0x93, 0x06, 0x7f, 0x46, 0x28, 0x9a, 0x06, + 0x69, 0x0c, 0x13, 0x01, 0xb2, 0x69, 0xb6, 0xcd, 0x5e, 0xcd, 0xeb, 0x90, 0xd2, 0x5c, 0x6e, 0x2f, + 0x97, 0x8c, 0x8b, 0xaf, 0x1f, 0xbf, 0x7f, 0x05, 0x94, 0xfb, 0xcf, 0x35, 0x34, 0x06, 0xe9, 0xbc, + 0x44, 0x2f, 0xca, 0x79, 0xb5, 0xbd, 0x77, 0x5e, 0x45, 0x8d, 0x2f, 0xc3, 0xd1, 0x77, 0x7d, 0x08, + 0x7c, 0x0c, 0x3c, 0xa7, 0x11, 0xe0, 0x93, 0xed, 0x0f, 0x96, 0x2e, 0x00, 0x7f, 0x20, 0x0f, 0x6c, + 0x03, 0xb9, 0x7f, 0x8a, 0xd6, 0xe0, 0x70, 0x50, 0x47, 0xc4, 0x02, 0xd5, 0x77, 0xa3, 0xe3, 0x77, + 0x4f, 0x70, 0x2a, 0x4d, 0xc5, 0xea, 0x1f, 0x40, 0xe8, 0xa6, 0xc3, 0x4f, 0x97, 0x2b, 0xdb, 0x58, + 0xae, 0x6c, 0xe3, 0x7a, 0x65, 0x1b, 0xa7, 0x6b, 0xbb, 0xb2, 0x5c, 0xdb, 0x95, 0xab, 0xb5, 0x5d, + 0xf9, 0xd3, 0xd1, 0x5e, 0xe2, 0xef, 0x8c, 0x50, 0xb6, 0xf7, 0xf1, 0x84, 0xcf, 0xd4, 0x5e, 0xbf, + 0xbf, 0x09, 0x00, 0x00, 0xff, 0xff, 0x58, 0x1c, 0x98, 0xef, 0x62, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -660,7 +660,7 @@ func (m *ListenFinalizeBlockRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Req == nil { - m.Req = &v1.FinalizeBlockRequest{} + m.Req = &v2.FinalizeBlockRequest{} } if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -696,7 +696,7 @@ func (m *ListenFinalizeBlockRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Res == nil { - m.Res = &v1.FinalizeBlockResponse{} + m.Res = &v2.FinalizeBlockResponse{} } if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -851,7 +851,7 @@ func (m *ListenCommitRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Res == nil { - m.Res = &v1.CommitResponse{} + m.Res = &v2.CommitResponse{} } if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/store/streaming/streaming_test.go b/store/streaming/streaming_test.go index dd8d4194de..dfef2b614f 100644 --- a/store/streaming/streaming_test.go +++ b/store/streaming/streaming_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - tmproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + tmproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/store/types/listening.pb.go b/store/types/listening.pb.go index 9773691292..836e171df2 100644 --- a/store/types/listening.pb.go +++ b/store/types/listening.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - v1 "github.com/cometbft/cometbft/api/cometbft/abci/v1" + v2 "github.com/cometbft/cometbft/api/cometbft/abci/v2" _ "github.com/cosmos/cosmos-proto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -98,9 +98,9 @@ func (m *StoreKVPair) GetValue() []byte { // BlockMetadata contains all the abci event data of a block // the file streamer dump them into files together with the state changes. type BlockMetadata struct { - ResponseCommit *v1.CommitResponse `protobuf:"bytes,6,opt,name=response_commit,json=responseCommit,proto3" json:"response_commit,omitempty"` - RequestFinalizeBlock *v1.FinalizeBlockRequest `protobuf:"bytes,7,opt,name=request_finalize_block,json=requestFinalizeBlock,proto3" json:"request_finalize_block,omitempty"` - ResponseFinalizeBlock *v1.FinalizeBlockResponse `protobuf:"bytes,8,opt,name=response_finalize_block,json=responseFinalizeBlock,proto3" json:"response_finalize_block,omitempty"` + ResponseCommit *v2.CommitResponse `protobuf:"bytes,6,opt,name=response_commit,json=responseCommit,proto3" json:"response_commit,omitempty"` + RequestFinalizeBlock *v2.FinalizeBlockRequest `protobuf:"bytes,7,opt,name=request_finalize_block,json=requestFinalizeBlock,proto3" json:"request_finalize_block,omitempty"` + ResponseFinalizeBlock *v2.FinalizeBlockResponse `protobuf:"bytes,8,opt,name=response_finalize_block,json=responseFinalizeBlock,proto3" json:"response_finalize_block,omitempty"` } func (m *BlockMetadata) Reset() { *m = BlockMetadata{} } @@ -136,21 +136,21 @@ func (m *BlockMetadata) XXX_DiscardUnknown() { var xxx_messageInfo_BlockMetadata proto.InternalMessageInfo -func (m *BlockMetadata) GetResponseCommit() *v1.CommitResponse { +func (m *BlockMetadata) GetResponseCommit() *v2.CommitResponse { if m != nil { return m.ResponseCommit } return nil } -func (m *BlockMetadata) GetRequestFinalizeBlock() *v1.FinalizeBlockRequest { +func (m *BlockMetadata) GetRequestFinalizeBlock() *v2.FinalizeBlockRequest { if m != nil { return m.RequestFinalizeBlock } return nil } -func (m *BlockMetadata) GetResponseFinalizeBlock() *v1.FinalizeBlockResponse { +func (m *BlockMetadata) GetResponseFinalizeBlock() *v2.FinalizeBlockResponse { if m != nil { return m.ResponseFinalizeBlock } @@ -170,30 +170,30 @@ var fileDescriptor_b6caeb9d7b7c7c10 = []byte{ // 416 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x6f, 0xd3, 0x30, 0x14, 0xc7, 0xeb, 0xd6, 0x2d, 0x9e, 0x07, 0x2c, 0x32, 0x65, 0x84, 0x81, 0xa2, 0x68, 0x42, 0xd0, - 0xcb, 0x1c, 0xba, 0x71, 0xe2, 0x38, 0x24, 0x24, 0x32, 0x21, 0xa1, 0x20, 0x71, 0x40, 0x48, 0x91, + 0xcb, 0x1c, 0xd6, 0x71, 0xe2, 0x38, 0x24, 0x24, 0x32, 0x21, 0xa1, 0x20, 0x71, 0x40, 0x48, 0x91, 0x93, 0xbe, 0x21, 0xab, 0x69, 0x5c, 0x62, 0x2f, 0x52, 0xb9, 0xf0, 0x15, 0xf8, 0x30, 0x48, 0x7c, 0x05, 0x8e, 0x13, 0x27, 0x8e, 0xa8, 0xfd, 0x22, 0x28, 0xb6, 0x8b, 0x34, 0x38, 0xec, 0x96, 0xff, 0x7b, 0xff, 0xff, 0xcf, 0xcf, 0xf1, 0xa3, 0x8f, 0x4a, 0xa5, 0x17, 0x4a, 0x27, 0xda, 0xa8, 0x06, - 0x92, 0x76, 0x5a, 0x80, 0x11, 0xd3, 0xa4, 0x92, 0xda, 0x40, 0x2d, 0xeb, 0x8f, 0x7c, 0xd9, 0x28, - 0xa3, 0xd8, 0xd8, 0xb9, 0xb8, 0x75, 0x71, 0xef, 0x3a, 0x78, 0x58, 0xaa, 0x05, 0x98, 0xe2, 0xdc, - 0x24, 0xa2, 0x28, 0x65, 0xd2, 0x4e, 0x13, 0xb3, 0x5a, 0x82, 0x76, 0x99, 0x83, 0xfb, 0x2e, 0x93, - 0x5b, 0x95, 0x78, 0x80, 0x15, 0x87, 0x5f, 0xe8, 0xee, 0xdb, 0x8e, 0x74, 0xf6, 0xee, 0x8d, 0x90, - 0x0d, 0x7b, 0x40, 0x77, 0x2c, 0x38, 0x9f, 0xc3, 0x2a, 0x44, 0x31, 0x9a, 0xec, 0x64, 0xc4, 0x16, - 0xce, 0x60, 0xc5, 0xf6, 0xe9, 0x68, 0x06, 0x15, 0x18, 0x08, 0xfb, 0x31, 0x9a, 0x90, 0xcc, 0x2b, - 0x16, 0xd0, 0x41, 0x67, 0x1f, 0xc4, 0x68, 0x72, 0x33, 0xeb, 0x3e, 0xd9, 0x98, 0x0e, 0x5b, 0x51, - 0x5d, 0x40, 0x88, 0x6d, 0xcd, 0x89, 0xe7, 0x77, 0x7e, 0x7e, 0x3b, 0xda, 0x73, 0xa7, 0x1f, 0xe9, - 0xd9, 0x3c, 0x7e, 0xca, 0x9f, 0x9d, 0x1c, 0x7e, 0xef, 0xd3, 0x5b, 0xa7, 0x95, 0x2a, 0xe7, 0xaf, - 0xc1, 0x88, 0x99, 0x30, 0x82, 0xbd, 0xa2, 0x7b, 0x0d, 0xe8, 0xa5, 0xaa, 0x35, 0xe4, 0xa5, 0x5a, - 0x2c, 0xa4, 0x09, 0x47, 0x31, 0x9a, 0xec, 0x1e, 0xc7, 0x7c, 0x7b, 0x4b, 0xde, 0xdd, 0x92, 0xb7, - 0x53, 0xfe, 0xc2, 0xf6, 0x33, 0x6f, 0xcf, 0x6e, 0x6f, 0x83, 0xae, 0xce, 0x3e, 0xd0, 0xfd, 0x06, - 0x3e, 0x5d, 0x80, 0x36, 0xf9, 0xb9, 0xac, 0x45, 0x25, 0x3f, 0x43, 0x5e, 0x74, 0x87, 0x85, 0x37, - 0x2c, 0xf1, 0xf1, 0xff, 0xc4, 0x97, 0xde, 0x67, 0x67, 0xca, 0x5c, 0x38, 0x1b, 0x7b, 0xca, 0x95, - 0x26, 0xcb, 0xe9, 0xbd, 0xbf, 0x83, 0xfe, 0x83, 0x27, 0x16, 0xff, 0xe4, 0x5a, 0xbc, 0x9f, 0xfb, - 0xee, 0x96, 0x73, 0xa5, 0x9d, 0x62, 0x82, 0x82, 0x7e, 0x8a, 0x49, 0x3f, 0x18, 0xa4, 0x98, 0x0c, - 0x02, 0x9c, 0x62, 0x82, 0x83, 0x61, 0x8a, 0xc9, 0x30, 0x18, 0x9d, 0x1e, 0xff, 0x58, 0x47, 0xe8, + 0x92, 0xf6, 0xb8, 0x00, 0x23, 0x8e, 0x93, 0x4a, 0x6a, 0x03, 0xb5, 0xac, 0x3f, 0xf2, 0x65, 0xa3, + 0x8c, 0x62, 0x63, 0xe7, 0xe2, 0xd6, 0xc5, 0xbd, 0xeb, 0xe0, 0x61, 0xa9, 0x16, 0x60, 0x8a, 0x73, + 0x93, 0x88, 0xa2, 0x94, 0x49, 0x3b, 0x4d, 0xcc, 0x6a, 0x09, 0xda, 0x65, 0x0e, 0xee, 0xbb, 0x4c, + 0x6e, 0x55, 0xe2, 0x01, 0x56, 0x1c, 0x7e, 0xa1, 0xbb, 0x6f, 0x3b, 0xd2, 0xd9, 0xbb, 0x37, 0x42, + 0x36, 0xec, 0x01, 0xdd, 0xb1, 0xe0, 0x7c, 0x0e, 0xab, 0x10, 0xc5, 0x68, 0xb2, 0x93, 0x11, 0x5b, + 0x38, 0x83, 0x15, 0xdb, 0xa7, 0xa3, 0x19, 0x54, 0x60, 0x20, 0xec, 0xc7, 0x68, 0x42, 0x32, 0xaf, + 0x58, 0x40, 0x07, 0x9d, 0x7d, 0x10, 0xa3, 0xc9, 0xcd, 0xac, 0xfb, 0x64, 0x63, 0x3a, 0x6c, 0x45, + 0x75, 0x01, 0x21, 0xb6, 0x35, 0x27, 0x9e, 0xdf, 0xf9, 0xf9, 0xed, 0x68, 0xcf, 0x9d, 0x7e, 0xa4, + 0x67, 0xf3, 0xf8, 0x29, 0x7f, 0x76, 0x72, 0xf8, 0xbd, 0x4f, 0x6f, 0x9d, 0x56, 0xaa, 0x9c, 0xbf, + 0x06, 0x23, 0x66, 0xc2, 0x08, 0xf6, 0x8a, 0xee, 0x35, 0xa0, 0x97, 0xaa, 0xd6, 0x90, 0x97, 0x6a, + 0xb1, 0x90, 0x26, 0x1c, 0xc5, 0x68, 0xb2, 0x3b, 0x8d, 0xf9, 0xf6, 0x96, 0xbc, 0xbb, 0x25, 0x6f, + 0xa7, 0xfc, 0x85, 0xed, 0x67, 0xde, 0x9e, 0xdd, 0xde, 0x06, 0x5d, 0x9d, 0x7d, 0xa0, 0xfb, 0x0d, + 0x7c, 0xba, 0x00, 0x6d, 0xf2, 0x73, 0x59, 0x8b, 0x4a, 0x7e, 0x86, 0xbc, 0xe8, 0x0e, 0x0b, 0x6f, + 0x58, 0xe2, 0xe3, 0xff, 0x89, 0x2f, 0xbd, 0xcf, 0xce, 0x94, 0xb9, 0x70, 0x36, 0xf6, 0x94, 0x2b, + 0x4d, 0x96, 0xd3, 0x7b, 0x7f, 0x07, 0xfd, 0x07, 0x4f, 0x2c, 0xfe, 0xc9, 0xb5, 0x78, 0x3f, 0xf7, + 0xdd, 0x2d, 0xe7, 0x4a, 0x3b, 0xc5, 0x04, 0x05, 0xfd, 0x14, 0x93, 0x7e, 0x30, 0x48, 0x31, 0x19, + 0x04, 0x38, 0xc5, 0x04, 0x07, 0xc3, 0x14, 0x93, 0x61, 0x30, 0x3a, 0x9d, 0xfe, 0x58, 0x47, 0xe8, 0x72, 0x1d, 0xa1, 0xdf, 0xeb, 0x08, 0x7d, 0xdd, 0x44, 0xbd, 0xcb, 0x4d, 0xd4, 0xfb, 0xb5, 0x89, 0x7a, 0xef, 0x43, 0xf7, 0x93, 0xf5, 0x6c, 0xce, 0xa5, 0xf2, 0xfb, 0x64, 0xf7, 0xa1, 0x18, 0xd9, - 0x57, 0x3f, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0x98, 0x9f, 0x12, 0x13, 0x6c, 0x02, 0x00, 0x00, + 0x57, 0x3f, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x7d, 0x73, 0x85, 0x6c, 0x02, 0x00, 0x00, } func (m *StoreKVPair) Marshal() (dAtA []byte, err error) { @@ -600,7 +600,7 @@ func (m *BlockMetadata) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ResponseCommit == nil { - m.ResponseCommit = &v1.CommitResponse{} + m.ResponseCommit = &v2.CommitResponse{} } if err := m.ResponseCommit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -636,7 +636,7 @@ func (m *BlockMetadata) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.RequestFinalizeBlock == nil { - m.RequestFinalizeBlock = &v1.FinalizeBlockRequest{} + m.RequestFinalizeBlock = &v2.FinalizeBlockRequest{} } if err := m.RequestFinalizeBlock.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -672,7 +672,7 @@ func (m *BlockMetadata) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ResponseFinalizeBlock == nil { - m.ResponseFinalizeBlock = &v1.FinalizeBlockResponse{} + m.ResponseFinalizeBlock = &v2.FinalizeBlockResponse{} } if err := m.ResponseFinalizeBlock.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/store/types/proof.go b/store/types/proof.go index d14f78ba0d..723af43b00 100644 --- a/store/types/proof.go +++ b/store/types/proof.go @@ -4,7 +4,7 @@ import ( "fmt" cmtprotocrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" - "github.com/cometbft/cometbft/crypto/merkle" + "github.com/cometbft/cometbft/v2/crypto/merkle" ics23 "github.com/cosmos/ics23/go" errorsmod "cosmossdk.io/errors" diff --git a/store/types/streaming.go b/store/types/streaming.go index 50554b418f..f7786151c8 100644 --- a/store/types/streaming.go +++ b/store/types/streaming.go @@ -3,7 +3,7 @@ package types import ( "context" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" ) // ABCIListener is the interface that we're exposing as a streaming service. diff --git a/systemtests/go.mod b/systemtests/go.mod index a361bf81db..15413826b6 100644 --- a/systemtests/go.mod +++ b/systemtests/go.mod @@ -4,7 +4,7 @@ go 1.23.5 require ( cosmossdk.io/math v1.5.3 - github.com/cometbft/cometbft v1.0.1 + github.com/cometbft/cometbft/v2 v2.0.0-main github.com/cosmos/cosmos-sdk v0.53.0 github.com/creachadair/tomledit v0.0.28 github.com/stretchr/testify v1.10.0 @@ -56,26 +56,26 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.5.1 // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/emicklei/dot v1.8.0 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/btree v1.1.3 // indirect - github.com/google/flatbuffers v25.1.24+incompatible // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/uuid v1.6.0 // indirect @@ -93,6 +93,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/yamux v0.1.2 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect + github.com/holiman/uint256 v1.3.2 // indirect github.com/huandu/skiplist v1.2.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect @@ -104,6 +105,7 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/linxGnu/grocksdb v1.10.1 // indirect + github.com/lmittmann/tint v1.0.7 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/minio/highwayhash v1.0.3 // indirect @@ -132,7 +134,7 @@ require ( github.com/spf13/pflag v1.0.6 // indirect github.com/spf13/viper v1.20.1 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/supranational/blst v0.3.13 // indirect + github.com/supranational/blst v0.3.14 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect @@ -142,7 +144,10 @@ require ( github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.4.0 // indirect - go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.17.0 // indirect golang.org/x/crypto v0.38.0 // indirect @@ -173,3 +178,7 @@ replace ( cosmossdk.io/store => ../store cosmossdk.io/x/tx => ../x/tx ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/systemtests/go.sum b/systemtests/go.sum index db8f06f1aa..1a918eedf0 100644 --- a/systemtests/go.sum +++ b/systemtests/go.sum @@ -28,8 +28,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -122,12 +122,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -171,8 +171,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.5.1 h1:7DCIXrQjo1LKmM96YD+hLVJ2EEsyyoWxJfpdd56HLps= -github.com/dgraph-io/badger/v4 v4.5.1/go.mod h1:qn3Be0j3TfV4kPbVoK0arXCD1/nr1ftth6sbL5jxdoA= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -201,6 +201,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -232,13 +234,10 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -277,9 +276,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= @@ -309,14 +305,13 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v25.1.24+incompatible h1:4wPqL3K7GzBd1CwyhSd3usxLKOaJN/AC6puCca6Jm7o= -github.com/google/flatbuffers v25.1.24+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -397,6 +392,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -462,6 +459,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= @@ -690,8 +689,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= -github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo= +github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= @@ -731,8 +730,6 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= @@ -794,8 +791,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -818,7 +813,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -929,8 +923,6 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= -golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -971,7 +963,6 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= diff --git a/systemtests/node_utils.go b/systemtests/node_utils.go index f503a0f390..a161e4c7b8 100644 --- a/systemtests/node_utils.go +++ b/systemtests/node_utils.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/cometbft/cometbft/privval" + "github.com/cometbft/cometbft/v2/privval" "github.com/stretchr/testify/require" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" diff --git a/systemtests/rpc_client.go b/systemtests/rpc_client.go index 5ff6a06a3b..617cd3c934 100644 --- a/systemtests/rpc_client.go +++ b/systemtests/rpc_client.go @@ -7,10 +7,10 @@ import ( "strconv" "testing" - abci "github.com/cometbft/cometbft/abci/types" - rpcclient "github.com/cometbft/cometbft/rpc/client" - client "github.com/cometbft/cometbft/rpc/client/http" - cmtypes "github.com/cometbft/cometbft/types" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclient "github.com/cometbft/cometbft/v2/rpc/client" + client "github.com/cometbft/cometbft/v2/rpc/client/http" + cmtypes "github.com/cometbft/cometbft/v2/types" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/systemtests/system.go b/systemtests/system.go index c5e45e607b..cd391cad80 100644 --- a/systemtests/system.go +++ b/systemtests/system.go @@ -18,10 +18,10 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/libs/sync" - client "github.com/cometbft/cometbft/rpc/client/http" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cometbft/cometbft/v2/libs/sync" + client "github.com/cometbft/cometbft/v2/rpc/client/http" + ctypes "github.com/cometbft/cometbft/v2/rpc/core/types" + tmtypes "github.com/cometbft/cometbft/v2/types" "github.com/stretchr/testify/require" "github.com/tidwall/sjson" diff --git a/systemtests/testnet_init.go b/systemtests/testnet_init.go index d64d26c433..d1e526fcde 100644 --- a/systemtests/testnet_init.go +++ b/systemtests/testnet_init.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/p2p" + "github.com/cometbft/cometbft/v2/p2p" "github.com/creachadair/tomledit" "github.com/creachadair/tomledit/parser" ) @@ -178,7 +178,7 @@ func (s ModifyConfigYamlInitializer) Initialize() { nodeAddresses := make([]string, s.initialNodesCount) for i := 0; i < s.initialNodesCount; i++ { nodeDir := filepath.Join(WorkDir, NodePath(i, s.outputDir, s.projectName), "config") - id := string(mustV(p2p.LoadNodeKey(filepath.Join(nodeDir, "node_key.json"))).ID()) + id := mustV(p2p.LoadNodeKey(filepath.Join(nodeDir, "node_key.json"))).ID() nodeAddresses[i] = fmt.Sprintf("%s@127.0.0.1:%d", id, DefaultP2PPort+i) } diff --git a/tests/e2e/auth/suite.go b/tests/e2e/auth/suite.go index e8d3054758..7cb65c1eb6 100644 --- a/tests/e2e/auth/suite.go +++ b/tests/e2e/auth/suite.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/tests/e2e/server/export_test.go b/tests/e2e/server/export_test.go index 7b681451e4..630f512576 100644 --- a/tests/e2e/server/export_test.go +++ b/tests/e2e/server/export_test.go @@ -13,7 +13,7 @@ import ( "path" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/spf13/cobra" "gotest.tools/v3/assert" diff --git a/tests/e2e/staking/suite.go b/tests/e2e/staking/suite.go index 119577416c..72fd8f0075 100644 --- a/tests/e2e/staking/suite.go +++ b/tests/e2e/staking/suite.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/cometbft/cometbft/rpc/client/http" + "github.com/cometbft/cometbft/v2/rpc/client/http" "github.com/stretchr/testify/suite" "cosmossdk.io/math" diff --git a/tests/go.mod b/tests/go.mod index 6804d0ae4b..d5bd295be1 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -12,8 +12,8 @@ require ( cosmossdk.io/simapp v0.0.0-20230620040119-e078f1a49e8b cosmossdk.io/store v1.1.2 cosmossdk.io/x/tx v0.14.0 - github.com/cometbft/cometbft v1.0.1 github.com/cometbft/cometbft/api v1.0.0 + github.com/cometbft/cometbft/v2 v2.0.0-main github.com/cosmos/cosmos-db v1.1.3 github.com/cosmos/cosmos-proto v1.0.0-beta.5 // this version is not used as it is always replaced by the latest Cosmos SDK version @@ -79,20 +79,19 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.7.0 // indirect - github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect + github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.8.0 // indirect github.com/emicklei/dot v1.8.0 // indirect github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect github.com/go-jose/go-jose/v4 v4.1.0 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect @@ -127,6 +126,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/yamux v0.1.2 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect + github.com/holiman/uint256 v1.3.2 // indirect github.com/huandu/skiplist v1.2.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect @@ -139,6 +139,7 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/linxGnu/grocksdb v1.10.1 // indirect + github.com/lmittmann/tint v1.0.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -235,3 +236,7 @@ replace ( // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1 ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/tests/go.sum b/tests/go.sum index 6f0399a9d3..5289b513b6 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -782,12 +782,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -831,13 +831,13 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.7.0 h1:Q+J8HApYAY7UMpL8d9owqiB+odzEc0zn/aqOD9jhc6Y= -github.com/dgraph-io/badger/v4 v4.7.0/go.mod h1:He7TzG3YBy3j4f5baj5B7Zl2XyfNe5bl4Udl0aPemVA= -github.com/dgraph-io/ristretto/v2 v2.2.0 h1:bkY3XzJcXoMuELV8F+vS8kzNgicwQFAaGINAEJdWGOM= -github.com/dgraph-io/ristretto/v2 v2.2.0/go.mod h1:RZrm63UmcBAaYWC1DotLYBmTvgkrs0+XhBd7Npn7/zI= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= +github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= +github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa512G+w+Pxci9hJPB8oMnkcP3iZF38= -github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -879,6 +879,8 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+ github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8= github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -923,15 +925,11 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -958,8 +956,9 @@ github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= +github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -1176,6 +1175,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -1259,6 +1260,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o= diff --git a/tests/integration/auth/client/cli/suite_test.go b/tests/integration/auth/client/cli/suite_test.go index fed1b07192..68101d44e7 100644 --- a/tests/integration/auth/client/cli/suite_test.go +++ b/tests/integration/auth/client/cli/suite_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - abci "github.com/cometbft/cometbft/abci/types" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/stretchr/testify/suite" "cosmossdk.io/core/address" diff --git a/tests/integration/bank/keeper/deterministic_test.go b/tests/integration/bank/keeper/deterministic_test.go index 56b820be92..533d5be652 100644 --- a/tests/integration/bank/keeper/deterministic_test.go +++ b/tests/integration/bank/keeper/deterministic_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "gotest.tools/v3/assert" "pgregory.net/rapid" diff --git a/tests/integration/distribution/keeper/msg_server_test.go b/tests/integration/distribution/keeper/msg_server_test.go index 63b2825c22..e2b64cb713 100644 --- a/tests/integration/distribution/keeper/msg_server_test.go +++ b/tests/integration/distribution/keeper/msg_server_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - cmtabcitypes "github.com/cometbft/cometbft/abci/types" - types "github.com/cometbft/cometbft/api/cometbft/types/v1" + types "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmtabcitypes "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "gotest.tools/v3/assert" diff --git a/tests/integration/evidence/keeper/infraction_test.go b/tests/integration/evidence/keeper/infraction_test.go index 4babceff78..ff4e260570 100644 --- a/tests/integration/evidence/keeper/infraction_test.go +++ b/tests/integration/evidence/keeper/infraction_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "gotest.tools/v3/assert" "cosmossdk.io/core/appmodule" diff --git a/tests/integration/gov/genesis_test.go b/tests/integration/gov/genesis_test.go index f2fd0563ab..306f546633 100644 --- a/tests/integration/gov/genesis_test.go +++ b/tests/integration/gov/genesis_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "gotest.tools/v3/assert" diff --git a/tests/integration/gov/keeper/keeper_test.go b/tests/integration/gov/keeper/keeper_test.go index faf17b1625..c8dee1fd71 100644 --- a/tests/integration/gov/keeper/keeper_test.go +++ b/tests/integration/gov/keeper/keeper_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" "cosmossdk.io/core/appmodule" diff --git a/tests/integration/slashing/keeper/keeper_test.go b/tests/integration/slashing/keeper/keeper_test.go index 0d192e3c1b..f8cda43fac 100644 --- a/tests/integration/slashing/keeper/keeper_test.go +++ b/tests/integration/slashing/keeper/keeper_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "gotest.tools/v3/assert" diff --git a/tests/integration/staking/keeper/common_test.go b/tests/integration/staking/keeper/common_test.go index ada2a488e2..82a3115d31 100644 --- a/tests/integration/staking/keeper/common_test.go +++ b/tests/integration/staking/keeper/common_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - cmtprototypes "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtprototypes "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" "cosmossdk.io/core/appmodule" diff --git a/tests/integration/staking/keeper/determinstic_test.go b/tests/integration/staking/keeper/determinstic_test.go index a3d6b202d9..6a7a305828 100644 --- a/tests/integration/staking/keeper/determinstic_test.go +++ b/tests/integration/staking/keeper/determinstic_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" "pgregory.net/rapid" diff --git a/tests/integration/staking/keeper/genesis_test.go b/tests/integration/staking/keeper/genesis_test.go index ded4bc0185..41bfaca301 100644 --- a/tests/integration/staking/keeper/genesis_test.go +++ b/tests/integration/staking/keeper/genesis_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "gotest.tools/v3/assert" diff --git a/tests/integration/staking/keeper/grpc_query_test.go b/tests/integration/staking/keeper/grpc_query_test.go index 2cc59f45e5..fae73b06bc 100644 --- a/tests/integration/staking/keeper/grpc_query_test.go +++ b/tests/integration/staking/keeper/grpc_query_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" "cosmossdk.io/math" diff --git a/tests/integration/staking/keeper/slash_test.go b/tests/integration/staking/keeper/slash_test.go index b9b7d904e2..2d6d54d481 100644 --- a/tests/integration/staking/keeper/slash_test.go +++ b/tests/integration/staking/keeper/slash_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "gotest.tools/v3/assert" diff --git a/tests/integration/staking/keeper/validator_test.go b/tests/integration/staking/keeper/validator_test.go index e5a8b291b0..bc20b363f0 100644 --- a/tests/integration/staking/keeper/validator_test.go +++ b/tests/integration/staking/keeper/validator_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "gotest.tools/v3/assert" "cosmossdk.io/math" diff --git a/tests/integration/staking/keeper/vote_extensions_test.go b/tests/integration/staking/keeper/vote_extensions_test.go index 734ba68760..563473115b 100644 --- a/tests/integration/staking/keeper/vote_extensions_test.go +++ b/tests/integration/staking/keeper/vote_extensions_test.go @@ -5,8 +5,8 @@ import ( "sort" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" protoio "github.com/cosmos/gogoproto/io" "github.com/cosmos/gogoproto/proto" gogotypes "github.com/cosmos/gogoproto/types" diff --git a/tests/integration/store/rootmulti/rollback_test.go b/tests/integration/store/rootmulti/rollback_test.go index 3b358527a0..fde14596d0 100644 --- a/tests/integration/store/rootmulti/rollback_test.go +++ b/tests/integration/store/rootmulti/rollback_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" "gotest.tools/v3/assert" diff --git a/tests/systemtests/go.mod b/tests/systemtests/go.mod index e50de7f095..3ac152288f 100644 --- a/tests/systemtests/go.mod +++ b/tests/systemtests/go.mod @@ -45,9 +45,9 @@ require ( github.com/cockroachdb/pebble v1.1.5 // indirect github.com/cockroachdb/redact v1.1.6 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb // indirect - github.com/cometbft/cometbft v1.0.1 // indirect github.com/cometbft/cometbft-db v1.0.4 // indirect github.com/cometbft/cometbft/api v1.0.0 // indirect + github.com/cometbft/cometbft/v2 v2.0.0-main // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.1.3 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect @@ -62,17 +62,16 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.7.0 // indirect - github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect + github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.8.0 // indirect github.com/emicklei/dot v1.8.0 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect @@ -100,6 +99,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/yamux v0.1.2 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect + github.com/holiman/uint256 v1.3.2 // indirect github.com/huandu/skiplist v1.2.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect @@ -111,6 +111,7 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/linxGnu/grocksdb v1.10.1 // indirect + github.com/lmittmann/tint v1.0.7 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/minio/highwayhash v1.0.3 // indirect @@ -139,7 +140,7 @@ require ( github.com/spf13/pflag v1.0.6 // indirect github.com/spf13/viper v1.20.1 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/supranational/blst v0.3.13 // indirect + github.com/supranational/blst v0.3.14 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect @@ -152,6 +153,7 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/otel v1.35.0 // indirect go.opentelemetry.io/otel/metric v1.35.0 // indirect + go.opentelemetry.io/otel/sdk v1.35.0 // indirect go.opentelemetry.io/otel/trace v1.35.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.17.0 // indirect @@ -181,3 +183,7 @@ replace ( cosmossdk.io/store => ../../store cosmossdk.io/x/tx => ../../x/tx ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/tests/systemtests/go.sum b/tests/systemtests/go.sum index 0764da4895..8b58c7583e 100644 --- a/tests/systemtests/go.sum +++ b/tests/systemtests/go.sum @@ -28,8 +28,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -122,12 +122,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -171,13 +171,13 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.7.0 h1:Q+J8HApYAY7UMpL8d9owqiB+odzEc0zn/aqOD9jhc6Y= -github.com/dgraph-io/badger/v4 v4.7.0/go.mod h1:He7TzG3YBy3j4f5baj5B7Zl2XyfNe5bl4Udl0aPemVA= -github.com/dgraph-io/ristretto/v2 v2.2.0 h1:bkY3XzJcXoMuELV8F+vS8kzNgicwQFAaGINAEJdWGOM= -github.com/dgraph-io/ristretto/v2 v2.2.0/go.mod h1:RZrm63UmcBAaYWC1DotLYBmTvgkrs0+XhBd7Npn7/zI= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= +github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= +github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa512G+w+Pxci9hJPB8oMnkcP3iZF38= -github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -201,6 +201,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -232,13 +234,9 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -394,6 +392,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -459,6 +459,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= @@ -687,8 +689,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= -github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo= +github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= @@ -789,8 +791,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -922,8 +922,6 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= -golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/tests/systemtests/upgrade_test.go b/tests/systemtests/upgrade_test.go index 6d36a2e91b..6a98c5a439 100644 --- a/tests/systemtests/upgrade_test.go +++ b/tests/systemtests/upgrade_test.go @@ -19,7 +19,7 @@ import ( const ( testSeed = "scene learn remember glide apple expand quality spawn property shoe lamp carry upset blossom draft reject aim file trash miss script joy only measure" - upgradeHeight int64 = 22 + upgradeHeight int64 = 45 upgradeName = "v053-to-v054" // must match UpgradeName in simapp/upgrades.go ) @@ -28,7 +28,7 @@ func TestChainUpgrade(t *testing.T) { // start a legacy chain with some state // when a chain upgrade proposal is executed // then the chain upgrades successfully - systest.Sut.StopChain() + systest.Sut.ResetChain(t) currentBranchBinary := systest.Sut.ExecBinary() currentInitializer := systest.Sut.TestnetInitializer() @@ -67,8 +67,10 @@ func TestChainUpgrade(t *testing.T) { raw := cli.CustomQuery("q", "gov", "proposal", proposalID) t.Log(raw) - systest.Sut.AwaitBlockHeight(t, upgradeHeight-1, 60*time.Second) + // generous timeout as this could run faster or slower based on HW or in CI + systest.Sut.AwaitBlockHeight(t, upgradeHeight-1, 2*time.Minute) t.Logf("current_height: %d\n", systest.Sut.CurrentHeight()) + raw = cli.CustomQuery("q", "gov", "proposal", proposalID) proposalStatus := gjson.Get(raw, "proposal.status").String() require.Equal(t, "PROPOSAL_STATUS_PASSED", proposalStatus, raw) @@ -82,7 +84,7 @@ func TestChainUpgrade(t *testing.T) { systest.Sut.SetTestnetInitializer(currentInitializer) systest.Sut.StartChain(t) - require.Equal(t, upgradeHeight+1, systest.Sut.CurrentHeight()) + require.True(t, upgradeHeight+1 <= systest.Sut.CurrentHeight()) regex, err := regexp.Compile("DBG this is a debug level message to test that verbose logging mode has properly been enabled during a chain upgrade") require.NoError(t, err) diff --git a/testutil/cli/cmt_mocks.go b/testutil/cli/cmt_mocks.go index 3bb35e2040..6890dfcda1 100644 --- a/testutil/cli/cmt_mocks.go +++ b/testutil/cli/cmt_mocks.go @@ -3,12 +3,12 @@ package cli import ( "context" - abci "github.com/cometbft/cometbft/abci/types" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - rpcclient "github.com/cometbft/cometbft/rpc/client" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" - coretypes "github.com/cometbft/cometbft/rpc/core/types" - cmttypes "github.com/cometbft/cometbft/types" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmtbytes "github.com/cometbft/cometbft/v2/libs/bytes" + rpcclient "github.com/cometbft/cometbft/v2/rpc/client" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" + cmttypes "github.com/cometbft/cometbft/v2/types" "github.com/cosmos/cosmos-sdk/client" ) diff --git a/testutil/context.go b/testutil/context.go index 5f16bbfd68..f877a9c498 100644 --- a/testutil/context.go +++ b/testutil/context.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/assert" diff --git a/testutil/integration/example_test.go b/testutil/integration/example_test.go index 92de40052c..046731c99a 100644 --- a/testutil/integration/example_test.go +++ b/testutil/integration/example_test.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/google/go-cmp/cmp" "cosmossdk.io/core/appmodule" diff --git a/testutil/integration/router.go b/testutil/integration/router.go index bccb811090..ab697df0ab 100644 --- a/testutil/integration/router.go +++ b/testutil/integration/router.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - cmtabcitypes "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmtabcitypes "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "cosmossdk.io/core/appmodule" diff --git a/testutil/mock/privval.go b/testutil/mock/privval.go index c713add2a9..7637d17658 100644 --- a/testutil/mock/privval.go +++ b/testutil/mock/privval.go @@ -1,9 +1,9 @@ package mock import ( - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - "github.com/cometbft/cometbft/crypto" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + "github.com/cometbft/cometbft/v2/crypto" + cmttypes "github.com/cometbft/cometbft/v2/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" @@ -36,7 +36,7 @@ func (pv PV) SignVote(chainID string, vote *cmtproto.Vote, signExtension bool) e } vote.Signature = sig if signExtension { - extSignBytes := cmttypes.VoteExtensionSignBytes(chainID, vote) + extSignBytes, _ := cmttypes.VoteExtensionSignBytes(chainID, vote) extSig, err := pv.PrivKey.Sign(extSignBytes) if err != nil { return err diff --git a/testutil/mock/privval_test.go b/testutil/mock/privval_test.go index 165c1bf577..c96ef844a9 100644 --- a/testutil/mock/privval_test.go +++ b/testutil/mock/privval_test.go @@ -3,7 +3,7 @@ package mock import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" ) diff --git a/testutil/mock/types_mock_appmodule.go b/testutil/mock/types_mock_appmodule.go index 8cab68282a..4502388512 100644 --- a/testutil/mock/types_mock_appmodule.go +++ b/testutil/mock/types_mock_appmodule.go @@ -15,7 +15,7 @@ import ( reflect "reflect" appmodule "cosmossdk.io/core/appmodule" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/cometbft/cometbft/v2/abci/types" client "github.com/cosmos/cosmos-sdk/client" codec "github.com/cosmos/cosmos-sdk/codec" types0 "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/testutil/mock/types_module_module.go b/testutil/mock/types_module_module.go index a85e911104..5037376780 100644 --- a/testutil/mock/types_module_module.go +++ b/testutil/mock/types_module_module.go @@ -14,7 +14,7 @@ import ( json "encoding/json" reflect "reflect" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/cometbft/cometbft/v2/abci/types" client "github.com/cosmos/cosmos-sdk/client" codec "github.com/cosmos/cosmos-sdk/codec" types0 "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/testutil/network/network.go b/testutil/network/network.go index 9641f48f79..01c9613b36 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -17,8 +17,8 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/node" - cmtclient "github.com/cometbft/cometbft/rpc/client" + "github.com/cometbft/cometbft/v2/node" + cmtclient "github.com/cometbft/cometbft/v2/rpc/client" dbm "github.com/cosmos/cosmos-db" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" @@ -381,7 +381,6 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) { ctx := server.NewDefaultContext() cmtCfg := ctx.Config - cmtCfg.Consensus.TimeoutCommit = cfg.TimeoutCommit // Only allow the first validator to expose an RPC, API and gRPC // server/client due to CometBFT in-process constraints. diff --git a/testutil/network/util.go b/testutil/network/util.go index 60a3c9e0a0..854a8c3892 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -2,19 +2,20 @@ package network import ( "context" + "crypto/sha256" "encoding/json" "fmt" "net" "os" "path/filepath" - cmtcfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/node" - "github.com/cometbft/cometbft/p2p" - pvm "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/rpc/client/local" - cmttime "github.com/cometbft/cometbft/types/time" + cmtcfg "github.com/cometbft/cometbft/v2/config" + "github.com/cometbft/cometbft/v2/node" + "github.com/cometbft/cometbft/v2/p2p" + pvm "github.com/cometbft/cometbft/v2/privval" + "github.com/cometbft/cometbft/v2/proxy" + "github.com/cometbft/cometbft/v2/rpc/client/local" + cmttime "github.com/cometbft/cometbft/v2/types/time" "golang.org/x/sync/errgroup" "cosmossdk.io/log" @@ -59,7 +60,23 @@ func startInProcess(cfg Config, val *Validator) error { Sha256Checksum: []byte{}, }, err } - return node.ChecksummedGenesisDoc{GenesisDoc: gen, Sha256Checksum: make([]byte, 0)}, nil + + genbz, err := gen.AppState.MarshalJSON() + if err != nil { + return node.ChecksummedGenesisDoc{ + Sha256Checksum: []byte{}, + }, err + } + + bz, err := json.Marshal(genbz) + if err != nil { + return node.ChecksummedGenesisDoc{ + Sha256Checksum: []byte{}, + }, err + } + sum := sha256.Sum256(bz) + + return node.ChecksummedGenesisDoc{GenesisDoc: gen, Sha256Checksum: sum[:]}, nil } cmtApp := server.NewCometABCIWrapper(app) diff --git a/testutil/sims/app_helpers.go b/testutil/sims/app_helpers.go index ad7cc42626..6b4b94ace3 100644 --- a/testutil/sims/app_helpers.go +++ b/testutil/sims/app_helpers.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmtjson "github.com/cometbft/cometbft/v2/libs/json" + cmttypes "github.com/cometbft/cometbft/v2/types" dbm "github.com/cosmos/cosmos-db" coreheader "cosmossdk.io/core/header" diff --git a/testutil/sims/tx_helpers.go b/testutil/sims/tx_helpers.go index fe770159c7..313b71cf55 100644 --- a/testutil/sims/tx_helpers.go +++ b/testutil/sims/tx_helpers.go @@ -6,8 +6,8 @@ import ( "testing" "time" - types2 "github.com/cometbft/cometbft/abci/types" - types "github.com/cometbft/cometbft/api/cometbft/types/v1" + types "github.com/cometbft/cometbft/api/cometbft/types/v2" + types2 "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "cosmossdk.io/errors" diff --git a/tools/benchmark/go.mod b/tools/benchmark/go.mod index fa1f98bfab..1ea069d854 100644 --- a/tools/benchmark/go.mod +++ b/tools/benchmark/go.mod @@ -40,9 +40,9 @@ require ( github.com/cockroachdb/pebble v1.1.5 // indirect github.com/cockroachdb/redact v1.1.6 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb // indirect - github.com/cometbft/cometbft v1.0.1 // indirect github.com/cometbft/cometbft-db v1.0.4 // indirect github.com/cometbft/cometbft/api v1.0.0 // indirect + github.com/cometbft/cometbft/v2 v2.0.0-main // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.1.3 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect @@ -55,26 +55,26 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.5.1 // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/emicklei/dot v1.8.0 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/btree v1.1.3 // indirect - github.com/google/flatbuffers v25.1.24+incompatible // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/gorilla/handlers v1.5.2 // indirect @@ -90,6 +90,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/yamux v0.1.2 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect + github.com/holiman/uint256 v1.3.2 // indirect github.com/huandu/skiplist v1.2.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect @@ -100,6 +101,7 @@ require ( github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/linxGnu/grocksdb v1.10.1 // indirect + github.com/lmittmann/tint v1.0.7 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mtibben/percent v0.2.1 // indirect @@ -126,7 +128,7 @@ require ( github.com/spf13/pflag v1.0.6 // indirect github.com/spf13/viper v1.20.1 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/supranational/blst v0.3.13 // indirect + github.com/supranational/blst v0.3.14 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect @@ -134,7 +136,10 @@ require ( github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.4.0 // indirect - go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.17.0 // indirect golang.org/x/crypto v0.38.0 // indirect @@ -167,3 +172,7 @@ replace ( cosmossdk.io/store => ../../store cosmossdk.io/x/tx => ../../x/tx ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/tools/benchmark/go.sum b/tools/benchmark/go.sum index 7e03d190ce..fda198a01f 100644 --- a/tools/benchmark/go.sum +++ b/tools/benchmark/go.sum @@ -109,12 +109,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -154,8 +154,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.5.1 h1:7DCIXrQjo1LKmM96YD+hLVJ2EEsyyoWxJfpdd56HLps= -github.com/dgraph-io/badger/v4 v4.5.1/go.mod h1:qn3Be0j3TfV4kPbVoK0arXCD1/nr1ftth6sbL5jxdoA= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -180,6 +180,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -211,13 +213,10 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -256,9 +255,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= @@ -288,14 +284,13 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v25.1.24+incompatible h1:4wPqL3K7GzBd1CwyhSd3usxLKOaJN/AC6puCca6Jm7o= -github.com/google/flatbuffers v25.1.24+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -376,6 +371,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -439,6 +436,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= @@ -657,8 +656,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= -github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo= +github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= @@ -689,8 +688,6 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= @@ -774,7 +771,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -924,7 +920,6 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= diff --git a/tools/confix/go.mod b/tools/confix/go.mod index 38ece4c7bd..6884d7ddc2 100644 --- a/tools/confix/go.mod +++ b/tools/confix/go.mod @@ -12,6 +12,26 @@ require ( gotest.tools/v3 v3.5.2 ) +require ( + github.com/cometbft/cometbft-db v1.0.4 // indirect + github.com/cometbft/cometbft/v2 v2.0.0-main // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect + github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect + github.com/holiman/uint256 v1.3.2 // indirect + github.com/jmhodges/levigo v1.0.0 // indirect + github.com/lmittmann/tint v1.0.7 // indirect + go.etcd.io/bbolt v1.4.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect +) + require ( cosmossdk.io/api v0.9.2 // indirect cosmossdk.io/collections v1.2.1 // indirect @@ -41,8 +61,6 @@ require ( github.com/cockroachdb/pebble v1.1.5 // indirect github.com/cockroachdb/redact v1.1.6 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb // indirect - github.com/cometbft/cometbft v1.0.1 // indirect - github.com/cometbft/cometbft-db v1.0.4 // indirect github.com/cometbft/cometbft/api v1.0.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.1.3 // indirect @@ -57,26 +75,19 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.5.1 // indirect - github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect - github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.8.0 // indirect github.com/emicklei/dot v1.8.0 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/btree v1.1.3 // indirect - github.com/google/flatbuffers v25.1.24+incompatible // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/uuid v1.6.0 // indirect @@ -98,7 +109,6 @@ require ( github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/jmhodges/levigo v1.0.0 // indirect github.com/klauspost/compress v1.18.0 // indirect github.com/klauspost/cpuid/v2 v2.2.10 // indirect github.com/kr/pretty v0.3.1 // indirect @@ -138,8 +148,6 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect; indirectÎ - go.etcd.io/bbolt v1.4.0 // indirect - go.opencensus.io v0.24.0 // indirect go.uber.org/mock v0.5.2 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.17.0 // indirect @@ -170,3 +178,7 @@ replace ( cosmossdk.io/x/tx => ../../x/tx github.com/cosmos/cosmos-sdk => ../.. ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/tools/confix/go.sum b/tools/confix/go.sum index 4dc323fd58..c887181ad6 100644 --- a/tools/confix/go.sum +++ b/tools/confix/go.sum @@ -26,8 +26,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE= github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -120,12 +120,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -173,13 +173,13 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.5.1 h1:7DCIXrQjo1LKmM96YD+hLVJ2EEsyyoWxJfpdd56HLps= -github.com/dgraph-io/badger/v4 v4.5.1/go.mod h1:qn3Be0j3TfV4kPbVoK0arXCD1/nr1ftth6sbL5jxdoA= -github.com/dgraph-io/ristretto/v2 v2.2.0 h1:bkY3XzJcXoMuELV8F+vS8kzNgicwQFAaGINAEJdWGOM= -github.com/dgraph-io/ristretto/v2 v2.2.0/go.mod h1:RZrm63UmcBAaYWC1DotLYBmTvgkrs0+XhBd7Npn7/zI= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= +github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= +github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa512G+w+Pxci9hJPB8oMnkcP3iZF38= -github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -203,6 +203,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -234,13 +236,10 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -279,9 +278,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= @@ -311,14 +307,13 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v25.1.24+incompatible h1:4wPqL3K7GzBd1CwyhSd3usxLKOaJN/AC6puCca6Jm7o= -github.com/google/flatbuffers v25.1.24+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -399,6 +394,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -464,6 +461,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= @@ -724,8 +723,6 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= @@ -787,8 +784,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -811,7 +806,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -922,8 +916,6 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= -golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -964,7 +956,6 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index fd8c2c1b61..b3b80fdc6f 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -4,8 +4,8 @@ go 1.23.5 require ( cosmossdk.io/log v1.6.0 - github.com/cometbft/cometbft v1.0.1 github.com/cometbft/cometbft-db v1.0.4 + github.com/cometbft/cometbft/v2 v2.0.0-main github.com/cosmos/cosmos-sdk v0.53.0 github.com/fsnotify/fsnotify v1.9.0 github.com/otiai10/copy v1.14.1 @@ -73,30 +73,28 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v4 v4.5.1 // indirect + github.com/dgraph-io/badger/v4 v4.6.0 // indirect github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.7.0 // indirect github.com/emicklei/dot v1.8.0 // indirect github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect + github.com/ethereum/go-ethereum v1.15.5 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/getsentry/sentry-go v0.33.0 // indirect github.com/go-jose/go-jose/v4 v4.0.5 // indirect - github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/btree v1.1.3 // indirect - github.com/google/flatbuffers v25.1.24+incompatible // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.9 // indirect @@ -121,6 +119,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/yamux v0.1.2 // indirect github.com/hdevalence/ed25519consensus v0.2.0 // indirect + github.com/holiman/uint256 v1.3.2 // indirect github.com/huandu/skiplist v1.2.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect @@ -132,6 +131,7 @@ require ( github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/linxGnu/grocksdb v1.10.1 // indirect + github.com/lmittmann/tint v1.0.7 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -161,7 +161,7 @@ require ( github.com/spf13/pflag v1.0.6 // indirect github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/supranational/blst v0.3.13 // indirect + github.com/supranational/blst v0.3.14 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.7.0 // indirect @@ -171,7 +171,6 @@ require ( github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.4.0 // indirect - go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect @@ -214,3 +213,7 @@ replace ( cosmossdk.io/store => ../../store cosmossdk.io/x/tx => ../../x/tx ) + +replace github.com/cometbft/cometbft/v2 => github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 + +replace github.com/cometbft/cometbft/api => github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index 4e44d55ba6..b197215ff1 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -768,12 +768,12 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g= github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/cometbft/cometbft v1.0.1 h1:JNVgbpL76sA4kXmBnyZ7iPjFAxi6HVp2l+rdT2RXVUs= -github.com/cometbft/cometbft v1.0.1/go.mod h1:r9fEwrbU6Oxs11I2bLsfAiG37OMn0Vip0w9arYU0Nw0= github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtprUFxs= github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA= -github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4= -github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469 h1:m0os1iFLq3XvSUN5csb5ZS0j8nHku97ApUJxibDJHFI= +github.com/cometbft/cometbft/api v0.0.0-20250604002332-f4d33abd2469/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469 h1:0396oj18tVMEWwjnkhaDrB+ESgmRmJ/vsGRsOQGu2CE= +github.com/cometbft/cometbft/v2 v2.0.0-20250604002332-f4d33abd2469/go.mod h1:V5p+X8gSj7t5l4sOAeB8RYAQ20jQe75jZJiKlWrKgC8= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -813,8 +813,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvw github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v4 v4.5.1 h1:7DCIXrQjo1LKmM96YD+hLVJ2EEsyyoWxJfpdd56HLps= -github.com/dgraph-io/badger/v4 v4.5.1/go.mod h1:qn3Be0j3TfV4kPbVoK0arXCD1/nr1ftth6sbL5jxdoA= +github.com/dgraph-io/badger/v4 v4.6.0 h1:acOwfOOZ4p1dPRnYzvkVm7rUk2Y21TgPVepCy5dJdFQ= +github.com/dgraph-io/badger/v4 v4.6.0/go.mod h1:KSJ5VTuZNC3Sd+YhvVjk2nYua9UZnnTr/SkXvdtiPgI= github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I= github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -857,6 +857,8 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+ github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8= github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= +github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo= +github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -897,15 +899,11 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= -github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -991,8 +989,8 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/flatbuffers v25.1.24+incompatible h1:4wPqL3K7GzBd1CwyhSd3usxLKOaJN/AC6puCca6Jm7o= -github.com/google/flatbuffers v25.1.24+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q= +github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -1144,6 +1142,8 @@ github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8 github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU= github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= +github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA= +github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= @@ -1221,6 +1221,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linxGnu/grocksdb v1.10.1 h1:YX6gUcKvSC3d0s9DaqgbU+CRkZHzlELgHu1Z/kmtslg= github.com/linxGnu/grocksdb v1.10.1/go.mod h1:C3CNe9UYc9hlEM2pC82AqiGS3LRW537u9LFV4wIZuHk= +github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= +github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o= @@ -1471,8 +1473,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= -github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY+qRo= +github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= diff --git a/tools/cosmovisor/scanner.go b/tools/cosmovisor/scanner.go index e435c38581..85caaeeef8 100644 --- a/tools/cosmovisor/scanner.go +++ b/tools/cosmovisor/scanner.go @@ -13,7 +13,7 @@ import ( "time" dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/store" + "github.com/cometbft/cometbft/v2/store" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) diff --git a/types/abci.go b/types/abci.go index a1df3ed22d..52c1a70359 100644 --- a/types/abci.go +++ b/types/abci.go @@ -1,7 +1,7 @@ package types import ( - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" ) // ABCIHandlers aggregates all ABCI handlers needed for an application. diff --git a/types/abci.pb.go b/types/abci.pb.go index b4dadfb2d0..6bd89a190c 100644 --- a/types/abci.pb.go +++ b/types/abci.pb.go @@ -5,8 +5,8 @@ package types import ( fmt "fmt" - v1 "github.com/cometbft/cometbft/api/cometbft/abci/v1" - v11 "github.com/cometbft/cometbft/api/cometbft/types/v1" + v2 "github.com/cometbft/cometbft/api/cometbft/abci/v2" + v21 "github.com/cometbft/cometbft/api/cometbft/types/v2" _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" @@ -63,7 +63,7 @@ type TxResponse struct { // these events include those emitted by processing all the messages and those // emitted from the ante. Whereas Logs contains the events, with // additional metadata, emitted only by processing the messages. - Events []v1.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events"` + Events []v2.Event `protobuf:"bytes,13,rep,name=events,proto3" json:"events"` } func (m *TxResponse) Reset() { *m = TxResponse{} } @@ -331,7 +331,7 @@ type Result struct { Log string `protobuf:"bytes,2,opt,name=log,proto3" json:"log,omitempty"` // Events contains a slice of Event objects that were emitted during message // or handler execution. - Events []v1.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events"` + Events []v2.Event `protobuf:"bytes,3,rep,name=events,proto3" json:"events"` // msg_responses contains the Msg handler responses type packed in Anys. MsgResponses []*any.Any `protobuf:"bytes,4,rep,name=msg_responses,json=msgResponses,proto3" json:"msg_responses,omitempty"` } @@ -628,7 +628,7 @@ type SearchBlocksResult struct { // Max count blocks per page Limit int64 `protobuf:"varint,5,opt,name=limit,proto3" json:"limit,omitempty"` // List of blocks in current page - Blocks []*v11.Block `protobuf:"bytes,6,rep,name=blocks,proto3" json:"blocks,omitempty"` + Blocks []*v21.Block `protobuf:"bytes,6,rep,name=blocks,proto3" json:"blocks,omitempty"` } func (m *SearchBlocksResult) Reset() { *m = SearchBlocksResult{} } @@ -698,7 +698,7 @@ func (m *SearchBlocksResult) GetLimit() int64 { return 0 } -func (m *SearchBlocksResult) GetBlocks() []*v11.Block { +func (m *SearchBlocksResult) GetBlocks() []*v21.Block { if m != nil { return m.Blocks } @@ -725,69 +725,69 @@ func init() { var fileDescriptor_4e37629bc7eb0df8 = []byte{ // 1006 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbf, 0x6f, 0x5b, 0x37, - 0x17, 0xd5, 0xd3, 0x53, 0x9e, 0x2c, 0xca, 0xfe, 0xfc, 0x81, 0x35, 0xe2, 0xe7, 0x20, 0x91, 0x54, - 0x25, 0x05, 0x84, 0x02, 0x79, 0x8a, 0x9d, 0x26, 0x68, 0x33, 0x25, 0x72, 0x7f, 0xc4, 0x40, 0x92, - 0x81, 0x56, 0x50, 0xa0, 0x8b, 0x40, 0x49, 0x34, 0xf5, 0x60, 0xbd, 0x47, 0x41, 0xa4, 0x6c, 0x79, - 0xeb, 0xd8, 0xb1, 0x53, 0xa7, 0x0e, 0x5d, 0xdb, 0xb9, 0x7b, 0xd7, 0x8c, 0x1e, 0xd3, 0x22, 0x70, - 0x53, 0x7b, 0xeb, 0x5f, 0x51, 0xdc, 0x4b, 0x3e, 0x49, 0xa9, 0x2b, 0x77, 0xe8, 0x46, 0x9e, 0x7b, - 0x49, 0xde, 0x73, 0xee, 0x21, 0x49, 0x6e, 0xf7, 0x94, 0x4e, 0x94, 0x6e, 0x76, 0xb9, 0x16, 0x4d, - 0xde, 0xed, 0xc5, 0xcd, 0xa3, 0xed, 0xae, 0x30, 0x7c, 0x1b, 0x27, 0xd1, 0x68, 0xac, 0x8c, 0xa2, - 0xa1, 0x4d, 0x8a, 0x20, 0x29, 0x42, 0xdc, 0x25, 0xdd, 0xd8, 0x90, 0x4a, 0x2a, 0x4c, 0x6a, 0xc2, - 0xc8, 0xe6, 0xdf, 0xb8, 0xd9, 0x53, 0x89, 0x30, 0xdd, 0x03, 0x93, 0xed, 0xd8, 0x34, 0x27, 0x23, - 0xa1, 0x5d, 0xf4, 0xd6, 0x2c, 0x8a, 0x28, 0x84, 0xbb, 0x43, 0xd5, 0x3b, 0x74, 0xe1, 0x2d, 0xa9, - 0x94, 0x1c, 0x8a, 0x26, 0xce, 0xba, 0x93, 0x83, 0x26, 0x4f, 0x4f, 0xb2, 0x90, 0xad, 0xa3, 0x63, - 0x0f, 0x74, 0x45, 0xe1, 0xa4, 0xfe, 0xd6, 0x27, 0xa4, 0x3d, 0x65, 0x42, 0x8f, 0x54, 0xaa, 0x05, - 0xbd, 0x4e, 0x82, 0x81, 0x88, 0xe5, 0xc0, 0x84, 0x5e, 0xcd, 0x6b, 0xf8, 0xcc, 0xcd, 0x68, 0x9d, - 0x04, 0x66, 0x3a, 0xe0, 0x7a, 0x10, 0xe6, 0x6b, 0x5e, 0xa3, 0xd4, 0x22, 0xe7, 0x67, 0xd5, 0xa0, - 0x3d, 0x7d, 0xca, 0xf5, 0x80, 0xb9, 0x08, 0xbd, 0x49, 0x4a, 0x3d, 0xd5, 0x17, 0x7a, 0xc4, 0x7b, - 0x22, 0xf4, 0x21, 0x8d, 0xcd, 0x01, 0x4a, 0x49, 0x01, 0x26, 0x61, 0xa1, 0xe6, 0x35, 0xd6, 0x18, - 0x8e, 0x01, 0xeb, 0x73, 0xc3, 0xc3, 0x6b, 0x98, 0x8c, 0x63, 0xba, 0x49, 0x8a, 0x63, 0x7e, 0xdc, - 0x19, 0x2a, 0x19, 0x06, 0x08, 0x07, 0x63, 0x7e, 0xfc, 0x4c, 0x49, 0xfa, 0x92, 0x14, 0x86, 0x4a, - 0xea, 0xb0, 0x58, 0xf3, 0x1b, 0xe5, 0x9d, 0x46, 0xb4, 0x4c, 0xdb, 0xe8, 0x49, 0x6b, 0x77, 0xef, - 0xb9, 0xd0, 0x9a, 0x4b, 0xf1, 0x4c, 0xc9, 0xd6, 0xe6, 0xab, 0xb3, 0x6a, 0xee, 0xa7, 0xdf, 0xab, - 0xeb, 0xef, 0xe2, 0x9a, 0xe1, 0x76, 0x50, 0x43, 0x9c, 0x1e, 0xa8, 0x70, 0xc5, 0xd6, 0x00, 0x63, - 0x7a, 0x8b, 0x10, 0xc9, 0x75, 0xe7, 0x98, 0xa7, 0x46, 0xf4, 0xc3, 0x12, 0x2a, 0x51, 0x92, 0x5c, - 0x7f, 0x89, 0x00, 0xdd, 0x22, 0x2b, 0x10, 0x9e, 0x68, 0xd1, 0x0f, 0x09, 0x06, 0x8b, 0x92, 0xeb, - 0x97, 0x5a, 0xf4, 0xe9, 0x1d, 0x92, 0x37, 0xd3, 0xb0, 0x5c, 0xf3, 0x1a, 0xe5, 0x9d, 0x8d, 0xc8, - 0x76, 0x24, 0xca, 0x3a, 0x12, 0x3d, 0x49, 0x4f, 0x58, 0xde, 0x4c, 0x41, 0x29, 0x13, 0x27, 0x42, - 0x1b, 0x9e, 0x8c, 0xc2, 0x55, 0xab, 0xd4, 0x0c, 0xa0, 0x4f, 0x49, 0x20, 0x8e, 0x44, 0x6a, 0x74, - 0xb8, 0x86, 0x54, 0x37, 0xa3, 0xac, 0xf1, 0x19, 0xcf, 0xe8, 0x33, 0x88, 0x5b, 0x66, 0xbf, 0xfd, - 0x7c, 0x77, 0xdd, 0x4a, 0x71, 0x57, 0xf7, 0x0f, 0x6b, 0xf7, 0xa2, 0x8f, 0x1e, 0x30, 0xb7, 0xfe, - 0x51, 0xe1, 0x9b, 0x1f, 0xaa, 0xb9, 0xfa, 0x8f, 0x1e, 0xf9, 0xdf, 0xbb, 0xdc, 0xe9, 0x87, 0xa4, - 0x94, 0x68, 0xd9, 0x89, 0xd3, 0xbe, 0x98, 0x62, 0xa7, 0xd7, 0x5a, 0x6b, 0x7f, 0x9e, 0x55, 0xe7, - 0x20, 0x5b, 0x49, 0xb4, 0xdc, 0x83, 0x11, 0xfd, 0x3f, 0xf1, 0xa1, 0x19, 0xd8, 0x77, 0x06, 0x43, - 0xba, 0x3f, 0x2b, 0xd0, 0xc7, 0x02, 0x3f, 0x58, 0xde, 0x8b, 0x7d, 0x33, 0x8e, 0x53, 0x69, 0xcb, - 0xdd, 0x70, 0x8d, 0x58, 0x5d, 0x00, 0xf5, 0xbc, 0xd6, 0xaf, 0xdf, 0xd4, 0xbc, 0xfa, 0x98, 0x94, - 0x17, 0xa2, 0xd0, 0x1c, 0xf0, 0x3a, 0x96, 0x58, 0x62, 0x38, 0xa6, 0x7b, 0x84, 0x70, 0x63, 0xc6, - 0x71, 0x77, 0x62, 0x84, 0x0e, 0xf3, 0x58, 0xc1, 0xed, 0x2b, 0xdc, 0x90, 0xe5, 0xb6, 0x0a, 0x70, - 0x3e, 0x5b, 0x58, 0xec, 0xce, 0xbc, 0x4f, 0x4a, 0xb3, 0x24, 0x60, 0x7b, 0x28, 0x4e, 0xdc, 0x81, - 0x30, 0xa4, 0x1b, 0xe4, 0xda, 0x11, 0x1f, 0x4e, 0x84, 0x53, 0xc0, 0x4e, 0xea, 0xbb, 0xa4, 0xf8, - 0x05, 0xd7, 0x7b, 0x97, 0xdd, 0x02, 0x2b, 0x0b, 0xcb, 0xdc, 0x92, 0xc7, 0x60, 0xe6, 0x96, 0xfa, - 0x2f, 0x1e, 0x09, 0x98, 0xd0, 0x93, 0xa1, 0xa1, 0xd7, 0xdd, 0x55, 0x80, 0xe5, 0xab, 0xad, 0x7c, - 0xe8, 0xb9, 0xeb, 0x70, 0x59, 0xfd, 0x07, 0x7f, 0x53, 0x7f, 0xa9, 0x3d, 0x2c, 0x5f, 0x97, 0x4c, - 0x5f, 0x90, 0x35, 0xe8, 0xee, 0xd8, 0xdd, 0x74, 0x1d, 0x16, 0x70, 0xf5, 0x3f, 0x9a, 0xb4, 0xf5, - 0xde, 0x65, 0x57, 0x3d, 0x64, 0xab, 0x89, 0x96, 0xd9, 0x43, 0x91, 0x79, 0xeb, 0x3b, 0x8f, 0xd0, - 0xfd, 0x38, 0x99, 0x0c, 0xb9, 0x89, 0x55, 0x3a, 0x7b, 0x46, 0x3e, 0xb7, 0x9c, 0xf1, 0x62, 0x79, - 0x78, 0x19, 0xde, 0x5f, 0xde, 0x21, 0xa7, 0x63, 0x6b, 0x05, 0xea, 0x3d, 0x3d, 0xab, 0x7a, 0x28, - 0x10, 0x4a, 0xfb, 0x31, 0x09, 0xc6, 0xa8, 0x0f, 0x0a, 0x50, 0xde, 0xa9, 0x2d, 0xdf, 0xc5, 0xea, - 0xc8, 0x5c, 0x7e, 0xfd, 0x31, 0x29, 0x3e, 0xd7, 0xf2, 0x53, 0x90, 0x70, 0x8b, 0x80, 0x99, 0x3b, - 0x0b, 0x46, 0x2a, 0x26, 0x5a, 0xb6, 0xc1, 0x4b, 0xd9, 0x03, 0x04, 0xbb, 0xaf, 0x5a, 0xc5, 0x1f, - 0x05, 0x60, 0x8a, 0xd0, 0xab, 0x7f, 0xef, 0x91, 0x52, 0x7b, 0x9a, 0x6d, 0xf2, 0xc9, 0xac, 0x3f, - 0xfe, 0xd5, 0x6c, 0xdc, 0x82, 0x85, 0x16, 0x5e, 0x52, 0x3e, 0xff, 0x1f, 0x95, 0x47, 0xd7, 0xbe, - 0xf1, 0xc8, 0xfa, 0xbe, 0xe0, 0xe3, 0xde, 0xa0, 0x3d, 0xd5, 0xce, 0x44, 0x55, 0x52, 0x36, 0xca, - 0xf0, 0x61, 0xa7, 0xa7, 0x26, 0xa9, 0x71, 0x56, 0x24, 0x08, 0xed, 0x02, 0x02, 0x5e, 0xb6, 0x21, - 0x6b, 0x44, 0x3b, 0x81, 0x65, 0x23, 0x2e, 0x45, 0x27, 0x9d, 0x24, 0x5d, 0x31, 0xc6, 0xa7, 0xbb, - 0xc0, 0x08, 0x40, 0x2f, 0x10, 0x01, 0x87, 0x63, 0x02, 0xee, 0x84, 0x2f, 0x78, 0x81, 0x95, 0x00, - 0x69, 0x03, 0x00, 0xbb, 0x0e, 0xe3, 0x24, 0x36, 0xf8, 0x8e, 0x17, 0x98, 0x9d, 0xd0, 0x87, 0xc4, - 0x37, 0x53, 0x1d, 0x06, 0x48, 0xf6, 0xce, 0x72, 0xc1, 0xe6, 0xbf, 0x0f, 0x83, 0x05, 0x8e, 0xde, - 0xaf, 0x60, 0x2c, 0xa4, 0xd7, 0x82, 0x3f, 0xee, 0x0a, 0x86, 0xfe, 0x72, 0x86, 0xfe, 0x15, 0x0c, - 0xfd, 0x7f, 0x61, 0xe8, 0x2f, 0x65, 0xe8, 0x67, 0x0c, 0xef, 0x91, 0x00, 0x3f, 0xe0, 0x8c, 0x64, - 0x38, 0xbf, 0x89, 0xf6, 0xdf, 0x3e, 0xda, 0x8e, 0xb0, 0x7a, 0xe6, 0xf2, 0x2c, 0xb7, 0xd6, 0xe3, - 0xd7, 0x7f, 0x54, 0x72, 0xaf, 0xce, 0x2b, 0xde, 0xe9, 0x79, 0xc5, 0x7b, 0x7b, 0x5e, 0xf1, 0xbe, - 0xbd, 0xa8, 0xe4, 0x4e, 0x2f, 0x2a, 0xb9, 0xd7, 0x17, 0x95, 0xdc, 0x57, 0x75, 0x19, 0x9b, 0xc1, - 0xa4, 0x0b, 0x7b, 0xb9, 0xaf, 0xba, 0x39, 0xf7, 0x83, 0xfd, 0xfa, 0xbb, 0x01, 0x7a, 0xe6, 0xfe, - 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x29, 0x1b, 0x28, 0xcc, 0x86, 0x08, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbf, 0x6f, 0x1b, 0x37, + 0x14, 0xd6, 0xe9, 0x94, 0x93, 0x45, 0xd9, 0x75, 0xc1, 0x1a, 0xf1, 0x39, 0x48, 0x24, 0x55, 0x49, + 0x01, 0xa1, 0x40, 0x4e, 0x89, 0xd2, 0x04, 0x6d, 0xa6, 0x44, 0xee, 0x8f, 0x18, 0x48, 0x32, 0xd0, + 0x0a, 0x0a, 0x74, 0x11, 0x28, 0x89, 0xa6, 0x0e, 0xd6, 0x1d, 0x05, 0x91, 0xb2, 0xe5, 0xad, 0x63, + 0xc7, 0x4e, 0x9d, 0x3a, 0x74, 0x6d, 0xe7, 0xee, 0x5d, 0x33, 0x7a, 0x4c, 0x8b, 0xc0, 0x4d, 0xed, + 0xad, 0x7f, 0x45, 0xf1, 0x1e, 0x79, 0x92, 0x53, 0x57, 0xee, 0x90, 0x8d, 0xfc, 0xde, 0x23, 0xf9, + 0xbe, 0xef, 0x7d, 0x24, 0xc9, 0xcd, 0xbe, 0xd2, 0x89, 0xd2, 0xcd, 0x1e, 0xd7, 0xa2, 0xc9, 0x7b, + 0xfd, 0xb8, 0x79, 0x70, 0xb7, 0x27, 0x0c, 0xbf, 0x8b, 0x93, 0x68, 0x3c, 0x51, 0x46, 0xd1, 0xd0, + 0x26, 0x45, 0x90, 0x14, 0x21, 0xee, 0x92, 0xae, 0x6d, 0x48, 0x25, 0x15, 0x26, 0x35, 0x61, 0x64, + 0xf3, 0xaf, 0x5d, 0xef, 0xab, 0x44, 0x98, 0xde, 0x9e, 0x71, 0x3b, 0xb6, 0x9a, 0xe6, 0x68, 0x2c, + 0xb4, 0x8b, 0xde, 0x98, 0x47, 0x11, 0x85, 0x70, 0x6f, 0xa4, 0xfa, 0xfb, 0x2e, 0xbc, 0x25, 0x95, + 0x92, 0x23, 0xd1, 0xc4, 0x59, 0x6f, 0xba, 0xd7, 0xe4, 0xe9, 0x51, 0x16, 0xb2, 0x75, 0x74, 0xed, + 0x81, 0xae, 0x28, 0x9c, 0xd4, 0xdf, 0xf8, 0x84, 0x74, 0x66, 0x4c, 0xe8, 0xb1, 0x4a, 0xb5, 0xa0, + 0x57, 0x49, 0x30, 0x14, 0xb1, 0x1c, 0x9a, 0xd0, 0xab, 0x79, 0x0d, 0x9f, 0xb9, 0x19, 0xad, 0x93, + 0xc0, 0xcc, 0x86, 0x5c, 0x0f, 0xc3, 0x7c, 0xcd, 0x6b, 0x94, 0xda, 0xe4, 0xf4, 0xa4, 0x1a, 0x74, + 0x66, 0x4f, 0xb8, 0x1e, 0x32, 0x17, 0xa1, 0xd7, 0x49, 0xa9, 0xaf, 0x06, 0x42, 0x8f, 0x79, 0x5f, + 0x84, 0x3e, 0xa4, 0xb1, 0x05, 0x40, 0x29, 0x29, 0xc0, 0x24, 0x2c, 0xd4, 0xbc, 0xc6, 0x1a, 0xc3, + 0x31, 0x60, 0x03, 0x6e, 0x78, 0x78, 0x05, 0x93, 0x71, 0x4c, 0x37, 0x49, 0x71, 0xc2, 0x0f, 0xbb, + 0x23, 0x25, 0xc3, 0x00, 0xe1, 0x60, 0xc2, 0x0f, 0x9f, 0x2a, 0x49, 0x5f, 0x90, 0xc2, 0x48, 0x49, + 0x1d, 0x16, 0x6b, 0x7e, 0xa3, 0xdc, 0x6a, 0x44, 0xcb, 0xb4, 0x8d, 0x1e, 0xb7, 0xb7, 0x77, 0x9e, + 0x09, 0xad, 0xb9, 0x14, 0x4f, 0x95, 0x6c, 0x6f, 0xbe, 0x3c, 0xa9, 0xe6, 0x7e, 0xf9, 0xb3, 0xba, + 0xfe, 0x36, 0xae, 0x19, 0x6e, 0x07, 0x35, 0xc4, 0xe9, 0x9e, 0x0a, 0x57, 0x6c, 0x0d, 0x30, 0xa6, + 0x37, 0x08, 0x91, 0x5c, 0x77, 0x0f, 0x79, 0x6a, 0xc4, 0x20, 0x2c, 0xa1, 0x12, 0x25, 0xc9, 0xf5, + 0xd7, 0x08, 0xd0, 0x2d, 0xb2, 0x02, 0xe1, 0xa9, 0x16, 0x83, 0x90, 0x60, 0xb0, 0x28, 0xb9, 0x7e, + 0xa1, 0xc5, 0x80, 0xde, 0x22, 0x79, 0x33, 0x0b, 0xcb, 0x35, 0xaf, 0x51, 0x6e, 0x6d, 0x44, 0xb6, + 0x23, 0x51, 0xd6, 0x91, 0xe8, 0x71, 0x7a, 0xc4, 0xf2, 0x66, 0x06, 0x4a, 0x99, 0x38, 0x11, 0xda, + 0xf0, 0x64, 0x1c, 0xae, 0x5a, 0xa5, 0xe6, 0x00, 0x7d, 0x42, 0x02, 0x71, 0x20, 0x52, 0xa3, 0xc3, + 0x35, 0xa4, 0xba, 0x19, 0x65, 0x8d, 0x77, 0x3c, 0x5b, 0xd1, 0x17, 0x10, 0xb7, 0xcc, 0xfe, 0xf8, + 0xf5, 0xf6, 0xba, 0x95, 0xe2, 0xb6, 0x1e, 0xec, 0xd7, 0xee, 0x44, 0x9f, 0xdc, 0x67, 0x6e, 0xfd, + 0xc3, 0xc2, 0x77, 0x3f, 0x55, 0x73, 0xf5, 0x9f, 0x3d, 0xf2, 0xde, 0xdb, 0xdc, 0xe9, 0xc7, 0xa4, + 0x94, 0x68, 0xd9, 0x8d, 0xd3, 0x81, 0x98, 0x61, 0xa7, 0xd7, 0xda, 0x6b, 0x7f, 0x9f, 0x54, 0x17, + 0x20, 0x5b, 0x49, 0xb4, 0xdc, 0x81, 0x11, 0x7d, 0x9f, 0xf8, 0xd0, 0x0c, 0xec, 0x3b, 0x83, 0x21, + 0xdd, 0x9d, 0x17, 0xe8, 0x63, 0x81, 0x1f, 0x2d, 0xef, 0xc5, 0xae, 0x99, 0xc4, 0xa9, 0xb4, 0xe5, + 0x6e, 0xb8, 0x46, 0xac, 0x9e, 0x03, 0xf5, 0xa2, 0xd6, 0x6f, 0x5f, 0xd7, 0xbc, 0xfa, 0x84, 0x94, + 0xcf, 0x45, 0xa1, 0x39, 0xe0, 0x75, 0x2c, 0xb1, 0xc4, 0x70, 0x4c, 0x77, 0x08, 0xe1, 0xc6, 0x4c, + 0xe2, 0xde, 0xd4, 0x08, 0x1d, 0xe6, 0xb1, 0x82, 0x9b, 0x97, 0xb8, 0x21, 0xcb, 0x6d, 0x17, 0xe0, + 0x7c, 0x76, 0x6e, 0xb1, 0x3b, 0xf3, 0x1e, 0x29, 0xcd, 0x93, 0x80, 0xed, 0xbe, 0x38, 0x72, 0x07, + 0xc2, 0x90, 0x6e, 0x90, 0x2b, 0x07, 0x7c, 0x34, 0x15, 0x4e, 0x01, 0x3b, 0xa9, 0x6f, 0x93, 0xe2, + 0x57, 0x5c, 0xef, 0x5c, 0x74, 0x0b, 0xac, 0x2c, 0x2c, 0x73, 0x4b, 0x1e, 0x83, 0x99, 0x5b, 0xea, + 0xbf, 0x79, 0x24, 0x60, 0x42, 0x4f, 0x47, 0x86, 0x5e, 0x75, 0x57, 0x01, 0x96, 0xaf, 0xb6, 0xf3, + 0xa1, 0xe7, 0xae, 0xc3, 0x45, 0xf5, 0xef, 0xff, 0x4b, 0xfd, 0xa5, 0xf6, 0xb0, 0x7c, 0x5d, 0x32, + 0x7d, 0x4e, 0xd6, 0xa0, 0xbb, 0x13, 0x77, 0xd3, 0x75, 0x58, 0xc0, 0xd5, 0xff, 0x69, 0xd2, 0xf6, + 0x07, 0x17, 0x5d, 0xf5, 0x80, 0xad, 0x26, 0x5a, 0x66, 0x0f, 0x45, 0xe6, 0xad, 0x1f, 0x3c, 0x42, + 0x77, 0xe3, 0x64, 0x3a, 0xe2, 0x26, 0x56, 0xe9, 0xfc, 0x19, 0xf9, 0xd2, 0x72, 0xc6, 0x8b, 0xe5, + 0xe1, 0x65, 0xf8, 0x70, 0x79, 0x87, 0x9c, 0x8e, 0xed, 0x15, 0xa8, 0xf7, 0xf8, 0xa4, 0xea, 0xa1, + 0x40, 0x28, 0xed, 0xa7, 0x24, 0x98, 0xa0, 0x3e, 0x28, 0x40, 0xb9, 0x55, 0x5b, 0xbe, 0x8b, 0xd5, + 0x91, 0xb9, 0xfc, 0xfa, 0x23, 0x52, 0x7c, 0xa6, 0xe5, 0xe7, 0x20, 0xe1, 0x16, 0x01, 0x33, 0x77, + 0xcf, 0x19, 0xa9, 0x98, 0x68, 0xd9, 0x01, 0x2f, 0x65, 0x0f, 0x10, 0xec, 0xbe, 0x6a, 0x15, 0x7f, + 0x18, 0x80, 0x29, 0x42, 0xaf, 0xfe, 0xa3, 0x47, 0x4a, 0x9d, 0x59, 0xb6, 0xc9, 0x67, 0xf3, 0xfe, + 0xf8, 0x97, 0xb3, 0x71, 0x0b, 0xce, 0xb5, 0xf0, 0x82, 0xf2, 0xf9, 0x77, 0x54, 0x1e, 0x5d, 0xfb, + 0xda, 0x23, 0xeb, 0xbb, 0x82, 0x4f, 0xfa, 0xc3, 0xce, 0x4c, 0x3b, 0x13, 0x55, 0x49, 0xd9, 0x28, + 0xc3, 0x47, 0xdd, 0xbe, 0x9a, 0xa6, 0xc6, 0x59, 0x91, 0x20, 0xb4, 0x0d, 0x08, 0x78, 0xd9, 0x86, + 0xac, 0x11, 0xed, 0x04, 0x96, 0x8d, 0xb9, 0x14, 0xdd, 0x74, 0x9a, 0xf4, 0xc4, 0x04, 0x9f, 0xee, + 0x02, 0x23, 0x00, 0x3d, 0x47, 0x04, 0x1c, 0x8e, 0x09, 0xb8, 0x13, 0xbe, 0xe0, 0x05, 0x56, 0x02, + 0xa4, 0x03, 0x00, 0xec, 0x3a, 0x8a, 0x93, 0xd8, 0xe0, 0x3b, 0x5e, 0x60, 0x76, 0x42, 0x1f, 0x10, + 0xdf, 0xcc, 0x74, 0x18, 0x20, 0xd9, 0x5b, 0xcb, 0x05, 0x5b, 0xfc, 0x3e, 0x0c, 0x16, 0x38, 0x7a, + 0xbf, 0x83, 0xb1, 0x90, 0x5e, 0x1b, 0xfe, 0xb8, 0x4b, 0x18, 0xfa, 0xcb, 0x19, 0xfa, 0x97, 0x30, + 0xf4, 0xff, 0x87, 0xa1, 0xbf, 0x94, 0xa1, 0x9f, 0x31, 0xbc, 0x43, 0x02, 0xfc, 0x80, 0x33, 0x92, + 0xe1, 0xe2, 0x26, 0xda, 0x7f, 0xfb, 0xa0, 0x15, 0x61, 0xf5, 0xcc, 0xe5, 0x59, 0x6e, 0xed, 0x47, + 0xaf, 0xfe, 0xaa, 0xe4, 0x5e, 0x9e, 0x56, 0xbc, 0xe3, 0xd3, 0x8a, 0xf7, 0xe6, 0xb4, 0xe2, 0x7d, + 0x7f, 0x56, 0xc9, 0x1d, 0x9f, 0x55, 0x72, 0xaf, 0xce, 0x2a, 0xb9, 0x6f, 0xea, 0x32, 0x36, 0xc3, + 0x69, 0x0f, 0xf6, 0x72, 0x5f, 0x75, 0x73, 0xe1, 0x07, 0xfb, 0xf5, 0xf7, 0x02, 0xf4, 0xcc, 0xbd, + 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x91, 0x3c, 0x0b, 0xc9, 0x86, 0x08, 0x00, 0x00, } func (m *TxResponse) Marshal() (dAtA []byte, err error) { @@ -1784,7 +1784,7 @@ func (this *SearchBlocksResult) String() string { } repeatedStringForBlocks := "[]*Block{" for _, f := range this.Blocks { - repeatedStringForBlocks += strings.Replace(fmt.Sprintf("%v", f), "Block", "v11.Block", 1) + "," + repeatedStringForBlocks += strings.Replace(fmt.Sprintf("%v", f), "Block", "v21.Block", 1) + "," } repeatedStringForBlocks += "}" s := strings.Join([]string{`&SearchBlocksResult{`, @@ -2202,7 +2202,7 @@ func (m *TxResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Events = append(m.Events, v1.Event{}) + m.Events = append(m.Events, v2.Event{}) if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2805,7 +2805,7 @@ func (m *Result) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Events = append(m.Events, v1.Event{}) + m.Events = append(m.Events, v2.Event{}) if err := m.Events[len(m.Events)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3550,7 +3550,7 @@ func (m *SearchBlocksResult) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Blocks = append(m.Blocks, &v11.Block{}) + m.Blocks = append(m.Blocks, &v21.Block{}) if err := m.Blocks[len(m.Blocks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/types/address/hash.go b/types/address/hash.go index ee7398518f..1847114a0d 100644 --- a/types/address/hash.go +++ b/types/address/hash.go @@ -6,7 +6,7 @@ import ( "fmt" "sort" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "cosmossdk.io/errors" diff --git a/types/address/hash_test.go b/types/address/hash_test.go index a52cd5d092..664f6a845d 100644 --- a/types/address/hash_test.go +++ b/types/address/hash_test.go @@ -5,7 +5,7 @@ import ( "slices" "testing" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/cometbft/cometbft/v2/crypto/tmhash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) diff --git a/types/context.go b/types/context.go index 7109c1af1c..f01861dc21 100644 --- a/types/context.go +++ b/types/context.go @@ -4,8 +4,8 @@ import ( "context" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/core/comet" "cosmossdk.io/core/header" diff --git a/types/context_test.go b/types/context_test.go index 111cd4867f..a25d9272d3 100644 --- a/types/context_test.go +++ b/types/context_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/types/errors/abci.go b/types/errors/abci.go index 8344f465cc..d7d251a10d 100644 --- a/types/errors/abci.go +++ b/types/errors/abci.go @@ -1,7 +1,7 @@ package errors import ( - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" errorsmod "cosmossdk.io/errors" ) diff --git a/types/events.go b/types/events.go index 9178ea1c71..9f7a4977a3 100644 --- a/types/events.go +++ b/types/events.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/jsonpb" proto "github.com/cosmos/gogoproto/proto" diff --git a/types/events_test.go b/types/events_test.go index 0b6b365d86..bf192caa1e 100644 --- a/types/events_test.go +++ b/types/events_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/suite" "cosmossdk.io/math" diff --git a/types/mempool/mempool_test.go b/types/mempool/mempool_test.go index 2ee5efa98e..c84abcfa38 100644 --- a/types/mempool/mempool_test.go +++ b/types/mempool/mempool_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" protov2 "google.golang.org/protobuf/proto" diff --git a/types/mempool/priority_nonce_test.go b/types/mempool/priority_nonce_test.go index e9a3c7f335..83a9abe423 100644 --- a/types/mempool/priority_nonce_test.go +++ b/types/mempool/priority_nonce_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "cosmossdk.io/log" diff --git a/types/mempool/sender_nonce_property_test.go b/types/mempool/sender_nonce_property_test.go index f39b037a27..8ff9282855 100644 --- a/types/mempool/sender_nonce_property_test.go +++ b/types/mempool/sender_nonce_property_test.go @@ -3,7 +3,7 @@ package mempool_test import ( "sort" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "pgregory.net/rapid" diff --git a/types/mempool/sender_nonce_test.go b/types/mempool/sender_nonce_test.go index 5d9804d44a..c997af5368 100644 --- a/types/mempool/sender_nonce_test.go +++ b/types/mempool/sender_nonce_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "cosmossdk.io/log" diff --git a/types/module/core_module.go b/types/module/core_module.go index c02943e99c..8f252e38c1 100644 --- a/types/module/core_module.go +++ b/types/module/core_module.go @@ -3,7 +3,7 @@ package module import ( "encoding/json" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" diff --git a/types/module/module.go b/types/module/module.go index b2ebca09e7..13e26a8387 100644 --- a/types/module/module.go +++ b/types/module/module.go @@ -36,7 +36,7 @@ import ( "slices" "sort" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" diff --git a/types/module/module_test.go b/types/module/module_test.go index ca2044fada..63a3a7cafd 100644 --- a/types/module/module_test.go +++ b/types/module/module_test.go @@ -7,8 +7,8 @@ import ( "io" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/spf13/cobra" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/types/query/pagination_test.go b/types/query/pagination_test.go index d8790a9efb..ba35f2229b 100644 --- a/types/query/pagination_test.go +++ b/types/query/pagination_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/suite" "cosmossdk.io/depinject" diff --git a/types/result.go b/types/result.go index 7ef5d6a05d..6fa111bec3 100644 --- a/types/result.go +++ b/types/result.go @@ -5,9 +5,9 @@ import ( "encoding/json" "strings" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" "github.com/cosmos/gogoproto/proto" "github.com/cosmos/cosmos-sdk/codec" diff --git a/types/result_test.go b/types/result_test.go index 914c56d9ed..61d64deea9 100644 --- a/types/result_test.go +++ b/types/result_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtt "github.com/cometbft/cometbft/api/cometbft/types/v1" - coretypes "github.com/cometbft/cometbft/rpc/core/types" - cmt "github.com/cometbft/cometbft/types" + cmtt "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" + cmt "github.com/cometbft/cometbft/v2/types" "github.com/golang/protobuf/proto" //nolint:staticcheck // grpc-gateway uses deprecated golang/protobuf "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/types/staking.go b/types/staking.go index 5688c06235..d299b81915 100644 --- a/types/staking.go +++ b/types/staking.go @@ -12,7 +12,7 @@ import ( // // This value is constant as this should not change without a hard fork. // For CometBFT this should be set to 1 block, for more details see: -// https://github.com/cometbft/cometbft/blob/main/spec/abci/abci%2B%2B_basic_concepts.md#consensusblock-execution-methods +// https://github.com/cometbft/cometbft/v2/blob/main/spec/abci/abci%2B%2B_basic_concepts.md#consensusblock-execution-methods const ValidatorUpdateDelay int64 = 1 var ( diff --git a/types/tx/service.pb.go b/types/tx/service.pb.go index 5a1eead6f4..f1792da131 100644 --- a/types/tx/service.pb.go +++ b/types/tx/service.pb.go @@ -6,7 +6,7 @@ package tx import ( context "context" fmt "fmt" - v1 "github.com/cometbft/cometbft/api/cometbft/types/v1" + v2 "github.com/cometbft/cometbft/api/cometbft/types/v2" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" @@ -659,8 +659,8 @@ func (m *GetBlockWithTxsRequest) GetPagination() *query.PageRequest { type GetBlockWithTxsResponse struct { // txs are the transactions in the block. Txs []*Tx `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` - BlockId *v1.BlockID `protobuf:"bytes,2,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` - Block *v1.Block `protobuf:"bytes,3,opt,name=block,proto3" json:"block,omitempty"` + BlockId *v2.BlockID `protobuf:"bytes,2,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + Block *v2.Block `protobuf:"bytes,3,opt,name=block,proto3" json:"block,omitempty"` // pagination defines a pagination for the response. Pagination *query.PageResponse `protobuf:"bytes,4,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -705,14 +705,14 @@ func (m *GetBlockWithTxsResponse) GetTxs() []*Tx { return nil } -func (m *GetBlockWithTxsResponse) GetBlockId() *v1.BlockID { +func (m *GetBlockWithTxsResponse) GetBlockId() *v2.BlockID { if m != nil { return m.BlockId } return nil } -func (m *GetBlockWithTxsResponse) GetBlock() *v1.Block { +func (m *GetBlockWithTxsResponse) GetBlock() *v2.Block { if m != nil { return m.Block } @@ -1124,90 +1124,90 @@ func init() { func init() { proto.RegisterFile("cosmos/tx/v1beta1/service.proto", fileDescriptor_e0b00a618705eca7) } var fileDescriptor_e0b00a618705eca7 = []byte{ - // 1314 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x97, 0xcf, 0x6f, 0x13, 0x47, - 0x14, 0xc7, 0xb3, 0x9b, 0x5f, 0xce, 0x73, 0x42, 0xcc, 0x24, 0x80, 0x31, 0xe0, 0x98, 0x85, 0x10, - 0x13, 0x89, 0x5d, 0x62, 0x88, 0xa8, 0x50, 0xab, 0xca, 0x6b, 0x9b, 0x34, 0x50, 0x30, 0x5a, 0xa7, - 0xaa, 0xa8, 0x2a, 0x59, 0x6b, 0x7b, 0xb0, 0xb7, 0xd8, 0xbb, 0xc6, 0x3b, 0x89, 0xd6, 0xa2, 0xa8, - 0x55, 0x4f, 0x6d, 0xd5, 0xaa, 0x95, 0xfa, 0x17, 0xf4, 0xde, 0x23, 0x7f, 0x44, 0xc5, 0x09, 0xd1, - 0x4b, 0xd5, 0x53, 0x05, 0x3d, 0xf5, 0xaf, 0xa8, 0x76, 0x66, 0xd6, 0xde, 0xb5, 0x77, 0x49, 0xe2, - 0xde, 0x66, 0x76, 0xde, 0xbc, 0xf7, 0x99, 0xef, 0xcc, 0xbc, 0x37, 0x0b, 0x6b, 0x75, 0xcb, 0xee, - 0x58, 0xb6, 0x42, 0x1c, 0xe5, 0x60, 0xab, 0x86, 0x89, 0xbe, 0xa5, 0xd8, 0xb8, 0x77, 0x60, 0xd4, - 0xb1, 0xdc, 0xed, 0x59, 0xc4, 0x42, 0x27, 0x99, 0x81, 0x4c, 0x1c, 0x99, 0x1b, 0xa4, 0xce, 0x37, - 0x2d, 0xab, 0xd9, 0xc6, 0x8a, 0xde, 0x35, 0x14, 0xdd, 0x34, 0x2d, 0xa2, 0x13, 0xc3, 0x32, 0x6d, - 0x36, 0x21, 0x75, 0x89, 0x7b, 0xac, 0xe9, 0x36, 0x56, 0xf4, 0x5a, 0xdd, 0x18, 0x38, 0x76, 0x3b, - 0xdc, 0x28, 0x35, 0x1e, 0x96, 0x38, 0x7c, 0x6c, 0xd3, 0xef, 0xe0, 0xe9, 0x3e, 0xee, 0xf5, 0x07, - 0x36, 0x5d, 0xbd, 0x69, 0x98, 0x34, 0x1a, 0xb7, 0xbd, 0x50, 0xb7, 0x3a, 0x98, 0xd4, 0x1e, 0x13, - 0x85, 0xf4, 0xbb, 0xd8, 0x56, 0x0e, 0xb6, 0x94, 0x5a, 0xdb, 0xaa, 0x3f, 0x89, 0x1e, 0xa6, 0x0d, - 0x3e, 0x7c, 0x96, 0x45, 0xaa, 0xd2, 0x9e, 0xc2, 0x17, 0x4a, 0x3b, 0xd2, 0xb7, 0x22, 0xa0, 0x1d, - 0x4c, 0xf6, 0x1c, 0xbb, 0x74, 0x80, 0x4d, 0xa2, 0xe1, 0xa7, 0xfb, 0xd8, 0x26, 0x28, 0x05, 0x73, - 0xd8, 0xed, 0xdb, 0x49, 0x21, 0x33, 0x9d, 0x5d, 0x50, 0xc5, 0xa4, 0xa0, 0xf1, 0x2f, 0xe8, 0x2e, - 0xc0, 0x90, 0x2f, 0x29, 0x66, 0x84, 0x6c, 0x3c, 0x77, 0x45, 0xe6, 0x5e, 0xdd, 0xc5, 0xc8, 0x74, - 0x31, 0x9e, 0x8c, 0xf2, 0x43, 0xbd, 0x89, 0xb9, 0x5f, 0xea, 0xc7, 0x37, 0x1b, 0x6d, 0x43, 0xcc, - 0xea, 0x35, 0x70, 0xaf, 0x5a, 0xeb, 0x27, 0xa7, 0x33, 0x42, 0xf6, 0x44, 0x2e, 0x25, 0x8f, 0x6d, - 0x84, 0x5c, 0x76, 0x4d, 0xd4, 0xbe, 0x36, 0x6f, 0xb1, 0x06, 0x42, 0x30, 0xd3, 0xd5, 0x9b, 0x38, - 0x39, 0x93, 0x11, 0xb2, 0x33, 0x1a, 0x6d, 0xa3, 0x55, 0x98, 0x6d, 0x1b, 0x1d, 0x83, 0x24, 0x67, - 0xe9, 0x47, 0xd6, 0x41, 0x57, 0x61, 0x96, 0xd2, 0x24, 0xe7, 0x32, 0x42, 0x76, 0x41, 0x5d, 0xf9, - 0xeb, 0xc5, 0xb5, 0x65, 0x16, 0xe0, 0x9a, 0xdd, 0x78, 0x92, 0xb9, 0x2e, 0x6f, 0x5f, 0xd7, 0x98, - 0x85, 0xf4, 0xaf, 0x00, 0x2b, 0x01, 0x29, 0xec, 0xae, 0x65, 0xda, 0x18, 0x6d, 0xc0, 0x34, 0x71, - 0x98, 0x10, 0xf1, 0xdc, 0xa9, 0x10, 0xbc, 0x3d, 0x47, 0x73, 0x2d, 0xd0, 0x0e, 0x2c, 0x12, 0xa7, - 0xda, 0xe3, 0xf3, 0xec, 0xa4, 0x48, 0x67, 0x5c, 0x0e, 0x48, 0x43, 0xcf, 0x86, 0x6f, 0x22, 0x37, - 0xd6, 0xe2, 0x64, 0xd0, 0xb6, 0xd1, 0xbd, 0x80, 0xc2, 0xd3, 0x54, 0xe1, 0x8d, 0x43, 0x15, 0x66, - 0xb3, 0xc7, 0x24, 0x5e, 0x85, 0x59, 0x62, 0x11, 0xbd, 0xcd, 0xc5, 0x62, 0x1d, 0x09, 0x03, 0x52, - 0x7b, 0x96, 0xde, 0xa8, 0xeb, 0x36, 0x71, 0x31, 0xd8, 0xb6, 0x9f, 0x85, 0x18, 0x71, 0xaa, 0xb5, - 0x3e, 0xc1, 0xee, 0x7a, 0x85, 0xec, 0xa2, 0x36, 0x4f, 0x1c, 0xd5, 0xed, 0xa2, 0x9b, 0x30, 0xd3, - 0xb1, 0x1a, 0x98, 0xee, 0xf7, 0x89, 0x5c, 0x26, 0x44, 0x86, 0x81, 0xbf, 0xfb, 0x56, 0x03, 0x6b, - 0xd4, 0x5a, 0xfa, 0x1c, 0x56, 0x02, 0x61, 0xb8, 0xa4, 0x25, 0x88, 0xfb, 0x94, 0xa2, 0xa1, 0x8e, - 0x2a, 0x14, 0x0c, 0x85, 0x92, 0xda, 0xb0, 0x5c, 0x31, 0x3a, 0xfb, 0x6d, 0x9d, 0x78, 0x07, 0x0c, - 0x5d, 0x05, 0x91, 0x38, 0xdc, 0x61, 0xf8, 0x5e, 0x51, 0x81, 0x44, 0xe2, 0x20, 0xd9, 0xb7, 0x58, - 0x77, 0x55, 0x8b, 0x21, 0xa7, 0xe3, 0xe6, 0x8d, 0x81, 0x02, 0xd2, 0xf7, 0x02, 0x24, 0x86, 0xe1, - 0xf8, 0x4a, 0xde, 0x87, 0x58, 0x53, 0xb7, 0xab, 0x86, 0xf9, 0xd8, 0xe2, 0x51, 0x2f, 0x46, 0x2f, - 0x63, 0x47, 0xb7, 0x77, 0xcd, 0xc7, 0x96, 0x36, 0xdf, 0x64, 0x0d, 0xf4, 0x1e, 0xcc, 0xf5, 0xb0, - 0xbd, 0xdf, 0x26, 0xfc, 0x1a, 0x65, 0xa2, 0xe7, 0x6a, 0xd4, 0x4e, 0xe3, 0xf6, 0x92, 0x04, 0x8b, - 0xf4, 0xac, 0x7a, 0xeb, 0x46, 0x30, 0xd3, 0xd2, 0xed, 0x16, 0x65, 0x58, 0xd0, 0x68, 0x5b, 0x7a, - 0x0e, 0x4b, 0xdc, 0x86, 0xc3, 0xae, 0x1f, 0x2a, 0x0e, 0x15, 0x66, 0x64, 0x77, 0xc4, 0x09, 0x77, - 0xe7, 0x27, 0x01, 0x4e, 0xef, 0x60, 0xa2, 0xba, 0x79, 0xea, 0x53, 0x83, 0xb4, 0xf6, 0x1c, 0xdb, - 0xa3, 0x3d, 0x0d, 0x73, 0x2d, 0x6c, 0x34, 0x5b, 0x84, 0xc2, 0x4c, 0x6b, 0xbc, 0x87, 0xee, 0x4c, - 0x9e, 0x5a, 0xfc, 0x67, 0xfe, 0xf6, 0xa9, 0xd7, 0x2f, 0xae, 0x9d, 0x0c, 0x6e, 0xe4, 0xb6, 0x9c, - 0x93, 0xbe, 0x13, 0xe1, 0xcc, 0x18, 0xd1, 0x71, 0x6f, 0xf9, 0x36, 0xc4, 0x68, 0xea, 0xad, 0x1a, - 0x0d, 0x4e, 0xe8, 0xa6, 0x2c, 0x96, 0x7e, 0x65, 0x96, 0x75, 0x0f, 0xb6, 0x64, 0x1a, 0x63, 0xb7, - 0xa8, 0xcd, 0x53, 0xdb, 0xdd, 0x06, 0x92, 0x61, 0x96, 0x36, 0xf9, 0x75, 0x4e, 0x46, 0xcd, 0xd1, - 0x98, 0x19, 0xda, 0x09, 0x48, 0x31, 0x73, 0xac, 0x1c, 0x70, 0x14, 0x2d, 0xf2, 0xb0, 0xbc, 0xe7, - 0x14, 0x71, 0xdd, 0xbd, 0xab, 0x87, 0xde, 0xfe, 0xdb, 0x2b, 0xaf, 0xc7, 0x6e, 0xc6, 0x2d, 0xe9, - 0x01, 0x24, 0x86, 0x2e, 0x8e, 0x75, 0xc4, 0xc2, 0xfd, 0xdd, 0x77, 0x91, 0x4a, 0xa6, 0x1f, 0xe9, - 0xff, 0xb8, 0x53, 0x5d, 0x3c, 0xcf, 0x1d, 0xc7, 0x3b, 0xee, 0x12, 0xef, 0xc2, 0xaa, 0xe7, 0x23, - 0xdf, 0x31, 0x4c, 0xcb, 0xe3, 0xba, 0x00, 0xa0, 0xbb, 0xfd, 0xea, 0x17, 0xb6, 0x65, 0xf2, 0x4b, - 0xb7, 0x40, 0xbf, 0xdc, 0xb5, 0x2d, 0x33, 0xdc, 0x57, 0x19, 0x4e, 0x8d, 0xf8, 0xe2, 0x50, 0x17, - 0x61, 0x91, 0x39, 0xab, 0x19, 0xa6, 0xde, 0xeb, 0x73, 0xb0, 0x38, 0xfd, 0xa6, 0xd2, 0x4f, 0x51, - 0xfa, 0xaf, 0x7a, 0xfa, 0x07, 0xe0, 0x26, 0xf5, 0x77, 0xcf, 0x05, 0x0c, 0xf8, 0xe3, 0x80, 0x13, - 0xac, 0x76, 0xf3, 0x23, 0x98, 0xe7, 0x65, 0x1b, 0x25, 0x61, 0xb5, 0xac, 0x15, 0x4b, 0x5a, 0x55, - 0x7d, 0x54, 0xfd, 0xe4, 0x41, 0xe5, 0x61, 0xa9, 0xb0, 0x7b, 0x67, 0xb7, 0x54, 0x4c, 0x4c, 0xa1, - 0x04, 0x2c, 0x0e, 0x46, 0xf2, 0x95, 0x42, 0x42, 0x40, 0x27, 0x61, 0x69, 0xf0, 0xa5, 0x58, 0xaa, - 0x14, 0x12, 0xe2, 0xe6, 0xd7, 0x02, 0x2c, 0x05, 0x6a, 0x0b, 0x4a, 0x43, 0x4a, 0xd5, 0xca, 0xf9, - 0x62, 0x21, 0x5f, 0xd9, 0xab, 0xde, 0x2f, 0x17, 0x4b, 0x23, 0x6e, 0xcf, 0xc3, 0xea, 0xc8, 0xb8, - 0xfa, 0x71, 0xb9, 0x70, 0x2f, 0x21, 0xa4, 0xc4, 0x98, 0x80, 0xce, 0xc0, 0xca, 0xc8, 0x68, 0xe5, - 0xd1, 0x83, 0x42, 0x42, 0x74, 0x39, 0x47, 0x06, 0xf2, 0x74, 0x64, 0x3a, 0xf7, 0x23, 0xc0, 0x7c, - 0x85, 0x3d, 0x17, 0xd1, 0x33, 0x88, 0x79, 0x55, 0x00, 0x49, 0x21, 0x47, 0x72, 0xa4, 0x22, 0xa5, - 0x2e, 0xbd, 0xd3, 0x86, 0xe7, 0xca, 0x2b, 0xdf, 0xfc, 0xf1, 0xcf, 0x2f, 0x62, 0xe6, 0xb6, 0xb0, - 0x29, 0x9d, 0x53, 0x42, 0x9e, 0xaa, 0x5e, 0xc0, 0xa7, 0x30, 0x4b, 0x53, 0x3a, 0x5a, 0x0b, 0xf1, - 0xea, 0x2f, 0x08, 0xa9, 0x4c, 0xb4, 0x01, 0x8f, 0xb9, 0x4e, 0x63, 0xae, 0xa1, 0x0b, 0x4a, 0xd8, - 0x23, 0xd5, 0x56, 0x9e, 0xb9, 0x45, 0xe4, 0x39, 0xfa, 0x0a, 0xe2, 0xbe, 0x12, 0x8e, 0xd6, 0xdf, - 0x55, 0xf9, 0x87, 0xe1, 0xaf, 0x1c, 0x66, 0xc6, 0x21, 0x2e, 0x52, 0x88, 0x73, 0xee, 0xc2, 0x4f, - 0x87, 0x73, 0xa0, 0x2f, 0x21, 0xee, 0x7b, 0x96, 0x85, 0x02, 0x8c, 0xbf, 0x60, 0x43, 0x01, 0x42, - 0x5e, 0x77, 0x52, 0x9a, 0x02, 0x24, 0x51, 0x54, 0xf4, 0xdf, 0x04, 0x58, 0x1e, 0xa9, 0x19, 0xe8, - 0x6a, 0xb8, 0xef, 0x90, 0x4a, 0x97, 0xda, 0x3c, 0x8a, 0x29, 0x47, 0x51, 0x5f, 0x86, 0x65, 0x6a, - 0xca, 0xb7, 0x81, 0xd6, 0x23, 0x76, 0x89, 0x56, 0x0b, 0xe5, 0x19, 0x2b, 0xa0, 0xcf, 0xd1, 0x0f, - 0x02, 0xc4, 0xbc, 0x4b, 0x1c, 0x7a, 0x3c, 0x47, 0x92, 0x7e, 0xe8, 0xf1, 0x1c, 0xcd, 0xea, 0xd2, - 0xad, 0x97, 0xe3, 0x37, 0x9c, 0x72, 0xa5, 0xdd, 0x8d, 0x3b, 0x1b, 0x82, 0xd6, 0x60, 0x04, 0x0c, - 0x87, 0x25, 0xbd, 0x08, 0x9c, 0x40, 0xc2, 0x8f, 0xc0, 0x09, 0x66, 0xf1, 0x09, 0x70, 0x30, 0x23, - 0xf8, 0x55, 0x80, 0xa5, 0x40, 0x0e, 0x46, 0x1b, 0xef, 0x88, 0xe7, 0x4f, 0xaa, 0xa9, 0xec, 0xe1, - 0x86, 0x9c, 0xee, 0x83, 0x28, 0xba, 0xcb, 0x2e, 0xdd, 0x5a, 0x24, 0x9d, 0x42, 0x33, 0x2a, 0x67, - 0xf4, 0xa5, 0xe1, 0x08, 0xc6, 0xf1, 0xc4, 0x1f, 0xc1, 0x18, 0x92, 0xd1, 0x27, 0x60, 0x64, 0x1b, - 0xca, 0x18, 0xd5, 0x0f, 0x7f, 0x7f, 0x93, 0x16, 0x5e, 0xbd, 0x49, 0x0b, 0x7f, 0xbf, 0x49, 0x0b, - 0x3f, 0xbf, 0x4d, 0x4f, 0xbd, 0x7a, 0x9b, 0x9e, 0xfa, 0xf3, 0x6d, 0x7a, 0xea, 0xb3, 0xf5, 0xa6, - 0x41, 0x5a, 0xfb, 0x35, 0xf7, 0x75, 0xe3, 0x39, 0x19, 0x86, 0xe1, 0x7f, 0xa7, 0xc4, 0xa9, 0xcd, - 0xd1, 0xbf, 0xcf, 0x1b, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x1d, 0xd5, 0xa1, 0x97, 0x0f, - 0x00, 0x00, + // 1313 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x97, 0xcf, 0x8f, 0xd3, 0x46, + 0x14, 0xc7, 0xd7, 0xde, 0x5f, 0xd9, 0x97, 0x5d, 0x36, 0xcc, 0x06, 0x08, 0x01, 0xb2, 0xc1, 0xb0, + 0x6c, 0x58, 0x09, 0x1b, 0x02, 0x2b, 0x2a, 0xd4, 0xaa, 0x8a, 0x93, 0xb0, 0x5d, 0x28, 0x04, 0x39, + 0x5b, 0x55, 0x54, 0x95, 0x22, 0x27, 0x19, 0x12, 0x97, 0xc4, 0x0e, 0xf1, 0xec, 0xca, 0x11, 0x45, + 0xad, 0x7a, 0x6a, 0xab, 0x56, 0xad, 0xd4, 0xbf, 0xa0, 0xf7, 0x1e, 0xf9, 0x23, 0x2a, 0x4e, 0x88, + 0x5e, 0xaa, 0x9e, 0x2a, 0xe8, 0xa9, 0x7f, 0x45, 0xe5, 0x99, 0x71, 0x62, 0x27, 0x36, 0xcb, 0xa6, + 0xb7, 0x19, 0xcf, 0x9b, 0xf7, 0x3e, 0xf3, 0x9d, 0x99, 0xf7, 0xc6, 0xb0, 0xde, 0xb0, 0xec, 0xae, + 0x65, 0x2b, 0xc4, 0x51, 0x0e, 0xae, 0xd5, 0x31, 0xd1, 0xaf, 0x29, 0x36, 0xee, 0x1f, 0x18, 0x0d, + 0x2c, 0xf7, 0xfa, 0x16, 0xb1, 0xd0, 0x71, 0x66, 0x20, 0x13, 0x47, 0xe6, 0x06, 0xe9, 0xb3, 0x2d, + 0xcb, 0x6a, 0x75, 0xb0, 0xa2, 0xf7, 0x0c, 0x45, 0x37, 0x4d, 0x8b, 0xe8, 0xc4, 0xb0, 0x4c, 0x9b, + 0x4d, 0x48, 0x5f, 0xe0, 0x1e, 0xeb, 0xba, 0x8d, 0x15, 0xbd, 0xde, 0x30, 0x86, 0x8e, 0xdd, 0x0e, + 0x37, 0x4a, 0x4f, 0x86, 0x25, 0x0e, 0x1f, 0xdb, 0xf2, 0x3b, 0x78, 0xb2, 0x8f, 0xfb, 0x83, 0xa1, + 0x4d, 0x4f, 0x6f, 0x19, 0x26, 0x8d, 0xc6, 0x6d, 0xcf, 0x35, 0xac, 0x2e, 0x26, 0xf5, 0x47, 0x44, + 0x21, 0x83, 0x1e, 0xb6, 0x95, 0x83, 0xbc, 0x52, 0xef, 0x58, 0x8d, 0xc7, 0xd1, 0xc3, 0xb4, 0xc1, + 0x87, 0x4f, 0xb3, 0x48, 0x35, 0xda, 0x53, 0xf8, 0x42, 0x69, 0x47, 0xfa, 0x56, 0x04, 0xb4, 0x83, + 0xc9, 0x9e, 0x63, 0x97, 0x0f, 0xb0, 0x49, 0x34, 0xfc, 0x64, 0x1f, 0xdb, 0x04, 0xa5, 0x61, 0x01, + 0xbb, 0x7d, 0x3b, 0x25, 0x64, 0x67, 0x73, 0x4b, 0xaa, 0x98, 0x12, 0x34, 0xfe, 0x05, 0xdd, 0x01, + 0x18, 0xf1, 0xa5, 0xc4, 0xac, 0x90, 0x8b, 0xe7, 0x2f, 0xc9, 0xdc, 0xab, 0xbb, 0x18, 0x99, 0x2e, + 0xc6, 0x93, 0x51, 0x7e, 0xa0, 0xb7, 0x30, 0xf7, 0x4b, 0xfd, 0xf8, 0x66, 0xa3, 0x6d, 0x88, 0x59, + 0xfd, 0x26, 0xee, 0xd7, 0xea, 0x83, 0xd4, 0x6c, 0x56, 0xc8, 0x1d, 0xcb, 0xa7, 0xe5, 0x89, 0x8d, + 0x90, 0x2b, 0xae, 0x89, 0x3a, 0xd0, 0x16, 0x2d, 0xd6, 0x40, 0x08, 0xe6, 0x7a, 0x7a, 0x0b, 0xa7, + 0xe6, 0xb2, 0x42, 0x6e, 0x4e, 0xa3, 0x6d, 0x94, 0x84, 0xf9, 0x8e, 0xd1, 0x35, 0x48, 0x6a, 0x9e, + 0x7e, 0x64, 0x1d, 0x74, 0x19, 0xe6, 0x29, 0x4d, 0x6a, 0x21, 0x2b, 0xe4, 0x96, 0xd4, 0xb5, 0xbf, + 0x9e, 0x5f, 0x59, 0x65, 0x01, 0xae, 0xd8, 0xcd, 0xc7, 0xd9, 0xab, 0xf2, 0xf6, 0x55, 0x8d, 0x59, + 0x48, 0xff, 0x0a, 0xb0, 0x16, 0x90, 0xc2, 0xee, 0x59, 0xa6, 0x8d, 0xd1, 0x26, 0xcc, 0x12, 0x87, + 0x09, 0x11, 0xcf, 0x9f, 0x08, 0xc1, 0xdb, 0x73, 0x34, 0xd7, 0x02, 0xed, 0xc0, 0x32, 0x71, 0x6a, + 0x7d, 0x3e, 0xcf, 0x4e, 0x89, 0x74, 0xc6, 0xc5, 0x80, 0x34, 0xf4, 0x6c, 0xf8, 0x26, 0x72, 0x63, + 0x2d, 0x4e, 0x86, 0x6d, 0x1b, 0xdd, 0x0d, 0x28, 0x3c, 0x4b, 0x15, 0xde, 0x3c, 0x54, 0x61, 0x36, + 0x7b, 0x42, 0xe2, 0x24, 0xcc, 0x13, 0x8b, 0xe8, 0x1d, 0x2e, 0x16, 0xeb, 0x48, 0x18, 0x90, 0xda, + 0xb7, 0xf4, 0x66, 0x43, 0xb7, 0x89, 0x8b, 0xc1, 0xb6, 0xfd, 0x34, 0xc4, 0x88, 0x53, 0xab, 0x0f, + 0x08, 0x76, 0xd7, 0x2b, 0xe4, 0x96, 0xb5, 0x45, 0xe2, 0xa8, 0x6e, 0x17, 0xdd, 0x80, 0xb9, 0xae, + 0xd5, 0xc4, 0x74, 0xbf, 0x8f, 0xe5, 0xb3, 0x21, 0x32, 0x0c, 0xfd, 0xdd, 0xb3, 0x9a, 0x58, 0xa3, + 0xd6, 0xd2, 0xe7, 0xb0, 0x16, 0x08, 0xc3, 0x25, 0x2d, 0x43, 0xdc, 0xa7, 0x14, 0x0d, 0xf5, 0xae, + 0x42, 0xc1, 0x48, 0x28, 0xa9, 0x03, 0xab, 0x55, 0xa3, 0xbb, 0xdf, 0xd1, 0x89, 0x77, 0xc0, 0xd0, + 0x65, 0x10, 0x89, 0xc3, 0x1d, 0x86, 0xef, 0x15, 0x15, 0x48, 0x24, 0x0e, 0x92, 0x7d, 0x8b, 0x75, + 0x57, 0xb5, 0x1c, 0x72, 0x3a, 0x6e, 0x5c, 0x1f, 0x2a, 0x20, 0x7d, 0x2f, 0x40, 0x62, 0x14, 0x8e, + 0xaf, 0xe4, 0x7d, 0x88, 0xb5, 0x74, 0xbb, 0x66, 0x98, 0x8f, 0x2c, 0x1e, 0xf5, 0x7c, 0xf4, 0x32, + 0x76, 0x74, 0x7b, 0xd7, 0x7c, 0x64, 0x69, 0x8b, 0x2d, 0xd6, 0x40, 0xef, 0xc1, 0x42, 0x1f, 0xdb, + 0xfb, 0x1d, 0xc2, 0xaf, 0x51, 0x36, 0x7a, 0xae, 0x46, 0xed, 0x34, 0x6e, 0x2f, 0x49, 0xb0, 0x4c, + 0xcf, 0xaa, 0xb7, 0x6e, 0x04, 0x73, 0x6d, 0xdd, 0x6e, 0x53, 0x86, 0x25, 0x8d, 0xb6, 0xa5, 0x67, + 0xb0, 0xc2, 0x6d, 0x38, 0xec, 0xc6, 0xa1, 0xe2, 0x50, 0x61, 0xc6, 0x76, 0x47, 0x9c, 0x72, 0x77, + 0x7e, 0x12, 0xe0, 0xe4, 0x0e, 0x26, 0xaa, 0x9b, 0xa7, 0x3e, 0x35, 0x48, 0x7b, 0xcf, 0xb1, 0x3d, + 0xda, 0x93, 0xb0, 0xd0, 0xc6, 0x46, 0xab, 0x4d, 0x28, 0xcc, 0xac, 0xc6, 0x7b, 0xe8, 0xf6, 0xf4, + 0xa9, 0xc5, 0x7f, 0xe6, 0x6f, 0x9d, 0x78, 0xf5, 0xfc, 0xca, 0xf1, 0xe0, 0x46, 0x6e, 0xcb, 0x79, + 0xe9, 0x3b, 0x11, 0x4e, 0x4d, 0x10, 0x1d, 0xf5, 0x96, 0x6f, 0x43, 0x8c, 0xa6, 0xde, 0x9a, 0xd1, + 0xe4, 0x84, 0x6e, 0xca, 0x62, 0xe9, 0x57, 0x66, 0x59, 0xf7, 0x20, 0x2f, 0xd3, 0x18, 0xbb, 0x25, + 0x6d, 0x91, 0xda, 0xee, 0x36, 0x91, 0x0c, 0xf3, 0xb4, 0xc9, 0xaf, 0x73, 0x2a, 0x6a, 0x8e, 0xc6, + 0xcc, 0xd0, 0x4e, 0x40, 0x8a, 0xb9, 0x23, 0xe5, 0x80, 0x77, 0xd1, 0xa2, 0x00, 0xab, 0x7b, 0x4e, + 0x09, 0x37, 0xdc, 0xbb, 0x7a, 0xe8, 0xed, 0xbf, 0xb5, 0xf6, 0x6a, 0xe2, 0x66, 0xdc, 0x94, 0xee, + 0x43, 0x62, 0xe4, 0xe2, 0x48, 0x47, 0x2c, 0xdc, 0xdf, 0x3d, 0x17, 0xa9, 0x6c, 0xfa, 0x91, 0xfe, + 0x8f, 0x3b, 0xd5, 0xc5, 0xf3, 0xdc, 0x71, 0xbc, 0xa3, 0x2e, 0xf1, 0x0e, 0x24, 0x3d, 0x1f, 0x85, + 0xae, 0x61, 0x5a, 0x1e, 0xd7, 0x39, 0x00, 0xdd, 0xed, 0xd7, 0xbe, 0xb0, 0x2d, 0x93, 0x5f, 0xba, + 0x25, 0xfa, 0xe5, 0x8e, 0x6d, 0x99, 0xe1, 0xbe, 0x2a, 0x70, 0x62, 0xcc, 0x17, 0x87, 0x3a, 0x0f, + 0xcb, 0xcc, 0x59, 0xdd, 0x30, 0xf5, 0xfe, 0x80, 0x83, 0xc5, 0xe9, 0x37, 0x95, 0x7e, 0x8a, 0xd2, + 0x3f, 0xe9, 0xe9, 0x1f, 0x80, 0x9b, 0xd6, 0xdf, 0x5d, 0x17, 0x30, 0xe0, 0x8f, 0x03, 0x4e, 0xb1, + 0xda, 0xad, 0x8f, 0x60, 0x91, 0x97, 0x6d, 0x94, 0x82, 0x64, 0x45, 0x2b, 0x95, 0xb5, 0x9a, 0xfa, + 0xb0, 0xf6, 0xc9, 0xfd, 0xea, 0x83, 0x72, 0x71, 0xf7, 0xf6, 0x6e, 0xb9, 0x94, 0x98, 0x41, 0x09, + 0x58, 0x1e, 0x8e, 0x14, 0xaa, 0xc5, 0x84, 0x80, 0x8e, 0xc3, 0xca, 0xf0, 0x4b, 0xa9, 0x5c, 0x2d, + 0x26, 0xc4, 0xad, 0xaf, 0x05, 0x58, 0x09, 0xd4, 0x16, 0x94, 0x81, 0xb4, 0xaa, 0x55, 0x0a, 0xa5, + 0x62, 0xa1, 0xba, 0x57, 0xbb, 0x57, 0x29, 0x95, 0xc7, 0xdc, 0x9e, 0x85, 0xe4, 0xd8, 0xb8, 0xfa, + 0x71, 0xa5, 0x78, 0x37, 0x21, 0xa4, 0xc5, 0x98, 0x80, 0x4e, 0xc1, 0xda, 0xd8, 0x68, 0xf5, 0xe1, + 0xfd, 0x62, 0x42, 0x74, 0x39, 0xc7, 0x06, 0x0a, 0x74, 0x64, 0x36, 0xff, 0x23, 0xc0, 0x62, 0x95, + 0x3d, 0x17, 0xd1, 0x53, 0x88, 0x79, 0x55, 0x00, 0x49, 0x21, 0x47, 0x72, 0xac, 0x22, 0xa5, 0x2f, + 0xbc, 0xd5, 0x86, 0xe7, 0xca, 0x4b, 0xdf, 0xfc, 0xf1, 0xcf, 0x2f, 0x62, 0xf6, 0x96, 0xb0, 0x25, + 0x9d, 0x51, 0x42, 0x9e, 0xaa, 0x5e, 0xc0, 0x27, 0x30, 0x4f, 0x53, 0x3a, 0x5a, 0x0f, 0xf1, 0xea, + 0x2f, 0x08, 0xe9, 0x6c, 0xb4, 0x01, 0x8f, 0xb9, 0x41, 0x63, 0xae, 0xa3, 0x73, 0x4a, 0xd8, 0x23, + 0xd5, 0x56, 0x9e, 0xba, 0x45, 0xe4, 0x19, 0xfa, 0x0a, 0xe2, 0xbe, 0x12, 0x8e, 0x36, 0xde, 0x56, + 0xf9, 0x47, 0xe1, 0x2f, 0x1d, 0x66, 0xc6, 0x21, 0xce, 0x53, 0x88, 0x33, 0xee, 0xc2, 0x4f, 0x86, + 0x73, 0xa0, 0x2f, 0x21, 0xee, 0x7b, 0x96, 0x85, 0x02, 0x4c, 0xbe, 0x60, 0x43, 0x01, 0x42, 0x5e, + 0x77, 0x52, 0x86, 0x02, 0xa4, 0x50, 0x54, 0xf4, 0xdf, 0x04, 0x58, 0x1d, 0xab, 0x19, 0xe8, 0x72, + 0xb8, 0xef, 0x90, 0x4a, 0x97, 0xde, 0x7a, 0x17, 0x53, 0x8e, 0xa2, 0xbe, 0x08, 0xcb, 0xd4, 0x94, + 0x6f, 0x13, 0x6d, 0x44, 0xec, 0x12, 0xad, 0x16, 0xca, 0x53, 0x56, 0x40, 0x9f, 0xa1, 0x1f, 0x04, + 0x88, 0x79, 0x97, 0x38, 0xf4, 0x78, 0x8e, 0x25, 0xfd, 0xd0, 0xe3, 0x39, 0x9e, 0xd5, 0xa5, 0x9b, + 0x2f, 0x26, 0x6f, 0x38, 0xe5, 0xca, 0xb8, 0x1b, 0x77, 0x3a, 0x04, 0xad, 0xc9, 0x08, 0x18, 0x0e, + 0x4b, 0x7a, 0x11, 0x38, 0x81, 0x84, 0x1f, 0x81, 0x13, 0xcc, 0xe2, 0x53, 0xe0, 0x60, 0x46, 0xf0, + 0xab, 0x00, 0x2b, 0x81, 0x1c, 0x8c, 0x36, 0xdf, 0x12, 0xcf, 0x9f, 0x54, 0xd3, 0xb9, 0xc3, 0x0d, + 0x39, 0xdd, 0x07, 0x51, 0x74, 0x17, 0x5d, 0xba, 0xf5, 0x48, 0x3a, 0x85, 0x66, 0x54, 0xce, 0xe8, + 0x4b, 0xc3, 0x11, 0x8c, 0x93, 0x89, 0x3f, 0x82, 0x31, 0x24, 0xa3, 0x4f, 0xc1, 0xc8, 0x36, 0x94, + 0x31, 0xaa, 0x1f, 0xfe, 0xfe, 0x3a, 0x23, 0xbc, 0x7c, 0x9d, 0x11, 0xfe, 0x7e, 0x9d, 0x11, 0x7e, + 0x7e, 0x93, 0x99, 0x79, 0xf9, 0x26, 0x33, 0xf3, 0xe7, 0x9b, 0xcc, 0xcc, 0x67, 0x1b, 0x2d, 0x83, + 0xb4, 0xf7, 0xeb, 0xee, 0xeb, 0xc6, 0x73, 0x32, 0x0a, 0xc3, 0xff, 0x4e, 0x89, 0x53, 0x5f, 0xa0, + 0x7f, 0x9f, 0xd7, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xa1, 0xa0, 0x7a, 0xec, 0x97, 0x0f, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3860,7 +3860,7 @@ func (m *GetBlockWithTxsResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.BlockId == nil { - m.BlockId = &v1.BlockID{} + m.BlockId = &v2.BlockID{} } if err := m.BlockId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3896,7 +3896,7 @@ func (m *GetBlockWithTxsResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Block == nil { - m.Block = &v1.Block{} + m.Block = &v2.Block{} } if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/auth/ante/feegrant_test.go b/x/auth/ante/feegrant_test.go index 5a1c60cba2..20acda00e7 100644 --- a/x/auth/ante/feegrant_test.go +++ b/x/auth/ante/feegrant_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/auth/ante/setup_test.go b/x/auth/ante/setup_test.go index 1f1f89ef09..c8345eeeb9 100644 --- a/x/auth/ante/setup_test.go +++ b/x/auth/ante/setup_test.go @@ -3,7 +3,7 @@ package ante_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" storetypes "cosmossdk.io/store/types" diff --git a/x/auth/ante/sigverify_benchmark_test.go b/x/auth/ante/sigverify_benchmark_test.go index b598e6df18..e7c58c7c9c 100644 --- a/x/auth/ante/sigverify_benchmark_test.go +++ b/x/auth/ante/sigverify_benchmark_test.go @@ -3,7 +3,7 @@ package ante_test import ( "testing" - cmtcrypto "github.com/cometbft/cometbft/crypto" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" diff --git a/x/auth/ante/testutil_test.go b/x/auth/ante/testutil_test.go index 63a8f7f46b..ef260a101e 100644 --- a/x/auth/ante/testutil_test.go +++ b/x/auth/ante/testutil_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/auth/keeper/keeper_test.go b/x/auth/keeper/keeper_test.go index 17034b2847..89fcd8c72b 100644 --- a/x/auth/keeper/keeper_test.go +++ b/x/auth/keeper/keeper_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" gogotypes "github.com/cosmos/gogoproto/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/x/auth/migrations/v2/store.go b/x/auth/migrations/v2/store.go index 303f4befaf..5153d65a22 100644 --- a/x/auth/migrations/v2/store.go +++ b/x/auth/migrations/v2/store.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/grpc" "github.com/cosmos/gogoproto/proto" "google.golang.org/grpc/codes" diff --git a/x/auth/migrations/v2/store_test.go b/x/auth/migrations/v2/store_test.go index 879842d574..3238055ba9 100644 --- a/x/auth/migrations/v2/store_test.go +++ b/x/auth/migrations/v2/store_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "cosmossdk.io/depinject" diff --git a/x/auth/migrations/v3/store_test.go b/x/auth/migrations/v3/store_test.go index a43af82936..bd3d21cbf1 100644 --- a/x/auth/migrations/v3/store_test.go +++ b/x/auth/migrations/v3/store_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "cosmossdk.io/collections" diff --git a/x/auth/simulation/proposals_test.go b/x/auth/simulation/proposals_test.go index 4e6ba30f19..339c937511 100644 --- a/x/auth/simulation/proposals_test.go +++ b/x/auth/simulation/proposals_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/auth/tx/query.go b/x/auth/tx/query.go index bcd63f168b..e66f2e1e62 100644 --- a/x/auth/tx/query.go +++ b/x/auth/tx/query.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/auth/types/account.go b/x/auth/types/account.go index b47186680a..c4b3f89845 100644 --- a/x/auth/types/account.go +++ b/x/auth/types/account.go @@ -8,7 +8,7 @@ import ( "slices" "strings" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" diff --git a/x/auth/vesting/client/cli/tx_test.go b/x/auth/vesting/client/cli/tx_test.go index 00119f5d7f..a0b834b877 100644 --- a/x/auth/vesting/client/cli/tx_test.go +++ b/x/auth/vesting/client/cli/tx_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/stretchr/testify/suite" sdkmath "cosmossdk.io/math" diff --git a/x/auth/vesting/module.go b/x/auth/vesting/module.go index eaa0254297..1a4bf42e68 100644 --- a/x/auth/vesting/module.go +++ b/x/auth/vesting/module.go @@ -3,7 +3,7 @@ package vesting import ( "encoding/json" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" "google.golang.org/grpc" diff --git a/x/auth/vesting/msg_server_test.go b/x/auth/vesting/msg_server_test.go index afcfad9a8a..ac6e70655d 100644 --- a/x/auth/vesting/msg_server_test.go +++ b/x/auth/vesting/msg_server_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/auth/vesting/types/vesting_account_test.go b/x/auth/vesting/types/vesting_account_test.go index 82ee27e4f2..51a48e0e00 100644 --- a/x/auth/vesting/types/vesting_account_test.go +++ b/x/auth/vesting/types/vesting_account_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - tmtime "github.com/cometbft/cometbft/types/time" + tmtime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/x/authz/client/cli/tx_test.go b/x/authz/client/cli/tx_test.go index 0760dfd81a..8f2f83f0a5 100644 --- a/x/authz/client/cli/tx_test.go +++ b/x/authz/client/cli/tx_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/x/authz/keeper/genesis_test.go b/x/authz/keeper/genesis_test.go index 60329683de..4e880252b1 100644 --- a/x/authz/keeper/genesis_test.go +++ b/x/authz/keeper/genesis_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/authz/keeper/keeper.go b/x/authz/keeper/keeper.go index b3654cefbd..d8746ff1bd 100644 --- a/x/authz/keeper/keeper.go +++ b/x/authz/keeper/keeper.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" corestoretypes "cosmossdk.io/core/store" diff --git a/x/authz/keeper/keeper_test.go b/x/authz/keeper/keeper_test.go index ab38e91486..a3663f3b6e 100644 --- a/x/authz/keeper/keeper_test.go +++ b/x/authz/keeper/keeper_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/authz/module/abci_test.go b/x/authz/module/abci_test.go index acb66ba9c6..130551eeb8 100644 --- a/x/authz/module/abci_test.go +++ b/x/authz/module/abci_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - types "github.com/cometbft/cometbft/api/cometbft/types/v1" + types "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/authz/simulation/operations_test.go b/x/authz/simulation/operations_test.go index 11ffb7d2e4..4de178f9cc 100644 --- a/x/authz/simulation/operations_test.go +++ b/x/authz/simulation/operations_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/x/bank/app_test.go b/x/bank/app_test.go index 67b1e3ed94..3fec0c7f11 100644 --- a/x/bank/app_test.go +++ b/x/bank/app_test.go @@ -3,8 +3,8 @@ package bank_test import ( "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/bank/bench_test.go b/x/bank/bench_test.go index bbe6fce212..47bda11eeb 100644 --- a/x/bank/bench_test.go +++ b/x/bank/bench_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/bank/client/cli/tx_test.go b/x/bank/client/cli/tx_test.go index 834c4185b6..db46e80a6a 100644 --- a/x/bank/client/cli/tx_test.go +++ b/x/bank/client/cli/tx_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/stretchr/testify/suite" sdkmath "cosmossdk.io/math" diff --git a/x/bank/keeper/collections_test.go b/x/bank/keeper/collections_test.go index 39159eaf84..78bc9682f9 100644 --- a/x/bank/keeper/collections_test.go +++ b/x/bank/keeper/collections_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/bank/keeper/keeper_test.go b/x/bank/keeper/keeper_test.go index f5570c0e7f..4d877a9e77 100644 --- a/x/bank/keeper/keeper_test.go +++ b/x/bank/keeper/keeper_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/bank/simulation/operations_test.go b/x/bank/simulation/operations_test.go index 1f18f0bf7e..044c8e2f54 100644 --- a/x/bank/simulation/operations_test.go +++ b/x/bank/simulation/operations_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/x/bank/simulation/proposals_test.go b/x/bank/simulation/proposals_test.go index b300ff0cce..9c21427692 100644 --- a/x/bank/simulation/proposals_test.go +++ b/x/bank/simulation/proposals_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/circuit/ante/circuit_test.go b/x/circuit/ante/circuit_test.go index 7e2d60d5cd..2951411ac2 100644 --- a/x/circuit/ante/circuit_test.go +++ b/x/circuit/ante/circuit_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" storetypes "cosmossdk.io/store/types" diff --git a/x/circuit/keeper/keeper_test.go b/x/circuit/keeper/keeper_test.go index 3123cb1439..7676ca322a 100644 --- a/x/circuit/keeper/keeper_test.go +++ b/x/circuit/keeper/keeper_test.go @@ -5,7 +5,7 @@ import ( context "context" "testing" - cmproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "cosmossdk.io/core/address" diff --git a/x/consensus/exported/exported.go b/x/consensus/exported/exported.go index 29b3f7342f..7a898e8e4e 100644 --- a/x/consensus/exported/exported.go +++ b/x/consensus/exported/exported.go @@ -3,7 +3,7 @@ package exported import ( "context" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/consensus/keeper/keeper.go b/x/consensus/keeper/keeper.go index 0c8746b806..0f7f1a845c 100644 --- a/x/consensus/keeper/keeper.go +++ b/x/consensus/keeper/keeper.go @@ -3,8 +3,8 @@ package keeper import ( "context" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttypes "github.com/cometbft/cometbft/v2/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/consensus/keeper/keeper_test.go b/x/consensus/keeper/keeper_test.go index f4a158729c..6ff65a83a0 100644 --- a/x/consensus/keeper/keeper_test.go +++ b/x/consensus/keeper/keeper_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttypes "github.com/cometbft/cometbft/v2/types" gogotypes "github.com/cosmos/gogoproto/types" "github.com/stretchr/testify/suite" diff --git a/x/consensus/types/msgs.go b/x/consensus/types/msgs.go index f6556cc28d..3e05e6fc34 100644 --- a/x/consensus/types/msgs.go +++ b/x/consensus/types/msgs.go @@ -3,8 +3,8 @@ package types import ( "errors" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttypes "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttypes "github.com/cometbft/cometbft/v2/types" "github.com/cosmos/gogoproto/types" ) diff --git a/x/consensus/types/query.pb.go b/x/consensus/types/query.pb.go index 34f9ab719d..159d6830db 100644 --- a/x/consensus/types/query.pb.go +++ b/x/consensus/types/query.pb.go @@ -6,7 +6,7 @@ package types import ( context "context" fmt "fmt" - v1 "github.com/cometbft/cometbft/api/cometbft/types/v1" + v2 "github.com/cometbft/cometbft/api/cometbft/types/v2" _ "github.com/cosmos/cosmos-proto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -72,7 +72,7 @@ type QueryParamsResponse struct { // params are the tendermint consensus params stored in the consensus module. // Please note that `params.version` is not populated in this response, it is // tracked separately in the x/upgrade module. - Params *v1.ConsensusParams `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"` + Params *v2.ConsensusParams `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"` } func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } @@ -108,7 +108,7 @@ func (m *QueryParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo -func (m *QueryParamsResponse) GetParams() *v1.ConsensusParams { +func (m *QueryParamsResponse) GetParams() *v2.ConsensusParams { if m != nil { return m.Params } @@ -123,26 +123,27 @@ func init() { func init() { proto.RegisterFile("cosmos/consensus/v1/query.proto", fileDescriptor_bf54d1e5df04cee9) } var fileDescriptor_bf54d1e5df04cee9 = []byte{ - // 302 bytes of a gzipped FileDescriptorProto + // 305 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0xce, 0xcf, 0x2b, 0x4e, 0xcd, 0x2b, 0x2e, 0x2d, 0xd6, 0x2f, 0x33, 0xd4, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86, 0x28, 0xd0, 0x83, 0x2b, 0xd0, 0x2b, 0x33, 0x94, 0x92, 0x49, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xcc, 0xcb, 0xcb, 0x2f, 0x49, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0x86, 0x68, 0x91, - 0x92, 0x4b, 0xce, 0xcf, 0x4d, 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x05, 0x9b, - 0x58, 0x90, 0x58, 0x94, 0x98, 0x0b, 0x93, 0x97, 0x84, 0x18, 0x19, 0x0f, 0xe6, 0xe9, 0x43, 0xcd, - 0x07, 0x73, 0x94, 0x44, 0xb8, 0x84, 0x02, 0x41, 0x96, 0x07, 0x80, 0xd5, 0x07, 0xa5, 0x16, 0x96, - 0xa6, 0x16, 0x97, 0x28, 0x05, 0x72, 0x09, 0xa3, 0x88, 0x16, 0x17, 0x80, 0x1c, 0x23, 0x64, 0xc5, - 0xc5, 0x06, 0x31, 0x57, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x49, 0x0f, 0x66, 0xb1, 0x1e, - 0xd8, 0x62, 0xbd, 0x32, 0x43, 0x3d, 0x67, 0x98, 0xb3, 0xa1, 0x7a, 0xa1, 0x3a, 0x8c, 0xe6, 0x32, - 0x72, 0xb1, 0x82, 0xcd, 0x14, 0x9a, 0xcc, 0xc8, 0xc5, 0x06, 0x91, 0x14, 0x52, 0xd7, 0xc3, 0xe2, - 0x59, 0x3d, 0x4c, 0x07, 0x49, 0x69, 0x10, 0x56, 0x08, 0x71, 0xa3, 0x92, 0xd9, 0xa9, 0x2d, 0xba, - 0xfc, 0x10, 0xc5, 0xba, 0xc5, 0x29, 0xd9, 0x0a, 0x06, 0x7a, 0x26, 0xe6, 0x4d, 0x97, 0x9f, 0x4c, - 0x66, 0x92, 0x15, 0x92, 0xd6, 0xc7, 0x16, 0xf6, 0x10, 0xf7, 0x39, 0x79, 0x9c, 0x78, 0x24, 0xc7, - 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, - 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x5e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x12, 0xc8, 0xaf, - 0x08, 0x03, 0x60, 0xe6, 0xeb, 0x57, 0x20, 0x99, 0x06, 0x0e, 0x84, 0x24, 0x36, 0x70, 0xc8, 0x1a, - 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x85, 0xe1, 0xa6, 0xea, 0x01, 0x00, 0x00, + 0x92, 0x4b, 0xce, 0xcf, 0x4d, 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, + 0x2f, 0x33, 0xd2, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x85, 0xc9, 0x4b, 0x42, 0x8c, 0x8c, 0x07, 0xf3, + 0xf4, 0xa1, 0xe6, 0x83, 0x39, 0x4a, 0x22, 0x5c, 0x42, 0x81, 0x20, 0xcb, 0x03, 0xc0, 0xea, 0x83, + 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x94, 0x02, 0xb9, 0x84, 0x51, 0x44, 0x8b, 0x0b, 0x40, 0x8e, + 0x11, 0xb2, 0xe2, 0x62, 0x83, 0x98, 0x2b, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0xa4, 0xa4, 0x07, + 0xb3, 0x58, 0x0f, 0x6c, 0xb1, 0x5e, 0x99, 0x91, 0x9e, 0x33, 0xcc, 0xd9, 0x50, 0xbd, 0x50, 0x1d, + 0x46, 0x73, 0x19, 0xb9, 0x58, 0xc1, 0x66, 0x0a, 0x4d, 0x66, 0xe4, 0x62, 0x83, 0x48, 0x0a, 0xa9, + 0xeb, 0x61, 0xf1, 0xac, 0x1e, 0xa6, 0x83, 0xa4, 0x34, 0x08, 0x2b, 0x84, 0xb8, 0x51, 0xc9, 0xec, + 0xd4, 0x16, 0x5d, 0x7e, 0x88, 0x62, 0xdd, 0xe2, 0x94, 0x6c, 0x05, 0x03, 0x3d, 0x13, 0xf3, 0xa6, + 0xcb, 0x4f, 0x26, 0x33, 0xc9, 0x0a, 0x49, 0xeb, 0x63, 0x0b, 0x7b, 0x88, 0xfb, 0x9c, 0x3c, 0x4e, + 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, 0x4a, 0x2f, 0x3d, 0xb3, 0x24, 0xa3, 0x34, + 0x09, 0xe4, 0x57, 0x84, 0x01, 0x30, 0xf3, 0xf5, 0x2b, 0x90, 0x4c, 0x03, 0x07, 0x42, 0x12, 0x1b, + 0x38, 0x64, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xef, 0xc3, 0x08, 0x4d, 0xea, 0x01, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -434,7 +435,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Params == nil { - m.Params = &v1.ConsensusParams{} + m.Params = &v2.ConsensusParams{} } if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/consensus/types/tx.pb.go b/x/consensus/types/tx.pb.go index 9212292d13..b33f735681 100644 --- a/x/consensus/types/tx.pb.go +++ b/x/consensus/types/tx.pb.go @@ -6,7 +6,7 @@ package types import ( context "context" fmt "fmt" - v1 "github.com/cometbft/cometbft/api/cometbft/types/v1" + v2 "github.com/cometbft/cometbft/api/cometbft/types/v2" _ "github.com/cosmos/cosmos-proto" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -40,12 +40,12 @@ type MsgUpdateParams struct { // separarately in x/upgrade. // // NOTE: All parameters must be supplied. - Block *v1.BlockParams `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` - Evidence *v1.EvidenceParams `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence,omitempty"` - Validator *v1.ValidatorParams `protobuf:"bytes,4,opt,name=validator,proto3" json:"validator,omitempty"` - Abci *v1.ABCIParams `protobuf:"bytes,5,opt,name=abci,proto3" json:"abci,omitempty"` // Deprecated: Do not use. - Synchrony *v1.SynchronyParams `protobuf:"bytes,6,opt,name=synchrony,proto3" json:"synchrony,omitempty"` - Feature *v1.FeatureParams `protobuf:"bytes,7,opt,name=feature,proto3" json:"feature,omitempty"` + Block *v2.BlockParams `protobuf:"bytes,2,opt,name=block,proto3" json:"block,omitempty"` + Evidence *v2.EvidenceParams `protobuf:"bytes,3,opt,name=evidence,proto3" json:"evidence,omitempty"` + Validator *v2.ValidatorParams `protobuf:"bytes,4,opt,name=validator,proto3" json:"validator,omitempty"` + Abci *v2.ABCIParams `protobuf:"bytes,5,opt,name=abci,proto3" json:"abci,omitempty"` // Deprecated: Do not use. + Synchrony *v2.SynchronyParams `protobuf:"bytes,6,opt,name=synchrony,proto3" json:"synchrony,omitempty"` + Feature *v2.FeatureParams `protobuf:"bytes,7,opt,name=feature,proto3" json:"feature,omitempty"` } func (m *MsgUpdateParams) Reset() { *m = MsgUpdateParams{} } @@ -88,21 +88,21 @@ func (m *MsgUpdateParams) GetAuthority() string { return "" } -func (m *MsgUpdateParams) GetBlock() *v1.BlockParams { +func (m *MsgUpdateParams) GetBlock() *v2.BlockParams { if m != nil { return m.Block } return nil } -func (m *MsgUpdateParams) GetEvidence() *v1.EvidenceParams { +func (m *MsgUpdateParams) GetEvidence() *v2.EvidenceParams { if m != nil { return m.Evidence } return nil } -func (m *MsgUpdateParams) GetValidator() *v1.ValidatorParams { +func (m *MsgUpdateParams) GetValidator() *v2.ValidatorParams { if m != nil { return m.Validator } @@ -110,21 +110,21 @@ func (m *MsgUpdateParams) GetValidator() *v1.ValidatorParams { } // Deprecated: Do not use. -func (m *MsgUpdateParams) GetAbci() *v1.ABCIParams { +func (m *MsgUpdateParams) GetAbci() *v2.ABCIParams { if m != nil { return m.Abci } return nil } -func (m *MsgUpdateParams) GetSynchrony() *v1.SynchronyParams { +func (m *MsgUpdateParams) GetSynchrony() *v2.SynchronyParams { if m != nil { return m.Synchrony } return nil } -func (m *MsgUpdateParams) GetFeature() *v1.FeatureParams { +func (m *MsgUpdateParams) GetFeature() *v2.FeatureParams { if m != nil { return m.Feature } @@ -177,39 +177,39 @@ func init() { func init() { proto.RegisterFile("cosmos/consensus/v1/tx.proto", fileDescriptor_2135c60575ab504d) } var fileDescriptor_2135c60575ab504d = []byte{ - // 500 bytes of a gzipped FileDescriptorProto + // 502 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6b, 0x13, 0x41, - 0x1c, 0xc5, 0xbb, 0x36, 0x69, 0xcd, 0x28, 0x14, 0x27, 0x4a, 0xa7, 0x41, 0x97, 0x18, 0x44, 0x4a, - 0x30, 0xb3, 0x4d, 0x8d, 0x8a, 0x82, 0x60, 0x57, 0x94, 0x7a, 0x28, 0xca, 0x96, 0x7a, 0xf0, 0x22, + 0x1c, 0xc5, 0xbb, 0x36, 0x69, 0xcd, 0x28, 0x14, 0x37, 0x4a, 0xa7, 0x41, 0x97, 0x18, 0x44, 0x4a, + 0x30, 0x33, 0x6d, 0x8c, 0x8a, 0x82, 0x60, 0x57, 0x94, 0x7a, 0x28, 0xca, 0x96, 0x7a, 0xf0, 0x22, 0xb3, 0xbb, 0xd3, 0xcd, 0xd2, 0xee, 0xce, 0xb2, 0x33, 0x59, 0x9b, 0x9b, 0x08, 0x5e, 0x3c, 0xf9, 0x45, 0x84, 0x1c, 0xfa, 0x21, 0xc4, 0x53, 0xf1, 0x24, 0x9e, 0x24, 0x39, 0xe4, 0x6b, 0x48, 0x66, 0x66, 0xb3, 0x1a, 0x57, 0xf1, 0x12, 0xc8, 0xbe, 0xf7, 0x7b, 0x6f, 0xe7, 0xbf, 0xff, 0x01, 0x57, - 0x3d, 0xc6, 0x23, 0xc6, 0x2d, 0x8f, 0xc5, 0x9c, 0xc6, 0x7c, 0xc0, 0xad, 0xac, 0x6b, 0x89, 0x13, - 0x9c, 0xa4, 0x4c, 0x30, 0x58, 0x57, 0x2a, 0x9e, 0xab, 0x38, 0xeb, 0x36, 0x2e, 0x91, 0x28, 0x8c, - 0x99, 0x25, 0x7f, 0x95, 0xaf, 0xb1, 0xa1, 0x7c, 0xaf, 0xe5, 0x3f, 0x4b, 0x43, 0x4a, 0x5a, 0xd7, - 0x05, 0x11, 0x0f, 0x66, 0xd1, 0x11, 0x0f, 0xb4, 0x60, 0x7a, 0x2c, 0xa2, 0xc2, 0x3d, 0x14, 0x96, - 0x18, 0x26, 0x54, 0xf6, 0x26, 0x24, 0x25, 0x91, 0x06, 0x5b, 0x9f, 0x2a, 0x60, 0x6d, 0x8f, 0x07, - 0x07, 0x89, 0x4f, 0x04, 0x7d, 0x21, 0x15, 0x78, 0x17, 0xd4, 0xc8, 0x40, 0xf4, 0x59, 0x1a, 0x8a, - 0x21, 0x32, 0x9a, 0xc6, 0x66, 0xcd, 0x46, 0x5f, 0x4f, 0x3b, 0x97, 0x75, 0xe3, 0x8e, 0xef, 0xa7, - 0x94, 0xf3, 0x7d, 0x91, 0x86, 0x71, 0xe0, 0x14, 0x56, 0xd8, 0x03, 0x55, 0xf7, 0x98, 0x79, 0x47, - 0xe8, 0x5c, 0xd3, 0xd8, 0xbc, 0xb0, 0x6d, 0xe2, 0xbc, 0x1b, 0xcb, 0x6e, 0x9c, 0x75, 0xb1, 0x3d, - 0xd3, 0x55, 0x8d, 0xa3, 0xcc, 0xf0, 0x21, 0x38, 0x4f, 0xb3, 0xd0, 0xa7, 0xb1, 0x47, 0xd1, 0xb2, - 0x04, 0xaf, 0x97, 0x80, 0x4f, 0xb4, 0x45, 0xb3, 0x73, 0x04, 0x3e, 0x02, 0xb5, 0x8c, 0x1c, 0x87, - 0x3e, 0x11, 0x2c, 0x45, 0x15, 0xc9, 0xb7, 0x4a, 0xf8, 0x97, 0xb9, 0x47, 0x07, 0x14, 0x10, 0xdc, - 0x05, 0x15, 0xe2, 0x7a, 0x21, 0xaa, 0x4a, 0xf8, 0x5a, 0x09, 0xbc, 0x63, 0x3f, 0x7e, 0xa6, 0x38, - 0xfb, 0xca, 0xf7, 0xd3, 0xce, 0x9a, 0x1a, 0x44, 0x87, 0xfb, 0x47, 0xcd, 0x2d, 0x7c, 0x67, 0x0b, - 0x19, 0x8e, 0x4c, 0x80, 0x07, 0xa0, 0xc6, 0x87, 0xb1, 0xd7, 0x4f, 0x59, 0x3c, 0x44, 0x2b, 0x7f, - 0x7d, 0x97, 0xfd, 0xdc, 0xa3, 0x33, 0xeb, 0x7f, 0x66, 0xf6, 0x9c, 0x22, 0x09, 0x3e, 0x07, 0xab, - 0x87, 0x94, 0x88, 0x41, 0x4a, 0xd1, 0xaa, 0x0c, 0x6d, 0x96, 0x84, 0x3e, 0x55, 0x8e, 0x7f, 0x45, - 0xe6, 0x29, 0x0f, 0xee, 0xbf, 0x9b, 0x8e, 0xda, 0xc5, 0x87, 0xfb, 0x30, 0x1d, 0xb5, 0x6f, 0x16, - 0x66, 0xeb, 0xe4, 0x97, 0x3d, 0x5d, 0xd8, 0x8d, 0xd6, 0x06, 0x58, 0x5f, 0x78, 0xe4, 0x50, 0x9e, - 0xcc, 0xec, 0xdb, 0xef, 0x0d, 0xb0, 0xbc, 0xc7, 0x03, 0xf8, 0x06, 0x5c, 0xfc, 0x6d, 0x9d, 0x6e, - 0xe0, 0x92, 0xfd, 0xc6, 0x0b, 0x29, 0x8d, 0x5b, 0xff, 0xe3, 0xca, 0xbb, 0x5a, 0xf5, 0x2f, 0x8b, - 0xe7, 0xeb, 0xdd, 0x6b, 0x54, 0xdf, 0x4e, 0x47, 0x6d, 0xc3, 0xde, 0xfd, 0x3c, 0x36, 0x8d, 0xb3, - 0xb1, 0x69, 0xfc, 0x18, 0x9b, 0xc6, 0xc7, 0x89, 0xb9, 0x74, 0x36, 0x31, 0x97, 0xbe, 0x4d, 0xcc, - 0xa5, 0x57, 0x38, 0x08, 0x45, 0x7f, 0xe0, 0xce, 0xa6, 0x67, 0xcd, 0x6f, 0x64, 0xe9, 0xb1, 0xe5, - 0x58, 0xdd, 0x15, 0x79, 0x47, 0x6e, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xda, 0x27, 0xbf, 0xba, - 0xbf, 0x03, 0x00, 0x00, + 0x3d, 0xc6, 0x23, 0xc6, 0xb1, 0xc7, 0x62, 0x4e, 0x63, 0x3e, 0xe0, 0x38, 0xdb, 0xc6, 0xe2, 0x04, + 0x25, 0x29, 0x13, 0xcc, 0xac, 0x2b, 0x15, 0xcd, 0x55, 0x94, 0x6d, 0x37, 0x2e, 0x91, 0x28, 0x8c, + 0x19, 0x96, 0xbf, 0xca, 0xd7, 0xd8, 0x50, 0xbe, 0xd7, 0xf2, 0x1f, 0xd6, 0x90, 0x92, 0xd6, 0x75, + 0x41, 0xc4, 0x83, 0x59, 0x74, 0xc4, 0x03, 0x2d, 0x58, 0x1e, 0x8b, 0xa8, 0x70, 0x0f, 0x05, 0x16, + 0xc3, 0x84, 0x72, 0x9c, 0x75, 0x71, 0x42, 0x52, 0x12, 0x69, 0xb0, 0xf5, 0xa9, 0x02, 0xd6, 0xf6, + 0x78, 0x70, 0x90, 0xf8, 0x44, 0xd0, 0x17, 0x52, 0x31, 0xef, 0x82, 0x1a, 0x19, 0x88, 0x3e, 0x4b, + 0x43, 0x31, 0x84, 0x46, 0xd3, 0xd8, 0xac, 0xd9, 0xf0, 0xeb, 0x69, 0xe7, 0xb2, 0x6e, 0xdc, 0xf1, + 0xfd, 0x94, 0x72, 0xbe, 0x2f, 0xd2, 0x30, 0x0e, 0x9c, 0xc2, 0x6a, 0xf6, 0x40, 0xd5, 0x3d, 0x66, + 0xde, 0x11, 0x3c, 0xd7, 0x34, 0x36, 0x2f, 0x74, 0x2d, 0x94, 0x77, 0x23, 0xd9, 0x8d, 0xb2, 0x2e, + 0xb2, 0x67, 0xba, 0xaa, 0x71, 0x94, 0xd9, 0x7c, 0x08, 0xce, 0xd3, 0x2c, 0xf4, 0x69, 0xec, 0x51, + 0xb8, 0x2c, 0xc1, 0xeb, 0x25, 0xe0, 0x13, 0x6d, 0xd1, 0xec, 0x1c, 0x31, 0x1f, 0x81, 0x5a, 0x46, + 0x8e, 0x43, 0x9f, 0x08, 0x96, 0xc2, 0x8a, 0xe4, 0x5b, 0x25, 0xfc, 0xcb, 0xdc, 0xa3, 0x03, 0x0a, + 0xc8, 0xdc, 0x05, 0x15, 0xe2, 0x7a, 0x21, 0xac, 0x4a, 0xf8, 0x5a, 0x09, 0xbc, 0x63, 0x3f, 0x7e, + 0xa6, 0x38, 0xfb, 0xca, 0xf7, 0xd3, 0xce, 0x9a, 0x1a, 0x44, 0x87, 0xfb, 0x47, 0xcd, 0x2d, 0x74, + 0x67, 0x0b, 0x1a, 0x8e, 0x4c, 0x30, 0x0f, 0x40, 0x8d, 0x0f, 0x63, 0xaf, 0x9f, 0xb2, 0x78, 0x08, + 0x57, 0xfe, 0xfa, 0x2e, 0xfb, 0xb9, 0x47, 0x67, 0xd6, 0xff, 0xcc, 0xec, 0x39, 0x45, 0x92, 0xf9, + 0x1c, 0xac, 0x1e, 0x52, 0x22, 0x06, 0x29, 0x85, 0xab, 0x32, 0xb4, 0x59, 0x12, 0xfa, 0x54, 0x39, + 0xfe, 0x15, 0x99, 0xa7, 0x3c, 0xb8, 0xff, 0x6e, 0x3a, 0x6a, 0x17, 0x1f, 0xee, 0xc3, 0x74, 0xd4, + 0xbe, 0x59, 0x98, 0xf1, 0xc9, 0x2f, 0x7b, 0xba, 0xb0, 0x1b, 0xad, 0x0d, 0xb0, 0xbe, 0xf0, 0xc8, + 0xa1, 0x3c, 0x99, 0xd9, 0xbb, 0xef, 0x0d, 0xb0, 0xbc, 0xc7, 0x03, 0xf3, 0x0d, 0xb8, 0xf8, 0xdb, + 0x3a, 0xdd, 0x40, 0x25, 0xfb, 0x8d, 0x16, 0x52, 0x1a, 0xb7, 0xfe, 0xc7, 0x95, 0x77, 0xb5, 0xea, + 0x5f, 0x16, 0xcf, 0xd7, 0xbb, 0xd7, 0xa8, 0xbe, 0x9d, 0x8e, 0xda, 0x86, 0xbd, 0xfb, 0x79, 0x6c, + 0x19, 0x67, 0x63, 0xcb, 0xf8, 0x31, 0xb6, 0x8c, 0x8f, 0x13, 0x6b, 0xe9, 0x6c, 0x62, 0x2d, 0x7d, + 0x9b, 0x58, 0x4b, 0xaf, 0x50, 0x10, 0x8a, 0xfe, 0xc0, 0x9d, 0x4d, 0x0f, 0xcf, 0x6f, 0x64, 0xe9, + 0xb1, 0xe5, 0x58, 0xdd, 0x15, 0x79, 0x47, 0x6e, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xa7, 0xd8, + 0x92, 0xdc, 0xbf, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -576,7 +576,7 @@ func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Block == nil { - m.Block = &v1.BlockParams{} + m.Block = &v2.BlockParams{} } if err := m.Block.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -612,7 +612,7 @@ func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Evidence == nil { - m.Evidence = &v1.EvidenceParams{} + m.Evidence = &v2.EvidenceParams{} } if err := m.Evidence.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -648,7 +648,7 @@ func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Validator == nil { - m.Validator = &v1.ValidatorParams{} + m.Validator = &v2.ValidatorParams{} } if err := m.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -684,7 +684,7 @@ func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Abci == nil { - m.Abci = &v1.ABCIParams{} + m.Abci = &v2.ABCIParams{} } if err := m.Abci.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -720,7 +720,7 @@ func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Synchrony == nil { - m.Synchrony = &v1.SynchronyParams{} + m.Synchrony = &v2.SynchronyParams{} } if err := m.Synchrony.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -756,7 +756,7 @@ func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Feature == nil { - m.Feature = &v1.FeatureParams{} + m.Feature = &v2.FeatureParams{} } if err := m.Feature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/distribution/client/cli/tx_test.go b/x/distribution/client/cli/tx_test.go index daa9b4cf91..df70d647b2 100644 --- a/x/distribution/client/cli/tx_test.go +++ b/x/distribution/client/cli/tx_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - abci "github.com/cometbft/cometbft/abci/types" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/x/distribution/keeper/abci_test.go b/x/distribution/keeper/abci_test.go index f8fb868f59..e0e3e816b4 100644 --- a/x/distribution/keeper/abci_test.go +++ b/x/distribution/keeper/abci_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/distribution/keeper/allocation.go b/x/distribution/keeper/allocation.go index dc3cf671a7..f91178ab48 100644 --- a/x/distribution/keeper/allocation.go +++ b/x/distribution/keeper/allocation.go @@ -3,7 +3,7 @@ package keeper import ( "context" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/math" diff --git a/x/distribution/keeper/allocation_test.go b/x/distribution/keeper/allocation_test.go index bb915294b6..a94ff14cb9 100644 --- a/x/distribution/keeper/allocation_test.go +++ b/x/distribution/keeper/allocation_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/distribution/keeper/delegation_test.go b/x/distribution/keeper/delegation_test.go index 61bd81369c..0cb16b065b 100644 --- a/x/distribution/keeper/delegation_test.go +++ b/x/distribution/keeper/delegation_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/distribution/keeper/keeper_test.go b/x/distribution/keeper/keeper_test.go index 5af9214d7a..442bbb03ab 100644 --- a/x/distribution/keeper/keeper_test.go +++ b/x/distribution/keeper/keeper_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/distribution/simulation/operations_test.go b/x/distribution/simulation/operations_test.go index 550b59555d..fa2287bf71 100644 --- a/x/distribution/simulation/operations_test.go +++ b/x/distribution/simulation/operations_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/x/distribution/simulation/proposals_test.go b/x/distribution/simulation/proposals_test.go index 15d634f645..78af70cf6d 100644 --- a/x/distribution/simulation/proposals_test.go +++ b/x/distribution/simulation/proposals_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" sdkmath "cosmossdk.io/math" diff --git a/x/evidence/genesis_test.go b/x/evidence/genesis_test.go index 539883338b..49128dcb4b 100644 --- a/x/evidence/genesis_test.go +++ b/x/evidence/genesis_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/x/evidence/keeper/keeper_test.go b/x/evidence/keeper/keeper_test.go index 3252cd2288..6fc73362e3 100644 --- a/x/evidence/keeper/keeper_test.go +++ b/x/evidence/keeper/keeper_test.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/evidence/types/evidence.go b/x/evidence/types/evidence.go index 33658335f8..d2e3941d90 100644 --- a/x/evidence/types/evidence.go +++ b/x/evidence/types/evidence.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/cometbft/cometbft/v2/crypto/tmhash" "cosmossdk.io/core/address" "cosmossdk.io/core/comet" diff --git a/x/feegrant/basic_fee_test.go b/x/feegrant/basic_fee_test.go index af2a34630e..0d4cc1b052 100644 --- a/x/feegrant/basic_fee_test.go +++ b/x/feegrant/basic_fee_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/feegrant/client/cli/tx_test.go b/x/feegrant/client/cli/tx_test.go index 7bec80e5f9..05ed867f6f 100644 --- a/x/feegrant/client/cli/tx_test.go +++ b/x/feegrant/client/cli/tx_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/x/feegrant/filtered_fee_test.go b/x/feegrant/filtered_fee_test.go index ae213e3ae0..01bd1db4d9 100644 --- a/x/feegrant/filtered_fee_test.go +++ b/x/feegrant/filtered_fee_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - ocproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + ocproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/feegrant/grant_test.go b/x/feegrant/grant_test.go index 902e1b4fec..05c9eb97ed 100644 --- a/x/feegrant/grant_test.go +++ b/x/feegrant/grant_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" storetypes "cosmossdk.io/store/types" diff --git a/x/feegrant/periodic_fee_test.go b/x/feegrant/periodic_fee_test.go index ff44ac4881..1133d6f07d 100644 --- a/x/feegrant/periodic_fee_test.go +++ b/x/feegrant/periodic_fee_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/feegrant/simulation/operations_test.go b/x/feegrant/simulation/operations_test.go index 52e3a89e99..8daccaaa52 100644 --- a/x/feegrant/simulation/operations_test.go +++ b/x/feegrant/simulation/operations_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/x/genutil/client/cli/gentx_test.go b/x/genutil/client/cli/gentx_test.go index 011bb24a7e..f3d228c7bf 100644 --- a/x/genutil/client/cli/gentx_test.go +++ b/x/genutil/client/cli/gentx_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - abci "github.com/cometbft/cometbft/abci/types" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/stretchr/testify/suite" sdkmath "cosmossdk.io/math" diff --git a/x/genutil/client/cli/init.go b/x/genutil/client/cli/init.go index 8fef2ba23e..63dbb8034c 100644 --- a/x/genutil/client/cli/init.go +++ b/x/genutil/client/cli/init.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - cfg "github.com/cometbft/cometbft/config" - cmttypes "github.com/cometbft/cometbft/types" + cfg "github.com/cometbft/cometbft/v2/config" + cmttypes "github.com/cometbft/cometbft/v2/types" "github.com/cosmos/go-bip39" "github.com/spf13/cobra" diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go index 77b220cfa4..974eba4f8b 100644 --- a/x/genutil/client/cli/init_test.go +++ b/x/genutil/client/cli/init_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - abci_server "github.com/cometbft/cometbft/abci/server" + abci_server "github.com/cometbft/cometbft/v2/abci/server" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/x/genutil/client/testutil/helpers.go b/x/genutil/client/testutil/helpers.go index 7a3fdc424c..2e54f261e5 100644 --- a/x/genutil/client/testutil/helpers.go +++ b/x/genutil/client/testutil/helpers.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - cmtcfg "github.com/cometbft/cometbft/config" + cmtcfg "github.com/cometbft/cometbft/v2/config" "github.com/spf13/viper" "cosmossdk.io/log" diff --git a/x/genutil/collect.go b/x/genutil/collect.go index 422a278b5a..d73442ff09 100644 --- a/x/genutil/collect.go +++ b/x/genutil/collect.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - cfg "github.com/cometbft/cometbft/config" + cfg "github.com/cometbft/cometbft/v2/config" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/genutil/genesis.go b/x/genutil/genesis.go index 0f8f7d4867..4748eda6c7 100644 --- a/x/genutil/genesis.go +++ b/x/genutil/genesis.go @@ -1,7 +1,7 @@ package genutil import ( - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/core/genesis" diff --git a/x/genutil/gentx.go b/x/genutil/gentx.go index 6b969145fb..49477705d2 100644 --- a/x/genutil/gentx.go +++ b/x/genutil/gentx.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/core/genesis" diff --git a/x/genutil/module.go b/x/genutil/module.go index 5d3337ba24..80a32270b7 100644 --- a/x/genutil/module.go +++ b/x/genutil/module.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" modulev1 "cosmossdk.io/api/cosmos/genutil/module/v1" diff --git a/x/genutil/testutil/expected_keepers_mocks.go b/x/genutil/testutil/expected_keepers_mocks.go index 52ba5af193..e5fcf82809 100644 --- a/x/genutil/testutil/expected_keepers_mocks.go +++ b/x/genutil/testutil/expected_keepers_mocks.go @@ -14,7 +14,7 @@ import ( json "encoding/json" reflect "reflect" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/cometbft/cometbft/v2/abci/types" codec "github.com/cosmos/cosmos-sdk/codec" types0 "github.com/cosmos/cosmos-sdk/types" exported "github.com/cosmos/cosmos-sdk/x/bank/exported" diff --git a/x/genutil/types/chain_id.go b/x/genutil/types/chain_id.go index 1d991a9f14..92f1a02cba 100644 --- a/x/genutil/types/chain_id.go +++ b/x/genutil/types/chain_id.go @@ -7,7 +7,7 @@ import ( "io" "strings" - "github.com/cometbft/cometbft/types" + "github.com/cometbft/cometbft/v2/types" ) const ChainIDFieldName = "chain_id" diff --git a/x/genutil/types/expected_keepers.go b/x/genutil/types/expected_keepers.go index 95f7d09b34..cdaa514da0 100644 --- a/x/genutil/types/expected_keepers.go +++ b/x/genutil/types/expected_keepers.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/genutil/types/genesis.go b/x/genutil/types/genesis.go index 6c65b968db..ad11b6cabe 100644 --- a/x/genutil/types/genesis.go +++ b/x/genutil/types/genesis.go @@ -11,10 +11,10 @@ import ( "path/filepath" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmttypes "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmtjson "github.com/cometbft/cometbft/v2/libs/json" + cmttypes "github.com/cometbft/cometbft/v2/types" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/cosmos/cosmos-sdk/version" ) diff --git a/x/genutil/types/genesis_test.go b/x/genutil/types/genesis_test.go index c5c729380f..7bfe868983 100644 --- a/x/genutil/types/genesis_test.go +++ b/x/genutil/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - cmttypes "github.com/cometbft/cometbft/types" + cmttypes "github.com/cometbft/cometbft/v2/types" "gotest.tools/v3/assert" "gotest.tools/v3/golden" diff --git a/x/genutil/utils.go b/x/genutil/utils.go index fdaaa85342..e1ad7288ac 100644 --- a/x/genutil/utils.go +++ b/x/genutil/utils.go @@ -8,11 +8,11 @@ import ( "path/filepath" "time" - cfg "github.com/cometbft/cometbft/config" - tmed25519 "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - cmttypes "github.com/cometbft/cometbft/types" + cfg "github.com/cometbft/cometbft/v2/config" + tmed25519 "github.com/cometbft/cometbft/v2/crypto/ed25519" + "github.com/cometbft/cometbft/v2/p2p" + "github.com/cometbft/cometbft/v2/privval" + cmttypes "github.com/cometbft/cometbft/v2/types" "github.com/cosmos/go-bip39" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" @@ -60,7 +60,7 @@ func InitializeNodeValidatorFilesFromMnemonic(config *cfg.Config, mnemonic strin return "", nil, err } - nodeID = string(nodeKey.ID()) + nodeID = nodeKey.ID() pvKeyFile := config.PrivValidatorKeyFile() if err := os.MkdirAll(filepath.Dir(pvKeyFile), 0o777); err != nil { diff --git a/x/genutil/utils_test.go b/x/genutil/utils_test.go index da960dcd90..ed1d336b6f 100644 --- a/x/genutil/utils_test.go +++ b/x/genutil/utils_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/config" - tmed25519 "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/privval" + "github.com/cometbft/cometbft/v2/config" + tmed25519 "github.com/cometbft/cometbft/v2/crypto/ed25519" + "github.com/cometbft/cometbft/v2/privval" "github.com/stretchr/testify/require" ) diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go index 3a9f83c7ca..39b5aa4aa7 100644 --- a/x/gov/abci_test.go +++ b/x/gov/abci_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "cosmossdk.io/collections" diff --git a/x/gov/client/cli/tx_test.go b/x/gov/client/cli/tx_test.go index e39e551a01..ea01a11332 100644 --- a/x/gov/client/cli/tx_test.go +++ b/x/gov/client/cli/tx_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - abci "github.com/cometbft/cometbft/abci/types" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/stretchr/testify/suite" sdkmath "cosmossdk.io/math" diff --git a/x/gov/client/utils/query.go b/x/gov/client/utils/query.go index a567f3b03a..0ec3c0b51f 100644 --- a/x/gov/client/utils/query.go +++ b/x/gov/client/utils/query.go @@ -13,7 +13,7 @@ import ( const ( defaultPage = 1 - defaultLimit = 30 // should be consistent with https://github.com/cometbft/cometbft/tree/v0.37.x/rpc/core#pagination + defaultLimit = 30 // should be consistent with https://github.com/cometbft/cometbft/v2/tree/v0.37.x/rpc/core#pagination ) // Proposer contains metadata of a governance proposal used for querying a diff --git a/x/gov/client/utils/query_test.go b/x/gov/client/utils/query_test.go index 994c363983..f20399d73b 100644 --- a/x/gov/client/utils/query_test.go +++ b/x/gov/client/utils/query_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/cometbft/cometbft/rpc/client/mock" - coretypes "github.com/cometbft/cometbft/rpc/core/types" - cmttypes "github.com/cometbft/cometbft/types" + "github.com/cometbft/cometbft/v2/rpc/client/mock" + coretypes "github.com/cometbft/cometbft/v2/rpc/core/types" + cmttypes "github.com/cometbft/cometbft/v2/types" "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" diff --git a/x/gov/keeper/common_test.go b/x/gov/keeper/common_test.go index fa87a960f3..f50196fc4a 100644 --- a/x/gov/keeper/common_test.go +++ b/x/gov/keeper/common_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/gov/simulation/operations_test.go b/x/gov/simulation/operations_test.go index b35e24da6e..a2510ae034 100644 --- a/x/gov/simulation/operations_test.go +++ b/x/gov/simulation/operations_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" diff --git a/x/gov/simulation/proposals_test.go b/x/gov/simulation/proposals_test.go index 3bc57d23f1..bc7740f7d6 100644 --- a/x/gov/simulation/proposals_test.go +++ b/x/gov/simulation/proposals_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/group/client/cli/tx_test.go b/x/group/client/cli/tx_test.go index acde682729..474e1ac568 100644 --- a/x/group/client/cli/tx_test.go +++ b/x/group/client/cli/tx_test.go @@ -7,8 +7,8 @@ import ( "io" "testing" - abci "github.com/cometbft/cometbft/abci/types" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/stretchr/testify/suite" // without this import amino json encoding will fail when resolving any types diff --git a/x/group/keeper/genesis.go b/x/group/keeper/genesis.go index 2ac6081420..21e6fddeb2 100644 --- a/x/group/keeper/genesis.go +++ b/x/group/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( "encoding/json" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/errors" diff --git a/x/group/keeper/keeper_test.go b/x/group/keeper/keeper_test.go index c24229987b..010c39b3c2 100644 --- a/x/group/keeper/keeper_test.go +++ b/x/group/keeper/keeper_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - cmttime "github.com/cometbft/cometbft/types/time" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/group/keeper/msg_server_test.go b/x/group/keeper/msg_server_test.go index 171885d7e5..8fe5d8ba8a 100644 --- a/x/group/keeper/msg_server_test.go +++ b/x/group/keeper/msg_server_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "go.uber.org/mock/gomock" "github.com/cosmos/cosmos-sdk/codec/address" diff --git a/x/group/module/abci_test.go b/x/group/module/abci_test.go index c5072b396f..4e8c84977a 100644 --- a/x/group/module/abci_test.go +++ b/x/group/module/abci_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "cosmossdk.io/core/address" diff --git a/x/group/simulation/operations_test.go b/x/group/simulation/operations_test.go index 4472ad9ec4..26d94d1569 100644 --- a/x/group/simulation/operations_test.go +++ b/x/group/simulation/operations_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/x/mint/simulation/proposals_test.go b/x/mint/simulation/proposals_test.go index d43ec82de7..92eb7f3c41 100644 --- a/x/mint/simulation/proposals_test.go +++ b/x/mint/simulation/proposals_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" sdkmath "cosmossdk.io/math" diff --git a/x/nft/keeper/keeper_test.go b/x/nft/keeper/keeper_test.go index ccf82fbdf6..32af281bf9 100644 --- a/x/nft/keeper/keeper_test.go +++ b/x/nft/keeper/keeper_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/nft/simulation/operations_test.go b/x/nft/simulation/operations_test.go index 4d53e4dcaf..404b45b7e5 100644 --- a/x/nft/simulation/operations_test.go +++ b/x/nft/simulation/operations_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/suite" "cosmossdk.io/depinject" diff --git a/x/params/simulation/operations_test.go b/x/params/simulation/operations_test.go index 135c95369e..f312020806 100644 --- a/x/params/simulation/operations_test.go +++ b/x/params/simulation/operations_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/params/simulation/proposals_test.go b/x/params/simulation/proposals_test.go index d26442c8d5..b5de335875 100644 --- a/x/params/simulation/proposals_test.go +++ b/x/params/simulation/proposals_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/params/types/consensus_params_legacy.go b/x/params/types/consensus_params_legacy.go index 57cafc051a..26ca722716 100644 --- a/x/params/types/consensus_params_legacy.go +++ b/x/params/types/consensus_params_legacy.go @@ -1,7 +1,7 @@ package types import ( - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/cosmos/cosmos-sdk/baseapp" ) diff --git a/x/params/types/subspace_test.go b/x/params/types/subspace_test.go index 0fab407d92..6a20803ce5 100644 --- a/x/params/types/subspace_test.go +++ b/x/params/types/subspace_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/suite" diff --git a/x/simulation/mock_cometbft.go b/x/simulation/mock_cometbft.go index 57d9d6c4d0..de0811f597 100644 --- a/x/simulation/mock_cometbft.go +++ b/x/simulation/mock_cometbft.go @@ -7,9 +7,9 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - "github.com/cometbft/cometbft/crypto/tmhash" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" + "github.com/cometbft/cometbft/v2/crypto/tmhash" ) type mockValidator struct { diff --git a/x/simulation/params.go b/x/simulation/params.go index 942e0168a3..ad3e48b0f2 100644 --- a/x/simulation/params.go +++ b/x/simulation/params.go @@ -4,8 +4,8 @@ import ( "encoding/json" "math/rand" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - "github.com/cometbft/cometbft/types" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + "github.com/cometbft/cometbft/v2/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/simulation" diff --git a/x/simulation/params_test.go b/x/simulation/params_test.go index 5511a7147a..9f2f61c938 100644 --- a/x/simulation/params_test.go +++ b/x/simulation/params_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go index 3b4b30f5ce..200240b7a5 100644 --- a/x/simulation/simulate.go +++ b/x/simulation/simulate.go @@ -10,8 +10,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/core/header" "cosmossdk.io/log" diff --git a/x/slashing/abci_test.go b/x/slashing/abci_test.go index ed954892f5..197e5aa3c0 100644 --- a/x/slashing/abci_test.go +++ b/x/slashing/abci_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "cosmossdk.io/depinject" diff --git a/x/slashing/app_test.go b/x/slashing/app_test.go index 70d659bc8e..8567625720 100644 --- a/x/slashing/app_test.go +++ b/x/slashing/app_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "cosmossdk.io/depinject" diff --git a/x/slashing/keeper/hooks.go b/x/slashing/keeper/hooks.go index 80c78d42c2..42b87aa320 100644 --- a/x/slashing/keeper/hooks.go +++ b/x/slashing/keeper/hooks.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/v2/crypto" sdkmath "cosmossdk.io/math" diff --git a/x/slashing/keeper/keeper_test.go b/x/slashing/keeper/keeper_test.go index ac83a4af48..65e0fff91e 100644 --- a/x/slashing/keeper/keeper_test.go +++ b/x/slashing/keeper/keeper_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/slashing/simulation/operations_test.go b/x/slashing/simulation/operations_test.go index 2ded710659..78864ee94e 100644 --- a/x/slashing/simulation/operations_test.go +++ b/x/slashing/simulation/operations_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmttypes "github.com/cometbft/cometbft/types" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmttypes "github.com/cometbft/cometbft/v2/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" diff --git a/x/slashing/simulation/proposals_test.go b/x/slashing/simulation/proposals_test.go index 3f098a9ee4..0d378ca109 100644 --- a/x/slashing/simulation/proposals_test.go +++ b/x/slashing/simulation/proposals_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" sdkmath "cosmossdk.io/math" diff --git a/x/staking/app_test.go b/x/staking/app_test.go index 8a2d9dbb8b..ba3f1109f8 100644 --- a/x/staking/app_test.go +++ b/x/staking/app_test.go @@ -3,8 +3,8 @@ package staking_test import ( "testing" - abci "github.com/cometbft/cometbft/abci/types" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/stretchr/testify/require" "cosmossdk.io/depinject" diff --git a/x/staking/client/cli/tx_test.go b/x/staking/client/cli/tx_test.go index 6b6db17fb7..fb477ee8f8 100644 --- a/x/staking/client/cli/tx_test.go +++ b/x/staking/client/cli/tx_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - abci "github.com/cometbft/cometbft/abci/types" - rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock" + abci "github.com/cometbft/cometbft/v2/abci/types" + rpcclientmock "github.com/cometbft/cometbft/v2/rpc/client/mock" "github.com/spf13/pflag" "github.com/stretchr/testify/suite" diff --git a/x/staking/genesis.go b/x/staking/genesis.go index 9feed178b2..ad856b1469 100644 --- a/x/staking/genesis.go +++ b/x/staking/genesis.go @@ -3,7 +3,7 @@ package staking import ( "fmt" - cmttypes "github.com/cometbft/cometbft/types" + cmttypes "github.com/cometbft/cometbft/v2/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/staking/keeper/abci.go b/x/staking/keeper/abci.go index 8131fa6dd1..1683855196 100644 --- a/x/staking/keeper/abci.go +++ b/x/staking/keeper/abci.go @@ -3,7 +3,7 @@ package keeper import ( "context" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "github.com/cosmos/cosmos-sdk/telemetry" "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/staking/keeper/genesis.go b/x/staking/keeper/genesis.go index 3f476986e4..86c6643c54 100644 --- a/x/staking/keeper/genesis.go +++ b/x/staking/keeper/genesis.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "cosmossdk.io/math" diff --git a/x/staking/keeper/historical_info_test.go b/x/staking/keeper/historical_info_test.go index c73801c296..362fe3ca87 100644 --- a/x/staking/keeper/historical_info_test.go +++ b/x/staking/keeper/historical_info_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "cosmossdk.io/math" diff --git a/x/staking/keeper/keeper.go b/x/staking/keeper/keeper.go index 45948f7222..25b8054401 100644 --- a/x/staking/keeper/keeper.go +++ b/x/staking/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" addresscodec "cosmossdk.io/core/address" storetypes "cosmossdk.io/core/store" diff --git a/x/staking/keeper/keeper_test.go b/x/staking/keeper/keeper_test.go index c90ed79032..956358dc8c 100644 --- a/x/staking/keeper/keeper_test.go +++ b/x/staking/keeper/keeper_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/x/staking/keeper/val_state_change.go b/x/staking/keeper/val_state_change.go index 7761d80a2e..12d1ec1e65 100644 --- a/x/staking/keeper/val_state_change.go +++ b/x/staking/keeper/val_state_change.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" gogotypes "github.com/cosmos/gogoproto/types" "cosmossdk.io/core/address" diff --git a/x/staking/keeper/validator_test.go b/x/staking/keeper/validator_test.go index 438b0d1da4..a9aab66941 100644 --- a/x/staking/keeper/validator_test.go +++ b/x/staking/keeper/validator_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" "go.uber.org/mock/gomock" "cosmossdk.io/math" diff --git a/x/staking/keeper_bench_test.go b/x/staking/keeper_bench_test.go index cd8dc1ddd3..9766851aba 100644 --- a/x/staking/keeper_bench_test.go +++ b/x/staking/keeper_bench_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" + cmttime "github.com/cometbft/cometbft/v2/types/time" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/x/staking/migrations/v5/migrations_test.go b/x/staking/migrations/v5/migrations_test.go index b079453561..dc79b089cb 100644 --- a/x/staking/migrations/v5/migrations_test.go +++ b/x/staking/migrations/v5/migrations_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/staking/module.go b/x/staking/module.go index 130f1adcc5..4309db371f 100644 --- a/x/staking/module.go +++ b/x/staking/module.go @@ -8,7 +8,7 @@ import ( "slices" "sort" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" diff --git a/x/staking/simulation/operations_test.go b/x/staking/simulation/operations_test.go index 91129433c5..674a60b5dd 100644 --- a/x/staking/simulation/operations_test.go +++ b/x/staking/simulation/operations_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - cmttypes "github.com/cometbft/cometbft/types" + abci "github.com/cometbft/cometbft/v2/abci/types" + cmttypes "github.com/cometbft/cometbft/v2/types" "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/x/staking/simulation/proposals_test.go b/x/staking/simulation/proposals_test.go index ede652c774..3c88ab269d 100644 --- a/x/staking/simulation/proposals_test.go +++ b/x/staking/simulation/proposals_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "gotest.tools/v3/assert" sdkmath "cosmossdk.io/math" diff --git a/x/staking/testutil/cmt.go b/x/staking/testutil/cmt.go index 6c3ca753da..212d3d6650 100644 --- a/x/staking/testutil/cmt.go +++ b/x/staking/testutil/cmt.go @@ -1,8 +1,8 @@ package testutil import ( - cmtcrypto "github.com/cometbft/cometbft/crypto" - cmttypes "github.com/cometbft/cometbft/types" + cmtcrypto "github.com/cometbft/cometbft/v2/crypto" + cmttypes "github.com/cometbft/cometbft/v2/types" "cosmossdk.io/math" diff --git a/x/staking/types/historical_info.go b/x/staking/types/historical_info.go index c2ef037c00..ee6b312719 100644 --- a/x/staking/types/historical_info.go +++ b/x/staking/types/historical_info.go @@ -3,7 +3,7 @@ package types import ( "sort" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/cosmos/gogoproto/proto" "cosmossdk.io/core/address" diff --git a/x/staking/types/historical_info_test.go b/x/staking/types/historical_info_test.go index e8b7f1597c..6430194386 100644 --- a/x/staking/types/historical_info_test.go +++ b/x/staking/types/historical_info_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" + cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v2" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index bc913a91ec..f7d1e87c41 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -8,8 +8,8 @@ import ( compress_gzip "compress/gzip" cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" - v11 "github.com/cometbft/cometbft/api/cometbft/abci/v1" - v1 "github.com/cometbft/cometbft/api/cometbft/types/v1" + v21 "github.com/cometbft/cometbft/api/cometbft/abci/v2" + v2 "github.com/cometbft/cometbft/api/cometbft/types/v2" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/tx/amino" @@ -113,7 +113,7 @@ func (Infraction) EnumDescriptor() ([]byte, []int) { // recent HistoricalInfo // (`n` is set by the staking module's `historical_entries` parameter). type HistoricalInfo struct { - Header v1.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header"` + Header v2.Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header"` Valset []Validator `protobuf:"bytes,2,rep,name=valset,proto3" json:"valset"` } @@ -150,11 +150,11 @@ func (m *HistoricalInfo) XXX_DiscardUnknown() { var xxx_messageInfo_HistoricalInfo proto.InternalMessageInfo -func (m *HistoricalInfo) GetHeader() v1.Header { +func (m *HistoricalInfo) GetHeader() v2.Header { if m != nil { return m.Header } - return v1.Header{} + return v2.Header{} } func (m *HistoricalInfo) GetValset() []Validator { @@ -1200,7 +1200,7 @@ var xxx_messageInfo_Pool proto.InternalMessageInfo // ValidatorUpdates defines an array of abci.ValidatorUpdate objects. // TODO: explore moving this to proto/cosmos/base to separate modules from tendermint dependence type ValidatorUpdates struct { - Updates []v11.ValidatorUpdate `protobuf:"bytes,1,rep,name=updates,proto3" json:"updates"` + Updates []v21.ValidatorUpdate `protobuf:"bytes,1,rep,name=updates,proto3" json:"updates"` } func (m *ValidatorUpdates) Reset() { *m = ValidatorUpdates{} } @@ -1236,7 +1236,7 @@ func (m *ValidatorUpdates) XXX_DiscardUnknown() { var xxx_messageInfo_ValidatorUpdates proto.InternalMessageInfo -func (m *ValidatorUpdates) GetUpdates() []v11.ValidatorUpdate { +func (m *ValidatorUpdates) GetUpdates() []v21.ValidatorUpdate { if m != nil { return m.Updates } @@ -1274,128 +1274,128 @@ func init() { } var fileDescriptor_64c30c6cf92913c9 = []byte{ - // 1927 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4d, 0x6c, 0x63, 0x47, - 0x1d, 0xcf, 0x8b, 0x53, 0x27, 0xf9, 0x3b, 0x89, 0x9d, 0xd9, 0x2f, 0xaf, 0x97, 0x8d, 0xbd, 0xee, - 0x42, 0xd3, 0xa5, 0xb1, 0x9b, 0x80, 0xf6, 0x10, 0x55, 0x45, 0x71, 0xec, 0x74, 0x5d, 0xda, 0x24, - 0xd8, 0x49, 0x80, 0x0a, 0x78, 0x1a, 0xbf, 0x37, 0x76, 0x86, 0xd8, 0xef, 0x99, 0x37, 0xe3, 0x10, - 0xdf, 0x39, 0x54, 0x41, 0x48, 0x3d, 0x20, 0x84, 0x04, 0x11, 0x2b, 0x71, 0x29, 0xb7, 0x1e, 0x56, - 0xdc, 0xb9, 0x15, 0x24, 0xa4, 0xd5, 0x9e, 0x50, 0x25, 0x02, 0xda, 0x3d, 0xb4, 0x82, 0x0b, 0xe2, - 0xc4, 0x11, 0xcd, 0xc7, 0xfb, 0x70, 0x9c, 0x6c, 0x36, 0xdb, 0x0a, 0x55, 0xf4, 0xf2, 0xf4, 0x66, - 0xe6, 0xff, 0xff, 0xcd, 0xfc, 0x7f, 0xff, 0x8f, 0xf9, 0x80, 0xdb, 0x96, 0xcb, 0x3a, 0x2e, 0x2b, - 0x32, 0x8e, 0xf7, 0xa8, 0xd3, 0x2a, 0xee, 0x2f, 0x36, 0x08, 0xc7, 0x8b, 0x7e, 0xbb, 0xd0, 0xf5, - 0x5c, 0xee, 0xa2, 0xab, 0x4a, 0xaa, 0xe0, 0xf7, 0x6a, 0xa9, 0xcc, 0xe5, 0x96, 0xdb, 0x72, 0xa5, - 0x48, 0x51, 0xfc, 0x29, 0xe9, 0xcc, 0xf5, 0x96, 0xeb, 0xb6, 0xda, 0xa4, 0x28, 0x5b, 0x8d, 0x5e, - 0xb3, 0x88, 0x9d, 0xbe, 0x1e, 0x9a, 0x3b, 0x39, 0x64, 0xf7, 0x3c, 0xcc, 0xa9, 0xeb, 0xe8, 0xf1, - 0xec, 0xc9, 0x71, 0x4e, 0x3b, 0x84, 0x71, 0xdc, 0xe9, 0xfa, 0xd8, 0x6a, 0x25, 0xa6, 0x9a, 0x54, - 0x2f, 0x4b, 0x63, 0x6b, 0x53, 0x1a, 0x98, 0x91, 0xc0, 0x0e, 0xcb, 0xa5, 0x3e, 0xf6, 0x2c, 0xee, - 0x50, 0xc7, 0x2d, 0xca, 0xaf, 0xee, 0xba, 0x69, 0xb9, 0x1d, 0xc2, 0x1b, 0x4d, 0x5e, 0xe4, 0xfd, - 0x2e, 0x61, 0xc5, 0xfd, 0x45, 0xf5, 0xa3, 0x87, 0xbf, 0x14, 0x0c, 0xe3, 0x86, 0x45, 0x4f, 0x8c, - 0xe6, 0x7f, 0x6e, 0xc0, 0xcc, 0x3d, 0xca, 0xb8, 0xeb, 0x51, 0x0b, 0xb7, 0xab, 0x4e, 0xd3, 0x45, - 0xaf, 0x41, 0x7c, 0x97, 0x60, 0x9b, 0x78, 0x69, 0x23, 0x67, 0xcc, 0x27, 0x96, 0xae, 0x17, 0x7c, - 0x84, 0x82, 0xd2, 0xdc, 0x5f, 0x2c, 0xdc, 0x93, 0x02, 0xa5, 0xc9, 0x0f, 0x8f, 0xb3, 0x23, 0xef, - 0x7f, 0xfc, 0xc1, 0x1d, 0xa3, 0xa6, 0x75, 0x50, 0x19, 0xe2, 0xfb, 0xb8, 0xcd, 0x08, 0x4f, 0x8f, - 0xe6, 0x62, 0xf3, 0x89, 0xa5, 0x5b, 0x85, 0xd3, 0x69, 0x2f, 0xec, 0xe0, 0x36, 0xb5, 0x31, 0x77, - 0x07, 0x51, 0x94, 0x6e, 0xfe, 0x17, 0xa3, 0x90, 0x5c, 0x75, 0x3b, 0x1d, 0xca, 0x18, 0x75, 0x9d, - 0x1a, 0xe6, 0x84, 0xa1, 0x37, 0x61, 0xcc, 0xc3, 0x9c, 0xc8, 0x55, 0x4d, 0x96, 0xee, 0x0a, 0xa5, - 0x8f, 0x8e, 0xb3, 0x37, 0x14, 0x3c, 0xb3, 0xf7, 0x0a, 0xd4, 0x2d, 0x76, 0x30, 0xdf, 0x2d, 0xbc, - 0x45, 0x5a, 0xd8, 0xea, 0x97, 0x89, 0xf5, 0xe8, 0xc1, 0x02, 0xe8, 0xd9, 0xcb, 0xc4, 0x52, 0x33, - 0x48, 0x0c, 0xf4, 0x2d, 0x98, 0xe8, 0xe0, 0x03, 0x53, 0xe2, 0x8d, 0x7e, 0x2a, 0xbc, 0xf1, 0x0e, - 0x3e, 0x10, 0xeb, 0x43, 0x3f, 0x80, 0xa4, 0x80, 0xb4, 0x76, 0xb1, 0xd3, 0x22, 0x0a, 0x39, 0xf6, - 0xa9, 0x90, 0xa7, 0x3b, 0xf8, 0x60, 0x55, 0xa2, 0x09, 0xfc, 0xe5, 0xb1, 0x4f, 0xee, 0x67, 0x8d, - 0xfc, 0x1f, 0x0c, 0x80, 0x90, 0x18, 0x84, 0x21, 0x65, 0x05, 0x2d, 0x39, 0x29, 0xd3, 0x5e, 0x7b, - 0xe9, 0x2c, 0xde, 0x4f, 0xd0, 0x5a, 0x9a, 0x16, 0xcb, 0x7b, 0x78, 0x9c, 0x35, 0xd4, 0xac, 0x49, - 0x6b, 0x88, 0xf6, 0x44, 0xaf, 0x6b, 0x63, 0x4e, 0x4c, 0x11, 0xc6, 0x92, 0xad, 0xc4, 0x52, 0xa6, - 0xa0, 0x62, 0xbc, 0xe0, 0xc7, 0x78, 0x61, 0xcb, 0x8f, 0x71, 0x05, 0xf8, 0xde, 0xdf, 0x7c, 0x40, - 0x50, 0xda, 0x62, 0x5c, 0xdb, 0xf0, 0xbe, 0x01, 0x89, 0x32, 0x61, 0x96, 0x47, 0xbb, 0x22, 0x6b, - 0x50, 0x1a, 0xc6, 0x3b, 0xae, 0x43, 0xf7, 0x74, 0xc4, 0x4d, 0xd6, 0xfc, 0x26, 0xca, 0xc0, 0x04, - 0xb5, 0x89, 0xc3, 0x29, 0xef, 0x2b, 0x37, 0xd5, 0x82, 0xb6, 0xd0, 0xfa, 0x31, 0x69, 0x30, 0xea, - 0xf3, 0x5c, 0xf3, 0x9b, 0xe8, 0x65, 0x48, 0x31, 0x62, 0xf5, 0x3c, 0xca, 0xfb, 0xa6, 0xe5, 0x3a, - 0x1c, 0x5b, 0x3c, 0x3d, 0x26, 0x45, 0x92, 0x7e, 0xff, 0xaa, 0xea, 0x16, 0x20, 0x36, 0xe1, 0x98, - 0xb6, 0x59, 0xfa, 0x05, 0x05, 0xa2, 0x9b, 0x7a, 0xa9, 0x47, 0xe3, 0x30, 0x19, 0x04, 0x2a, 0x5a, - 0x85, 0x94, 0xdb, 0x25, 0x9e, 0xf8, 0x37, 0xb1, 0x6d, 0x7b, 0x84, 0x31, 0x1d, 0x8d, 0xe9, 0x47, - 0x0f, 0x16, 0x2e, 0x6b, 0xc2, 0x57, 0xd4, 0x48, 0x9d, 0x7b, 0xd4, 0x69, 0xd5, 0x92, 0xbe, 0x86, - 0xee, 0x46, 0xdf, 0x15, 0x2e, 0x73, 0x18, 0x71, 0x58, 0x8f, 0x99, 0xdd, 0x5e, 0x63, 0x8f, 0xf4, - 0x35, 0xa9, 0x97, 0x87, 0x48, 0x5d, 0x71, 0xfa, 0xa5, 0xf4, 0x9f, 0x42, 0x68, 0xcb, 0xeb, 0x77, - 0xb9, 0x5b, 0xd8, 0xec, 0x35, 0xbe, 0x49, 0xfa, 0xc2, 0x55, 0x1a, 0x67, 0x53, 0xc2, 0xa0, 0xab, - 0x10, 0xff, 0x21, 0xa6, 0x6d, 0x62, 0x4b, 0x46, 0x26, 0x6a, 0xba, 0x85, 0x96, 0x21, 0xce, 0x38, - 0xe6, 0x3d, 0x26, 0x69, 0x98, 0x59, 0xca, 0x9f, 0x15, 0x1b, 0x25, 0xd7, 0xb1, 0xeb, 0x52, 0xb2, - 0xa6, 0x35, 0xd0, 0x2a, 0xc4, 0xb9, 0xbb, 0x47, 0x1c, 0x4d, 0x50, 0xe9, 0xab, 0x3a, 0x9a, 0xaf, - 0x0c, 0x47, 0x73, 0xd5, 0xe1, 0x91, 0x38, 0xae, 0x3a, 0xbc, 0xa6, 0x55, 0xd1, 0xf7, 0x20, 0x65, - 0x93, 0x36, 0x69, 0x49, 0xe6, 0xd8, 0x2e, 0xf6, 0x08, 0x4b, 0xc7, 0x25, 0xdc, 0xe2, 0x85, 0x93, - 0xa3, 0x96, 0x0c, 0xa0, 0xea, 0x12, 0x09, 0x6d, 0x42, 0xc2, 0x0e, 0xc3, 0x29, 0x3d, 0x2e, 0xc9, - 0x7c, 0xf1, 0x2c, 0x1b, 0x23, 0x91, 0x17, 0xad, 0x3c, 0x51, 0x08, 0x11, 0x41, 0x3d, 0xa7, 0xe1, - 0x3a, 0x36, 0x75, 0x5a, 0xe6, 0x2e, 0xa1, 0xad, 0x5d, 0x9e, 0x9e, 0xc8, 0x19, 0xf3, 0xb1, 0x5a, - 0x32, 0xe8, 0xbf, 0x27, 0xbb, 0xd1, 0x26, 0xcc, 0x84, 0xa2, 0x32, 0x43, 0x26, 0x2f, 0x9a, 0x21, - 0xd3, 0x01, 0x80, 0x10, 0x41, 0x6f, 0x03, 0x84, 0x39, 0x98, 0x06, 0x89, 0x96, 0x3f, 0x3f, 0x9b, - 0xa3, 0xc6, 0x44, 0x00, 0x90, 0x03, 0x97, 0x3a, 0xd4, 0x31, 0x19, 0x69, 0x37, 0x4d, 0xcd, 0x9c, - 0xc0, 0x4d, 0x48, 0xfa, 0x5f, 0xbf, 0x80, 0x37, 0x3f, 0x7a, 0xb0, 0x90, 0x54, 0xad, 0x05, 0x66, - 0xef, 0xe5, 0x5e, 0x2d, 0x7c, 0xfd, 0x6e, 0x6d, 0xb6, 0x43, 0x9d, 0x3a, 0x69, 0x37, 0xcb, 0x01, - 0x30, 0x7a, 0x0d, 0x6e, 0x84, 0x84, 0xb8, 0x8e, 0xb9, 0xeb, 0xb6, 0x6d, 0xd3, 0x23, 0x4d, 0xd3, - 0x72, 0x7b, 0x0e, 0x4f, 0x4f, 0x49, 0x1a, 0xaf, 0x05, 0x22, 0x1b, 0xce, 0x3d, 0xb7, 0x6d, 0xd7, - 0x48, 0x73, 0x55, 0x0c, 0xa3, 0x17, 0x21, 0x64, 0xc3, 0xa4, 0x36, 0x4b, 0x4f, 0xe7, 0x62, 0xf3, - 0x63, 0xb5, 0xa9, 0xa0, 0xb3, 0x6a, 0xb3, 0xe5, 0x89, 0x77, 0xef, 0x67, 0x47, 0x3e, 0xb9, 0x9f, - 0x1d, 0xc9, 0xaf, 0xc1, 0xd4, 0x0e, 0x6e, 0xeb, 0xd4, 0x22, 0x0c, 0xdd, 0x85, 0x49, 0xec, 0x37, - 0xd2, 0x46, 0x2e, 0xf6, 0xd4, 0xd4, 0x0c, 0x45, 0xf3, 0xbf, 0x33, 0x20, 0x5e, 0xde, 0xd9, 0xc4, - 0xd4, 0x43, 0x15, 0x98, 0x0d, 0x63, 0xf5, 0x59, 0xb3, 0x3c, 0x0c, 0x6f, 0x3f, 0xcd, 0xd7, 0x61, - 0x76, 0xdf, 0x2f, 0x1c, 0x01, 0x8c, 0xda, 0x6a, 0x6e, 0x3d, 0x7a, 0xb0, 0x70, 0x53, 0xc3, 0x04, - 0xc5, 0xe5, 0x04, 0xde, 0xfe, 0x89, 0xfe, 0x88, 0xcd, 0x6f, 0xc2, 0xb8, 0x5a, 0x2a, 0x43, 0xdf, - 0x80, 0x17, 0xba, 0xe2, 0x47, 0x9a, 0x9a, 0x58, 0x9a, 0x3b, 0x33, 0xe6, 0xa5, 0x7c, 0x34, 0x42, - 0x94, 0x5e, 0xfe, 0xa7, 0xa3, 0x00, 0xe5, 0x9d, 0x9d, 0x2d, 0x8f, 0x76, 0xdb, 0x84, 0x7f, 0x56, - 0xb6, 0x6f, 0xc3, 0x95, 0xd0, 0x76, 0xe6, 0x59, 0x17, 0xb7, 0xff, 0x52, 0xa0, 0x5f, 0xf7, 0xac, - 0x53, 0x61, 0x6d, 0xc6, 0x03, 0xd8, 0xd8, 0xc5, 0x61, 0xcb, 0x8c, 0x0f, 0x33, 0xfb, 0x1d, 0x48, - 0x84, 0x64, 0x30, 0x54, 0x85, 0x09, 0xae, 0xff, 0x35, 0xc1, 0xf9, 0xb3, 0x09, 0xf6, 0xd5, 0xa2, - 0x24, 0x07, 0xea, 0xf9, 0xff, 0x18, 0x00, 0x91, 0x1c, 0xf9, 0x7c, 0xc6, 0x18, 0xaa, 0x42, 0x5c, - 0x17, 0xe7, 0xd8, 0xf3, 0x16, 0x67, 0x0d, 0x10, 0x21, 0xf5, 0x67, 0xa3, 0x70, 0x69, 0xdb, 0xcf, - 0xde, 0xcf, 0x3f, 0x07, 0xdb, 0x30, 0x4e, 0x1c, 0xee, 0x51, 0x49, 0x82, 0xf0, 0xf9, 0xab, 0x67, - 0xf9, 0xfc, 0x14, 0xa3, 0x2a, 0x0e, 0xf7, 0xfa, 0xd1, 0x08, 0xf0, 0xb1, 0x22, 0x7c, 0xfc, 0x2a, - 0x06, 0xe9, 0xb3, 0x54, 0xd1, 0x4b, 0x90, 0xb4, 0x3c, 0x22, 0x3b, 0xfc, 0x7d, 0xc7, 0x90, 0x05, - 0x73, 0xc6, 0xef, 0xd6, 0xdb, 0x4e, 0x0d, 0xc4, 0x41, 0x4d, 0x04, 0x97, 0x10, 0x7d, 0xbe, 0x93, - 0xd9, 0x4c, 0x88, 0x20, 0x37, 0x9e, 0x2d, 0x48, 0x52, 0x87, 0x72, 0x8a, 0xdb, 0x66, 0x03, 0xb7, - 0xb1, 0x63, 0xf9, 0x27, 0xd8, 0x0b, 0xed, 0xf9, 0x33, 0x1a, 0xa3, 0xa4, 0x20, 0x50, 0x05, 0xc6, - 0x7d, 0xb4, 0xb1, 0x8b, 0xa3, 0xf9, 0xba, 0xe8, 0x16, 0x4c, 0x45, 0x37, 0x06, 0x79, 0x1a, 0x19, - 0xab, 0x25, 0x22, 0xfb, 0xc2, 0x79, 0x3b, 0x4f, 0xfc, 0xa9, 0x3b, 0x8f, 0x3e, 0xf0, 0xfd, 0x26, - 0x06, 0xb3, 0x35, 0x62, 0xff, 0xff, 0xbb, 0x65, 0x13, 0x40, 0xa5, 0xaa, 0xa8, 0xa4, 0xda, 0x33, - 0xcf, 0x91, 0xef, 0x93, 0x0a, 0xa4, 0xcc, 0xf8, 0xff, 0xca, 0x43, 0x7f, 0x1d, 0x85, 0xa9, 0xa8, - 0x87, 0xbe, 0x90, 0x9b, 0x16, 0x5a, 0x0f, 0xcb, 0xd4, 0x98, 0x2c, 0x53, 0x2f, 0x9f, 0x55, 0xa6, - 0x86, 0xa2, 0xf9, 0x9c, 0xfa, 0xf4, 0xeb, 0x18, 0xc4, 0x37, 0xb1, 0x87, 0x3b, 0x0c, 0x6d, 0x0c, - 0x9d, 0x6d, 0xfd, 0x17, 0x81, 0x93, 0xc1, 0x5c, 0xd6, 0x2f, 0x20, 0x2a, 0x96, 0x7f, 0x79, 0xd6, - 0xd1, 0xf6, 0xcb, 0x30, 0x23, 0xee, 0xc8, 0x81, 0x41, 0x8a, 0xdc, 0x69, 0x79, 0xd5, 0x0d, 0xac, - 0x67, 0x28, 0x0b, 0x09, 0x21, 0x16, 0xd6, 0x61, 0x21, 0x03, 0x1d, 0x7c, 0x50, 0x51, 0x3d, 0x68, - 0x01, 0xd0, 0x6e, 0xf0, 0x68, 0x61, 0x86, 0x44, 0x08, 0xb9, 0xd9, 0x70, 0xc4, 0x17, 0xbf, 0x09, - 0x20, 0x56, 0x61, 0xda, 0xc4, 0x71, 0x3b, 0xfa, 0xa2, 0x37, 0x29, 0x7a, 0xca, 0xa2, 0x03, 0xfd, - 0xc4, 0x50, 0x47, 0xe4, 0x13, 0x37, 0x69, 0x7d, 0x43, 0xd9, 0x7a, 0x86, 0xa4, 0xf8, 0xf7, 0x71, - 0x36, 0xd3, 0xc7, 0x9d, 0xf6, 0x72, 0xfe, 0x14, 0x9c, 0xfc, 0x69, 0x97, 0x7b, 0x71, 0x70, 0x1e, - 0xbc, 0x89, 0x2f, 0xdf, 0x16, 0xe1, 0x7d, 0xf8, 0xf1, 0x07, 0x77, 0x6e, 0x84, 0xa7, 0xec, 0xe2, - 0x41, 0xf0, 0xa8, 0xa5, 0x7c, 0x22, 0x4e, 0xaa, 0x28, 0xdc, 0x35, 0x6a, 0x84, 0x75, 0xc5, 0x25, - 0x50, 0x5c, 0x1a, 0x22, 0x87, 0x7b, 0xe3, 0xe9, 0x97, 0x86, 0x50, 0x7f, 0xe0, 0xd2, 0x10, 0xc9, - 0xa9, 0xd7, 0xc3, 0xa2, 0x3d, 0x1a, 0x3c, 0x02, 0x49, 0xac, 0x06, 0x66, 0x24, 0x72, 0xfb, 0xa0, - 0x03, 0x10, 0xbe, 0x92, 0x4c, 0xd5, 0x91, 0xfc, 0x9f, 0x0d, 0xb8, 0x3e, 0x14, 0x7e, 0xc1, 0x92, - 0x2d, 0x40, 0x5e, 0x64, 0x50, 0xba, 0xb1, 0xaf, 0x97, 0xfe, 0x7c, 0xd1, 0x3c, 0xeb, 0x0d, 0x55, - 0xee, 0xcf, 0x66, 0xf7, 0xd1, 0xa5, 0xe7, 0x8f, 0x06, 0x5c, 0x8e, 0x2e, 0x20, 0x30, 0xa5, 0x0e, - 0x53, 0xd1, 0xa9, 0xb5, 0x11, 0xb7, 0x9f, 0xc5, 0x88, 0xe8, 0xfa, 0x07, 0x40, 0xd0, 0x4e, 0x98, - 0xe2, 0xea, 0x29, 0x6d, 0xf1, 0x99, 0x49, 0xf1, 0x17, 0x76, 0x6a, 0xaa, 0x2b, 0xdf, 0xfc, 0xd3, - 0x80, 0xb1, 0x4d, 0xd7, 0x6d, 0xa3, 0x1f, 0xc1, 0xac, 0xe3, 0x72, 0x53, 0xa4, 0x03, 0xb1, 0x4d, - 0x7d, 0xd7, 0x57, 0xe5, 0xb3, 0xf2, 0x54, 0xae, 0xfe, 0x71, 0x9c, 0x1d, 0xd6, 0x1c, 0x24, 0x50, - 0x3f, 0x29, 0x39, 0x2e, 0x2f, 0x49, 0xa1, 0x2d, 0xf5, 0x1c, 0xd0, 0x84, 0xe9, 0xc1, 0xe9, 0x54, - 0x89, 0x5d, 0x39, 0x6f, 0xba, 0xe9, 0x73, 0xa7, 0x9a, 0x6a, 0x44, 0xe6, 0x59, 0x9e, 0x10, 0x5e, - 0xfb, 0x97, 0xf0, 0xdc, 0x3b, 0x90, 0x0a, 0xea, 0xcb, 0xb6, 0x7c, 0x8f, 0x62, 0x68, 0x0d, 0xc6, - 0xd5, 0xd3, 0x94, 0x7f, 0xba, 0xbf, 0x15, 0x3e, 0x74, 0xe2, 0x86, 0x45, 0x0b, 0xfb, 0x91, 0x47, - 0x4a, 0xa5, 0x34, 0xc0, 0xa7, 0x56, 0xbe, 0xf3, 0x7b, 0x03, 0x20, 0x7c, 0x38, 0x41, 0xaf, 0xc0, - 0xb5, 0xd2, 0xc6, 0x7a, 0xd9, 0xac, 0x6f, 0xad, 0x6c, 0x6d, 0xd7, 0xcd, 0xed, 0xf5, 0xfa, 0x66, - 0x65, 0xb5, 0xba, 0x56, 0xad, 0x94, 0x53, 0x23, 0x99, 0xe4, 0xe1, 0x51, 0x2e, 0xb1, 0xed, 0xb0, - 0x2e, 0xb1, 0x68, 0x93, 0x12, 0x1b, 0x7d, 0x05, 0x2e, 0x0f, 0x4a, 0x8b, 0x56, 0xa5, 0x9c, 0x32, - 0x32, 0x53, 0x87, 0x47, 0xb9, 0x09, 0x75, 0x50, 0x24, 0x36, 0x9a, 0x87, 0x2b, 0xc3, 0x72, 0xd5, - 0xf5, 0x37, 0x52, 0xa3, 0x99, 0xe9, 0xc3, 0xa3, 0xdc, 0x64, 0x70, 0xa2, 0x44, 0x79, 0x40, 0x51, - 0x49, 0x8d, 0x17, 0xcb, 0xc0, 0xe1, 0x51, 0x2e, 0xae, 0xdc, 0x90, 0x19, 0x7b, 0xf7, 0xb7, 0x73, - 0x23, 0x77, 0xbe, 0x0f, 0x50, 0x75, 0x9a, 0x1e, 0xb6, 0x64, 0xb8, 0x65, 0xe0, 0x6a, 0x75, 0x7d, - 0xad, 0xb6, 0xb2, 0xba, 0x55, 0xdd, 0x58, 0x1f, 0x5c, 0xf6, 0x89, 0xb1, 0xf2, 0xc6, 0x76, 0xe9, - 0xad, 0x8a, 0x59, 0xaf, 0xbe, 0xb1, 0x9e, 0x32, 0xd0, 0x35, 0xb8, 0x34, 0x30, 0xf6, 0xed, 0xf5, - 0xad, 0xea, 0xdb, 0x95, 0xd4, 0x68, 0x69, 0xed, 0xc3, 0xc7, 0x73, 0xc6, 0xc3, 0xc7, 0x73, 0xc6, - 0xdf, 0x1f, 0xcf, 0x19, 0xef, 0x3d, 0x99, 0x1b, 0x79, 0xf8, 0x64, 0x6e, 0xe4, 0x2f, 0x4f, 0xe6, - 0x46, 0xde, 0x79, 0xa5, 0x45, 0xf9, 0x6e, 0xaf, 0x21, 0xe8, 0xd6, 0xaf, 0xdf, 0xc5, 0x53, 0x4b, - 0x9e, 0x7c, 0x6e, 0x6e, 0xc4, 0xe5, 0x2e, 0xf3, 0xb5, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x08, - 0x26, 0x06, 0x41, 0xe6, 0x17, 0x00, 0x00, + // 1928 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4f, 0x6c, 0x23, 0x57, + 0x19, 0xcf, 0xc4, 0xa9, 0x93, 0x7c, 0x4e, 0x62, 0xe7, 0x6d, 0x76, 0xd7, 0xeb, 0x65, 0x63, 0xaf, + 0xbb, 0xd0, 0x74, 0x69, 0xec, 0x6e, 0x40, 0x7b, 0x88, 0xaa, 0xa2, 0x38, 0x76, 0xba, 0x2e, 0x6d, + 0x12, 0xc6, 0x49, 0x80, 0x0a, 0x18, 0x3d, 0xcf, 0x3c, 0x3b, 0x43, 0xec, 0x19, 0x33, 0xef, 0x39, + 0xc4, 0x77, 0x0e, 0x55, 0x10, 0x52, 0x0f, 0x08, 0x21, 0x41, 0xc4, 0x4a, 0x5c, 0xca, 0xad, 0x87, + 0x15, 0x77, 0x6e, 0x05, 0x09, 0x69, 0xb5, 0x27, 0x54, 0x89, 0x80, 0x76, 0x0f, 0xad, 0xe0, 0x82, + 0x38, 0x71, 0x44, 0xef, 0xcf, 0xfc, 0xb1, 0x1d, 0x6f, 0x36, 0xdb, 0x0a, 0x55, 0xf4, 0x32, 0x9a, + 0xf7, 0xde, 0xf7, 0xfd, 0xde, 0xfb, 0x7e, 0xdf, 0x9f, 0xf7, 0x07, 0x6e, 0x99, 0x2e, 0x6d, 0xbb, + 0xb4, 0x48, 0x19, 0x3e, 0xb0, 0x9d, 0x66, 0xf1, 0xf0, 0x4e, 0x9d, 0x30, 0x7c, 0xc7, 0x6f, 0x17, + 0x3a, 0x9e, 0xcb, 0x5c, 0x74, 0x45, 0x4a, 0x15, 0xfc, 0x5e, 0x25, 0x95, 0x59, 0x68, 0xba, 0x4d, + 0x57, 0x88, 0x14, 0xf9, 0x9f, 0x94, 0xce, 0x5c, 0x6b, 0xba, 0x6e, 0xb3, 0x45, 0x8a, 0xa2, 0x55, + 0xef, 0x36, 0x8a, 0xd8, 0xe9, 0xa9, 0xa1, 0xc5, 0xc1, 0x21, 0xab, 0xeb, 0x61, 0x66, 0xbb, 0x8e, + 0x1a, 0xcf, 0x0e, 0x8e, 0x33, 0xbb, 0x4d, 0x28, 0xc3, 0xed, 0x8e, 0x8f, 0x2d, 0x57, 0x62, 0xc8, + 0x49, 0xd5, 0xb2, 0x14, 0xb6, 0x32, 0xa5, 0x8e, 0x29, 0x09, 0xec, 0x30, 0x5d, 0xdb, 0xc7, 0x9e, + 0xc7, 0x6d, 0xdb, 0x71, 0x8b, 0xe2, 0xab, 0xba, 0x6e, 0x98, 0x6e, 0x9b, 0xb0, 0x7a, 0x83, 0x15, + 0x59, 0xaf, 0x43, 0x68, 0xf1, 0x70, 0x45, 0xfe, 0xa8, 0xe1, 0x2f, 0x05, 0xc3, 0xb8, 0x6e, 0xda, + 0x03, 0xa3, 0xf9, 0x9f, 0x6b, 0x30, 0x77, 0xcf, 0xa6, 0xcc, 0xf5, 0x6c, 0x13, 0xb7, 0xaa, 0x4e, + 0xc3, 0x45, 0xaf, 0x41, 0x7c, 0x9f, 0x60, 0x8b, 0x78, 0x69, 0x2d, 0xa7, 0x2d, 0x25, 0x56, 0xae, + 0x15, 0x7c, 0x84, 0x82, 0xd4, 0x3c, 0x5c, 0x29, 0xdc, 0x13, 0x02, 0xa5, 0xe9, 0x0f, 0x4f, 0xb3, + 0x63, 0xef, 0x7f, 0xfc, 0xc1, 0x6d, 0x4d, 0x57, 0x3a, 0xa8, 0x0c, 0xf1, 0x43, 0xdc, 0xa2, 0x84, + 0xa5, 0xc7, 0x73, 0xb1, 0xa5, 0xc4, 0xca, 0xcd, 0xc2, 0xd9, 0xb4, 0x17, 0xf6, 0x70, 0xcb, 0xb6, + 0x30, 0x73, 0xfb, 0x51, 0xa4, 0x6e, 0xfe, 0x17, 0xe3, 0x90, 0x5c, 0x77, 0xdb, 0x6d, 0x9b, 0x52, + 0xdb, 0x75, 0x74, 0xcc, 0x08, 0x45, 0x6f, 0xc2, 0x84, 0x87, 0x19, 0x11, 0xab, 0x9a, 0x2e, 0xdd, + 0xe5, 0x4a, 0x1f, 0x9d, 0x66, 0xaf, 0x4b, 0x78, 0x6a, 0x1d, 0x14, 0x6c, 0xb7, 0xd8, 0xc6, 0x6c, + 0xbf, 0xf0, 0x16, 0x69, 0x62, 0xb3, 0x57, 0x26, 0xe6, 0xa3, 0x07, 0xcb, 0xa0, 0x66, 0x2f, 0x13, + 0x53, 0xce, 0x20, 0x30, 0xd0, 0xb7, 0x60, 0xaa, 0x8d, 0x8f, 0x0c, 0x81, 0x37, 0xfe, 0xa9, 0xf0, + 0x26, 0xdb, 0xf8, 0x88, 0xaf, 0x0f, 0xfd, 0x00, 0x92, 0x1c, 0xd2, 0xdc, 0xc7, 0x4e, 0x93, 0x48, + 0xe4, 0xd8, 0xa7, 0x42, 0x9e, 0x6d, 0xe3, 0xa3, 0x75, 0x81, 0xc6, 0xf1, 0x57, 0x27, 0x3e, 0xb9, + 0x9f, 0xd5, 0xf2, 0x7f, 0xd0, 0x00, 0x42, 0x62, 0x10, 0x86, 0x94, 0x19, 0xb4, 0xc4, 0xa4, 0x54, + 0x79, 0xed, 0xa5, 0x51, 0xbc, 0x0f, 0xd0, 0x5a, 0x9a, 0xe5, 0xcb, 0x7b, 0x78, 0x9a, 0xd5, 0xe4, + 0xac, 0x49, 0x73, 0x88, 0xf6, 0x44, 0xb7, 0x63, 0x61, 0x46, 0x0c, 0x1e, 0xc6, 0x82, 0xad, 0xc4, + 0x4a, 0xa6, 0x20, 0x63, 0xbc, 0xe0, 0xc7, 0x78, 0x61, 0xc7, 0x8f, 0x71, 0x09, 0xf8, 0xde, 0xdf, + 0x7c, 0x40, 0x90, 0xda, 0x7c, 0x5c, 0xd9, 0xf0, 0xbe, 0x06, 0x89, 0x32, 0xa1, 0xa6, 0x67, 0x77, + 0x78, 0xd6, 0xa0, 0x34, 0x4c, 0xb6, 0x5d, 0xc7, 0x3e, 0x50, 0x11, 0x37, 0xad, 0xfb, 0x4d, 0x94, + 0x81, 0x29, 0xdb, 0x22, 0x0e, 0xb3, 0x59, 0x4f, 0xba, 0x49, 0x0f, 0xda, 0x5c, 0xeb, 0xc7, 0xa4, + 0x4e, 0x6d, 0x9f, 0x67, 0xdd, 0x6f, 0xa2, 0x97, 0x21, 0x45, 0x89, 0xd9, 0xf5, 0x6c, 0xd6, 0x33, + 0x4c, 0xd7, 0x61, 0xd8, 0x64, 0xe9, 0x09, 0x21, 0x92, 0xf4, 0xfb, 0xd7, 0x65, 0x37, 0x07, 0xb1, + 0x08, 0xc3, 0x76, 0x8b, 0xa6, 0x5f, 0x90, 0x20, 0xaa, 0xa9, 0x96, 0x7a, 0x32, 0x09, 0xd3, 0x41, + 0xa0, 0xa2, 0x75, 0x48, 0xb9, 0x1d, 0xe2, 0xf1, 0x7f, 0x03, 0x5b, 0x96, 0x47, 0x28, 0x55, 0xd1, + 0x98, 0x7e, 0xf4, 0x60, 0x79, 0x41, 0x11, 0xbe, 0x26, 0x47, 0x6a, 0xcc, 0xb3, 0x9d, 0xa6, 0x9e, + 0xf4, 0x35, 0x54, 0x37, 0xfa, 0x2e, 0x77, 0x99, 0x43, 0x89, 0x43, 0xbb, 0xd4, 0xe8, 0x74, 0xeb, + 0x07, 0xa4, 0xa7, 0x48, 0x5d, 0x18, 0x22, 0x75, 0xcd, 0xe9, 0x95, 0xd2, 0x7f, 0x0a, 0xa1, 0x4d, + 0xaf, 0xd7, 0x61, 0x6e, 0x61, 0xbb, 0x5b, 0xff, 0x26, 0xe9, 0x71, 0x57, 0x29, 0x9c, 0x6d, 0x01, + 0x83, 0xae, 0x40, 0xfc, 0x87, 0xd8, 0x6e, 0x11, 0x4b, 0x30, 0x32, 0xa5, 0xab, 0x16, 0x5a, 0x85, + 0x38, 0x65, 0x98, 0x75, 0xa9, 0xa0, 0x61, 0x6e, 0x25, 0x3f, 0x2a, 0x36, 0x4a, 0xae, 0x63, 0xd5, + 0x84, 0xa4, 0xae, 0x34, 0xd0, 0x3a, 0xc4, 0x99, 0x7b, 0x40, 0x1c, 0x45, 0x50, 0xe9, 0xab, 0x2a, + 0x9a, 0x2f, 0x0f, 0x47, 0x73, 0xd5, 0x61, 0x91, 0x38, 0xae, 0x3a, 0x4c, 0x57, 0xaa, 0xe8, 0x7b, + 0x90, 0xb2, 0x48, 0x8b, 0x34, 0x05, 0x73, 0x74, 0x1f, 0x7b, 0x84, 0xa6, 0xe3, 0x02, 0xee, 0xce, + 0x85, 0x93, 0x43, 0x4f, 0x06, 0x50, 0x35, 0x81, 0x84, 0xb6, 0x21, 0x61, 0x85, 0xe1, 0x94, 0x9e, + 0x14, 0x64, 0xbe, 0x38, 0xca, 0xc6, 0x48, 0xe4, 0x45, 0x2b, 0x4f, 0x14, 0x82, 0x47, 0x50, 0xd7, + 0xa9, 0xbb, 0x8e, 0x65, 0x3b, 0x4d, 0x63, 0x9f, 0xd8, 0xcd, 0x7d, 0x96, 0x9e, 0xca, 0x69, 0x4b, + 0x31, 0x3d, 0x19, 0xf4, 0xdf, 0x13, 0xdd, 0x68, 0x1b, 0xe6, 0x42, 0x51, 0x91, 0x21, 0xd3, 0x17, + 0xcd, 0x90, 0xd9, 0x00, 0x80, 0x8b, 0xa0, 0xb7, 0x01, 0xc2, 0x1c, 0x4c, 0x83, 0x40, 0xcb, 0x9f, + 0x9f, 0xcd, 0x51, 0x63, 0x22, 0x00, 0xc8, 0x81, 0x4b, 0x6d, 0xdb, 0x31, 0x28, 0x69, 0x35, 0x0c, + 0xc5, 0x1c, 0xc7, 0x4d, 0x08, 0xfa, 0x5f, 0xbf, 0x80, 0x37, 0x3f, 0x7a, 0xb0, 0x9c, 0x94, 0xad, + 0x65, 0x6a, 0x1d, 0xe4, 0x5e, 0x2d, 0x7c, 0xfd, 0xae, 0x3e, 0xdf, 0xb6, 0x9d, 0x1a, 0x69, 0x35, + 0xca, 0x01, 0x30, 0x7a, 0x0d, 0xae, 0x87, 0x84, 0xb8, 0x8e, 0xb1, 0xef, 0xb6, 0x2c, 0xc3, 0x23, + 0x0d, 0xc3, 0x74, 0xbb, 0x0e, 0x4b, 0xcf, 0x08, 0x1a, 0xaf, 0x06, 0x22, 0x5b, 0xce, 0x3d, 0xb7, + 0x65, 0xe9, 0xa4, 0xb1, 0xce, 0x87, 0xd1, 0x8b, 0x10, 0xb2, 0x61, 0xd8, 0x16, 0x4d, 0xcf, 0xe6, + 0x62, 0x4b, 0x13, 0xfa, 0x4c, 0xd0, 0x59, 0xb5, 0xe8, 0xea, 0xd4, 0xbb, 0xf7, 0xb3, 0x63, 0x9f, + 0xdc, 0xcf, 0x8e, 0xe5, 0x37, 0x60, 0x66, 0x0f, 0xb7, 0x54, 0x6a, 0x11, 0x8a, 0xee, 0xc2, 0x34, + 0xf6, 0x1b, 0x69, 0x2d, 0x17, 0x7b, 0x6a, 0x6a, 0x86, 0xa2, 0xf9, 0xdf, 0x69, 0x10, 0x2f, 0xef, + 0x6d, 0x63, 0xdb, 0x43, 0x15, 0x98, 0x0f, 0x63, 0xf5, 0x59, 0xb3, 0x3c, 0x0c, 0x6f, 0x3f, 0xcd, + 0x37, 0x61, 0xfe, 0xd0, 0x2f, 0x1c, 0x01, 0x8c, 0xdc, 0x6a, 0x6e, 0x3e, 0x7a, 0xb0, 0x7c, 0x43, + 0xc1, 0x04, 0xc5, 0x65, 0x00, 0xef, 0x70, 0xa0, 0x3f, 0x62, 0xf3, 0x9b, 0x30, 0x29, 0x97, 0x4a, + 0xd1, 0x37, 0xe0, 0x85, 0x0e, 0xff, 0x11, 0xa6, 0x26, 0x56, 0x16, 0x47, 0xc6, 0xbc, 0x90, 0x8f, + 0x46, 0x88, 0xd4, 0xcb, 0xff, 0x74, 0x1c, 0xa0, 0xbc, 0xb7, 0xb7, 0xe3, 0xd9, 0x9d, 0x16, 0x61, + 0x9f, 0x95, 0xed, 0xbb, 0x70, 0x39, 0xb4, 0x9d, 0x7a, 0xe6, 0xc5, 0xed, 0xbf, 0x14, 0xe8, 0xd7, + 0x3c, 0xf3, 0x4c, 0x58, 0x8b, 0xb2, 0x00, 0x36, 0x76, 0x71, 0xd8, 0x32, 0x65, 0xc3, 0xcc, 0x7e, + 0x07, 0x12, 0x21, 0x19, 0x14, 0x55, 0x61, 0x8a, 0xa9, 0x7f, 0x45, 0x70, 0x7e, 0x34, 0xc1, 0xbe, + 0x5a, 0x94, 0xe4, 0x40, 0x3d, 0xff, 0x1f, 0x0d, 0x20, 0x92, 0x23, 0x9f, 0xcf, 0x18, 0x43, 0x55, + 0x88, 0xab, 0xe2, 0x1c, 0x7b, 0xde, 0xe2, 0xac, 0x00, 0x22, 0xa4, 0xfe, 0x6c, 0x1c, 0x2e, 0xed, + 0xfa, 0xd9, 0xfb, 0xf9, 0xe7, 0x60, 0x17, 0x26, 0x89, 0xc3, 0x3c, 0x5b, 0x90, 0xc0, 0x7d, 0xfe, + 0xea, 0x28, 0x9f, 0x9f, 0x61, 0x54, 0xc5, 0x61, 0x5e, 0x2f, 0x1a, 0x01, 0x3e, 0x56, 0x84, 0x8f, + 0x5f, 0xc5, 0x20, 0x3d, 0x4a, 0x15, 0xbd, 0x04, 0x49, 0xd3, 0x23, 0xa2, 0xc3, 0xdf, 0x77, 0x34, + 0x51, 0x30, 0xe7, 0xfc, 0x6e, 0xb5, 0xed, 0xe8, 0xc0, 0x0f, 0x6a, 0x3c, 0xb8, 0xb8, 0xe8, 0xf3, + 0x9d, 0xcc, 0xe6, 0x42, 0x04, 0xb1, 0xf1, 0xec, 0x40, 0xd2, 0x76, 0x6c, 0x66, 0xe3, 0x96, 0x51, + 0xc7, 0x2d, 0xec, 0x98, 0xfe, 0x09, 0xf6, 0x42, 0x7b, 0xfe, 0x9c, 0xc2, 0x28, 0x49, 0x08, 0x54, + 0x81, 0x49, 0x1f, 0x6d, 0xe2, 0xe2, 0x68, 0xbe, 0x2e, 0xba, 0x09, 0x33, 0xd1, 0x8d, 0x41, 0x9c, + 0x46, 0x26, 0xf4, 0x44, 0x64, 0x5f, 0x38, 0x6f, 0xe7, 0x89, 0x3f, 0x75, 0xe7, 0x51, 0x07, 0xbe, + 0xdf, 0xc4, 0x60, 0x5e, 0x27, 0xd6, 0xff, 0xbf, 0x5b, 0xb6, 0x01, 0x64, 0xaa, 0xf2, 0x4a, 0xaa, + 0x3c, 0xf3, 0x1c, 0xf9, 0x3e, 0x2d, 0x41, 0xca, 0x94, 0xfd, 0xaf, 0x3c, 0xf4, 0xd7, 0x71, 0x98, + 0x89, 0x7a, 0xe8, 0x0b, 0xb9, 0x69, 0xa1, 0xcd, 0xb0, 0x4c, 0x4d, 0x88, 0x32, 0xf5, 0xf2, 0xa8, + 0x32, 0x35, 0x14, 0xcd, 0xe7, 0xd4, 0xa7, 0x5f, 0xc7, 0x20, 0xbe, 0x8d, 0x3d, 0xdc, 0xa6, 0x68, + 0x6b, 0xe8, 0x6c, 0xeb, 0xbf, 0x08, 0x0c, 0x06, 0x73, 0x59, 0xbd, 0x80, 0xc8, 0x58, 0xfe, 0xe5, + 0xa8, 0xa3, 0xed, 0x97, 0x61, 0x8e, 0xdf, 0x91, 0x03, 0x83, 0x24, 0xb9, 0xb3, 0xe2, 0xaa, 0x1b, + 0x58, 0x4f, 0x51, 0x16, 0x12, 0x5c, 0x2c, 0xac, 0xc3, 0x5c, 0x06, 0xda, 0xf8, 0xa8, 0x22, 0x7b, + 0xd0, 0x32, 0xa0, 0xfd, 0xe0, 0xd1, 0xc2, 0x08, 0x89, 0xe0, 0x72, 0xf3, 0xe1, 0x88, 0x2f, 0x7e, + 0x03, 0x80, 0xaf, 0xc2, 0xb0, 0x88, 0xe3, 0xb6, 0xd5, 0x45, 0x6f, 0x9a, 0xf7, 0x94, 0x79, 0x07, + 0xfa, 0x89, 0x26, 0x8f, 0xc8, 0x03, 0x37, 0x69, 0x75, 0x43, 0xd9, 0x79, 0x86, 0xa4, 0xf8, 0xf7, + 0x69, 0x36, 0xd3, 0xc3, 0xed, 0xd6, 0x6a, 0xfe, 0x0c, 0x9c, 0xfc, 0x59, 0x97, 0x7b, 0x7e, 0x70, + 0xee, 0xbf, 0x89, 0xaf, 0xde, 0xe2, 0xe1, 0x7d, 0xfc, 0xf1, 0x07, 0xb7, 0xaf, 0x87, 0xa7, 0xec, + 0xe2, 0x51, 0xf0, 0xa8, 0x25, 0x7d, 0xc2, 0x4f, 0xaa, 0x28, 0xdc, 0x35, 0x74, 0x42, 0x3b, 0xfc, + 0x12, 0xc8, 0x2f, 0x0d, 0x91, 0xc3, 0xbd, 0xf6, 0xf4, 0x4b, 0x43, 0xa8, 0xdf, 0x77, 0x69, 0x88, + 0xe4, 0xd4, 0xeb, 0x61, 0xd1, 0x1e, 0x0f, 0x1e, 0x81, 0x04, 0x56, 0x1d, 0x53, 0x12, 0xb9, 0x7d, + 0xd8, 0x7d, 0x10, 0xbe, 0x92, 0x48, 0xd5, 0xb1, 0xfc, 0x9f, 0x35, 0xb8, 0x36, 0x14, 0x7e, 0xc1, + 0x92, 0x4d, 0x40, 0x5e, 0x64, 0x50, 0xb8, 0xb1, 0xa7, 0x96, 0xfe, 0x7c, 0xd1, 0x3c, 0xef, 0x0d, + 0x55, 0xee, 0xcf, 0x66, 0xf7, 0x51, 0xa5, 0xe7, 0x8f, 0x1a, 0x2c, 0x44, 0x17, 0x10, 0x98, 0x52, + 0x83, 0x99, 0xe8, 0xd4, 0xca, 0x88, 0x5b, 0xcf, 0x62, 0x44, 0x74, 0xfd, 0x7d, 0x20, 0x68, 0x2f, + 0x4c, 0x71, 0xf9, 0x94, 0x76, 0xe7, 0x99, 0x49, 0xf1, 0x17, 0x76, 0x66, 0xaa, 0x4b, 0xdf, 0xfc, + 0x53, 0x83, 0x89, 0x6d, 0xd7, 0x6d, 0xa1, 0x1f, 0xc1, 0xbc, 0xe3, 0x32, 0x83, 0xa7, 0x03, 0xb1, + 0x0c, 0x75, 0xd7, 0x97, 0xe5, 0xb3, 0xf2, 0x54, 0xae, 0xfe, 0x71, 0x9a, 0x1d, 0xd6, 0xec, 0x27, + 0x50, 0x3d, 0x29, 0x39, 0x2e, 0x2b, 0x09, 0xa1, 0x1d, 0xf9, 0x1c, 0xd0, 0x80, 0xd9, 0xfe, 0xe9, + 0x64, 0x89, 0x5d, 0x3b, 0x6f, 0xba, 0xd9, 0x73, 0xa7, 0x9a, 0xa9, 0x47, 0xe6, 0x59, 0x9d, 0xe2, + 0x5e, 0xfb, 0x17, 0xf7, 0xdc, 0x3b, 0x90, 0x0a, 0xea, 0xcb, 0xae, 0x78, 0x8f, 0xa2, 0x68, 0x03, + 0x26, 0xe5, 0xd3, 0x94, 0x7f, 0xba, 0xbf, 0x19, 0x3e, 0x74, 0xe2, 0xba, 0x69, 0x17, 0x0e, 0x57, + 0x0a, 0x03, 0x4a, 0x7d, 0x7c, 0x2a, 0xe5, 0xdb, 0xbf, 0xd7, 0x00, 0xc2, 0x87, 0x13, 0xf4, 0x0a, + 0x5c, 0x2d, 0x6d, 0x6d, 0x96, 0x8d, 0xda, 0xce, 0xda, 0xce, 0x6e, 0xcd, 0xd8, 0xdd, 0xac, 0x6d, + 0x57, 0xd6, 0xab, 0x1b, 0xd5, 0x4a, 0x39, 0x35, 0x96, 0x49, 0x1e, 0x9f, 0xe4, 0x12, 0xbb, 0x0e, + 0xed, 0x10, 0xd3, 0x6e, 0xd8, 0xc4, 0x42, 0x5f, 0x81, 0x85, 0x7e, 0x69, 0xde, 0xaa, 0x94, 0x53, + 0x5a, 0x66, 0xe6, 0xf8, 0x24, 0x37, 0x25, 0x0f, 0x8a, 0xc4, 0x42, 0x4b, 0x70, 0x79, 0x58, 0xae, + 0xba, 0xf9, 0x46, 0x6a, 0x3c, 0x33, 0x7b, 0x7c, 0x92, 0x9b, 0x0e, 0x4e, 0x94, 0x28, 0x0f, 0x28, + 0x2a, 0xa9, 0xf0, 0x62, 0x19, 0x38, 0x3e, 0xc9, 0xc5, 0xa5, 0x1b, 0x32, 0x13, 0xef, 0xfe, 0x76, + 0x71, 0xec, 0xf6, 0xf7, 0x01, 0xaa, 0x4e, 0xc3, 0xc3, 0xa6, 0x08, 0xb7, 0x0c, 0x5c, 0xa9, 0x6e, + 0x6e, 0xe8, 0x6b, 0xeb, 0x3b, 0xd5, 0xad, 0xcd, 0xfe, 0x65, 0x0f, 0x8c, 0x95, 0xb7, 0x76, 0x4b, + 0x6f, 0x55, 0x8c, 0x5a, 0xf5, 0x8d, 0xcd, 0x94, 0x86, 0xae, 0xc2, 0xa5, 0xbe, 0xb1, 0x6f, 0x6f, + 0xee, 0x54, 0xdf, 0xae, 0xa4, 0xc6, 0x4b, 0x1b, 0x1f, 0x3e, 0x5e, 0xd4, 0x1e, 0x3e, 0x5e, 0xd4, + 0xfe, 0xfe, 0x78, 0x51, 0x7b, 0xef, 0xc9, 0xe2, 0xd8, 0xc3, 0x27, 0x8b, 0x63, 0x7f, 0x79, 0xb2, + 0x38, 0xf6, 0xce, 0x2b, 0x4d, 0x9b, 0xed, 0x77, 0xeb, 0x9c, 0x6e, 0xf5, 0xfa, 0x5d, 0x3c, 0xb3, + 0xe4, 0x89, 0xe7, 0xe6, 0x7a, 0x5c, 0xec, 0x32, 0x5f, 0xfb, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x16, 0x93, 0xee, 0x56, 0xe6, 0x17, 0x00, 0x00, } func (this *Pool) Description() (desc *github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor.FileDescriptorSet) { @@ -1404,835 +1404,847 @@ func (this *Pool) Description() (desc *github_com_cosmos_gogoproto_protoc_gen_go func StakingDescription() (desc *github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 13235 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0xbd, 0x6b, 0x70, 0x23, 0xd7, - 0x75, 0x20, 0x3c, 0x0d, 0x80, 0x78, 0x1c, 0x80, 0x40, 0xf3, 0x92, 0x33, 0x83, 0xe1, 0x48, 0x43, - 0x0e, 0x46, 0x8f, 0xd1, 0x48, 0xe2, 0x68, 0x46, 0xa3, 0x91, 0x44, 0x59, 0x56, 0xf0, 0x1a, 0x0e, - 0x46, 0x24, 0x40, 0x37, 0x40, 0x4a, 0xa3, 0x3c, 0x3a, 0x4d, 0xe0, 0x92, 0x6c, 0x0d, 0xd0, 0x0d, - 0xa3, 0x1b, 0x14, 0xa9, 0x54, 0xa5, 0xec, 0xc4, 0xc9, 0xe7, 0xc8, 0x71, 0x3e, 0xe7, 0x8b, 0xbf, - 0x44, 0xb1, 0x3d, 0x8e, 0xed, 0x7c, 0x89, 0xed, 0xbc, 0x3e, 0x27, 0x71, 0xb2, 0x71, 0xb6, 0xf6, - 0x91, 0xdd, 0x4d, 0x36, 0xf1, 0xee, 0x66, 0x9d, 0x54, 0xed, 0x6e, 0x2a, 0x55, 0xab, 0xdd, 0xb5, - 0x53, 0xb1, 0xfc, 0xc8, 0x73, 0xed, 0x5d, 0x57, 0x79, 0x53, 0xde, 0xba, 0xaf, 0x7e, 0x00, 0x0d, - 0x02, 0x1c, 0xdb, 0x59, 0x6f, 0xb2, 0x7f, 0x48, 0xf4, 0xbd, 0xe7, 0x9c, 0x3e, 0xf7, 0xdc, 0x73, - 0xcf, 0x39, 0xf7, 0xdc, 0x47, 0xc3, 0xdf, 0xe8, 0xb0, 0xb8, 0x63, 0x9a, 0x3b, 0x6d, 0x7c, 0xb1, - 0xdb, 0x33, 0x6d, 0x73, 0xab, 0xbf, 0x7d, 0xb1, 0x85, 0xad, 0x66, 0x4f, 0xef, 0xda, 0x66, 0x6f, - 0x89, 0x96, 0xa1, 0x0c, 0x83, 0x58, 0x12, 0x10, 0xb9, 0x4f, 0x4a, 0x30, 0x73, 0x4d, 0x6f, 0xe3, - 0x92, 0x03, 0x59, 0xc7, 0x36, 0x7a, 0x02, 0x22, 0xdb, 0x7a, 0x1b, 0x67, 0xa5, 0xc5, 0xf0, 0xf9, - 0xe4, 0xe5, 0x7b, 0x96, 0x06, 0xb0, 0x96, 0xfc, 0x18, 0xeb, 0xa4, 0x58, 0xa1, 0x18, 0x17, 0xbe, - 0x27, 0xfe, 0x96, 0x2f, 0x7e, 0xf2, 0x6b, 0x92, 0xfc, 0x56, 0xf2, 0x77, 0xbe, 0x83, 0x6e, 0xb1, - 0x67, 0x74, 0x65, 0x89, 0xe0, 0x79, 0xf8, 0xd9, 0xbb, 0x44, 0x4a, 0x54, 0x82, 0xa4, 0xba, 0xc5, - 0xaa, 0x85, 0x6d, 0x15, 0xef, 0xdb, 0xd8, 0xb0, 0x74, 0xd3, 0x98, 0x7f, 0x38, 0x00, 0x6b, 0x88, - 0xdb, 0xb2, 0x00, 0xcf, 0xfd, 0xf6, 0x14, 0xcc, 0x06, 0xb0, 0x86, 0x10, 0x44, 0x0c, 0xad, 0x43, - 0x9a, 0x23, 0x9d, 0x4f, 0x28, 0xf4, 0x37, 0xca, 0x42, 0xac, 0xab, 0x35, 0x6f, 0x69, 0x3b, 0x38, - 0x1b, 0xa2, 0xc5, 0xe2, 0x11, 0x9d, 0x01, 0x68, 0xe1, 0x2e, 0x36, 0x5a, 0xd8, 0x68, 0x1e, 0x64, - 0xc3, 0x8b, 0xe1, 0xf3, 0x09, 0xc5, 0x53, 0x82, 0x1e, 0x84, 0x99, 0x6e, 0x7f, 0xab, 0xad, 0x37, - 0x55, 0x0f, 0x18, 0x2c, 0x86, 0xcf, 0x4f, 0x29, 0x32, 0xab, 0x28, 0xb9, 0xc0, 0xf7, 0x43, 0xe6, - 0x25, 0xac, 0xdd, 0xf2, 0x82, 0x26, 0x29, 0x68, 0x9a, 0x14, 0x97, 0x7c, 0x54, 0xcd, 0xae, 0xad, - 0x9b, 0x86, 0x17, 0x34, 0x43, 0x5f, 0x2e, 0xb3, 0x0a, 0x0f, 0x70, 0x11, 0x52, 0x1d, 0x6c, 0x59, - 0xda, 0x0e, 0x56, 0xed, 0x83, 0x2e, 0xce, 0x46, 0x68, 0x3f, 0x2d, 0x0e, 0xf5, 0xd3, 0x60, 0x1f, - 0x25, 0x39, 0x56, 0xe3, 0xa0, 0x8b, 0x51, 0x1e, 0x12, 0xd8, 0xe8, 0x77, 0x18, 0x85, 0xa9, 0x11, - 0x3d, 0x5d, 0x36, 0xfa, 0x9d, 0x41, 0x2a, 0x71, 0x82, 0xc6, 0x49, 0xc4, 0x2c, 0xdc, 0xdb, 0xd3, - 0x9b, 0x38, 0x1b, 0xa5, 0x04, 0xee, 0x1f, 0x22, 0x50, 0x67, 0xf5, 0x83, 0x34, 0x04, 0x1e, 0x2a, - 0x42, 0xc2, 0xe9, 0xef, 0x6c, 0x8c, 0x12, 0xb9, 0x37, 0x40, 0xdf, 0x70, 0xbb, 0x35, 0x48, 0xc2, - 0xc5, 0x43, 0x57, 0x21, 0xc6, 0x64, 0x64, 0x65, 0xe3, 0x8b, 0xd2, 0xf9, 0xe4, 0xe5, 0xbb, 0x02, - 0x55, 0xb6, 0xc6, 0x60, 0x14, 0x01, 0x8c, 0x2a, 0x20, 0x5b, 0x66, 0xbf, 0xd7, 0xc4, 0x6a, 0xd3, - 0x6c, 0x61, 0x55, 0x37, 0xb6, 0xcd, 0x6c, 0x82, 0x12, 0x58, 0x18, 0x6e, 0x08, 0x05, 0x2c, 0x9a, - 0x2d, 0x5c, 0x31, 0xb6, 0x4d, 0x25, 0x6d, 0xf9, 0x9e, 0xd1, 0x09, 0x88, 0x5a, 0x07, 0x86, 0xad, - 0xed, 0x67, 0x53, 0x54, 0x9d, 0xf8, 0x13, 0xba, 0x0c, 0x31, 0xdc, 0xd2, 0xc9, 0xeb, 0xb2, 0xe9, - 0x45, 0xe9, 0x7c, 0xfa, 0x72, 0x76, 0x58, 0xc6, 0xac, 0x5e, 0x11, 0x80, 0xb9, 0xff, 0x11, 0x85, - 0xcc, 0x24, 0x3a, 0xfc, 0x14, 0x4c, 0x6d, 0x13, 0xc9, 0x64, 0x43, 0x47, 0x91, 0x1b, 0xc3, 0xf1, - 0x0b, 0x3e, 0x7a, 0x87, 0x82, 0xcf, 0x43, 0xd2, 0xc0, 0x96, 0x8d, 0x5b, 0x4c, 0x8b, 0xc2, 0x13, - 0xea, 0x21, 0x30, 0xa4, 0x61, 0x35, 0x8c, 0xdc, 0x91, 0x1a, 0x3e, 0x0f, 0x19, 0x87, 0x25, 0xb5, - 0xa7, 0x19, 0x3b, 0x42, 0x9f, 0x2f, 0x8e, 0xe3, 0x64, 0xc9, 0x31, 0x1e, 0x0a, 0x41, 0x53, 0xd2, - 0xd8, 0xf7, 0x8c, 0x4a, 0x00, 0xa6, 0x81, 0xcd, 0x6d, 0xb5, 0x85, 0x9b, 0xed, 0x6c, 0x7c, 0x84, - 0x94, 0x6a, 0x04, 0x64, 0x48, 0x4a, 0x26, 0x2b, 0x6d, 0xb6, 0xd1, 0x93, 0xae, 0x7a, 0xc6, 0x46, - 0x68, 0xd7, 0x1a, 0x1b, 0x98, 0x43, 0x1a, 0xba, 0x01, 0xe9, 0x1e, 0x26, 0x63, 0x05, 0xb7, 0x78, - 0xcb, 0x12, 0x94, 0x89, 0xa5, 0xb1, 0x2d, 0x53, 0x38, 0x1a, 0x6b, 0xd8, 0x74, 0xcf, 0xfb, 0x88, - 0xce, 0x81, 0x53, 0xa0, 0x52, 0xb5, 0x02, 0x6a, 0x69, 0x52, 0xa2, 0xb0, 0x4a, 0xd4, 0x2b, 0x0f, - 0xb0, 0xa7, 0x5b, 0xfa, 0x96, 0xde, 0xd6, 0x6d, 0x62, 0xb6, 0x88, 0xf6, 0x9e, 0x1d, 0x1e, 0x17, - 0x07, 0x9d, 0x2d, 0xb3, 0xbd, 0xe9, 0x00, 0x2a, 0x1e, 0xa4, 0xf9, 0x97, 0x21, 0xed, 0x97, 0x30, - 0x9a, 0x83, 0x29, 0xcb, 0xd6, 0x7a, 0x36, 0x55, 0xe4, 0x29, 0x85, 0x3d, 0x20, 0x19, 0xc2, 0xd8, - 0x68, 0x51, 0x4b, 0x3c, 0xa5, 0x90, 0x9f, 0xe8, 0xdb, 0x5c, 0x99, 0x85, 0xa9, 0xcc, 0xee, 0x1b, - 0x56, 0x0a, 0x1f, 0xe5, 0x41, 0xd1, 0xcd, 0x3f, 0x0e, 0xd3, 0x3e, 0x19, 0x4c, 0xfa, 0xea, 0xdc, - 0xbf, 0x8e, 0xc0, 0xf1, 0x40, 0xda, 0xe8, 0x79, 0x98, 0xeb, 0x1b, 0xba, 0x61, 0xe3, 0x5e, 0xb7, - 0x87, 0x89, 0xd6, 0xb3, 0x77, 0x65, 0x3f, 0x1b, 0x1b, 0xa1, 0xb7, 0x1b, 0x5e, 0x68, 0x46, 0x45, - 0x99, 0xed, 0x0f, 0x17, 0xa2, 0x9b, 0x90, 0x24, 0x2a, 0xa6, 0xf5, 0x34, 0x4a, 0x90, 0x0d, 0xe8, - 0xcb, 0x93, 0x35, 0x79, 0xa9, 0xe4, 0x62, 0x16, 0xc2, 0x6f, 0x97, 0x42, 0x8a, 0x97, 0x16, 0x7a, - 0x1c, 0xe2, 0xdb, 0x58, 0xb3, 0xfb, 0x3d, 0x6c, 0x65, 0x2f, 0x53, 0x51, 0x9e, 0x1e, 0x1e, 0xe7, - 0x0c, 0xa0, 0x8e, 0x6d, 0xc5, 0x01, 0x46, 0x1d, 0x48, 0xed, 0xe1, 0x9e, 0xbe, 0xad, 0x37, 0x19, - 0x53, 0x61, 0xaa, 0x01, 0x4f, 0x4c, 0xc8, 0xd4, 0xa6, 0x07, 0xb5, 0x6e, 0x6b, 0x36, 0x5e, 0x86, - 0x8d, 0xea, 0x66, 0x59, 0xa9, 0x5c, 0xab, 0x94, 0x4b, 0x8c, 0x4d, 0x1f, 0xf9, 0xf9, 0x77, 0x4b, - 0x90, 0xf4, 0xb4, 0x84, 0x58, 0x54, 0xa3, 0xdf, 0xd9, 0xc2, 0x3d, 0xde, 0x5f, 0xfc, 0x09, 0x9d, - 0x86, 0xc4, 0x76, 0xbf, 0xdd, 0x66, 0x7a, 0xcb, 0x7c, 0x77, 0x9c, 0x14, 0x50, 0x9d, 0x45, 0x10, - 0xe1, 0x96, 0x88, 0x9a, 0x49, 0xf2, 0x1b, 0xcd, 0x43, 0x5c, 0xe8, 0x75, 0x76, 0x6a, 0x51, 0x3a, - 0x1f, 0x57, 0x9c, 0x67, 0x56, 0xd7, 0xc5, 0x9a, 0x8d, 0x5b, 0xd9, 0xa8, 0xa8, 0x63, 0xcf, 0x37, - 0x22, 0xf1, 0x88, 0x3c, 0x95, 0xbb, 0x02, 0x33, 0x43, 0x4d, 0x41, 0x19, 0x48, 0x96, 0xca, 0xc5, - 0xd5, 0xbc, 0x92, 0x6f, 0x54, 0x6a, 0x55, 0xf9, 0x18, 0x4a, 0x83, 0xa7, 0x75, 0xb2, 0x74, 0x21, - 0x11, 0x7f, 0x3d, 0x26, 0xbf, 0xe5, 0x2d, 0x6f, 0x79, 0x4b, 0x28, 0xf7, 0x5b, 0x51, 0x98, 0x0b, - 0xb2, 0xa3, 0x81, 0x26, 0xdd, 0x6d, 0x74, 0xd8, 0xd7, 0xe8, 0x3c, 0x4c, 0xb5, 0xb5, 0x2d, 0xdc, - 0xce, 0x46, 0x68, 0x27, 0x3c, 0x38, 0x91, 0xa5, 0x5e, 0x5a, 0x25, 0x28, 0x0a, 0xc3, 0x44, 0x6f, - 0xe4, 0xa2, 0x99, 0xa2, 0x14, 0x2e, 0x4c, 0x46, 0x81, 0xd8, 0x57, 0x2e, 0xc6, 0xd3, 0x90, 0x20, - 0xff, 0x99, 0xdc, 0xa3, 0x4c, 0xee, 0xa4, 0x80, 0xca, 0x7d, 0x1e, 0xe2, 0xd4, 0x74, 0xb6, 0xb0, - 0xd3, 0x27, 0xe2, 0x99, 0x18, 0x9b, 0x16, 0xde, 0xd6, 0xfa, 0x6d, 0x5b, 0xdd, 0xd3, 0xda, 0x7d, - 0x4c, 0x8d, 0x60, 0x42, 0x49, 0xf1, 0xc2, 0x4d, 0x52, 0x86, 0x16, 0x20, 0xc9, 0x2c, 0xad, 0x6e, - 0xb4, 0xf0, 0x3e, 0xf5, 0xc2, 0x53, 0x0a, 0x33, 0xbe, 0x15, 0x52, 0x42, 0x5e, 0xff, 0xa2, 0x65, - 0x1a, 0xc2, 0x5c, 0xd1, 0x57, 0x90, 0x02, 0xfa, 0xfa, 0xc7, 0x07, 0x03, 0x80, 0xbb, 0x83, 0x9b, - 0x37, 0x64, 0x5f, 0xef, 0x87, 0x0c, 0x85, 0x78, 0x94, 0x0f, 0x65, 0xad, 0x9d, 0x9d, 0xa1, 0x6a, - 0x90, 0x66, 0xc5, 0x35, 0x5e, 0x9a, 0xfb, 0xf5, 0x10, 0x44, 0xa8, 0xb3, 0xc9, 0x40, 0xb2, 0x71, - 0x73, 0xbd, 0xac, 0x96, 0x6a, 0x1b, 0x85, 0xd5, 0xb2, 0x2c, 0x91, 0xae, 0xa7, 0x05, 0xd7, 0x56, - 0x6b, 0xf9, 0x86, 0x1c, 0x72, 0x9e, 0x2b, 0xd5, 0xc6, 0xd5, 0x2b, 0x72, 0xd8, 0x41, 0xd8, 0x60, - 0x05, 0x11, 0x2f, 0xc0, 0xa3, 0x97, 0xe5, 0x29, 0x24, 0x43, 0x8a, 0x11, 0xa8, 0x3c, 0x5f, 0x2e, - 0x5d, 0xbd, 0x22, 0x47, 0xfd, 0x25, 0x8f, 0x5e, 0x96, 0x63, 0x68, 0x1a, 0x12, 0xb4, 0xa4, 0x50, - 0xab, 0xad, 0xca, 0x71, 0x87, 0x66, 0xbd, 0xa1, 0x54, 0xaa, 0x2b, 0x72, 0xc2, 0xa1, 0xb9, 0xa2, - 0xd4, 0x36, 0xd6, 0x65, 0x70, 0x28, 0xac, 0x95, 0xeb, 0xf5, 0xfc, 0x4a, 0x59, 0x4e, 0x3a, 0x10, - 0x85, 0x9b, 0x8d, 0x72, 0x5d, 0x4e, 0xf9, 0xd8, 0x7a, 0xf4, 0xb2, 0x3c, 0xed, 0xbc, 0xa2, 0x5c, - 0xdd, 0x58, 0x93, 0xd3, 0x68, 0x06, 0xa6, 0xd9, 0x2b, 0x04, 0x13, 0x99, 0x81, 0xa2, 0xab, 0x57, - 0x64, 0xd9, 0x65, 0x84, 0x51, 0x99, 0xf1, 0x15, 0x5c, 0xbd, 0x22, 0xa3, 0x5c, 0x11, 0xa6, 0xa8, - 0x1a, 0x22, 0x04, 0xe9, 0xd5, 0x7c, 0xa1, 0xbc, 0xaa, 0xd6, 0xd6, 0xc9, 0xa0, 0xc9, 0xaf, 0xca, - 0x92, 0x5b, 0xa6, 0x94, 0xd7, 0xcb, 0xf9, 0x46, 0xb9, 0x24, 0x87, 0xbd, 0x65, 0x6f, 0xda, 0xa8, - 0x28, 0xe5, 0x92, 0x1c, 0xca, 0x35, 0x61, 0x2e, 0xc8, 0xc9, 0x06, 0x0e, 0x21, 0x8f, 0x2e, 0x84, - 0x46, 0xe8, 0x02, 0xa5, 0x35, 0xa8, 0x0b, 0xb9, 0x9f, 0x0d, 0xc3, 0x6c, 0x40, 0xa0, 0x11, 0xf8, - 0x92, 0x67, 0x60, 0x8a, 0xe9, 0x32, 0xb3, 0xd4, 0x0f, 0x04, 0x46, 0x2c, 0x54, 0xb3, 0x87, 0xc2, - 0x2f, 0x8a, 0xe7, 0x0d, 0x59, 0xc3, 0x23, 0x42, 0x56, 0x42, 0x62, 0x48, 0x61, 0xbf, 0x73, 0x28, - 0x20, 0x60, 0x31, 0xd3, 0xd5, 0x49, 0x62, 0x26, 0x5a, 0x76, 0xb4, 0xc0, 0x60, 0x6a, 0x6c, 0x60, - 0x10, 0xbd, 0x93, 0xc0, 0xe0, 0x29, 0x98, 0x19, 0xe2, 0x65, 0x62, 0x07, 0xfd, 0xfd, 0x12, 0x64, - 0x47, 0xc9, 0x77, 0x8c, 0x55, 0x0d, 0xf9, 0xac, 0xea, 0x53, 0x83, 0x9d, 0x70, 0x76, 0x74, 0x3f, - 0x0e, 0xa9, 0xcb, 0x87, 0x25, 0x38, 0x11, 0x3c, 0xbb, 0x09, 0xe4, 0xe1, 0x8d, 0x10, 0xed, 0x60, - 0x7b, 0xd7, 0x14, 0xd1, 0xfa, 0x7d, 0x01, 0x31, 0x20, 0xa9, 0x1e, 0xd4, 0x17, 0x8e, 0xe5, 0x0d, - 0x22, 0xc3, 0xa3, 0xa6, 0x28, 0x8c, 0x9b, 0x21, 0x4e, 0x7f, 0x28, 0x04, 0xc7, 0x03, 0x89, 0x07, - 0x32, 0x7a, 0x37, 0x80, 0x6e, 0x74, 0xfb, 0x36, 0x8b, 0xc8, 0x99, 0x31, 0x4f, 0xd0, 0x12, 0x6a, - 0xff, 0x88, 0xa1, 0xee, 0xdb, 0x4e, 0x3d, 0x73, 0xb4, 0xc0, 0x8a, 0x28, 0xc0, 0x13, 0x2e, 0xa3, - 0x11, 0xca, 0xe8, 0x99, 0x11, 0x2d, 0x1d, 0xd2, 0xed, 0x47, 0x40, 0x6e, 0xb6, 0x75, 0x6c, 0xd8, - 0xaa, 0x65, 0xf7, 0xb0, 0xd6, 0xd1, 0x8d, 0x1d, 0xe6, 0xb0, 0x97, 0xa7, 0xb6, 0xb5, 0xb6, 0x85, - 0x95, 0x0c, 0xab, 0xae, 0x8b, 0x5a, 0x82, 0x41, 0x15, 0xa8, 0xe7, 0xc1, 0x88, 0xfa, 0x30, 0x58, - 0xb5, 0x83, 0x91, 0xfb, 0xc5, 0x04, 0x24, 0x3d, 0x73, 0x41, 0x74, 0x16, 0x52, 0x2f, 0x6a, 0x7b, - 0x9a, 0x2a, 0x92, 0x01, 0x4c, 0x12, 0x49, 0x52, 0xb6, 0xce, 0x13, 0x02, 0x8f, 0xc0, 0x1c, 0x05, - 0x31, 0xfb, 0x36, 0xee, 0xa9, 0xcd, 0xb6, 0x66, 0x59, 0x54, 0x68, 0x71, 0x0a, 0x8a, 0x48, 0x5d, - 0x8d, 0x54, 0x15, 0x45, 0x0d, 0x7a, 0x0c, 0x66, 0x29, 0x46, 0xa7, 0xdf, 0xb6, 0xf5, 0x6e, 0x1b, - 0xd3, 0x34, 0x87, 0x45, 0xbd, 0x96, 0xc3, 0xd9, 0x0c, 0x81, 0x58, 0xe3, 0x00, 0x84, 0x23, 0x0b, - 0x95, 0xe0, 0x6e, 0x8a, 0xb6, 0x83, 0x0d, 0xdc, 0xd3, 0x6c, 0xac, 0xe2, 0x37, 0xf7, 0xb5, 0xb6, - 0xa5, 0x6a, 0x46, 0x4b, 0xdd, 0xd5, 0xac, 0xdd, 0xec, 0x1c, 0x21, 0x50, 0x08, 0x65, 0x25, 0xe5, - 0x14, 0x01, 0x5c, 0xe1, 0x70, 0x65, 0x0a, 0x96, 0x37, 0x5a, 0xd7, 0x35, 0x6b, 0x17, 0x2d, 0xc3, - 0x09, 0x4a, 0xc5, 0xb2, 0x7b, 0xba, 0xb1, 0xa3, 0x36, 0x77, 0x71, 0xf3, 0x96, 0xda, 0xb7, 0xb7, - 0x9f, 0xc8, 0x9e, 0xf6, 0xbe, 0x9f, 0x72, 0x58, 0xa7, 0x30, 0x45, 0x02, 0xb2, 0x61, 0x6f, 0x3f, - 0x81, 0xea, 0x90, 0x22, 0x9d, 0xd1, 0xd1, 0x5f, 0xc6, 0xea, 0xb6, 0xd9, 0xa3, 0x6e, 0x38, 0x1d, - 0x60, 0xdd, 0x3c, 0x12, 0x5c, 0xaa, 0x71, 0x84, 0x35, 0xb3, 0x85, 0x97, 0xa7, 0xea, 0xeb, 0xe5, - 0x72, 0x49, 0x49, 0x0a, 0x2a, 0xd7, 0xcc, 0x1e, 0x51, 0xa8, 0x1d, 0xd3, 0x11, 0x70, 0x92, 0x29, - 0xd4, 0x8e, 0x29, 0xc4, 0xfb, 0x18, 0xcc, 0x36, 0x9b, 0xac, 0xcd, 0x7a, 0x53, 0xe5, 0x79, 0x01, - 0x2b, 0x2b, 0xfb, 0x84, 0xd5, 0x6c, 0xae, 0x30, 0x00, 0xae, 0xe3, 0x16, 0x7a, 0x12, 0x8e, 0xbb, - 0xc2, 0xf2, 0x22, 0xce, 0x0c, 0xb5, 0x72, 0x10, 0xf5, 0x31, 0x98, 0xed, 0x1e, 0x0c, 0x23, 0x22, - 0xdf, 0x1b, 0xbb, 0x07, 0x83, 0x68, 0xf7, 0xd2, 0xc4, 0x50, 0x0f, 0x37, 0x69, 0xb4, 0x78, 0xd2, - 0x0b, 0xed, 0xa9, 0x40, 0x4b, 0x20, 0x37, 0x9b, 0x2a, 0x36, 0xb4, 0xad, 0x36, 0x56, 0xb5, 0x1e, - 0x36, 0x34, 0x2b, 0xbb, 0x40, 0x81, 0x23, 0x76, 0xaf, 0x8f, 0x95, 0x74, 0xb3, 0x59, 0xa6, 0x95, - 0x79, 0x5a, 0x87, 0x2e, 0xc0, 0x8c, 0xb9, 0xf5, 0x62, 0x93, 0x29, 0x96, 0xda, 0xed, 0xe1, 0x6d, - 0x7d, 0x3f, 0x7b, 0x0f, 0x95, 0x52, 0x86, 0x54, 0x50, 0xb5, 0x5a, 0xa7, 0xc5, 0xe8, 0x01, 0x90, - 0x9b, 0xd6, 0xae, 0xd6, 0xeb, 0x52, 0xe3, 0x6c, 0x75, 0xb5, 0x26, 0xce, 0xde, 0xcb, 0x40, 0x59, - 0x79, 0x55, 0x14, 0x13, 0xc5, 0xb6, 0x5e, 0xd2, 0xb7, 0x6d, 0x41, 0xf1, 0x7e, 0xa6, 0xd8, 0xb4, - 0x8c, 0x53, 0x3b, 0x0f, 0x72, 0x77, 0xb7, 0xeb, 0x7f, 0xf1, 0x79, 0x0a, 0x96, 0xee, 0xee, 0x76, - 0xbd, 0xef, 0x3d, 0x07, 0xd3, 0x04, 0xd2, 0x7d, 0xe9, 0x03, 0x2c, 0x84, 0xeb, 0xee, 0x7a, 0xde, - 0x78, 0x05, 0x4e, 0x10, 0xa0, 0x0e, 0xb6, 0xb5, 0x96, 0x66, 0x6b, 0x1e, 0xe8, 0x87, 0x28, 0xf4, - 0x5c, 0x77, 0xb7, 0xbb, 0xc6, 0x2b, 0x7d, 0x7c, 0xf6, 0xfa, 0x5b, 0x07, 0x8e, 0x7e, 0x3c, 0xcc, - 0xf8, 0x24, 0x65, 0x42, 0x43, 0xee, 0x78, 0x06, 0xf3, 0x4d, 0x9b, 0xaf, 0xe5, 0x96, 0x21, 0xe5, - 0xd5, 0x7b, 0x94, 0x00, 0xa6, 0xf9, 0xb2, 0x44, 0xe2, 0xa8, 0x62, 0xad, 0x44, 0x22, 0xa0, 0x17, - 0xca, 0x72, 0x88, 0x44, 0x62, 0xab, 0x95, 0x46, 0x59, 0x55, 0x36, 0xaa, 0x8d, 0xca, 0x5a, 0x59, - 0x0e, 0x7b, 0xe6, 0x06, 0x37, 0x22, 0xf1, 0x0b, 0xf2, 0x83, 0x37, 0x22, 0xf1, 0xfb, 0xe4, 0xfb, - 0xa9, 0x78, 0x86, 0x94, 0x32, 0xf7, 0xa5, 0x30, 0xa4, 0xfd, 0xc9, 0x01, 0xf4, 0x06, 0x38, 0x29, - 0xb2, 0x7f, 0x16, 0xb6, 0xd5, 0x97, 0xf4, 0x1e, 0x1d, 0xac, 0x1d, 0x8d, 0x39, 0x4e, 0x47, 0x29, - 0xe7, 0x38, 0x54, 0x1d, 0xdb, 0xcf, 0xe9, 0x3d, 0x32, 0x14, 0x3b, 0x9a, 0x8d, 0x56, 0x61, 0xc1, - 0x30, 0x55, 0xcb, 0xd6, 0x8c, 0x96, 0xd6, 0x6b, 0x79, 0x73, 0xaf, 0x5a, 0xb3, 0x89, 0x2d, 0xcb, - 0x64, 0x4e, 0xd2, 0xa1, 0x72, 0x97, 0x61, 0xd6, 0x39, 0xb0, 0xeb, 0x3d, 0xf2, 0x1c, 0x74, 0x60, - 0x4c, 0x84, 0x47, 0x8d, 0x89, 0xd3, 0x90, 0xe8, 0x68, 0x5d, 0x15, 0x1b, 0x76, 0xef, 0x80, 0x86, - 0xff, 0x71, 0x25, 0xde, 0xd1, 0xba, 0x65, 0xf2, 0x8c, 0x36, 0xe1, 0x3e, 0x17, 0x54, 0x6d, 0xe3, - 0x1d, 0xad, 0x79, 0xa0, 0xd2, 0x58, 0x9f, 0x66, 0xaa, 0xd4, 0xa6, 0x69, 0x6c, 0xb7, 0xf5, 0xa6, - 0x6d, 0x51, 0xdb, 0xc1, 0xec, 0x5f, 0xce, 0xc5, 0x58, 0xa5, 0x08, 0x37, 0x2c, 0xd3, 0xa0, 0x21, - 0x7e, 0x51, 0x40, 0xfb, 0xd4, 0x26, 0xf5, 0x2d, 0xa1, 0x36, 0xfe, 0xae, 0x8f, 0xc8, 0x53, 0x37, - 0x22, 0xf1, 0x29, 0x39, 0x7a, 0x23, 0x12, 0x8f, 0xca, 0xb1, 0x1b, 0x91, 0x78, 0x5c, 0x4e, 0xdc, - 0x88, 0xc4, 0x13, 0x32, 0xe4, 0x6e, 0x4f, 0x43, 0xca, 0x3b, 0x63, 0x21, 0x13, 0xc0, 0x26, 0x75, - 0xb8, 0x12, 0x35, 0xc9, 0xe7, 0x0e, 0x9d, 0xdf, 0x2c, 0x15, 0x89, 0x27, 0x5e, 0x8e, 0xb2, 0xe9, - 0x81, 0xc2, 0x30, 0x49, 0x14, 0x44, 0x06, 0x19, 0x66, 0xb1, 0x54, 0x5c, 0xe1, 0x4f, 0x68, 0x05, - 0xa2, 0x2f, 0x5a, 0x94, 0x36, 0x0b, 0xe5, 0xee, 0x39, 0x9c, 0xf6, 0x8d, 0x3a, 0x25, 0x9e, 0xb8, - 0x51, 0x57, 0xab, 0x35, 0x65, 0x2d, 0xbf, 0xaa, 0x70, 0x74, 0x74, 0x0a, 0x22, 0x6d, 0xed, 0xe5, - 0x03, 0xbf, 0xcf, 0xa6, 0x45, 0x68, 0x09, 0x32, 0x7d, 0x83, 0x4d, 0xf7, 0x49, 0x1f, 0x13, 0xa8, - 0x8c, 0x17, 0x2a, 0xed, 0xd6, 0xae, 0x12, 0xf8, 0x09, 0xf5, 0xea, 0x14, 0x44, 0x5e, 0xc2, 0xda, - 0x2d, 0xbf, 0x67, 0xa5, 0x45, 0xe8, 0x3c, 0xa4, 0x5a, 0x78, 0xab, 0xbf, 0xa3, 0xf6, 0x70, 0x4b, - 0x6b, 0xda, 0x7e, 0x7f, 0x92, 0xa4, 0x55, 0x0a, 0xad, 0x41, 0xcf, 0x42, 0x82, 0xf4, 0x91, 0x41, - 0xfb, 0x78, 0x86, 0x8a, 0xe0, 0xe1, 0xc3, 0x45, 0xc0, 0xbb, 0x58, 0x20, 0x29, 0x2e, 0x3e, 0xba, - 0x0e, 0x31, 0x5b, 0xeb, 0xed, 0x60, 0xdb, 0xca, 0xce, 0x2e, 0x86, 0xcf, 0xa7, 0x03, 0x32, 0x75, - 0x01, 0xa4, 0x1a, 0x14, 0x85, 0x4e, 0xb6, 0x05, 0x3a, 0x7a, 0x0e, 0x64, 0x9e, 0x10, 0x56, 0xf9, - 0x4c, 0xd9, 0xca, 0xce, 0x51, 0x05, 0x7c, 0xe8, 0x70, 0x92, 0x3c, 0x9f, 0x5c, 0x62, 0x48, 0x4a, - 0x06, 0xfb, 0x9e, 0xfd, 0xe3, 0xe2, 0xf8, 0x51, 0xc6, 0xc5, 0x06, 0x64, 0xf8, 0x6f, 0xd5, 0xea, - 0x77, 0xbb, 0x66, 0xcf, 0xce, 0x9e, 0xa0, 0xf8, 0x63, 0x18, 0x12, 0xc4, 0x18, 0x8e, 0x92, 0xde, - 0xf6, 0x3d, 0x7f, 0xf3, 0x86, 0xdb, 0xfc, 0x0b, 0x90, 0xf6, 0x0b, 0xc3, 0x9b, 0x8e, 0x0f, 0x4f, - 0x98, 0x8e, 0x27, 0xd3, 0x12, 0x31, 0xd7, 0x23, 0xae, 0x89, 0x3d, 0xcc, 0xff, 0x78, 0x08, 0xd2, - 0xfe, 0x86, 0xa1, 0x15, 0x40, 0xa2, 0xc7, 0x74, 0xc3, 0xee, 0x99, 0xad, 0x7e, 0x13, 0xb7, 0xf8, - 0x80, 0x1d, 0xfd, 0x9e, 0x19, 0x8e, 0x53, 0x71, 0x50, 0xbc, 0x84, 0x3c, 0xa3, 0x20, 0x34, 0x21, - 0xa1, 0x92, 0x3b, 0x3e, 0x2e, 0xc2, 0xac, 0x20, 0x40, 0x88, 0xbd, 0xa4, 0xf5, 0x0c, 0x12, 0x22, - 0xb3, 0xa0, 0x1d, 0x79, 0xaa, 0x9e, 0x63, 0x35, 0x28, 0x0f, 0x42, 0x5d, 0xd4, 0x1e, 0xee, 0x98, - 0x7b, 0xb8, 0xc5, 0x33, 0x4e, 0xa3, 0x5f, 0x9b, 0xe6, 0x08, 0x0a, 0x83, 0xcf, 0x5d, 0x84, 0x29, - 0x6a, 0x7e, 0x10, 0x00, 0x37, 0x40, 0xf2, 0x31, 0x14, 0x87, 0x48, 0xb1, 0xa6, 0x10, 0xf7, 0x28, - 0x43, 0x8a, 0x95, 0xaa, 0xeb, 0x95, 0x72, 0xb1, 0x2c, 0x87, 0x72, 0x8f, 0x41, 0x94, 0xd9, 0x14, - 0xe2, 0x3a, 0x1d, 0xab, 0x22, 0x1f, 0xe3, 0x8f, 0x9c, 0x86, 0x24, 0x6a, 0x37, 0xd6, 0x0a, 0x65, - 0x45, 0x0e, 0xe5, 0x36, 0x20, 0x33, 0x30, 0x0e, 0xd1, 0x71, 0x98, 0x51, 0xca, 0x8d, 0x72, 0xb5, - 0x51, 0xa9, 0x55, 0xd5, 0x8d, 0xea, 0xb3, 0xd5, 0xda, 0x73, 0x55, 0xf9, 0x98, 0xbf, 0x58, 0xf8, - 0x61, 0x09, 0xcd, 0x81, 0xec, 0x16, 0xd7, 0x6b, 0x1b, 0x0a, 0xe5, 0xe6, 0x87, 0x43, 0x20, 0x0f, - 0x0e, 0x4a, 0x74, 0x12, 0x66, 0x1b, 0x79, 0x65, 0xa5, 0xdc, 0x50, 0x59, 0xce, 0xc4, 0x21, 0x3d, - 0x07, 0xb2, 0xb7, 0xe2, 0x5a, 0x85, 0xa6, 0x84, 0x16, 0xe0, 0xb4, 0xb7, 0xb4, 0xfc, 0x7c, 0xa3, - 0x5c, 0xad, 0xd3, 0x97, 0xe7, 0xab, 0x2b, 0x24, 0x28, 0x18, 0xa0, 0x27, 0xb2, 0x34, 0x61, 0xc2, - 0xaa, 0x9f, 0x5e, 0x79, 0xb5, 0x24, 0x47, 0x06, 0x8b, 0x6b, 0xd5, 0x72, 0xed, 0x9a, 0x3c, 0x35, - 0xf8, 0x76, 0x9a, 0xb9, 0x89, 0xa2, 0x79, 0x38, 0x31, 0x58, 0xaa, 0x96, 0xab, 0x0d, 0xe5, 0xa6, - 0x1c, 0x1b, 0x7c, 0x71, 0xbd, 0xac, 0x6c, 0x56, 0x8a, 0x65, 0x39, 0x8e, 0x4e, 0x00, 0xf2, 0x73, - 0xd4, 0xb8, 0x5e, 0x2b, 0xc9, 0x89, 0x20, 0x8f, 0x85, 0xe4, 0xd9, 0xdc, 0x2f, 0x48, 0x90, 0xf2, - 0x66, 0x51, 0x7c, 0x46, 0x45, 0xfa, 0x56, 0x73, 0xb6, 0xb9, 0x3f, 0x08, 0x41, 0xd2, 0x93, 0x4e, - 0x21, 0x93, 0x58, 0xad, 0xdd, 0x36, 0x5f, 0x52, 0xb5, 0xb6, 0xae, 0x59, 0xdc, 0x1f, 0x02, 0x2d, - 0xca, 0x93, 0x92, 0x49, 0xfd, 0xcf, 0xe4, 0xa1, 0x4b, 0xf4, 0x8e, 0x43, 0x97, 0xd8, 0xb7, 0x60, - 0xe8, 0x32, 0x25, 0x47, 0x73, 0x7f, 0x14, 0x02, 0x79, 0x30, 0x3b, 0x32, 0x20, 0x37, 0x69, 0x94, - 0xdc, 0xbc, 0xed, 0x0b, 0x1d, 0xa5, 0x7d, 0x83, 0x5e, 0x3d, 0x3c, 0xd2, 0xab, 0x07, 0x38, 0xab, - 0xc8, 0xb7, 0xb2, 0xb3, 0xf2, 0xaa, 0xeb, 0xbf, 0x93, 0x20, 0xed, 0x4f, 0xe6, 0xf8, 0x24, 0x96, - 0x3b, 0x8a, 0xc4, 0xfc, 0x3d, 0x72, 0x76, 0x54, 0x8f, 0xfc, 0xad, 0xb4, 0xeb, 0x27, 0xc3, 0x30, - 0xed, 0xcb, 0xfd, 0x4c, 0xca, 0xdd, 0x9b, 0x61, 0x46, 0x6f, 0xe1, 0x4e, 0xd7, 0xb4, 0xb1, 0xd1, - 0x3c, 0x50, 0xdb, 0x78, 0x0f, 0xb7, 0xa9, 0x18, 0xd2, 0x01, 0x6b, 0xbc, 0xbe, 0x37, 0x2c, 0x55, - 0x5c, 0xbc, 0x55, 0x82, 0xb6, 0x3c, 0x5b, 0x29, 0x95, 0xd7, 0xd6, 0x6b, 0x8d, 0x72, 0xb5, 0x78, - 0x53, 0x58, 0x72, 0x45, 0xd6, 0x07, 0xc0, 0x7c, 0x02, 0x3f, 0xf7, 0xad, 0x31, 0xe9, 0x5c, 0x07, - 0x79, 0xb0, 0x35, 0xc4, 0xa0, 0x07, 0xb4, 0x47, 0x3e, 0x86, 0x66, 0x21, 0x53, 0xad, 0xa9, 0xf5, - 0x4a, 0xa9, 0xac, 0x96, 0xaf, 0x5d, 0x2b, 0x17, 0x1b, 0x75, 0xb6, 0x56, 0xe1, 0x40, 0x37, 0xe4, - 0x90, 0xb7, 0x6f, 0xde, 0x13, 0x86, 0xd9, 0x00, 0x4e, 0x50, 0x9e, 0xa7, 0x08, 0x59, 0xd6, 0xf2, - 0xe1, 0x49, 0xb8, 0x5f, 0x22, 0xb3, 0xfb, 0x75, 0xad, 0x67, 0xf3, 0x8c, 0xe2, 0x03, 0x40, 0xc4, - 0x6b, 0xd8, 0x24, 0xbc, 0xef, 0xf1, 0x35, 0x20, 0x16, 0x82, 0x64, 0xdc, 0x72, 0xb6, 0x0c, 0xf4, - 0x10, 0xa0, 0xae, 0x69, 0xe9, 0xb6, 0xbe, 0x87, 0x49, 0x0c, 0xc5, 0x81, 0xc9, 0xc0, 0x8d, 0x28, - 0xb2, 0xa8, 0xa9, 0x18, 0xb6, 0x03, 0x6d, 0xe0, 0x1d, 0x6d, 0x00, 0x9a, 0x4c, 0x3f, 0xc2, 0x8a, - 0x2c, 0x6a, 0x1c, 0xe8, 0xb3, 0x90, 0x6a, 0x99, 0xfd, 0xad, 0x36, 0xe6, 0x70, 0xc4, 0x24, 0x4b, - 0x4a, 0x92, 0x95, 0x39, 0x20, 0x3c, 0x6d, 0xe6, 0xae, 0x54, 0xa5, 0x94, 0x24, 0x2b, 0x63, 0x20, - 0xf7, 0x43, 0x46, 0xdb, 0xd9, 0xe9, 0x11, 0xe2, 0x82, 0x10, 0x4b, 0x04, 0xa6, 0x9d, 0x62, 0x0a, - 0x38, 0x7f, 0x03, 0xe2, 0x42, 0x0e, 0x64, 0xfe, 0x4b, 0x24, 0xa1, 0x76, 0x59, 0x76, 0x3b, 0x74, - 0x3e, 0xa1, 0xc4, 0x0d, 0x51, 0x79, 0x16, 0x52, 0xba, 0xe5, 0xee, 0x7a, 0xca, 0x86, 0x16, 0x43, - 0xe7, 0xe3, 0x4a, 0x52, 0xb7, 0xdc, 0x9d, 0x4d, 0x9f, 0x90, 0x01, 0x5c, 0x65, 0x43, 0x3f, 0x2a, - 0x41, 0x9a, 0x39, 0x98, 0x6e, 0x0f, 0x5b, 0xd8, 0x68, 0x8a, 0x69, 0xe1, 0x03, 0x87, 0xa8, 0x28, + // 13435 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0xbd, 0x6b, 0x74, 0x63, 0xd7, + 0x75, 0x18, 0x3c, 0x17, 0x00, 0xf1, 0xd8, 0x00, 0x81, 0xcb, 0x43, 0xce, 0x0c, 0x86, 0x23, 0x0d, + 0x39, 0x18, 0x3d, 0x46, 0x23, 0x89, 0xa3, 0xa1, 0x46, 0x23, 0x89, 0xb2, 0xac, 0xe0, 0x35, 0x33, + 0x18, 0x91, 0x00, 0x7d, 0x01, 0x52, 0x1a, 0xe5, 0x71, 0x73, 0x09, 0x1c, 0x92, 0x57, 0x03, 0xdc, + 0x0b, 0xe3, 0x5e, 0x50, 0xa4, 0xb2, 0x56, 0x96, 0x9d, 0x38, 0xf9, 0x1c, 0x39, 0xce, 0xe7, 0x7c, + 0xc9, 0x97, 0x28, 0xb6, 0xc7, 0xb1, 0x9d, 0x2f, 0xb1, 0x9d, 0xd7, 0xe7, 0x24, 0x4e, 0x1a, 0xa7, + 0x2b, 0x6d, 0xd3, 0x26, 0x69, 0xe2, 0xb6, 0x89, 0x93, 0xb5, 0xda, 0x64, 0x65, 0xad, 0xaa, 0xad, + 0x9d, 0xc6, 0xf2, 0x23, 0xcd, 0xa3, 0x4e, 0xeb, 0xb5, 0xdc, 0x2c, 0x77, 0x9d, 0xd7, 0x7d, 0x00, + 0x17, 0x04, 0x38, 0xb6, 0x53, 0x37, 0xe9, 0x1f, 0x12, 0xe7, 0x9c, 0xbd, 0xf7, 0xd9, 0x67, 0x9f, + 0x7d, 0xf6, 0xd9, 0x67, 0x9f, 0xc7, 0x85, 0xbf, 0xd5, 0x61, 0x71, 0xc7, 0x34, 0x77, 0xda, 0xf8, + 0x62, 0xb7, 0x67, 0xda, 0xe6, 0x56, 0x7f, 0xfb, 0x62, 0x0b, 0x5b, 0xcd, 0x9e, 0xde, 0xb5, 0xcd, + 0xde, 0x12, 0xcd, 0x43, 0x19, 0x06, 0xb1, 0x24, 0x20, 0x72, 0x9f, 0x90, 0x60, 0xe6, 0xaa, 0xde, + 0xc6, 0x25, 0x07, 0xb2, 0x8e, 0x6d, 0xf4, 0x04, 0x44, 0xb6, 0xf5, 0x36, 0xce, 0x4a, 0x8b, 0xe1, + 0xf3, 0xc9, 0xe5, 0x7b, 0x96, 0x06, 0xb0, 0x96, 0xfc, 0x18, 0xeb, 0x24, 0x5b, 0xa1, 0x18, 0x17, + 0xbe, 0x23, 0xfe, 0x96, 0x2f, 0x7c, 0xe2, 0x2b, 0x92, 0xfc, 0x56, 0xf2, 0x77, 0xbe, 0x83, 0x6e, + 0xb1, 0x34, 0xba, 0xbc, 0x44, 0xf0, 0x3c, 0xfc, 0xec, 0x5d, 0x22, 0x39, 0x2a, 0x41, 0x52, 0xdd, + 0x6c, 0xd5, 0xc2, 0xb6, 0x8a, 0xf7, 0x6d, 0x6c, 0x58, 0xba, 0x69, 0xcc, 0x3f, 0x1c, 0x80, 0x35, + 0xc4, 0x6d, 0x59, 0x80, 0xe7, 0x7e, 0x6b, 0x0a, 0x66, 0x03, 0x58, 0x43, 0x08, 0x22, 0x86, 0xd6, + 0x21, 0xcd, 0x91, 0xce, 0x27, 0x14, 0xfa, 0x1b, 0x65, 0x21, 0xd6, 0xd5, 0x9a, 0xb7, 0xb4, 0x1d, + 0x9c, 0x0d, 0xd1, 0x6c, 0x91, 0x44, 0x67, 0x00, 0x5a, 0xb8, 0x8b, 0x8d, 0x16, 0x36, 0x9a, 0x07, + 0xd9, 0xf0, 0x62, 0xf8, 0x7c, 0x42, 0xf1, 0xe4, 0xa0, 0x07, 0x61, 0xa6, 0xdb, 0xdf, 0x6a, 0xeb, + 0x4d, 0xd5, 0x03, 0x06, 0x8b, 0xe1, 0xf3, 0x53, 0x8a, 0xcc, 0x0a, 0x4a, 0x2e, 0xf0, 0xfd, 0x90, + 0x79, 0x09, 0x6b, 0xb7, 0xbc, 0xa0, 0x49, 0x0a, 0x9a, 0x26, 0xd9, 0x25, 0x1f, 0x55, 0xb3, 0x6b, + 0xeb, 0xa6, 0xe1, 0x05, 0xcd, 0xd0, 0xca, 0x65, 0x56, 0xe0, 0x01, 0x2e, 0x42, 0xaa, 0x83, 0x2d, + 0x4b, 0xdb, 0xc1, 0xaa, 0x7d, 0xd0, 0xc5, 0xd9, 0x08, 0xed, 0xa7, 0xc5, 0xa1, 0x7e, 0x1a, 0xec, + 0xa3, 0x24, 0xc7, 0x6a, 0x1c, 0x74, 0x31, 0xca, 0x43, 0x02, 0x1b, 0xfd, 0x0e, 0xa3, 0x30, 0x35, + 0xa2, 0xa7, 0xcb, 0x46, 0xbf, 0x33, 0x48, 0x25, 0x4e, 0xd0, 0x38, 0x89, 0x98, 0x85, 0x7b, 0x7b, + 0x7a, 0x13, 0x67, 0xa3, 0x94, 0xc0, 0xfd, 0x43, 0x04, 0xea, 0xac, 0x7c, 0x90, 0x86, 0xc0, 0x43, + 0x45, 0x48, 0x38, 0xfd, 0x9d, 0x8d, 0x51, 0x22, 0xf7, 0x06, 0xe8, 0x1b, 0x6e, 0xb7, 0x06, 0x49, + 0xb8, 0x78, 0xe8, 0x0a, 0xc4, 0x98, 0x8c, 0xac, 0x6c, 0x7c, 0x51, 0x3a, 0x9f, 0x5c, 0xbe, 0x2b, + 0x50, 0x65, 0x6b, 0x0c, 0x46, 0x11, 0xc0, 0xa8, 0x02, 0xb2, 0x65, 0xf6, 0x7b, 0x4d, 0xac, 0x36, + 0xcd, 0x16, 0x56, 0x75, 0x63, 0xdb, 0xcc, 0x26, 0x28, 0x81, 0x85, 0xe1, 0x86, 0x50, 0xc0, 0xa2, + 0xd9, 0xc2, 0x15, 0x63, 0xdb, 0x54, 0xd2, 0x96, 0x2f, 0x8d, 0x4e, 0x40, 0xd4, 0x3a, 0x30, 0x6c, + 0x6d, 0x3f, 0x9b, 0xa2, 0xea, 0xc4, 0x53, 0x68, 0x19, 0x62, 0xb8, 0xa5, 0x93, 0xea, 0xb2, 0xe9, + 0x45, 0xe9, 0x7c, 0x7a, 0x39, 0x3b, 0x2c, 0x63, 0x56, 0xae, 0x08, 0xc0, 0xdc, 0xff, 0x88, 0x42, + 0x66, 0x12, 0x1d, 0x7e, 0x0a, 0xa6, 0xb6, 0x89, 0x64, 0xb2, 0xa1, 0xa3, 0xc8, 0x8d, 0xe1, 0xf8, + 0x05, 0x1f, 0xbd, 0x43, 0xc1, 0xe7, 0x21, 0x69, 0x60, 0xcb, 0xc6, 0x2d, 0xa6, 0x45, 0xe1, 0x09, + 0xf5, 0x10, 0x18, 0xd2, 0xb0, 0x1a, 0x46, 0xee, 0x48, 0x0d, 0x9f, 0x87, 0x8c, 0xc3, 0x92, 0xda, + 0xd3, 0x8c, 0x1d, 0xa1, 0xcf, 0x17, 0xc7, 0x71, 0xb2, 0xe4, 0x18, 0x0f, 0x85, 0xa0, 0x29, 0x69, + 0xec, 0x4b, 0xa3, 0x12, 0x80, 0x69, 0x60, 0x73, 0x5b, 0x6d, 0xe1, 0x66, 0x3b, 0x1b, 0x1f, 0x21, + 0xa5, 0x1a, 0x01, 0x19, 0x92, 0x92, 0xc9, 0x72, 0x9b, 0x6d, 0xf4, 0xa4, 0xab, 0x9e, 0xb1, 0x11, + 0xda, 0xb5, 0xc6, 0x06, 0xe6, 0x90, 0x86, 0x6e, 0x40, 0xba, 0x87, 0xc9, 0x58, 0xc1, 0x2d, 0xde, + 0xb2, 0x04, 0x65, 0x62, 0x69, 0x6c, 0xcb, 0x14, 0x8e, 0xc6, 0x1a, 0x36, 0xdd, 0xf3, 0x26, 0xd1, + 0x39, 0x70, 0x32, 0x54, 0xaa, 0x56, 0x40, 0x2d, 0x4d, 0x4a, 0x64, 0x56, 0x89, 0x7a, 0xe5, 0x01, + 0xf6, 0x74, 0x4b, 0xdf, 0xd2, 0xdb, 0xba, 0x4d, 0xcc, 0x16, 0xd1, 0xde, 0xb3, 0xc3, 0xe3, 0xe2, + 0xa0, 0xb3, 0x65, 0xb6, 0x37, 0x1d, 0x40, 0xc5, 0x83, 0x34, 0xff, 0x32, 0xa4, 0xfd, 0x12, 0x46, + 0x73, 0x30, 0x65, 0xd9, 0x5a, 0xcf, 0xa6, 0x8a, 0x3c, 0xa5, 0xb0, 0x04, 0x92, 0x21, 0x8c, 0x8d, + 0x16, 0xb5, 0xc4, 0x53, 0x0a, 0xf9, 0x89, 0xbe, 0xc9, 0x95, 0x59, 0x98, 0xca, 0xec, 0xbe, 0x61, + 0xa5, 0xf0, 0x51, 0x1e, 0x14, 0xdd, 0xfc, 0xe3, 0x30, 0xed, 0x93, 0xc1, 0xa4, 0x55, 0xe7, 0xfe, + 0x75, 0x04, 0x8e, 0x07, 0xd2, 0x46, 0xcf, 0xc3, 0x5c, 0xdf, 0xd0, 0x0d, 0x1b, 0xf7, 0xba, 0x3d, + 0x4c, 0xb4, 0x9e, 0xd5, 0x95, 0xfd, 0x4c, 0x6c, 0x84, 0xde, 0x6e, 0x78, 0xa1, 0x19, 0x15, 0x65, + 0xb6, 0x3f, 0x9c, 0x89, 0x6e, 0x42, 0x92, 0xa8, 0x98, 0xd6, 0xd3, 0x28, 0x41, 0x36, 0xa0, 0x97, + 0x27, 0x6b, 0xf2, 0x52, 0xc9, 0xc5, 0x2c, 0x84, 0xdf, 0x2e, 0x85, 0x14, 0x2f, 0x2d, 0xf4, 0x38, + 0xc4, 0xb7, 0xb1, 0x66, 0xf7, 0x7b, 0xd8, 0xca, 0x2e, 0x53, 0x51, 0x9e, 0x1e, 0x1e, 0xe7, 0x0c, + 0xa0, 0x8e, 0x6d, 0xc5, 0x01, 0x46, 0x1d, 0x48, 0xed, 0xe1, 0x9e, 0xbe, 0xad, 0x37, 0x19, 0x53, + 0x61, 0xaa, 0x01, 0x4f, 0x4c, 0xc8, 0xd4, 0xa6, 0x07, 0xb5, 0x6e, 0x6b, 0x36, 0x5e, 0x81, 0x8d, + 0xea, 0x66, 0x59, 0xa9, 0x5c, 0xad, 0x94, 0x4b, 0x8c, 0x4d, 0x1f, 0xf9, 0xf9, 0x1f, 0x96, 0x20, + 0xe9, 0x69, 0x09, 0xb1, 0xa8, 0x46, 0xbf, 0xb3, 0x85, 0x7b, 0xbc, 0xbf, 0x78, 0x0a, 0x9d, 0x86, + 0xc4, 0x76, 0xbf, 0xdd, 0x66, 0x7a, 0xcb, 0xe6, 0xee, 0x38, 0xc9, 0xa0, 0x3a, 0x8b, 0x20, 0xc2, + 0x2d, 0x11, 0x35, 0x93, 0xe4, 0x37, 0x9a, 0x87, 0xb8, 0xd0, 0xeb, 0xec, 0xd4, 0xa2, 0x74, 0x3e, + 0xae, 0x38, 0x69, 0x56, 0xd6, 0xc5, 0x9a, 0x8d, 0x5b, 0xd9, 0xa8, 0x28, 0x63, 0xe9, 0x1b, 0x91, + 0x78, 0x44, 0x9e, 0xca, 0x5d, 0x86, 0x99, 0xa1, 0xa6, 0xa0, 0x0c, 0x24, 0x4b, 0xe5, 0xe2, 0x6a, + 0x5e, 0xc9, 0x37, 0x2a, 0xb5, 0xaa, 0x7c, 0x0c, 0xa5, 0xc1, 0xd3, 0x3a, 0x59, 0xba, 0x90, 0x88, + 0xbf, 0x1e, 0x93, 0xdf, 0xf2, 0x96, 0xb7, 0xbc, 0x25, 0x94, 0xfb, 0x8d, 0x28, 0xcc, 0x05, 0xd9, + 0xd1, 0x40, 0x93, 0xee, 0x36, 0x3a, 0xec, 0x6b, 0x74, 0x1e, 0xa6, 0xda, 0xda, 0x16, 0x6e, 0x67, + 0x23, 0xb4, 0x13, 0x1e, 0x9c, 0xc8, 0x52, 0x2f, 0xad, 0x12, 0x14, 0x85, 0x61, 0xa2, 0x37, 0x72, + 0xd1, 0x4c, 0x51, 0x0a, 0x17, 0x26, 0xa3, 0x40, 0xec, 0x2b, 0x17, 0xe3, 0x69, 0x48, 0x90, 0xff, + 0x4c, 0xee, 0x51, 0x26, 0x77, 0x92, 0x41, 0xe5, 0x3e, 0x0f, 0x71, 0x6a, 0x3a, 0x5b, 0xd8, 0xe9, + 0x13, 0x91, 0x26, 0xc6, 0xa6, 0x85, 0xb7, 0xb5, 0x7e, 0xdb, 0x56, 0xf7, 0xb4, 0x76, 0x1f, 0x53, + 0x23, 0x98, 0x50, 0x52, 0x3c, 0x73, 0x93, 0xe4, 0xa1, 0x05, 0x48, 0x32, 0x4b, 0xab, 0x1b, 0x2d, + 0xbc, 0x4f, 0x67, 0xe1, 0x29, 0x85, 0x19, 0xdf, 0x0a, 0xc9, 0x21, 0xd5, 0xbf, 0x68, 0x99, 0x86, + 0x30, 0x57, 0xb4, 0x0a, 0x92, 0x41, 0xab, 0x7f, 0x7c, 0xd0, 0x01, 0xb8, 0x3b, 0xb8, 0x79, 0x43, + 0xf6, 0xf5, 0x7e, 0xc8, 0x50, 0x88, 0x47, 0xf9, 0x50, 0xd6, 0xda, 0xd9, 0x19, 0xaa, 0x06, 0x69, + 0x96, 0x5d, 0xe3, 0xb9, 0xb9, 0x5f, 0x09, 0x41, 0x84, 0x4e, 0x36, 0x19, 0x48, 0x36, 0x6e, 0xae, + 0x97, 0xd5, 0x52, 0x6d, 0xa3, 0xb0, 0x5a, 0x96, 0x25, 0xd2, 0xf5, 0x34, 0xe3, 0xea, 0x6a, 0x2d, + 0xdf, 0x90, 0x43, 0x4e, 0xba, 0x52, 0x6d, 0x5c, 0xb9, 0x2c, 0x87, 0x1d, 0x84, 0x0d, 0x96, 0x11, + 0xf1, 0x02, 0x3c, 0xba, 0x2c, 0x4f, 0x21, 0x19, 0x52, 0x8c, 0x40, 0xe5, 0xf9, 0x72, 0xe9, 0xca, + 0x65, 0x39, 0xea, 0xcf, 0x79, 0x74, 0x59, 0x8e, 0xa1, 0x69, 0x48, 0xd0, 0x9c, 0x42, 0xad, 0xb6, + 0x2a, 0xc7, 0x1d, 0x9a, 0xf5, 0x86, 0x52, 0xa9, 0x5e, 0x93, 0x13, 0x0e, 0xcd, 0x6b, 0x4a, 0x6d, + 0x63, 0x5d, 0x06, 0x87, 0xc2, 0x5a, 0xb9, 0x5e, 0xcf, 0x5f, 0x2b, 0xcb, 0x49, 0x07, 0xa2, 0x70, + 0xb3, 0x51, 0xae, 0xcb, 0x29, 0x1f, 0x5b, 0x8f, 0x2e, 0xcb, 0xd3, 0x4e, 0x15, 0xe5, 0xea, 0xc6, + 0x9a, 0x9c, 0x46, 0x33, 0x30, 0xcd, 0xaa, 0x10, 0x4c, 0x64, 0x06, 0xb2, 0xae, 0x5c, 0x96, 0x65, + 0x97, 0x11, 0x46, 0x65, 0xc6, 0x97, 0x71, 0xe5, 0xb2, 0x8c, 0x72, 0x45, 0x98, 0xa2, 0x6a, 0x88, + 0x10, 0xa4, 0x57, 0xf3, 0x85, 0xf2, 0xaa, 0x5a, 0x5b, 0x27, 0x83, 0x26, 0xbf, 0x2a, 0x4b, 0x6e, + 0x9e, 0x52, 0x5e, 0x2f, 0xe7, 0x1b, 0xe5, 0x92, 0x1c, 0xf6, 0xe6, 0xbd, 0x69, 0xa3, 0xa2, 0x94, + 0x4b, 0x72, 0x28, 0xd7, 0x84, 0xb9, 0xa0, 0x49, 0x36, 0x70, 0x08, 0x79, 0x74, 0x21, 0x34, 0x42, + 0x17, 0x28, 0xad, 0x41, 0x5d, 0xc8, 0xfd, 0x54, 0x18, 0x66, 0x03, 0x1c, 0x8d, 0xc0, 0x4a, 0x9e, + 0x81, 0x29, 0xa6, 0xcb, 0xcc, 0x52, 0x3f, 0x10, 0xe8, 0xb1, 0x50, 0xcd, 0x1e, 0x72, 0xbf, 0x28, + 0x9e, 0xd7, 0x65, 0x0d, 0x8f, 0x70, 0x59, 0x09, 0x89, 0x21, 0x85, 0xfd, 0xd6, 0x21, 0x87, 0x80, + 0xf9, 0x4c, 0x57, 0x26, 0xf1, 0x99, 0x68, 0xde, 0xd1, 0x1c, 0x83, 0xa9, 0xb1, 0x8e, 0x41, 0xf4, + 0x4e, 0x1c, 0x83, 0xa7, 0x60, 0x66, 0x88, 0x97, 0x89, 0x27, 0xe8, 0xef, 0x96, 0x20, 0x3b, 0x4a, + 0xbe, 0x63, 0xac, 0x6a, 0xc8, 0x67, 0x55, 0x9f, 0x1a, 0xec, 0x84, 0xb3, 0xa3, 0xfb, 0x71, 0x48, + 0x5d, 0x3e, 0x24, 0xc1, 0x89, 0xe0, 0xd5, 0x4d, 0x20, 0x0f, 0x6f, 0x84, 0x68, 0x07, 0xdb, 0xbb, + 0xa6, 0xf0, 0xd6, 0xef, 0x0b, 0xf0, 0x01, 0x49, 0xf1, 0xa0, 0xbe, 0x70, 0x2c, 0xaf, 0x13, 0x19, + 0x1e, 0xb5, 0x44, 0x61, 0xdc, 0x0c, 0x71, 0xfa, 0x7d, 0x21, 0x38, 0x1e, 0x48, 0x3c, 0x90, 0xd1, + 0xbb, 0x01, 0x74, 0xa3, 0xdb, 0xb7, 0x99, 0x47, 0xce, 0x8c, 0x79, 0x82, 0xe6, 0x50, 0xfb, 0x47, + 0x0c, 0x75, 0xdf, 0x76, 0xca, 0xd9, 0x44, 0x0b, 0x2c, 0x8b, 0x02, 0x3c, 0xe1, 0x32, 0x1a, 0xa1, + 0x8c, 0x9e, 0x19, 0xd1, 0xd2, 0x21, 0xdd, 0x7e, 0x04, 0xe4, 0x66, 0x5b, 0xc7, 0x86, 0xad, 0x5a, + 0x76, 0x0f, 0x6b, 0x1d, 0xdd, 0xd8, 0x61, 0x13, 0xf6, 0xca, 0xd4, 0xb6, 0xd6, 0xb6, 0xb0, 0x92, + 0x61, 0xc5, 0x75, 0x51, 0x4a, 0x30, 0xa8, 0x02, 0xf5, 0x3c, 0x18, 0x51, 0x1f, 0x06, 0x2b, 0x76, + 0x30, 0x72, 0x3f, 0x97, 0x80, 0xa4, 0x67, 0x2d, 0x88, 0xce, 0x42, 0xea, 0x45, 0x6d, 0x4f, 0x53, + 0x45, 0x30, 0x80, 0x49, 0x22, 0x49, 0xf2, 0xd6, 0x79, 0x40, 0xe0, 0x11, 0x98, 0xa3, 0x20, 0x66, + 0xdf, 0xc6, 0x3d, 0xb5, 0xd9, 0xd6, 0x2c, 0x8b, 0x0a, 0x2d, 0x4e, 0x41, 0x11, 0x29, 0xab, 0x91, + 0xa2, 0xa2, 0x28, 0x41, 0x8f, 0xc1, 0x2c, 0xc5, 0xe8, 0xf4, 0xdb, 0xb6, 0xde, 0x6d, 0x63, 0x1a, + 0xe6, 0xb0, 0xe8, 0xac, 0xe5, 0x70, 0x36, 0x43, 0x20, 0xd6, 0x38, 0x00, 0xe1, 0xc8, 0x42, 0x25, + 0xb8, 0x9b, 0xa2, 0xed, 0x60, 0x03, 0xf7, 0x34, 0x1b, 0xab, 0xf8, 0xcd, 0x7d, 0xad, 0x6d, 0xa9, + 0x9a, 0xd1, 0x52, 0x77, 0x35, 0x6b, 0x37, 0x3b, 0x47, 0x08, 0x14, 0x42, 0x59, 0x49, 0x39, 0x45, + 0x00, 0xaf, 0x71, 0xb8, 0x32, 0x05, 0xcb, 0x1b, 0xad, 0xeb, 0x9a, 0xb5, 0x8b, 0x56, 0xe0, 0x04, + 0xa5, 0x62, 0xd9, 0x3d, 0xdd, 0xd8, 0x51, 0x9b, 0xbb, 0xb8, 0x79, 0x4b, 0xed, 0xdb, 0xdb, 0x4f, + 0x64, 0x4f, 0x7b, 0xeb, 0xa7, 0x1c, 0xd6, 0x29, 0x4c, 0x91, 0x80, 0x6c, 0xd8, 0xdb, 0x4f, 0xa0, + 0x3a, 0xa4, 0x48, 0x67, 0x74, 0xf4, 0x97, 0xb1, 0xba, 0x6d, 0xf6, 0xe8, 0x34, 0x9c, 0x0e, 0xb0, + 0x6e, 0x1e, 0x09, 0x2e, 0xd5, 0x38, 0xc2, 0x9a, 0xd9, 0xc2, 0x2b, 0x53, 0xf5, 0xf5, 0x72, 0xb9, + 0xa4, 0x24, 0x05, 0x95, 0xab, 0x66, 0x8f, 0x28, 0xd4, 0x8e, 0xe9, 0x08, 0x38, 0xc9, 0x14, 0x6a, + 0xc7, 0x14, 0xe2, 0x7d, 0x0c, 0x66, 0x9b, 0x4d, 0xd6, 0x66, 0xbd, 0xa9, 0xf2, 0xb8, 0x80, 0x95, + 0x95, 0x7d, 0xc2, 0x6a, 0x36, 0xaf, 0x31, 0x00, 0xae, 0xe3, 0x16, 0x7a, 0x12, 0x8e, 0xbb, 0xc2, + 0xf2, 0x22, 0xce, 0x0c, 0xb5, 0x72, 0x10, 0xf5, 0x31, 0x98, 0xed, 0x1e, 0x0c, 0x23, 0x22, 0x5f, + 0x8d, 0xdd, 0x83, 0x41, 0xb4, 0x7b, 0x69, 0x60, 0xa8, 0x87, 0x9b, 0xd4, 0x5b, 0x3c, 0xe9, 0x85, + 0xf6, 0x14, 0xa0, 0x25, 0x90, 0x9b, 0x4d, 0x15, 0x1b, 0xda, 0x56, 0x1b, 0xab, 0x5a, 0x0f, 0x1b, + 0x9a, 0x95, 0x5d, 0xa0, 0xc0, 0x11, 0xbb, 0xd7, 0xc7, 0x4a, 0xba, 0xd9, 0x2c, 0xd3, 0xc2, 0x3c, + 0x2d, 0x43, 0x17, 0x60, 0xc6, 0xdc, 0x7a, 0xb1, 0xc9, 0x14, 0x4b, 0xed, 0xf6, 0xf0, 0xb6, 0xbe, + 0x9f, 0xbd, 0x87, 0x4a, 0x29, 0x43, 0x0a, 0xa8, 0x5a, 0xad, 0xd3, 0x6c, 0xf4, 0x00, 0xc8, 0x4d, + 0x6b, 0x57, 0xeb, 0x75, 0xa9, 0x71, 0xb6, 0xba, 0x5a, 0x13, 0x67, 0xef, 0x65, 0xa0, 0x2c, 0xbf, + 0x2a, 0xb2, 0x89, 0x62, 0x5b, 0x2f, 0xe9, 0xdb, 0xb6, 0xa0, 0x78, 0x3f, 0x53, 0x6c, 0x9a, 0xc7, + 0xa9, 0x9d, 0x07, 0xb9, 0xbb, 0xdb, 0xf5, 0x57, 0x7c, 0x9e, 0x82, 0xa5, 0xbb, 0xbb, 0x5d, 0x6f, + 0xbd, 0xe7, 0x60, 0x9a, 0x40, 0xba, 0x95, 0x3e, 0xc0, 0x5c, 0xb8, 0xee, 0xae, 0xa7, 0xc6, 0xcb, + 0x70, 0x82, 0x00, 0x75, 0xb0, 0xad, 0xb5, 0x34, 0x5b, 0xf3, 0x40, 0x3f, 0x44, 0xa1, 0xe7, 0xba, + 0xbb, 0xdd, 0x35, 0x5e, 0xe8, 0xe3, 0xb3, 0xd7, 0xdf, 0x3a, 0x70, 0xf4, 0xe3, 0x61, 0xc6, 0x27, + 0xc9, 0x13, 0x1a, 0x72, 0xc7, 0x2b, 0x98, 0xaf, 0xdb, 0x7a, 0x2d, 0xb7, 0x02, 0x29, 0xaf, 0xde, + 0xa3, 0x04, 0x30, 0xcd, 0x97, 0x25, 0xe2, 0x47, 0x15, 0x6b, 0x25, 0xe2, 0x01, 0xbd, 0x50, 0x96, + 0x43, 0xc4, 0x13, 0x5b, 0xad, 0x34, 0xca, 0xaa, 0xb2, 0x51, 0x6d, 0x54, 0xd6, 0xca, 0x72, 0xd8, + 0xb3, 0x36, 0xb8, 0x11, 0x89, 0x5f, 0x90, 0x1f, 0xbc, 0x11, 0x89, 0xdf, 0x27, 0xdf, 0x4f, 0xc5, + 0x33, 0xa4, 0x94, 0xb9, 0x2f, 0x86, 0x21, 0xed, 0x0f, 0x0e, 0xa0, 0x37, 0xc0, 0x49, 0x11, 0xfd, + 0xb3, 0xb0, 0xad, 0xbe, 0xa4, 0xf7, 0xe8, 0x60, 0xed, 0x68, 0x6c, 0xe2, 0x74, 0x94, 0x72, 0x8e, + 0x43, 0xd5, 0xb1, 0xfd, 0x9c, 0xde, 0x23, 0x43, 0xb1, 0xa3, 0xd9, 0x68, 0x15, 0x16, 0x0c, 0x53, + 0xb5, 0x6c, 0xcd, 0x68, 0x69, 0xbd, 0x96, 0x37, 0xf6, 0xaa, 0x35, 0x9b, 0xd8, 0xb2, 0x4c, 0x36, + 0x49, 0x3a, 0x54, 0xee, 0x32, 0xcc, 0x3a, 0x07, 0x76, 0x67, 0x8f, 0x3c, 0x07, 0x1d, 0x18, 0x13, + 0xe1, 0x51, 0x63, 0xe2, 0x34, 0x24, 0x3a, 0x5a, 0x57, 0xc5, 0x86, 0xdd, 0x3b, 0xa0, 0xee, 0x7f, + 0x5c, 0x89, 0x77, 0xb4, 0x6e, 0x99, 0xa4, 0xd1, 0x26, 0xdc, 0xe7, 0x82, 0xaa, 0x6d, 0xbc, 0xa3, + 0x35, 0x0f, 0x54, 0xea, 0xeb, 0xd3, 0x48, 0x95, 0xda, 0x34, 0x8d, 0xed, 0xb6, 0xde, 0xb4, 0x2d, + 0x6a, 0x3b, 0x98, 0xfd, 0xcb, 0xb9, 0x18, 0xab, 0x14, 0xe1, 0x86, 0x65, 0x1a, 0xd4, 0xc5, 0x2f, + 0x0a, 0x68, 0x9f, 0xda, 0xa4, 0xbe, 0x21, 0xd4, 0xc6, 0xdf, 0xf5, 0x11, 0x79, 0xea, 0x46, 0x24, + 0x3e, 0x25, 0x47, 0x6f, 0x44, 0xe2, 0x51, 0x39, 0x76, 0x23, 0x12, 0x8f, 0xcb, 0x89, 0x1b, 0x91, + 0x78, 0x42, 0x86, 0xdc, 0xed, 0x69, 0x48, 0x79, 0x57, 0x2c, 0x64, 0x01, 0xd8, 0xa4, 0x13, 0xae, + 0x44, 0x4d, 0xf2, 0xb9, 0x43, 0xd7, 0x37, 0x4b, 0x45, 0x32, 0x13, 0xaf, 0x44, 0xd9, 0xf2, 0x40, + 0x61, 0x98, 0xc4, 0x0b, 0x22, 0x83, 0x0c, 0x33, 0x5f, 0x2a, 0xae, 0xf0, 0x14, 0xba, 0x06, 0xd1, + 0x17, 0x2d, 0x4a, 0x9b, 0xb9, 0x72, 0xf7, 0x1c, 0x4e, 0xfb, 0x46, 0x9d, 0x12, 0x4f, 0xdc, 0xa8, + 0xab, 0xd5, 0x9a, 0xb2, 0x96, 0x5f, 0x55, 0x38, 0x3a, 0x3a, 0x05, 0x91, 0xb6, 0xf6, 0xf2, 0x81, + 0x7f, 0xce, 0xa6, 0x59, 0x68, 0x09, 0x32, 0x7d, 0x83, 0x2d, 0xf7, 0x49, 0x1f, 0x13, 0xa8, 0x8c, + 0x17, 0x2a, 0xed, 0x96, 0xae, 0x12, 0xf8, 0x09, 0xf5, 0xea, 0x14, 0x44, 0x5e, 0xc2, 0xda, 0x2d, + 0xff, 0xcc, 0x4a, 0xb3, 0xd0, 0x79, 0x48, 0xb5, 0xf0, 0x56, 0x7f, 0x47, 0xed, 0xe1, 0x96, 0xd6, + 0xb4, 0xfd, 0xf3, 0x49, 0x92, 0x16, 0x29, 0xb4, 0x04, 0x3d, 0x0b, 0x09, 0xd2, 0x47, 0x06, 0xed, + 0xe3, 0x19, 0x2a, 0x82, 0x87, 0x0f, 0x17, 0x01, 0xef, 0x62, 0x81, 0xa4, 0xb8, 0xf8, 0xe8, 0x3a, + 0xc4, 0x6c, 0xad, 0xb7, 0x83, 0x6d, 0x2b, 0x3b, 0xbb, 0x18, 0x3e, 0x9f, 0x0e, 0x88, 0xd4, 0x05, + 0x90, 0x6a, 0x50, 0x14, 0xba, 0xd8, 0x16, 0xe8, 0xe8, 0x39, 0x90, 0x79, 0x40, 0x58, 0xe5, 0x2b, + 0x65, 0x2b, 0x3b, 0x47, 0x15, 0xf0, 0xa1, 0xc3, 0x49, 0xf2, 0x78, 0x72, 0x89, 0x21, 0x29, 0x19, + 0xec, 0x4b, 0xfb, 0xc7, 0xc5, 0xf1, 0xa3, 0x8c, 0x8b, 0x0d, 0xc8, 0xf0, 0xdf, 0xaa, 0xd5, 0xef, + 0x76, 0xcd, 0x9e, 0x9d, 0x3d, 0x41, 0xf1, 0xc7, 0x30, 0x24, 0x88, 0x31, 0x1c, 0x25, 0xbd, 0xed, + 0x4b, 0x7f, 0xfd, 0x86, 0xdb, 0xfc, 0x0b, 0x90, 0xf6, 0x0b, 0xc3, 0x1b, 0x8e, 0x0f, 0x4f, 0x18, + 0x8e, 0x27, 0xcb, 0x12, 0xb1, 0xd6, 0x23, 0x53, 0x13, 0x4b, 0xcc, 0xff, 0x48, 0x08, 0xd2, 0xfe, + 0x86, 0xa1, 0x6b, 0x80, 0x44, 0x8f, 0xe9, 0x86, 0xdd, 0x33, 0x5b, 0xfd, 0x26, 0x6e, 0xf1, 0x01, + 0x3b, 0xba, 0x9e, 0x19, 0x8e, 0x53, 0x71, 0x50, 0xbc, 0x84, 0x3c, 0xa3, 0x20, 0x34, 0x21, 0xa1, + 0x92, 0x3b, 0x3e, 0x2e, 0xc2, 0xac, 0x20, 0x40, 0x88, 0xbd, 0xa4, 0xf5, 0x0c, 0xe2, 0x22, 0x33, + 0xa7, 0x1d, 0x79, 0x8a, 0x9e, 0x63, 0x25, 0x28, 0x0f, 0x42, 0x5d, 0xd4, 0x1e, 0xee, 0x98, 0x7b, + 0xb8, 0xc5, 0x23, 0x4e, 0xa3, 0xab, 0x4d, 0x73, 0x04, 0x85, 0xc1, 0xe7, 0x2e, 0xc2, 0x14, 0x35, + 0x3f, 0x08, 0x80, 0x1b, 0x20, 0xf9, 0x18, 0x8a, 0x43, 0xa4, 0x58, 0x53, 0xc8, 0xf4, 0x28, 0x43, + 0x8a, 0xe5, 0xaa, 0xeb, 0x95, 0x72, 0xb1, 0x2c, 0x87, 0x72, 0x8f, 0x41, 0x94, 0xd9, 0x14, 0x32, + 0x75, 0x3a, 0x56, 0x45, 0x3e, 0xc6, 0x93, 0x9c, 0x86, 0x24, 0x4a, 0x37, 0xd6, 0x0a, 0x65, 0x45, + 0x0e, 0xe5, 0x36, 0x20, 0x33, 0x30, 0x0e, 0xd1, 0x71, 0x98, 0x51, 0xca, 0x8d, 0x72, 0xb5, 0x51, + 0xa9, 0x55, 0xd5, 0x8d, 0xea, 0xb3, 0xd5, 0xda, 0x73, 0x55, 0xf9, 0x98, 0x3f, 0x5b, 0xcc, 0xc3, + 0x12, 0x9a, 0x03, 0xd9, 0xcd, 0xae, 0xd7, 0x36, 0x14, 0xca, 0xcd, 0xf7, 0x87, 0x40, 0x1e, 0x1c, + 0x94, 0xe8, 0x24, 0xcc, 0x36, 0xf2, 0xca, 0xb5, 0x72, 0x43, 0x65, 0x31, 0x13, 0x87, 0xf4, 0x1c, + 0xc8, 0xde, 0x82, 0xab, 0x15, 0x1a, 0x12, 0x5a, 0x80, 0xd3, 0xde, 0xdc, 0xf2, 0xf3, 0x8d, 0x72, + 0xb5, 0x4e, 0x2b, 0xcf, 0x57, 0xaf, 0x11, 0xa7, 0x60, 0x80, 0x9e, 0x88, 0xd2, 0x84, 0x09, 0xab, + 0x7e, 0x7a, 0xe5, 0xd5, 0x92, 0x1c, 0x19, 0xcc, 0xae, 0x55, 0xcb, 0xb5, 0xab, 0xf2, 0xd4, 0x60, + 0xed, 0x34, 0x72, 0x13, 0x45, 0xf3, 0x70, 0x62, 0x30, 0x57, 0x2d, 0x57, 0x1b, 0xca, 0x4d, 0x39, + 0x36, 0x58, 0x71, 0xbd, 0xac, 0x6c, 0x56, 0x8a, 0x65, 0x39, 0x8e, 0x4e, 0x00, 0xf2, 0x73, 0xd4, + 0xb8, 0x5e, 0x2b, 0xc9, 0x89, 0xa0, 0x19, 0x0b, 0xc9, 0xb3, 0xb9, 0x9f, 0x95, 0x20, 0xe5, 0x8d, + 0xa2, 0xf8, 0x8c, 0x8a, 0xf4, 0x8d, 0x36, 0xd9, 0xe6, 0xfe, 0x20, 0x04, 0x49, 0x4f, 0x38, 0x85, + 0x2c, 0x62, 0xb5, 0x76, 0xdb, 0x7c, 0x49, 0xd5, 0xda, 0xba, 0x66, 0xf1, 0xf9, 0x10, 0x68, 0x56, + 0x9e, 0xe4, 0x4c, 0x3a, 0xff, 0x4c, 0xee, 0xba, 0x44, 0xef, 0xd8, 0x75, 0x89, 0x7d, 0x03, 0xba, + 0x2e, 0x53, 0x72, 0x34, 0xf7, 0xc7, 0x21, 0x90, 0x07, 0xa3, 0x23, 0x03, 0x72, 0x93, 0x46, 0xc9, + 0xcd, 0xdb, 0xbe, 0xd0, 0x51, 0xda, 0x37, 0x38, 0xab, 0x87, 0x47, 0xce, 0xea, 0x01, 0x93, 0x55, + 0xe4, 0x1b, 0x79, 0xb2, 0xf2, 0xaa, 0xeb, 0xbf, 0x95, 0x20, 0xed, 0x0f, 0xe6, 0xf8, 0x24, 0x96, + 0x3b, 0x8a, 0xc4, 0xfc, 0x3d, 0x72, 0x76, 0x54, 0x8f, 0xfc, 0x9d, 0xb4, 0xeb, 0xc7, 0xc2, 0x30, + 0xed, 0x8b, 0xfd, 0x4c, 0xca, 0xdd, 0x9b, 0x61, 0x46, 0x6f, 0xe1, 0x4e, 0xd7, 0xb4, 0xb1, 0xd1, + 0x3c, 0x50, 0xdb, 0x78, 0x0f, 0xb7, 0xa9, 0x18, 0xd2, 0x01, 0x7b, 0xbc, 0xbe, 0x1a, 0x96, 0x2a, + 0x2e, 0xde, 0x2a, 0x41, 0x5b, 0x99, 0xad, 0x94, 0xca, 0x6b, 0xeb, 0xb5, 0x46, 0xb9, 0x5a, 0xbc, + 0x29, 0x2c, 0xb9, 0x22, 0xeb, 0x03, 0x60, 0x3e, 0x81, 0x9f, 0xfb, 0xc6, 0x58, 0x74, 0xae, 0x83, + 0x3c, 0xd8, 0x1a, 0x62, 0xd0, 0x03, 0xda, 0x23, 0x1f, 0x43, 0xb3, 0x90, 0xa9, 0xd6, 0xd4, 0x7a, + 0xa5, 0x54, 0x56, 0xcb, 0x57, 0xaf, 0x96, 0x8b, 0x8d, 0x3a, 0xdb, 0xab, 0x70, 0xa0, 0x1b, 0x72, + 0xc8, 0xdb, 0x37, 0xef, 0x0e, 0xc3, 0x6c, 0x00, 0x27, 0x28, 0xcf, 0x43, 0x84, 0x2c, 0x6a, 0xf9, + 0xf0, 0x24, 0xdc, 0x2f, 0x91, 0xd5, 0xfd, 0xba, 0xd6, 0xb3, 0x79, 0x44, 0xf1, 0x01, 0x20, 0xe2, + 0x35, 0x6c, 0xe2, 0xde, 0xf7, 0xf8, 0x1e, 0x10, 0x73, 0x41, 0x32, 0x6e, 0x3e, 0xdb, 0x06, 0x7a, + 0x08, 0x50, 0xd7, 0xb4, 0x74, 0x5b, 0xdf, 0xc3, 0xc4, 0x87, 0xe2, 0xc0, 0x64, 0xe0, 0x46, 0x14, + 0x59, 0x94, 0x54, 0x0c, 0xdb, 0x81, 0x36, 0xf0, 0x8e, 0x36, 0x00, 0x4d, 0x96, 0x1f, 0x61, 0x45, + 0x16, 0x25, 0x0e, 0xf4, 0x59, 0x48, 0xb5, 0xcc, 0xfe, 0x56, 0x1b, 0x73, 0x38, 0x62, 0x92, 0x25, + 0x25, 0xc9, 0xf2, 0x1c, 0x10, 0x1e, 0x36, 0x73, 0x77, 0xaa, 0x52, 0x4a, 0x92, 0xe5, 0x31, 0x90, + 0xfb, 0x21, 0xa3, 0xed, 0xec, 0xf4, 0x08, 0x71, 0x41, 0x88, 0x05, 0x02, 0xd3, 0x4e, 0x36, 0x05, + 0x9c, 0xbf, 0x01, 0x71, 0x21, 0x07, 0xb2, 0xfe, 0x25, 0x92, 0x50, 0xbb, 0x2c, 0xba, 0x1d, 0x3a, + 0x9f, 0x50, 0xe2, 0x86, 0x28, 0x3c, 0x0b, 0x29, 0xdd, 0x72, 0x4f, 0x3d, 0x65, 0x43, 0x8b, 0xa1, + 0xf3, 0x71, 0x25, 0xa9, 0x5b, 0xee, 0xc9, 0xa6, 0x8f, 0xcb, 0x00, 0xae, 0xb2, 0xa1, 0x1f, 0x94, + 0x20, 0xcd, 0x26, 0x98, 0x6e, 0x0f, 0x5b, 0xd8, 0x68, 0x8a, 0x65, 0xe1, 0x03, 0x87, 0xa8, 0x28, 0x33, 0x73, 0xeb, 0x1c, 0xa1, 0xf0, 0xcc, 0xdb, 0x25, 0xe9, 0x55, 0x29, 0xf2, 0xaa, 0x24, 0x7d, - 0x48, 0x9a, 0x46, 0xf1, 0xf2, 0xf3, 0xeb, 0xab, 0x95, 0x62, 0xa5, 0x91, 0x7d, 0x5b, 0x8c, 0x3e, - 0x57, 0xd6, 0xf8, 0xf3, 0x67, 0x63, 0xfe, 0xfa, 0xd7, 0x63, 0xbf, 0x22, 0x85, 0xe3, 0xaf, 0xc7, - 0x94, 0xe9, 0x6d, 0x2f, 0x3d, 0xd4, 0xf6, 0xee, 0xe3, 0x08, 0x8d, 0x9a, 0x48, 0xba, 0xdc, 0x94, - 0xf9, 0xee, 0x8d, 0xc2, 0x03, 0x94, 0x91, 0x28, 0x65, 0x24, 0x89, 0xa2, 0xc5, 0xd5, 0x5a, 0xbd, - 0x5c, 0xa2, 0x6c, 0x24, 0x50, 0xa4, 0xb6, 0x5e, 0xae, 0x66, 0x3f, 0x2b, 0x5e, 0xe9, 0x6e, 0xf9, - 0x78, 0x55, 0x82, 0x93, 0x62, 0xa1, 0x96, 0xfb, 0x5a, 0x6c, 0x34, 0xcd, 0x96, 0x88, 0x6e, 0xd3, - 0x97, 0x2f, 0x1d, 0xf6, 0x72, 0x85, 0xa3, 0x52, 0x91, 0x94, 0x39, 0x62, 0xe1, 0xe1, 0x21, 0x91, - 0xe4, 0xab, 0x25, 0xce, 0x4b, 0x12, 0x45, 0xd7, 0xf3, 0xc5, 0x67, 0xcb, 0x25, 0x97, 0x9b, 0xe3, - 0xbd, 0x20, 0x2a, 0xe8, 0x7b, 0x21, 0xd3, 0xb7, 0xb7, 0x9f, 0x20, 0xba, 0xa1, 0xb7, 0xd8, 0xca, - 0x79, 0x64, 0xd4, 0x92, 0xab, 0xcb, 0xd1, 0x86, 0xbd, 0xfd, 0xc4, 0xa6, 0x83, 0xc1, 0x85, 0xc2, - 0x58, 0x49, 0xa0, 0x48, 0xb5, 0x56, 0x2d, 0x0b, 0x36, 0xe8, 0x2a, 0xf3, 0x4d, 0x97, 0x8d, 0x74, - 0xdf, 0x87, 0x8a, 0xbe, 0x17, 0x64, 0x91, 0x1e, 0x72, 0x44, 0x32, 0x35, 0x6a, 0xd5, 0xd8, 0x65, - 0x80, 0x27, 0x99, 0x1c, 0x61, 0xdc, 0xe7, 0xe1, 0x60, 0x0e, 0x65, 0x56, 0xcb, 0xd5, 0x95, 0xc6, - 0x75, 0x75, 0x5d, 0x29, 0xd3, 0xc5, 0xbf, 0xec, 0xdb, 0xc4, 0xeb, 0x33, 0x1d, 0x3f, 0x22, 0xfa, - 0x3e, 0x09, 0x92, 0x2c, 0x04, 0x62, 0x39, 0x29, 0x96, 0x54, 0xb8, 0xef, 0xb0, 0x77, 0xd3, 0x08, - 0x88, 0x42, 0x17, 0x9e, 0xa4, 0xaf, 0x0d, 0x0b, 0x85, 0x38, 0x89, 0xd0, 0x6a, 0x79, 0x25, 0x5f, - 0xbc, 0xa9, 0x16, 0xca, 0xf5, 0x06, 0xb1, 0x64, 0x35, 0x85, 0xe9, 0x28, 0xa0, 0xa9, 0xfc, 0xea, - 0x6a, 0xed, 0x39, 0x57, 0x10, 0xf0, 0xa2, 0x43, 0x06, 0xfd, 0xbc, 0x04, 0x73, 0xd8, 0xd8, 0x36, - 0x7b, 0x4d, 0xba, 0x60, 0x4d, 0x46, 0xb4, 0x65, 0x1f, 0xb4, 0xd9, 0x88, 0x0e, 0x9c, 0x94, 0x7b, - 0x35, 0x93, 0xe2, 0x55, 0x29, 0x5a, 0x9d, 0x60, 0x15, 0x2a, 0x6f, 0x97, 0x42, 0xaf, 0x12, 0xc6, - 0x42, 0x94, 0xb7, 0xc8, 0xab, 0xd2, 0x14, 0xe5, 0x30, 0xf6, 0xaa, 0x14, 0x7f, 0x55, 0x4a, 0x7c, - 0x48, 0x9a, 0x41, 0xa9, 0x7a, 0xe3, 0xe6, 0x6a, 0x59, 0x65, 0xdc, 0x52, 0x0e, 0xd3, 0x28, 0x41, - 0xcb, 0x2e, 0x3f, 0x72, 0xf9, 0x4a, 0xf6, 0x73, 0x94, 0xcb, 0xcf, 0xc5, 0x14, 0x84, 0x87, 0xc8, - 0xa3, 0x4f, 0x48, 0x70, 0x4a, 0x2c, 0x91, 0x5b, 0x74, 0xd9, 0x4c, 0xf5, 0x2c, 0xb0, 0xc5, 0x29, - 0xcb, 0xe5, 0xc3, 0x58, 0x76, 0x57, 0xd9, 0x78, 0xe1, 0x12, 0x9f, 0xf0, 0x0e, 0x2e, 0xc2, 0x15, - 0xae, 0xb2, 0x96, 0x7c, 0x48, 0xca, 0x20, 0x28, 0x3f, 0xbf, 0x5e, 0x53, 0x1a, 0x6a, 0x7e, 0x75, - 0x95, 0xf2, 0x7b, 0x1c, 0xc9, 0xbc, 0xa4, 0x51, 0x5b, 0x57, 0x57, 0xcb, 0x9b, 0xe5, 0x55, 0x97, - 0xed, 0x93, 0xad, 0x60, 0x82, 0xf3, 0x1f, 0x94, 0x60, 0x66, 0xe8, 0xf5, 0xb9, 0xb7, 0x4a, 0x70, - 0x72, 0x04, 0x0b, 0xe8, 0x5e, 0x38, 0x5b, 0x2a, 0x5f, 0xcb, 0x6f, 0xac, 0x36, 0xd4, 0xfa, 0xcd, - 0xb5, 0x42, 0x6d, 0x55, 0xdd, 0xac, 0xd4, 0x2b, 0x85, 0xca, 0x6a, 0xa5, 0xe1, 0x75, 0x60, 0x69, - 0xf0, 0x30, 0xc8, 0xa6, 0x6b, 0x83, 0xec, 0xc9, 0x21, 0x32, 0x29, 0x5c, 0xad, 0x15, 0xf3, 0xab, - 0x14, 0x28, 0x2c, 0xe6, 0x9c, 0xc5, 0x86, 0x1c, 0xb9, 0x11, 0x8f, 0x4b, 0xdc, 0xb7, 0x7d, 0x07, - 0x4c, 0xfb, 0x8c, 0x1f, 0x99, 0x22, 0xd1, 0xa9, 0x15, 0xd1, 0xe7, 0x7a, 0xb9, 0x5a, 0xf4, 0x4e, - 0xe9, 0x52, 0xe0, 0x18, 0x3b, 0x59, 0x22, 0x4f, 0xc2, 0x14, 0xca, 0x21, 0xe2, 0x54, 0xb9, 0x3a, - 0x3a, 0x8b, 0xd3, 0xe1, 0xdc, 0xe3, 0x10, 0x17, 0xc6, 0x8c, 0x4c, 0xd4, 0xe8, 0x7c, 0x6b, 0x60, - 0x9a, 0x18, 0x07, 0x6a, 0xc9, 0x64, 0x89, 0x30, 0xc8, 0x2c, 0x9c, 0x1c, 0xca, 0x6d, 0xc2, 0xf1, - 0x40, 0x43, 0x84, 0xce, 0xc1, 0x82, 0x58, 0x10, 0x67, 0x53, 0x40, 0xb5, 0x5c, 0x2d, 0xd6, 0x4a, - 0x64, 0xd2, 0xec, 0xd2, 0x04, 0xe0, 0x16, 0x89, 0x71, 0x29, 0xac, 0x95, 0x1c, 0xca, 0x55, 0x20, - 0xed, 0x37, 0x27, 0xe8, 0x34, 0x9c, 0xdc, 0x68, 0x5c, 0x7b, 0x42, 0xdd, 0xcc, 0xaf, 0x56, 0x4a, - 0xf9, 0x81, 0xe9, 0x31, 0x00, 0xb7, 0x29, 0x72, 0x88, 0x30, 0x4a, 0x6c, 0x8d, 0x1c, 0xce, 0x45, - 0xe2, 0x92, 0x2c, 0xe5, 0xea, 0x90, 0x19, 0x30, 0x0c, 0xe8, 0x2e, 0xc8, 0xf2, 0xf9, 0x6a, 0x10, - 0x57, 0x54, 0x42, 0x3e, 0x53, 0xc1, 0x66, 0xee, 0xa5, 0xf2, 0x6a, 0x65, 0xad, 0xd2, 0xa0, 0xfc, - 0x5d, 0x07, 0x70, 0x47, 0x3c, 0x89, 0x60, 0x6e, 0xd4, 0x6b, 0x55, 0xf5, 0x1a, 0x99, 0xf6, 0x37, - 0x3c, 0xa4, 0x12, 0xc0, 0x46, 0xb8, 0x2c, 0x91, 0xd9, 0xe9, 0xb0, 0x19, 0x90, 0x43, 0xb9, 0xe7, - 0x00, 0x0d, 0x8f, 0x56, 0xb4, 0x08, 0x77, 0x95, 0xab, 0xd7, 0x6a, 0x4a, 0xb1, 0xac, 0x56, 0xf3, - 0x6b, 0x84, 0x3f, 0x36, 0x36, 0x5d, 0xd2, 0xd3, 0xe0, 0x0e, 0x4d, 0x91, 0x93, 0x70, 0x47, 0xaf, - 0x1c, 0xba, 0xf0, 0x31, 0x89, 0x44, 0x46, 0xef, 0xa8, 0xce, 0x7f, 0x58, 0x42, 0x77, 0xc7, 0x5f, - 0x8f, 0xa1, 0xd8, 0x52, 0x77, 0x6b, 0xa9, 0xd9, 0xed, 0xce, 0x67, 0xc8, 0x8f, 0x62, 0xb7, 0x7b, - 0x4d, 0xc4, 0x7b, 0x0b, 0xf1, 0xcf, 0xc5, 0x50, 0x9c, 0x94, 0xbe, 0xa8, 0xed, 0x69, 0xf3, 0x32, - 0xf9, 0x75, 0x43, 0xdb, 0xd3, 0x1c, 0x80, 0xd3, 0xf1, 0xcf, 0xc7, 0x50, 0x94, 0x14, 0xef, 0x98, - 0xf3, 0x69, 0xf2, 0x7f, 0xc5, 0x74, 0x2a, 0xcf, 0xc5, 0xbf, 0x10, 0x43, 0x40, 0x0a, 0xbb, 0x07, - 0xf6, 0xae, 0x69, 0xcc, 0x23, 0xf2, 0x7b, 0x9d, 0xfe, 0xf6, 0x00, 0xfd, 0x60, 0x95, 0x03, 0x91, - 0xc1, 0x7f, 0x89, 0x03, 0xd1, 0xdf, 0x02, 0xe8, 0x42, 0x34, 0xfe, 0x8e, 0xaa, 0xfc, 0xae, 0xea, - 0x85, 0x68, 0xfc, 0x5d, 0x55, 0xf9, 0x47, 0xab, 0x37, 0xa2, 0xf1, 0xcf, 0xc6, 0xe4, 0xd7, 0x63, - 0xb9, 0xbf, 0x08, 0x03, 0x72, 0x4d, 0x85, 0x93, 0x05, 0x7c, 0x1e, 0xe2, 0x4e, 0x5a, 0x91, 0xed, - 0xf3, 0x7e, 0xc3, 0x21, 0x16, 0x46, 0xa0, 0x79, 0x8a, 0x06, 0xd2, 0x8c, 0x0e, 0x35, 0x94, 0x87, - 0x4c, 0x47, 0x37, 0xf4, 0x4e, 0xbf, 0xa3, 0x8a, 0x5c, 0xdb, 0xd8, 0x1c, 0x12, 0x47, 0xe0, 0xcf, - 0x94, 0x84, 0xb6, 0xef, 0x23, 0x31, 0x35, 0x96, 0x04, 0x43, 0xe0, 0xcf, 0xf3, 0x5f, 0x91, 0x20, - 0x3b, 0x8a, 0xd9, 0x3b, 0x4a, 0x03, 0x56, 0x61, 0xce, 0xdc, 0xc3, 0xbd, 0x9e, 0xde, 0xa2, 0x2b, - 0x7b, 0xce, 0xe4, 0x20, 0x32, 0x7e, 0x72, 0x30, 0xeb, 0x41, 0x74, 0x3a, 0xb5, 0x40, 0x62, 0xb8, - 0x7d, 0x12, 0xbe, 0x08, 0x4a, 0x53, 0xe3, 0x29, 0x4d, 0x53, 0x14, 0x41, 0xe3, 0x06, 0x19, 0xa4, - 0x64, 0x3e, 0x1e, 0x92, 0xc3, 0xee, 0x0c, 0x24, 0xf7, 0xfe, 0x30, 0xa4, 0xfd, 0xdb, 0x95, 0x51, - 0x09, 0xe2, 0x6d, 0x93, 0xef, 0xe3, 0x63, 0xbd, 0x7d, 0x7e, 0xcc, 0x0e, 0xe7, 0xa5, 0x55, 0x0e, - 0xaf, 0x38, 0x98, 0xf3, 0xbf, 0x2f, 0x41, 0x5c, 0x14, 0xa3, 0x13, 0x10, 0xe9, 0x6a, 0xf6, 0x2e, - 0x25, 0x37, 0x55, 0x08, 0xc9, 0x92, 0x42, 0x9f, 0x49, 0xb9, 0xd5, 0xd5, 0xd8, 0x1e, 0x46, 0x5e, - 0x4e, 0x9e, 0xc9, 0x2c, 0xa0, 0x8d, 0xb5, 0x16, 0x5d, 0x93, 0x36, 0x3b, 0x1d, 0x6c, 0xd8, 0x96, - 0x98, 0x05, 0xf0, 0xf2, 0x22, 0x2f, 0x46, 0x0f, 0xc2, 0x8c, 0xdd, 0xd3, 0xf4, 0xb6, 0x0f, 0x36, - 0x42, 0x61, 0x65, 0x51, 0xe1, 0x00, 0x2f, 0xc3, 0x29, 0x41, 0xb7, 0x85, 0x6d, 0xad, 0xb9, 0x8b, - 0x5b, 0x2e, 0x52, 0x94, 0x6e, 0x5f, 0x39, 0xc9, 0x01, 0x4a, 0xbc, 0x5e, 0xe0, 0x5e, 0xe8, 0xfb, - 0x8e, 0x2b, 0xec, 0x20, 0xcc, 0x8f, 0x2b, 0x5c, 0x1a, 0x71, 0x5c, 0x61, 0x70, 0xb7, 0xb8, 0xe7, - 0xac, 0xc2, 0x85, 0x00, 0x14, 0xbf, 0x44, 0xdd, 0x70, 0xfe, 0x53, 0x21, 0x98, 0x11, 0x8b, 0xf7, - 0x2d, 0xa7, 0x8f, 0xd6, 0x00, 0x34, 0xc3, 0x30, 0x6d, 0x6f, 0x2f, 0x0d, 0xcf, 0xb7, 0x86, 0xf0, - 0x96, 0xf2, 0x0e, 0x92, 0xe2, 0x21, 0x30, 0xff, 0x05, 0x09, 0xc0, 0xad, 0x1a, 0xd9, 0x5d, 0x0b, - 0x90, 0xe4, 0xad, 0xa2, 0x47, 0x3e, 0x58, 0x8e, 0x1b, 0x58, 0xd1, 0x35, 0xbd, 0x4d, 0x77, 0xe5, - 0x6c, 0xe1, 0x1d, 0xdd, 0xe0, 0x3b, 0x12, 0xd9, 0x83, 0xd8, 0x95, 0x13, 0x71, 0x77, 0xec, 0x2a, - 0x10, 0xb7, 0x70, 0x47, 0x33, 0x6c, 0xbd, 0xc9, 0x07, 0xeb, 0xd5, 0x23, 0x31, 0xbf, 0x54, 0xe7, - 0xd8, 0x8a, 0x43, 0x27, 0x77, 0x1e, 0xe2, 0xa2, 0xd4, 0x71, 0x4d, 0xc7, 0x50, 0x0c, 0xc2, 0xf5, - 0x32, 0x71, 0xce, 0xd4, 0x43, 0x54, 0xf2, 0x75, 0x39, 0x74, 0xe1, 0xc3, 0x21, 0x88, 0x09, 0xeb, - 0x31, 0x0b, 0x99, 0x72, 0xa9, 0x32, 0xe0, 0xe5, 0x66, 0x21, 0x2d, 0x0a, 0xb9, 0x95, 0x7f, 0x5b, - 0xcc, 0x5b, 0xb8, 0xae, 0xd4, 0x1a, 0xb5, 0xcb, 0xf2, 0x9f, 0x0e, 0x17, 0x3e, 0x2a, 0x7f, 0x36, - 0x86, 0x66, 0x20, 0x25, 0x0a, 0x2f, 0x3f, 0x72, 0xf9, 0x51, 0xf9, 0xf5, 0xc1, 0xa2, 0x2b, 0xf2, - 0xe7, 0x68, 0x7a, 0x55, 0x14, 0x5d, 0x52, 0x1b, 0xc4, 0x55, 0xd5, 0xaa, 0xab, 0x37, 0x65, 0xc9, - 0x5b, 0x71, 0xd9, 0x53, 0x11, 0x42, 0x77, 0xc3, 0x49, 0x51, 0xf1, 0xe4, 0x93, 0x4f, 0x3e, 0xf9, - 0xb8, 0xa7, 0xf2, 0xf6, 0x3b, 0xa3, 0x83, 0xd5, 0x4f, 0x78, 0xaa, 0xdf, 0x3f, 0x5c, 0xfd, 0xa4, - 0xa7, 0xfa, 0xa7, 0xde, 0x19, 0x45, 0xb3, 0x90, 0x14, 0xd5, 0x6b, 0xf9, 0xe7, 0xe5, 0xaf, 0x7d, - 0xed, 0x6b, 0x5f, 0x8b, 0x5d, 0xd8, 0x00, 0x79, 0x28, 0x24, 0x9b, 0x03, 0xd9, 0x17, 0x83, 0x11, - 0xf1, 0x1e, 0x1b, 0x28, 0xa5, 0x61, 0x96, 0x2c, 0x91, 0x10, 0xc7, 0x53, 0xca, 0x42, 0x32, 0x39, - 0x54, 0xf8, 0x5e, 0x98, 0x6d, 0x9a, 0x9d, 0xc1, 0x1e, 0x2f, 0xc8, 0x03, 0x5b, 0x8e, 0xac, 0xeb, - 0xd2, 0x0b, 0x0f, 0x73, 0xa0, 0x1d, 0xb3, 0xad, 0x19, 0x3b, 0x4b, 0x66, 0x6f, 0xc7, 0x3d, 0xb2, - 0x44, 0xa6, 0x8f, 0x96, 0xe7, 0xe0, 0x52, 0x77, 0xeb, 0x2b, 0x92, 0xf4, 0xa1, 0x50, 0x78, 0x65, - 0xbd, 0xf0, 0x73, 0xa1, 0xf9, 0x15, 0x86, 0xb8, 0x2e, 0xf4, 0x49, 0xc1, 0xdb, 0x6d, 0xdc, 0x24, - 0x9d, 0x0e, 0x7f, 0xf6, 0x20, 0xcc, 0xed, 0x98, 0x3b, 0x26, 0xa5, 0x74, 0x91, 0xfc, 0xe2, 0x67, - 0x9e, 0x12, 0x4e, 0xe9, 0xfc, 0xd8, 0x03, 0x52, 0xcb, 0x55, 0x98, 0xe5, 0xc0, 0x2a, 0x9d, 0xcd, - 0xb2, 0x5d, 0x11, 0xe8, 0xd0, 0xcd, 0x79, 0xd9, 0x5f, 0xfe, 0x13, 0x9a, 0x86, 0x54, 0x66, 0x38, - 0x2a, 0xa9, 0x63, 0x1b, 0x27, 0x96, 0x15, 0x38, 0xee, 0xa3, 0xc7, 0x32, 0x09, 0xb8, 0x37, 0x86, - 0xe2, 0x6f, 0x73, 0x8a, 0xb3, 0x1e, 0x8a, 0x75, 0x8e, 0xba, 0x5c, 0x84, 0xe9, 0xa3, 0xd0, 0xfa, - 0x1d, 0x4e, 0x2b, 0x85, 0xbd, 0x44, 0x56, 0x20, 0x43, 0x89, 0x34, 0xfb, 0x96, 0x6d, 0x76, 0x68, - 0x9a, 0xe6, 0x70, 0x32, 0xff, 0xf2, 0x4f, 0x98, 0xb1, 0x4e, 0x13, 0xb4, 0xa2, 0x83, 0xb5, 0xbc, - 0x0c, 0x74, 0x56, 0xde, 0xc2, 0xcd, 0xf6, 0x18, 0x0a, 0xbf, 0xcb, 0x19, 0x71, 0xe0, 0x97, 0x37, - 0xc9, 0x24, 0xad, 0xdf, 0xa1, 0x59, 0x14, 0x2f, 0x27, 0xe3, 0xb7, 0xe1, 0x65, 0xff, 0xe0, 0xfb, - 0x99, 0x3f, 0x98, 0x75, 0x08, 0x78, 0x78, 0xf2, 0xf4, 0xe2, 0x0e, 0xb6, 0x6d, 0xdc, 0xb3, 0x54, - 0xad, 0x1d, 0xc4, 0x9e, 0x67, 0x1f, 0x53, 0xf6, 0x27, 0xbf, 0xe8, 0xef, 0xc5, 0x15, 0x86, 0x99, - 0x6f, 0xb7, 0x97, 0x37, 0xe0, 0x64, 0x80, 0x56, 0x4c, 0x40, 0xf3, 0x3d, 0x9c, 0xe6, 0xdc, 0x90, - 0x66, 0x10, 0xb2, 0xeb, 0x20, 0xca, 0x9d, 0xbe, 0x9c, 0x80, 0xe6, 0x7b, 0x39, 0x4d, 0xc4, 0x71, - 0x45, 0x97, 0x12, 0x8a, 0x37, 0x60, 0x66, 0x0f, 0xf7, 0xb6, 0x4c, 0x8b, 0xef, 0x1d, 0x9b, 0x80, - 0xdc, 0xfb, 0x38, 0xb9, 0x0c, 0x47, 0xa4, 0x9b, 0xc9, 0x08, 0xad, 0x27, 0x21, 0xbe, 0xad, 0x35, - 0xf1, 0x04, 0x24, 0x6e, 0x73, 0x12, 0x31, 0x02, 0x4f, 0x50, 0xf3, 0x90, 0xda, 0x31, 0x79, 0x22, - 0x6d, 0x3c, 0xfa, 0xfb, 0x39, 0x7a, 0x52, 0xe0, 0x70, 0x12, 0x5d, 0xb3, 0xdb, 0x6f, 0x6b, 0xf6, - 0x24, 0x1c, 0xfc, 0x94, 0x20, 0x21, 0x70, 0x38, 0x89, 0x23, 0x88, 0xf5, 0x03, 0x82, 0x84, 0xe5, - 0x91, 0xe7, 0x33, 0x90, 0x34, 0x8d, 0xf6, 0x81, 0x69, 0x4c, 0xc2, 0xc4, 0x07, 0x39, 0x05, 0xe0, - 0x28, 0x84, 0xc0, 0x53, 0x90, 0x98, 0xb4, 0x23, 0x7e, 0xe6, 0x8b, 0x62, 0x78, 0x88, 0x1e, 0x58, - 0x81, 0x8c, 0x30, 0x50, 0xba, 0x69, 0x4c, 0x40, 0xe2, 0x67, 0x39, 0x89, 0xb4, 0x07, 0x8d, 0x37, - 0xc3, 0xc6, 0x96, 0xbd, 0x83, 0x27, 0x21, 0xf2, 0x61, 0xd1, 0x0c, 0x8e, 0xc2, 0x45, 0xb9, 0x85, - 0x8d, 0xe6, 0xee, 0x64, 0x14, 0x3e, 0x22, 0x44, 0x29, 0x70, 0x08, 0x89, 0x22, 0x4c, 0x77, 0xb4, - 0x9e, 0xb5, 0xab, 0xb5, 0x27, 0xea, 0x8e, 0x8f, 0x72, 0x1a, 0x29, 0x07, 0x89, 0x4b, 0xa4, 0x6f, - 0x1c, 0x85, 0xcc, 0xcf, 0x09, 0x89, 0x78, 0xd0, 0xf8, 0xd0, 0xb3, 0x6c, 0x1a, 0xc7, 0x1f, 0x85, - 0xda, 0xcf, 0x8b, 0xa1, 0xc7, 0x70, 0xd7, 0xbc, 0x14, 0x9f, 0x82, 0x84, 0xa5, 0xbf, 0x3c, 0x11, - 0x99, 0x5f, 0x10, 0x3d, 0x4d, 0x11, 0x08, 0xf2, 0x4d, 0x38, 0x15, 0xe8, 0x26, 0x26, 0x20, 0xf6, - 0x8b, 0x9c, 0xd8, 0x89, 0x00, 0x57, 0xc1, 0x4d, 0xc2, 0x51, 0x49, 0xfe, 0x92, 0x30, 0x09, 0x78, - 0x80, 0xd6, 0x3a, 0xcc, 0xf5, 0x0d, 0x4b, 0xdb, 0x3e, 0x9a, 0xd4, 0xfe, 0x7f, 0x21, 0x35, 0x86, - 0xeb, 0x93, 0x5a, 0x03, 0x4e, 0x70, 0x8a, 0x47, 0xeb, 0xd7, 0x8f, 0x09, 0xc3, 0xca, 0xb0, 0x37, - 0xfc, 0xbd, 0xfb, 0xed, 0x30, 0xef, 0x88, 0x53, 0x04, 0xdd, 0x96, 0xda, 0xd1, 0xba, 0x13, 0x50, - 0xfe, 0x65, 0x4e, 0x59, 0x58, 0x7c, 0x27, 0x6a, 0xb7, 0xd6, 0xb4, 0x2e, 0x21, 0xfe, 0x3c, 0x64, - 0x05, 0xf1, 0xbe, 0xd1, 0xc3, 0x4d, 0x73, 0xc7, 0xd0, 0x5f, 0xc6, 0xad, 0x09, 0x48, 0xff, 0xca, - 0x40, 0x57, 0x6d, 0x78, 0xd0, 0x09, 0xe5, 0x0a, 0xc8, 0x4e, 0xac, 0xa2, 0xea, 0x1d, 0xba, 0xde, - 0x78, 0x38, 0xc5, 0x5f, 0x15, 0x3d, 0xe5, 0xe0, 0x55, 0x28, 0xda, 0x72, 0x19, 0xd8, 0x01, 0x96, - 0x49, 0x55, 0xf2, 0xe3, 0x9c, 0xd0, 0xb4, 0x8b, 0xc5, 0x0d, 0x47, 0xd3, 0xec, 0x74, 0xb5, 0xde, - 0x24, 0xf6, 0xef, 0xd7, 0x84, 0xe1, 0xe0, 0x28, 0xdc, 0x70, 0x90, 0x88, 0x8e, 0x78, 0xfb, 0x09, - 0x28, 0xfc, 0xba, 0x30, 0x1c, 0x02, 0x87, 0x93, 0x10, 0x01, 0xc3, 0x04, 0x24, 0xfe, 0x81, 0x20, - 0x21, 0x70, 0x08, 0x89, 0x37, 0xb9, 0x8e, 0xb6, 0x87, 0x77, 0x74, 0xcb, 0xe6, 0x47, 0xcc, 0x0e, - 0x27, 0xf5, 0x1b, 0x5f, 0xf4, 0x07, 0x61, 0x8a, 0x07, 0x95, 0x58, 0x22, 0x9e, 0xf8, 0xa6, 0x0b, - 0x3b, 0xe3, 0x19, 0xfb, 0x84, 0xb0, 0x44, 0x1e, 0x34, 0xc2, 0x9b, 0x27, 0x42, 0x24, 0x62, 0x6f, - 0x92, 0x09, 0xea, 0x04, 0xe4, 0x7e, 0x73, 0x80, 0xb9, 0xba, 0xc0, 0x25, 0x34, 0x3d, 0xf1, 0x4f, - 0xdf, 0xb8, 0x85, 0x0f, 0x26, 0xd2, 0xce, 0x7f, 0x38, 0x10, 0xff, 0x6c, 0x30, 0x4c, 0x66, 0x43, - 0x32, 0x03, 0xf1, 0x14, 0x1a, 0x77, 0x84, 0x35, 0xfb, 0xd6, 0x2f, 0xf1, 0xf6, 0xfa, 0xc3, 0xa9, - 0xe5, 0x55, 0xa2, 0xe4, 0xfe, 0xa0, 0x67, 0x3c, 0xb1, 0xef, 0xff, 0x92, 0xa3, 0xe7, 0xbe, 0x98, - 0x67, 0xf9, 0x1a, 0x4c, 0xfb, 0x02, 0x9e, 0xf1, 0xa4, 0xde, 0xc6, 0x49, 0xa5, 0xbc, 0xf1, 0xce, - 0xf2, 0x63, 0x10, 0x21, 0xc1, 0xcb, 0x78, 0xf4, 0x1f, 0xe0, 0xe8, 0x14, 0x7c, 0xf9, 0x69, 0x88, - 0x8b, 0xa0, 0x65, 0x3c, 0xea, 0x0f, 0x72, 0x54, 0x07, 0x85, 0xa0, 0x8b, 0x80, 0x65, 0x3c, 0xfa, - 0xff, 0x25, 0xd0, 0x05, 0x0a, 0x41, 0x9f, 0x5c, 0x84, 0xff, 0xf4, 0x1d, 0x11, 0xee, 0x74, 0x84, - 0xec, 0x9e, 0x82, 0x18, 0x8f, 0x54, 0xc6, 0x63, 0xff, 0x10, 0x7f, 0xb9, 0xc0, 0x58, 0x7e, 0x1c, - 0xa6, 0x26, 0x14, 0xf8, 0x3b, 0x39, 0x2a, 0x83, 0x5f, 0x2e, 0x42, 0xd2, 0x13, 0x9d, 0x8c, 0x47, - 0xff, 0x11, 0x8e, 0xee, 0xc5, 0x22, 0xac, 0xf3, 0xe8, 0x64, 0x3c, 0x81, 0xff, 0x5b, 0xb0, 0xce, - 0x31, 0x88, 0xd8, 0x44, 0x60, 0x32, 0x1e, 0xfb, 0x5d, 0x42, 0xea, 0x02, 0x65, 0xf9, 0x19, 0x48, - 0x38, 0xce, 0x66, 0x3c, 0xfe, 0x8f, 0x72, 0x7c, 0x17, 0x87, 0x48, 0xc0, 0xe3, 0xec, 0xc6, 0x93, - 0xf8, 0x7f, 0x84, 0x04, 0x3c, 0x58, 0x64, 0x18, 0x0d, 0x06, 0x30, 0xe3, 0x29, 0xfd, 0x98, 0x18, - 0x46, 0x03, 0xf1, 0x0b, 0xe9, 0x4d, 0x6a, 0xf3, 0xc7, 0x93, 0x78, 0xb7, 0xe8, 0x4d, 0x0a, 0x4f, - 0xd8, 0x18, 0x8c, 0x08, 0xc6, 0xd3, 0xf8, 0x09, 0xc1, 0xc6, 0x40, 0x40, 0xb0, 0xbc, 0x0e, 0x68, - 0x38, 0x1a, 0x18, 0x4f, 0xef, 0x55, 0x4e, 0x6f, 0x66, 0x28, 0x18, 0x58, 0x7e, 0x0e, 0x4e, 0x04, - 0x47, 0x02, 0xe3, 0xa9, 0xfe, 0xe4, 0x97, 0x06, 0xe6, 0x6e, 0xde, 0x40, 0x60, 0xb9, 0xe1, 0xba, - 0x14, 0x6f, 0x14, 0x30, 0x9e, 0xec, 0x7b, 0xbe, 0xe4, 0x37, 0xdc, 0xde, 0x20, 0x60, 0x39, 0x0f, - 0xe0, 0x3a, 0xe0, 0xf1, 0xb4, 0xde, 0xc7, 0x69, 0x79, 0x90, 0xc8, 0xd0, 0xe0, 0xfe, 0x77, 0x3c, - 0xfe, 0x6d, 0x31, 0x34, 0x38, 0x06, 0x19, 0x1a, 0xc2, 0xf5, 0x8e, 0xc7, 0x7e, 0xbf, 0x18, 0x1a, - 0x02, 0x85, 0x68, 0xb6, 0xc7, 0xbb, 0x8d, 0xa7, 0xf0, 0x41, 0xa1, 0xd9, 0x1e, 0xac, 0xe5, 0x2a, - 0xcc, 0x0c, 0x39, 0xc4, 0xf1, 0xa4, 0x3e, 0xc4, 0x49, 0xc9, 0x83, 0xfe, 0xd0, 0xeb, 0xbc, 0xb8, - 0x33, 0x1c, 0x4f, 0xed, 0xa7, 0x07, 0x9c, 0x17, 0xf7, 0x85, 0xcb, 0x4f, 0x41, 0xdc, 0xe8, 0xb7, - 0xdb, 0x64, 0xf0, 0xa0, 0xc3, 0x8f, 0x18, 0x67, 0x3f, 0xf7, 0x55, 0x2e, 0x1d, 0x81, 0xb0, 0xfc, - 0x18, 0x4c, 0xe1, 0xce, 0x16, 0x6e, 0x8d, 0xc3, 0xfc, 0xfc, 0x57, 0x85, 0xc1, 0x24, 0xd0, 0xcb, - 0xcf, 0x00, 0xb0, 0xd4, 0x08, 0xdd, 0x63, 0x3f, 0x06, 0xf7, 0x0b, 0x5f, 0xe5, 0x07, 0xf2, 0x5c, - 0x14, 0x97, 0x00, 0x3b, 0xde, 0x77, 0x38, 0x81, 0x2f, 0xfa, 0x09, 0xd0, 0x1e, 0x79, 0x12, 0x62, - 0x2f, 0x5a, 0xa6, 0x61, 0x6b, 0x3b, 0xe3, 0xb0, 0xff, 0x8c, 0x63, 0x0b, 0x78, 0x22, 0xb0, 0x8e, - 0xd9, 0xc3, 0xb6, 0xb6, 0x63, 0x8d, 0xc3, 0xfd, 0x73, 0x8e, 0xeb, 0x20, 0x10, 0xe4, 0xa6, 0x66, - 0xd9, 0x93, 0xb4, 0xfb, 0x2f, 0x04, 0xb2, 0x40, 0x20, 0x4c, 0x93, 0xdf, 0xb7, 0xf0, 0xc1, 0x38, - 0xdc, 0xbf, 0x14, 0x4c, 0x73, 0xf8, 0xe5, 0xa7, 0x21, 0x41, 0x7e, 0xb2, 0x83, 0xba, 0x63, 0x90, - 0xff, 0x8a, 0x23, 0xbb, 0x18, 0xe4, 0xcd, 0x96, 0xdd, 0xb2, 0xf5, 0xf1, 0xc2, 0xfe, 0x6b, 0xde, - 0xd3, 0x02, 0x7e, 0x39, 0x0f, 0x49, 0xcb, 0x6e, 0xb5, 0xfa, 0x3c, 0x3e, 0x1d, 0x83, 0xfe, 0x5f, - 0xbf, 0xea, 0xa4, 0x2c, 0x1c, 0x1c, 0xd2, 0xdb, 0x2f, 0xdd, 0xb2, 0xbb, 0x26, 0xdd, 0x95, 0x35, - 0x8e, 0xc2, 0x97, 0x38, 0x05, 0x0f, 0xca, 0x72, 0x11, 0x52, 0xa4, 0x2d, 0x62, 0x73, 0xcb, 0x38, - 0x12, 0x5f, 0xe6, 0x02, 0xf0, 0x21, 0x15, 0xbe, 0xfb, 0x77, 0x3f, 0x7d, 0x46, 0xfa, 0xd4, 0xa7, - 0xcf, 0x48, 0xff, 0xf9, 0xd3, 0x67, 0xa4, 0x77, 0x7d, 0xe6, 0xcc, 0xb1, 0x4f, 0x7d, 0xe6, 0xcc, - 0xb1, 0x3f, 0xfa, 0xcc, 0x99, 0x63, 0xc1, 0x59, 0x62, 0x58, 0x31, 0x57, 0x4c, 0x96, 0x1f, 0x7e, - 0xe1, 0xde, 0x1d, 0xdd, 0xde, 0xed, 0x6f, 0x2d, 0x35, 0xcd, 0xce, 0xc5, 0xa6, 0x69, 0x75, 0x4c, - 0xeb, 0xa2, 0x3f, 0xaf, 0x4b, 0x7f, 0xc1, 0xdf, 0x48, 0x64, 0xce, 0xec, 0x4f, 0xe7, 0x6a, 0xc6, - 0xc1, 0xa8, 0x8b, 0xae, 0xae, 0x42, 0x38, 0x6f, 0x1c, 0xa0, 0x53, 0xcc, 0xc0, 0xa9, 0xfd, 0x5e, - 0x9b, 0x1f, 0xf5, 0x8c, 0x91, 0xe7, 0x8d, 0x5e, 0xdb, 0xbf, 0xcd, 0x3f, 0xc5, 0xb7, 0xf9, 0x17, - 0x7e, 0x44, 0x3a, 0x5a, 0x4b, 0xe2, 0x79, 0xe3, 0x80, 0x36, 0x64, 0x5d, 0x7a, 0xe1, 0xa1, 0xb1, - 0x79, 0xee, 0x5b, 0x86, 0xf9, 0x92, 0x41, 0xd8, 0xee, 0x6e, 0x89, 0x1c, 0xf7, 0x99, 0xc1, 0x1c, - 0xf7, 0x73, 0xb8, 0xdd, 0x7e, 0x96, 0xc0, 0x35, 0x08, 0xca, 0x56, 0x94, 0x5d, 0x4c, 0x00, 0x3f, - 0x16, 0x82, 0x33, 0x43, 0xe9, 0x6c, 0xae, 0x04, 0xa3, 0x84, 0xb0, 0x0c, 0xf1, 0x92, 0xd0, 0xad, - 0x2c, 0xc4, 0x2c, 0xdc, 0x34, 0x8d, 0x16, 0xdb, 0xaf, 0x1d, 0x56, 0xc4, 0x23, 0x11, 0x84, 0xa1, - 0x19, 0xa6, 0xc5, 0x0f, 0x4b, 0xb3, 0x87, 0xc2, 0x7b, 0x8f, 0x28, 0x88, 0x69, 0xf1, 0x26, 0x21, - 0x8d, 0x4b, 0x13, 0x4a, 0x43, 0x34, 0xc2, 0x97, 0xf9, 0x9f, 0x54, 0x2a, 0x3f, 0x11, 0x82, 0x85, - 0x41, 0xa9, 0x90, 0x91, 0x65, 0xd9, 0x5a, 0xa7, 0x3b, 0x4a, 0x2c, 0x4f, 0x41, 0xa2, 0x21, 0x60, - 0x8e, 0x2c, 0x97, 0xdb, 0x47, 0x94, 0x4b, 0xda, 0x79, 0x95, 0x10, 0xcc, 0xe5, 0x09, 0x05, 0xe3, - 0xb4, 0xe3, 0x8e, 0x24, 0xf3, 0xde, 0x04, 0x9c, 0x62, 0xc3, 0x49, 0x65, 0x43, 0x89, 0x3d, 0x70, - 0x99, 0xa4, 0xbc, 0x55, 0xe3, 0xd7, 0x49, 0x72, 0xcf, 0xc2, 0x6c, 0x85, 0x58, 0x0b, 0x32, 0x0b, - 0x72, 0x57, 0x78, 0x02, 0xcf, 0x93, 0x2f, 0xfa, 0x02, 0x7e, 0xbe, 0xc0, 0xe8, 0x2d, 0xca, 0xbd, - 0x55, 0x02, 0xb9, 0xde, 0xd4, 0xda, 0x5a, 0xef, 0xeb, 0x25, 0x85, 0x1e, 0x07, 0x60, 0xbb, 0x01, - 0x9d, 0xfb, 0xa8, 0xd2, 0x97, 0xb3, 0x4b, 0xde, 0xc6, 0x2d, 0xb1, 0x37, 0xd1, 0xb3, 0x56, 0x09, - 0x0a, 0x4b, 0x7e, 0x5e, 0x78, 0x1e, 0xc0, 0xad, 0x40, 0xa7, 0xe1, 0x64, 0xbd, 0x98, 0x5f, 0xcd, - 0x2b, 0x62, 0x23, 0x4f, 0x7d, 0xbd, 0x5c, 0x64, 0x77, 0xbb, 0x1c, 0x43, 0x27, 0x00, 0x79, 0x2b, - 0x9d, 0xf3, 0x29, 0xc7, 0x61, 0xc6, 0x5b, 0xce, 0x2e, 0xda, 0x08, 0x2d, 0x5f, 0x87, 0x0c, 0x3b, - 0xc2, 0xaf, 0x6a, 0xad, 0x16, 0x6e, 0xa9, 0xba, 0x81, 0xc6, 0x9c, 0x88, 0xcf, 0xfe, 0xde, 0xbf, - 0x9f, 0xa2, 0x4d, 0x9b, 0x66, 0x88, 0x79, 0x82, 0x57, 0x31, 0x48, 0xcc, 0xa9, 0x77, 0xba, 0x6d, - 0x4c, 0xd7, 0xae, 0x55, 0x5d, 0xc8, 0x7f, 0x7c, 0x38, 0x43, 0xe8, 0x85, 0xcf, 0x27, 0x94, 0x59, - 0x17, 0xdd, 0xe9, 0xbd, 0xe5, 0x67, 0xdd, 0xfd, 0x82, 0x0e, 0x83, 0x63, 0x29, 0x7e, 0x92, 0x73, - 0x28, 0xb2, 0x19, 0x82, 0xc5, 0x55, 0x98, 0xd1, 0x9a, 0x4d, 0xdc, 0xf5, 0xf1, 0x37, 0xc6, 0x83, - 0x88, 0xd6, 0xca, 0x1c, 0xd3, 0x65, 0xed, 0x71, 0x88, 0x5a, 0xb4, 0x53, 0xc6, 0x91, 0x10, 0xec, - 0x70, 0xf0, 0xe5, 0xb2, 0xd8, 0x1f, 0xeb, 0xb4, 0x68, 0x0c, 0x81, 0x7f, 0xc5, 0x09, 0xa4, 0x28, - 0x9a, 0x68, 0x8d, 0x01, 0x33, 0xec, 0x26, 0x25, 0xec, 0x69, 0xcd, 0xe1, 0x59, 0x94, 0x7f, 0xf4, - 0xab, 0x8f, 0xd0, 0x85, 0xfb, 0xb3, 0x7e, 0xa5, 0x0b, 0x18, 0x2c, 0x8a, 0xcc, 0x69, 0xbb, 0xed, - 0xc5, 0x90, 0x16, 0xef, 0xe3, 0xed, 0x3e, 0xfc, 0x65, 0xff, 0x98, 0xbf, 0xec, 0x4c, 0x90, 0x86, - 0x7b, 0xde, 0x34, 0xcd, 0xa9, 0xb2, 0x8a, 0xe5, 0x02, 0x4c, 0xd3, 0x7b, 0x17, 0x1d, 0xe1, 0x1c, - 0xfe, 0x96, 0x7f, 0xf2, 0xab, 0x8f, 0xb0, 0x81, 0x46, 0x90, 0xb8, 0x68, 0x0a, 0xe5, 0x51, 0x56, - 0xef, 0x85, 0x07, 0x87, 0xfd, 0x37, 0xfb, 0xf7, 0x30, 0xa5, 0xfe, 0x94, 0x97, 0x55, 0xd7, 0x3a, - 0x45, 0x60, 0x46, 0xeb, 0xe8, 0x86, 0x79, 0x91, 0xfe, 0xe5, 0x56, 0x69, 0x8a, 0x3e, 0x4c, 0xb0, - 0x6c, 0x7b, 0x95, 0x19, 0x8b, 0xf1, 0x7a, 0xfb, 0x57, 0x3f, 0xfc, 0xb3, 0x53, 0xae, 0x41, 0x59, - 0x5e, 0x1b, 0xde, 0x2b, 0x3b, 0x9e, 0xc6, 0x5f, 0x0b, 0x1a, 0x83, 0x5b, 0x5f, 0x97, 0xdf, 0x00, - 0x71, 0x87, 0xcc, 0xb8, 0xd8, 0x4d, 0x10, 0x71, 0x30, 0x48, 0xe4, 0xc6, 0x94, 0x76, 0x92, 0x38, - 0xfd, 0x4b, 0x02, 0x9f, 0xd9, 0xb0, 0x2a, 0x69, 0xcd, 0x0a, 0xa4, 0x5b, 0xa6, 0x61, 0xab, 0x66, - 0x47, 0xb7, 0x71, 0xa7, 0x6b, 0x8f, 0x8d, 0x7c, 0xbf, 0xcc, 0x88, 0xc4, 0x95, 0x69, 0x82, 0x57, - 0x13, 0x68, 0x84, 0x13, 0x76, 0x19, 0xd3, 0x24, 0x9c, 0xfc, 0x37, 0x87, 0x13, 0x8a, 0x43, 0x38, - 0xb9, 0x23, 0xed, 0xb0, 0x5a, 0xb7, 0xb8, 0xbb, 0xb3, 0xf7, 0x99, 0x16, 0x38, 0xda, 0xf1, 0xcf, - 0x23, 0x70, 0x86, 0x03, 0x6f, 0x69, 0x16, 0xbe, 0xb8, 0x77, 0x69, 0x0b, 0xdb, 0xda, 0xa5, 0x8b, - 0x4d, 0x53, 0x17, 0xb1, 0xce, 0x2c, 0x77, 0x67, 0xa4, 0x7e, 0x89, 0xd7, 0xcf, 0x07, 0x6e, 0x08, - 0x98, 0x1f, 0xed, 0x06, 0xe7, 0x87, 0x75, 0x30, 0xd7, 0x86, 0x48, 0xd1, 0xd4, 0xe9, 0x29, 0xd0, - 0x16, 0x36, 0xcc, 0x0e, 0x77, 0x48, 0xec, 0x01, 0x5d, 0x87, 0xa8, 0xd6, 0x31, 0xfb, 0x86, 0xcd, - 0x9c, 0x51, 0xe1, 0x91, 0xdf, 0x7d, 0x6d, 0xe1, 0xd8, 0x1f, 0xbf, 0xb6, 0x70, 0x9c, 0x91, 0xb5, - 0x5a, 0xb7, 0x96, 0x74, 0xf3, 0x62, 0x47, 0xb3, 0x77, 0x89, 0x09, 0xf8, 0xc3, 0x8f, 0x3f, 0x0c, - 0xfc, 0x7d, 0x15, 0xc3, 0xfe, 0xc8, 0x67, 0x3f, 0x76, 0x41, 0x52, 0x38, 0xfe, 0x72, 0xe4, 0xf5, - 0x0f, 0x2c, 0x48, 0xb9, 0x2e, 0xc4, 0x4a, 0xb8, 0x79, 0xc8, 0x0b, 0x2b, 0x03, 0x2f, 0xbc, 0xc4, - 0x5f, 0x78, 0x7a, 0xf8, 0x85, 0xec, 0x74, 0x59, 0x09, 0x37, 0x3d, 0xaf, 0x2d, 0xe1, 0xe6, 0xc0, - 0x1b, 0x2b, 0x10, 0xaf, 0x18, 0x36, 0xbb, 0x0e, 0xe6, 0x69, 0x08, 0xeb, 0x06, 0xbb, 0x45, 0x20, - 0x51, 0x78, 0xf0, 0x08, 0x4d, 0x51, 0x08, 0x5e, 0xae, 0x06, 0xf1, 0x12, 0x6e, 0x32, 0x52, 0x45, - 0x08, 0xb7, 0x70, 0x93, 0x93, 0xba, 0x03, 0x26, 0x09, 0x76, 0xa1, 0xf4, 0x47, 0xff, 0xe5, 0xcc, - 0xb1, 0xb7, 0x7c, 0xfa, 0xcc, 0xb1, 0x91, 0xea, 0x94, 0x1b, 0xaf, 0x4e, 0x8e, 0x16, 0x7d, 0x94, - 0x6a, 0x51, 0x07, 0xdb, 0x5b, 0xdb, 0xf6, 0xc5, 0x66, 0xef, 0xa0, 0x6b, 0x9b, 0x17, 0xf7, 0x2e, - 0x11, 0xab, 0x62, 0x6e, 0x73, 0x2d, 0x42, 0xa2, 0x7e, 0x89, 0xd5, 0x2f, 0xed, 0x8d, 0x50, 0xa2, - 0xdc, 0x36, 0x4c, 0xad, 0x13, 0x44, 0xd2, 0x4d, 0xb6, 0x69, 0x6b, 0x6d, 0x1e, 0x2d, 0xb2, 0x07, - 0x52, 0xca, 0x2e, 0x32, 0x0b, 0xb1, 0x52, 0x5d, 0xdc, 0x61, 0xd6, 0xc6, 0xda, 0x36, 0xbb, 0xcc, - 0x25, 0x4c, 0xa7, 0x19, 0x71, 0x52, 0x40, 0xef, 0x6d, 0x99, 0x83, 0x29, 0xad, 0xcf, 0x36, 0xba, - 0x85, 0xc9, 0xfc, 0x83, 0x3e, 0xe4, 0x56, 0x21, 0xc6, 0xf7, 0x3d, 0x20, 0x19, 0xc2, 0xb7, 0xf0, - 0x01, 0x7d, 0x4f, 0x4a, 0x21, 0x3f, 0xd1, 0x45, 0x98, 0xa2, 0xdc, 0xf3, 0x33, 0x74, 0xa7, 0x96, + 0x50, 0x9a, 0x46, 0xf1, 0xf2, 0xf3, 0xeb, 0xab, 0x95, 0x62, 0xa5, 0x91, 0x7d, 0x5b, 0x8c, 0xa6, + 0x2b, 0x6b, 0x3c, 0xfd, 0x99, 0x98, 0xbf, 0xfc, 0xf5, 0xd8, 0x2f, 0x4a, 0xe1, 0xf8, 0xeb, 0x31, + 0x65, 0x7a, 0xdb, 0x4b, 0x0f, 0xb5, 0xbd, 0xe7, 0x38, 0x42, 0xa3, 0x16, 0x92, 0x2e, 0x37, 0x65, + 0x7e, 0x7a, 0xa3, 0xf0, 0x00, 0x65, 0x24, 0x4a, 0x19, 0x49, 0xa2, 0x68, 0x71, 0xb5, 0x56, 0x2f, + 0x97, 0x28, 0x1b, 0x09, 0x14, 0xa9, 0xad, 0x97, 0xab, 0xd9, 0xcf, 0x88, 0x2a, 0xdd, 0x23, 0x1f, + 0xaf, 0x4a, 0x70, 0x52, 0x6c, 0xd4, 0xf2, 0xb9, 0x16, 0x1b, 0x4d, 0xb3, 0x25, 0xbc, 0xdb, 0xf4, + 0xf2, 0xa5, 0xc3, 0x2a, 0x57, 0x38, 0x2a, 0x15, 0x49, 0x99, 0x23, 0x16, 0x1e, 0x1e, 0x12, 0x49, + 0xbe, 0x5a, 0xe2, 0xbc, 0x24, 0x51, 0x74, 0x3d, 0x5f, 0x7c, 0xb6, 0x5c, 0x72, 0xb9, 0x39, 0xde, + 0x0b, 0xa2, 0x82, 0xbe, 0x13, 0x32, 0x7d, 0x7b, 0xfb, 0x09, 0xa2, 0x1b, 0x7a, 0x8b, 0xed, 0x9c, + 0x47, 0x46, 0x6d, 0xb9, 0xba, 0x1c, 0x6d, 0xd8, 0xdb, 0x4f, 0x6c, 0x3a, 0x18, 0x5c, 0x28, 0x8c, + 0x95, 0x04, 0x8a, 0x54, 0x6b, 0xd5, 0xb2, 0x60, 0x83, 0xee, 0x32, 0xdf, 0x74, 0xd9, 0x48, 0xf7, + 0x7d, 0xa8, 0xe8, 0x3b, 0x41, 0x16, 0xe1, 0x21, 0x47, 0x24, 0x53, 0xa3, 0x76, 0x8d, 0x5d, 0x06, + 0x78, 0x90, 0xc9, 0x11, 0xc6, 0x7d, 0x1e, 0x0e, 0xe6, 0x50, 0x66, 0xb5, 0x5c, 0xbd, 0xd6, 0xb8, + 0xae, 0xae, 0x2b, 0x65, 0xba, 0xf9, 0x97, 0x7d, 0x9b, 0xa8, 0x3e, 0xd3, 0xf1, 0x23, 0xa2, 0xef, + 0x92, 0x20, 0xc9, 0x5c, 0x20, 0x16, 0x93, 0x62, 0x41, 0x85, 0xfb, 0x0e, 0xab, 0x9b, 0x7a, 0x40, + 0x14, 0xba, 0xf0, 0x24, 0xad, 0x36, 0x2c, 0x14, 0xe2, 0x24, 0x42, 0xab, 0xe5, 0x6b, 0xf9, 0xe2, + 0x4d, 0xb5, 0x50, 0xae, 0x37, 0x88, 0x25, 0xab, 0x29, 0x4c, 0x47, 0x01, 0x4d, 0xe5, 0x57, 0x57, + 0x6b, 0xcf, 0xb9, 0x82, 0x80, 0x17, 0x1d, 0x32, 0xe8, 0x67, 0x24, 0x98, 0xc3, 0xc6, 0xb6, 0xd9, + 0x6b, 0xd2, 0x0d, 0x6b, 0x32, 0xa2, 0x2d, 0xfb, 0xa0, 0xcd, 0x46, 0x74, 0xe0, 0xa2, 0xdc, 0xab, + 0x99, 0x14, 0xaf, 0x4a, 0xd1, 0xea, 0x04, 0xab, 0x50, 0x79, 0xbb, 0x14, 0x7a, 0x95, 0x30, 0x16, + 0xa2, 0xbc, 0x45, 0x5e, 0x95, 0xa6, 0x28, 0x87, 0xb1, 0x57, 0xa5, 0xf8, 0xab, 0x52, 0xe2, 0x83, + 0xd2, 0x0c, 0x4a, 0xd5, 0x1b, 0x37, 0x57, 0xcb, 0x2a, 0xe3, 0x96, 0x72, 0x98, 0x46, 0x09, 0x9a, + 0xb7, 0xfc, 0xc8, 0xf2, 0xe5, 0xec, 0x67, 0x29, 0x97, 0x9f, 0x8d, 0x29, 0x08, 0x0f, 0x91, 0x47, + 0x1f, 0x97, 0xe0, 0x94, 0xd8, 0x22, 0xb7, 0xe8, 0xb6, 0x99, 0xea, 0xd9, 0x60, 0x8b, 0x53, 0x96, + 0xcb, 0x87, 0xb1, 0xec, 0xee, 0xb2, 0xf1, 0xcc, 0x25, 0xbe, 0xe0, 0x1d, 0xdc, 0x84, 0x2b, 0x5c, + 0x61, 0x2d, 0xf9, 0xa0, 0x94, 0x41, 0x50, 0x7e, 0x7e, 0xbd, 0xa6, 0x34, 0xd4, 0xfc, 0xea, 0x2a, + 0xe5, 0xf7, 0x38, 0x92, 0x79, 0x4e, 0xa3, 0xb6, 0xae, 0xae, 0x96, 0x37, 0xcb, 0xab, 0x2e, 0xdb, + 0x27, 0x5b, 0xc1, 0x04, 0xe7, 0x3f, 0x20, 0xc1, 0xcc, 0x50, 0xf5, 0xb9, 0xb7, 0x4a, 0x70, 0x72, + 0x04, 0x0b, 0xe8, 0x5e, 0x38, 0x5b, 0x2a, 0x5f, 0xcd, 0x6f, 0xac, 0x36, 0xd4, 0xfa, 0xcd, 0xb5, + 0x42, 0x6d, 0x55, 0xdd, 0xac, 0xd4, 0x2b, 0x85, 0xca, 0x6a, 0xa5, 0xe1, 0x9d, 0xc0, 0xd2, 0xe0, + 0x61, 0x90, 0x2d, 0xd7, 0x06, 0xd9, 0x93, 0x43, 0x64, 0x51, 0xb8, 0x5a, 0x2b, 0xe6, 0x57, 0x29, + 0x50, 0x58, 0xac, 0x39, 0x8b, 0x0d, 0x39, 0x72, 0x23, 0x1e, 0x97, 0xf8, 0xdc, 0xf6, 0x2d, 0x30, + 0xed, 0x33, 0x7e, 0x64, 0x89, 0x44, 0x97, 0x56, 0x44, 0x9f, 0xeb, 0xe5, 0x6a, 0xd1, 0xbb, 0xa4, + 0x4b, 0x81, 0x63, 0xec, 0x64, 0x89, 0xa4, 0x84, 0x29, 0x94, 0x43, 0x64, 0x52, 0xe5, 0xea, 0xe8, + 0x6c, 0x4e, 0x87, 0x73, 0x8f, 0x43, 0x5c, 0x18, 0x33, 0xb2, 0x50, 0xa3, 0xeb, 0xad, 0x81, 0x65, + 0x62, 0x1c, 0xa8, 0x25, 0x93, 0x25, 0xc2, 0x20, 0xb3, 0x70, 0x72, 0x28, 0xb7, 0x09, 0xc7, 0x03, + 0x0d, 0x11, 0x3a, 0x07, 0x0b, 0x62, 0x43, 0x9c, 0x2d, 0x01, 0xd5, 0x72, 0xb5, 0x58, 0x2b, 0x91, + 0x45, 0xb3, 0x4b, 0x13, 0x80, 0x5b, 0x24, 0xc6, 0xa5, 0xb0, 0x56, 0x72, 0x28, 0x57, 0x81, 0xb4, + 0xdf, 0x9c, 0xa0, 0xd3, 0x70, 0x72, 0xa3, 0x71, 0xf5, 0x09, 0x75, 0x33, 0xbf, 0x5a, 0x29, 0xe5, + 0x07, 0x96, 0xc7, 0x00, 0xdc, 0xa6, 0xc8, 0x21, 0xc2, 0x28, 0xb1, 0x35, 0x72, 0x38, 0x17, 0x89, + 0x4b, 0xb2, 0x94, 0xab, 0x43, 0x66, 0xc0, 0x30, 0xa0, 0xbb, 0x20, 0xcb, 0xd7, 0xab, 0x41, 0x5c, + 0x51, 0x09, 0xf9, 0x4c, 0x05, 0x5b, 0xb9, 0x97, 0xca, 0xab, 0x95, 0xb5, 0x4a, 0x83, 0xf2, 0x77, + 0x1d, 0xc0, 0x1d, 0xf1, 0xc4, 0x83, 0xb9, 0x51, 0xaf, 0x55, 0xd5, 0xab, 0x64, 0xd9, 0xdf, 0xf0, + 0x90, 0x4a, 0x00, 0x1b, 0xe1, 0xb2, 0x44, 0x56, 0xa7, 0xc3, 0x66, 0x40, 0x0e, 0xe5, 0x9e, 0x03, + 0x34, 0x3c, 0x5a, 0xd1, 0x22, 0xdc, 0x55, 0xae, 0x5e, 0xad, 0x29, 0xc5, 0xb2, 0x5a, 0xcd, 0xaf, + 0x11, 0xfe, 0xd8, 0xd8, 0x74, 0x49, 0x4f, 0x83, 0x3b, 0x34, 0x45, 0x4c, 0xc2, 0x1d, 0xbd, 0x72, + 0xe8, 0xc2, 0x47, 0x25, 0xe2, 0x19, 0xbd, 0xa3, 0x3a, 0xff, 0x21, 0x09, 0xdd, 0x1d, 0x7f, 0x3d, + 0x86, 0x62, 0x4b, 0xdd, 0xad, 0xa5, 0x66, 0xb7, 0x3b, 0x9f, 0x21, 0x3f, 0x8a, 0xdd, 0xee, 0x55, + 0xe1, 0xef, 0x2d, 0xc4, 0x3f, 0x1b, 0x43, 0x71, 0x92, 0xfb, 0xa2, 0xb6, 0xa7, 0xcd, 0xcb, 0xe4, + 0xd7, 0x0d, 0x6d, 0x4f, 0x73, 0x00, 0x4e, 0xc7, 0x3f, 0x17, 0x43, 0x51, 0x92, 0xbd, 0x63, 0xce, + 0xa7, 0xc9, 0xff, 0x6b, 0xa6, 0x53, 0x78, 0x2e, 0xfe, 0xf9, 0x18, 0x02, 0x92, 0xd9, 0x3d, 0xb0, + 0x77, 0x4d, 0x63, 0x1e, 0x91, 0xdf, 0xeb, 0xf4, 0xb7, 0x07, 0xe8, 0x7b, 0xab, 0x1c, 0x88, 0x0c, + 0xfe, 0x4b, 0x1c, 0x88, 0xfe, 0x16, 0x40, 0x17, 0xa2, 0xf1, 0x77, 0x54, 0xe5, 0x77, 0x55, 0x2f, + 0x44, 0xe3, 0xef, 0xaa, 0xca, 0x3f, 0x58, 0xbd, 0x11, 0x8d, 0x7f, 0x26, 0x26, 0xbf, 0x1e, 0xcb, + 0xfd, 0x45, 0x18, 0x90, 0x6b, 0x2a, 0x9c, 0x28, 0xe0, 0xf3, 0x10, 0x77, 0xc2, 0x8a, 0xec, 0x9c, + 0xf7, 0x1b, 0x0e, 0xb1, 0x30, 0x02, 0xcd, 0x93, 0x35, 0x10, 0x66, 0x74, 0xa8, 0xa1, 0x3c, 0x64, + 0x3a, 0xba, 0xa1, 0x77, 0xfa, 0x1d, 0x55, 0xc4, 0xda, 0xc6, 0xc6, 0x90, 0x38, 0x02, 0x4f, 0x53, + 0x12, 0xda, 0xbe, 0x8f, 0xc4, 0xd4, 0x58, 0x12, 0x0c, 0x81, 0xa7, 0xe7, 0xbf, 0x24, 0x41, 0x76, + 0x14, 0xb3, 0x77, 0x14, 0x06, 0xac, 0xc2, 0x9c, 0xb9, 0x87, 0x7b, 0x3d, 0xbd, 0x45, 0x77, 0xf6, + 0x9c, 0xc5, 0x41, 0x64, 0xfc, 0xe2, 0x60, 0xd6, 0x83, 0xe8, 0x74, 0x6a, 0x81, 0xf8, 0x70, 0xfb, + 0xc4, 0x7d, 0x11, 0x94, 0xa6, 0xc6, 0x53, 0x9a, 0xa6, 0x28, 0x82, 0xc6, 0x0d, 0x32, 0x48, 0xc9, + 0x7a, 0x3c, 0x24, 0x87, 0xdd, 0x15, 0x48, 0xee, 0x7d, 0x61, 0x48, 0xfb, 0x8f, 0x2b, 0xa3, 0x12, + 0xc4, 0xdb, 0x26, 0x3f, 0xc7, 0xc7, 0x7a, 0xfb, 0xfc, 0x98, 0x13, 0xce, 0x4b, 0xab, 0x1c, 0x5e, + 0x71, 0x30, 0xe7, 0x7f, 0x4f, 0x82, 0xb8, 0xc8, 0x46, 0x27, 0x20, 0xd2, 0xd5, 0xec, 0x5d, 0x4a, + 0x6e, 0xaa, 0x10, 0x92, 0x25, 0x85, 0xa6, 0x49, 0xbe, 0xd5, 0xd5, 0xd8, 0x19, 0x46, 0x9e, 0x4f, + 0xd2, 0x64, 0x15, 0xd0, 0xc6, 0x5a, 0x8b, 0xee, 0x49, 0x9b, 0x9d, 0x0e, 0x36, 0x6c, 0x4b, 0xac, + 0x02, 0x78, 0x7e, 0x91, 0x67, 0xa3, 0x07, 0x61, 0xc6, 0xee, 0x69, 0x7a, 0xdb, 0x07, 0x1b, 0xa1, + 0xb0, 0xb2, 0x28, 0x70, 0x80, 0x57, 0xe0, 0x94, 0xa0, 0xdb, 0xc2, 0xb6, 0xd6, 0xdc, 0xc5, 0x2d, + 0x17, 0x29, 0x4a, 0x8f, 0xaf, 0x9c, 0xe4, 0x00, 0x25, 0x5e, 0x2e, 0x70, 0x2f, 0xf4, 0x7d, 0xd7, + 0x15, 0x76, 0x10, 0xe6, 0xd7, 0x15, 0x2e, 0x8d, 0xb8, 0xae, 0x30, 0x78, 0x5a, 0xdc, 0x73, 0x57, + 0xe1, 0x42, 0x00, 0x8a, 0x5f, 0xa2, 0xae, 0x3b, 0xff, 0xc9, 0x10, 0xcc, 0x88, 0xcd, 0xfb, 0x96, + 0xd3, 0x47, 0x6b, 0x00, 0x9a, 0x61, 0x98, 0xb6, 0xb7, 0x97, 0x86, 0xd7, 0x5b, 0x43, 0x78, 0x4b, + 0x79, 0x07, 0x49, 0xf1, 0x10, 0x98, 0xff, 0xbc, 0x04, 0xe0, 0x16, 0x8d, 0xec, 0xae, 0x05, 0x48, + 0xf2, 0x56, 0xd1, 0x2b, 0x1f, 0x2c, 0xc6, 0x0d, 0x2c, 0xeb, 0xaa, 0xde, 0xa6, 0xa7, 0x72, 0xb6, + 0xf0, 0x8e, 0x6e, 0xf0, 0x13, 0x89, 0x2c, 0x21, 0x4e, 0xe5, 0x44, 0xdc, 0x13, 0xbb, 0x0a, 0xc4, + 0x2d, 0xdc, 0xd1, 0x0c, 0x5b, 0x6f, 0xf2, 0xc1, 0x7a, 0xe5, 0x48, 0xcc, 0x2f, 0xd5, 0x39, 0xb6, + 0xe2, 0xd0, 0xc9, 0x9d, 0x87, 0xb8, 0xc8, 0x75, 0xa6, 0xa6, 0x63, 0x28, 0x06, 0xe1, 0x7a, 0x99, + 0x4c, 0xce, 0x74, 0x86, 0xa8, 0xe4, 0xeb, 0x72, 0xe8, 0xc2, 0x87, 0x42, 0x10, 0x13, 0xd6, 0x63, + 0x16, 0x32, 0xe5, 0x52, 0x65, 0x60, 0x96, 0x9b, 0x85, 0xb4, 0xc8, 0xe4, 0x56, 0xfe, 0x6d, 0x31, + 0x6f, 0xe6, 0xba, 0x52, 0x6b, 0xd4, 0x96, 0xe5, 0x3f, 0x1b, 0xce, 0x7c, 0x54, 0xfe, 0x4c, 0x0c, + 0xcd, 0x40, 0x4a, 0x64, 0x2e, 0x3f, 0xb2, 0xfc, 0xa8, 0xfc, 0xfa, 0x60, 0xd6, 0x65, 0xf9, 0xb3, + 0x34, 0xbc, 0x2a, 0xb2, 0x2e, 0xa9, 0x0d, 0x32, 0x55, 0xd5, 0xaa, 0xab, 0x37, 0x65, 0xc9, 0x5b, + 0xb0, 0xec, 0x29, 0x08, 0xa1, 0xbb, 0xe1, 0xa4, 0x28, 0x78, 0xf2, 0xc9, 0x27, 0x9f, 0x7c, 0xdc, + 0x53, 0x78, 0xfb, 0x9d, 0xd1, 0xc1, 0xe2, 0x27, 0x3c, 0xc5, 0xef, 0x1b, 0x2e, 0x7e, 0xd2, 0x53, + 0xfc, 0xe3, 0xef, 0x8c, 0xa2, 0x59, 0x48, 0x8a, 0xe2, 0xb5, 0xfc, 0xf3, 0xf2, 0x57, 0xbe, 0xf2, + 0x95, 0xaf, 0xc4, 0x2e, 0x6c, 0x80, 0x3c, 0xe4, 0x92, 0xcd, 0x81, 0xec, 0xf3, 0xc1, 0x88, 0x78, + 0x8f, 0x0d, 0xe4, 0x52, 0x37, 0x4b, 0x96, 0x88, 0x8b, 0xe3, 0xc9, 0x65, 0x2e, 0x99, 0x1c, 0x2a, + 0x7c, 0x27, 0xcc, 0x36, 0xcd, 0xce, 0x60, 0x8f, 0x17, 0xe4, 0x81, 0x23, 0x47, 0xd6, 0x75, 0xe9, + 0x85, 0x87, 0x39, 0xd0, 0x8e, 0xd9, 0xd6, 0x8c, 0x9d, 0x25, 0xb3, 0xb7, 0xe3, 0x5e, 0x59, 0x22, + 0xcb, 0x47, 0xcb, 0x73, 0x71, 0xa9, 0xbb, 0xf5, 0x25, 0x49, 0xfa, 0x60, 0x28, 0x7c, 0x6d, 0xbd, + 0xf0, 0xd3, 0xa1, 0xf9, 0x6b, 0x0c, 0x71, 0x5d, 0xe8, 0x93, 0x82, 0xb7, 0xdb, 0xb8, 0x49, 0x3a, + 0x1d, 0xfe, 0xfc, 0x41, 0x98, 0xdb, 0x31, 0x77, 0x4c, 0x4a, 0xe9, 0x22, 0xf9, 0xc5, 0xef, 0x3c, + 0x25, 0x9c, 0xdc, 0xf9, 0xb1, 0x17, 0xa4, 0x56, 0xaa, 0x30, 0xcb, 0x81, 0x55, 0xba, 0x9a, 0x65, + 0xa7, 0x22, 0xd0, 0xa1, 0x87, 0xf3, 0xb2, 0xbf, 0xf0, 0xa7, 0x34, 0x0c, 0xa9, 0xcc, 0x70, 0x54, + 0x52, 0xc6, 0x0e, 0x4e, 0xac, 0x28, 0x70, 0xdc, 0x47, 0x8f, 0x45, 0x12, 0x70, 0x6f, 0x0c, 0xc5, + 0xdf, 0xe2, 0x14, 0x67, 0x3d, 0x14, 0xeb, 0x1c, 0x75, 0xa5, 0x08, 0xd3, 0x47, 0xa1, 0xf5, 0xdb, + 0x9c, 0x56, 0x0a, 0x7b, 0x89, 0x5c, 0x83, 0x0c, 0x25, 0xd2, 0xec, 0x5b, 0xb6, 0xd9, 0xa1, 0x61, + 0x9a, 0xc3, 0xc9, 0xfc, 0xcb, 0x3f, 0x65, 0xc6, 0x3a, 0x4d, 0xd0, 0x8a, 0x0e, 0xd6, 0xca, 0x0a, + 0xd0, 0x55, 0x79, 0x0b, 0x37, 0xdb, 0x63, 0x28, 0xfc, 0x0e, 0x67, 0xc4, 0x81, 0x5f, 0xd9, 0x24, + 0x8b, 0xb4, 0x7e, 0x87, 0x46, 0x51, 0xbc, 0x9c, 0x8c, 0x3f, 0x86, 0x97, 0xfd, 0x83, 0xef, 0x66, + 0xf3, 0xc1, 0xac, 0x43, 0xc0, 0xc3, 0x93, 0xa7, 0x17, 0x77, 0xb0, 0x6d, 0xe3, 0x9e, 0xa5, 0x6a, + 0xed, 0x20, 0xf6, 0x3c, 0xe7, 0x98, 0xb2, 0x3f, 0xf6, 0x05, 0x7f, 0x2f, 0x5e, 0x63, 0x98, 0xf9, + 0x76, 0x7b, 0x65, 0x03, 0x4e, 0x06, 0x68, 0xc5, 0x04, 0x34, 0xdf, 0xcd, 0x69, 0xce, 0x0d, 0x69, + 0x06, 0x21, 0xbb, 0x0e, 0x22, 0xdf, 0xe9, 0xcb, 0x09, 0x68, 0xbe, 0x87, 0xd3, 0x44, 0x1c, 0x57, + 0x74, 0x29, 0xa1, 0x78, 0x03, 0x66, 0xf6, 0x70, 0x6f, 0xcb, 0xb4, 0xf8, 0xd9, 0xb1, 0x09, 0xc8, + 0xbd, 0x97, 0x93, 0xcb, 0x70, 0x44, 0x7a, 0x98, 0x8c, 0xd0, 0x7a, 0x12, 0xe2, 0xdb, 0x5a, 0x13, + 0x4f, 0x40, 0xe2, 0x36, 0x27, 0x11, 0x23, 0xf0, 0x04, 0x35, 0x0f, 0xa9, 0x1d, 0x93, 0x07, 0xd2, + 0xc6, 0xa3, 0xbf, 0x8f, 0xa3, 0x27, 0x05, 0x0e, 0x27, 0xd1, 0x35, 0xbb, 0xfd, 0xb6, 0x66, 0x4f, + 0xc2, 0xc1, 0x8f, 0x0b, 0x12, 0x02, 0x87, 0x93, 0x38, 0x82, 0x58, 0xdf, 0x2f, 0x48, 0x58, 0x1e, + 0x79, 0x3e, 0x03, 0x49, 0xd3, 0x68, 0x1f, 0x98, 0xc6, 0x24, 0x4c, 0x7c, 0x80, 0x53, 0x00, 0x8e, + 0x42, 0x08, 0x3c, 0x05, 0x89, 0x49, 0x3b, 0xe2, 0x27, 0xbf, 0x20, 0x86, 0x87, 0xe8, 0x81, 0x6b, + 0x90, 0x11, 0x06, 0x4a, 0x37, 0x8d, 0x09, 0x48, 0xfc, 0x14, 0x27, 0x91, 0xf6, 0xa0, 0xf1, 0x66, + 0xd8, 0xd8, 0xb2, 0x77, 0xf0, 0x24, 0x44, 0x3e, 0x24, 0x9a, 0xc1, 0x51, 0xb8, 0x28, 0xb7, 0xb0, + 0xd1, 0xdc, 0x9d, 0x8c, 0xc2, 0x87, 0x85, 0x28, 0x05, 0x0e, 0x21, 0x51, 0x84, 0xe9, 0x8e, 0xd6, + 0xb3, 0x76, 0xb5, 0xf6, 0x44, 0xdd, 0xf1, 0x11, 0x4e, 0x23, 0xe5, 0x20, 0x71, 0x89, 0xf4, 0x8d, + 0xa3, 0x90, 0xf9, 0x69, 0x21, 0x11, 0x0f, 0x1a, 0x1f, 0x7a, 0x96, 0x4d, 0xfd, 0xf8, 0xa3, 0x50, + 0xfb, 0x19, 0x31, 0xf4, 0x18, 0xee, 0x9a, 0x97, 0xe2, 0x53, 0x90, 0xb0, 0xf4, 0x97, 0x27, 0x22, + 0xf3, 0xb3, 0xa2, 0xa7, 0x29, 0x02, 0x41, 0xbe, 0x09, 0xa7, 0x02, 0xa7, 0x89, 0x09, 0x88, 0xfd, + 0x1c, 0x27, 0x76, 0x22, 0x60, 0xaa, 0xe0, 0x26, 0xe1, 0xa8, 0x24, 0x7f, 0x5e, 0x98, 0x04, 0x3c, + 0x40, 0x6b, 0x1d, 0xe6, 0xfa, 0x86, 0xa5, 0x6d, 0x1f, 0x4d, 0x6a, 0xff, 0xbf, 0x90, 0x1a, 0xc3, + 0xf5, 0x49, 0xad, 0x01, 0x27, 0x38, 0xc5, 0xa3, 0xf5, 0xeb, 0x47, 0x85, 0x61, 0x65, 0xd8, 0x1b, + 0xfe, 0xde, 0xfd, 0x66, 0x98, 0x77, 0xc4, 0x29, 0x9c, 0x6e, 0x4b, 0xed, 0x68, 0xdd, 0x09, 0x28, + 0xff, 0x02, 0xa7, 0x2c, 0x2c, 0xbe, 0xe3, 0xb5, 0x5b, 0x6b, 0x5a, 0x97, 0x10, 0x7f, 0x1e, 0xb2, + 0x82, 0x78, 0xdf, 0xe8, 0xe1, 0xa6, 0xb9, 0x63, 0xe8, 0x2f, 0xe3, 0xd6, 0x04, 0xa4, 0x7f, 0x71, + 0xa0, 0xab, 0x36, 0x3c, 0xe8, 0x84, 0x72, 0x05, 0x64, 0xc7, 0x57, 0x51, 0xf5, 0x0e, 0xdd, 0x6f, + 0x3c, 0x9c, 0xe2, 0x2f, 0x89, 0x9e, 0x72, 0xf0, 0x2a, 0x14, 0x6d, 0xa5, 0x0c, 0xec, 0x02, 0xcb, + 0xa4, 0x2a, 0xf9, 0x31, 0x4e, 0x68, 0xda, 0xc5, 0xe2, 0x86, 0xa3, 0x69, 0x76, 0xba, 0x5a, 0x6f, + 0x12, 0xfb, 0xf7, 0xcb, 0xc2, 0x70, 0x70, 0x14, 0x6e, 0x38, 0x88, 0x47, 0x47, 0x66, 0xfb, 0x09, + 0x28, 0xfc, 0x8a, 0x30, 0x1c, 0x02, 0x87, 0x93, 0x10, 0x0e, 0xc3, 0x04, 0x24, 0xfe, 0x91, 0x20, + 0x21, 0x70, 0x08, 0x89, 0x37, 0xb9, 0x13, 0x6d, 0x0f, 0xef, 0xe8, 0x96, 0xcd, 0xaf, 0x98, 0x1d, + 0x4e, 0xea, 0x57, 0xbf, 0xe0, 0x77, 0xc2, 0x14, 0x0f, 0x2a, 0xb1, 0x44, 0x3c, 0xf0, 0x4d, 0x37, + 0x76, 0xc6, 0x33, 0xf6, 0x71, 0x61, 0x89, 0x3c, 0x68, 0x84, 0x37, 0x8f, 0x87, 0x48, 0xc4, 0xde, + 0x24, 0x0b, 0xd4, 0x09, 0xc8, 0xfd, 0xda, 0x00, 0x73, 0x75, 0x81, 0x4b, 0x68, 0x7a, 0xfc, 0x9f, + 0xbe, 0x71, 0x0b, 0x1f, 0x4c, 0xa4, 0x9d, 0xff, 0x78, 0xc0, 0xff, 0xd9, 0x60, 0x98, 0xcc, 0x86, + 0x64, 0x06, 0xfc, 0x29, 0x34, 0xee, 0x0a, 0x6b, 0xf6, 0xad, 0x5f, 0xe4, 0xed, 0xf5, 0xbb, 0x53, + 0x2b, 0xab, 0x44, 0xc9, 0xfd, 0x4e, 0xcf, 0x78, 0x62, 0xdf, 0xfd, 0x45, 0x47, 0xcf, 0x7d, 0x3e, + 0xcf, 0xca, 0x55, 0x98, 0xf6, 0x39, 0x3c, 0xe3, 0x49, 0xbd, 0x8d, 0x93, 0x4a, 0x79, 0xfd, 0x9d, + 0x95, 0xc7, 0x20, 0x42, 0x9c, 0x97, 0xf1, 0xe8, 0xdf, 0xc3, 0xd1, 0x29, 0xf8, 0xca, 0xd3, 0x10, + 0x17, 0x4e, 0xcb, 0x78, 0xd4, 0xef, 0xe5, 0xa8, 0x0e, 0x0a, 0x41, 0x17, 0x0e, 0xcb, 0x78, 0xf4, + 0xff, 0x4b, 0xa0, 0x0b, 0x14, 0x82, 0x3e, 0xb9, 0x08, 0xff, 0xd9, 0x3b, 0x22, 0x7c, 0xd2, 0x11, + 0xb2, 0x7b, 0x0a, 0x62, 0xdc, 0x53, 0x19, 0x8f, 0xfd, 0x7d, 0xbc, 0x72, 0x81, 0xb1, 0xf2, 0x38, + 0x4c, 0x4d, 0x28, 0xf0, 0x77, 0x72, 0x54, 0x06, 0xbf, 0x52, 0x84, 0xa4, 0xc7, 0x3b, 0x19, 0x8f, + 0xfe, 0x03, 0x1c, 0xdd, 0x8b, 0x45, 0x58, 0xe7, 0xde, 0xc9, 0x78, 0x02, 0xff, 0xb7, 0x60, 0x9d, + 0x63, 0x10, 0xb1, 0x09, 0xc7, 0x64, 0x3c, 0xf6, 0xbb, 0x84, 0xd4, 0x05, 0xca, 0xca, 0x33, 0x90, + 0x70, 0x26, 0x9b, 0xf1, 0xf8, 0x3f, 0xc8, 0xf1, 0x5d, 0x1c, 0x22, 0x01, 0xcf, 0x64, 0x37, 0x9e, + 0xc4, 0xff, 0x23, 0x24, 0xe0, 0xc1, 0x22, 0xc3, 0x68, 0xd0, 0x81, 0x19, 0x4f, 0xe9, 0x87, 0xc4, + 0x30, 0x1a, 0xf0, 0x5f, 0x48, 0x6f, 0x52, 0x9b, 0x3f, 0x9e, 0xc4, 0x0f, 0x8b, 0xde, 0xa4, 0xf0, + 0x84, 0x8d, 0x41, 0x8f, 0x60, 0x3c, 0x8d, 0x1f, 0x15, 0x6c, 0x0c, 0x38, 0x04, 0x2b, 0xeb, 0x80, + 0x86, 0xbd, 0x81, 0xf1, 0xf4, 0x5e, 0xe5, 0xf4, 0x66, 0x86, 0x9c, 0x81, 0x95, 0xe7, 0xe0, 0x44, + 0xb0, 0x27, 0x30, 0x9e, 0xea, 0x8f, 0x7d, 0x71, 0x60, 0xed, 0xe6, 0x75, 0x04, 0x56, 0x1a, 0xee, + 0x94, 0xe2, 0xf5, 0x02, 0xc6, 0x93, 0x7d, 0xf7, 0x17, 0xfd, 0x86, 0xdb, 0xeb, 0x04, 0xac, 0xe4, + 0x01, 0xdc, 0x09, 0x78, 0x3c, 0xad, 0xf7, 0x72, 0x5a, 0x1e, 0x24, 0x32, 0x34, 0xf8, 0xfc, 0x3b, + 0x1e, 0xff, 0xb6, 0x18, 0x1a, 0x1c, 0x83, 0x0c, 0x0d, 0x31, 0xf5, 0x8e, 0xc7, 0x7e, 0x9f, 0x18, + 0x1a, 0x02, 0x85, 0x68, 0xb6, 0x67, 0x76, 0x1b, 0x4f, 0xe1, 0x03, 0x42, 0xb3, 0x3d, 0x58, 0x2b, + 0x55, 0x98, 0x19, 0x9a, 0x10, 0xc7, 0x93, 0xfa, 0x20, 0x27, 0x25, 0x0f, 0xce, 0x87, 0xde, 0xc9, + 0x8b, 0x4f, 0x86, 0xe3, 0xa9, 0xfd, 0xc4, 0xc0, 0xe4, 0xc5, 0xe7, 0xc2, 0x95, 0xa7, 0x20, 0x6e, + 0xf4, 0xdb, 0x6d, 0x32, 0x78, 0xd0, 0xe1, 0x57, 0x8c, 0xb3, 0x9f, 0xfd, 0x32, 0x97, 0x8e, 0x40, + 0x58, 0x79, 0x0c, 0xa6, 0x70, 0x67, 0x0b, 0xb7, 0xc6, 0x61, 0x7e, 0xee, 0xcb, 0xc2, 0x60, 0x12, + 0xe8, 0x95, 0x67, 0x00, 0x58, 0x68, 0x84, 0x9e, 0xb1, 0x1f, 0x83, 0xfb, 0xf9, 0x2f, 0xf3, 0x0b, + 0x79, 0x2e, 0x8a, 0x4b, 0x80, 0x5d, 0xef, 0x3b, 0x9c, 0xc0, 0x17, 0xfc, 0x04, 0x68, 0x8f, 0x3c, + 0x09, 0xb1, 0x17, 0x2d, 0xd3, 0xb0, 0xb5, 0x9d, 0x71, 0xd8, 0x7f, 0xce, 0xb1, 0x05, 0x3c, 0x11, + 0x58, 0xc7, 0xec, 0x61, 0x5b, 0xdb, 0xb1, 0xc6, 0xe1, 0xfe, 0x17, 0x8e, 0xeb, 0x20, 0x10, 0xe4, + 0xa6, 0x66, 0xd9, 0x93, 0xb4, 0xfb, 0x2f, 0x04, 0xb2, 0x40, 0x20, 0x4c, 0x93, 0xdf, 0xb7, 0xf0, + 0xc1, 0x38, 0xdc, 0xbf, 0x14, 0x4c, 0x73, 0xf8, 0x95, 0xa7, 0x21, 0x41, 0x7e, 0xb2, 0x8b, 0xba, + 0x63, 0x90, 0xff, 0x8a, 0x23, 0xbb, 0x18, 0xa4, 0x66, 0xcb, 0x6e, 0xd9, 0xfa, 0x78, 0x61, 0xff, + 0x35, 0xef, 0x69, 0x01, 0xbf, 0x92, 0x87, 0xa4, 0x65, 0xb7, 0x5a, 0x7d, 0xee, 0x9f, 0x8e, 0x41, + 0xff, 0xaf, 0x5f, 0x76, 0x42, 0x16, 0x0e, 0x0e, 0xe9, 0xed, 0x97, 0x6e, 0xd9, 0x5d, 0x93, 0x9e, + 0xca, 0x1a, 0x47, 0xe1, 0x8b, 0x9c, 0x82, 0x07, 0x65, 0xa5, 0x08, 0x29, 0xd2, 0x16, 0x71, 0xb8, + 0x65, 0x1c, 0x89, 0xbf, 0xe1, 0x02, 0xf0, 0x21, 0x15, 0xbe, 0xfd, 0x77, 0x3e, 0x75, 0x46, 0xfa, + 0xe4, 0xa7, 0xce, 0x48, 0xff, 0xf1, 0x53, 0x67, 0xa4, 0x77, 0x7d, 0xfa, 0xcc, 0xb1, 0x4f, 0x7e, + 0xfa, 0xcc, 0xb1, 0x3f, 0xfe, 0xf4, 0x99, 0x63, 0xc1, 0x51, 0x62, 0xb8, 0x66, 0x5e, 0x33, 0x59, + 0x7c, 0xf8, 0x85, 0x7b, 0x77, 0x74, 0x7b, 0xb7, 0xbf, 0xb5, 0xd4, 0x34, 0x3b, 0x17, 0x9b, 0xa6, + 0xd5, 0x31, 0xad, 0x8b, 0xfe, 0xb8, 0x2e, 0xfd, 0x05, 0x7f, 0x2b, 0x91, 0x35, 0xb3, 0x3f, 0x9c, + 0xab, 0x19, 0x07, 0xa3, 0x1e, 0xba, 0xba, 0x02, 0xe1, 0xbc, 0x71, 0x80, 0x4e, 0x31, 0x03, 0xa7, + 0xf6, 0x7b, 0x6d, 0x7e, 0xd5, 0x33, 0x46, 0xd2, 0x1b, 0xbd, 0xb6, 0xff, 0x98, 0x7f, 0x8a, 0x1f, + 0xf3, 0x2f, 0xfc, 0x80, 0x74, 0xb4, 0x96, 0xc4, 0xf3, 0xc6, 0x01, 0x6d, 0xc8, 0xba, 0xf4, 0xc2, + 0x43, 0x63, 0xe3, 0xdc, 0xb7, 0x0c, 0xf3, 0x25, 0x83, 0xb0, 0xdd, 0xdd, 0x12, 0x31, 0xee, 0x33, + 0x83, 0x31, 0xee, 0xe7, 0x70, 0xbb, 0xfd, 0x2c, 0x81, 0x6b, 0x10, 0x94, 0xad, 0x28, 0x7b, 0x98, + 0x00, 0x7e, 0x28, 0x04, 0x67, 0x86, 0xc2, 0xd9, 0x5c, 0x09, 0x46, 0x09, 0x61, 0x05, 0xe2, 0x25, + 0xa1, 0x5b, 0x59, 0x88, 0x59, 0xb8, 0x69, 0x1a, 0x2d, 0x76, 0x5e, 0x3b, 0xac, 0x88, 0x24, 0x11, + 0x84, 0xa1, 0x19, 0xa6, 0xc5, 0x2f, 0x4b, 0xb3, 0x44, 0xe1, 0x3d, 0x47, 0x14, 0xc4, 0xb4, 0xa8, + 0x49, 0x48, 0xe3, 0xd2, 0x84, 0xd2, 0x10, 0x8d, 0xf0, 0x45, 0xfe, 0x27, 0x95, 0xca, 0x8f, 0x86, + 0x60, 0x61, 0x50, 0x2a, 0x64, 0x64, 0x59, 0xb6, 0xd6, 0xe9, 0x8e, 0x12, 0xcb, 0x53, 0x90, 0x68, + 0x08, 0x98, 0x23, 0xcb, 0xe5, 0xf6, 0x11, 0xe5, 0x92, 0x76, 0xaa, 0x12, 0x82, 0x59, 0x9e, 0x50, + 0x30, 0x4e, 0x3b, 0xee, 0x48, 0x32, 0xef, 0x49, 0xc0, 0x29, 0x36, 0x9c, 0x54, 0x36, 0x94, 0x58, + 0x82, 0xcb, 0x24, 0xe5, 0x2d, 0x1a, 0xbf, 0x4f, 0x92, 0x7b, 0x16, 0x66, 0x2b, 0xc4, 0x5a, 0x90, + 0x55, 0x90, 0xbb, 0xc3, 0x13, 0x78, 0x9f, 0x7c, 0xd1, 0xe7, 0xf0, 0xf3, 0x0d, 0x46, 0x6f, 0x56, + 0xee, 0xad, 0x12, 0xc8, 0xf5, 0xa6, 0xd6, 0xd6, 0x7a, 0x5f, 0x2d, 0x29, 0xf4, 0x38, 0x00, 0x3b, + 0x0d, 0xe8, 0xbc, 0x47, 0x95, 0x5e, 0xce, 0x2e, 0x79, 0x1b, 0xb7, 0xc4, 0x6a, 0xa2, 0x77, 0xad, + 0x12, 0x14, 0x96, 0xfc, 0xbc, 0xf0, 0x3c, 0x80, 0x5b, 0x80, 0x4e, 0xc3, 0xc9, 0x7a, 0x31, 0xbf, + 0x9a, 0x57, 0xc4, 0x41, 0x9e, 0xfa, 0x7a, 0xb9, 0xc8, 0xde, 0x76, 0x39, 0x86, 0x4e, 0x00, 0xf2, + 0x16, 0x3a, 0xf7, 0x53, 0x8e, 0xc3, 0x8c, 0x37, 0x9f, 0x3d, 0xb4, 0x11, 0x5a, 0xb9, 0x0e, 0x19, + 0x76, 0x85, 0x5f, 0xd5, 0x5a, 0x2d, 0xdc, 0x52, 0x75, 0x03, 0x8d, 0xb9, 0x11, 0x9f, 0xfd, 0xdd, + 0x7f, 0x37, 0x45, 0x9b, 0x36, 0xcd, 0x10, 0xf3, 0x04, 0xaf, 0x62, 0x10, 0x9f, 0x53, 0xef, 0x74, + 0xdb, 0x98, 0xee, 0x5d, 0xab, 0xba, 0x90, 0xff, 0x78, 0x77, 0x86, 0xd0, 0x0b, 0x9f, 0x4f, 0x28, + 0xb3, 0x2e, 0xba, 0xd3, 0x7b, 0x2b, 0xcf, 0xba, 0xe7, 0x05, 0x1d, 0x06, 0xc7, 0x52, 0xfc, 0x04, + 0xe7, 0x50, 0x44, 0x33, 0x04, 0x8b, 0xab, 0x30, 0xa3, 0x35, 0x9b, 0xb8, 0xeb, 0xe3, 0x6f, 0xcc, + 0x0c, 0x22, 0x5a, 0x2b, 0x73, 0x4c, 0x97, 0xb5, 0xc7, 0x21, 0x6a, 0xd1, 0x4e, 0x19, 0x47, 0x42, + 0xb0, 0xc3, 0xc1, 0x57, 0xca, 0xe2, 0x7c, 0xac, 0xd3, 0xa2, 0x31, 0x04, 0xfe, 0x15, 0x27, 0x90, + 0xa2, 0x68, 0xa2, 0x35, 0x06, 0xcc, 0xb0, 0x97, 0x94, 0xb0, 0xa7, 0x35, 0x87, 0x47, 0x51, 0x7e, + 0xfd, 0x97, 0x1e, 0xa1, 0x1b, 0xf7, 0x67, 0xfd, 0x4a, 0x17, 0x30, 0x58, 0x14, 0x99, 0xd3, 0x76, + 0xdb, 0x8b, 0x21, 0x2d, 0xea, 0xe3, 0xed, 0x3e, 0xbc, 0xb2, 0x7f, 0xc2, 0x2b, 0x3b, 0x13, 0xa4, + 0xe1, 0x9e, 0x9a, 0xa6, 0x39, 0x55, 0x56, 0xb0, 0x52, 0x80, 0x69, 0xfa, 0xee, 0xa2, 0x23, 0x9c, + 0xc3, 0x6b, 0xf9, 0xa7, 0xbf, 0xf4, 0x08, 0x1b, 0x68, 0x04, 0x89, 0x8b, 0xa6, 0x50, 0x1e, 0x65, + 0xf5, 0x5e, 0x78, 0x70, 0x78, 0xfe, 0x66, 0xff, 0x1e, 0xa6, 0xd4, 0x9f, 0xf2, 0xb2, 0xea, 0x5a, + 0xa7, 0x08, 0xcc, 0x68, 0x1d, 0xdd, 0x30, 0x2f, 0xd2, 0xbf, 0xdc, 0x2a, 0x4d, 0xd1, 0xc4, 0x04, + 0xdb, 0xb6, 0x57, 0x98, 0xb1, 0x18, 0xaf, 0xb7, 0x7f, 0xf5, 0xfd, 0x3f, 0x35, 0xe5, 0x1a, 0x94, + 0x95, 0xb5, 0xe1, 0xb3, 0xb2, 0xe3, 0x69, 0xfc, 0xb5, 0xa0, 0x31, 0x78, 0xf4, 0x75, 0xe5, 0x0d, + 0x10, 0x77, 0xc8, 0x8c, 0xf3, 0xdd, 0x04, 0x11, 0x07, 0x83, 0x78, 0x6e, 0x4c, 0x69, 0x27, 0xf1, + 0xd3, 0xbf, 0x28, 0xf0, 0x99, 0x0d, 0xab, 0x92, 0xd6, 0x5c, 0x83, 0x74, 0xcb, 0x34, 0x6c, 0xd5, + 0xec, 0xe8, 0x36, 0xee, 0x74, 0xed, 0xb1, 0x9e, 0xef, 0xdf, 0x30, 0x22, 0x71, 0x65, 0x9a, 0xe0, + 0xd5, 0x04, 0x1a, 0xe1, 0x84, 0x3d, 0xc6, 0x34, 0x09, 0x27, 0xff, 0xcd, 0xe1, 0x84, 0xe2, 0x10, + 0x4e, 0xee, 0x48, 0x3b, 0xac, 0xd6, 0x2d, 0x3e, 0xdd, 0xd9, 0xfb, 0x4c, 0x0b, 0x1c, 0xed, 0xf8, + 0x17, 0x11, 0x38, 0xc3, 0x81, 0xb7, 0x34, 0x0b, 0x5f, 0xdc, 0xbb, 0xb4, 0x85, 0x6d, 0xed, 0xd2, + 0xc5, 0xa6, 0xa9, 0x0b, 0x5f, 0x67, 0x96, 0x4f, 0x67, 0xa4, 0x7c, 0x89, 0x97, 0xcf, 0x07, 0x1e, + 0x08, 0x98, 0x1f, 0x3d, 0x0d, 0xce, 0x0f, 0xeb, 0x60, 0xae, 0x0d, 0x91, 0xa2, 0xa9, 0xd3, 0x5b, + 0xa0, 0x2d, 0x6c, 0x98, 0x1d, 0x3e, 0x21, 0xb1, 0x04, 0xba, 0x0e, 0x51, 0xad, 0x63, 0xf6, 0x0d, + 0x9b, 0x4d, 0x46, 0x85, 0x47, 0x7e, 0xe7, 0xb5, 0x85, 0x63, 0x7f, 0xf2, 0xda, 0xc2, 0x71, 0x46, + 0xd6, 0x6a, 0xdd, 0x5a, 0xd2, 0xcd, 0x8b, 0x1d, 0xcd, 0xde, 0x25, 0x26, 0xe0, 0x0f, 0x3f, 0xf6, + 0x30, 0xf0, 0xfa, 0x2a, 0x86, 0xfd, 0xe1, 0xcf, 0x7c, 0xf4, 0x82, 0xa4, 0x70, 0xfc, 0x95, 0xc8, + 0xeb, 0xef, 0x5f, 0x90, 0x72, 0x5d, 0x88, 0x95, 0x70, 0xf3, 0x90, 0x0a, 0x2b, 0x03, 0x15, 0x5e, + 0xe2, 0x15, 0x9e, 0x1e, 0xae, 0x90, 0xdd, 0x2e, 0x2b, 0xe1, 0xa6, 0xa7, 0xda, 0x12, 0x6e, 0x0e, + 0xd4, 0x58, 0x81, 0x78, 0xc5, 0xb0, 0xd9, 0x73, 0x30, 0x4f, 0x43, 0x58, 0x37, 0xd8, 0x2b, 0x02, + 0x89, 0xc2, 0x83, 0x47, 0x68, 0x8a, 0x42, 0xf0, 0x72, 0x35, 0x88, 0x97, 0x70, 0x93, 0x91, 0x2a, + 0x42, 0xb8, 0x85, 0x9b, 0x9c, 0xd4, 0x1d, 0x30, 0x49, 0xb0, 0x0b, 0xa5, 0x3f, 0xfe, 0x4f, 0x67, + 0x8e, 0xbd, 0xe5, 0x53, 0x67, 0x8e, 0x8d, 0x54, 0xa7, 0xdc, 0x78, 0x75, 0x72, 0xb4, 0xe8, 0x23, + 0x54, 0x8b, 0x3a, 0xd8, 0xde, 0xda, 0xb6, 0x2f, 0x36, 0x7b, 0x07, 0x5d, 0xdb, 0xbc, 0xb8, 0x77, + 0x89, 0x58, 0x15, 0x73, 0x9b, 0x6b, 0x11, 0x12, 0xe5, 0x4b, 0xac, 0x7c, 0x69, 0x6f, 0x84, 0x12, + 0xe5, 0xb6, 0x61, 0x6a, 0x9d, 0x20, 0x92, 0x6e, 0xb2, 0x4d, 0x5b, 0x6b, 0x73, 0x6f, 0x91, 0x25, + 0x48, 0x2e, 0x7b, 0xc8, 0x2c, 0xc4, 0x72, 0x75, 0xf1, 0x86, 0x59, 0x1b, 0x6b, 0xdb, 0xec, 0x31, + 0x97, 0x30, 0x5d, 0x66, 0xc4, 0x49, 0x06, 0x7d, 0xb7, 0x65, 0x0e, 0xa6, 0xb4, 0x3e, 0x3b, 0xe8, + 0x16, 0x26, 0xeb, 0x0f, 0x9a, 0xc8, 0xad, 0x42, 0x8c, 0x9f, 0x7b, 0x40, 0x32, 0x84, 0x6f, 0xe1, + 0x03, 0x5a, 0x4f, 0x4a, 0x21, 0x3f, 0xd1, 0x45, 0x98, 0xa2, 0xdc, 0xf3, 0x3b, 0x74, 0xa7, 0x96, 0x86, 0xd9, 0x5f, 0xa2, 0x5c, 0x2a, 0x0c, 0x2e, 0x77, 0x03, 0xe2, 0x25, 0x93, 0x28, 0xb7, 0x9f, - 0x5c, 0x82, 0x91, 0xa3, 0x4c, 0x77, 0xfb, 0xb6, 0x38, 0xe8, 0x4c, 0x1f, 0xd0, 0x09, 0x88, 0xb2, - 0xdb, 0x7d, 0xf8, 0x6e, 0x3d, 0xfe, 0x94, 0x2b, 0x42, 0x8c, 0xd2, 0xae, 0x75, 0x9d, 0x5b, 0xf7, - 0x24, 0xcf, 0xad, 0x7b, 0x9c, 0x7c, 0xc8, 0xe5, 0x16, 0x41, 0xa4, 0xa5, 0xd9, 0x1a, 0x6f, 0x38, - 0xfd, 0x9d, 0x7b, 0x06, 0xe2, 0x9c, 0x88, 0x85, 0x1e, 0x85, 0xb0, 0xd9, 0x15, 0x9b, 0x51, 0x4f, - 0x8f, 0x6c, 0x4b, 0xad, 0x5b, 0x88, 0x10, 0x7d, 0x52, 0x08, 0x74, 0x61, 0x6d, 0xa4, 0x6a, 0x3c, - 0xea, 0x53, 0x0d, 0xd1, 0xed, 0xe2, 0x87, 0xd6, 0xd5, 0x2f, 0x0e, 0x2b, 0x83, 0xa3, 0x2b, 0xaf, - 0x86, 0xe0, 0xee, 0x00, 0x5d, 0xb9, 0x85, 0x0f, 0xac, 0x23, 0xab, 0xca, 0x1e, 0x24, 0xd6, 0xe9, - 0xbd, 0xc0, 0xcf, 0xe2, 0x03, 0x34, 0x0f, 0x31, 0xdc, 0xba, 0xfc, 0xd8, 0x63, 0x97, 0x9e, 0x64, - 0x1d, 0x79, 0xfd, 0x98, 0x22, 0x0a, 0xd0, 0x19, 0x48, 0x58, 0xb8, 0xd9, 0xbd, 0xfc, 0xd8, 0xd5, - 0x5b, 0x97, 0x98, 0xe0, 0xae, 0x1f, 0x53, 0xdc, 0x22, 0x74, 0x17, 0xc4, 0xb7, 0xda, 0xd6, 0xa5, - 0xcb, 0x8f, 0x3e, 0x71, 0x89, 0x09, 0xf1, 0xfa, 0x31, 0xc5, 0x29, 0x59, 0x8e, 0x93, 0xe1, 0xfc, - 0xfa, 0x07, 0x17, 0xa4, 0xc2, 0x14, 0x84, 0xad, 0x7e, 0xe7, 0x9b, 0x25, 0x9a, 0xdf, 0x8c, 0xc1, - 0x59, 0xa7, 0x9a, 0x19, 0xec, 0xbd, 0x4b, 0x17, 0xf9, 0x69, 0x17, 0xe7, 0xa6, 0xe9, 0x19, 0x47, - 0x3c, 0x14, 0x84, 0x48, 0xe7, 0x70, 0x81, 0x8e, 0x10, 0xde, 0xc7, 0x25, 0x48, 0x6d, 0x0a, 0xda, - 0x75, 0x6c, 0xa3, 0x37, 0x00, 0x38, 0xef, 0x12, 0xca, 0x72, 0xd7, 0xd2, 0xd0, 0xdb, 0x96, 0x1c, - 0x24, 0xc5, 0x03, 0x8f, 0x9e, 0x80, 0x78, 0xb7, 0x67, 0x76, 0x4d, 0x8b, 0xdf, 0x05, 0x36, 0x0e, - 0xd7, 0x81, 0x46, 0x0f, 0x01, 0xa2, 0x43, 0x5b, 0xdd, 0x33, 0x6d, 0xdd, 0xd8, 0x51, 0xbb, 0xe6, - 0x4b, 0xfc, 0x96, 0xc6, 0xb0, 0x22, 0xd3, 0x9a, 0x4d, 0x5a, 0xb1, 0x4e, 0xca, 0x73, 0xff, 0x5d, - 0x82, 0x84, 0x43, 0x85, 0xcc, 0x29, 0xb5, 0x56, 0xab, 0x87, 0x2d, 0x8b, 0x8f, 0x5e, 0xf1, 0x88, - 0x96, 0x21, 0xd6, 0xed, 0x6f, 0xa9, 0x62, 0xa4, 0x24, 0x2f, 0xdf, 0x1d, 0xa8, 0xf7, 0x42, 0x7d, - 0xe8, 0x01, 0xe2, 0x68, 0xb7, 0xbf, 0x45, 0x54, 0xe9, 0x2c, 0xa4, 0x02, 0x78, 0x49, 0xee, 0xb9, - 0x6c, 0xd0, 0xbb, 0xaa, 0x79, 0x03, 0xd4, 0x6e, 0x4f, 0x37, 0x7b, 0xba, 0x7d, 0x40, 0xf7, 0x6c, - 0x86, 0x15, 0x59, 0x54, 0xac, 0xf3, 0x72, 0x94, 0x83, 0x69, 0xce, 0x8b, 0xba, 0x75, 0x60, 0xf3, - 0xfd, 0xc8, 0x29, 0x25, 0xc9, 0x5e, 0x57, 0x20, 0x45, 0x68, 0x11, 0x52, 0x02, 0xc6, 0xb9, 0x31, - 0x24, 0xa1, 0x00, 0x03, 0x21, 0x53, 0xa7, 0x5c, 0x1b, 0x32, 0x75, 0x3a, 0xcd, 0x70, 0x9b, 0x7f, - 0xd5, 0x6d, 0xa4, 0x34, 0x41, 0x23, 0x47, 0x36, 0x30, 0x34, 0xd4, 0xc0, 0x0b, 0xff, 0x41, 0x82, - 0x64, 0xa1, 0x6d, 0x36, 0x6f, 0x55, 0x4a, 0xd7, 0xda, 0xda, 0x0e, 0xba, 0x04, 0xc7, 0x0b, 0xab, - 0xb5, 0xe2, 0xb3, 0x6a, 0xa5, 0xa4, 0x5e, 0x5b, 0xcd, 0x7b, 0x4e, 0x26, 0xcc, 0x9f, 0x78, 0xe5, - 0xf6, 0x22, 0xf2, 0xc0, 0x6e, 0x18, 0x74, 0x5a, 0x8d, 0x2e, 0xc2, 0x9c, 0x1f, 0x25, 0x5f, 0xa8, - 0x97, 0xab, 0x0d, 0x59, 0x9a, 0x3f, 0xfe, 0xca, 0xed, 0xc5, 0x19, 0x0f, 0x46, 0x7e, 0xcb, 0xc2, - 0x86, 0x3d, 0x8c, 0x50, 0xac, 0xad, 0xad, 0x55, 0x1a, 0x72, 0x68, 0x08, 0xa1, 0x68, 0x76, 0x3a, - 0xba, 0x8d, 0x1e, 0x80, 0x19, 0x3f, 0x42, 0xb5, 0xb2, 0x2a, 0x87, 0xe7, 0xd1, 0x2b, 0xb7, 0x17, - 0xd3, 0x1e, 0xe8, 0xaa, 0xde, 0x9e, 0x8f, 0xbf, 0xfd, 0xa7, 0xcf, 0x1c, 0xfb, 0xc8, 0xff, 0x77, - 0x46, 0x2a, 0xac, 0x8e, 0x1c, 0xbd, 0x97, 0x27, 0x1f, 0xbd, 0x62, 0x78, 0x3a, 0x83, 0xf7, 0xfd, - 0x21, 0x58, 0x70, 0x6a, 0xf7, 0x70, 0xcf, 0xd2, 0x4d, 0x83, 0x8c, 0x43, 0xa6, 0xfa, 0x4e, 0x28, - 0xc5, 0x3b, 0x87, 0x03, 0x8c, 0x36, 0x6d, 0x4f, 0x43, 0x38, 0xdf, 0xed, 0xa2, 0x79, 0x3a, 0xaa, - 0x6c, 0xb3, 0x69, 0x32, 0x37, 0x18, 0x51, 0x9c, 0x67, 0x52, 0x67, 0x99, 0xdb, 0xf6, 0x4b, 0x5a, - 0xcf, 0xb9, 0x19, 0x54, 0x3c, 0xe7, 0x9e, 0x84, 0x44, 0xd1, 0x34, 0x2c, 0x6c, 0x58, 0x7d, 0x9a, - 0x5e, 0xd9, 0x22, 0xc2, 0xe0, 0x14, 0xd8, 0x03, 0x71, 0x23, 0x5a, 0xb7, 0x4b, 0x31, 0x23, 0x0a, - 0xf9, 0xc9, 0xc2, 0x96, 0x42, 0x75, 0xa4, 0x78, 0xae, 0x4c, 0x2e, 0x1e, 0x57, 0x00, 0x8e, 0x80, - 0xde, 0x7d, 0xb7, 0xc7, 0xf0, 0x3b, 0xd6, 0xcd, 0x2b, 0x9e, 0x00, 0xcb, 0x36, 0x26, 0xac, 0x98, - 0x1f, 0x6f, 0x2f, 0xe7, 0xc7, 0xf5, 0xca, 0x88, 0x58, 0x76, 0x5c, 0xb2, 0x2b, 0xf7, 0x24, 0x4c, - 0xaf, 0x6b, 0x3d, 0xbb, 0x8e, 0xed, 0xeb, 0x58, 0x6b, 0xe1, 0x9e, 0x3f, 0x5e, 0x99, 0x16, 0xf1, - 0x0a, 0x82, 0x08, 0x0d, 0x4a, 0x98, 0xbb, 0xa6, 0xbf, 0x73, 0x3a, 0x44, 0xe8, 0xf9, 0x54, 0x27, - 0x96, 0xe1, 0x18, 0x2c, 0x96, 0x21, 0xdd, 0x45, 0xad, 0x04, 0x4f, 0x97, 0xd2, 0x07, 0xf4, 0x98, - 0x88, 0x48, 0xc2, 0x63, 0x22, 0x12, 0xee, 0xc3, 0x79, 0x5c, 0xd2, 0x81, 0x18, 0x1f, 0x08, 0x0e, - 0x27, 0x92, 0xcb, 0x09, 0xaa, 0x42, 0xa6, 0xab, 0xf5, 0x6c, 0x7a, 0xdd, 0xd5, 0x2e, 0x6d, 0x06, - 0xb7, 0x96, 0x8b, 0x01, 0xc6, 0xdb, 0xd7, 0x5c, 0xfe, 0x9a, 0xe9, 0xae, 0xb7, 0x30, 0xf7, 0x7a, - 0x04, 0xa2, 0x5c, 0x1c, 0x6f, 0x84, 0x18, 0x17, 0x38, 0xb7, 0x4d, 0x67, 0x96, 0x02, 0xd4, 0x7f, - 0xc9, 0x51, 0x53, 0x4e, 0x50, 0x20, 0xa1, 0xfb, 0x20, 0xde, 0xdc, 0xd5, 0x74, 0x43, 0xd5, 0x5b, - 0x3c, 0x22, 0x4f, 0x7e, 0xfa, 0xb5, 0x85, 0x58, 0x91, 0x94, 0x55, 0x4a, 0x4a, 0x8c, 0x56, 0x56, - 0x5a, 0x24, 0x8a, 0xda, 0xc5, 0xfa, 0xce, 0xae, 0xcd, 0xcd, 0x34, 0x7f, 0x42, 0x4f, 0x40, 0x84, - 0x74, 0x19, 0x3f, 0x45, 0x32, 0x3f, 0x34, 0xd5, 0x72, 0xb2, 0x85, 0x85, 0x38, 0x79, 0xf1, 0xbb, - 0xfe, 0xd3, 0x82, 0xa4, 0x50, 0x0c, 0x54, 0x82, 0xe9, 0xb6, 0x66, 0xd9, 0x2a, 0x1d, 0x27, 0xe4, - 0xf5, 0x53, 0x9c, 0xc4, 0xb0, 0x48, 0xb8, 0x6c, 0x39, 0xef, 0x49, 0x82, 0xc6, 0x8a, 0x5a, 0xe8, - 0x3c, 0xc8, 0x94, 0x4a, 0x93, 0x9a, 0x2a, 0x16, 0x99, 0x46, 0xa9, 0xe8, 0xd3, 0xa4, 0x9c, 0x59, - 0x30, 0x1a, 0x9f, 0x9e, 0x86, 0x04, 0xbd, 0xd6, 0x8d, 0x82, 0xb0, 0x83, 0xd1, 0x71, 0x52, 0x40, - 0x2b, 0xef, 0x87, 0x8c, 0xeb, 0x65, 0x19, 0x48, 0x9c, 0x51, 0x71, 0x8b, 0x29, 0xe0, 0x23, 0x30, - 0x67, 0xe0, 0x7d, 0x5b, 0x1d, 0x84, 0x4e, 0x50, 0x68, 0x44, 0xea, 0x36, 0xfd, 0x18, 0xf7, 0x42, - 0xba, 0x29, 0xa4, 0xcf, 0x60, 0x81, 0xc2, 0x4e, 0x3b, 0xa5, 0x14, 0xec, 0x14, 0xc4, 0xb5, 0x6e, - 0x97, 0x01, 0x24, 0xb9, 0x93, 0xed, 0x76, 0x69, 0xd5, 0x05, 0x98, 0xa1, 0x6d, 0xec, 0x61, 0xab, - 0xdf, 0xb6, 0x39, 0x91, 0x14, 0x85, 0xc9, 0x90, 0x0a, 0x85, 0x95, 0x53, 0xd8, 0x73, 0x30, 0x8d, - 0xf7, 0xf4, 0x16, 0x36, 0x9a, 0x98, 0xc1, 0x4d, 0x53, 0xb8, 0x94, 0x28, 0xa4, 0x40, 0x0f, 0x80, - 0xe3, 0x3d, 0x55, 0xe1, 0xd8, 0xd3, 0x8c, 0x9e, 0x28, 0xcf, 0xb3, 0xe2, 0x5c, 0x16, 0x22, 0x25, - 0xcd, 0xd6, 0x88, 0x1d, 0xb3, 0xf7, 0x59, 0xbc, 0x92, 0x52, 0xc8, 0xcf, 0xdc, 0x27, 0xc2, 0x10, - 0xd9, 0x34, 0x6d, 0x8c, 0xae, 0x78, 0xa2, 0xe7, 0x74, 0xa0, 0x4a, 0xd7, 0xf5, 0x1d, 0x03, 0xb7, - 0xd6, 0xac, 0x1d, 0xcf, 0x75, 0xcc, 0xae, 0x42, 0x85, 0x7c, 0x0a, 0x35, 0x07, 0x53, 0x3d, 0xb3, - 0x6f, 0xb4, 0xc4, 0x71, 0x0d, 0xfa, 0x80, 0xae, 0x91, 0xd0, 0x91, 0xeb, 0x49, 0x64, 0xac, 0x9e, - 0x64, 0x88, 0x9e, 0x10, 0x35, 0xe6, 0x05, 0x4a, 0x6c, 0x8b, 0xab, 0x4b, 0x01, 0x12, 0x8e, 0x85, - 0x71, 0x14, 0x6e, 0x12, 0x9d, 0x75, 0xd1, 0x48, 0x50, 0xe2, 0xf4, 0xbe, 0x23, 0x3e, 0xa6, 0x73, - 0xb2, 0x53, 0xc1, 0xe5, 0xe7, 0x53, 0x2c, 0x7e, 0x37, 0x74, 0x8c, 0x36, 0xcc, 0x55, 0x2c, 0x76, - 0x3f, 0xf4, 0x5d, 0x90, 0xb0, 0xf4, 0x1d, 0x83, 0x1e, 0x81, 0xe2, 0xba, 0xe7, 0x16, 0x90, 0x5a, - 0xf7, 0x80, 0x3d, 0xd3, 0x35, 0xcf, 0x67, 0x0c, 0x2e, 0xc2, 0xac, 0xfb, 0x01, 0x01, 0x97, 0x0a, - 0xd3, 0x33, 0xe4, 0x54, 0xd5, 0x45, 0x4d, 0xee, 0x9f, 0x49, 0x10, 0xe5, 0xce, 0xdd, 0xed, 0x07, - 0x29, 0xb8, 0x1f, 0x42, 0xa3, 0xfa, 0x21, 0xfc, 0x75, 0xf5, 0x03, 0x38, 0x7c, 0x5a, 0xfc, 0x0a, - 0xe0, 0xa0, 0x48, 0x96, 0x31, 0x59, 0xd7, 0x77, 0xf8, 0xd8, 0xf7, 0x60, 0xe5, 0x5e, 0x93, 0x88, - 0xfb, 0xe5, 0xf5, 0xa8, 0x00, 0xd3, 0x82, 0x33, 0x75, 0xbb, 0xad, 0xed, 0x70, 0x75, 0x3c, 0x33, - 0x9a, 0x3d, 0x12, 0xb3, 0x28, 0x49, 0xce, 0x11, 0x8d, 0xbe, 0x02, 0x7b, 0x36, 0x34, 0xa2, 0x67, - 0x7d, 0xaa, 0x14, 0xbe, 0x33, 0x55, 0xf2, 0x75, 0x7a, 0x64, 0xa0, 0xd3, 0x73, 0x9f, 0x91, 0xf8, - 0xe7, 0x07, 0x5a, 0xec, 0xc8, 0xd7, 0xff, 0xb2, 0xde, 0xfa, 0x76, 0xae, 0x5f, 0x2d, 0xdc, 0x52, - 0x87, 0xba, 0xed, 0x9e, 0x00, 0x92, 0x7e, 0xae, 0xdd, 0xee, 0x43, 0x82, 0x4c, 0xdd, 0xed, 0xc6, - 0x5f, 0x0b, 0xc1, 0xcc, 0x10, 0xfc, 0xdf, 0xc1, 0xee, 0xf4, 0x8f, 0xe1, 0xa9, 0x09, 0xc7, 0x70, - 0x74, 0xe4, 0x18, 0xfe, 0xb5, 0x10, 0xcd, 0x3d, 0x74, 0x4d, 0x4b, 0x6b, 0xff, 0xad, 0xd8, 0xe0, - 0xd3, 0x90, 0xe8, 0x9a, 0x6d, 0x95, 0xd5, 0xb0, 0x83, 0x73, 0xf1, 0xae, 0xd9, 0x56, 0x86, 0x54, - 0x6d, 0xea, 0x1b, 0x65, 0xa0, 0xa3, 0xdf, 0x80, 0x6e, 0x88, 0x0d, 0x8e, 0x2a, 0x1b, 0x52, 0x4c, - 0x16, 0x3c, 0x82, 0xba, 0x44, 0x84, 0x40, 0x63, 0x32, 0x69, 0x30, 0xe6, 0x73, 0xf8, 0x66, 0xa0, - 0x0a, 0x07, 0x24, 0x28, 0x2c, 0xde, 0x18, 0x4e, 0x5c, 0x0d, 0x58, 0x2e, 0x85, 0x03, 0xe6, 0x5e, - 0x95, 0x00, 0x56, 0x89, 0x70, 0x69, 0x8b, 0x49, 0xf0, 0x63, 0x51, 0x26, 0x54, 0xdf, 0xbb, 0x17, - 0x46, 0x76, 0x1c, 0xe7, 0x20, 0x65, 0x79, 0x59, 0x2f, 0xc1, 0xb4, 0xab, 0xe0, 0x16, 0x16, 0xec, - 0x2c, 0x1c, 0x96, 0x12, 0xa8, 0x63, 0x5b, 0x49, 0xed, 0x79, 0x9e, 0x72, 0xff, 0x42, 0x82, 0x04, - 0xe5, 0x6a, 0x0d, 0xdb, 0x9a, 0xaf, 0x23, 0xa5, 0xaf, 0xa3, 0x23, 0xef, 0x06, 0x60, 0x74, 0x2c, - 0xfd, 0x65, 0xcc, 0xf5, 0x2b, 0x41, 0x4b, 0xea, 0xfa, 0xcb, 0x18, 0x3d, 0xee, 0x48, 0x3d, 0x3c, - 0x46, 0xea, 0xdc, 0x74, 0x08, 0xd9, 0x9f, 0x84, 0x18, 0xbd, 0xa6, 0x65, 0xdf, 0xe2, 0x89, 0x80, - 0xa8, 0xd1, 0xef, 0x34, 0xf6, 0xad, 0xdc, 0x2d, 0x88, 0x35, 0xf6, 0x59, 0x4e, 0xf3, 0x34, 0x24, - 0x7a, 0xa6, 0xc9, 0xa3, 0x41, 0x16, 0x88, 0xc7, 0x49, 0x01, 0x0d, 0x7e, 0x44, 0x1a, 0x2f, 0xe4, - 0xa6, 0xf1, 0xdc, 0x44, 0x64, 0x78, 0xb2, 0x44, 0x24, 0x99, 0xb7, 0x4f, 0xfb, 0x46, 0x14, 0x7a, - 0x08, 0x4e, 0xd6, 0x2b, 0x2b, 0xd5, 0x72, 0x49, 0x5d, 0xab, 0xaf, 0x0c, 0xdc, 0x9f, 0x30, 0x9f, - 0x79, 0xe5, 0xf6, 0x62, 0x92, 0x4f, 0xd8, 0x47, 0x41, 0xaf, 0x2b, 0xe5, 0xcd, 0x5a, 0xa3, 0x2c, - 0x4b, 0x0c, 0x7a, 0xbd, 0x87, 0xf7, 0x4c, 0x9b, 0x7d, 0xea, 0xea, 0x11, 0x38, 0x15, 0x00, 0xed, - 0x4c, 0xdb, 0x67, 0x5e, 0xb9, 0xbd, 0x38, 0xbd, 0xde, 0xc3, 0x4c, 0xd5, 0x28, 0xc6, 0x12, 0x64, - 0x87, 0x31, 0x6a, 0xeb, 0xb5, 0x7a, 0x7e, 0x55, 0x5e, 0x9c, 0x97, 0x5f, 0xb9, 0xbd, 0x98, 0x12, - 0xb6, 0x83, 0xc0, 0x7f, 0xf3, 0xe7, 0xed, 0x91, 0xe1, 0xdd, 0x1e, 0x2f, 0xf5, 0xb4, 0x6e, 0x17, - 0xf7, 0xac, 0x51, 0xdb, 0x1a, 0xce, 0x41, 0xb2, 0xe4, 0xb9, 0xdb, 0xc8, 0xd9, 0xdf, 0x22, 0xd1, - 0x7b, 0x8f, 0xd8, 0x43, 0x2e, 0x07, 0x70, 0xad, 0x6d, 0x6a, 0x76, 0x00, 0x4c, 0xc8, 0x03, 0x53, - 0x31, 0xec, 0xab, 0x57, 0x02, 0x60, 0xc2, 0x02, 0xe6, 0x1c, 0x24, 0x37, 0x46, 0x01, 0x45, 0xfc, - 0x84, 0x1e, 0xbd, 0x1c, 0x00, 0x33, 0x35, 0x40, 0x28, 0x10, 0x68, 0x5a, 0x00, 0x9d, 0x85, 0x44, - 0xc1, 0x34, 0xdb, 0x01, 0x20, 0x71, 0x0f, 0x9d, 0xba, 0xe7, 0xda, 0x26, 0x1f, 0x50, 0xc2, 0xc3, - 0x10, 0xcd, 0x6b, 0x05, 0xc0, 0x38, 0x3b, 0x80, 0x8e, 0xbc, 0xf1, 0xe5, 0x39, 0xde, 0x2f, 0x47, - 0xdd, 0xf8, 0x22, 0xfa, 0xf3, 0xce, 0x36, 0xbe, 0xa4, 0x3c, 0x8b, 0x1b, 0x4e, 0x96, 0xa1, 0xab, - 0xf5, 0xb4, 0xce, 0x21, 0x89, 0x8b, 0xe0, 0xa4, 0xc2, 0x98, 0x7d, 0x45, 0xf3, 0x63, 0x34, 0x91, - 0xcc, 0x6c, 0x32, 0xce, 0x84, 0x79, 0x9d, 0xb2, 0x80, 0xae, 0x78, 0xb3, 0x3b, 0xc9, 0xd1, 0x71, - 0x08, 0x03, 0x17, 0xd9, 0x9f, 0xa7, 0x21, 0x2e, 0x26, 0x5e, 0xdc, 0x36, 0x9f, 0x0d, 0x8a, 0x96, - 0x38, 0x08, 0xc7, 0x75, 0x50, 0xd0, 0xb7, 0x41, 0xc2, 0xb1, 0xd4, 0xdc, 0x34, 0xe5, 0x0e, 0xb3, - 0xed, 0x9c, 0x80, 0x8b, 0x84, 0x96, 0xdd, 0xf4, 0x40, 0x64, 0x64, 0xc6, 0x61, 0x93, 0x41, 0x70, - 0x6c, 0x27, 0x35, 0xf0, 0x18, 0x44, 0xb4, 0xad, 0xa6, 0xce, 0xdd, 0xf9, 0xdd, 0x01, 0x88, 0xf9, - 0x42, 0xb1, 0xc2, 0xb0, 0x68, 0x62, 0x97, 0x82, 0x13, 0xa6, 0xad, 0x03, 0xa3, 0xb9, 0xdb, 0x33, - 0x8d, 0x03, 0xee, 0xc1, 0x83, 0x98, 0xae, 0x0b, 0x18, 0xc1, 0xb4, 0x83, 0x44, 0x98, 0xe6, 0x77, - 0x41, 0xf0, 0xcb, 0x23, 0x83, 0x98, 0xe6, 0x77, 0x48, 0x08, 0xa6, 0x39, 0x42, 0xae, 0xc2, 0xf3, - 0xa9, 0xbc, 0xdb, 0xe8, 0xc5, 0xdd, 0xfb, 0x3c, 0x1f, 0xcc, 0x06, 0x7c, 0xbc, 0xa3, 0xed, 0xb3, - 0x64, 0xf0, 0x49, 0x88, 0x91, 0xca, 0x1d, 0x7e, 0x83, 0x66, 0x58, 0x89, 0x76, 0xb4, 0xfd, 0x15, - 0xcd, 0xba, 0x11, 0x89, 0x87, 0xe5, 0x48, 0xee, 0xa3, 0x24, 0xfc, 0xf6, 0x75, 0x0d, 0x7a, 0x10, - 0x10, 0xc1, 0xd0, 0x76, 0xb0, 0x4a, 0x9c, 0x10, 0xed, 0x64, 0x41, 0x37, 0xd3, 0xd1, 0xf6, 0xf3, - 0x3b, 0xb8, 0xda, 0xef, 0x50, 0x06, 0x2c, 0xb4, 0x06, 0xb2, 0x00, 0x16, 0x0a, 0xe8, 0xc4, 0x0b, - 0x43, 0x5f, 0x3f, 0xe3, 0x00, 0x2c, 0xa0, 0x79, 0x95, 0x04, 0x34, 0x69, 0x46, 0xcf, 0xd9, 0xf0, - 0xe6, 0x6b, 0x4a, 0xd8, 0xdf, 0x94, 0xdc, 0x33, 0x90, 0x19, 0xd0, 0x02, 0x6f, 0x3a, 0x9c, 0x0a, - 0x8d, 0xce, 0xdd, 0x13, 0x22, 0x1d, 0x4e, 0x47, 0xdf, 0x72, 0xfc, 0x37, 0x3e, 0xb0, 0x20, 0xd1, - 0x65, 0xd4, 0x07, 0x61, 0xda, 0xa7, 0x06, 0x22, 0x71, 0x29, 0xb9, 0x89, 0x4b, 0x17, 0xf8, 0x05, - 0x48, 0x11, 0x57, 0x8a, 0x5b, 0x1c, 0xf6, 0x3e, 0xc8, 0x30, 0x5f, 0x3f, 0x28, 0x6b, 0x16, 0xc3, - 0xaf, 0x09, 0x81, 0xe7, 0x44, 0x50, 0xef, 0x17, 0x7b, 0x52, 0x40, 0xad, 0x68, 0x56, 0xee, 0xc7, - 0x25, 0xc8, 0x0c, 0xe8, 0x06, 0x7a, 0x1a, 0x12, 0xdd, 0x1e, 0x6e, 0xea, 0x9e, 0x34, 0xd7, 0x21, - 0x22, 0x8c, 0x50, 0xf1, 0xb9, 0x18, 0x24, 0x4c, 0x12, 0xbb, 0x24, 0x5a, 0xb8, 0xad, 0x1d, 0x8c, - 0xef, 0x05, 0x46, 0x42, 0x7c, 0xa4, 0xb2, 0x44, 0x90, 0x72, 0xbf, 0x23, 0xc1, 0xb4, 0x4f, 0xe9, - 0x50, 0x0b, 0xee, 0x26, 0x2e, 0xda, 0xbb, 0x33, 0x9f, 0x7f, 0x36, 0xc1, 0x33, 0x47, 0x0b, 0xba, - 0x10, 0xc5, 0x75, 0x34, 0x34, 0xb8, 0x91, 0x94, 0x79, 0x42, 0xc7, 0xdd, 0xa0, 0xcf, 0xbe, 0xaf, - 0x70, 0x9d, 0x05, 0xe3, 0x35, 0x40, 0xdd, 0x2d, 0x7b, 0x90, 0x74, 0x68, 0x52, 0xd2, 0x32, 0x41, - 0xf6, 0x12, 0xcc, 0xd5, 0x01, 0xdc, 0x81, 0x8b, 0xf2, 0x93, 0x34, 0x22, 0x7c, 0x18, 0x87, 0xcb, - 0xa1, 0xac, 0x54, 0x58, 0xff, 0xc8, 0xa7, 0xcf, 0x48, 0xdf, 0x94, 0xd0, 0xe1, 0x2b, 0x75, 0xb8, - 0xcb, 0x05, 0xdd, 0x6a, 0xea, 0x83, 0x09, 0x6d, 0xd9, 0x31, 0x0e, 0xa4, 0x76, 0x92, 0x7c, 0xf6, - 0x18, 0x4f, 0x33, 0x49, 0xbe, 0xfb, 0x0e, 0xd3, 0xd9, 0xff, 0x36, 0x01, 0x31, 0x05, 0xbf, 0xb9, - 0x8f, 0x2d, 0x1b, 0x3d, 0x0a, 0x11, 0xdc, 0xdc, 0x35, 0x87, 0xd7, 0x94, 0x78, 0x33, 0x96, 0xca, - 0xcd, 0x5d, 0x93, 0x03, 0x5f, 0x3f, 0xa6, 0x50, 0x60, 0x74, 0x15, 0xa6, 0xb6, 0xdb, 0x7d, 0x9e, - 0xe9, 0xf6, 0xf9, 0x21, 0x81, 0x75, 0x8d, 0x54, 0xbb, 0x68, 0x0c, 0x9c, 0xbc, 0x8c, 0x7e, 0x1e, - 0x34, 0x3c, 0xea, 0x65, 0xf4, 0xab, 0xa0, 0xee, 0xcb, 0x08, 0x30, 0x2a, 0x02, 0xe8, 0x86, 0x6e, - 0xab, 0x34, 0x09, 0xcc, 0xfd, 0x40, 0x2e, 0x08, 0x55, 0xb7, 0x69, 0xc2, 0xd8, 0xc5, 0x4f, 0xe8, - 0xa2, 0x8c, 0x70, 0xfc, 0xe6, 0x3e, 0xee, 0x09, 0x5f, 0x10, 0xc0, 0xf1, 0x9b, 0x48, 0xb5, 0x87, - 0x63, 0x0a, 0x4e, 0x7c, 0x27, 0xfb, 0xf6, 0x8b, 0xbd, 0xcf, 0x3f, 0x8a, 0xb6, 0x38, 0x8c, 0x4a, - 0x3f, 0xfd, 0xd2, 0xd8, 0x77, 0x91, 0x63, 0x4d, 0x56, 0x82, 0x9e, 0x74, 0xe6, 0x68, 0xc9, 0xc1, - 0x49, 0x91, 0x83, 0xcc, 0xa6, 0x68, 0x0e, 0x2e, 0x47, 0x40, 0x35, 0x48, 0xb7, 0x75, 0xcb, 0x56, - 0x2d, 0x43, 0xeb, 0x5a, 0xbb, 0xa6, 0x2d, 0x3e, 0xbf, 0x70, 0xdf, 0x30, 0x89, 0x55, 0xdd, 0xb2, - 0xeb, 0x02, 0xcc, 0xa5, 0x34, 0xdd, 0xf6, 0x96, 0x13, 0x82, 0xe6, 0xf6, 0x36, 0xee, 0x39, 0x14, - 0x69, 0x56, 0x36, 0x90, 0x60, 0x8d, 0xc0, 0x09, 0x4c, 0x0f, 0x41, 0xd3, 0x5b, 0x8e, 0xbe, 0x03, - 0x66, 0xdb, 0xa6, 0xd6, 0x72, 0xe8, 0xa9, 0xcd, 0xdd, 0xbe, 0x71, 0x8b, 0xe6, 0x70, 0x93, 0x97, - 0x2f, 0x04, 0xb0, 0x69, 0x6a, 0x2d, 0x81, 0x5c, 0x24, 0xa0, 0x2e, 0xe5, 0x99, 0xf6, 0x60, 0x1d, - 0x52, 0x61, 0x4e, 0xeb, 0x76, 0xdb, 0x07, 0x83, 0xe4, 0x33, 0x94, 0xfc, 0x83, 0xc3, 0xe4, 0xf3, - 0x04, 0x7a, 0x04, 0x7d, 0xa4, 0x0d, 0x55, 0xa2, 0x0d, 0x90, 0xbb, 0x3d, 0x4c, 0x8f, 0xe5, 0x76, - 0xf9, 0x2c, 0x84, 0x7e, 0xdf, 0x20, 0x79, 0xf9, 0xfc, 0x30, 0xf1, 0x75, 0x06, 0x29, 0xa6, 0x2b, - 0x2e, 0xe5, 0x4c, 0xd7, 0x5f, 0xc3, 0xc8, 0x9a, 0x4d, 0x4c, 0xbf, 0x06, 0xc3, 0xc9, 0xce, 0x8c, - 0x26, 0x4b, 0x21, 0x03, 0xc9, 0xfa, 0x6a, 0xd0, 0x35, 0x48, 0xb2, 0xb4, 0x95, 0x4a, 0x6c, 0x20, - 0xfd, 0xcc, 0x4e, 0xf2, 0xf2, 0xb9, 0x80, 0xe1, 0x4a, 0x81, 0x36, 0x4d, 0x1b, 0xbb, 0xc4, 0x00, - 0x3b, 0x85, 0x68, 0x0b, 0x8e, 0xd3, 0x6f, 0x44, 0x1c, 0xa8, 0x7e, 0x83, 0x9b, 0x9d, 0xe5, 0xf7, - 0x3a, 0x0f, 0x51, 0xa4, 0x1f, 0x6e, 0x3c, 0xd8, 0xf4, 0x5a, 0x5e, 0x97, 0xf4, 0xec, 0xde, 0x70, - 0x2d, 0xd1, 0xb4, 0x6d, 0xdd, 0xd0, 0xda, 0xfa, 0xcb, 0x98, 0x45, 0x27, 0xf4, 0x9b, 0x4b, 0x81, - 0x9a, 0x76, 0x8d, 0xc3, 0xd1, 0x68, 0xc5, 0xa3, 0x69, 0xdb, 0xde, 0xf2, 0x42, 0x8c, 0xcf, 0x29, - 0x9c, 0xdb, 0xd3, 0x63, 0x72, 0x9c, 0x7d, 0xe3, 0xe3, 0x46, 0x24, 0x0e, 0x72, 0x32, 0x77, 0x3f, - 0x24, 0x3d, 0x76, 0x0a, 0x65, 0x21, 0xc6, 0xbd, 0xa6, 0x38, 0x9f, 0xc0, 0x1f, 0x73, 0x69, 0x48, - 0x79, 0x4d, 0x53, 0xee, 0x5d, 0x12, 0x24, 0x3d, 0x46, 0x87, 0x60, 0x7a, 0x57, 0xb2, 0x12, 0x6e, - 0x20, 0x7a, 0x4e, 0x84, 0x0d, 0xa2, 0x9e, 0xad, 0xa6, 0xa6, 0x68, 0x21, 0x8f, 0x5a, 0xd0, 0x02, - 0x24, 0xbb, 0x97, 0xbb, 0x0e, 0x48, 0x98, 0x82, 0x40, 0xf7, 0x72, 0x57, 0x00, 0x9c, 0x85, 0x14, - 0x69, 0xba, 0xea, 0x8d, 0x87, 0x13, 0x4a, 0x92, 0x94, 0x71, 0x90, 0xdc, 0xef, 0x87, 0x40, 0x1e, - 0x34, 0x66, 0xce, 0x0a, 0x97, 0x74, 0xe4, 0x15, 0xae, 0x53, 0x83, 0x6b, 0x6b, 0xee, 0x72, 0xda, - 0x1a, 0xc8, 0xee, 0xa2, 0x10, 0xf3, 0x3d, 0x87, 0x04, 0xf8, 0x03, 0x93, 0x11, 0x25, 0xd3, 0x1c, - 0x98, 0x9d, 0xac, 0xf8, 0x36, 0x95, 0x44, 0x9c, 0x1d, 0xbc, 0x83, 0xfa, 0x24, 0x60, 0x36, 0xba, - 0x2d, 0xcd, 0xc6, 0x22, 0xa7, 0xee, 0xd9, 0x5f, 0x72, 0x1f, 0x64, 0xb4, 0x6e, 0x57, 0xb5, 0x6c, - 0xcd, 0xc6, 0xbe, 0x5d, 0x14, 0xd3, 0x5a, 0xb7, 0x4b, 0xbf, 0x1d, 0xca, 0x22, 0xb9, 0x7b, 0x21, - 0x4d, 0x2c, 0xbc, 0xae, 0xb5, 0x45, 0x98, 0x10, 0x65, 0x01, 0x1f, 0x2f, 0xe5, 0xa1, 0x46, 0x0b, - 0x52, 0x5e, 0xe3, 0xee, 0xe4, 0x5e, 0x24, 0x4f, 0xee, 0x05, 0xf1, 0x8b, 0xbd, 0x98, 0x84, 0xc4, - 0x1d, 0x6c, 0xc1, 0xab, 0x8d, 0x73, 0x34, 0x4f, 0xb3, 0xc7, 0x92, 0xab, 0x71, 0x85, 0x3d, 0xe4, - 0x6e, 0x42, 0xda, 0xef, 0x07, 0x50, 0x1a, 0x42, 0xf6, 0x3e, 0x7f, 0x4b, 0xc8, 0xde, 0x47, 0x97, - 0x3c, 0x9f, 0x55, 0x4d, 0x07, 0x79, 0x3f, 0x8e, 0xef, 0xe6, 0x46, 0xd9, 0xa5, 0x74, 0xb9, 0x0c, - 0x4c, 0xfb, 0xbc, 0x44, 0xee, 0x04, 0xcc, 0x05, 0xd9, 0xfc, 0x9c, 0x0e, 0x73, 0x41, 0xa6, 0x1b, - 0x5d, 0x85, 0xb8, 0x63, 0xf4, 0x87, 0xd2, 0x69, 0xe2, 0xed, 0x0e, 0x92, 0x03, 0xeb, 0x5b, 0x0e, - 0x0c, 0xf9, 0x96, 0x03, 0x73, 0xdf, 0x0d, 0xd9, 0x51, 0xf6, 0x7c, 0x60, 0x7d, 0x20, 0xe2, 0x08, - 0xee, 0x04, 0x44, 0xf9, 0x75, 0xb6, 0x21, 0x9a, 0x87, 0xe0, 0x4f, 0x44, 0xa0, 0xcc, 0xb6, 0x87, - 0x59, 0x7a, 0x82, 0x3e, 0xe4, 0x54, 0x38, 0x35, 0xd2, 0xa4, 0x8f, 0x5e, 0x4e, 0x67, 0x84, 0xf8, - 0x72, 0x3a, 0x7d, 0xa0, 0x5f, 0x15, 0xc7, 0x86, 0xc8, 0xf2, 0x25, 0x14, 0xfe, 0x94, 0x7b, 0x4f, - 0x18, 0x4e, 0x04, 0xdb, 0x75, 0xb4, 0x08, 0x29, 0x32, 0x3b, 0xb0, 0xfd, 0x13, 0x09, 0xe8, 0x68, - 0xfb, 0x0d, 0x3e, 0x8b, 0xe0, 0x4b, 0x91, 0x21, 0x67, 0x29, 0x12, 0x6d, 0xc2, 0x4c, 0xdb, 0x6c, - 0x6a, 0x6d, 0xd5, 0xb3, 0x14, 0xcc, 0x87, 0xd3, 0x3d, 0xa3, 0xec, 0xb4, 0x58, 0x6c, 0x20, 0x26, - 0x88, 0x0f, 0x84, 0x0c, 0x25, 0xb2, 0xea, 0x2c, 0x1b, 0xa3, 0x32, 0x24, 0x3b, 0xba, 0xb5, 0x85, - 0x77, 0xb5, 0x3d, 0xdd, 0xec, 0xf1, 0x71, 0x15, 0xa0, 0x3d, 0x6b, 0x2e, 0x90, 0x58, 0xa3, 0xf6, - 0xe0, 0x79, 0x3a, 0x65, 0x2a, 0x70, 0xed, 0x3c, 0x7a, 0x64, 0xcb, 0x32, 0x6a, 0x15, 0x3a, 0x36, - 0x72, 0x15, 0x3a, 0x68, 0xc9, 0x37, 0x1e, 0xbc, 0xe4, 0xfb, 0x0a, 0xed, 0x9c, 0x20, 0xef, 0x38, - 0xbc, 0x0a, 0x8c, 0x1a, 0x30, 0xc7, 0xf1, 0x5b, 0x3e, 0xe9, 0x0f, 0x6d, 0x4e, 0xf3, 0x07, 0x5d, - 0x1e, 0xa9, 0x23, 0x81, 0x3f, 0x5a, 0xf0, 0xe1, 0x3b, 0x14, 0xbc, 0xd8, 0x8b, 0x11, 0xf1, 0xec, - 0xc5, 0xf8, 0xdf, 0xac, 0x33, 0x7e, 0x20, 0x2c, 0x56, 0xc7, 0x3c, 0x81, 0x45, 0xe0, 0x26, 0x93, - 0x51, 0x8b, 0x39, 0xa2, 0x61, 0xe1, 0x23, 0x37, 0x8c, 0xf7, 0x76, 0x64, 0x7c, 0x6f, 0x4f, 0x7d, - 0x23, 0x7b, 0x3b, 0x7a, 0x87, 0xbd, 0xfd, 0x4d, 0xed, 0x87, 0xf7, 0x49, 0x30, 0x3f, 0x3a, 0x1c, - 0x0b, 0xec, 0x90, 0x23, 0x2d, 0x3f, 0x8e, 0xf2, 0x78, 0xf7, 0x42, 0x7a, 0x20, 0x5a, 0x64, 0xca, - 0x3c, 0xed, 0x9b, 0x8f, 0xe7, 0x7e, 0x25, 0x0c, 0x73, 0x41, 0x01, 0x5d, 0xc0, 0x88, 0x55, 0x60, - 0xb6, 0x85, 0x9b, 0x7a, 0xeb, 0x8e, 0x07, 0xec, 0x0c, 0x47, 0xff, 0x3f, 0xe3, 0x75, 0x58, 0x4f, - 0xd0, 0x05, 0x98, 0xb1, 0x0e, 0x8c, 0xa6, 0x6e, 0xec, 0xa8, 0xb6, 0x29, 0x62, 0xa3, 0x04, 0x4b, - 0x10, 0xf2, 0x8a, 0x86, 0xc9, 0xa3, 0xa3, 0x9f, 0x01, 0x88, 0x2b, 0xd8, 0xea, 0x92, 0x60, 0x0e, - 0x15, 0x21, 0x81, 0xf7, 0x9b, 0xb8, 0x6b, 0xbb, 0x39, 0xae, 0xc0, 0x39, 0x06, 0x07, 0x11, 0x78, - 0x64, 0xae, 0xed, 0xe0, 0xa1, 0x2b, 0x3c, 0xa5, 0x30, 0x32, 0x39, 0xc0, 0x42, 0x75, 0x07, 0x95, - 0xe5, 0x14, 0x1e, 0x17, 0x39, 0x85, 0xf0, 0xa8, 0x99, 0x32, 0x0f, 0xdc, 0x1d, 0x3c, 0x9e, 0x54, - 0xb8, 0xc2, 0x93, 0x0a, 0x91, 0x51, 0xaf, 0x63, 0xf1, 0xbd, 0xfb, 0x3a, 0x9d, 0xdd, 0xe5, 0xeb, - 0xcd, 0x2a, 0x44, 0x47, 0x35, 0xd5, 0x13, 0x88, 0xbb, 0x4d, 0x75, 0xd3, 0x0a, 0x8f, 0x8b, 0xb4, - 0x42, 0x6c, 0x14, 0xd3, 0x3c, 0xf2, 0x74, 0x99, 0x66, 0x79, 0x85, 0x37, 0x7a, 0xf2, 0x0a, 0x89, - 0xc1, 0x9c, 0xfc, 0x50, 0x5e, 0xc1, 0xc1, 0x76, 0x12, 0x0b, 0xcb, 0x4e, 0x62, 0x21, 0x35, 0x32, - 0x2b, 0xc1, 0x43, 0x46, 0x07, 0x59, 0x64, 0x16, 0xd6, 0x87, 0x32, 0x0b, 0x2c, 0x11, 0x70, 0xff, - 0xd8, 0xcc, 0x82, 0x43, 0x6a, 0x20, 0xb5, 0xb0, 0x3e, 0x94, 0x5a, 0x48, 0x8f, 0xa2, 0x38, 0x10, - 0x9f, 0xba, 0x14, 0xfd, 0xb9, 0x85, 0xef, 0x0c, 0xce, 0x2d, 0x8c, 0x9c, 0xfc, 0x07, 0xc4, 0xa2, - 0x0e, 0xe9, 0x80, 0xe4, 0xc2, 0x77, 0x8f, 0x48, 0x2e, 0xc8, 0xa3, 0x26, 0xc1, 0x41, 0x91, 0xa8, - 0xf3, 0x82, 0xa0, 0xec, 0xc2, 0x66, 0x40, 0x76, 0x81, 0xa5, 0x01, 0x1e, 0x98, 0x20, 0xbb, 0xe0, - 0x90, 0x1e, 0x4a, 0x2f, 0x6c, 0x06, 0xa4, 0x17, 0xd0, 0x68, 0xba, 0x03, 0x01, 0x94, 0x97, 0xae, - 0x3f, 0xbf, 0xb0, 0xe2, 0xcf, 0x2f, 0xcc, 0x1e, 0x1e, 0xb7, 0xb2, 0x30, 0xc0, 0xa1, 0xe6, 0x4d, - 0x30, 0x34, 0x47, 0x25, 0x18, 0x58, 0x0e, 0xe0, 0xe1, 0x09, 0x13, 0x0c, 0x0e, 0xed, 0xc0, 0x0c, - 0xc3, 0xfa, 0x50, 0x86, 0xe1, 0xf8, 0x28, 0x85, 0x1b, 0x70, 0x48, 0xae, 0xc2, 0x8d, 0x4c, 0x31, - 0xb0, 0x8f, 0x89, 0xb2, 0xcf, 0x88, 0x82, 0x9c, 0xbc, 0x11, 0x89, 0x27, 0xe5, 0x54, 0xee, 0x01, - 0x12, 0x02, 0x0d, 0xd8, 0x3d, 0x32, 0xe1, 0xc0, 0xbd, 0x9e, 0xd9, 0x13, 0x0b, 0xa2, 0xf4, 0x21, - 0x77, 0x1e, 0x52, 0x5e, 0x13, 0x77, 0x48, 0x3a, 0x22, 0x03, 0xd3, 0x3e, 0xab, 0x96, 0xfb, 0x0d, - 0x09, 0x52, 0x5e, 0x7b, 0xe5, 0x9b, 0xac, 0x26, 0xf8, 0x64, 0xd5, 0x93, 0xa4, 0x08, 0xf9, 0x93, - 0x14, 0x0b, 0x90, 0x24, 0x13, 0xb6, 0x81, 0xfc, 0x83, 0xd6, 0x75, 0xf2, 0x0f, 0x62, 0x17, 0x27, - 0x4b, 0x65, 0x70, 0xcf, 0xc0, 0xb6, 0x30, 0x64, 0x9c, 0x1d, 0xad, 0x3c, 0xe7, 0xff, 0x30, 0xcc, - 0x7a, 0x60, 0x9d, 0x89, 0x20, 0x9b, 0x8a, 0xcb, 0x0e, 0x74, 0x9e, 0xcf, 0x08, 0x7f, 0x47, 0x82, - 0x99, 0x21, 0x73, 0x19, 0x98, 0x63, 0x90, 0xbe, 0x51, 0x39, 0x86, 0xd0, 0x9d, 0xe7, 0x18, 0xbc, - 0x53, 0xdb, 0xb0, 0x7f, 0x6a, 0xfb, 0x15, 0x09, 0xa6, 0x7d, 0x66, 0x9b, 0x74, 0x42, 0xd3, 0x6c, - 0x89, 0xe5, 0x73, 0xfa, 0x9b, 0xc4, 0x34, 0x6d, 0x53, 0x7c, 0x05, 0x92, 0xfc, 0x24, 0x50, 0x8e, - 0x23, 0x4a, 0x70, 0x37, 0xe3, 0xcc, 0x53, 0xa7, 0xbc, 0x47, 0xd8, 0xf8, 0xb1, 0xae, 0xa8, 0x7b, - 0xac, 0xcb, 0x59, 0x35, 0x8f, 0x79, 0x56, 0xcd, 0xd1, 0x93, 0x90, 0xa0, 0x2b, 0x06, 0xaa, 0xd9, - 0xb5, 0x78, 0xfa, 0xf9, 0xae, 0x43, 0x8e, 0x74, 0x59, 0xf4, 0xc4, 0x00, 0x3b, 0x07, 0xe6, 0x46, - 0x2c, 0x09, 0x5f, 0xc4, 0x72, 0x17, 0x24, 0x08, 0xfb, 0xec, 0x93, 0xd2, 0xc0, 0x6f, 0x5d, 0x11, - 0x05, 0xb9, 0x9f, 0x0f, 0x41, 0x66, 0xc0, 0xeb, 0x04, 0x36, 0x3e, 0x68, 0xfb, 0xca, 0x64, 0x02, - 0x39, 0x03, 0xb0, 0xa3, 0x59, 0xea, 0x4b, 0x9a, 0x61, 0xe3, 0x16, 0x97, 0x8a, 0xa7, 0x04, 0xcd, - 0x43, 0x9c, 0x3c, 0xf5, 0x2d, 0xdc, 0xe2, 0xd9, 0x1c, 0xe7, 0x19, 0x55, 0x20, 0x8a, 0xf7, 0xe8, - 0x8d, 0xf4, 0xec, 0x2b, 0x60, 0x27, 0x03, 0xcc, 0x13, 0xa9, 0x2f, 0x64, 0x49, 0x77, 0x7f, 0xfe, - 0xb5, 0x05, 0x99, 0x81, 0x3f, 0xe4, 0x9c, 0xe5, 0x55, 0x38, 0x01, 0xbf, 0x18, 0xe2, 0x03, 0x62, - 0xa0, 0xa9, 0xc5, 0x94, 0xc8, 0x13, 0x10, 0xa1, 0xb2, 0xc3, 0x3d, 0xca, 0x74, 0x07, 0x77, 0xba, - 0xa6, 0xd9, 0x56, 0xd9, 0x38, 0xcf, 0x43, 0xda, 0xef, 0x64, 0xd1, 0x39, 0x98, 0xee, 0x61, 0x5b, - 0xd3, 0x0d, 0xd5, 0x17, 0x47, 0xa7, 0x58, 0x21, 0x1b, 0x57, 0xde, 0xef, 0x0d, 0xe4, 0xde, 0x04, - 0xc7, 0x03, 0x7d, 0x2c, 0x7a, 0x02, 0x12, 0xae, 0x7f, 0x66, 0x07, 0xb4, 0x0e, 0xcb, 0xd9, 0xb8, - 0xc0, 0xb9, 0x4d, 0x38, 0x1e, 0xe8, 0x64, 0xd1, 0xd3, 0x10, 0x65, 0x9b, 0xb7, 0xf9, 0x06, 0xbd, - 0x7b, 0xc7, 0x7b, 0xe7, 0x7e, 0xdb, 0x56, 0x38, 0x52, 0xee, 0x12, 0x9c, 0x1a, 0xe9, 0x65, 0xdd, - 0xcc, 0x8b, 0xe4, 0xc9, 0xbc, 0xe4, 0x7e, 0x49, 0x82, 0xf9, 0xd1, 0x9e, 0x13, 0x15, 0x06, 0x18, - 0xba, 0x30, 0xa1, 0xdf, 0xf5, 0x70, 0x45, 0xa6, 0x26, 0x3d, 0xbc, 0x8d, 0xed, 0xe6, 0x2e, 0x73, - 0xe1, 0xcc, 0x28, 0x4c, 0x2b, 0xd3, 0xbc, 0x94, 0xe2, 0x58, 0x0c, 0xec, 0x45, 0xdc, 0xb4, 0x55, - 0xd6, 0xa9, 0x16, 0x9d, 0x1e, 0x24, 0x08, 0x18, 0x29, 0xad, 0xb3, 0xc2, 0xdc, 0x83, 0x70, 0x72, - 0x84, 0x2f, 0x0e, 0xd8, 0x7b, 0xfe, 0x02, 0x01, 0x0e, 0x74, 0xb0, 0xe8, 0x19, 0x88, 0x5a, 0xb6, - 0x66, 0xf7, 0x2d, 0xde, 0xb2, 0xfb, 0xc7, 0xfa, 0xe6, 0x3a, 0x05, 0x57, 0x38, 0x5a, 0xee, 0x29, - 0x40, 0xc3, 0x9e, 0x36, 0x60, 0x1e, 0x26, 0x05, 0xcd, 0xc3, 0xb6, 0xe0, 0xf4, 0x21, 0x3e, 0x15, - 0x15, 0x07, 0x98, 0x7b, 0x70, 0x22, 0x97, 0x3c, 0xc0, 0xe0, 0x9f, 0x87, 0xe0, 0x78, 0xa0, 0x6b, - 0xf5, 0x8c, 0x52, 0xe9, 0xeb, 0x1d, 0xa5, 0x4f, 0x03, 0xd8, 0xfb, 0xe2, 0xc4, 0x01, 0xb7, 0xf6, - 0x41, 0xf3, 0x89, 0x7d, 0xdc, 0xa4, 0x06, 0x8b, 0x28, 0x46, 0xc2, 0xe6, 0xbf, 0x2c, 0xd4, 0xf0, - 0xce, 0x7d, 0xfb, 0xd4, 0x13, 0x58, 0x7c, 0x5a, 0x38, 0xb1, 0xcf, 0x70, 0x27, 0xc9, 0xac, 0xd8, - 0x42, 0x2f, 0xc0, 0xc9, 0x01, 0x8f, 0xe6, 0xd0, 0x8e, 0x4c, 0xec, 0xd8, 0x8e, 0xfb, 0x1d, 0x9b, - 0xa0, 0xed, 0xf5, 0x4a, 0x53, 0x7e, 0xaf, 0xf4, 0x02, 0x80, 0x3b, 0x09, 0x76, 0x37, 0xc7, 0x4a, - 0xde, 0xcd, 0xb1, 0x57, 0x61, 0x8a, 0x68, 0x82, 0x10, 0x55, 0x80, 0xc1, 0x20, 0x5d, 0xea, 0x99, - 0x45, 0x33, 0xf0, 0xdc, 0x8b, 0x42, 0xdb, 0xbc, 0xf9, 0xc8, 0x11, 0xef, 0x78, 0xa3, 0xff, 0x1d, - 0xb9, 0xd1, 0xa9, 0xcd, 0xe0, 0x77, 0x7d, 0x0f, 0x4c, 0xd1, 0xee, 0x0f, 0x3c, 0xef, 0xfc, 0x5d, - 0x00, 0x9a, 0x6d, 0xf7, 0xf4, 0xad, 0xbe, 0xfb, 0x86, 0xc5, 0x11, 0xfa, 0x93, 0x17, 0x80, 0x85, - 0xbb, 0xb8, 0x22, 0xcd, 0xb9, 0xb8, 0x1e, 0x65, 0xf2, 0x50, 0xcc, 0x55, 0x21, 0xed, 0xc7, 0x0d, - 0x3e, 0xc0, 0x3d, 0xfc, 0xa5, 0x6a, 0xd7, 0x91, 0xf3, 0x6b, 0xe5, 0xe8, 0x43, 0xee, 0xad, 0x21, - 0x48, 0x79, 0xb5, 0xef, 0xef, 0xa1, 0xb3, 0xcc, 0xfd, 0xa0, 0x04, 0x71, 0xa7, 0xfd, 0x87, 0x1c, - 0x0d, 0x70, 0x8f, 0xf2, 0x3b, 0xf9, 0x7a, 0xb6, 0x42, 0x12, 0x76, 0x56, 0x48, 0xde, 0xe0, 0x38, - 0x84, 0x91, 0x93, 0x79, 0xaf, 0xb4, 0xc5, 0xa6, 0x5c, 0xee, 0xa0, 0x9e, 0x9a, 0xec, 0xb4, 0xf0, - 0x1c, 0x4c, 0x79, 0x8f, 0xfa, 0xb2, 0x87, 0x9c, 0xe5, 0xd9, 0xbb, 0xc4, 0x46, 0xa3, 0x0b, 0x18, - 0xf2, 0x00, 0x0e, 0x1f, 0xf0, 0x0d, 0x8f, 0x3f, 0xe0, 0x1b, 0x19, 0x3c, 0xe0, 0xcb, 0x62, 0x80, - 0xdc, 0xff, 0x2b, 0x41, 0x5c, 0x8c, 0x12, 0xf4, 0x8c, 0x77, 0x9f, 0x9d, 0xd8, 0xb4, 0x33, 0xda, - 0x4a, 0xf1, 0xc6, 0x7b, 0xb6, 0xd9, 0x0d, 0x9d, 0x56, 0x08, 0x1f, 0xf9, 0xb4, 0x02, 0x8f, 0x4a, - 0xbe, 0x2c, 0x81, 0x3c, 0x38, 0x8a, 0xbf, 0x7e, 0xfe, 0x86, 0xbd, 0x57, 0x38, 0xc0, 0x7b, 0x8d, - 0x3a, 0x83, 0x10, 0x19, 0x75, 0x06, 0x61, 0xb8, 0xdd, 0x53, 0x77, 0xda, 0xee, 0x1f, 0x08, 0x41, - 0xd2, 0x93, 0x1d, 0x44, 0x8f, 0xf9, 0x0e, 0x34, 0x9c, 0x3d, 0x34, 0x95, 0xe8, 0x39, 0xd1, 0xe0, - 0x93, 0x54, 0xe8, 0x0e, 0x24, 0xf5, 0x8d, 0x3f, 0xe7, 0x18, 0x7c, 0xf0, 0x7e, 0x6a, 0xc4, 0xc1, - 0xfb, 0xef, 0x93, 0x20, 0xee, 0xa4, 0x62, 0x8e, 0xba, 0x9a, 0x77, 0x02, 0xa2, 0x3c, 0x12, 0x63, - 0xcb, 0x79, 0xfc, 0x29, 0x30, 0xaf, 0x3a, 0x0f, 0xf1, 0x0e, 0xb6, 0x35, 0x6a, 0x1e, 0x99, 0xbf, - 0x73, 0x9e, 0x2f, 0x6c, 0x41, 0xd2, 0xb3, 0x20, 0x8a, 0x4e, 0xc1, 0xf1, 0xe2, 0xf5, 0x72, 0xf1, - 0x59, 0xb5, 0xf1, 0xfc, 0xe0, 0x87, 0x01, 0x87, 0xaa, 0x94, 0x32, 0x7d, 0x66, 0x9f, 0x0c, 0xf2, - 0x57, 0xb1, 0x8a, 0xd0, 0x7c, 0xe4, 0xed, 0x3f, 0x7d, 0xe6, 0xd8, 0x85, 0x2f, 0x4b, 0x30, 0x1b, - 0x10, 0xf3, 0xa2, 0xb3, 0x70, 0x77, 0xed, 0xda, 0xb5, 0xb2, 0xa2, 0xd6, 0xab, 0xf9, 0xf5, 0xfa, - 0xf5, 0x5a, 0x43, 0x55, 0xca, 0xf5, 0x8d, 0x55, 0xef, 0x87, 0xf5, 0x16, 0xe1, 0xae, 0x60, 0x90, - 0x7c, 0xb1, 0x58, 0x5e, 0x6f, 0xb0, 0x0f, 0xd8, 0x8f, 0x80, 0x28, 0xd0, 0xaf, 0xfd, 0x8c, 0x26, - 0xa1, 0x94, 0x6f, 0x94, 0x8b, 0x0d, 0x39, 0x8c, 0xee, 0x87, 0x73, 0x87, 0x41, 0xf0, 0xcf, 0xfd, - 0xc9, 0x91, 0xb1, 0x80, 0xf5, 0x72, 0xb5, 0x54, 0x56, 0xe4, 0x29, 0xde, 0xee, 0x0f, 0x84, 0x20, - 0x3b, 0x2a, 0xb4, 0x26, 0xb4, 0xf2, 0xeb, 0xeb, 0xab, 0x37, 0x5d, 0x5a, 0xc5, 0xeb, 0x1b, 0xd5, - 0x67, 0x87, 0x45, 0x70, 0x1f, 0xe4, 0x0e, 0x03, 0x74, 0x04, 0x71, 0x2f, 0x9c, 0x3d, 0x14, 0x8e, - 0x8b, 0x63, 0x0c, 0x98, 0x52, 0x6e, 0x28, 0x37, 0xe5, 0x30, 0x5a, 0x82, 0x0b, 0x63, 0xc1, 0x9c, - 0x3a, 0x39, 0x82, 0x2e, 0xc2, 0x83, 0x87, 0xc3, 0x33, 0x01, 0x09, 0x04, 0x21, 0xa2, 0x57, 0x24, - 0x38, 0x1e, 0x18, 0xa3, 0xa3, 0x73, 0xb0, 0xb0, 0xae, 0xd4, 0x8a, 0xe5, 0x7a, 0xdd, 0x39, 0xce, - 0xa0, 0xd6, 0x1b, 0xf9, 0xc6, 0x46, 0xdd, 0x23, 0x9b, 0x1c, 0x9c, 0x19, 0x05, 0xe4, 0xc8, 0xe5, - 0x10, 0x18, 0xae, 0x01, 0x42, 0x4f, 0x6f, 0x4b, 0x70, 0x6a, 0x64, 0x4c, 0x8e, 0xce, 0xc3, 0x3d, - 0xec, 0xdb, 0x93, 0xea, 0x66, 0xad, 0x51, 0x56, 0xcb, 0xcf, 0x37, 0xca, 0xd5, 0x7a, 0xa5, 0x56, - 0x1d, 0xe6, 0xea, 0x7e, 0x38, 0x77, 0x28, 0xa4, 0xc3, 0xda, 0x38, 0xc0, 0x01, 0xfe, 0xde, 0x26, - 0x41, 0x66, 0xc0, 0x16, 0xd2, 0x4f, 0x5c, 0x56, 0xea, 0x85, 0xf2, 0xf5, 0xfc, 0x66, 0xa5, 0xa6, - 0x0c, 0x8e, 0xd9, 0x73, 0xb0, 0x30, 0x54, 0x5b, 0xda, 0x58, 0x5f, 0xad, 0x14, 0xf3, 0x8d, 0xb2, - 0xca, 0xce, 0xa0, 0x90, 0x86, 0x0d, 0x01, 0xad, 0x56, 0x56, 0xae, 0x37, 0xd4, 0xe2, 0x6a, 0xa5, - 0x5c, 0x6d, 0xa8, 0xf9, 0x46, 0x23, 0xef, 0x0e, 0xe7, 0xc2, 0xb3, 0x23, 0xf7, 0x7e, 0x5e, 0x9a, - 0x7c, 0xef, 0x27, 0xdf, 0xdd, 0xe9, 0x6c, 0xfd, 0xfc, 0xd3, 0x8b, 0x70, 0x0f, 0xbf, 0x15, 0xc9, - 0xb2, 0xb5, 0x5b, 0xba, 0xb1, 0xe3, 0x5c, 0x9d, 0xc5, 0x9f, 0xf9, 0x16, 0xd0, 0x13, 0xfc, 0xe6, - 0x25, 0x51, 0x3a, 0xe6, 0x02, 0xad, 0x91, 0xf7, 0xae, 0x8e, 0x3d, 0x3a, 0x30, 0x6e, 0x83, 0xe7, - 0x61, 0x97, 0x73, 0x8d, 0xb9, 0x02, 0x2c, 0xe0, 0xf2, 0xae, 0xf9, 0xc3, 0xaf, 0x72, 0x98, 0x3f, - 0x74, 0x5f, 0x6c, 0xee, 0xdd, 0x12, 0xa4, 0xaf, 0xeb, 0x96, 0x6d, 0xf6, 0xf4, 0xa6, 0xd6, 0xa6, - 0x81, 0xc4, 0x1b, 0x26, 0x3e, 0xeb, 0x56, 0x48, 0x10, 0x37, 0xc6, 0xaf, 0xf8, 0xda, 0x15, 0xc7, - 0xcd, 0xa2, 0x7b, 0x5a, 0x9b, 0x9d, 0x33, 0xf3, 0xde, 0x11, 0x38, 0x28, 0x76, 0x8f, 0x7f, 0xf5, - 0x52, 0x61, 0xb8, 0xb9, 0x1f, 0x0f, 0x41, 0x86, 0x4e, 0x75, 0x2c, 0x3a, 0x35, 0xa6, 0x93, 0xaf, - 0x1b, 0x10, 0xe9, 0x69, 0x36, 0x9f, 0x90, 0x14, 0xae, 0x1e, 0xf9, 0xba, 0x2d, 0xf6, 0x06, 0x4a, - 0x03, 0xbd, 0x09, 0xe2, 0x1d, 0x6d, 0x5f, 0xa5, 0xf4, 0x42, 0x5f, 0x17, 0xbd, 0x58, 0x47, 0xdb, - 0x27, 0xfc, 0xa1, 0xef, 0xa2, 0x9f, 0xf3, 0x54, 0x9b, 0xbb, 0x9a, 0xb1, 0x83, 0x19, 0xe5, 0xf0, - 0xd7, 0x45, 0x79, 0xba, 0xa3, 0xed, 0x17, 0x29, 0x35, 0x42, 0x9f, 0xdf, 0x64, 0xf6, 0x5b, 0x12, - 0x9f, 0x67, 0x52, 0xc1, 0x20, 0x0d, 0xe4, 0xa6, 0xf3, 0x44, 0x5f, 0x2a, 0xd2, 0xb7, 0xf7, 0x8f, - 0x92, 0xfb, 0x80, 0x58, 0x0b, 0xd3, 0x84, 0xbd, 0x4f, 0xbd, 0xb6, 0x20, 0xb1, 0xb7, 0x66, 0x9a, - 0x43, 0x62, 0x4f, 0xb2, 0xf9, 0xb3, 0x4a, 0x63, 0x9b, 0xd0, 0xd8, 0xd8, 0x66, 0x5a, 0xc4, 0x36, - 0x8c, 0x20, 0x30, 0x6c, 0x52, 0xcf, 0xdb, 0xf0, 0x11, 0x09, 0x92, 0x25, 0xcf, 0x7d, 0xa6, 0x59, - 0x88, 0x75, 0x4c, 0x43, 0xbf, 0x85, 0x7b, 0x4e, 0xfe, 0x9d, 0x3d, 0x92, 0xf8, 0x83, 0x7d, 0x3c, - 0xdf, 0x3e, 0x10, 0xf7, 0xaa, 0x88, 0x67, 0x82, 0xf5, 0x12, 0xde, 0xb2, 0x74, 0x21, 0x67, 0x45, - 0x3c, 0xa2, 0x07, 0x40, 0xb6, 0x70, 0xb3, 0xdf, 0xd3, 0xed, 0x03, 0xb5, 0x69, 0x1a, 0xb6, 0xd6, - 0xb4, 0x79, 0x88, 0x9f, 0x11, 0xe5, 0x45, 0x56, 0x4c, 0x88, 0xb4, 0xb0, 0xad, 0xe9, 0x6d, 0xb6, - 0x85, 0x2d, 0xa1, 0x88, 0x47, 0xce, 0xea, 0xed, 0x98, 0x77, 0xd2, 0x52, 0x04, 0xd9, 0xec, 0xe2, - 0x9e, 0x6f, 0xad, 0x9e, 0x69, 0x63, 0xf6, 0x0f, 0x3f, 0xfe, 0xf0, 0x1c, 0x17, 0x38, 0x5f, 0xe5, - 0x65, 0x07, 0xb3, 0x94, 0x8c, 0xc0, 0x10, 0x8b, 0xbf, 0x37, 0x7d, 0x19, 0xf7, 0xfe, 0x96, 0x7b, - 0x2d, 0xd2, 0xdc, 0x90, 0x50, 0xf3, 0xc6, 0x41, 0x21, 0xfb, 0x49, 0x97, 0x34, 0x4f, 0x29, 0xaf, - 0xd3, 0x89, 0x8a, 0x37, 0xfb, 0x4e, 0xc9, 0x90, 0xd0, 0xee, 0x45, 0x4d, 0x6f, 0xe3, 0x16, 0x9f, - 0x05, 0xf3, 0x27, 0xb4, 0xec, 0x64, 0x94, 0xd8, 0x37, 0x6a, 0x73, 0xa3, 0x74, 0xa3, 0x60, 0x1a, - 0x2d, 0x7f, 0x22, 0x09, 0x15, 0x21, 0x6a, 0x9b, 0xb7, 0xb0, 0xc1, 0x05, 0x74, 0xb4, 0x1b, 0xf3, - 0x38, 0x2a, 0xfa, 0x0e, 0x90, 0x5b, 0xb8, 0x8d, 0x77, 0xd8, 0x19, 0xd4, 0x5d, 0xad, 0x87, 0xd9, - 0x65, 0x08, 0x77, 0x74, 0x6b, 0x5e, 0xc6, 0x21, 0x55, 0xa7, 0x94, 0xd0, 0xba, 0xff, 0xc6, 0xdc, - 0x98, 0xb3, 0x58, 0x1c, 0xd8, 0x46, 0x8f, 0xe6, 0x79, 0x2d, 0x8f, 0xef, 0x86, 0xdd, 0x07, 0x40, - 0xee, 0x1b, 0x5b, 0xa6, 0x41, 0x3f, 0xb8, 0xca, 0xa3, 0xeb, 0x38, 0x5b, 0x85, 0x71, 0xca, 0xf9, - 0x2a, 0xcc, 0x3a, 0xa4, 0x5d, 0x50, 0x3a, 0x42, 0x12, 0x47, 0x1d, 0x21, 0xd3, 0x0e, 0x01, 0x02, - 0x82, 0xd6, 0x00, 0xdc, 0x31, 0x48, 0xd7, 0x00, 0x92, 0xa3, 0x7b, 0xcc, 0x1d, 0xcd, 0xde, 0xc6, - 0x78, 0x08, 0x20, 0x03, 0x66, 0x3b, 0xba, 0xa1, 0x5a, 0xb8, 0xbd, 0xad, 0x72, 0xc9, 0x11, 0xba, - 0x49, 0x2a, 0xfe, 0x37, 0x1e, 0xa1, 0x37, 0xff, 0xf8, 0xe3, 0x0f, 0x67, 0xdc, 0x7b, 0x07, 0x17, - 0x1f, 0x59, 0xba, 0x72, 0x55, 0x99, 0xe9, 0xe8, 0x46, 0x1d, 0xb7, 0xb7, 0x4b, 0x0e, 0x61, 0xf4, - 0x06, 0x38, 0xed, 0x0a, 0xc4, 0x34, 0xd4, 0x5d, 0xb3, 0xdd, 0x52, 0x7b, 0x78, 0x5b, 0x6d, 0xd2, - 0x1b, 0x1d, 0x53, 0x54, 0x8c, 0x27, 0x1d, 0x90, 0x9a, 0x71, 0xdd, 0x6c, 0xb7, 0x14, 0xbc, 0x5d, - 0x24, 0xd5, 0xe8, 0x1c, 0xb8, 0xd2, 0x50, 0xf5, 0x96, 0x95, 0x9d, 0x5e, 0x0c, 0x9f, 0x8f, 0x28, - 0x29, 0xa7, 0xb0, 0xd2, 0xb2, 0x96, 0xe3, 0x6f, 0xff, 0xc0, 0xc2, 0xb1, 0xd7, 0x3f, 0xb0, 0x70, - 0x2c, 0x77, 0x8d, 0x5e, 0x9c, 0xc6, 0x87, 0x16, 0xb6, 0xd0, 0x55, 0x48, 0x68, 0xe2, 0x81, 0x9d, - 0x65, 0x3a, 0x64, 0x68, 0xba, 0xa0, 0xb9, 0x8f, 0x4a, 0x10, 0x2d, 0x6d, 0xae, 0x6b, 0x7a, 0x0f, - 0x95, 0x61, 0xc6, 0xd5, 0xd5, 0x49, 0x47, 0xb9, 0xab, 0xde, 0x62, 0x98, 0x57, 0x47, 0x6d, 0xec, - 0x49, 0x14, 0xce, 0xfe, 0xe1, 0xc7, 0x1f, 0xbe, 0x9b, 0x93, 0xd9, 0x1c, 0xd8, 0xe3, 0x23, 0xe8, - 0x0d, 0xee, 0xfd, 0xf1, 0xb4, 0xf9, 0x06, 0xc4, 0x18, 0xab, 0x16, 0x7a, 0x06, 0xa6, 0xba, 0xe4, - 0x07, 0x4f, 0xe5, 0x9e, 0x19, 0xa9, 0xf3, 0x14, 0xde, 0xab, 0x21, 0x0c, 0x2f, 0xf7, 0x8e, 0x10, - 0x40, 0x69, 0x73, 0xb3, 0xd1, 0xd3, 0xbb, 0x6d, 0x6c, 0x7f, 0xa3, 0xda, 0xbe, 0x01, 0xc7, 0x3d, - 0x47, 0xce, 0x7b, 0xcd, 0xa3, 0xb7, 0x7f, 0xd6, 0x3d, 0x7c, 0xde, 0x6b, 0x06, 0x92, 0x6d, 0x59, - 0xb6, 0x43, 0x36, 0x7c, 0x74, 0xb2, 0x25, 0xcb, 0x1e, 0x96, 0xec, 0xf3, 0x90, 0x74, 0x85, 0x61, - 0xa1, 0x0a, 0xc4, 0x6d, 0xfe, 0x9b, 0x0b, 0x38, 0x37, 0x5a, 0xc0, 0x02, 0xcd, 0x2b, 0x64, 0x07, - 0x3d, 0xf7, 0x15, 0x09, 0xc0, 0x33, 0x46, 0xbe, 0x35, 0x75, 0x0c, 0x55, 0x20, 0xca, 0x8d, 0x73, - 0xf8, 0x8e, 0xef, 0x5d, 0x65, 0x04, 0x3c, 0x42, 0x7d, 0x67, 0x08, 0x66, 0x37, 0xc4, 0xe8, 0xfd, - 0xd6, 0x97, 0xc1, 0x06, 0xc4, 0xb0, 0x61, 0xf7, 0x74, 0x67, 0x29, 0xe2, 0x91, 0x51, 0x7d, 0x1e, - 0xd0, 0xa8, 0xb2, 0x61, 0xf7, 0x0e, 0xbc, 0x1a, 0x20, 0x68, 0x79, 0xe4, 0xf1, 0xde, 0x30, 0x64, - 0x47, 0xa1, 0xa2, 0xfb, 0x21, 0xd3, 0xec, 0x61, 0x5a, 0xe0, 0x3f, 0x5a, 0x97, 0x16, 0xc5, 0xdc, - 0xed, 0x28, 0x40, 0x02, 0x35, 0xa2, 0x5c, 0x04, 0xf4, 0xce, 0x22, 0xb3, 0xb4, 0x4b, 0x81, 0x3a, - 0x9e, 0x06, 0x64, 0xc4, 0x7e, 0xfd, 0x2d, 0xad, 0xad, 0x19, 0x4d, 0x11, 0xc1, 0x1e, 0xc9, 0xe7, - 0x8b, 0x3d, 0xff, 0x05, 0x46, 0x02, 0x95, 0x21, 0x26, 0xa8, 0x45, 0x8e, 0x4e, 0x4d, 0xe0, 0xa2, - 0xb3, 0x90, 0xf2, 0x3a, 0x06, 0x1a, 0x8d, 0x44, 0x94, 0xa4, 0xc7, 0x2f, 0x8c, 0xf3, 0x3c, 0xd1, - 0x43, 0x3d, 0x0f, 0x0f, 0xf8, 0x7e, 0x2a, 0x0c, 0x33, 0x0a, 0x6e, 0xfd, 0xdd, 0xef, 0x96, 0x75, - 0x00, 0x36, 0x54, 0x89, 0x25, 0xe5, 0x3d, 0x73, 0x07, 0xe3, 0x3d, 0xc1, 0x88, 0x94, 0x2c, 0xfb, - 0x6f, 0xab, 0x87, 0xfe, 0x63, 0x08, 0x52, 0xde, 0x1e, 0xfa, 0x7b, 0xe9, 0xb4, 0x50, 0xd5, 0x35, - 0x53, 0xec, 0xc4, 0xc1, 0x03, 0xa3, 0xcc, 0xd4, 0x90, 0x36, 0x8f, 0xb1, 0x4f, 0xef, 0x0b, 0x43, - 0x94, 0xef, 0xe6, 0xa9, 0x0d, 0xc5, 0xb6, 0x63, 0xcf, 0x55, 0x4f, 0x8b, 0xa3, 0xe9, 0x81, 0xa1, - 0xed, 0xbd, 0x90, 0x26, 0x73, 0x64, 0xdf, 0x16, 0x21, 0xe9, 0xfc, 0x34, 0x9d, 0xea, 0xba, 0xdb, - 0x69, 0xd1, 0x02, 0x24, 0x09, 0x98, 0x6b, 0x87, 0x09, 0x0c, 0x74, 0xb4, 0xfd, 0x32, 0x2b, 0x41, - 0x0f, 0x03, 0xda, 0x75, 0x92, 0x16, 0xaa, 0x2b, 0x08, 0x02, 0x37, 0xe3, 0xd6, 0x08, 0xf0, 0xbb, - 0x01, 0x08, 0x17, 0x2a, 0xbb, 0x6a, 0x9c, 0x5f, 0xe4, 0x4e, 0x4a, 0x4a, 0xf4, 0xba, 0xf1, 0xb7, - 0x49, 0x2c, 0x44, 0x1e, 0x98, 0x49, 0xf3, 0x19, 0x4a, 0x63, 0x82, 0x41, 0xf1, 0xd7, 0xaf, 0x2d, - 0xcc, 0x1f, 0x68, 0x9d, 0xf6, 0x72, 0x2e, 0x80, 0x4e, 0x2e, 0x68, 0x72, 0x4f, 0x02, 0x67, 0xff, - 0x4c, 0x7c, 0xf9, 0x1e, 0xa2, 0xde, 0xaf, 0x7c, 0xf6, 0x63, 0x17, 0x4e, 0x7b, 0x6e, 0xf7, 0xde, - 0x77, 0x92, 0x5a, 0xac, 0x4f, 0x48, 0xa4, 0x8a, 0x5c, 0xaf, 0xe1, 0xd9, 0xc7, 0x05, 0x9e, 0xe0, - 0x5e, 0x3a, 0x7c, 0xd2, 0xe0, 0xe2, 0xfb, 0x26, 0x0d, 0x9e, 0x31, 0xf5, 0x46, 0xd7, 0x68, 0xbb, - 0xb7, 0x17, 0x0d, 0xdd, 0x3d, 0xbf, 0x54, 0x34, 0x75, 0x1f, 0x09, 0x81, 0x44, 0x87, 0xea, 0xb1, - 0xdc, 0xbf, 0x91, 0xe0, 0xd4, 0x90, 0xfa, 0x39, 0x2c, 0x37, 0x01, 0xf5, 0x3c, 0x95, 0xb4, 0x1b, - 0xc5, 0xe5, 0xb9, 0x77, 0xa6, 0xcd, 0x33, 0xbd, 0x21, 0xcb, 0xfd, 0x8d, 0xf1, 0x3e, 0xdc, 0xf4, - 0xfc, 0x9e, 0x04, 0x73, 0x5e, 0x06, 0x9c, 0xa6, 0xd4, 0x21, 0xe5, 0x7d, 0x35, 0x6f, 0xc4, 0x3d, - 0x93, 0x34, 0xc2, 0xcb, 0xbf, 0x8f, 0x08, 0xda, 0x74, 0x87, 0x38, 0x4b, 0xa5, 0x5d, 0x9a, 0x58, - 0x28, 0x82, 0xb1, 0xc0, 0xa1, 0xce, 0xfa, 0xe6, 0x0b, 0x12, 0x44, 0xd6, 0x4d, 0xb3, 0x8d, 0xde, - 0x0c, 0x33, 0x86, 0x69, 0xab, 0x64, 0x38, 0xe0, 0x96, 0xca, 0xe7, 0xfa, 0xcc, 0x7c, 0x96, 0x0f, - 0x95, 0xd5, 0xe7, 0x5f, 0x5b, 0x18, 0xc6, 0x0c, 0xba, 0xfd, 0x3f, 0x63, 0x98, 0x76, 0x81, 0x02, - 0x35, 0x58, 0x3a, 0x60, 0x1b, 0xa6, 0xfd, 0xaf, 0x63, 0x26, 0x36, 0x3f, 0xee, 0x75, 0xd3, 0x63, - 0x5f, 0x95, 0xda, 0xf2, 0xbc, 0x87, 0xdd, 0x16, 0xfe, 0x97, 0xec, 0x32, 0x0a, 0x79, 0x73, 0x70, - 0xa3, 0xc8, 0x35, 0x88, 0x89, 0x8d, 0x21, 0xd2, 0xa4, 0x9b, 0x4e, 0xbc, 0xf2, 0xe4, 0xc8, 0x17, - 0x7e, 0x5d, 0x02, 0x70, 0x13, 0x27, 0xe8, 0x21, 0x38, 0x59, 0xa8, 0x55, 0x4b, 0x6e, 0x72, 0xdf, - 0xf3, 0x59, 0x1d, 0x71, 0xc7, 0x93, 0xd5, 0xc5, 0x4d, 0x7d, 0x5b, 0xc7, 0x2d, 0x74, 0x1f, 0xcc, - 0xf9, 0xa1, 0xc9, 0x53, 0xb9, 0x24, 0x4b, 0xf3, 0xa9, 0x57, 0x6e, 0x2f, 0xc6, 0x59, 0xa0, 0x88, - 0x5b, 0xe8, 0x3c, 0x1c, 0x1f, 0x86, 0xab, 0x54, 0x57, 0xe4, 0xd0, 0xfc, 0xf4, 0x2b, 0xb7, 0x17, - 0x13, 0x4e, 0x44, 0x89, 0x72, 0x80, 0xbc, 0x90, 0x9c, 0x5e, 0x78, 0x1e, 0x5e, 0xb9, 0xbd, 0x18, - 0x65, 0xdd, 0xc0, 0x57, 0x05, 0xbe, 0x13, 0xa0, 0x62, 0x6c, 0xf7, 0xb4, 0x26, 0x55, 0xb7, 0x79, - 0x38, 0x51, 0xa9, 0x5e, 0x53, 0xf2, 0xc5, 0x46, 0xa5, 0x56, 0x1d, 0xf8, 0x1a, 0x90, 0xbf, 0xae, - 0x54, 0xdb, 0x28, 0xac, 0x96, 0xd5, 0x7a, 0x65, 0xa5, 0xca, 0x96, 0xf0, 0x7c, 0x75, 0xcf, 0x55, - 0x1b, 0x95, 0xb5, 0xb2, 0x1c, 0x2a, 0x5c, 0x1b, 0x99, 0xed, 0x7f, 0xe8, 0xd0, 0x0f, 0x1a, 0xb8, - 0x26, 0xcf, 0xf7, 0x69, 0x83, 0xff, 0x19, 0x00, 0x00, 0xff, 0xff, 0x78, 0x9b, 0x4c, 0x7d, 0xfd, - 0xb7, 0x00, 0x00, + 0x5c, 0x82, 0x91, 0xa3, 0x4c, 0x77, 0xfb, 0xb6, 0xb8, 0xe8, 0x4c, 0x13, 0xe8, 0x04, 0x44, 0xd9, + 0xeb, 0x3e, 0xfc, 0xb4, 0x1e, 0x4f, 0xe5, 0x8a, 0x10, 0xa3, 0xb4, 0x6b, 0x5d, 0xe7, 0xd5, 0x3d, + 0xc9, 0xf3, 0xea, 0x1e, 0x27, 0x1f, 0x72, 0xb9, 0x45, 0x10, 0x69, 0x69, 0xb6, 0xc6, 0x1b, 0x4e, + 0x7f, 0xe7, 0x9e, 0x81, 0x38, 0x27, 0x62, 0xa1, 0x47, 0x21, 0x6c, 0x76, 0xc5, 0x61, 0xd4, 0xd3, + 0x23, 0xdb, 0x52, 0xeb, 0x16, 0x22, 0x44, 0x9f, 0x14, 0x02, 0x5d, 0x58, 0x1b, 0xa9, 0x1a, 0x8f, + 0xfa, 0x54, 0x43, 0x74, 0xbb, 0xf8, 0xa1, 0x75, 0xf5, 0x8b, 0xc3, 0xca, 0xe0, 0xe8, 0xca, 0xab, + 0x21, 0xb8, 0x3b, 0x40, 0x57, 0x6e, 0xe1, 0x03, 0xeb, 0xc8, 0xaa, 0xb2, 0x07, 0x89, 0x75, 0xfa, + 0x2e, 0xf0, 0xb3, 0xf8, 0x00, 0xcd, 0x43, 0x0c, 0xb7, 0x96, 0x1f, 0x7b, 0xec, 0xd2, 0x93, 0xac, + 0x23, 0xaf, 0x1f, 0x53, 0x44, 0x06, 0x3a, 0x03, 0x09, 0x0b, 0x37, 0xbb, 0xcb, 0x8f, 0x5d, 0xb9, + 0x75, 0x89, 0x09, 0xee, 0xfa, 0x31, 0xc5, 0xcd, 0x42, 0x77, 0x41, 0x7c, 0xab, 0x6d, 0x5d, 0x5a, + 0x7e, 0xf4, 0x89, 0x4b, 0x4c, 0x88, 0xd7, 0x8f, 0x29, 0x4e, 0xce, 0x4a, 0x9c, 0x0c, 0xe7, 0xd7, + 0x3f, 0xb0, 0x20, 0x15, 0xa6, 0x20, 0x6c, 0xf5, 0x3b, 0x5f, 0x2f, 0xd1, 0xfc, 0x5a, 0x0c, 0xce, + 0x3a, 0xc5, 0xcc, 0x60, 0xef, 0x2d, 0x5f, 0xe4, 0xb7, 0x5d, 0x9c, 0x97, 0xa6, 0x67, 0x1c, 0xf1, + 0x50, 0x90, 0xa5, 0xbd, 0xe5, 0xf9, 0xc3, 0x05, 0x3a, 0x42, 0x78, 0x1f, 0x93, 0x20, 0xb5, 0x29, + 0x68, 0xd7, 0xb1, 0x8d, 0xde, 0x00, 0xe0, 0xd4, 0x25, 0x94, 0xe5, 0xae, 0xa5, 0xa1, 0xda, 0x96, + 0x1c, 0x24, 0xc5, 0x03, 0x8f, 0x9e, 0x80, 0x78, 0xb7, 0x67, 0x76, 0x4d, 0x8b, 0xbf, 0x05, 0x36, + 0x0e, 0xd7, 0x81, 0x46, 0x0f, 0x01, 0xa2, 0x43, 0x5b, 0xdd, 0x33, 0x6d, 0xdd, 0xd8, 0x51, 0xbb, + 0xe6, 0x4b, 0xfc, 0x95, 0xc6, 0xb0, 0x22, 0xd3, 0x92, 0x4d, 0x5a, 0xb0, 0x4e, 0xf2, 0x73, 0xff, + 0x5d, 0x82, 0x84, 0x43, 0x85, 0xac, 0x29, 0xb5, 0x56, 0xab, 0x87, 0x2d, 0x8b, 0x8f, 0x5e, 0x91, + 0x44, 0x2b, 0x10, 0xeb, 0xf6, 0xb7, 0x54, 0x31, 0x52, 0x92, 0xcb, 0x77, 0x07, 0xea, 0xbd, 0x50, + 0x1f, 0x7a, 0x81, 0x38, 0xda, 0xed, 0x6f, 0x11, 0x55, 0x3a, 0x0b, 0xa9, 0x00, 0x5e, 0x92, 0x7b, + 0x2e, 0x1b, 0xf4, 0xad, 0x6a, 0xde, 0x00, 0xb5, 0xdb, 0xd3, 0xcd, 0x9e, 0x6e, 0x1f, 0xd0, 0x33, + 0x9b, 0x61, 0x45, 0x16, 0x05, 0xeb, 0x3c, 0x1f, 0xe5, 0x60, 0x9a, 0xf3, 0xa2, 0x6e, 0x1d, 0xd8, + 0xfc, 0x3c, 0x72, 0x4a, 0x49, 0xb2, 0xea, 0x0a, 0x24, 0x0b, 0x2d, 0x42, 0x4a, 0xc0, 0x38, 0x2f, + 0x86, 0x24, 0x14, 0x60, 0x20, 0x64, 0xe9, 0x94, 0x6b, 0x43, 0xa6, 0x4e, 0x97, 0x19, 0x6e, 0xf3, + 0xaf, 0xb8, 0x8d, 0x94, 0x26, 0x68, 0xe4, 0xc8, 0x06, 0x86, 0x86, 0x1a, 0x78, 0xe1, 0x8f, 0x24, + 0x48, 0x16, 0xda, 0x66, 0xf3, 0x56, 0xa5, 0x74, 0xb5, 0xad, 0xed, 0xa0, 0x4b, 0x70, 0xbc, 0xb0, + 0x5a, 0x2b, 0x3e, 0xab, 0x56, 0x4a, 0xea, 0xd5, 0xd5, 0xbc, 0xe7, 0x66, 0xc2, 0xfc, 0x89, 0x57, + 0x6e, 0x2f, 0x22, 0x0f, 0xec, 0x86, 0x41, 0x97, 0xd5, 0xe8, 0x22, 0xcc, 0xf9, 0x51, 0xf2, 0x85, + 0x7a, 0xb9, 0xda, 0x90, 0xa5, 0xf9, 0xe3, 0xaf, 0xdc, 0x5e, 0x9c, 0xf1, 0x60, 0xe4, 0xb7, 0x2c, + 0x6c, 0xd8, 0xc3, 0x08, 0xc5, 0xda, 0xda, 0x5a, 0xa5, 0x21, 0x87, 0x86, 0x10, 0x8a, 0x66, 0xa7, + 0xa3, 0xdb, 0xe8, 0x01, 0x98, 0xf1, 0x23, 0x54, 0x2b, 0xab, 0x72, 0x78, 0x1e, 0xbd, 0x72, 0x7b, + 0x31, 0xed, 0x81, 0xae, 0xea, 0xed, 0xf9, 0xf8, 0xdb, 0x7f, 0xe2, 0xcc, 0xb1, 0x0f, 0xff, 0x7f, + 0x67, 0xa4, 0xc2, 0xea, 0xc8, 0xd1, 0xbb, 0x3c, 0xf9, 0xe8, 0x15, 0xc3, 0xd3, 0x19, 0xbc, 0xef, + 0x0b, 0xc1, 0x82, 0x53, 0xba, 0x87, 0x7b, 0x96, 0x6e, 0x1a, 0x64, 0x1c, 0x32, 0xd5, 0x77, 0x5c, + 0x29, 0xde, 0x39, 0x1c, 0x60, 0xb4, 0x69, 0x7b, 0x1a, 0xc2, 0xf9, 0x6e, 0x17, 0xcd, 0xd3, 0x51, + 0x65, 0x9b, 0x4d, 0x93, 0x4d, 0x83, 0x11, 0xc5, 0x49, 0x93, 0x32, 0xcb, 0xdc, 0xb6, 0x5f, 0xd2, + 0x7a, 0xce, 0xcb, 0xa0, 0x22, 0x9d, 0x7b, 0x12, 0x12, 0x45, 0xd3, 0xb0, 0xb0, 0x61, 0xf5, 0x69, + 0x78, 0x65, 0x8b, 0x08, 0x83, 0x53, 0x60, 0x09, 0x32, 0x8d, 0x68, 0xdd, 0x2e, 0xc5, 0x8c, 0x28, + 0xe4, 0x27, 0x73, 0x5b, 0x0a, 0xd5, 0x91, 0xe2, 0xb9, 0x3c, 0xb9, 0x78, 0x5c, 0x01, 0x38, 0x02, + 0xfa, 0xd4, 0x19, 0x8f, 0xe1, 0x77, 0xac, 0x9b, 0x57, 0x3c, 0x01, 0x96, 0x6d, 0x8c, 0x5b, 0x31, + 0x3f, 0xde, 0x5e, 0xce, 0x8f, 0xeb, 0x95, 0x11, 0xbe, 0xec, 0xb8, 0x60, 0x57, 0xee, 0x49, 0x98, + 0x5e, 0xd7, 0x7a, 0x76, 0x1d, 0xdb, 0xd7, 0xb1, 0xd6, 0xc2, 0x3d, 0xbf, 0xbf, 0x32, 0x2d, 0xfc, + 0x15, 0x04, 0x11, 0xea, 0x94, 0xb0, 0xe9, 0x9a, 0xfe, 0xce, 0xe9, 0x10, 0xa1, 0xf7, 0x53, 0x1d, + 0x5f, 0x86, 0x63, 0x30, 0x5f, 0x86, 0x74, 0x17, 0xb5, 0x12, 0x3c, 0x5c, 0x4a, 0x13, 0xe8, 0x31, + 0xe1, 0x91, 0x84, 0xc7, 0x78, 0x24, 0x7c, 0x0e, 0xe7, 0x7e, 0x49, 0x07, 0x62, 0x7c, 0x20, 0x38, + 0x9c, 0x48, 0x2e, 0x27, 0xa8, 0x0a, 0x99, 0xae, 0xd6, 0xb3, 0xe9, 0x73, 0x57, 0xbb, 0xb4, 0x19, + 0xdc, 0x5a, 0x2e, 0x06, 0x18, 0x6f, 0x5f, 0x73, 0x79, 0x35, 0xd3, 0x5d, 0x6f, 0x66, 0xee, 0xf5, + 0x08, 0x44, 0xb9, 0x38, 0xde, 0x08, 0x31, 0x2e, 0x70, 0x6e, 0x9b, 0xce, 0x2c, 0x05, 0xa8, 0xff, + 0x92, 0xa3, 0xa6, 0x9c, 0xa0, 0x40, 0x42, 0xf7, 0x41, 0xbc, 0xb9, 0xab, 0xe9, 0x86, 0xaa, 0xb7, + 0xb8, 0x47, 0x9e, 0xfc, 0xd4, 0x6b, 0x0b, 0xb1, 0x22, 0xc9, 0xab, 0x94, 0x94, 0x18, 0x2d, 0xac, + 0xb4, 0x88, 0x17, 0xb5, 0x8b, 0xf5, 0x9d, 0x5d, 0x9b, 0x9b, 0x69, 0x9e, 0x42, 0x4f, 0x40, 0x84, + 0x74, 0x19, 0xbf, 0x45, 0x32, 0x3f, 0xb4, 0xd4, 0x72, 0xa2, 0x85, 0x85, 0x38, 0xa9, 0xf8, 0x5d, + 0xff, 0x61, 0x41, 0x52, 0x28, 0x06, 0x2a, 0xc1, 0x74, 0x5b, 0xb3, 0x6c, 0x95, 0x8e, 0x13, 0x52, + 0xfd, 0x14, 0x27, 0x31, 0x2c, 0x12, 0x2e, 0x5b, 0xce, 0x7b, 0x92, 0xa0, 0xb1, 0xac, 0x16, 0x3a, + 0x0f, 0x32, 0xa5, 0xd2, 0xa4, 0xa6, 0x8a, 0x79, 0xa6, 0x51, 0x2a, 0xfa, 0x34, 0xc9, 0x67, 0x16, + 0x8c, 0xfa, 0xa7, 0xa7, 0x21, 0x41, 0x9f, 0x75, 0xa3, 0x20, 0xec, 0x62, 0x74, 0x9c, 0x64, 0xd0, + 0xc2, 0xfb, 0x21, 0xe3, 0xce, 0xb2, 0x0c, 0x24, 0xce, 0xa8, 0xb8, 0xd9, 0x14, 0xf0, 0x11, 0x98, + 0x33, 0xf0, 0xbe, 0xad, 0x0e, 0x42, 0x27, 0x28, 0x34, 0x22, 0x65, 0x9b, 0x7e, 0x8c, 0x7b, 0x21, + 0xdd, 0x14, 0xd2, 0x67, 0xb0, 0x40, 0x61, 0xa7, 0x9d, 0x5c, 0x0a, 0x76, 0x0a, 0xe2, 0x5a, 0xb7, + 0xcb, 0x00, 0x92, 0x7c, 0x92, 0xed, 0x76, 0x69, 0xd1, 0x05, 0x98, 0xa1, 0x6d, 0xec, 0x61, 0xab, + 0xdf, 0xb6, 0x39, 0x91, 0x14, 0x85, 0xc9, 0x90, 0x02, 0x85, 0xe5, 0x53, 0xd8, 0x73, 0x30, 0x8d, + 0xf7, 0xf4, 0x16, 0x36, 0x9a, 0x98, 0xc1, 0x4d, 0x53, 0xb8, 0x94, 0xc8, 0xa4, 0x40, 0x0f, 0x80, + 0x33, 0x7b, 0xaa, 0x62, 0x62, 0x4f, 0x33, 0x7a, 0x22, 0x3f, 0xcf, 0xb2, 0x73, 0x59, 0x88, 0x94, + 0x34, 0x5b, 0x23, 0x76, 0xcc, 0xde, 0x67, 0xfe, 0x4a, 0x4a, 0x21, 0x3f, 0x73, 0xef, 0x8f, 0x40, + 0x64, 0xd3, 0xb4, 0x31, 0xba, 0xec, 0xf1, 0x9e, 0xd3, 0x81, 0x2a, 0x5d, 0xd7, 0x77, 0x0c, 0xdc, + 0x5a, 0xb3, 0x76, 0x3c, 0xcf, 0x31, 0xbb, 0x0a, 0x15, 0xf2, 0x29, 0xd4, 0x1c, 0x4c, 0xf5, 0xcc, + 0xbe, 0xd1, 0x12, 0xd7, 0x35, 0x68, 0x02, 0x5d, 0x25, 0xae, 0x23, 0xd7, 0x93, 0xc8, 0x58, 0x3d, + 0xc9, 0x10, 0x3d, 0x21, 0x6a, 0xcc, 0x33, 0x94, 0xd8, 0x16, 0x57, 0x97, 0x02, 0x24, 0x1c, 0x0b, + 0xe3, 0x28, 0xdc, 0x24, 0x3a, 0xeb, 0xa2, 0x11, 0xa7, 0xc4, 0xe9, 0x7d, 0x47, 0x7c, 0x4c, 0xe7, + 0x64, 0xa7, 0x80, 0xcb, 0xcf, 0xa7, 0x58, 0xfc, 0x6d, 0xe8, 0x18, 0x6d, 0x98, 0xab, 0x58, 0xec, + 0x7d, 0xe8, 0xbb, 0x20, 0x61, 0xe9, 0x3b, 0x06, 0xbd, 0x02, 0xc5, 0x75, 0xcf, 0xcd, 0x20, 0xa5, + 0xee, 0x05, 0x7b, 0xa6, 0x6b, 0x9e, 0xcf, 0x18, 0x5c, 0x84, 0x59, 0xf7, 0x03, 0x02, 0x2e, 0x15, + 0xa6, 0x67, 0xc8, 0x29, 0xaa, 0x3b, 0xe4, 0xce, 0x83, 0x6c, 0x98, 0x86, 0xda, 0xeb, 0x7a, 0xae, + 0xed, 0x33, 0xa5, 0x4b, 0x1b, 0xa6, 0xa1, 0x74, 0x9d, 0xb3, 0x02, 0xe8, 0x29, 0x98, 0x1f, 0x84, + 0xf4, 0xd4, 0xc0, 0x94, 0xf0, 0xa4, 0x1f, 0xc7, 0xa9, 0x26, 0xf7, 0xcf, 0x25, 0x88, 0x72, 0x1f, + 0xc2, 0xed, 0x6e, 0x29, 0xb8, 0xbb, 0x43, 0xa3, 0xba, 0x3b, 0xfc, 0x55, 0x75, 0x37, 0x38, 0xcc, + 0x5a, 0xfc, 0xa5, 0xe1, 0x20, 0x87, 0x99, 0x31, 0x59, 0xd7, 0x77, 0xb8, 0x89, 0xf1, 0x60, 0xe5, + 0x5e, 0x93, 0xc8, 0x2c, 0xcf, 0xcb, 0x51, 0x01, 0xa6, 0x05, 0x67, 0xea, 0x76, 0x5b, 0xdb, 0xe1, + 0x5a, 0x7f, 0x66, 0x34, 0x7b, 0xc4, 0x35, 0x52, 0x92, 0x9c, 0x23, 0xea, 0xe4, 0x05, 0x2a, 0x50, + 0x68, 0x84, 0x02, 0xf9, 0x34, 0x36, 0x7c, 0x67, 0x1a, 0xeb, 0xd3, 0xad, 0xc8, 0x80, 0x6e, 0xe5, + 0x3e, 0x2d, 0xf1, 0xaf, 0x1c, 0xb4, 0xd8, 0xcd, 0xb2, 0xff, 0x65, 0xbd, 0xf5, 0xcd, 0x5c, 0x8d, + 0x5b, 0xb8, 0xa5, 0x0e, 0x75, 0xdb, 0x3d, 0x01, 0x24, 0xfd, 0x5c, 0xbb, 0xdd, 0x87, 0x04, 0x99, + 0xba, 0xdb, 0x8d, 0xef, 0x0d, 0xc3, 0xcc, 0x10, 0xfc, 0xdf, 0xc3, 0xee, 0xf4, 0x9b, 0x8a, 0xa9, + 0x09, 0x4d, 0x45, 0xf4, 0x48, 0xa6, 0x22, 0x76, 0x07, 0xa6, 0x22, 0x7e, 0xb8, 0xa9, 0xf8, 0xe5, + 0x10, 0x8d, 0xa4, 0x74, 0x4d, 0x4b, 0x6b, 0xff, 0x9d, 0xcc, 0x28, 0xa7, 0x21, 0xd1, 0x35, 0xdb, + 0x2a, 0x2b, 0x61, 0xd7, 0x00, 0xe3, 0x5d, 0xb3, 0xad, 0x0c, 0x69, 0xf4, 0xd4, 0xd7, 0x6a, 0xba, + 0x89, 0x7e, 0x0d, 0x7a, 0x3b, 0x36, 0x38, 0x78, 0x6d, 0x48, 0x31, 0x59, 0x70, 0x7f, 0xf0, 0x12, + 0x11, 0x02, 0xf5, 0x30, 0xa5, 0x41, 0x0f, 0xd6, 0xe1, 0x9b, 0x81, 0x2a, 0x1c, 0x90, 0xa0, 0x30, + 0xef, 0x69, 0x38, 0x0c, 0x37, 0x60, 0x20, 0x15, 0x0e, 0x98, 0x7b, 0x55, 0x02, 0x58, 0x25, 0xc2, + 0xa5, 0x2d, 0x26, 0xae, 0x9c, 0x45, 0x99, 0x50, 0x7d, 0x75, 0x2f, 0x8c, 0xec, 0x38, 0xce, 0x41, + 0xca, 0xf2, 0xb2, 0x5e, 0x82, 0x69, 0x77, 0x1c, 0x59, 0x58, 0xb0, 0xb3, 0x70, 0x58, 0x80, 0xa3, + 0x8e, 0x6d, 0x25, 0xb5, 0xe7, 0x49, 0xe5, 0x7e, 0x53, 0x82, 0x04, 0xe5, 0x6a, 0x0d, 0xdb, 0x9a, + 0xaf, 0x23, 0xa5, 0xaf, 0xa2, 0x23, 0xef, 0x06, 0x60, 0x74, 0x2c, 0xfd, 0x65, 0xcc, 0xf5, 0x2b, + 0x41, 0x73, 0xea, 0xfa, 0xcb, 0x18, 0x3d, 0xee, 0x48, 0x3d, 0x3c, 0x46, 0xea, 0xdc, 0x42, 0x09, + 0xd9, 0x9f, 0x84, 0x18, 0x7d, 0x74, 0x66, 0xdf, 0xe2, 0x61, 0x8d, 0xa8, 0xd1, 0xef, 0x34, 0xf6, + 0xad, 0xdc, 0x2d, 0x88, 0x35, 0xf6, 0x59, 0x84, 0xf6, 0x34, 0x24, 0x7a, 0xa6, 0xc9, 0x7d, 0x5b, + 0xb6, 0xac, 0x88, 0x93, 0x0c, 0xea, 0xca, 0x89, 0xa0, 0x64, 0xc8, 0x0d, 0x4a, 0xba, 0x61, 0xd5, + 0xf0, 0x64, 0x61, 0xd5, 0x0b, 0x7f, 0x24, 0xc1, 0xb4, 0x6f, 0x44, 0xa1, 0x87, 0xe0, 0x64, 0xbd, + 0x72, 0xad, 0x5a, 0x2e, 0xa9, 0x6b, 0xf5, 0x6b, 0x03, 0xaf, 0x41, 0xcc, 0x67, 0x5e, 0xb9, 0xbd, + 0x98, 0xe4, 0xe1, 0x87, 0x51, 0xd0, 0xeb, 0x4a, 0x79, 0xb3, 0xd6, 0x28, 0xcb, 0x12, 0x83, 0x5e, + 0xef, 0xe1, 0x3d, 0xd3, 0x66, 0x1f, 0xee, 0x7a, 0x04, 0x4e, 0x05, 0x40, 0x3b, 0x41, 0x88, 0x99, + 0x57, 0x6e, 0x2f, 0x4e, 0xaf, 0xf7, 0x30, 0x53, 0x35, 0x8a, 0xb1, 0x04, 0xd9, 0x61, 0x8c, 0xda, + 0x7a, 0xad, 0x9e, 0x5f, 0x95, 0x17, 0xe7, 0xe5, 0x57, 0x6e, 0x2f, 0xa6, 0x84, 0xed, 0x20, 0xf0, + 0x5f, 0xff, 0x28, 0x44, 0x64, 0xf8, 0xec, 0xca, 0x4b, 0x3d, 0xad, 0xdb, 0xc5, 0x3d, 0x6b, 0xd4, + 0x21, 0x8d, 0x73, 0x90, 0x2c, 0x79, 0x5e, 0x6a, 0x72, 0x4e, 0xeb, 0x48, 0xf4, 0x15, 0x27, 0x96, + 0xc8, 0xe5, 0x00, 0xae, 0xb6, 0x4d, 0xcd, 0x0e, 0x80, 0x09, 0x79, 0x60, 0x2a, 0x86, 0x7d, 0xe5, + 0x72, 0x00, 0x4c, 0x58, 0xc0, 0x9c, 0x83, 0xe4, 0xc6, 0x28, 0xa0, 0x88, 0x9f, 0xd0, 0xa3, 0xcb, + 0x01, 0x30, 0x53, 0x03, 0x84, 0x02, 0x81, 0xa6, 0x05, 0xd0, 0x59, 0x48, 0x14, 0x4c, 0xb3, 0x1d, + 0x00, 0x12, 0xf7, 0xd0, 0xa9, 0x7b, 0x1e, 0xa1, 0xf2, 0x01, 0x25, 0x3c, 0x0c, 0xd1, 0x28, 0x5d, + 0x00, 0x8c, 0x73, 0x9e, 0xe9, 0xc8, 0xc7, 0x78, 0x9e, 0xe3, 0xfd, 0x72, 0xd4, 0x63, 0x3c, 0xa2, + 0x3f, 0xef, 0xec, 0x18, 0x4f, 0xca, 0xb3, 0x55, 0xe3, 0xc4, 0x4c, 0xba, 0x5a, 0x4f, 0xeb, 0x1c, + 0x12, 0x86, 0x09, 0x0e, 0x91, 0x8c, 0x39, 0x25, 0x35, 0x3f, 0x46, 0x13, 0x73, 0x1f, 0x0f, 0x43, + 0xc6, 0x59, 0xfe, 0xaf, 0x53, 0x16, 0xd0, 0x65, 0x6f, 0xac, 0x2a, 0x39, 0xda, 0xdd, 0x61, 0xe0, + 0x22, 0x96, 0xf5, 0x34, 0xc4, 0xc5, 0x32, 0x92, 0xdb, 0xe6, 0xb3, 0x41, 0x4e, 0x19, 0x07, 0xe1, + 0xb8, 0x0e, 0x0a, 0xfa, 0x26, 0x48, 0x38, 0x96, 0x9a, 0x9b, 0xa6, 0xdc, 0x61, 0xb6, 0x9d, 0x13, + 0x70, 0x91, 0xd0, 0x8a, 0x1b, 0xec, 0x88, 0x8c, 0x8c, 0x9f, 0x6c, 0x32, 0x08, 0x8e, 0xed, 0x04, + 0x3a, 0x1e, 0x83, 0x88, 0xb6, 0xd5, 0xd4, 0xf9, 0x74, 0x7e, 0x77, 0x00, 0x62, 0xbe, 0x50, 0xac, + 0x30, 0x2c, 0x1a, 0xa6, 0xa6, 0xe0, 0x84, 0x69, 0xeb, 0xc0, 0x68, 0xee, 0xf6, 0x4c, 0xe3, 0x80, + 0xcf, 0xe0, 0x41, 0x4c, 0xd7, 0x05, 0x8c, 0x60, 0xda, 0x41, 0x22, 0x4c, 0xf3, 0x97, 0x2d, 0xf8, + 0x53, 0x98, 0x41, 0x4c, 0xf3, 0x17, 0x31, 0x04, 0xd3, 0x1c, 0x21, 0x57, 0xe1, 0xd1, 0x61, 0xde, + 0x6d, 0xf4, 0x19, 0xf2, 0x7d, 0x1e, 0xdd, 0x66, 0x03, 0x3e, 0xde, 0xd1, 0xf6, 0x59, 0x68, 0xfb, + 0x24, 0xc4, 0x48, 0xe1, 0x0e, 0x7f, 0x0f, 0x34, 0xac, 0x44, 0x3b, 0xda, 0xfe, 0x35, 0xcd, 0xba, + 0x11, 0x89, 0x87, 0xe5, 0x48, 0xee, 0x23, 0xc4, 0xcb, 0xf7, 0x75, 0x0d, 0x7a, 0x10, 0x10, 0xc1, + 0xd0, 0x76, 0xb0, 0x4a, 0x26, 0x21, 0xda, 0xc9, 0x82, 0x6e, 0xa6, 0xa3, 0xed, 0xe7, 0x77, 0x70, + 0xb5, 0xdf, 0xa1, 0x0c, 0x58, 0x68, 0x0d, 0x64, 0x01, 0x2c, 0x14, 0xd0, 0xf1, 0x17, 0x86, 0xbe, + 0xe5, 0xc6, 0x01, 0x98, 0x43, 0xf3, 0x2a, 0x71, 0x68, 0xd2, 0x8c, 0x9e, 0x73, 0x7c, 0xcf, 0xd7, + 0x94, 0xb0, 0xbf, 0x29, 0xb9, 0x67, 0x20, 0x33, 0xa0, 0x05, 0xde, 0xe0, 0x3e, 0x15, 0x1a, 0x8d, + 0x44, 0x24, 0x44, 0x70, 0x9f, 0x8e, 0xbe, 0x95, 0xf8, 0xaf, 0xbe, 0x7f, 0x41, 0xa2, 0x9b, 0xc2, + 0x0f, 0xc2, 0xb4, 0x4f, 0x0d, 0x44, 0x18, 0x56, 0x72, 0xc3, 0xb0, 0x2e, 0xf0, 0x0b, 0x90, 0x22, + 0x53, 0x29, 0x6e, 0x71, 0xd8, 0xfb, 0x20, 0xc3, 0xe6, 0xfa, 0x41, 0x59, 0xb3, 0xa5, 0xc2, 0x9a, + 0x10, 0x78, 0x4e, 0xac, 0x1d, 0xfc, 0x62, 0x4f, 0x0a, 0xa8, 0x6b, 0x9a, 0x95, 0xfb, 0x11, 0x09, + 0x32, 0x03, 0xba, 0x81, 0x9e, 0x86, 0x44, 0xb7, 0x87, 0x9b, 0xba, 0x27, 0x68, 0x77, 0x88, 0x08, + 0x23, 0x54, 0x7c, 0x2e, 0x06, 0x71, 0x93, 0xc4, 0x99, 0x8f, 0x16, 0x6e, 0x6b, 0x07, 0xe3, 0x7b, + 0x81, 0x91, 0x10, 0x9f, 0xdc, 0x2c, 0x11, 0xa4, 0xdc, 0x6f, 0x4b, 0x30, 0xed, 0x53, 0x3a, 0xd4, + 0x82, 0xbb, 0xc9, 0x14, 0xed, 0xbd, 0x67, 0xc0, 0x3f, 0x02, 0xe1, 0x59, 0x0a, 0x06, 0x3d, 0xef, + 0xe2, 0x4e, 0x34, 0xd4, 0xb9, 0x91, 0x94, 0x79, 0x42, 0xc7, 0xbd, 0x6e, 0xc0, 0xbe, 0x16, 0x71, + 0x9d, 0x39, 0xe3, 0x35, 0x40, 0xdd, 0x2d, 0x7b, 0x90, 0x74, 0x68, 0x52, 0xd2, 0x32, 0x41, 0xf6, + 0x12, 0xcc, 0xd5, 0x01, 0xdc, 0x81, 0x8b, 0xf2, 0x93, 0x34, 0x22, 0x7c, 0x18, 0x87, 0x2b, 0xa1, + 0xac, 0x54, 0x58, 0xff, 0xf0, 0xa7, 0xce, 0x48, 0x5f, 0x17, 0xd7, 0xe1, 0x5d, 0xcf, 0xc3, 0x5d, + 0x2e, 0xe8, 0x56, 0x53, 0x1f, 0x0c, 0xcf, 0xcb, 0x8e, 0x71, 0x20, 0xa5, 0x93, 0x44, 0xe7, 0xc7, + 0xcc, 0x34, 0x93, 0x44, 0xef, 0xef, 0x2c, 0x38, 0x3f, 0x6e, 0x6a, 0xca, 0xfd, 0x7e, 0x02, 0x62, + 0x0a, 0x7e, 0x73, 0x1f, 0x5b, 0x36, 0x7a, 0x14, 0x22, 0xb8, 0xb9, 0x6b, 0x0e, 0xef, 0xa0, 0xf1, + 0x66, 0x2e, 0x95, 0x9b, 0xbb, 0x26, 0x07, 0xbe, 0x7e, 0x4c, 0xa1, 0xc0, 0xe8, 0x0a, 0x4c, 0x6d, + 0xb7, 0xfb, 0x3c, 0xae, 0xef, 0x9b, 0xa7, 0x04, 0xd6, 0x55, 0x52, 0xec, 0xa2, 0x31, 0x70, 0x52, + 0x19, 0xfd, 0x18, 0x6a, 0x78, 0x54, 0x65, 0xf4, 0x1b, 0xa8, 0x6e, 0x65, 0x04, 0x18, 0x15, 0x01, + 0x74, 0x43, 0xb7, 0x55, 0x1a, 0xf2, 0xe6, 0xf3, 0x44, 0x2e, 0x08, 0x55, 0xb7, 0x69, 0x78, 0xdc, + 0xc5, 0x4f, 0xe8, 0x22, 0x8f, 0x70, 0xfc, 0xe6, 0x3e, 0xee, 0x89, 0xb9, 0x22, 0x80, 0xe3, 0x37, + 0x91, 0x62, 0x0f, 0xc7, 0x14, 0x9c, 0xcc, 0xad, 0xec, 0x4b, 0x37, 0xf6, 0x3e, 0xff, 0x04, 0xdc, + 0xe2, 0x30, 0x2a, 0xfd, 0xd0, 0x4d, 0x63, 0xdf, 0x45, 0x8e, 0x35, 0x59, 0x0e, 0x7a, 0xd2, 0x59, + 0xc3, 0x25, 0x07, 0x17, 0x4d, 0x0e, 0x32, 0x5b, 0xc2, 0x39, 0xb8, 0x1c, 0x01, 0xd5, 0x20, 0xdd, + 0xd6, 0x2d, 0x5b, 0xb5, 0x0c, 0xad, 0x6b, 0xed, 0x9a, 0xb6, 0xf8, 0xd8, 0xc4, 0x7d, 0xc3, 0x24, + 0x56, 0x75, 0xcb, 0xae, 0x0b, 0x30, 0x97, 0xd2, 0x74, 0xdb, 0x9b, 0x4f, 0x08, 0x9a, 0xdb, 0xdb, + 0xb8, 0xe7, 0x50, 0xa4, 0x31, 0xe8, 0x40, 0x82, 0x35, 0x02, 0x27, 0x30, 0x3d, 0x04, 0x4d, 0x6f, + 0x3e, 0xfa, 0x16, 0x98, 0x6d, 0x9b, 0x5a, 0xcb, 0xa1, 0xa7, 0x36, 0x77, 0xfb, 0xc6, 0x2d, 0x1a, + 0xb1, 0x4e, 0x2e, 0x5f, 0x08, 0x60, 0xd3, 0xd4, 0x5a, 0x02, 0xb9, 0x48, 0x40, 0x5d, 0xca, 0x33, + 0xed, 0xc1, 0x32, 0xa4, 0xc2, 0x9c, 0xd6, 0xed, 0xb6, 0x0f, 0x06, 0xc9, 0x67, 0x28, 0xf9, 0x07, + 0x87, 0xc9, 0xe7, 0x09, 0xf4, 0x08, 0xfa, 0x48, 0x1b, 0x2a, 0x44, 0x1b, 0x20, 0x77, 0x7b, 0x98, + 0x5e, 0x42, 0xee, 0xf2, 0x55, 0x0a, 0xfd, 0x9a, 0x43, 0x72, 0xf9, 0xfc, 0x30, 0xf1, 0x75, 0x06, + 0x29, 0x96, 0x33, 0x2e, 0xe5, 0x4c, 0xd7, 0x5f, 0xc2, 0xc8, 0x9a, 0x4d, 0x4c, 0xbf, 0x7d, 0xc3, + 0xc9, 0xce, 0x8c, 0x26, 0x4b, 0x21, 0x03, 0xc9, 0xfa, 0x4a, 0xd0, 0x55, 0x48, 0xb2, 0xe8, 0x99, + 0x4a, 0x6c, 0x24, 0xfd, 0xa8, 0x50, 0x72, 0xf9, 0x5c, 0xc0, 0x70, 0xa5, 0x40, 0x9b, 0xa6, 0x8d, + 0x5d, 0x62, 0x80, 0x9d, 0x4c, 0xb4, 0x05, 0xc7, 0xe9, 0x17, 0x31, 0x0e, 0x54, 0xbf, 0x41, 0xce, + 0xce, 0xf2, 0x57, 0xac, 0x87, 0x28, 0xd2, 0xcf, 0x54, 0x1e, 0x6c, 0x7a, 0x2d, 0xb3, 0x4b, 0x7a, + 0x76, 0x6f, 0xb8, 0x94, 0x68, 0xda, 0xb6, 0x6e, 0x68, 0x6d, 0xfd, 0x65, 0xcc, 0xbc, 0x17, 0xfa, + 0x85, 0xa9, 0x40, 0x4d, 0xbb, 0xca, 0xe1, 0xa8, 0x37, 0xe3, 0xd1, 0xb4, 0x6d, 0x6f, 0x7e, 0x21, + 0xc6, 0xd7, 0x1c, 0xce, 0x5b, 0xf1, 0x31, 0x39, 0xce, 0xbe, 0x68, 0x72, 0x23, 0x12, 0x07, 0x39, + 0x99, 0xbb, 0x1f, 0x92, 0x1e, 0x3b, 0x85, 0xb2, 0x10, 0xe3, 0xb3, 0xaa, 0xb8, 0x8d, 0xc1, 0x93, + 0xb9, 0x34, 0xa4, 0xbc, 0xa6, 0x29, 0xf7, 0x2e, 0x09, 0x92, 0x1e, 0xa3, 0x43, 0x30, 0xbd, 0xfb, + 0x76, 0x09, 0xd7, 0x51, 0x3d, 0x27, 0xdc, 0x0a, 0x51, 0xce, 0xf6, 0x8e, 0x53, 0x34, 0x93, 0x7b, + 0x35, 0x68, 0x01, 0x92, 0xdd, 0xe5, 0xae, 0x03, 0x12, 0xa6, 0x20, 0xd0, 0x5d, 0xee, 0x0a, 0x80, + 0xb3, 0x90, 0x22, 0x4d, 0x57, 0xbd, 0xfe, 0x72, 0x42, 0x49, 0x92, 0x3c, 0x0e, 0x92, 0xfb, 0xbd, + 0x10, 0xc8, 0x83, 0xc6, 0xcc, 0xd9, 0xcf, 0x93, 0x8e, 0xbc, 0x9f, 0x77, 0x6a, 0x70, 0x27, 0xd1, + 0xdd, 0x3c, 0x5c, 0x03, 0xd9, 0xdd, 0x02, 0x63, 0x73, 0xd3, 0x21, 0x0b, 0x80, 0x81, 0xc5, 0x8a, + 0x92, 0x69, 0x0e, 0xac, 0x5e, 0xae, 0xf9, 0x8e, 0xd0, 0x44, 0x9c, 0xf3, 0xca, 0x83, 0xfa, 0x24, + 0x60, 0x36, 0xba, 0x2d, 0xcd, 0xc6, 0x22, 0xb4, 0xef, 0x39, 0x4d, 0x73, 0x1f, 0x64, 0xb4, 0x6e, + 0x57, 0xb5, 0x6c, 0xcd, 0xc6, 0xbe, 0x33, 0x23, 0xd3, 0x5a, 0xb7, 0x4b, 0xbf, 0x94, 0xca, 0x3c, + 0xbd, 0x7b, 0x21, 0x4d, 0x2c, 0xbc, 0xae, 0xb5, 0x85, 0x1b, 0x11, 0x65, 0x0e, 0x21, 0xcf, 0xe5, + 0xae, 0x48, 0x0b, 0x52, 0x5e, 0xe3, 0xee, 0xc4, 0x66, 0x24, 0x4f, 0x6c, 0x06, 0xf1, 0x67, 0xcc, + 0x98, 0x84, 0xc4, 0x8b, 0x73, 0xc1, 0x7b, 0xab, 0x73, 0x34, 0x8e, 0xb3, 0xc7, 0x62, 0xbc, 0x71, + 0x85, 0x25, 0x72, 0x37, 0x21, 0xed, 0x9f, 0x07, 0x50, 0x1a, 0x42, 0xf6, 0x3e, 0xaf, 0x25, 0x64, + 0xef, 0xa3, 0x4b, 0x9e, 0x8f, 0xc8, 0xa6, 0x83, 0x66, 0x3f, 0x8e, 0xef, 0xc6, 0x4e, 0xd9, 0x13, + 0x7c, 0xb9, 0x0c, 0x4c, 0xfb, 0x66, 0x89, 0xdc, 0x09, 0x98, 0x0b, 0xb2, 0xf9, 0x39, 0x1d, 0xe6, + 0x82, 0x4c, 0x37, 0xba, 0x02, 0x71, 0xc7, 0xe8, 0x0f, 0x85, 0xdb, 0x44, 0xed, 0x0e, 0x92, 0x03, + 0xeb, 0xdb, 0xfc, 0x0c, 0xf9, 0x36, 0x3f, 0x73, 0xdf, 0x0e, 0xd9, 0x51, 0xf6, 0x7c, 0x60, 0x9b, + 0x22, 0xe2, 0x08, 0xee, 0x04, 0x44, 0xf9, 0xe3, 0xbd, 0x21, 0x1a, 0xa7, 0xe0, 0x29, 0x22, 0x50, + 0x66, 0xdb, 0xc3, 0x2c, 0x7c, 0x41, 0x13, 0x39, 0x15, 0x4e, 0x8d, 0x34, 0xe9, 0xa3, 0x0f, 0x0f, + 0x30, 0x42, 0xfc, 0xf0, 0x00, 0x4d, 0xd0, 0x6f, 0xa8, 0x63, 0x43, 0x44, 0x01, 0x13, 0x0a, 0x4f, + 0xe5, 0xde, 0x1d, 0x86, 0x13, 0xc1, 0x76, 0x1d, 0x2d, 0x42, 0x8a, 0xac, 0x1e, 0x6c, 0xff, 0x42, + 0x03, 0x3a, 0xda, 0x7e, 0x83, 0xaf, 0x32, 0xf8, 0xc6, 0x6b, 0xc8, 0xd9, 0x78, 0x45, 0x9b, 0x30, + 0xd3, 0x36, 0x9b, 0x5a, 0x5b, 0xf5, 0x6c, 0x7c, 0xf3, 0xe1, 0x74, 0xcf, 0x28, 0x3b, 0x2d, 0xf6, + 0x3c, 0x88, 0x09, 0xe2, 0x03, 0x21, 0x43, 0x89, 0xac, 0x3a, 0x9b, 0xe4, 0xa8, 0x0c, 0xc9, 0x8e, + 0x6e, 0x6d, 0xe1, 0x5d, 0x6d, 0x4f, 0x37, 0x7b, 0x7c, 0x5c, 0x05, 0x68, 0xcf, 0x9a, 0x0b, 0x24, + 0x76, 0xe4, 0x3d, 0x78, 0x9e, 0x4e, 0x99, 0x0a, 0x3c, 0x29, 0x10, 0x3d, 0xb2, 0x65, 0x19, 0xb5, + 0xe7, 0x1e, 0x1b, 0xb9, 0xe7, 0x1e, 0xb4, 0xc1, 0x1d, 0x0f, 0xde, 0xe0, 0x7e, 0x85, 0x76, 0x4e, + 0xd0, 0xec, 0x38, 0xbc, 0xe7, 0x8d, 0x1a, 0x30, 0xc7, 0xf1, 0x5b, 0x3e, 0xe9, 0x0f, 0x1d, 0xc5, + 0xf3, 0x3b, 0x5d, 0x1e, 0xa9, 0x23, 0x81, 0x3f, 0x5a, 0xf0, 0xe1, 0x3b, 0x14, 0xbc, 0x38, 0x79, + 0x12, 0xf1, 0x9c, 0x3c, 0xf9, 0xdf, 0xac, 0x33, 0xbe, 0xc7, 0xd9, 0xa4, 0xf3, 0x38, 0x16, 0x81, + 0x47, 0x6a, 0x46, 0x6d, 0xf6, 0x88, 0x86, 0x85, 0x8f, 0xdc, 0x30, 0xde, 0xdb, 0x91, 0xf1, 0xbd, + 0x3d, 0xf5, 0xb5, 0xec, 0xed, 0xe8, 0x1d, 0xf6, 0xf6, 0xd7, 0xb5, 0x1f, 0x7e, 0x5f, 0x82, 0xf9, + 0xd1, 0xee, 0x58, 0x60, 0x87, 0x1c, 0x69, 0x17, 0x74, 0xd4, 0x8c, 0x77, 0x2f, 0xa4, 0x07, 0xbc, + 0x45, 0xa6, 0xcc, 0xd3, 0xbe, 0xf5, 0x3a, 0xba, 0x04, 0xc7, 0xf9, 0x4e, 0xe3, 0x00, 0xf4, 0x14, + 0x6f, 0xbc, 0x69, 0x28, 0x5d, 0x1f, 0xe7, 0xb9, 0x5f, 0x0c, 0xc3, 0x5c, 0x90, 0x0f, 0x18, 0x30, + 0xc8, 0x15, 0x98, 0x6d, 0xe1, 0xa6, 0xde, 0xba, 0xe3, 0x31, 0x3e, 0xc3, 0xd1, 0xff, 0xcf, 0x10, + 0x1f, 0x56, 0x2d, 0x74, 0x01, 0x66, 0xac, 0x03, 0xa3, 0xa9, 0x1b, 0x3b, 0xaa, 0x6d, 0x0a, 0x77, + 0x2a, 0xc1, 0x62, 0x8e, 0xbc, 0xa0, 0x61, 0x72, 0x87, 0xea, 0x27, 0x01, 0xe2, 0x0a, 0xb6, 0xba, + 0xc4, 0xff, 0x43, 0x45, 0x48, 0xe0, 0xfd, 0x26, 0xee, 0xda, 0x6e, 0xd8, 0x2c, 0x70, 0x59, 0xc2, + 0x41, 0x04, 0x1e, 0x59, 0x9e, 0x3b, 0x78, 0xe8, 0x32, 0x8f, 0x42, 0x8c, 0x8c, 0x27, 0x30, 0xef, + 0xde, 0x41, 0x65, 0x61, 0x88, 0xc7, 0x45, 0x18, 0x22, 0x3c, 0x6a, 0x71, 0xcd, 0x7d, 0x7d, 0x07, + 0x8f, 0xc7, 0x21, 0x2e, 0xf3, 0x38, 0x44, 0x64, 0x54, 0x75, 0x6c, 0x49, 0xe0, 0x56, 0xa7, 0xb3, + 0xc7, 0x8e, 0xbd, 0x81, 0x88, 0xe8, 0xa8, 0xa6, 0x7a, 0x7c, 0x77, 0xb7, 0xa9, 0x6e, 0x24, 0xe2, + 0x71, 0x11, 0x89, 0x88, 0x8d, 0x62, 0x9a, 0x3b, 0xab, 0x2e, 0xd3, 0x2c, 0x14, 0xf1, 0x46, 0x4f, + 0x28, 0x22, 0x31, 0x18, 0xe6, 0x1f, 0x0a, 0x45, 0x38, 0xd8, 0x4e, 0x2c, 0x62, 0xc5, 0x89, 0x45, + 0xa4, 0x46, 0x06, 0x32, 0xb8, 0x97, 0xe9, 0x20, 0x8b, 0x60, 0xc4, 0xfa, 0x50, 0x30, 0x82, 0xc5, + 0x0e, 0xee, 0x1f, 0x1b, 0x8c, 0x70, 0x48, 0x0d, 0x44, 0x23, 0xd6, 0x87, 0xa2, 0x11, 0xe9, 0x51, + 0x14, 0x07, 0x5c, 0x5a, 0x97, 0xa2, 0x3f, 0x1c, 0xf1, 0xad, 0xc1, 0xe1, 0x88, 0x91, 0xf1, 0x82, + 0x00, 0xf7, 0xd5, 0x21, 0x1d, 0x10, 0x8f, 0xf8, 0xf6, 0x11, 0xf1, 0x08, 0x79, 0xd4, 0xba, 0x39, + 0xc8, 0x79, 0x75, 0x2a, 0x08, 0x0a, 0x48, 0x6c, 0x06, 0x04, 0x24, 0x58, 0xe4, 0xe0, 0x81, 0x09, + 0x02, 0x12, 0x0e, 0xe9, 0xa1, 0x88, 0xc4, 0x66, 0x40, 0x44, 0x02, 0x8d, 0xa6, 0x3b, 0xe0, 0x73, + 0x79, 0xe9, 0xfa, 0x43, 0x12, 0xd7, 0xfc, 0x21, 0x89, 0xd9, 0xc3, 0x5d, 0x5d, 0xe6, 0x39, 0x38, + 0xd4, 0xbc, 0x31, 0x89, 0xe6, 0xa8, 0x98, 0x04, 0x0b, 0x1b, 0x3c, 0x3c, 0x61, 0x4c, 0xc2, 0xa1, + 0x1d, 0x18, 0x94, 0x58, 0x1f, 0x0a, 0x4a, 0x1c, 0x1f, 0xa5, 0x70, 0x03, 0x13, 0x92, 0xab, 0x70, + 0x23, 0xa3, 0x12, 0xec, 0x6b, 0xab, 0xec, 0x3b, 0xab, 0x20, 0x27, 0x6f, 0x44, 0xe2, 0x49, 0x39, + 0x95, 0x7b, 0x80, 0x78, 0x4d, 0x03, 0x76, 0x8f, 0xac, 0x51, 0x70, 0xaf, 0x67, 0xf6, 0xc4, 0x1e, + 0x2b, 0x4d, 0xe4, 0xce, 0x43, 0xca, 0x6b, 0xe2, 0x0e, 0x89, 0x60, 0x64, 0x60, 0xda, 0x67, 0xd5, + 0x72, 0x5f, 0x0e, 0x41, 0xca, 0x6b, 0xaf, 0x7c, 0xeb, 0xdb, 0x04, 0x5f, 0xdf, 0x7a, 0xe2, 0x1a, + 0x21, 0x7f, 0x5c, 0x63, 0x01, 0x92, 0x64, 0x8d, 0x37, 0x10, 0xb2, 0xd0, 0xba, 0x4e, 0xc8, 0x42, + 0x1c, 0x73, 0x65, 0xd1, 0x0f, 0x3e, 0x33, 0xb0, 0x53, 0x11, 0x19, 0xe7, 0xc8, 0x2f, 0xdf, 0x46, + 0x78, 0x18, 0x66, 0x3d, 0xb0, 0xce, 0xda, 0x91, 0xcd, 0xff, 0xb2, 0x03, 0x9d, 0xe7, 0x27, 0x68, + 0xbf, 0x19, 0x32, 0x6d, 0xcd, 0xc0, 0xe2, 0x0e, 0x89, 0x8e, 0x2d, 0xee, 0x77, 0x2d, 0x1f, 0x6e, + 0x92, 0x97, 0x56, 0x35, 0x03, 0xaf, 0x3b, 0x48, 0xf4, 0x7b, 0xbf, 0x4a, 0xba, 0xed, 0xcb, 0xa4, + 0xdf, 0x65, 0xe2, 0x1f, 0x3f, 0x21, 0x25, 0xd4, 0xde, 0xd2, 0x6b, 0xfd, 0x34, 0x8f, 0x50, 0x98, + 0xcf, 0xc3, 0x6c, 0x00, 0xa5, 0xe0, 0x2b, 0x6c, 0xee, 0x23, 0x1e, 0x62, 0x83, 0x7d, 0x25, 0xf4, + 0x84, 0x94, 0xfb, 0x6d, 0x09, 0x66, 0x86, 0x2c, 0x7e, 0x60, 0x64, 0x45, 0xfa, 0x5a, 0x45, 0x56, + 0x42, 0x77, 0x1e, 0x59, 0xf1, 0x2e, 0xe8, 0xc3, 0xfe, 0x05, 0xfd, 0x97, 0x24, 0x98, 0xf6, 0xcd, + 0x3c, 0x44, 0x8f, 0x9a, 0x66, 0x4b, 0x1c, 0x2a, 0xa0, 0xbf, 0x89, 0x68, 0xda, 0xa6, 0xf8, 0xd2, + 0x27, 0xf9, 0x49, 0xa0, 0x9c, 0xb9, 0x34, 0xc1, 0x67, 0x4a, 0x67, 0x75, 0x3e, 0xe5, 0xbd, 0xa6, + 0xc8, 0xc5, 0x1a, 0x75, 0xaf, 0xee, 0x39, 0x62, 0x8d, 0x79, 0xce, 0x12, 0xa0, 0x27, 0x21, 0x41, + 0xf7, 0x51, 0x54, 0xb3, 0x6b, 0xf1, 0xa0, 0xfb, 0x5d, 0x87, 0x5c, 0xdb, 0xb3, 0xe8, 0xad, 0x10, + 0x76, 0xd7, 0xcf, 0x75, 0xba, 0x12, 0x3e, 0xa7, 0xeb, 0x2e, 0x48, 0x10, 0xf6, 0xd9, 0x67, 0xc3, + 0x81, 0xbf, 0xac, 0x23, 0x32, 0x72, 0xbf, 0x19, 0x82, 0xcc, 0xc0, 0xc4, 0x19, 0xd8, 0xf8, 0xa0, + 0x43, 0x3d, 0x93, 0x09, 0xe4, 0x0c, 0xc0, 0x8e, 0x66, 0xa9, 0x2f, 0x69, 0x86, 0x8d, 0x5b, 0x5c, + 0x2a, 0x9e, 0x1c, 0x34, 0x0f, 0x71, 0x92, 0xea, 0x5b, 0xb8, 0xc5, 0x63, 0x58, 0x4e, 0x1a, 0x55, + 0x20, 0x8a, 0xf7, 0xe8, 0x57, 0x07, 0xd8, 0x97, 0xde, 0x4e, 0x06, 0x58, 0x58, 0x52, 0x5e, 0xc8, + 0x92, 0xee, 0xfe, 0xdc, 0x6b, 0x0b, 0x32, 0x03, 0x7f, 0xc8, 0xb9, 0xaf, 0xad, 0x70, 0x02, 0x7e, + 0x31, 0xc4, 0x07, 0xc4, 0x80, 0x4e, 0x42, 0x8c, 0x8e, 0x46, 0xbd, 0x45, 0x3d, 0x84, 0x84, 0x12, + 0x25, 0xc9, 0x4a, 0x8b, 0x46, 0x5a, 0x53, 0x22, 0x6c, 0x42, 0xa4, 0xcd, 0x6e, 0x76, 0x29, 0xd3, + 0x1d, 0xdc, 0xe9, 0x9a, 0x66, 0x5b, 0x65, 0x36, 0x2c, 0x0f, 0x69, 0xbf, 0x03, 0x81, 0xce, 0xc1, + 0x74, 0x0f, 0xdb, 0x9a, 0x6e, 0xa8, 0xbe, 0x65, 0x45, 0x8a, 0x65, 0x32, 0x9b, 0xe1, 0xfd, 0xd8, + 0x44, 0xee, 0x4d, 0x70, 0x3c, 0xd0, 0x7f, 0x40, 0x4f, 0x40, 0xc2, 0xf5, 0x3d, 0xd8, 0xed, 0xbc, + 0xc3, 0x42, 0x58, 0x2e, 0x70, 0x6e, 0x13, 0x8e, 0x07, 0x3a, 0x10, 0xe8, 0x69, 0x88, 0xb2, 0x93, + 0xfb, 0xfc, 0x3c, 0xe3, 0xbd, 0xe3, 0x3d, 0x8f, 0x7e, 0xdb, 0x56, 0x38, 0x52, 0xee, 0x12, 0x9c, + 0x1a, 0xe9, 0x41, 0xb8, 0x81, 0x28, 0xc9, 0x13, 0x88, 0xca, 0xfd, 0xbc, 0x04, 0xf3, 0xa3, 0xbd, + 0x02, 0x54, 0x18, 0x60, 0xe8, 0xc2, 0x84, 0x3e, 0x85, 0x87, 0x2b, 0xb2, 0x52, 0xeb, 0xe1, 0x6d, + 0x6c, 0x37, 0x77, 0x99, 0x7b, 0xc2, 0xac, 0xc5, 0xb4, 0x32, 0xcd, 0x73, 0x29, 0x8e, 0xc5, 0xc0, + 0x5e, 0xc4, 0x4d, 0x5b, 0x65, 0x9d, 0x6a, 0xd1, 0xa5, 0x4f, 0x82, 0x80, 0x91, 0xdc, 0x3a, 0xcb, + 0xcc, 0x3d, 0x08, 0x27, 0x47, 0xf8, 0x19, 0x01, 0x17, 0x0f, 0x5e, 0x20, 0xc0, 0x81, 0xce, 0x03, + 0x7a, 0x06, 0xa2, 0x96, 0xad, 0xd9, 0x7d, 0x8b, 0xb7, 0xec, 0xfe, 0xb1, 0x7e, 0x47, 0x9d, 0x82, + 0x2b, 0x1c, 0x2d, 0x87, 0x01, 0x0d, 0x7b, 0x11, 0x01, 0xcb, 0x52, 0x29, 0x68, 0x59, 0x1a, 0x74, + 0x54, 0x36, 0x14, 0x74, 0x54, 0x36, 0xb7, 0x05, 0xa7, 0x0f, 0xf1, 0x2c, 0x50, 0x71, 0xa0, 0x19, + 0x0f, 0x4e, 0xe4, 0x98, 0x0c, 0x34, 0xe5, 0xd7, 0xc3, 0x70, 0x3c, 0xd0, 0xc1, 0xf0, 0x0c, 0x74, + 0xe9, 0xab, 0x1d, 0xe8, 0x4f, 0x03, 0xd8, 0xfb, 0xe2, 0x62, 0x0a, 0x9f, 0x30, 0x82, 0x56, 0x55, + 0xfb, 0xb8, 0x49, 0x6d, 0x1e, 0x51, 0xa1, 0x84, 0xcd, 0x7f, 0x59, 0xa8, 0xe1, 0x0d, 0x1a, 0xf4, + 0xe9, 0x64, 0x62, 0xf1, 0xc5, 0xf1, 0xc4, 0xd3, 0x8e, 0x1b, 0x5d, 0x60, 0xd9, 0x16, 0x7a, 0x01, + 0x4e, 0x0e, 0x4c, 0x8a, 0x0e, 0xed, 0xc8, 0xc4, 0x73, 0xe3, 0x71, 0xff, 0xdc, 0x28, 0x68, 0x7b, + 0x27, 0xb6, 0x29, 0xff, 0x35, 0x9d, 0x35, 0x90, 0xe9, 0xb2, 0x99, 0xf9, 0x24, 0xec, 0x6c, 0x46, + 0xf4, 0x08, 0x27, 0x64, 0x08, 0x32, 0xed, 0x28, 0x76, 0x42, 0xe3, 0x05, 0x00, 0x37, 0xb2, 0xe0, + 0x1e, 0x62, 0x96, 0xbc, 0x87, 0x98, 0xaf, 0xc0, 0x14, 0x51, 0x41, 0x21, 0xf9, 0x00, 0x4b, 0x45, + 0x34, 0xc4, 0x13, 0x9a, 0x60, 0xe0, 0xb9, 0x17, 0x85, 0x9a, 0x7b, 0xe3, 0xc2, 0x23, 0xea, 0x78, + 0xa3, 0xbf, 0x8e, 0xdc, 0xe8, 0x10, 0x73, 0x70, 0x5d, 0xdf, 0x01, 0x53, 0x54, 0x9b, 0x02, 0x6f, + 0xd9, 0x7f, 0x1b, 0x80, 0x66, 0xdb, 0x3d, 0x7d, 0xab, 0xef, 0xd6, 0xb0, 0x38, 0x42, 0x1d, 0xf3, + 0x02, 0xb0, 0x70, 0x17, 0xd7, 0xcb, 0x39, 0x17, 0xd7, 0xa3, 0x9b, 0x1e, 0x8a, 0xb9, 0x2a, 0xa4, + 0xfd, 0xb8, 0xe3, 0x7c, 0x2e, 0x71, 0x18, 0xd1, 0x75, 0x2d, 0xf8, 0x63, 0x86, 0x34, 0x91, 0x7b, + 0x6b, 0x08, 0x52, 0x5e, 0x65, 0xfe, 0x07, 0x38, 0x7d, 0xe7, 0xbe, 0x57, 0x82, 0xb8, 0xd3, 0xfe, + 0x43, 0x6e, 0x8a, 0xb8, 0x0f, 0x48, 0x38, 0xfb, 0x26, 0x6c, 0xa7, 0x2a, 0xec, 0xec, 0x54, 0xbd, + 0xc1, 0x99, 0x89, 0x46, 0x46, 0x48, 0xbc, 0xd2, 0x16, 0x87, 0xa7, 0xf9, 0xcc, 0xf8, 0xd4, 0x64, + 0x77, 0xd4, 0xe7, 0x60, 0xca, 0x7b, 0xc1, 0x9c, 0x25, 0x72, 0x96, 0xe7, 0x8c, 0x19, 0x1b, 0xdc, + 0x2e, 0x60, 0xc8, 0x03, 0x38, 0x7c, 0xad, 0x3c, 0x3c, 0xfe, 0x5a, 0x79, 0x64, 0xf0, 0x5a, 0x39, + 0x73, 0x3e, 0x72, 0xff, 0xaf, 0x04, 0x71, 0x31, 0x4a, 0xd0, 0x33, 0xde, 0xf3, 0x90, 0xe2, 0x70, + 0xd5, 0x68, 0xa3, 0xc7, 0x1b, 0xef, 0x39, 0x0e, 0x39, 0x74, 0x79, 0x25, 0x7c, 0xe4, 0xcb, 0x2b, + 0xdc, 0x1d, 0xfa, 0xcf, 0x21, 0x90, 0x07, 0x47, 0xf1, 0x57, 0xcf, 0xdf, 0xf0, 0xb4, 0x19, 0x0e, + 0x9a, 0x36, 0x47, 0x5c, 0x49, 0x89, 0x8c, 0xbc, 0x92, 0x32, 0xd4, 0xee, 0xa9, 0xa3, 0x5f, 0xda, + 0x19, 0x19, 0x42, 0x8e, 0x8e, 0x0a, 0x21, 0x8f, 0xb9, 0xdf, 0x12, 0x3b, 0xf4, 0x7e, 0x0b, 0x97, + 0xf3, 0xf7, 0x84, 0x20, 0xe9, 0x09, 0xf1, 0xa2, 0xc7, 0x7c, 0x17, 0x5d, 0xce, 0x1e, 0x1a, 0x0f, + 0xf6, 0xdc, 0x74, 0xf1, 0xf5, 0x4c, 0xe8, 0x0e, 0x7a, 0xe6, 0x6b, 0x7f, 0x9b, 0x37, 0xf8, 0x79, + 0x89, 0xa9, 0x11, 0xcf, 0x4b, 0x7c, 0x97, 0x04, 0x71, 0x27, 0x9e, 0x76, 0xd4, 0x5d, 0xdc, 0x13, + 0x10, 0xe5, 0x2e, 0x27, 0xdb, 0xc6, 0xe5, 0xa9, 0xc0, 0xe0, 0xf8, 0x3c, 0xc4, 0x3b, 0xd8, 0xd6, + 0xa8, 0x39, 0x66, 0xd3, 0xb5, 0x93, 0xbe, 0xb0, 0x05, 0x49, 0xcf, 0x46, 0x38, 0x3a, 0x05, 0xc7, + 0x8b, 0xd7, 0xcb, 0xc5, 0x67, 0xd5, 0xc6, 0xf3, 0x83, 0x9f, 0xbf, 0x1c, 0x2a, 0x52, 0xca, 0x34, + 0xcd, 0x3e, 0x8c, 0xe5, 0x2f, 0x62, 0x05, 0xa1, 0xf9, 0xc8, 0xdb, 0x7f, 0xe2, 0xcc, 0xb1, 0x0b, + 0x7f, 0x23, 0xc1, 0x6c, 0x80, 0x73, 0x8f, 0xce, 0xc2, 0xdd, 0xb5, 0xab, 0x57, 0xcb, 0x8a, 0x5a, + 0xaf, 0xe6, 0xd7, 0xeb, 0xd7, 0x6b, 0x0d, 0x55, 0x29, 0xd7, 0x37, 0x56, 0xbd, 0x9f, 0x8f, 0x5c, + 0x84, 0xbb, 0x82, 0x41, 0xf2, 0xc5, 0x62, 0x79, 0xbd, 0x21, 0x4b, 0x68, 0x01, 0x4e, 0x8f, 0x80, + 0x28, 0xd0, 0x6f, 0x5a, 0x8d, 0x26, 0xa1, 0x94, 0x6f, 0x94, 0x8b, 0x0d, 0x39, 0x8c, 0xee, 0x87, + 0x73, 0x87, 0x41, 0xf0, 0x8f, 0x5a, 0xca, 0x91, 0xb1, 0x80, 0xf5, 0x72, 0xb5, 0x54, 0x56, 0xe4, + 0x29, 0xde, 0xee, 0xf7, 0x87, 0x20, 0x3b, 0x6a, 0x0d, 0x41, 0x68, 0xe5, 0xd7, 0xd7, 0x57, 0x6f, + 0xba, 0xb4, 0x8a, 0xd7, 0x37, 0xaa, 0xcf, 0x0e, 0x8b, 0xe0, 0x3e, 0xc8, 0x1d, 0x06, 0xe8, 0x08, + 0xe2, 0x5e, 0x38, 0x7b, 0x28, 0x1c, 0x17, 0xc7, 0x18, 0x30, 0xa5, 0xdc, 0x50, 0x6e, 0xca, 0x61, + 0xb4, 0x04, 0x17, 0xc6, 0x82, 0x39, 0x65, 0x72, 0x04, 0x5d, 0x84, 0x07, 0x0f, 0x87, 0x67, 0x02, + 0x12, 0x08, 0x42, 0x44, 0xaf, 0x48, 0x70, 0x3c, 0x70, 0x31, 0x82, 0xce, 0xc1, 0xc2, 0xba, 0x52, + 0x2b, 0x96, 0xeb, 0x75, 0xe7, 0x9a, 0x8b, 0x5a, 0x6f, 0xe4, 0x1b, 0x1b, 0x75, 0x8f, 0x6c, 0x72, + 0x70, 0x66, 0x14, 0x90, 0x23, 0x97, 0x43, 0x60, 0xb8, 0x06, 0x08, 0x3d, 0xbd, 0x2d, 0xc1, 0xa9, + 0x91, 0x4b, 0x0a, 0x74, 0x1e, 0xee, 0x61, 0x5f, 0x58, 0x55, 0x37, 0x6b, 0x8d, 0xb2, 0x5a, 0x7e, + 0xbe, 0x51, 0xae, 0xd6, 0x2b, 0xb5, 0xea, 0x30, 0x57, 0xf7, 0xc3, 0xb9, 0x43, 0x21, 0x1d, 0xd6, + 0xc6, 0x01, 0x0e, 0xf0, 0xf7, 0x36, 0x09, 0x32, 0x03, 0xb6, 0x90, 0x7e, 0xc8, 0xb5, 0x52, 0x2f, + 0x94, 0xaf, 0xe7, 0x37, 0x2b, 0x35, 0x65, 0x70, 0xcc, 0x9e, 0x83, 0x85, 0xa1, 0xd2, 0xd2, 0xc6, + 0xfa, 0x6a, 0xa5, 0x98, 0x6f, 0x94, 0x55, 0x76, 0x37, 0x89, 0x34, 0x6c, 0x08, 0x68, 0xb5, 0x72, + 0xed, 0x7a, 0x43, 0x2d, 0xae, 0x56, 0xca, 0xd5, 0x86, 0x9a, 0x6f, 0x34, 0xf2, 0xee, 0x70, 0x2e, + 0x3c, 0x3b, 0xf2, 0x4c, 0xf0, 0xa5, 0xc9, 0xcf, 0x04, 0xf3, 0x53, 0xbf, 0xce, 0x91, 0xe0, 0x3f, + 0xbb, 0x08, 0xf7, 0xf0, 0xb7, 0xbf, 0x2c, 0x5b, 0xbb, 0xa5, 0x1b, 0x3b, 0xce, 0x03, 0x71, 0x3c, + 0xcd, 0x8f, 0x06, 0x9f, 0xe0, 0xef, 0x8b, 0x89, 0xdc, 0x31, 0xcf, 0xc4, 0x8d, 0x7c, 0x5d, 0x78, + 0xec, 0x95, 0x92, 0xb1, 0x07, 0x7f, 0x0f, 0x79, 0x82, 0x6e, 0xcc, 0x43, 0x77, 0x01, 0x4f, 0xd4, + 0xcd, 0x1f, 0xfe, 0x60, 0xc9, 0xfc, 0xa1, 0xe7, 0xa5, 0x73, 0x3f, 0x2c, 0x41, 0xfa, 0xba, 0x6e, + 0xd9, 0x66, 0x4f, 0x6f, 0x6a, 0x6d, 0xea, 0xb8, 0xbc, 0x61, 0xe2, 0x3b, 0x90, 0x85, 0x04, 0x99, + 0xc6, 0xf8, 0x43, 0x76, 0xbb, 0xe2, 0x1a, 0x62, 0x74, 0x4f, 0x6b, 0xb3, 0xfb, 0x87, 0xde, 0x97, + 0x30, 0x07, 0xc5, 0xee, 0x99, 0x5f, 0xbd, 0x54, 0x18, 0x6e, 0xee, 0x47, 0x42, 0x90, 0xa1, 0x4b, + 0x2b, 0x8b, 0xae, 0xec, 0xe9, 0xda, 0xf1, 0x06, 0x44, 0x7a, 0x9a, 0xcd, 0x17, 0x40, 0x85, 0x2b, + 0x47, 0x7e, 0x54, 0x8e, 0xd5, 0x40, 0x69, 0xa0, 0x37, 0x41, 0xbc, 0xa3, 0xed, 0xab, 0x94, 0x5e, + 0xe8, 0xab, 0xa2, 0x17, 0xeb, 0x68, 0xfb, 0x84, 0x3f, 0xf4, 0x6d, 0xf4, 0xa3, 0xb5, 0x6a, 0x73, + 0x57, 0x33, 0x76, 0x30, 0xa3, 0x1c, 0xfe, 0xaa, 0x28, 0x4f, 0x77, 0xb4, 0xfd, 0x22, 0xa5, 0x46, + 0xe8, 0xf3, 0xf7, 0xfa, 0x7e, 0x43, 0xe2, 0xeb, 0x5a, 0x2a, 0x18, 0xa4, 0x81, 0xdc, 0x74, 0x52, + 0xb4, 0x52, 0x11, 0xc0, 0xbe, 0x7f, 0x94, 0xdc, 0x07, 0xc4, 0x5a, 0x98, 0x26, 0xec, 0x7d, 0xf2, + 0xb5, 0x05, 0x89, 0xd5, 0x9a, 0x69, 0x0e, 0x89, 0x3d, 0xc9, 0x96, 0xff, 0x2a, 0xf5, 0x6d, 0x42, + 0x63, 0x7d, 0x9b, 0x69, 0xe1, 0xdb, 0x30, 0x82, 0xc0, 0xb0, 0x49, 0x39, 0x6f, 0xc3, 0x87, 0x25, + 0x48, 0x96, 0x3c, 0xaf, 0xf6, 0x66, 0x21, 0xd6, 0x31, 0x0d, 0xfd, 0x16, 0xee, 0x39, 0x9b, 0x28, + 0x2c, 0x49, 0xfc, 0x0f, 0xbd, 0x85, 0x0d, 0x5b, 0xb7, 0x0f, 0xc4, 0xeb, 0x41, 0x22, 0x4d, 0xb0, + 0x5e, 0xc2, 0x5b, 0x96, 0x2e, 0xe4, 0xac, 0x88, 0x24, 0x7a, 0x00, 0x64, 0x0b, 0x37, 0xfb, 0x3d, + 0xdd, 0x3e, 0x50, 0x9b, 0xa6, 0x61, 0x6b, 0x4d, 0x9b, 0x2f, 0x29, 0x32, 0x22, 0xbf, 0xc8, 0xb2, + 0x09, 0x91, 0x16, 0xb6, 0x35, 0xbd, 0xcd, 0x8e, 0x2e, 0x26, 0x14, 0x91, 0xe4, 0xac, 0xde, 0x8e, + 0x79, 0x17, 0x49, 0x45, 0x90, 0xcd, 0x2e, 0xee, 0xf9, 0xce, 0x68, 0x30, 0x6d, 0xcc, 0xfe, 0xe1, + 0xc7, 0x1e, 0x9e, 0xe3, 0x02, 0xe7, 0x5b, 0xf5, 0xec, 0xc2, 0x9e, 0x92, 0x11, 0x18, 0x62, 0x07, + 0xff, 0xa6, 0x6f, 0xcf, 0xa1, 0xbf, 0xe5, 0x3e, 0xfe, 0x35, 0x37, 0x24, 0xd4, 0xbc, 0x71, 0x50, + 0xc8, 0x7e, 0xc2, 0x25, 0xcd, 0x83, 0xea, 0xeb, 0x74, 0x61, 0xe4, 0xdd, 0x7f, 0xa0, 0x64, 0x88, + 0x6b, 0xf7, 0xa2, 0xa6, 0xb7, 0x71, 0x8b, 0xaf, 0xba, 0x79, 0x0a, 0xad, 0x38, 0x01, 0x31, 0xf6, + 0x25, 0xe6, 0xdc, 0x28, 0xdd, 0x28, 0x98, 0x46, 0xcb, 0x1f, 0x07, 0x43, 0x45, 0x88, 0xda, 0xe6, + 0x2d, 0x6c, 0x70, 0x01, 0x1d, 0xed, 0x5d, 0x48, 0x8e, 0x8a, 0xbe, 0x05, 0xe4, 0x16, 0x6e, 0xe3, + 0x1d, 0x76, 0x37, 0x79, 0x57, 0xeb, 0x61, 0xf6, 0xe4, 0xc7, 0x1d, 0xbd, 0x0d, 0x99, 0x71, 0x48, + 0xd5, 0x29, 0x25, 0xb4, 0xee, 0x7f, 0x17, 0x3a, 0xe6, 0xec, 0xf8, 0x07, 0xb6, 0xd1, 0xa3, 0x79, + 0x5e, 0xcb, 0xe3, 0x7b, 0x47, 0xfa, 0x01, 0x90, 0xfb, 0xc6, 0x96, 0x69, 0xd0, 0xcf, 0x0a, 0x73, + 0xef, 0x3a, 0xce, 0xb6, 0xd2, 0x9c, 0x7c, 0xbe, 0x95, 0xb6, 0x0e, 0x69, 0x17, 0x94, 0x8e, 0x90, + 0xc4, 0x51, 0x47, 0xc8, 0xb4, 0x43, 0x80, 0x80, 0xa0, 0x35, 0x00, 0x77, 0x0c, 0xd2, 0x5d, 0x90, + 0xe4, 0xe8, 0x1e, 0x73, 0x47, 0xb3, 0xb7, 0x31, 0x1e, 0x02, 0xc8, 0x80, 0xd9, 0x8e, 0x6e, 0xa8, + 0x16, 0x6e, 0x6f, 0xab, 0x5c, 0x72, 0xe2, 0xbd, 0x92, 0x44, 0xe1, 0x8d, 0x47, 0xe8, 0xcd, 0x3f, + 0xf9, 0xd8, 0xc3, 0x19, 0xf7, 0x75, 0xcd, 0xc5, 0x47, 0x96, 0x2e, 0x5f, 0x51, 0x66, 0x3a, 0xba, + 0x51, 0xc7, 0xed, 0xed, 0x92, 0x43, 0x18, 0xbd, 0x01, 0x4e, 0xbb, 0x02, 0x31, 0x0d, 0x75, 0xd7, + 0x6c, 0xb7, 0xd4, 0x1e, 0xde, 0x56, 0x9b, 0xf4, 0xdd, 0xd2, 0x14, 0x15, 0xe3, 0x49, 0x07, 0xa4, + 0x66, 0x5c, 0x37, 0xdb, 0x2d, 0x05, 0x6f, 0x17, 0x49, 0x31, 0x3a, 0x07, 0xae, 0x34, 0x54, 0xbd, + 0x65, 0x65, 0xa7, 0x17, 0xc3, 0xe7, 0x23, 0x4a, 0xca, 0xc9, 0xac, 0xb4, 0xac, 0x95, 0xf8, 0xdb, + 0xdf, 0xbf, 0x70, 0xec, 0xf5, 0xf7, 0x2f, 0x1c, 0xcb, 0x5d, 0xa5, 0xcf, 0x03, 0xf2, 0xa1, 0x85, + 0x2d, 0x74, 0x05, 0x12, 0x9a, 0x48, 0xb0, 0x3b, 0x6e, 0x87, 0x0c, 0x4d, 0x17, 0x34, 0xf7, 0x11, + 0x09, 0xa2, 0xa5, 0xcd, 0x75, 0x4d, 0xef, 0xa1, 0x32, 0xcc, 0xb8, 0xba, 0x3a, 0xe9, 0x28, 0x77, + 0xd5, 0x5b, 0x0c, 0xf3, 0xea, 0xa8, 0x03, 0x5d, 0x89, 0xc2, 0xd9, 0x3f, 0xfc, 0xd8, 0xc3, 0x77, + 0x73, 0x32, 0x9b, 0x03, 0x67, 0xbb, 0x04, 0xbd, 0xc1, 0x33, 0x5f, 0x9e, 0x36, 0xdf, 0x80, 0x18, + 0x63, 0xd5, 0x42, 0xcf, 0xc0, 0x54, 0x97, 0xfc, 0xe0, 0x91, 0xe8, 0x33, 0x23, 0x75, 0x9e, 0xc2, + 0x7b, 0x35, 0x84, 0xe1, 0xe5, 0xde, 0x11, 0x02, 0x28, 0x6d, 0x6e, 0x36, 0x7a, 0x7a, 0xb7, 0x8d, + 0xed, 0xaf, 0x55, 0xdb, 0x37, 0xe0, 0xb8, 0xe7, 0x29, 0x82, 0x5e, 0xf3, 0xe8, 0xed, 0x9f, 0x75, + 0x1f, 0x25, 0xe8, 0x35, 0x03, 0xc9, 0xb6, 0x2c, 0xdb, 0x21, 0x1b, 0x3e, 0x3a, 0xd9, 0x92, 0x65, + 0x0f, 0x4b, 0xf6, 0x79, 0x48, 0xba, 0xc2, 0xb0, 0x50, 0x05, 0xe2, 0x36, 0xff, 0xcd, 0x05, 0x9c, + 0x1b, 0x2d, 0x60, 0x81, 0xe6, 0x15, 0xb2, 0x83, 0x9e, 0xfb, 0x92, 0x04, 0xe0, 0x19, 0x23, 0xdf, + 0x98, 0x3a, 0x86, 0x2a, 0x10, 0xe5, 0xc6, 0x39, 0x7c, 0xc7, 0xaf, 0x0b, 0x33, 0x02, 0x1e, 0xa1, + 0xbe, 0x33, 0x04, 0xb3, 0x1b, 0x62, 0xf4, 0x7e, 0xe3, 0xcb, 0x60, 0x03, 0x62, 0xd8, 0xb0, 0x7b, + 0xba, 0xb3, 0x93, 0xf2, 0xc8, 0xa8, 0x3e, 0x0f, 0x68, 0x14, 0x3d, 0x97, 0xe0, 0xd5, 0x00, 0x41, + 0xcb, 0x23, 0x8f, 0xf7, 0x84, 0x21, 0x3b, 0x0a, 0x15, 0xdd, 0x0f, 0x99, 0x66, 0x0f, 0xd3, 0x0c, + 0xff, 0x95, 0xcb, 0xb4, 0xc8, 0xe6, 0xd3, 0x8e, 0x02, 0xc4, 0x51, 0x23, 0xca, 0x45, 0x40, 0xef, + 0xcc, 0x33, 0x4b, 0xbb, 0x14, 0xe8, 0xc4, 0xd3, 0x80, 0x8c, 0xb8, 0xa7, 0xb1, 0xa5, 0xb5, 0x35, + 0xa3, 0x29, 0x3c, 0xd8, 0x23, 0xcd, 0xf9, 0xe2, 0xae, 0x47, 0x81, 0x91, 0x40, 0x65, 0x88, 0x09, + 0x6a, 0x91, 0xa3, 0x53, 0x13, 0xb8, 0xe8, 0x2c, 0xa4, 0xbc, 0x13, 0x03, 0xf5, 0x46, 0x22, 0x4a, + 0xd2, 0x33, 0x2f, 0x8c, 0x9b, 0x79, 0xa2, 0x87, 0xce, 0x3c, 0xdc, 0xe1, 0xfb, 0xf1, 0x30, 0xcc, + 0x28, 0xb8, 0xf5, 0xf7, 0xbf, 0x5b, 0xd6, 0x01, 0xd8, 0x50, 0x25, 0x96, 0x94, 0xf7, 0xcc, 0x1d, + 0x8c, 0xf7, 0x04, 0x23, 0x52, 0xb2, 0xec, 0xbf, 0xab, 0x1e, 0xfa, 0xf7, 0x21, 0x48, 0x79, 0x7b, + 0xe8, 0x1f, 0xe4, 0xa4, 0x85, 0xaa, 0xae, 0x99, 0x62, 0x37, 0x4d, 0x1e, 0x18, 0x65, 0xa6, 0x86, + 0xb4, 0x79, 0x8c, 0x7d, 0x7a, 0x6f, 0x18, 0xa2, 0xfc, 0x3c, 0x53, 0x6d, 0xc8, 0xb7, 0x1d, 0x7b, + 0xdf, 0x7e, 0x5a, 0x6c, 0xc8, 0x06, 0xba, 0xb6, 0xf7, 0x42, 0x9a, 0xac, 0x91, 0x7d, 0x87, 0xa4, + 0xa4, 0xf3, 0xd3, 0x74, 0xa9, 0xeb, 0x9e, 0x89, 0x46, 0x0b, 0x90, 0x24, 0x60, 0xae, 0x1d, 0x26, + 0x30, 0xd0, 0xd1, 0xf6, 0xcb, 0x2c, 0x07, 0x3d, 0x0c, 0x68, 0xd7, 0x09, 0x5a, 0xa8, 0xae, 0x20, + 0x08, 0xdc, 0x8c, 0x5b, 0x22, 0xc0, 0xef, 0x06, 0x20, 0x5c, 0xa8, 0xec, 0x41, 0x7d, 0xfe, 0xb9, + 0x02, 0x92, 0x53, 0xa2, 0x8f, 0xea, 0xbf, 0x4d, 0x62, 0x2e, 0xf2, 0xc0, 0x4a, 0x9a, 0xaf, 0x50, + 0x1a, 0x13, 0x0c, 0x8a, 0xbf, 0x7e, 0x6d, 0x61, 0xfe, 0x40, 0xeb, 0xb4, 0x57, 0x72, 0x01, 0x74, + 0x72, 0x41, 0x8b, 0x7b, 0xe2, 0x38, 0xfb, 0x57, 0xe2, 0x2b, 0xf7, 0x10, 0xf5, 0x7e, 0xe5, 0x33, + 0x1f, 0xbd, 0x70, 0xda, 0xf3, 0x86, 0xfd, 0xbe, 0x13, 0xd4, 0x62, 0x7d, 0x42, 0x3c, 0x55, 0xe4, + 0xce, 0x1a, 0x9e, 0x93, 0x6c, 0xe0, 0x71, 0xee, 0xa5, 0xc3, 0x17, 0x0d, 0x2e, 0xbe, 0x6f, 0xd1, + 0xe0, 0x19, 0x53, 0x6f, 0x74, 0x8d, 0xb6, 0xfb, 0xaa, 0xd5, 0xd0, 0x17, 0x16, 0x96, 0x8a, 0xa6, + 0xee, 0x23, 0x21, 0x90, 0xe8, 0x50, 0x3d, 0x96, 0xfb, 0x37, 0x12, 0x9c, 0x1a, 0x52, 0x3f, 0x87, + 0xe5, 0x26, 0xa0, 0x9e, 0xa7, 0x90, 0x76, 0xa3, 0x78, 0x22, 0xfa, 0xce, 0xb4, 0x79, 0xa6, 0x37, + 0x64, 0xb9, 0xbf, 0x36, 0xb3, 0x0f, 0x37, 0x3d, 0xbf, 0x2b, 0xc1, 0x9c, 0x97, 0x01, 0xa7, 0x29, + 0x75, 0x48, 0x79, 0xab, 0xe6, 0x8d, 0xb8, 0x67, 0x92, 0x46, 0x78, 0xf9, 0xf7, 0x11, 0x41, 0x9b, + 0xee, 0x10, 0x67, 0xa1, 0xb4, 0x4b, 0x13, 0x0b, 0x45, 0x30, 0x16, 0x38, 0xd4, 0x59, 0xdf, 0x7c, + 0x5e, 0x82, 0xc8, 0xba, 0x69, 0xb6, 0xd1, 0x9b, 0x61, 0xc6, 0x30, 0x6d, 0x95, 0x0c, 0x07, 0xdc, + 0x52, 0xf9, 0x5a, 0x9f, 0x99, 0xcf, 0xf2, 0xa1, 0xb2, 0xfa, 0xdc, 0x6b, 0x0b, 0xc3, 0x98, 0x41, + 0xdf, 0xb8, 0xc8, 0x18, 0xa6, 0x5d, 0xa0, 0x40, 0x0d, 0x16, 0x0e, 0xd8, 0x86, 0x69, 0x7f, 0x75, + 0xcc, 0xc4, 0xe6, 0xc7, 0x55, 0x37, 0x3d, 0xb6, 0xaa, 0xd4, 0x96, 0xa7, 0x1e, 0xf6, 0x26, 0xfe, + 0x5f, 0xb2, 0x47, 0x4a, 0xe4, 0xcd, 0xc1, 0x73, 0x2e, 0x57, 0x21, 0x26, 0xce, 0xb5, 0x48, 0x93, + 0x9e, 0x99, 0xf1, 0xca, 0x93, 0x23, 0x5f, 0xf8, 0x15, 0x09, 0xc0, 0x0d, 0x9c, 0xa0, 0x87, 0xe0, + 0x64, 0xa1, 0x56, 0x2d, 0xb9, 0xc1, 0x7d, 0xcf, 0xc7, 0xa3, 0xc4, 0xdb, 0x5f, 0x56, 0x17, 0x37, + 0xf5, 0x6d, 0x1d, 0xb7, 0xd0, 0x7d, 0x30, 0xe7, 0x87, 0x26, 0xa9, 0x72, 0x49, 0x96, 0xe6, 0x53, + 0xaf, 0xdc, 0x5e, 0x8c, 0x33, 0x47, 0x11, 0xb7, 0xd0, 0x79, 0x38, 0x3e, 0x0c, 0x57, 0xa9, 0x5e, + 0x93, 0x43, 0xf3, 0xd3, 0xaf, 0xdc, 0x5e, 0x4c, 0x38, 0x1e, 0x25, 0xca, 0x01, 0xf2, 0x42, 0x72, + 0x7a, 0xe1, 0x79, 0x78, 0xe5, 0xf6, 0x62, 0x94, 0x75, 0x03, 0xdf, 0x15, 0xf8, 0x56, 0x80, 0x8a, + 0xb1, 0xdd, 0xd3, 0x9a, 0x54, 0xdd, 0xe6, 0xe1, 0x44, 0xa5, 0x7a, 0x55, 0xc9, 0x17, 0x1b, 0x95, + 0x5a, 0x75, 0xe0, 0x9b, 0x57, 0xfe, 0xb2, 0x52, 0x6d, 0xa3, 0xb0, 0x5a, 0x56, 0xeb, 0x95, 0x6b, + 0x55, 0xb6, 0x85, 0xe7, 0x2b, 0x7b, 0xae, 0xda, 0xa8, 0xac, 0x95, 0xe5, 0x50, 0xe1, 0xea, 0xc8, + 0x68, 0xff, 0x43, 0x87, 0x7e, 0xb6, 0xc3, 0x35, 0x79, 0xbe, 0x0f, 0x78, 0xfc, 0xcf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xd9, 0x65, 0xbe, 0xbe, 0xe3, 0xba, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -7242,7 +7254,7 @@ func (m *ValidatorUpdates) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Updates = append(m.Updates, v11.ValidatorUpdate{}) + m.Updates = append(m.Updates, v21.ValidatorUpdate{}) if err := m.Updates[len(m.Updates)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index 3847afd204..c2fbebec34 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -7,9 +7,9 @@ import ( "strings" "time" - abci "github.com/cometbft/cometbft/abci/types" cmtprotocrypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1" - "github.com/cometbft/cometbft/crypto/encoding" + abci "github.com/cometbft/cometbft/v2/abci/types" + "github.com/cometbft/cometbft/v2/crypto/encoding" "cosmossdk.io/core/address" "cosmossdk.io/errors" diff --git a/x/staking/types/validator_test.go b/x/staking/types/validator_test.go index 6d5febb95c..ada0e95f2f 100644 --- a/x/staking/types/validator_test.go +++ b/x/staking/types/validator_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - cmttypes "github.com/cometbft/cometbft/types" + cmttypes "github.com/cometbft/cometbft/v2/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/upgrade/types/storeloader_test.go b/x/upgrade/types/storeloader_test.go index 9a3dac9629..0d4c5f41d0 100644 --- a/x/upgrade/types/storeloader_test.go +++ b/x/upgrade/types/storeloader_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/cometbft/cometbft/v2/abci/types" dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require"