From 03815911c5c878c540e24f3dd73f35bedff78989 Mon Sep 17 00:00:00 2001 From: Till Ziegler Date: Fri, 24 May 2024 18:08:12 +0200 Subject: [PATCH 1/6] feat: v3 upgrade (#471) Co-authored-by: Dong Lieu Co-authored-by: Anh Minh <1phamminh0811@gmail.com> Co-authored-by: expertdicer Co-authored-by: StrathCole <7449529+StrathCole@users.noreply.github.com> --- Dockerfile | 4 +- Makefile | 8 +- app/app.go | 97 ++- app/encoding.go | 2 +- app/export.go | 8 +- app/keepers/keepers.go | 187 ++--- app/keepers/routers.go | 35 +- app/legacy/migrate.go | 17 +- app/legacy/pubkey_replacement.go | 4 +- app/modules.go | 153 ++-- app/sim_test.go | 97 ++- app/testing/mock.go | 6 +- app/testing/test_suite.go | 95 ++- app/upgrades/forks/constants.go | 4 +- app/upgrades/forks/forks.go | 8 +- app/upgrades/types.go | 8 +- app/upgrades/v2/constants.go | 2 +- app/upgrades/v2/upgrades.go | 4 +- app/upgrades/v3/constants.go | 2 +- app/upgrades/v3/upgrades.go | 4 +- app/upgrades/v4/constants.go | 4 +- app/upgrades/v4/upgrades.go | 4 +- app/upgrades/v5/constants.go | 6 +- app/upgrades/v5/upgrades.go | 4 +- app/upgrades/v6/constants.go | 4 +- app/upgrades/v6/upgrades.go | 4 +- app/upgrades/v6_1/constants.go | 2 +- app/upgrades/v6_1/upgrades.go | 4 +- app/upgrades/v7/constants.go | 6 +- app/upgrades/v7/upgrades.go | 4 +- app/upgrades/v7_1/constants.go | 4 +- app/upgrades/v7_1/upgrades.go | 6 +- app/upgrades/v8/constants.go | 21 + app/upgrades/v8/upgrades.go | 70 ++ cmd/terrad/genaccounts.go | 2 +- cmd/terrad/main.go | 2 +- cmd/terrad/root.go | 60 +- cmd/terrad/testnet.go | 25 +- contrib/updates/Dockerfile.old | 125 ++++ contrib/updates/prepare_cosmovisor.sh | 2 +- custom/auth/ante/ante.go | 37 +- custom/auth/ante/ante_test.go | 26 +- custom/auth/ante/expected_keeper.go | 4 +- custom/auth/ante/fee.go | 15 +- custom/auth/ante/fee_burntax.go | 5 +- custom/auth/ante/fee_tax.go | 12 +- custom/auth/ante/fee_test.go | 16 +- custom/auth/ante/integration_test.go | 10 +- custom/auth/ante/min_initial_deposit.go | 8 +- custom/auth/ante/min_initial_deposit_test.go | 28 +- custom/auth/ante/spamming_memo_test.go | 59 ++ custom/auth/ante/spamming_prevention.go | 2 +- custom/auth/ante/spamming_prevention_test.go | 7 +- custom/auth/client/cli/estimate_fee.go | 2 +- custom/auth/client/utils/feeutils.go | 20 +- custom/auth/module.go | 9 +- custom/auth/post/post.go | 13 +- custom/auth/simulation/genesis.go | 4 +- custom/auth/tx/service.go | 2 +- custom/auth/tx/service.pb.go | 99 +-- custom/auth/tx/service.pb.gw.go | 30 +- custom/authz/client/cli/tx.go | 7 +- custom/authz/module.go | 4 +- custom/bank/client/cli/tx.go | 12 +- custom/bank/module.go | 11 +- custom/bank/simulation/genesis.go | 18 +- custom/bank/simulation/operations.go | 58 +- custom/crisis/module.go | 4 +- custom/distribution/module.go | 2 +- custom/distribution/types/codec.go | 2 +- custom/evidence/module.go | 2 +- custom/feegrant/module.go | 2 +- custom/gov/module.go | 10 +- custom/mint/module.go | 2 +- custom/params/module.go | 2 +- custom/params/types/codec.go | 2 +- custom/slashing/module.go | 2 +- custom/staking/module.go | 4 +- custom/staking/module_test.go | 19 +- custom/upgrade/module.go | 2 +- custom/upgrade/types/codec.go | 2 +- custom/wasm/client/cli/tx.go | 17 +- custom/wasm/keeper/handler_plugin.go | 7 +- custom/wasm/module.go | 8 +- custom/wasm/simulation/operations.go | 3 +- custom/wasm/types/legacy/genesis.pb.go | 78 +- custom/wasm/types/legacy/msgs.go | 69 +- custom/wasm/types/legacy/tx.pb.go | 252 ++----- custom/wasm/types/legacy/wasm.pb.go | 77 +- go.mod | 178 +++-- go.sum | 305 ++++---- ictest.Dockerfile | 4 +- proto/buf.lock | 8 +- proto/buf.yaml | 8 +- proto/terra/dyncomm/v1beta1/dyncomm.proto | 7 +- proto/terra/dyncomm/v1beta1/genesis.proto | 13 +- proto/terra/dyncomm/v1beta1/query.proto | 13 +- proto/terra/market/v1beta1/genesis.proto | 10 +- proto/terra/market/v1beta1/market.proto | 5 +- proto/terra/market/v1beta1/query.proto | 13 +- proto/terra/market/v1beta1/tx.proto | 10 +- proto/terra/oracle/v1beta1/genesis.proto | 16 +- proto/terra/oracle/v1beta1/oracle.proto | 9 +- proto/terra/oracle/v1beta1/query.proto | 30 +- proto/terra/oracle/v1beta1/tx.proto | 2 +- proto/terra/treasury/v1beta1/genesis.proto | 46 +- proto/terra/treasury/v1beta1/gov.proto | 13 +- proto/terra/treasury/v1beta1/query.proto | 43 +- proto/terra/treasury/v1beta1/treasury.proto | 12 +- proto/terra/tx/v1beta1/service.proto | 6 +- proto/terra/vesting/v1beta1/vesting.proto | 6 +- proto/terra/wasm/v1beta1/genesis.proto | 8 +- proto/terra/wasm/v1beta1/tx.proto | 2 +- proto/terra/wasm/v1beta1/wasm.proto | 2 +- scripts/protoc-swagger-gen.sh | 2 +- scripts/protocgen.sh | 2 +- scripts/run-node.sh | 1 - tests/e2e/configurer/base.go | 19 +- tests/e2e/configurer/chain/chain.go | 47 +- tests/e2e/configurer/chain/commands.go | 31 +- tests/e2e/configurer/chain/node.go | 10 +- tests/e2e/configurer/chain/queries.go | 13 +- tests/e2e/configurer/current.go | 6 +- tests/e2e/configurer/factory.go | 66 +- tests/e2e/containers/containers.go | 197 ++++- tests/e2e/e2e.Dockerfile | 4 +- tests/e2e/e2e_setup_test.go | 2 +- tests/e2e/e2e_test.go | 3 +- tests/e2e/initialization/chain.go | 11 +- tests/e2e/initialization/chain/main.go | 2 +- tests/e2e/initialization/config.go | 49 +- tests/e2e/initialization/init.go | 8 +- tests/e2e/initialization/init_test.go | 2 +- tests/e2e/initialization/node.go | 22 +- tests/e2e/initialization/node/main.go | 2 +- tests/e2e/initialization/util.go | 2 +- ...d_burn_tax_exemption_address_proposal.json | 2 +- tests/e2e/util/codec.go | 4 +- tests/interchaintest/chain_start_test.go | 6 +- tests/interchaintest/go.mod | 224 +++--- tests/interchaintest/go.sum | 702 +++++++++++++----- tests/interchaintest/helpers/cosmwams.go | 12 +- tests/interchaintest/helpers/ibc_hooks.go | 2 +- tests/interchaintest/helpers/pfm.go | 320 -------- tests/interchaintest/helpers/validator.go | 19 +- tests/interchaintest/ibc_hooks_test.go | 14 +- tests/interchaintest/ibc_pfm_terra_test.go | 75 -- tests/interchaintest/ibc_pfm_test.go | 72 -- tests/interchaintest/ibc_transfer_test.go | 16 +- tests/interchaintest/setup.go | 31 +- tests/interchaintest/validator_test.go | 10 +- types/alias.go | 8 +- wasmbinding/bindings/query.go | 4 +- wasmbinding/helper.go | 13 - wasmbinding/message_plugin.go | 35 +- wasmbinding/queries.go | 8 +- wasmbinding/query_plugin.go | 23 +- wasmbinding/stargate_whitelist.go | 6 +- wasmbinding/test/custom_message_test.go | 10 +- wasmbinding/test/custom_query_test.go | 16 +- wasmbinding/test/custom_test.go | 6 +- wasmbinding/test/helpers_test.go | 2 +- wasmbinding/test/tax_test.go | 4 +- wasmbinding/wasm.go | 11 +- x/dyncomm/abci.go | 6 +- x/dyncomm/ante/ante.go | 15 +- x/dyncomm/ante/ante_test.go | 22 +- x/dyncomm/client/cli/query.go | 2 +- x/dyncomm/genesis.go | 4 +- x/dyncomm/keeper/dyncomm.go | 2 +- x/dyncomm/keeper/dyncomm_test.go | 8 +- x/dyncomm/keeper/keeper.go | 4 +- x/dyncomm/keeper/legacy_querier.go | 30 - x/dyncomm/keeper/params.go | 2 +- x/dyncomm/keeper/querier.go | 2 +- x/dyncomm/keeper/test_utils.go | 48 +- x/dyncomm/module.go | 24 +- x/dyncomm/post/post.go | 10 +- x/dyncomm/types/dyncomm.pb.go | 73 +- x/dyncomm/types/genesis.pb.go | 81 +- x/dyncomm/types/query.pb.go | 119 ++- x/dyncomm/types/query.pb.gw.go | 26 +- x/market/abci.go | 2 +- x/market/abci_test.go | 2 +- x/market/client/cli/query.go | 2 +- x/market/client/cli/tx.go | 9 +- x/market/common_test.go | 4 +- x/market/exported/alias.go | 2 +- x/market/genesis.go | 4 +- x/market/genesis_test.go | 2 +- x/market/handler.go | 7 +- x/market/handler_test.go | 6 +- x/market/keeper/alias_functions.go | 2 +- x/market/keeper/keeper.go | 4 +- x/market/keeper/keeper_test.go | 2 +- x/market/keeper/legacy_querier.go | 63 -- x/market/keeper/legacy_querier_test.go | 137 ---- x/market/keeper/msg_server.go | 4 +- x/market/keeper/params.go | 2 +- x/market/keeper/querier.go | 2 +- x/market/keeper/querier_test.go | 4 +- x/market/keeper/swap.go | 22 +- x/market/keeper/swap_test.go | 2 +- x/market/keeper/test_utils.go | 52 +- x/market/module.go | 22 +- x/market/simulation/decoder.go | 2 +- x/market/simulation/decoder_test.go | 4 +- x/market/simulation/genesis.go | 2 +- x/market/simulation/operations.go | 19 +- x/market/simulation/params.go | 12 +- x/market/types/errors.go | 8 +- x/market/types/genesis.pb.go | 58 +- x/market/types/market.pb.go | 72 +- x/market/types/msgs.go | 15 +- x/market/types/msgs_test.go | 2 +- x/market/types/params.go | 2 +- x/market/types/query.pb.go | 147 ++-- x/market/types/query.pb.gw.go | 32 +- x/market/types/tx.pb.go | 126 ++-- x/oracle/abci.go | 6 +- x/oracle/abci_test.go | 10 +- x/oracle/client/cli/query.go | 2 +- x/oracle/client/cli/tx.go | 2 +- x/oracle/common_test.go | 4 +- x/oracle/exported/alias.go | 2 +- x/oracle/genesis.go | 4 +- x/oracle/genesis_test.go | 6 +- x/oracle/handler.go | 7 +- x/oracle/handler_test.go | 8 +- x/oracle/keeper/alias_functions.go | 2 +- x/oracle/keeper/ballot.go | 2 +- x/oracle/keeper/ballot_test.go | 4 +- x/oracle/keeper/keeper.go | 20 +- x/oracle/keeper/keeper_test.go | 4 +- x/oracle/keeper/legacy_querier.go | 250 ------- x/oracle/keeper/legacy_querier_test.go | 414 ----------- x/oracle/keeper/msg_server.go | 15 +- x/oracle/keeper/msg_server_test.go | 4 +- x/oracle/keeper/params.go | 2 +- x/oracle/keeper/querier.go | 2 +- x/oracle/keeper/querier_test.go | 4 +- x/oracle/keeper/reward.go | 4 +- x/oracle/keeper/reward_test.go | 4 +- x/oracle/keeper/test_utils.go | 49 +- x/oracle/module.go | 22 +- x/oracle/simulation/decoder.go | 2 +- x/oracle/simulation/decoder_test.go | 10 +- x/oracle/simulation/genesis.go | 4 +- x/oracle/simulation/operations.go | 30 +- x/oracle/simulation/params.go | 18 +- x/oracle/tally.go | 7 +- x/oracle/tally_fuzz_test.go | 4 +- x/oracle/types/ballot_test.go | 8 +- x/oracle/types/denom_test.go | 2 +- x/oracle/types/errors.go | 30 +- x/oracle/types/expected_keeper.go | 7 +- x/oracle/types/genesis.pb.go | 118 ++- x/oracle/types/genesis_test.go | 4 +- x/oracle/types/hash.go | 2 +- x/oracle/types/hash_test.go | 2 +- x/oracle/types/msgs.go | 27 +- x/oracle/types/msgs_test.go | 4 +- x/oracle/types/oracle.pb.go | 149 ++-- x/oracle/types/params.go | 2 +- x/oracle/types/params_test.go | 2 +- x/oracle/types/query.pb.go | 381 +++------- x/oracle/types/query.pb.gw.go | 70 +- x/oracle/types/test_utils.go | 44 +- x/oracle/types/tx.pb.go | 144 ++-- x/oracle/types/vote_test.go | 2 +- x/treasury/abci.go | 6 +- x/treasury/abci_test.go | 6 +- x/treasury/client/cli/gov_tx.go | 2 +- x/treasury/client/cli/query.go | 2 +- x/treasury/client/proposal_handler.go | 2 +- x/treasury/exported/alias.go | 2 +- x/treasury/genesis.go | 9 +- x/treasury/genesis_test.go | 4 +- x/treasury/keeper/alias_functions.go | 2 +- x/treasury/keeper/burn_account.go | 2 +- x/treasury/keeper/burn_account_test.go | 2 +- x/treasury/keeper/gov.go | 2 +- x/treasury/keeper/indicator.go | 2 +- x/treasury/keeper/indicator_test.go | 5 +- x/treasury/keeper/keeper.go | 23 +- x/treasury/keeper/keeper_test.go | 9 +- x/treasury/keeper/legacy_querier.go | 199 ----- x/treasury/keeper/legacy_querier_test.go | 350 --------- x/treasury/keeper/migrations.go | 2 +- x/treasury/keeper/params.go | 2 +- x/treasury/keeper/policy_test.go | 6 +- x/treasury/keeper/querier.go | 7 +- x/treasury/keeper/querier_test.go | 4 +- x/treasury/keeper/seigniorage.go | 4 +- x/treasury/keeper/seigniorage_test.go | 2 +- x/treasury/keeper/test_utils.go | 70 +- x/treasury/module.go | 22 +- x/treasury/proposal_handler.go | 8 +- x/treasury/simulation/decoder.go | 2 +- x/treasury/simulation/decoder_test.go | 6 +- x/treasury/simulation/genesis.go | 4 +- x/treasury/simulation/params.go | 20 +- x/treasury/types/errors.go | 4 +- x/treasury/types/exptected_keepers.go | 5 +- x/treasury/types/genesis.pb.go | 113 ++- x/treasury/types/gov.go | 10 +- x/treasury/types/gov.pb.go | 68 +- x/treasury/types/keys.go | 4 +- x/treasury/types/params.go | 2 +- x/treasury/types/querier.go | 5 +- x/treasury/types/query.pb.go | 310 +++----- x/treasury/types/query.pb.gw.go | 58 +- x/treasury/types/treasury.pb.go | 149 ++-- x/vesting/module.go | 2 +- x/vesting/types/common_test.go | 10 +- x/vesting/types/genesis_test.go | 6 +- x/vesting/types/vesting.pb.go | 102 +-- x/vesting/types/vesting_account_test.go | 8 +- 318 files changed, 4251 insertions(+), 5771 deletions(-) create mode 100644 app/upgrades/v8/constants.go create mode 100644 app/upgrades/v8/upgrades.go create mode 100644 contrib/updates/Dockerfile.old create mode 100644 custom/auth/ante/spamming_memo_test.go delete mode 100644 tests/interchaintest/helpers/pfm.go delete mode 100644 tests/interchaintest/ibc_pfm_terra_test.go delete mode 100644 tests/interchaintest/ibc_pfm_test.go delete mode 100644 x/dyncomm/keeper/legacy_querier.go delete mode 100644 x/market/keeper/legacy_querier.go delete mode 100644 x/market/keeper/legacy_querier_test.go delete mode 100644 x/oracle/keeper/legacy_querier.go delete mode 100644 x/oracle/keeper/legacy_querier_test.go delete mode 100644 x/treasury/keeper/legacy_querier.go delete mode 100644 x/treasury/keeper/legacy_querier_test.go diff --git a/Dockerfile b/Dockerfile index 95defca46..5e4e6cd11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,8 +52,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ # Cosmwasm - Download correct libwasmvm version and verify checksum RUN set -eux &&\ - WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 5) && \ - WASMVM_DOWNLOADS="https://github.com/classic-terra/wasmvm/releases/download/${WASMVM_VERSION}"; \ + WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 2) && \ + WASMVM_DOWNLOADS="https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}"; \ wget ${WASMVM_DOWNLOADS}/checksums.txt -O /tmp/checksums.txt; \ if [ ${BUILDPLATFORM} = "linux/amd64" ]; then \ WASMVM_URL="${WASMVM_DOWNLOADS}/libwasmvm_muslc.x86_64.a"; \ diff --git a/Makefile b/Makefile index 9065df090..f521db964 100755 --- a/Makefile +++ b/Makefile @@ -300,9 +300,8 @@ format: ### Protobuf ### ############################################################################### -CONTAINER_PROTO_VER=v0.7 -CONTAINER_PROTO_IMAGE=tendermintdev/sdk-proto-gen:$(CONTAINER_PROTO_VER) -CONTAINER_PROTO_FMT=cosmos-sdk-proto-fmt-$(CONTAINER_PROTO_VER) +CONTAINER_PROTO_VER=0.13.1 +CONTAINER_PROTO_IMAGE=ghcr.io/cosmos/proto-builder:$(CONTAINER_PROTO_VER) proto-all: proto-format proto-lint proto-gen @@ -312,8 +311,7 @@ proto-gen: proto-format: @echo "Formatting Protobuf files" - @if docker ps -a --format '{{.Names}}' | grep -Eq "^${CONTAINER_PROTO_FMT}$$"; then docker start -a $(CONTAINER_PROTO_FMT); else docker run --name $(CONTAINER_PROTO_FMT) -v $(CURDIR):/workspace --workdir /workspace tendermintdev/docker-build-proto \ - find ./proto -name "*.proto" -exec clang-format -i {} \; ; fi + @$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(CONTAINER_PROTO_IMAGE) find ./proto -name "*.proto" -exec clang-format -i {} \; proto-lint: @$(DOCKER_BUF) lint --error-format=json diff --git a/app/app.go b/app/app.go index 269ac5f94..73a944da7 100644 --- a/app/app.go +++ b/app/app.go @@ -1,6 +1,7 @@ package app import ( + "encoding/json" "fmt" "io" stdlog "log" @@ -12,22 +13,24 @@ import ( "github.com/rakyll/statik/fs" "github.com/spf13/cast" - abci "github.com/tendermint/tendermint/abci/types" - tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - tmos "github.com/tendermint/tendermint/libs/os" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + tmjson "github.com/cometbft/cometbft/libs/json" + "github.com/cometbft/cometbft/libs/log" + tmos "github.com/cometbft/cometbft/libs/os" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" + nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/runtime" + "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/version" @@ -38,28 +41,31 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/classic-terra/core/v2/app/keepers" - terraappparams "github.com/classic-terra/core/v2/app/params" + "github.com/classic-terra/core/v3/app/keepers" + terraappparams "github.com/classic-terra/core/v3/app/params" // upgrades - "github.com/classic-terra/core/v2/app/upgrades" - v2 "github.com/classic-terra/core/v2/app/upgrades/v2" - v3 "github.com/classic-terra/core/v2/app/upgrades/v3" - v4 "github.com/classic-terra/core/v2/app/upgrades/v4" - v5 "github.com/classic-terra/core/v2/app/upgrades/v5" - v6 "github.com/classic-terra/core/v2/app/upgrades/v6" - v6_1 "github.com/classic-terra/core/v2/app/upgrades/v6_1" - v7 "github.com/classic-terra/core/v2/app/upgrades/v7" - v7_1 "github.com/classic-terra/core/v2/app/upgrades/v7_1" - - customante "github.com/classic-terra/core/v2/custom/auth/ante" - custompost "github.com/classic-terra/core/v2/custom/auth/post" - customauthtx "github.com/classic-terra/core/v2/custom/auth/tx" + "github.com/classic-terra/core/v3/app/upgrades" + v2 "github.com/classic-terra/core/v3/app/upgrades/v2" + v3 "github.com/classic-terra/core/v3/app/upgrades/v3" + v4 "github.com/classic-terra/core/v3/app/upgrades/v4" + v5 "github.com/classic-terra/core/v3/app/upgrades/v5" + v6 "github.com/classic-terra/core/v3/app/upgrades/v6" + v6_1 "github.com/classic-terra/core/v3/app/upgrades/v6_1" + v7 "github.com/classic-terra/core/v3/app/upgrades/v7" + v7_1 "github.com/classic-terra/core/v3/app/upgrades/v7_1" + v8 "github.com/classic-terra/core/v3/app/upgrades/v8" + + customante "github.com/classic-terra/core/v3/custom/auth/ante" + custompost "github.com/classic-terra/core/v3/custom/auth/post" + customauthtx "github.com/classic-terra/core/v3/custom/auth/tx" "github.com/CosmWasm/wasmd/x/wasm" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" // unnamed import of statik for swagger UI support - _ "github.com/classic-terra/core/v2/client/docs/statik" + _ "github.com/classic-terra/core/v3/client/docs/statik" ) const appName = "TerraApp" @@ -69,7 +75,7 @@ var ( DefaultNodeHome string // Upgrades defines upgrades to be applied to the network - Upgrades = []upgrades.Upgrade{v2.Upgrade, v3.Upgrade, v4.Upgrade, v5.Upgrade, v6.Upgrade, v6_1.Upgrade, v7.Upgrade, v7_1.Upgrade} + Upgrades = []upgrades.Upgrade{v2.Upgrade, v3.Upgrade, v4.Upgrade, v5.Upgrade, v6.Upgrade, v6_1.Upgrade, v7.Upgrade, v7_1.Upgrade, v8.Upgrade} // Forks defines forks to be applied to the network Forks = []upgrades.Fork{} @@ -77,7 +83,7 @@ var ( // Verify app interface at compile time var ( - _ simapp.App = (*TerraApp)(nil) + _ runtime.AppI = (*TerraApp)(nil) _ servertypes.Application = (*TerraApp)(nil) ) @@ -90,6 +96,7 @@ type TerraApp struct { legacyAmino *codec.LegacyAmino appCodec codec.Codec + txConfig client.TxConfig interfaceRegistry codectypes.InterfaceRegistry invCheckPeriod uint @@ -116,14 +123,17 @@ func init() { // NewTerraApp returns a reference to an initialized TerraApp. func NewTerraApp( logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool, - homePath string, invCheckPeriod uint, encodingConfig terraappparams.EncodingConfig, appOpts servertypes.AppOptions, - wasmOpts []wasm.Option, baseAppOptions ...func(*baseapp.BaseApp), + homePath string, encodingConfig terraappparams.EncodingConfig, appOpts servertypes.AppOptions, + wasmOpts []wasmkeeper.Option, baseAppOptions ...func(*baseapp.BaseApp), ) *TerraApp { appCodec := encodingConfig.Marshaler legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry + txConfig := encodingConfig.TxConfig - bApp := baseapp.NewBaseApp(appName, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) + invCheckPeriod := cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)) + + bApp := baseapp.NewBaseApp(appName, logger, db, txConfig.TxDecoder(), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version) bApp.SetInterfaceRegistry(interfaceRegistry) @@ -133,6 +143,7 @@ func NewTerraApp( legacyAmino: legacyAmino, appCodec: appCodec, interfaceRegistry: interfaceRegistry, + txConfig: txConfig, invCheckPeriod: invCheckPeriod, } @@ -172,8 +183,7 @@ func NewTerraApp( // NOTE: Treasury must occur after bank module so that initial supply is properly set app.mm.SetOrderInitGenesis(orderInitGenesis()...) - app.mm.RegisterInvariants(&app.CrisisKeeper) - app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino) + app.mm.RegisterInvariants(app.CrisisKeeper) app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter()) app.mm.RegisterServices(app.configurator) app.setupUpgradeHandlers() @@ -211,10 +221,11 @@ func NewTerraApp( SigGasConsumer: ante.DefaultSigVerificationGasConsumer, SignModeHandler: encodingConfig.TxConfig.SignModeHandler(), IBCKeeper: *app.IBCKeeper, + WasmKeeper: &app.WasmKeeper, DistributionKeeper: app.DistrKeeper, GovKeeper: app.GovKeeper, WasmConfig: &wasmConfig, - TXCounterStoreKey: app.GetKey(wasm.StoreKey), + TXCounterStoreKey: app.GetKey(wasmtypes.StoreKey), DyncommKeeper: app.DyncommKeeper, StakingKeeper: app.StakingKeeper, Cdc: app.appCodec, @@ -237,6 +248,18 @@ func NewTerraApp( app.SetPostHandler(postHandler) app.SetEndBlocker(app.EndBlocker) + // must be before Loading version + // requires the snapshot store to be created and registered as a BaseAppOption + // see cmd/wasmd/root.go: 206 - 214 approx + if manager := app.SnapshotManager(); manager != nil { + err := manager.RegisterExtensions( + wasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.WasmKeeper), + ) + if err != nil { + panic(fmt.Errorf("failed to register snapshot extension: %s", err)) + } + } + if loadLatest { if err := app.LoadLatestVersion(); err != nil { tmos.Exit(err.Error()) @@ -255,6 +278,11 @@ func NewTerraApp( // Name returns the name of the App func (app *TerraApp) Name() string { return app.BaseApp.Name() } +// DefaultGenesis returns a default genesis from the registered AppModuleBasic's. +func (app *TerraApp) DefaultGenesis() map[string]json.RawMessage { + return ModuleBasics.DefaultGenesis(app.appCodec) +} + // BeginBlocker application updates every begin block func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { BeginBlockForks(ctx, app) @@ -371,6 +399,10 @@ func (app *TerraApp) RegisterTendermintService(clientCtx client.Context) { ) } +func (app *TerraApp) RegisterNodeService(clientCtx client.Context) { + nodeservice.RegisterNodeService(clientCtx, app.GRPCQueryRouter()) +} + // RegisterSwaggerAPI registers swagger route with API Server func RegisterSwaggerAPI(rtr *mux.Router) { statikFS, err := fs.New() @@ -403,7 +435,8 @@ func (app *TerraApp) setupUpgradeStoreLoaders() { for _, upgrade := range Upgrades { if upgradeInfo.Name == upgrade.UpgradeName { - app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrade.StoreUpgrades)) + storeUpgrades := upgrade.StoreUpgrades + app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) } } } diff --git a/app/encoding.go b/app/encoding.go index 4b9220a19..93a6eff9e 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec/legacy" "github.com/cosmos/cosmos-sdk/std" - "github.com/classic-terra/core/v2/app/params" + "github.com/classic-terra/core/v3/app/params" ) var legacyCodecRegistered = false diff --git a/app/export.go b/app/export.go index df4a3686f..6b8076eb2 100644 --- a/app/export.go +++ b/app/export.go @@ -4,7 +4,7 @@ import ( "encoding/json" "log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -12,13 +12,13 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" ) // ExportAppStateAndValidators exports the state of the application for a genesis // file. func (app *TerraApp) ExportAppStateAndValidators( - forZeroHeight bool, jailAllowedAddrs []string, + forZeroHeight bool, jailAllowedAddrs, modulesToExport []string, ) (servertypes.ExportedApp, error) { // as if they could withdraw from the start of the next block ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) @@ -31,7 +31,7 @@ func (app *TerraApp) ExportAppStateAndValidators( app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs) } - genState := app.mm.ExportGenesis(ctx, app.appCodec) + genState := app.mm.ExportGenesisForModules(ctx, app.appCodec, modulesToExport) appState, err := json.MarshalIndent(genState, "", " ") if err != nil { return servertypes.ExportedApp{}, err diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index f9b37543a..3df0dbbda 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -3,17 +3,20 @@ package keepers import ( "path/filepath" - icacontrollerkeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/keeper" - icacontrollertypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/types" - icahostkeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/keeper" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" - ibcfeekeeper "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/keeper" - ibcfeetypes "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/types" - ibctransfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer" - ibctransferkeeper "github.com/cosmos/ibc-go/v6/modules/apps/transfer/keeper" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" + ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7" + ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/keeper" + ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" + icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + ibcfeekeeper "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" + ibctransfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" @@ -27,6 +30,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" @@ -37,7 +42,6 @@ import ( feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" @@ -52,21 +56,17 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - customwasmkeeper "github.com/classic-terra/core/v2/custom/wasm/keeper" - terrawasm "github.com/classic-terra/core/v2/wasmbinding" - - dyncommkeeper "github.com/classic-terra/core/v2/x/dyncomm/keeper" - dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/types" - marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" - markettypes "github.com/classic-terra/core/v2/x/market/types" - oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" - treasurykeeper "github.com/classic-terra/core/v2/x/treasury/keeper" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" - - ibchooks "github.com/terra-money/core/v2/x/ibc-hooks" - ibchookskeeper "github.com/terra-money/core/v2/x/ibc-hooks/keeper" - ibchooktypes "github.com/terra-money/core/v2/x/ibc-hooks/types" + customwasmkeeper "github.com/classic-terra/core/v3/custom/wasm/keeper" + terrawasm "github.com/classic-terra/core/v3/wasmbinding" + + dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper" + dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types" + marketkeeper "github.com/classic-terra/core/v3/x/market/keeper" + markettypes "github.com/classic-terra/core/v3/x/market/types" + oraclekeeper "github.com/classic-terra/core/v3/x/oracle/keeper" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" + treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" ) type AppKeepers struct { @@ -76,31 +76,32 @@ type AppKeepers struct { memKeys map[string]*storetypes.MemoryStoreKey // keepers - AccountKeeper authkeeper.AccountKeeper - AuthzKeeper authzkeeper.Keeper - BankKeeper bankkeeper.Keeper - CapabilityKeeper *capabilitykeeper.Keeper - StakingKeeper stakingkeeper.Keeper - SlashingKeeper slashingkeeper.Keeper - MintKeeper mintkeeper.Keeper - DistrKeeper distrkeeper.Keeper - GovKeeper govkeeper.Keeper - CrisisKeeper crisiskeeper.Keeper - UpgradeKeeper upgradekeeper.Keeper - ParamsKeeper paramskeeper.Keeper - IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the appKeepers, so we can SetRouter on it correctly - IBCFeeKeeper ibcfeekeeper.Keeper - ICAControllerKeeper icacontrollerkeeper.Keeper - ICAHostKeeper icahostkeeper.Keeper - EvidenceKeeper evidencekeeper.Keeper - FeeGrantKeeper feegrantkeeper.Keeper - TransferKeeper ibctransferkeeper.Keeper - OracleKeeper oraclekeeper.Keeper - MarketKeeper marketkeeper.Keeper - TreasuryKeeper treasurykeeper.Keeper - WasmKeeper wasmkeeper.Keeper - DyncommKeeper dyncommkeeper.Keeper - IBCHooksKeeper *ibchookskeeper.Keeper + AccountKeeper authkeeper.AccountKeeper + AuthzKeeper authzkeeper.Keeper + BankKeeper bankkeeper.Keeper + CapabilityKeeper *capabilitykeeper.Keeper + StakingKeeper *stakingkeeper.Keeper + SlashingKeeper slashingkeeper.Keeper + MintKeeper mintkeeper.Keeper + DistrKeeper distrkeeper.Keeper + GovKeeper govkeeper.Keeper + CrisisKeeper *crisiskeeper.Keeper + UpgradeKeeper *upgradekeeper.Keeper + ParamsKeeper paramskeeper.Keeper + IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the appKeepers, so we can SetRouter on it correctly + IBCFeeKeeper ibcfeekeeper.Keeper + ICAControllerKeeper icacontrollerkeeper.Keeper + ICAHostKeeper icahostkeeper.Keeper + EvidenceKeeper evidencekeeper.Keeper + FeeGrantKeeper feegrantkeeper.Keeper + TransferKeeper ibctransferkeeper.Keeper + OracleKeeper oraclekeeper.Keeper + MarketKeeper marketkeeper.Keeper + TreasuryKeeper treasurykeeper.Keeper + WasmKeeper wasmkeeper.Keeper + DyncommKeeper dyncommkeeper.Keeper + IBCHooksKeeper *ibchookskeeper.Keeper + ConsensusParamsKeeper consensusparamkeeper.Keeper Ics20WasmHooks *ibchooks.WasmHooks IBCHooksWrapper *ibchooks.ICS4Middleware @@ -118,16 +119,17 @@ type AppKeepers struct { func NewAppKeepers( appCodec codec.Codec, bApp *baseapp.BaseApp, - cdc *codec.LegacyAmino, + legacyAmino *codec.LegacyAmino, maccPerms map[string][]string, allowedReceivingModAcc map[string]bool, skipUpgradeHeights map[int64]bool, homePath string, invCheckPeriod uint, - wasmOpts []wasm.Option, + wasmOpts []wasmkeeper.Option, appOpts servertypes.AppOptions, ) *AppKeepers { keys := sdk.NewKVStoreKeys( + crisistypes.StoreKey, authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, @@ -136,17 +138,18 @@ func NewAppKeepers( slashingtypes.StoreKey, govtypes.StoreKey, paramstypes.StoreKey, + consensusparamtypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, capabilitytypes.StoreKey, authzkeeper.StoreKey, - ibchost.StoreKey, + ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, - ibchooktypes.StoreKey, + ibchookstypes.StoreKey, oracletypes.StoreKey, markettypes.StoreKey, treasurytypes.StoreKey, @@ -165,13 +168,14 @@ func NewAppKeepers( // init params keeper and subspaces appKeepers.ParamsKeeper = initParamsKeeper( appCodec, - cdc, + legacyAmino, appKeepers.keys[paramstypes.StoreKey], appKeepers.tkeys[paramstypes.TStoreKey], ) // set the BaseApp's parameter store - bApp.SetParamStore(appKeepers.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())) + appKeepers.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authtypes.NewModuleAddress(govtypes.ModuleName).String()) + bApp.SetParamStore(&appKeepers.ConsensusParamsKeeper) // add capability keeper and ScopeToModule for ibc module appKeepers.CapabilityKeeper = capabilitykeeper.NewKeeper( @@ -179,7 +183,7 @@ func NewAppKeepers( appKeepers.keys[capabilitytypes.StoreKey], appKeepers.memKeys[capabilitytypes.MemStoreKey], ) - scopedIBCKeeper := appKeepers.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) + scopedIBCKeeper := appKeepers.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName) scopedICAControllerKeeper := appKeepers.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) scopedICAHostKeeper := appKeepers.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) scopedTransferKeeper := appKeepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) @@ -193,17 +197,17 @@ func NewAppKeepers( appKeepers.AccountKeeper = authkeeper.NewAccountKeeper( appCodec, appKeepers.keys[authtypes.StoreKey], - appKeepers.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) appKeepers.BankKeeper = bankkeeper.NewBaseKeeper( appCodec, appKeepers.keys[banktypes.StoreKey], appKeepers.AccountKeeper, - appKeepers.GetSubspace(banktypes.ModuleName), appKeepers.BlacklistedAccAddrs(maccPerms, allowedReceivingModAcc), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) appKeepers.AuthzKeeper = authzkeeper.NewKeeper( appKeepers.keys[authzkeeper.StoreKey], @@ -216,42 +220,45 @@ func NewAppKeepers( appKeepers.keys[feegrant.StoreKey], appKeepers.AccountKeeper, ) - stakingKeeper := stakingkeeper.NewKeeper( + appKeepers.StakingKeeper = stakingkeeper.NewKeeper( appCodec, appKeepers.keys[stakingtypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BankKeeper, - appKeepers.GetSubspace(stakingtypes.ModuleName), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) appKeepers.MintKeeper = mintkeeper.NewKeeper( appCodec, appKeepers.keys[minttypes.StoreKey], - appKeepers.GetSubspace(minttypes.ModuleName), - &stakingKeeper, + appKeepers.StakingKeeper, appKeepers.AccountKeeper, appKeepers.BankKeeper, authtypes.FeeCollectorName, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) appKeepers.DistrKeeper = distrkeeper.NewKeeper( appCodec, appKeepers.keys[distrtypes.StoreKey], - appKeepers.GetSubspace(distrtypes.ModuleName), appKeepers.AccountKeeper, appKeepers.BankKeeper, - &stakingKeeper, + appKeepers.StakingKeeper, authtypes.FeeCollectorName, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) appKeepers.SlashingKeeper = slashingkeeper.NewKeeper( appCodec, + legacyAmino, appKeepers.keys[slashingtypes.StoreKey], - &stakingKeeper, - appKeepers.GetSubspace(slashingtypes.ModuleName), + appKeepers.StakingKeeper, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) appKeepers.CrisisKeeper = crisiskeeper.NewKeeper( - appKeepers.GetSubspace(crisistypes.ModuleName), + appCodec, + appKeepers.keys[crisistypes.StoreKey], invCheckPeriod, appKeepers.BankKeeper, authtypes.FeeCollectorName, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) appKeepers.UpgradeKeeper = upgradekeeper.NewKeeper( skipUpgradeHeights, @@ -264,15 +271,15 @@ func NewAppKeepers( // register the staking hooks // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks - appKeepers.StakingKeeper = *stakingKeeper.SetHooks( + appKeepers.StakingKeeper.SetHooks( stakingtypes.NewMultiStakingHooks(appKeepers.DistrKeeper.Hooks(), appKeepers.SlashingKeeper.Hooks()), ) // Create IBC Keeper appKeepers.IBCKeeper = ibckeeper.NewKeeper( appCodec, - appKeepers.keys[ibchost.StoreKey], - appKeepers.GetSubspace(ibchost.ModuleName), + appKeepers.keys[ibcexported.StoreKey], + appKeepers.GetSubspace(ibcexported.ModuleName), appKeepers.StakingKeeper, appKeepers.UpgradeKeeper, scopedIBCKeeper, @@ -311,7 +318,7 @@ func NewAppKeepers( // create evidence keeper with router evidenceKeeper := evidencekeeper.NewKeeper( - appCodec, appKeepers.keys[evidencetypes.StoreKey], &appKeepers.StakingKeeper, appKeepers.SlashingKeeper, + appCodec, appKeepers.keys[evidencetypes.StoreKey], appKeepers.StakingKeeper, appKeepers.SlashingKeeper, ) // If evidence needs to be handled for the appKeepers, set routes in router here and seal appKeepers.EvidenceKeeper = *evidenceKeeper @@ -319,7 +326,7 @@ func NewAppKeepers( // Initialize terra module keepers appKeepers.OracleKeeper = oraclekeeper.NewKeeper( appCodec, appKeepers.keys[oracletypes.StoreKey], appKeepers.GetSubspace(oracletypes.ModuleName), - appKeepers.AccountKeeper, appKeepers.BankKeeper, appKeepers.DistrKeeper, &stakingKeeper, distrtypes.ModuleName, + appKeepers.AccountKeeper, appKeepers.BankKeeper, appKeepers.DistrKeeper, appKeepers.StakingKeeper, distrtypes.ModuleName, ) appKeepers.MarketKeeper = marketkeeper.NewKeeper( appCodec, appKeepers.keys[markettypes.StoreKey], @@ -336,7 +343,7 @@ func NewAppKeepers( ) hooksKeeper := ibchookskeeper.NewKeeper( - appKeepers.keys[ibchooktypes.StoreKey], + appKeepers.keys[ibchookstypes.StoreKey], ) appKeepers.IBCHooksKeeper = &hooksKeeper @@ -376,6 +383,7 @@ func NewAppKeepers( wasmMsgHandler := customwasmkeeper.NewMessageHandler( bApp.MsgServiceRouter(), + appKeepers.IBCFeeKeeper, appKeepers.IBCKeeper.ChannelKeeper, scopedWasmKeeper, appKeepers.BankKeeper, @@ -406,11 +414,11 @@ func NewAppKeepers( appKeepers.WasmKeeper = wasmkeeper.NewKeeper( appCodec, appKeepers.keys[wasmtypes.StoreKey], - appKeepers.GetSubspace(wasmtypes.ModuleName), appKeepers.AccountKeeper, appKeepers.BankKeeper, appKeepers.StakingKeeper, - appKeepers.DistrKeeper, + distrkeeper.NewQuerier(appKeepers.DistrKeeper), + appKeepers.IBCFeeKeeper, appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, scopedWasmKeeper, @@ -420,26 +428,32 @@ func NewAppKeepers( filepath.Join(homePath, "data"), wasmConfig, supportedFeatures, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), wasmOpts..., ) // AFTER wasm set contractKeeper for ics20 wasm hook - contractKeeper := wasmkeeper.NewDefaultPermissionKeeper(appKeepers.WasmKeeper) - appKeepers.Ics20WasmHooks.ContractKeeper = contractKeeper + appKeepers.Ics20WasmHooks.ContractKeeper = &appKeepers.WasmKeeper // register the proposal types govRouter := appKeepers.newGovRouter() govConfig := govtypes.DefaultConfig() - appKeepers.GovKeeper = govkeeper.NewKeeper( + govKeeper := govkeeper.NewKeeper( appCodec, appKeepers.keys[govtypes.StoreKey], - appKeepers.GetSubspace(govtypes.ModuleName), appKeepers.AccountKeeper, appKeepers.BankKeeper, - &stakingKeeper, - govRouter, + appKeepers.StakingKeeper, bApp.MsgServiceRouter(), govConfig, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + ) + // Set legacy router for backwards compatibility with gov v1beta1 + govKeeper.SetLegacyRouter(govRouter) + appKeepers.GovKeeper = *govKeeper.SetHooks( + govtypes.NewMultiGovHooks( + // register the governance hooks + ), ) appKeepers.DyncommKeeper = dyncommkeeper.NewKeeper( @@ -478,10 +492,10 @@ func initParamsKeeper( paramsKeeper.Subspace(minttypes.ModuleName) paramsKeeper.Subspace(distrtypes.ModuleName) paramsKeeper.Subspace(slashingtypes.ModuleName) - paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) + paramsKeeper.Subspace(govtypes.ModuleName) paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) - paramsKeeper.Subspace(ibchost.ModuleName) + paramsKeeper.Subspace(ibcexported.ModuleName) paramsKeeper.Subspace(icahosttypes.SubModuleName) paramsKeeper.Subspace(icacontrollertypes.SubModuleName) paramsKeeper.Subspace(markettypes.ModuleName) @@ -489,7 +503,6 @@ func initParamsKeeper( paramsKeeper.Subspace(treasurytypes.ModuleName) paramsKeeper.Subspace(wasmtypes.ModuleName) paramsKeeper.Subspace(dyncommtypes.ModuleName) - paramsKeeper.Subspace(ibchooktypes.ModuleName) return paramsKeeper } diff --git a/app/keepers/routers.go b/app/keepers/routers.go index b2ec5e42f..c52eff163 100644 --- a/app/keepers/routers.go +++ b/app/keepers/routers.go @@ -1,21 +1,19 @@ package keepers import ( - icacontroller "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller" - icacontrollertypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/types" - icahost "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" - ibcfee "github.com/cosmos/ibc-go/v6/modules/apps/29-fee" - transfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - ibcclient "github.com/cosmos/ibc-go/v6/modules/core/02-client" - ibcclienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" + icacontroller "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" + transfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" - "github.com/classic-terra/core/v2/x/treasury" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" - distr "github.com/cosmos/cosmos-sdk/x/distribution" - distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + "github.com/classic-terra/core/v3/x/treasury" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/params" @@ -24,8 +22,9 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - ibchooks "github.com/terra-money/core/v2/x/ibc-hooks" + ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7" ) func (appKeepers *AppKeepers) newGovRouter() govv1beta1.Router { @@ -33,11 +32,9 @@ func (appKeepers *AppKeepers) newGovRouter() govv1beta1.Router { govRouter. AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(appKeepers.ParamsKeeper)). - AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(appKeepers.DistrKeeper)). AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(appKeepers.UpgradeKeeper)). AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(appKeepers.IBCKeeper.ClientKeeper)). - AddRoute(treasurytypes.RouterKey, treasury.NewProposalHandler(appKeepers.TreasuryKeeper)). - AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(appKeepers.WasmKeeper, wasm.EnableAllProposals)) + AddRoute(treasurytypes.RouterKey, treasury.NewProposalHandler(appKeepers.TreasuryKeeper)) return govRouter } @@ -76,7 +73,7 @@ func (appKeepers *AppKeepers) newIBCRouter() *porttypes.Router { ibcRouter := porttypes.NewRouter() ibcRouter. AddRoute(ibctransfertypes.ModuleName, transferHookFeeStack). - AddRoute(wasm.ModuleName, wasmStack). + AddRoute(wasmtypes.ModuleName, wasmStack). AddRoute(icacontrollertypes.SubModuleName, icaControllerStack). AddRoute(icahosttypes.SubModuleName, icaHostStack) diff --git a/app/legacy/migrate.go b/app/legacy/migrate.go index ed75b1bbd..078cc2f9b 100644 --- a/app/legacy/migrate.go +++ b/app/legacy/migrate.go @@ -7,15 +7,14 @@ import ( "strings" "time" + tmjson "github.com/cometbft/cometbft/libs/json" + tmtypes "github.com/cometbft/cometbft/types" "github.com/pkg/errors" "github.com/spf13/cobra" - tmjson "github.com/tendermint/tendermint/libs/json" - tmtypes "github.com/tendermint/tendermint/types" - ibcxfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - host "github.com/cosmos/ibc-go/v6/modules/core/24-host" - "github.com/cosmos/ibc-go/v6/modules/core/exported" - ibccoretypes "github.com/cosmos/ibc-go/v6/modules/core/types" + ibcxfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibccoretypes "github.com/cosmos/ibc-go/v7/modules/core/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" @@ -26,7 +25,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil/types" staking "github.com/cosmos/cosmos-sdk/x/staking/types" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" ) const ( @@ -133,11 +132,11 @@ $ terrad migrate /path/to/genesis.json --chain-id=cosmoshub-4 --genesis-time=201 ibcTransferGenesis.Params.ReceiveEnabled = false ibcTransferGenesis.Params.SendEnabled = false - ibcCoreGenesis.ClientGenesis.Params.AllowedClients = []string{exported.Tendermint} + ibcCoreGenesis.ClientGenesis.Params.AllowedClients = []string{ibcexported.Tendermint} stakingGenesis.Params.HistoricalEntries = 10000 newGenState[ibcxfertypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(ibcTransferGenesis) - newGenState[host.ModuleName] = clientCtx.Codec.MustMarshalJSON(ibcCoreGenesis) + newGenState[ibcexported.ModuleName] = clientCtx.Codec.MustMarshalJSON(ibcCoreGenesis) newGenState[captypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(capGenesis) newGenState[evtypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(evGenesis) newGenState[staking.ModuleName] = clientCtx.Codec.MustMarshalJSON(&stakingGenesis) diff --git a/app/legacy/pubkey_replacement.go b/app/legacy/pubkey_replacement.go index 8e168c316..be598d2a0 100644 --- a/app/legacy/pubkey_replacement.go +++ b/app/legacy/pubkey_replacement.go @@ -7,9 +7,9 @@ import ( "log" "os" + cryptocodec "github.com/cometbft/cometbft/crypto/encoding" + tmtypes "github.com/cometbft/cometbft/types" "github.com/pkg/errors" - cryptocodec "github.com/tendermint/tendermint/crypto/encoding" - tmtypes "github.com/tendermint/tendermint/types" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/app/modules.go b/app/modules.go index 28658b299..a7dfb5cb2 100644 --- a/app/modules.go +++ b/app/modules.go @@ -2,34 +2,33 @@ package app import ( "github.com/CosmWasm/wasmd/x/wasm" - wasmclient "github.com/CosmWasm/wasmd/x/wasm/client" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - terraappparams "github.com/classic-terra/core/v2/app/params" - customauth "github.com/classic-terra/core/v2/custom/auth" - customauthsim "github.com/classic-terra/core/v2/custom/auth/simulation" - customauthz "github.com/classic-terra/core/v2/custom/authz" - custombank "github.com/classic-terra/core/v2/custom/bank" - customcrisis "github.com/classic-terra/core/v2/custom/crisis" - customdistr "github.com/classic-terra/core/v2/custom/distribution" - customevidence "github.com/classic-terra/core/v2/custom/evidence" - customfeegrant "github.com/classic-terra/core/v2/custom/feegrant" - customgov "github.com/classic-terra/core/v2/custom/gov" - custommint "github.com/classic-terra/core/v2/custom/mint" - customparams "github.com/classic-terra/core/v2/custom/params" - customslashing "github.com/classic-terra/core/v2/custom/slashing" - customstaking "github.com/classic-terra/core/v2/custom/staking" - customupgrade "github.com/classic-terra/core/v2/custom/upgrade" - customwasm "github.com/classic-terra/core/v2/custom/wasm" - "github.com/classic-terra/core/v2/x/dyncomm" - dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/types" - "github.com/classic-terra/core/v2/x/market" - markettypes "github.com/classic-terra/core/v2/x/market/types" - "github.com/classic-terra/core/v2/x/oracle" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" - "github.com/classic-terra/core/v2/x/treasury" - treasuryclient "github.com/classic-terra/core/v2/x/treasury/client" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" - "github.com/classic-terra/core/v2/x/vesting" + terraappparams "github.com/classic-terra/core/v3/app/params" + customauth "github.com/classic-terra/core/v3/custom/auth" + customauthsim "github.com/classic-terra/core/v3/custom/auth/simulation" + customauthz "github.com/classic-terra/core/v3/custom/authz" + custombank "github.com/classic-terra/core/v3/custom/bank" + customcrisis "github.com/classic-terra/core/v3/custom/crisis" + customdistr "github.com/classic-terra/core/v3/custom/distribution" + customevidence "github.com/classic-terra/core/v3/custom/evidence" + customfeegrant "github.com/classic-terra/core/v3/custom/feegrant" + customgov "github.com/classic-terra/core/v3/custom/gov" + custommint "github.com/classic-terra/core/v3/custom/mint" + customparams "github.com/classic-terra/core/v3/custom/params" + customslashing "github.com/classic-terra/core/v3/custom/slashing" + customstaking "github.com/classic-terra/core/v3/custom/staking" + customupgrade "github.com/classic-terra/core/v3/custom/upgrade" + customwasm "github.com/classic-terra/core/v3/custom/wasm" + "github.com/classic-terra/core/v3/x/dyncomm" + dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types" + "github.com/classic-terra/core/v3/x/market" + markettypes "github.com/classic-terra/core/v3/x/market/types" + "github.com/classic-terra/core/v3/x/oracle" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" + "github.com/classic-terra/core/v3/x/treasury" + treasuryclient "github.com/classic-terra/core/v3/x/treasury/client" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" + "github.com/classic-terra/core/v3/x/vesting" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -39,10 +38,11 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/capability" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + consensus "github.com/cosmos/cosmos-sdk/x/consensus" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" "github.com/cosmos/cosmos-sdk/x/crisis" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distr "github.com/cosmos/cosmos-sdk/x/distribution" - distrclient "github.com/cosmos/cosmos-sdk/x/distribution/client" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/cosmos/cosmos-sdk/x/evidence" evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" @@ -51,6 +51,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" "github.com/cosmos/cosmos-sdk/x/gov" + govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/mint" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" @@ -64,20 +65,21 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ibcfee "github.com/cosmos/ibc-go/v6/modules/apps/29-fee" - ibcfeetypes "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/types" - transfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - ibc "github.com/cosmos/ibc-go/v6/modules/core" - ibcclientclient "github.com/cosmos/ibc-go/v6/modules/core/02-client/client" - ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host" + ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7" + ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" + ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" + transfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v7/modules/core" + ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" // unnamed import of statik for swagger UI support - _ "github.com/classic-terra/core/v2/client/docs/statik" - ibchooks "github.com/terra-money/core/v2/x/ibc-hooks" - ibchooktypes "github.com/terra-money/core/v2/x/ibc-hooks/types" + _ "github.com/classic-terra/core/v3/client/docs/statik" ) var ( @@ -87,24 +89,22 @@ var ( ModuleBasics = module.NewBasicManager( customauth.AppModuleBasic{}, customauthz.AppModuleBasic{}, - genutil.AppModuleBasic{}, + genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator), custombank.AppModuleBasic{}, capability.AppModuleBasic{}, customstaking.AppModuleBasic{}, custommint.AppModuleBasic{}, customdistr.AppModuleBasic{}, customgov.NewAppModuleBasic( - append( - wasmclient.ProposalHandlers, + []govclient.ProposalHandler{ paramsclient.ProposalHandler, - distrclient.ProposalHandler, upgradeclient.LegacyProposalHandler, upgradeclient.LegacyCancelProposalHandler, ibcclientclient.UpdateClientProposalHandler, ibcclientclient.UpgradeProposalHandler, treasuryclient.ProposalAddBurnTaxExemptionAddressHandler, treasuryclient.ProposalRemoveBurnTaxExemptionAddressHandler, - ), + }, ), customparams.AppModuleBasic{}, customcrisis.AppModuleBasic{}, @@ -112,6 +112,7 @@ var ( customfeegrant.AppModuleBasic{}, ibc.AppModuleBasic{}, ica.AppModuleBasic{}, + ibctm.AppModuleBasic{}, customupgrade.AppModuleBasic{}, customevidence.AppModuleBasic{}, transfer.AppModuleBasic{}, @@ -123,6 +124,7 @@ var ( ibcfee.AppModuleBasic{}, dyncomm.AppModuleBasic{}, ibchooks.AppModuleBasic{}, + consensus.AppModuleBasic{}, ) // module account permissions maccPerms = map[string][]string{ @@ -139,8 +141,8 @@ var ( ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, ibcfeetypes.ModuleName: nil, icatypes.ModuleName: nil, - wasm.ModuleName: {authtypes.Burner}, - ibchooktypes.ModuleName: nil, + wasmtypes.ModuleName: {authtypes.Burner}, + ibchookstypes.ModuleName: nil, } // module accounts that are allowed to receive tokens allowedReceivingModAcc = map[string]bool{ @@ -160,16 +162,15 @@ func appModules( app.AccountKeeper, app.StakingKeeper, app.BaseApp.DeliverTx, encodingConfig.TxConfig, ), - auth.NewAppModule(appCodec, app.AccountKeeper, nil), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), - crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), + auth.NewAppModule(appCodec, app.AccountKeeper, nil, app.GetSubspace(authtypes.ModuleName)), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)), + mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)), + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)), + distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), upgrade.NewAppModule(app.UpgradeKeeper), evidence.NewAppModule(app.EvidenceKeeper), params.NewAppModule(app.ParamsKeeper), @@ -181,9 +182,11 @@ func appModules( market.NewAppModule(appCodec, app.MarketKeeper, app.AccountKeeper, app.BankKeeper, app.OracleKeeper), oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper), treasury.NewAppModule(appCodec, app.TreasuryKeeper), - wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), dyncomm.NewAppModule(appCodec, app.DyncommKeeper, app.StakingKeeper), ibchooks.NewAppModule(app.AccountKeeper), + consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper), + crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them } } @@ -194,15 +197,15 @@ func simulationModules( ) []module.AppModuleSimulation { appCodec := encodingConfig.Marshaler return []module.AppModuleSimulation{ - customauth.NewAppModule(appCodec, app.AccountKeeper, customauthsim.RandomGenesisAccounts), - custombank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), + customauth.NewAppModule(appCodec, app.AccountKeeper, customauthsim.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)), + custombank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), - distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)), + mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)), + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)), + distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), evidence.NewAppModule(app.EvidenceKeeper), params.NewAppModule(app.ParamsKeeper), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), @@ -213,7 +216,7 @@ func simulationModules( oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper), market.NewAppModule(appCodec, app.MarketKeeper, app.AccountKeeper, app.BankKeeper, app.OracleKeeper), treasury.NewAppModule(appCodec, app.TreasuryKeeper), - wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), dyncomm.NewAppModule(appCodec, app.DyncommKeeper, app.StakingKeeper), } } @@ -236,17 +239,19 @@ func orderBeginBlockers() []string { feegrant.ModuleName, paramstypes.ModuleName, // additional non simd modules - ibchost.ModuleName, + ibcexported.ModuleName, ibctransfertypes.ModuleName, icatypes.ModuleName, ibcfeetypes.ModuleName, - ibchooktypes.ModuleName, + ibchookstypes.ModuleName, // Terra Classic modules oracletypes.ModuleName, treasurytypes.ModuleName, markettypes.ModuleName, wasmtypes.ModuleName, dyncommtypes.ModuleName, + // consensus module + consensusparamtypes.ModuleName, } } @@ -268,17 +273,19 @@ func orderEndBlockers() []string { paramstypes.ModuleName, upgradetypes.ModuleName, // additional non simd modules - ibchost.ModuleName, + ibcexported.ModuleName, ibctransfertypes.ModuleName, icatypes.ModuleName, ibcfeetypes.ModuleName, - ibchooktypes.ModuleName, + ibchookstypes.ModuleName, // Terra Classic modules oracletypes.ModuleName, treasurytypes.ModuleName, markettypes.ModuleName, wasmtypes.ModuleName, dyncommtypes.ModuleName, + // consensus module + consensusparamtypes.ModuleName, } } @@ -300,16 +307,18 @@ func orderInitGenesis() []string { upgradetypes.ModuleName, feegrant.ModuleName, // additional non simd modules - ibchost.ModuleName, + ibcexported.ModuleName, ibctransfertypes.ModuleName, icatypes.ModuleName, ibcfeetypes.ModuleName, - ibchooktypes.ModuleName, + ibchookstypes.ModuleName, // Terra Classic modules markettypes.ModuleName, oracletypes.ModuleName, treasurytypes.ModuleName, wasmtypes.ModuleName, dyncommtypes.ModuleName, + // consensus module + consensusparamtypes.ModuleName, } } diff --git a/app/sim_test.go b/app/sim_test.go index fa9f1b374..144b73f0a 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -7,24 +7,31 @@ import ( "testing" "time" - "github.com/CosmWasm/wasmd/x/wasm" - terraapp "github.com/classic-terra/core/v2/app" - helpers "github.com/classic-terra/core/v2/app/testing" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + terraapp "github.com/classic-terra/core/v3/app" + helpers "github.com/classic-terra/core/v3/app/testing" + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + "github.com/cometbft/cometbft/libs/rand" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/rand" - dbm "github.com/tendermint/tm-db" + "cosmossdk.io/simapp" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/store" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" ) +// SimAppChainID hardcoded chainID for simulation +const SimAppChainID = "simulation-app" + +var emptyWasmOpts []wasmkeeper.Option + // interBlockCacheOpt returns a BaseApp option function that sets the persistent // inter-block write-through cache. func interBlockCacheOpt() func(*baseapp.BaseApp) { @@ -37,47 +44,55 @@ func fauxMerkleModeOpt() func(*baseapp.BaseApp) { } func init() { - simapp.GetSimulatorFlags() + simcli.GetSimulatorFlags() } -// Profile with: -// /usr/local/go/bin/go test -benchmem -run=^$ github.com/cosmos/cosmos-sdk/GaiaApp -bench ^BenchmarkFullAppSimulation$ -Commit=true -cpuprofile cpu.out -func BenchmarkFullAppSimulation(b *testing.B) { - config, db, dir, logger, _, err := simapp.SetupSimulation("goleveldb-app-sim", "Simulation") - if err != nil { - b.Fatalf("simulation setup failed: %s", err.Error()) +func setupSimulationApp(b *testing.B, msg string) (simtypes.Config, dbm.DB, simtestutil.AppOptionsMap, *terraapp.TerraApp) { + config := simcli.NewConfigFromFlags() + config.ChainID = SimAppChainID + + db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim", "Simulation", simcli.FlagVerboseValue, simcli.FlagEnabledValue) + if skip { + b.Skip(msg) } + require.NoError(b, err, "simulation setup failed") - defer func() { - db.Close() - err = os.RemoveAll(dir) - if err != nil { - b.Fatal(err) - } - }() + b.Cleanup(func() { + require.NoError(b, db.Close()) + require.NoError(b, os.RemoveAll(dir)) + }) - var emptyWasmOpts []wasm.Option + appOptions := make(simtestutil.AppOptionsMap, 0) app := terraapp.NewTerraApp( logger, db, nil, true, map[int64]bool{}, - terraapp.DefaultNodeHome, simapp.FlagPeriodValue, terraapp.MakeEncodingConfig(), - simapp.EmptyAppOptions{}, emptyWasmOpts, interBlockCacheOpt(), fauxMerkleModeOpt()) + dir, terraapp.MakeEncodingConfig(), + appOptions, emptyWasmOpts, interBlockCacheOpt(), fauxMerkleModeOpt(), baseapp.SetChainID(SimAppChainID), + ) + require.Equal(b, "WasmApp", app.Name()) + return config, db, appOptions, app +} + +// Profile with: +// /usr/local/go/bin/go test -benchmem -run=^$ github.com/cosmos/cosmos-sdk/GaiaApp -bench ^BenchmarkFullAppSimulation$ -Commit=true -cpuprofile cpu.out +func BenchmarkFullAppSimulation(b *testing.B) { + config, db, _, app := setupSimulationApp(b, "skipping application simulation") // Run randomized simulation:w _, simParams, simErr := simulation.SimulateFromSeed( b, os.Stdout, app.BaseApp, - simapp.AppStateFn(app.AppCodec(), app.SimulationManager()), + simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager(), app.DefaultGenesis()), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - if err = simapp.CheckExportSimulation(app, config, simParams); err != nil { + if err := simtestutil.CheckExportSimulation(app, config, simParams); err != nil { b.Fatal(err) } @@ -86,18 +101,18 @@ func BenchmarkFullAppSimulation(b *testing.B) { } if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } } // TODO: Make another test for the fuzzer itself, which just has noOp txs // and doesn't depend on the application. func TestAppStateDeterminism(t *testing.T) { - if !simapp.FlagEnabledValue { + if !simcli.FlagEnabledValue { t.Skip("skipping application simulation") } - config := simapp.NewConfigFromFlags() + config := simcli.NewConfigFromFlags() config.InitialBlockHeight = 1 config.ExportParamsPath = "" config.OnOperation = false @@ -113,18 +128,18 @@ func TestAppStateDeterminism(t *testing.T) { for j := 0; j < numTimesToRunPerSeed; j++ { var logger log.Logger - if simapp.FlagVerboseValue { + if simcli.FlagVerboseValue { logger = log.TestingLogger() } else { logger = log.NewNopLogger() } db := dbm.NewMemDB() - var emptyWasmOpts []wasm.Option + var emptyWasmOpts []wasmkeeper.Option app := terraapp.NewTerraApp( logger, db, nil, true, map[int64]bool{}, terraapp.DefaultNodeHome, - simapp.FlagPeriodValue, terraapp.MakeEncodingConfig(), - simapp.EmptyAppOptions{}, emptyWasmOpts, interBlockCacheOpt(), fauxMerkleModeOpt(), + terraapp.MakeEncodingConfig(), + simtestutil.EmptyAppOptions{}, emptyWasmOpts, interBlockCacheOpt(), fauxMerkleModeOpt(), ) fmt.Printf( @@ -136,9 +151,9 @@ func TestAppStateDeterminism(t *testing.T) { t, os.Stdout, app.BaseApp, - AppStateFn(app.AppCodec(), app.SimulationManager()), + AppStateFn(app.AppCodec(), app.SimulationManager(), app.DefaultGenesis()), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), @@ -146,7 +161,7 @@ func TestAppStateDeterminism(t *testing.T) { require.NoError(t, err) if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } appHash := app.LastCommitID().Hash @@ -165,11 +180,11 @@ func TestAppStateDeterminism(t *testing.T) { // AppStateFn returns the initial application state using a genesis or the simulation parameters. // It panics if the user provides files for both of them. // If a file is not given for the genesis or the sim params, it creates a randomized one. -func AppStateFn(codec codec.Codec, manager *module.SimulationManager) simtypes.AppStateFn { +func AppStateFn(codec codec.Codec, manager *module.SimulationManager, genesisState map[string]json.RawMessage) simtypes.AppStateFn { // quick hack to setup app state genesis with our app modules simapp.ModuleBasics = terraapp.ModuleBasics - if simapp.FlagGenesisTimeValue == 0 { // always set to have a block time - simapp.FlagGenesisTimeValue = time.Now().Unix() + if simcli.FlagGenesisTimeValue == 0 { // always set to have a block time + simcli.FlagGenesisTimeValue = time.Now().Unix() } - return simapp.AppStateFn(codec, manager) + return simtestutil.AppStateFn(codec, manager, genesisState) } diff --git a/app/testing/mock.go b/app/testing/mock.go index 0e2ca9521..ffbfc82fb 100644 --- a/app/testing/mock.go +++ b/app/testing/mock.go @@ -1,9 +1,9 @@ package helpers import ( - "github.com/tendermint/tendermint/crypto" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" + "github.com/cometbft/cometbft/crypto" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" diff --git a/app/testing/test_suite.go b/app/testing/test_suite.go index 598e94dd4..171452005 100644 --- a/app/testing/test_suite.go +++ b/app/testing/test_suite.go @@ -5,37 +5,45 @@ import ( "testing" "time" - "github.com/CosmWasm/wasmd/x/wasm" - "github.com/classic-terra/core/v2/app" - appparams "github.com/classic-terra/core/v2/app/params" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/classic-terra/core/v3/app" + appparams "github.com/classic-terra/core/v3/app/params" + dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types" + markettypes "github.com/classic-terra/core/v3/x/market/types" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/baseapp" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp" + "github.com/cosmos/cosmos-sdk/server" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" ) // SimAppChainID hardcoded chainID for simulation const ( - SimAppChainID = "terra-app" + SimAppChainID = "" ) -var emptyWasmOpts []wasm.Option +var emptyWasmOpts []wasmkeeper.Option // EmptyBaseAppOptions is a stub implementing AppOptions type EmptyBaseAppOptions struct{} @@ -51,7 +59,7 @@ type KeeperTestHelper struct { } func (s *KeeperTestHelper) Setup(_ *testing.T, chainID string) { - s.App = SetupApp(s.T()) + s.App = SetupApp(s.T(), chainID) s.Ctx = s.App.BaseApp.NewContext(false, tmproto.Header{Height: 1, ChainID: chainID, Time: time.Now().UTC()}) s.CheckCtx = s.App.BaseApp.NewContext(true, tmproto.Header{Height: 1, ChainID: chainID, Time: time.Now().UTC()}) s.QueryHelper = &baseapp.QueryServiceTestHelper{ @@ -69,8 +77,8 @@ func (ao EmptyBaseAppOptions) Get(_ string) interface{} { // DefaultConsensusParams defines the default Tendermint consensus params used // in app testing. -var DefaultConsensusParams = &abci.ConsensusParams{ - Block: &abci.BlockParams{ +var DefaultConsensusParams = &tmproto.ConsensusParams{ + Block: &tmproto.BlockParams{ MaxBytes: 200000, MaxGas: 2000000, }, @@ -90,7 +98,7 @@ type EmptyAppOptions struct{} func (EmptyAppOptions) Get(_ string) interface{} { return nil } -func SetupApp(t *testing.T) *app.TerraApp { +func SetupApp(t *testing.T, chainID string) *app.TerraApp { t.Helper() privVal := NewPV() @@ -107,8 +115,8 @@ func SetupApp(t *testing.T) *app.TerraApp { Address: acc.GetAddress().String(), Coins: sdk.NewCoins(sdk.NewCoin(appparams.BondDenom, sdk.NewInt(100000000000000))), } - - app := SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, balance) + genesisAccounts := []authtypes.GenesisAccount{acc} + app := SetupWithGenesisValSet(t, chainID, valSet, genesisAccounts, balance) return app } @@ -117,19 +125,19 @@ func SetupApp(t *testing.T) *app.TerraApp { // that also act as delegators. For simplicity, each validator is bonded with a delegation // of one consensus engine unit in the default token of the app from first genesis // account. A Nop logger is set in app. -func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *app.TerraApp { +func SetupWithGenesisValSet(t *testing.T, chainID string, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *app.TerraApp { t.Helper() - terraApp, genesisState := setup(true, 5) + terraApp, genesisState := setup(chainID) genesisState = genesisStateWithValSet(t, terraApp, genesisState, valSet, genAccs, balances...) - stateBytes, err := json.MarshalIndent(genesisState, "", " ") + stateBytes, err := json.MarshalIndent(genesisState, "", "") require.NoError(t, err) // init chain will set the validator set and initialize the genesis accounts terraApp.InitChain( abci.RequestInitChain{ - ChainId: SimAppChainID, + ChainId: chainID, Validators: []abci.ValidatorUpdate{}, ConsensusParams: DefaultConsensusParams, AppStateBytes: stateBytes, @@ -139,7 +147,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs // commit genesis changes terraApp.Commit() terraApp.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ - ChainID: SimAppChainID, + ChainID: chainID, Height: terraApp.LastBlockHeight() + 1, AppHash: terraApp.LastCommitID().Hash, ValidatorsHash: valSet.Hash(), @@ -149,9 +157,12 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs return terraApp } -func setup(withGenesis bool, invCheckPeriod uint) (*app.TerraApp, app.GenesisState) { +func setup(chainID string) (*app.TerraApp, app.GenesisState) { db := dbm.NewMemDB() encCdc := app.MakeEncodingConfig() + appOptions := make(simtestutil.AppOptionsMap, 0) + appOptions[server.FlagInvCheckPeriod] = 5 + appOptions[server.FlagMinGasPrices] = "0luna" terraapp := app.NewTerraApp( log.NewNopLogger(), @@ -160,14 +171,11 @@ func setup(withGenesis bool, invCheckPeriod uint) (*app.TerraApp, app.GenesisSta true, map[int64]bool{}, app.DefaultNodeHome, - invCheckPeriod, encCdc, - simapp.EmptyAppOptions{}, + simtestutil.EmptyAppOptions{}, emptyWasmOpts, + baseapp.SetChainID(chainID), ) - if withGenesis { - return terraapp, app.NewDefaultGenesisState() - } return terraapp, app.GenesisState{} } @@ -246,10 +254,41 @@ func genesisStateWithValSet(t *testing.T, balances, totalSupply, []banktypes.Metadata{}, + []banktypes.SendEnabled{}, ) genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis) + // update mint genesis state + mintGenesis := minttypes.DefaultGenesisState() + genesisState[minttypes.ModuleName] = app.AppCodec().MustMarshalJSON(mintGenesis) + + // update distribution genesis state + distGenesis := distrtypes.DefaultGenesisState() + genesisState[distrtypes.ModuleName] = app.AppCodec().MustMarshalJSON(distGenesis) + + // update oracle genesis state + oracleGenesis := oracletypes.DefaultGenesisState() + genesisState[oracletypes.ModuleName] = app.AppCodec().MustMarshalJSON(oracleGenesis) + + // update market gensis state + marketGenesis := markettypes.DefaultGenesisState() + genesisState[markettypes.ModuleName] = app.AppCodec().MustMarshalJSON(marketGenesis) + + // update dyncomm genesis state + dyncommGenesis := dyncommtypes.DefaultGenesisState() + genesisState[dyncommtypes.ModuleName] = app.AppCodec().MustMarshalJSON(dyncommGenesis) + + // update treasury genesis state + treasuryGensis := treasurytypes.DefaultGenesisState() + genesisState[treasurytypes.ModuleName] = app.AppCodec().MustMarshalJSON(treasuryGensis) + + // update wasm genesis state + wasmGenesis := &wasmtypes.GenesisState{ + Params: wasmtypes.DefaultParams(), + } + genesisState[wasmtypes.ModuleName] = app.AppCodec().MustMarshalJSON(wasmGenesis) + return genesisState } diff --git a/app/upgrades/forks/constants.go b/app/upgrades/forks/constants.go index ac3b6028e..8fac68dc6 100644 --- a/app/upgrades/forks/constants.go +++ b/app/upgrades/forks/constants.go @@ -1,8 +1,8 @@ package forks import ( - "github.com/classic-terra/core/v2/app/upgrades" - "github.com/classic-terra/core/v2/types/fork" + "github.com/classic-terra/core/v3/app/upgrades" + "github.com/classic-terra/core/v3/types/fork" ) var DisableSwapFork = upgrades.Fork{ diff --git a/app/upgrades/forks/forks.go b/app/upgrades/forks/forks.go index dbf595958..2b26f2236 100644 --- a/app/upgrades/forks/forks.go +++ b/app/upgrades/forks/forks.go @@ -3,12 +3,12 @@ package forks import ( "fmt" - "github.com/classic-terra/core/v2/app/keepers" - core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v3/app/keepers" + core "github.com/classic-terra/core/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - ibcchanneltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) func runForkLogicSwapDisable(ctx sdk.Context, keppers *keepers.AppKeepers, _ *module.Manager) { diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 40f9bdad3..d1634463f 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -1,20 +1,20 @@ package upgrades import ( + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" store "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/classic-terra/core/v2/app/keepers" + "github.com/classic-terra/core/v3/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil // that allows upgrade handlers to modify BaseApp parameters. type BaseAppParamManager interface { - GetConsensusParams(ctx sdk.Context) *abci.ConsensusParams - StoreConsensusParams(ctx sdk.Context, cp *abci.ConsensusParams) + GetConsensusParams(ctx sdk.Context) *tmproto.ConsensusParams + StoreConsensusParams(ctx sdk.Context, cp *tmproto.ConsensusParams) } // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v2/constants.go b/app/upgrades/v2/constants.go index 35be5dd93..08d5d5d1f 100644 --- a/app/upgrades/v2/constants.go +++ b/app/upgrades/v2/constants.go @@ -1,7 +1,7 @@ package v2 import ( - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v2/upgrades.go b/app/upgrades/v2/upgrades.go index 81a8cb268..a2d0c66ba 100644 --- a/app/upgrades/v2/upgrades.go +++ b/app/upgrades/v2/upgrades.go @@ -1,8 +1,8 @@ package v2 import ( - "github.com/classic-terra/core/v2/app/keepers" - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go index 772869b31..f1261f221 100644 --- a/app/upgrades/v3/constants.go +++ b/app/upgrades/v3/constants.go @@ -1,7 +1,7 @@ package v3 import ( - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index f3db6acd5..1e24f6e88 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -1,8 +1,8 @@ package v3 import ( - "github.com/classic-terra/core/v2/app/keepers" - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go index 25812f68a..83e56dd2d 100644 --- a/app/upgrades/v4/constants.go +++ b/app/upgrades/v4/constants.go @@ -1,9 +1,9 @@ package v4 import ( - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ) const UpgradeName = "v4" diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 7677e452a..fbd92256a 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -1,8 +1,8 @@ package v4 import ( - "github.com/classic-terra/core/v2/app/keepers" - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go index 2d472b78b..364ea5688 100644 --- a/app/upgrades/v5/constants.go +++ b/app/upgrades/v5/constants.go @@ -1,11 +1,11 @@ package v5 import ( - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" - icacontrollertypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/types" - ibcfeetypes "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/types" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" ) const UpgradeName = "v5" diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go index 7b229753c..34756c5d1 100644 --- a/app/upgrades/v5/upgrades.go +++ b/app/upgrades/v5/upgrades.go @@ -1,8 +1,8 @@ package v5 import ( - "github.com/classic-terra/core/v2/app/keepers" - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v6/constants.go b/app/upgrades/v6/constants.go index 2fbea9a58..55f8757ca 100644 --- a/app/upgrades/v6/constants.go +++ b/app/upgrades/v6/constants.go @@ -1,8 +1,8 @@ package v6 import ( - "github.com/classic-terra/core/v2/app/upgrades" - dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/types" + "github.com/classic-terra/core/v3/app/upgrades" + dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v6/upgrades.go b/app/upgrades/v6/upgrades.go index 36892573f..b4300660a 100644 --- a/app/upgrades/v6/upgrades.go +++ b/app/upgrades/v6/upgrades.go @@ -1,8 +1,8 @@ package v6 import ( - "github.com/classic-terra/core/v2/app/keepers" - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v6_1/constants.go b/app/upgrades/v6_1/constants.go index efcf97400..2584f0ffa 100644 --- a/app/upgrades/v6_1/constants.go +++ b/app/upgrades/v6_1/constants.go @@ -1,7 +1,7 @@ package v61 import ( - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v6_1/upgrades.go b/app/upgrades/v6_1/upgrades.go index 3aabe6284..8a3f63717 100644 --- a/app/upgrades/v6_1/upgrades.go +++ b/app/upgrades/v6_1/upgrades.go @@ -1,8 +1,8 @@ package v61 import ( - "github.com/classic-terra/core/v2/app/keepers" - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go index 90db15ad3..a26a055c0 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -1,9 +1,9 @@ package v7 import ( - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" - ibc_hooks_types "github.com/terra-money/core/v2/x/ibc-hooks/types" + ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" ) const UpgradeName = "v7" @@ -13,7 +13,7 @@ var Upgrade = upgrades.Upgrade{ CreateUpgradeHandler: CreateV7UpgradeHandler, StoreUpgrades: store.StoreUpgrades{ Added: []string{ - ibc_hooks_types.StoreKey, + ibchookstypes.StoreKey, }, }, } diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index 950a70059..43e84544d 100644 --- a/app/upgrades/v7/upgrades.go +++ b/app/upgrades/v7/upgrades.go @@ -1,8 +1,8 @@ package v7 import ( - "github.com/classic-terra/core/v2/app/keepers" - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v7_1/constants.go b/app/upgrades/v7_1/constants.go index 83e4fcbd2..f3cbf7f4c 100644 --- a/app/upgrades/v7_1/constants.go +++ b/app/upgrades/v7_1/constants.go @@ -1,7 +1,7 @@ -package v7_1 +package v71 import ( - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v7_1/upgrades.go b/app/upgrades/v7_1/upgrades.go index 8ee61ac2a..0f553eadc 100644 --- a/app/upgrades/v7_1/upgrades.go +++ b/app/upgrades/v7_1/upgrades.go @@ -1,8 +1,8 @@ -package v7_1 +package v71 import ( - "github.com/classic-terra/core/v2/app/keepers" - "github.com/classic-terra/core/v2/app/upgrades" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go new file mode 100644 index 000000000..457bcd370 --- /dev/null +++ b/app/upgrades/v8/constants.go @@ -0,0 +1,21 @@ +package v8 + +import ( + "github.com/classic-terra/core/v3/app/upgrades" + store "github.com/cosmos/cosmos-sdk/store/types" + consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + crisistpyes "github.com/cosmos/cosmos-sdk/x/crisis/types" +) + +const UpgradeName = "v8" + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateV8UpgradeHandler, + StoreUpgrades: store.StoreUpgrades{ + Added: []string{ + consensustypes.ModuleName, + crisistpyes.ModuleName, + }, + }, +} diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go new file mode 100644 index 000000000..81c28b7a0 --- /dev/null +++ b/app/upgrades/v8/upgrades.go @@ -0,0 +1,70 @@ +package v8 + +import ( + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" + "github.com/cosmos/cosmos-sdk/baseapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" + distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" +) + +func CreateV8UpgradeHandler( + mm *module.Manager, + cfg module.Configurator, + _ upgrades.BaseAppParamManager, + keepers *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + // Set param key table for params module migration + for _, subspace := range keepers.ParamsKeeper.GetSubspaces() { + subspace := subspace + + var keyTable paramstypes.KeyTable + switch subspace.Name() { + case authtypes.ModuleName: + keyTable = authtypes.ParamKeyTable() + case banktypes.ModuleName: + keyTable = banktypes.ParamKeyTable() + case stakingtypes.ModuleName: + keyTable = stakingtypes.ParamKeyTable() + case minttypes.ModuleName: + keyTable = minttypes.ParamKeyTable() + case distrtypes.ModuleName: + keyTable = distrtypes.ParamKeyTable() + case slashingtypes.ModuleName: + keyTable = slashingtypes.ParamKeyTable() + case govtypes.ModuleName: + keyTable = govv1.ParamKeyTable() + case wasmtypes.ModuleName: + keyTable = wasmtypes.ParamKeyTable() + case crisistypes.ModuleName: + keyTable = crisistypes.ParamKeyTable() + } + + if !subspace.HasKeyTable() { + subspace.WithKeyTable(keyTable) + } + } + + legacyBaseAppSubspace := keepers.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable()) + baseapp.MigrateParams(ctx, legacyBaseAppSubspace, &keepers.ConsensusParamsKeeper) + + params := keepers.IBCKeeper.ClientKeeper.GetParams(ctx) + params.AllowedClients = append(params.AllowedClients, exported.Localhost) + keepers.IBCKeeper.ClientKeeper.SetParams(ctx, params) + return mm.RunMigrations(ctx, cfg, fromVM) + } +} diff --git a/cmd/terrad/genaccounts.go b/cmd/terrad/genaccounts.go index ac1cac29b..c7339713a 100644 --- a/cmd/terrad/genaccounts.go +++ b/cmd/terrad/genaccounts.go @@ -21,7 +21,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - vestingtypes "github.com/classic-terra/core/v2/x/vesting/types" + vestingtypes "github.com/classic-terra/core/v3/x/vesting/types" ) const ( diff --git a/cmd/terrad/main.go b/cmd/terrad/main.go index 4f4a0656d..26b6bfe53 100644 --- a/cmd/terrad/main.go +++ b/cmd/terrad/main.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - terraapp "github.com/classic-terra/core/v2/app" + terraapp "github.com/classic-terra/core/v3/app" ) func main() { diff --git a/cmd/terrad/root.go b/cmd/terrad/root.go index 9a7f3835a..19afcdae8 100644 --- a/cmd/terrad/root.go +++ b/cmd/terrad/root.go @@ -6,12 +6,14 @@ import ( "os" "path/filepath" + dbm "github.com/cometbft/cometbft-db" + tmcli "github.com/cometbft/cometbft/libs/cli" + "github.com/cometbft/cometbft/libs/log" "github.com/spf13/cast" "github.com/spf13/cobra" - tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" + tmcfg "github.com/cometbft/cometbft/config" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" @@ -31,16 +33,18 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/crisis" + genutil "github.com/cosmos/cosmos-sdk/x/genutil" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - tmcfg "github.com/tendermint/tendermint/config" + genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - terraapp "github.com/classic-terra/core/v2/app" - terralegacy "github.com/classic-terra/core/v2/app/legacy" - "github.com/classic-terra/core/v2/app/params" - authcustomcli "github.com/classic-terra/core/v2/custom/auth/client/cli" - core "github.com/classic-terra/core/v2/types" + terraapp "github.com/classic-terra/core/v3/app" + terralegacy "github.com/classic-terra/core/v3/app/legacy" + "github.com/classic-terra/core/v3/app/params" + authcustomcli "github.com/classic-terra/core/v3/custom/auth/client/cli" + core "github.com/classic-terra/core/v3/types" "github.com/CosmWasm/wasmd/x/wasm" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" ) @@ -117,9 +121,11 @@ func initTendermintConfig() *tmcfg.Config { func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { a := appCreator{encodingConfig} + gentxModule := terraapp.ModuleBasics[genutiltypes.ModuleName].(genutil.AppModuleBasic) + rootCmd.AddCommand( genutilcli.InitCmd(terraapp.ModuleBasics, terraapp.DefaultNodeHome), - genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, terraapp.DefaultNodeHome), + genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, terraapp.DefaultNodeHome, gentxModule.GenTxValidator), terralegacy.MigrateGenesisCmd(), genutilcli.GenTxCmd(terraapp.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, terraapp.DefaultNodeHome), genutilcli.ValidateGenesisCmd(terraapp.ModuleBasics), @@ -140,9 +146,6 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { txCommand(), keys.Commands(terraapp.DefaultNodeHome), ) - - // add rosetta commands - rootCmd.AddCommand(server.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Marshaler)) } func addModuleInitFlags(startCmd *cobra.Command) { @@ -225,13 +228,26 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a panic(err) } - snapshotDir := filepath.Join(cast.ToString(appOpts.Get(flags.FlagHome)), "data", "snapshots") + homeDir := cast.ToString(appOpts.Get(flags.FlagHome)) + chainID := cast.ToString(appOpts.Get(flags.FlagChainID)) + if chainID == "" { + // fallback to genesis chain-id + genDocFile := filepath.Join(homeDir, "config", "genesis.json") + appGenesis, err := tmtypes.GenesisDocFromFile(genDocFile) + if err != nil { + panic(err) + } + + chainID = appGenesis.ChainID + } + + snapshotDir := filepath.Join(homeDir, "data", "snapshots") err = os.MkdirAll(snapshotDir, os.ModePerm) if err != nil { panic(err) } - snapshotDB, err := sdk.NewLevelDB("metadata", snapshotDir) + snapshotDB, err := dbm.NewDB("metadata", server.GetAppDBBackend(appOpts), snapshotDir) if err != nil { panic(err) } @@ -246,15 +262,15 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a ) // TODO: We want to parse legacy wasm options from app.toml in [wasm] section here or not? - var wasmOpts []wasm.Option + var wasmOpts []wasmkeeper.Option return terraapp.NewTerraApp( logger, db, traceStore, true, skipUpgradeHeights, cast.ToString(appOpts.Get(flags.FlagHome)), - cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), a.encodingConfig, appOpts, wasmOpts, + baseapp.SetChainID(chainID), baseapp.SetPruning(pruningOpts), baseapp.SetMinGasPrices(cast.ToString(appOpts.Get(server.FlagMinGasPrices))), baseapp.SetHaltHeight(cast.ToUint64(appOpts.Get(server.FlagHaltHeight))), @@ -273,9 +289,9 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a func (a appCreator) appExport( logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool, jailAllowedAddrs []string, - appOpts servertypes.AppOptions, + appOpts servertypes.AppOptions, modulesToExport []string, ) (servertypes.ExportedApp, error) { - var wasmOpts []wasm.Option + var wasmOpts []wasmkeeper.Option homePath, ok := appOpts.Get(flags.FlagHome).(string) if !ok || homePath == "" { return servertypes.ExportedApp{}, errors.New("application home not set") @@ -283,14 +299,14 @@ func (a appCreator) appExport( var terraApp *terraapp.TerraApp if height != -1 { - terraApp = terraapp.NewTerraApp(logger, db, traceStore, false, map[int64]bool{}, homePath, cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), a.encodingConfig, appOpts, wasmOpts) + terraApp = terraapp.NewTerraApp(logger, db, traceStore, false, map[int64]bool{}, homePath, a.encodingConfig, appOpts, wasmOpts) if err := terraApp.LoadHeight(height); err != nil { return servertypes.ExportedApp{}, err } } else { - terraApp = terraapp.NewTerraApp(logger, db, traceStore, true, map[int64]bool{}, homePath, cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), a.encodingConfig, appOpts, wasmOpts) + terraApp = terraapp.NewTerraApp(logger, db, traceStore, true, map[int64]bool{}, homePath, a.encodingConfig, appOpts, wasmOpts) } - return terraApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs) + return terraApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) } diff --git a/cmd/terrad/testnet.go b/cmd/terrad/testnet.go index ab85a9c5c..465493975 100644 --- a/cmd/terrad/testnet.go +++ b/cmd/terrad/testnet.go @@ -11,12 +11,13 @@ import ( "path/filepath" "time" + tmconfig "github.com/cometbft/cometbft/config" + tmos "github.com/cometbft/cometbft/libs/os" + tmrand "github.com/cometbft/cometbft/libs/rand" + "github.com/cometbft/cometbft/types" + tmtime "github.com/cometbft/cometbft/types/time" + govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/spf13/cobra" - tmconfig "github.com/tendermint/tendermint/config" - tmos "github.com/tendermint/tendermint/libs/os" - tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/types" - tmtime "github.com/tendermint/tendermint/types/time" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" @@ -34,10 +35,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" ) var ( @@ -77,7 +77,7 @@ Example: nodeDaemonHome, _ := cmd.Flags().GetString(flagNodeDaemonHome) startingIPAddress, _ := cmd.Flags().GetString(flagStartingIPAddress) numValidators, _ := cmd.Flags().GetInt(flagNumValidators) - algo, _ := cmd.Flags().GetString(flags.FlagKeyAlgorithm) + algo, _ := cmd.Flags().GetString(flags.FlagKeyType) return InitTestnet( clientCtx, cmd, config, mbm, genBalIterator, outputDir, chainID, minGasPrices, @@ -94,7 +94,7 @@ Example: cmd.Flags().String(flags.FlagChainID, "", "genesis file chain-id, if left blank will be randomly created") cmd.Flags().String(server.FlagMinGasPrices, fmt.Sprintf("0.000006%s", core.MicroLunaDenom), "Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.01photino,0.001stake)") cmd.Flags().String(flags.FlagKeyringBackend, flags.DefaultKeyringBackend, "Select keyring's backend (os|file|test)") - cmd.Flags().String(flags.FlagKeyAlgorithm, string(hd.Secp256k1Type), "Key signing algorithm to generate keys for") + cmd.Flags().String(flags.FlagKeyType, string(hd.Secp256k1Type), "Key signing algorithm to generate keys for") return cmd } @@ -309,9 +309,10 @@ func initGenFiles( appGenState[banktypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&bankGenState) // set gov in the genesis state - var govGenState govv1beta1.GenesisState + var govGenState govv1.GenesisState clientCtx.Codec.MustUnmarshalJSON(appGenState[govtypes.ModuleName], &govGenState) - govGenState.VotingParams.VotingPeriod = time.Minute * 3 + votingPeriod := time.Minute * 3 + govGenState.Params.VotingPeriod = &votingPeriod appGenState[govtypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&govGenState) appGenStateJSON, err := json.MarshalIndent(appGenState, "", " ") @@ -358,7 +359,7 @@ func collectGenFiles( return err } - nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.Codec, clientCtx.TxConfig, nodeConfig, initCfg, *genDoc, genBalIterator) + nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.Codec, clientCtx.TxConfig, nodeConfig, initCfg, *genDoc, genBalIterator, genutiltypes.DefaultMessageValidator) if err != nil { return err } diff --git a/contrib/updates/Dockerfile.old b/contrib/updates/Dockerfile.old new file mode 100644 index 000000000..95defca46 --- /dev/null +++ b/contrib/updates/Dockerfile.old @@ -0,0 +1,125 @@ +# syntax=docker/dockerfile:1 + +ARG source=./ +ARG GO_VERSION="1.20" +ARG BUILDPLATFORM=linux/amd64 +ARG BASE_IMAGE="golang:${GO_VERSION}-alpine3.18" +FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} as base + +############################################################################### +# Builder +############################################################################### + +FROM base as builder-stage-1 + +ARG source +ARG GIT_COMMIT +ARG GIT_VERSION +ARG BUILDPLATFORM +ARG GOOS=linux \ + GOARCH=amd64 + +ENV GOOS=$GOOS \ + GOARCH=$GOARCH + +# NOTE: add libusb-dev to run with LEDGER_ENABLED=true +RUN set -eux &&\ + apk update &&\ + apk add --no-cache \ + ca-certificates \ + linux-headers \ + build-base \ + cmake \ + git + +# install mimalloc for musl +WORKDIR ${GOPATH}/src/mimalloc +RUN set -eux &&\ + git clone --depth 1 --branch v2.1.2 \ + https://github.com/microsoft/mimalloc . &&\ + mkdir -p build &&\ + cd build &&\ + cmake .. &&\ + make -j$(nproc) &&\ + make install + +# download dependencies to cache as layer +WORKDIR ${GOPATH}/src/app +COPY ${source}go.mod ${source}go.sum ./ +RUN --mount=type=cache,target=/root/.cache/go-build \ + --mount=type=cache,target=/root/go/pkg/mod \ + go mod download -x + +# Cosmwasm - Download correct libwasmvm version and verify checksum +RUN set -eux &&\ + WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 5) && \ + WASMVM_DOWNLOADS="https://github.com/classic-terra/wasmvm/releases/download/${WASMVM_VERSION}"; \ + wget ${WASMVM_DOWNLOADS}/checksums.txt -O /tmp/checksums.txt; \ + if [ ${BUILDPLATFORM} = "linux/amd64" ]; then \ + WASMVM_URL="${WASMVM_DOWNLOADS}/libwasmvm_muslc.x86_64.a"; \ + elif [ ${BUILDPLATFORM} = "linux/arm64" ]; then \ + WASMVM_URL="${WASMVM_DOWNLOADS}/libwasmvm_muslc.aarch64.a"; \ + else \ + echo "Unsupported Build Platfrom ${BUILDPLATFORM}"; \ + exit 1; \ + fi; \ + wget ${WASMVM_URL} -O /lib/libwasmvm_muslc.a; \ + CHECKSUM=`sha256sum /lib/libwasmvm_muslc.a | cut -d" " -f1`; \ + grep ${CHECKSUM} /tmp/checksums.txt; \ + rm /tmp/checksums.txt + +############################################################################### + +FROM builder-stage-1 as builder-stage-2 + +ARG source +ARG GOOS=linux \ + GOARCH=amd64 + +ENV GOOS=$GOOS \ + GOARCH=$GOARCH + +# Copy the remaining files +COPY ${source} . + +# Build app binary +RUN --mount=type=cache,target=/root/.cache/go-build \ + --mount=type=cache,target=/root/go/pkg/mod \ + go install \ + -mod=readonly \ + -tags "netgo,muslc" \ + -ldflags " \ + -w -s -linkmode=external -extldflags \ + '-L/go/src/mimalloc/build -lmimalloc -Wl,-z,muldefs -static' \ + -X github.com/cosmos/cosmos-sdk/version.Name='terra' \ + -X github.com/cosmos/cosmos-sdk/version.AppName='terrad' \ + -X github.com/cosmos/cosmos-sdk/version.Version=${GIT_VERSION} \ + -X github.com/cosmos/cosmos-sdk/version.Commit=${GIT_COMMIT} \ + -X github.com/cosmos/cosmos-sdk/version.BuildTags='netgo,muslc' \ + " \ + -trimpath \ + ./... + +################################################################################ + +FROM alpine as terra-core + +RUN apk update && apk add wget lz4 aria2 curl jq gawk coreutils "zlib>1.2.12-r2" libssl3 + +COPY --from=builder-stage-2 /go/bin/terrad /usr/local/bin/terrad + +RUN addgroup -g 1000 terra && \ + adduser -u 1000 -G terra -D -h /app terra + +# rest server +EXPOSE 1317 +# grpc server +EXPOSE 9090 +# tendermint p2p +EXPOSE 26656 +# tendermint rpc +EXPOSE 26657 + +WORKDIR /app + +CMD ["terrad", "version"] \ No newline at end of file diff --git a/contrib/updates/prepare_cosmovisor.sh b/contrib/updates/prepare_cosmovisor.sh index 164bd53f6..b55fad1be 100644 --- a/contrib/updates/prepare_cosmovisor.sh +++ b/contrib/updates/prepare_cosmovisor.sh @@ -30,7 +30,7 @@ fi ## check if $BUILDDIR/old/terrad exists if [ ! -f "$BUILDDIR/old/terrad" ]; then mkdir -p $BUILDDIR/old - docker build --platform linux/amd64 --no-cache --build-arg source=./_build/core-${OLD_VERSION:1}/ --tag classic-terra/terraclassic.terrad-binary.old . + docker build --platform linux/amd64 --no-cache --build-arg source=./_build/core-${OLD_VERSION:1}/ --tag classic-terra/terraclassic.terrad-binary.old -f contrib/updates/Dockerfile.old . docker create --platform linux/amd64 --name old-temp classic-terra/terraclassic.terrad-binary.old:latest docker cp old-temp:/usr/local/bin/terrad $BUILDDIR/old/ docker rm old-temp diff --git a/custom/auth/ante/ante.go b/custom/auth/ante/ante.go index a6f548209..7dabfce5a 100644 --- a/custom/auth/ante/ante.go +++ b/custom/auth/ante/ante.go @@ -1,15 +1,7 @@ package ante import ( - dyncommante "github.com/classic-terra/core/v2/x/dyncomm/ante" - dyncommkeeper "github.com/classic-terra/core/v2/x/dyncomm/keeper" - "github.com/cosmos/cosmos-sdk/codec" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante" - ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" - - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + errorsmod "cosmossdk.io/errors" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -17,6 +9,16 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/signing" distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" + + dyncommante "github.com/classic-terra/core/v3/x/dyncomm/ante" + dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper" + "github.com/cosmos/cosmos-sdk/codec" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" + ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" ) // HandlerOptions are the options required for constructing a default SDK AnteHandler. @@ -31,12 +33,13 @@ type HandlerOptions struct { SigGasConsumer ante.SignatureVerificationGasConsumer TxFeeChecker ante.TxFeeChecker IBCKeeper ibckeeper.Keeper + WasmKeeper *wasmkeeper.Keeper DistributionKeeper distributionkeeper.Keeper GovKeeper govkeeper.Keeper WasmConfig *wasmtypes.WasmConfig TXCounterStoreKey storetypes.StoreKey DyncommKeeper dyncommkeeper.Keeper - StakingKeeper stakingkeeper.Keeper + StakingKeeper *stakingkeeper.Keeper Cdc codec.BinaryCodec } @@ -45,31 +48,31 @@ type HandlerOptions struct { // signer. func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { if options.AccountKeeper == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder") + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder") } if options.BankKeeper == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder") + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder") } if options.OracleKeeper == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "oracle keeper is required for ante builder") + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "oracle keeper is required for ante builder") } if options.TreasuryKeeper == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "treasury keeper is required for ante builder") + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "treasury keeper is required for ante builder") } if options.SignModeHandler == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder") + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder") } if options.WasmConfig == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder") + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder") } if options.TXCounterStoreKey == nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder") + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "tx counter key is required for ante builder") } return sdk.ChainAnteDecorators( diff --git a/custom/auth/ante/ante_test.go b/custom/auth/ante/ante_test.go index ec264d475..ba3d58677 100644 --- a/custom/auth/ante/ante_test.go +++ b/custom/auth/ante/ante_test.go @@ -5,26 +5,26 @@ import ( "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/cosmos/cosmos-sdk/types/tx/signing" xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - terraapp "github.com/classic-terra/core/v2/app" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + terraapp "github.com/classic-terra/core/v3/app" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" - "github.com/CosmWasm/wasmd/x/wasm" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" ) // AnteTestSuite is a test suite to be used with ante handler tests. @@ -41,11 +41,11 @@ type AnteTestSuite struct { // returns context and app with params set on account keeper func createTestApp(isCheckTx bool, tempDir string) (*terraapp.TerraApp, sdk.Context) { // TODO: we need to feed in custom binding here? - var wasmOpts []wasm.Option + var wasmOpts []wasmkeeper.Option app := terraapp.NewTerraApp( log.NewNopLogger(), dbm.NewMemDB(), nil, true, map[int64]bool{}, - tempDir, simapp.FlagPeriodValue, terraapp.MakeEncodingConfig(), - simapp.EmptyAppOptions{}, wasmOpts, + tempDir, terraapp.MakeEncodingConfig(), + simtestutil.EmptyAppOptions{}, wasmOpts, ) ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) @@ -69,8 +69,8 @@ func (suite *AnteTestSuite) SetupTest(isCheckTx bool) { WithTxConfig(encodingConfig.TxConfig) } -func (suite *AnteTestSuite) SetupEncoding() simappparams.EncodingConfig { - encodingConfig := simapp.MakeTestEncodingConfig() +func (suite *AnteTestSuite) SetupEncoding() testutil.TestEncodingConfig { + encodingConfig := testutil.MakeTestEncodingConfig() // We're using TestMsg encoding in some tests, so register it here. encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil) testdata.RegisterInterfaces(encodingConfig.InterfaceRegistry) diff --git a/custom/auth/ante/expected_keeper.go b/custom/auth/ante/expected_keeper.go index b6cdd1d6a..1326fb785 100644 --- a/custom/auth/ante/expected_keeper.go +++ b/custom/auth/ante/expected_keeper.go @@ -1,6 +1,7 @@ package ante import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" @@ -10,7 +11,7 @@ import ( type TreasuryKeeper interface { RecordEpochTaxProceeds(ctx sdk.Context, delta sdk.Coins) GetTaxRate(ctx sdk.Context) (taxRate sdk.Dec) - GetTaxCap(ctx sdk.Context, denom string) (taxCap sdk.Int) + GetTaxCap(ctx sdk.Context, denom string) (taxCap math.Int) GetBurnSplitRate(ctx sdk.Context) sdk.Dec HasBurnTaxExemptionAddress(ctx sdk.Context, addresses ...string) bool HasBurnTaxExemptionContract(ctx sdk.Context, address string) bool @@ -24,6 +25,7 @@ type OracleKeeper interface { // BankKeeper defines the contract needed for supply related APIs (noalias) type BankKeeper interface { + IsSendEnabledCoins(ctx sdk.Context, coins ...sdk.Coin) error SendCoins(ctx sdk.Context, from, to sdk.AccAddress, amt sdk.Coins) error SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error SendCoinsFromModuleToModule(ctx sdk.Context, senderModule string, recipientModule string, amt sdk.Coins) error diff --git a/custom/auth/ante/fee.go b/custom/auth/ante/fee.go index a6ef2a16a..44acc1f4b 100644 --- a/custom/auth/ante/fee.go +++ b/custom/auth/ante/fee.go @@ -4,6 +4,7 @@ import ( "fmt" "math" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -33,11 +34,11 @@ func NewFeeDecorator(ak ante.AccountKeeper, bk BankKeeper, fk ante.FeegrantKeepe func (fd FeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) { feeTx, ok := tx.(sdk.FeeTx) if !ok { - return ctx, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx") + return ctx, errorsmod.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx") } if !simulate && ctx.BlockHeight() > 0 && feeTx.GetGas() == 0 { - return ctx, sdkerrors.Wrap(sdkerrors.ErrInvalidGasLimit, "must provide positive gas") + return ctx, errorsmod.Wrap(sdkerrors.ErrInvalidGasLimit, "must provide positive gas") } var ( @@ -83,7 +84,7 @@ func (fd FeeDecorator) checkDeductFee(ctx sdk.Context, feeTx sdk.FeeTx, taxes sd } else if !feeGranter.Equals(feePayer) { err := fd.feegrantKeeper.UseGrantedFees(ctx, feeGranter, feePayer, fee, feeTx.GetMsgs()) if err != nil { - return sdkerrors.Wrapf(err, "%s does not not allow to pay fees for %s", feeGranter, feePayer) + return errorsmod.Wrapf(err, "%s does not not allow to pay fees for %s", feeGranter, feePayer) } } @@ -128,12 +129,12 @@ func (fd FeeDecorator) checkDeductFee(ctx sdk.Context, feeTx sdk.FeeTx, taxes sd // DeductFees deducts fees from the given account. func DeductFees(bankKeeper types.BankKeeper, ctx sdk.Context, acc types.AccountI, fees sdk.Coins) error { if !fees.IsValid() { - return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFee, "invalid fee amount: %s", fees) + return errorsmod.Wrapf(sdkerrors.ErrInsufficientFee, "invalid fee amount: %s", fees) } err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), types.FeeCollectorName, fees) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) + return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) } return nil @@ -146,7 +147,7 @@ func DeductFees(bankKeeper types.BankKeeper, ctx sdk.Context, acc types.AccountI func (fd FeeDecorator) checkTxFee(ctx sdk.Context, tx sdk.Tx, taxes sdk.Coins) (int64, error) { feeTx, ok := tx.(sdk.FeeTx) if !ok { - return 0, sdkerrors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx") + return 0, errorsmod.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx") } feeCoins := feeTx.GetFee() @@ -176,7 +177,7 @@ func (fd FeeDecorator) checkTxFee(ctx sdk.Context, tx sdk.Tx, taxes sdk.Coins) ( // Check required fees if !requiredFees.IsZero() && !feeCoins.IsAnyGTE(requiredFees) { - return 0, sdkerrors.Wrapf(sdkerrors.ErrInsufficientFee, "insufficient fees; got: %q, required: %q = %q(gas) + %q(stability)", feeCoins, requiredFees, requiredGasFees, taxes) + return 0, errorsmod.Wrapf(sdkerrors.ErrInsufficientFee, "insufficient fees; got: %q, required: %q = %q(gas) + %q(stability)", feeCoins, requiredFees, requiredGasFees, taxes) } } diff --git a/custom/auth/ante/fee_burntax.go b/custom/auth/ante/fee_burntax.go index 900a76918..fd76cd3ea 100644 --- a/custom/auth/ante/fee_burntax.go +++ b/custom/auth/ante/fee_burntax.go @@ -1,11 +1,12 @@ package ante import ( + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/types" - treasury "github.com/classic-terra/core/v2/x/treasury/types" + treasury "github.com/classic-terra/core/v3/x/treasury/types" ) // BurnTaxSplit splits @@ -30,7 +31,7 @@ func (fd FeeDecorator) BurnTaxSplit(ctx sdk.Context, taxes sdk.Coins) (err error treasury.BurnModuleName, taxes, ); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) + return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) } } diff --git a/custom/auth/ante/fee_tax.go b/custom/auth/ante/fee_tax.go index 43abe14bb..96a0e48d6 100644 --- a/custom/auth/ante/fee_tax.go +++ b/custom/auth/ante/fee_tax.go @@ -4,13 +4,13 @@ import ( "regexp" "strings" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" authz "github.com/cosmos/cosmos-sdk/x/authz" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - marketexported "github.com/classic-terra/core/v2/x/market/exported" - oracleexported "github.com/classic-terra/core/v2/x/oracle/exported" + marketexported "github.com/classic-terra/core/v3/x/market/exported" + oracleexported "github.com/classic-terra/core/v3/x/oracle/exported" ) var IBCRegexp = regexp.MustCompile("^ibc/[a-fA-F0-9]{64}$") @@ -54,13 +54,13 @@ func FilterMsgAndComputeTax(ctx sdk.Context, tk TreasuryKeeper, msgs ...sdk.Msg) case *marketexported.MsgSwapSend: taxes = taxes.Add(computeTax(ctx, tk, sdk.NewCoins(msg.OfferCoin))...) - case *wasm.MsgInstantiateContract: + case *wasmtypes.MsgInstantiateContract: taxes = taxes.Add(computeTax(ctx, tk, msg.Funds)...) - case *wasm.MsgInstantiateContract2: + case *wasmtypes.MsgInstantiateContract2: taxes = taxes.Add(computeTax(ctx, tk, msg.Funds)...) - case *wasm.MsgExecuteContract: + case *wasmtypes.MsgExecuteContract: if !tk.HasBurnTaxExemptionContract(ctx, msg.Contract) { taxes = taxes.Add(computeTax(ctx, tk, msg.Funds)...) } diff --git a/custom/auth/ante/fee_test.go b/custom/auth/ante/fee_test.go index b92ff3370..50dcc8c4c 100644 --- a/custom/auth/ante/fee_test.go +++ b/custom/auth/ante/fee_test.go @@ -18,10 +18,10 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/classic-terra/core/v2/custom/auth/ante" - core "github.com/classic-terra/core/v2/types" - markettypes "github.com/classic-terra/core/v2/x/market/types" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/custom/auth/ante" + core "github.com/classic-terra/core/v3/types" + markettypes "github.com/classic-terra/core/v3/x/market/types" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" ) func (s *AnteTestSuite) TestDeductFeeDecorator_ZeroGas() { @@ -507,7 +507,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFeesAuthzExec() { s.Require().NoError(err, "Decorator should not have errored on fee higher than local gasPrice") } -// go test -v -run ^TestAnteTestSuite/TestTaxExemption$ github.com/classic-terra/core/v2/custom/auth/ante +// go test -v -run ^TestAnteTestSuite/TestTaxExemption$ github.com/classic-terra/core/v3/custom/auth/ante func (s *AnteTestSuite) TestTaxExemption() { // keys and addresses var privs []cryptotypes.PrivKey @@ -730,7 +730,7 @@ func (s *AnteTestSuite) TestTaxExemption() { } } -// go test -v -run ^TestAnteTestSuite/TestBurnSplitTax$ github.com/classic-terra/core/v2/custom/auth/ante +// go test -v -run ^TestAnteTestSuite/TestBurnSplitTax$ github.com/classic-terra/core/v3/custom/auth/ante func (s *AnteTestSuite) TestBurnSplitTax() { s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0)) // 100% s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1)) // 10% @@ -833,7 +833,7 @@ func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec) { ) } -// go test -v -run ^TestAnteTestSuite/TestEnsureIBCUntaxed$ github.com/classic-terra/core/v2/custom/auth/ante +// go test -v -run ^TestAnteTestSuite/TestEnsureIBCUntaxed$ github.com/classic-terra/core/v3/custom/auth/ante // TestEnsureIBCUntaxed tests that IBC transactions are not taxed, but fee is still deducted func (s *AnteTestSuite) TestEnsureIBCUntaxed() { s.SetupTest(true) // setup @@ -883,7 +883,7 @@ func (s *AnteTestSuite) TestEnsureIBCUntaxed() { s.Require().True(taxProceeds.Empty()) } -// go test -v -run ^TestAnteTestSuite/TestOracleZeroFee$ github.com/classic-terra/core/v2/custom/auth/ante +// go test -v -run ^TestAnteTestSuite/TestOracleZeroFee$ github.com/classic-terra/core/v3/custom/auth/ante func (s *AnteTestSuite) TestOracleZeroFee() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() diff --git a/custom/auth/ante/integration_test.go b/custom/auth/ante/integration_test.go index 801a0a964..ffadd5983 100644 --- a/custom/auth/ante/integration_test.go +++ b/custom/auth/ante/integration_test.go @@ -13,12 +13,12 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - customante "github.com/classic-terra/core/v2/custom/auth/ante" - core "github.com/classic-terra/core/v2/types" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + customante "github.com/classic-terra/core/v3/custom/auth/ante" + core "github.com/classic-terra/core/v3/types" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" ) -// go test -v -run ^TestAnteTestSuite/TestIntegrationTaxExemption$ github.com/classic-terra/core/v2/custom/auth/ante +// go test -v -run ^TestAnteTestSuite/TestIntegrationTaxExemption$ github.com/classic-terra/core/v3/custom/auth/ante func (s *AnteTestSuite) TestIntegrationTaxExemption() { // keys and addresses var privs []cryptotypes.PrivKey @@ -123,6 +123,7 @@ func (s *AnteTestSuite) TestIntegrationTaxExemption() { ak := s.app.AccountKeeper bk := s.app.BankKeeper dk := s.app.DistrKeeper + wk := s.app.WasmKeeper // Set burn split rate to 50% // fee amount should be 500, 50% of 10000 @@ -138,6 +139,7 @@ func (s *AnteTestSuite) TestIntegrationTaxExemption() { customante.HandlerOptions{ AccountKeeper: ak, BankKeeper: bk, + WasmKeeper: &wk, FeegrantKeeper: s.app.FeeGrantKeeper, OracleKeeper: s.app.OracleKeeper, TreasuryKeeper: s.app.TreasuryKeeper, diff --git a/custom/auth/ante/min_initial_deposit.go b/custom/auth/ante/min_initial_deposit.go index 0804c68e4..aba117587 100644 --- a/custom/auth/ante/min_initial_deposit.go +++ b/custom/auth/ante/min_initial_deposit.go @@ -3,12 +3,14 @@ package ante import ( "fmt" - core "github.com/classic-terra/core/v2/types" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + + core "github.com/classic-terra/core/v3/types" ) // MinInitialDeposit Decorator will check Initial Deposits for MsgSubmitProposal @@ -47,7 +49,7 @@ func HandleCheckMinInitialDeposit(ctx sdk.Context, msg sdk.Msg, govKeeper govkee default: return fmt.Errorf("could not dereference msg as MsgSubmitProposal") } - minDeposit := govKeeper.GetDepositParams(ctx).MinDeposit + minDeposit := govKeeper.GetParams(ctx).MinDeposit requiredAmount := sdk.NewDecFromInt(minDeposit[0].Amount).Mul(treasuryKeeper.GetMinInitialDepositRatio(ctx)).TruncateInt() requiredDepositCoins := sdk.NewCoins( @@ -75,7 +77,7 @@ func (midd MinInitialDepositDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, si err := HandleCheckMinInitialDeposit(ctx, msg, midd.govKeeper, midd.treasuryKeeper) if err != nil { - return ctx, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, err.Error()) + return ctx, errorsmod.Wrapf(sdkerrors.ErrUnauthorized, err.Error()) } } diff --git a/custom/auth/ante/min_initial_deposit_test.go b/custom/auth/ante/min_initial_deposit_test.go index 5c67bc1d1..73f13b58f 100644 --- a/custom/auth/ante/min_initial_deposit_test.go +++ b/custom/auth/ante/min_initial_deposit_test.go @@ -9,8 +9,8 @@ import ( // banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/classic-terra/core/v2/custom/auth/ante" - core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v3/custom/auth/ante" + core "github.com/classic-terra/core/v3/types" // core "github.com/terra-money/core/types" // treasury "github.com/terra-money/core/x/treasury/types" @@ -31,12 +31,12 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioDefault() { antehandler := sdk.ChainAnteDecorators(midd) // set required deposit to uluna - suite.app.GovKeeper.SetDepositParams(suite.ctx, govv1.DefaultDepositParams()) - govparams := suite.app.GovKeeper.GetDepositParams(suite.ctx) + suite.app.GovKeeper.SetParams(suite.ctx, govv1.DefaultParams()) + govparams := suite.app.GovKeeper.GetParams(suite.ctx) govparams.MinDeposit = sdk.NewCoins( sdk.NewCoin(core.MicroLunaDenom, sdk.NewInt(1_000_000)), ) - suite.app.GovKeeper.SetDepositParams(suite.ctx, govparams) + suite.app.GovKeeper.SetParams(suite.ctx, govparams) // set initial deposit ratio to 0.0 ratio := sdk.ZeroDec() @@ -63,7 +63,7 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioDefault() { suite.Require().NoError(err, "error: Proposal whithout initial deposit should have gone through") // create v1 proposal - msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata") + msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata", "title", "summary") feeAmountv1 := testdata.NewTestFeeAmount() gasLimitv1 := testdata.NewTestGasLimit() suite.Require().NoError(suite.txBuilder.SetMsgs(msgv1)) @@ -86,12 +86,12 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithSufficientDeposit() { antehandler := sdk.ChainAnteDecorators(midd) // set required deposit to uluna - suite.app.GovKeeper.SetDepositParams(suite.ctx, govv1.DefaultDepositParams()) - govparams := suite.app.GovKeeper.GetDepositParams(suite.ctx) + suite.app.GovKeeper.SetParams(suite.ctx, govv1.DefaultParams()) + govparams := suite.app.GovKeeper.GetParams(suite.ctx) govparams.MinDeposit = sdk.NewCoins( sdk.NewCoin(core.MicroLunaDenom, sdk.NewInt(1_000_000)), ) - suite.app.GovKeeper.SetDepositParams(suite.ctx, govparams) + suite.app.GovKeeper.SetParams(suite.ctx, govparams) // set initial deposit ratio to 0.2 ratio := sdk.NewDecWithPrec(2, 1) @@ -120,7 +120,7 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithSufficientDeposit() { suite.Require().NoError(err, "error: Proposal with sufficient initial deposit should have gone through") // create v1 proposal - msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata") + msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata", "title", "summary") feeAmountv1 := testdata.NewTestFeeAmount() gasLimitv1 := testdata.NewTestGasLimit() suite.Require().NoError(suite.txBuilder.SetMsgs(msgv1)) @@ -143,12 +143,12 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithInsufficientDeposit() antehandler := sdk.ChainAnteDecorators(midd) // set required deposit to uluna - suite.app.GovKeeper.SetDepositParams(suite.ctx, govv1.DefaultDepositParams()) - govparams := suite.app.GovKeeper.GetDepositParams(suite.ctx) + suite.app.GovKeeper.SetParams(suite.ctx, govv1.DefaultParams()) + govparams := suite.app.GovKeeper.GetParams(suite.ctx) govparams.MinDeposit = sdk.NewCoins( sdk.NewCoin(core.MicroLunaDenom, sdk.NewInt(1_000_000)), ) - suite.app.GovKeeper.SetDepositParams(suite.ctx, govparams) + suite.app.GovKeeper.SetParams(suite.ctx, govparams) // set initial deposit ratio to 0.2 ratio := sdk.NewDecWithPrec(2, 1) @@ -177,7 +177,7 @@ func (suite *AnteTestSuite) TestMinInitialDepositRatioWithInsufficientDeposit() suite.Require().Error(err, "error: Proposal with insufficient initial deposit should have failed") // create v1 proposal - msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata") + msgv1, _ := govv1.NewMsgSubmitProposal([]sdk.Msg{}, depositCoins1, addr1.String(), "metadata", "title", "summary") feeAmountv1 := testdata.NewTestFeeAmount() gasLimitv1 := testdata.NewTestGasLimit() suite.Require().NoError(suite.txBuilder.SetMsgs(msgv1)) diff --git a/custom/auth/ante/spamming_memo_test.go b/custom/auth/ante/spamming_memo_test.go new file mode 100644 index 000000000..1b61378cf --- /dev/null +++ b/custom/auth/ante/spamming_memo_test.go @@ -0,0 +1,59 @@ +package ante_test + +import ( + "fmt" + + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" + "github.com/cosmos/cosmos-sdk/testutil/testdata" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + + "github.com/cosmos/cosmos-sdk/x/auth/ante" +) + +func (suite *AnteTestSuite) TestMemoSpamming() { + suite.SetupTest(true) // setup + suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder() + + midd := ante.NewValidateMemoDecorator(suite.app.AccountKeeper) + antehandler := sdk.ChainAnteDecorators(midd) + + priv1, _, addr1 := testdata.KeyTestPubAddr() + _, _, addr2 := testdata.KeyTestPubAddr() + + // Set IsCheckTx to true + suite.ctx = suite.ctx.WithIsCheckTx(true) + + suite.app.AccountKeeper.SetParams(suite.ctx, authtypes.DefaultParams()) + authParams := suite.app.AccountKeeper.GetParams(suite.ctx) + authParams.MaxMemoCharacters = 512 + suite.app.AccountKeeper.SetParams(suite.ctx, authParams) + + transferCoin := sdk.Coin{} + msg := ibctransfertypes.NewMsgTransfer( + "transfer", + "channel-0", + transferCoin, + addr1.String(), + addr2.String(), + clienttypes.Height{}, + 0, + longMemo, + ) + feeAmount := testdata.NewTestFeeAmount() + gasLimit := testdata.NewTestGasLimit() + suite.Require().NoError(suite.txBuilder.SetMsgs(msg)) + suite.txBuilder.SetFeeAmount(feeAmount) + suite.txBuilder.SetGasLimit(gasLimit) + privs, accNums, accSeqs := []cryptotypes.PrivKey{priv1}, []uint64{0}, []uint64{0} + tx, err := suite.CreateTestTx(privs, accNums, accSeqs, suite.ctx.ChainID()) + suite.Require().NoError(err) + + _, err = antehandler(suite.ctx, tx, false) + + fmt.Println("err: ", err) +} + +var longMemo = "6d5184c6ee6a853986cc2e41b1f308cede7accb9994d7b90d951e7560ee9ba6b61b0500df10180b841bc0833bf7fc3be33ee4bf91bf9044daa4f421de59470d75ceef8aef47c44c3d55d01cbf95a29f3b6e21c536b394207f770807a508bb3398ca401f8a469d7c9e98e6f009f1ed4be8964dc2a9830e1aa8480982795faab8dd8bfc1ada3725ac9ef9e404492fb832801c3edcc0b6b82c0758193416c02961338339bbde9a20d55af67ed69717c0a3a80465103a2cee184a47a144ce7fbc706adcd148c1b6ddc143258c78f1528ee2a400eed47f787f3324b6efaa185950b866cc1953e77d968e2d956848abffdb7d92e2e190ffe1c78cabe110429a81c21f436ed09fc8a10add744ecaa9f07c39a430265368ecfddb0f6d8d3f80e9bcfb2af19371202dd0845ff57d0bd565856b2a83b41bdc7b116bc7347c80c0d4bf3741deeb499f3cd22204d7cb6709f2867c1831d55e3efbe6b3e43261294ef6f2cbb9fa139249deeeeec8916806fd257aa871150f61714ff63f5e0042690cf62c6b4083e31bc84cb070ba6eecee853f55cd1b08a932610d5171e70d87cac011e7e8a821d539fdf12c4df57cc1efd7fe7b49a80d4df4b790dcbc94e1d4c354800fef027036db9a3de40b4f2544a0084325f5cfda839d01318096738fc542cc253537c71478e06d7d8e5b1ea12e712e42976a68e5cf31f2688c3276ec689dae917608f034b63804a19c0ffe287e3b5553ee59dae20499182cafa1b37530d999e3d6fc0d922c18b2a93cdd381547645b4c34f60d2e51b11f64af4510b1d5fc8c9dbbca9ba77d4e796e1fcb678c145cf0d4b90a5cfe158769f22076c8b113060b3f44b989a62c70dd8074dc9a2fdea79c8495cc66c33a253c824cbcae344684003a82d3b600edab8c4152bd169c0ab1582c36e937aed35d06fb6fef1537d0685b6f5f6cd17624f7dd03a60153c2f39bdfda0b0b4c27495bf996642c05830124f9a5d9ab829e5d1ad3eab10f443fa7f63fa804ce7df355a0335c96e1c59879bf38a2c918fbe43ebf88551f29653284388a716cd6ce39752ba85851e96e9634792008ca39402e2fda8c369a1a6435a0237a859cb106051ff20522c37497c6b5d002cb0e4897de1c83205c44794a1ed5d1b6e3fcc5262f821340a6960817105355ed44422baeee55e2f4df54773d5580333cc5f133bd632ab1f6ba9197242e0b3a43f2a11a47eaed703137ed5bb486419c5c4657a74b6e01472ef69844929cd974977323c744c2cc206d674463d17aaac5e50012df6d34e78d19c7904792c618d1e83487a23edd47e83587e5b3330d3c34620bdf3b2c162b38581579e0c5fa808f927582f9fbc5e2190b036c65b339b36e82bb1d4028d3af2b108dc05242748e8ff4c85224fb616d2b6d8c7ececef9f909d7faffe0a9ee50fdee54c309bb8758ab0fc81959688daa8607df9e0497ca61a169181356396471fa9845166c2f2bbfe49a8581f344efb616d088594a259942a6a5e9056ae42f696e8c2eb311cdaa8ea7db64fa598f3d67fa5e090347e120849bb81461b4064bcc290cefafdca7e4f72417d31c7de1c14faec26845fe1e29518b5f8ce1ffc8f98cd8f723b46134c0de0bee21a7f91202e02a1b2118ad3b27b1d1f999c41b5af851d3ef9b91a21cbc4165c6a616e056af3f16714d39ee405fd046ffd2f618a999d34466195c6dad1297960da73e1cc19faa894a953debbb4490ec5b3ca13cc5cb30c78431f6818863f53a2193490563da5e2d573fbecce5fe6fd65731f4fa3c9f467b8a4acb33eecb8e3d1a6d6d592e095fd45f68691c89b114231a7e0aa5a561f1f01c43ea7b17b6604d138b42407502f484f58029075bb0a041b9d107ce64434cf2c5f9427d2cddf209625d193d79bf70e6df5db4f288668552aaebbe2c665f949cd5d5ea5030a298f900ea91ff7bac8e17df98a1ce17234e2857572c7bf0ab898e7a6724a3eec74cfcb0fec86c01d96a0f9a9275c0f4c60553d4169073b0f2d2af668066dffd086dbd974ad8ca82dc67afe51c69965184a838da926cb21d7b12e42ffb6309742fd3e26323850deaf0d3f2920fb40b31d476fa7146d0cb46dbf101b6dbff567461473808438495be37f1bd1b5ab07e321ff8caed7b05e0a5e4bfef86bfa1d1367fbfbb12fb933931c4e1927ee0118e009f9038b7efc36b83590fe912553ed73da1d71c567dae83f5326f92269c1cb46422078bf7c0dacf0d707ba1f2a77f393da2247a1318959691d9ece4a1a21b346487ff1fba522109954d47f576b02a2a04837af1bb55421701ab87b026434b7801b1a2ea633073fd89d19caa3e2451793bf022cb088d446eda5b4525d160b9bbc88539ba1f668a8f372e16ac4b3b530fb8709bdef1abde73b0bb0c9b07030c91ec4e73ea2ef108662d60461171850c25db3af8c69734691c14faa83159f64233920cf914f2e1b32303370c26a3ebfca32e5fc307329c4a75dbd7e4c71196c0646bfd77b499e0ac6ad0a68dee81d01d51351a6f6d31374fab7a78466344eaa3cc44ec7c63eab11042d2113f32dd612011f6e4e2c2dcc44eb8618c7b17a8d5b4c1772e0db213085c0d2e421cc26314d87d4c94817834b29853325010f7a676f493c3d00b71e001261f0eff1c8173002ba9359e46775e06179ab6997104a02ee518bac9b3ffaef2b5c73a1a3a1a4fbea48d0e365a34779f5cbbb8671a54bfaa8b25cbae6b61b8fb31562f589b8635829b80b361a9658ad061d72f24a4f61648b02d175718cc8a549545cf9e0745fd39ef6b4d937a9b15a90ed03d3ba4afb6ab86b7db9ec9e6515cfb51de93b12de9fe471cb9ca3c4e40054f66e6762a6f68415d4fb53607667ba15d8d61a7530947e4729c8266d74c0300b2b4347a09dc836b6fd69f85a49794082e2ebca0eede5c7150c266d11171ae38c5cfa32fdf208c4984ace2bee9f2f27415d3d9a24303bfb00eed311f6a745f89e3b6d36eac9ba3105b2b393ec6635546f75af202870eb906f07a89d243e73add3fca1fd681d4e7b8a9ebc935536c88ff4d4aedc839f7092624eda684faf893d45a251f282b1f5a6d263e1733ca4ab1055f411ca9118bb2368bccb6ced641e853a63792744539a8d6417e4f5ec81f182462703a9858bfc6e4925ac229db7dd0febd100555017d2ed31dafa7dce4f55e3a3e7f6b4007212fd2326722ca46272f3e640e7476695aa8c850063fd757abd8ea023f532ff229bdb2405cb1e9d4593a6f0f9b79ac9edaba1110351d4c0caea34e9d2f5c0dd48424e981bf50a6f4e6e53b807e5a2b5decf6ee1ab819d011352d9ec002ee7c2608a9bf79cdf0f5c935e9314e36cf70343def521d00d2145fe7f01d6923c74e8191b28bde8cd0ce46390f56e6c329b7b9a0bcf407d76fd84e1188de9fa364ad01498eff0eac2d8c9ca4edaa0c6c2416fcda5d61fefa395a8ce949128d454575fe6151d8986f8cc945215ae5b7ec3c3883765e1c2b07fe08a6180a31d7ea796c646435f4b79f4790a67dead9da428a73a85dce9fae762d716dd733e2309c5b13623697efe2c7d1aa4ae6425172babb49d02d6c88de76981a8c6ce01ff8af277cdd6f2e83aa793da1b66c7422e9597805733b17c6aa6810ee5be17060568e9e37d11d8726d26acb1860bfb33954c57895700588f42ac5c1c651005ec1e773115668163af569e299919a486fefcea90039efa16cb10da918a7c711016bd3d5e37a67beed1a0f66cfd8b7bf471cc89f98b27c505f3b75df7c97423691fa5df3d4ef8ef8c3d42382aa42ba61190e5c7c5605841e616feca883f3447ef387197c4fd4250dc4ed40e40e19b86387a8f545668b9255b1b66ee07888b2dfe766cd87ef115a6974777814676fc6f4120cb7098d41e5aabe011e2793e1eabe17cb5c81ce6c6ca1d4c4d850ad035089f51b4769966ab320c74daadfeaaac4b393971d3f53e34340190d91839d094e237d5fb3cea9be4d4fbf72a347d69b0e38dd0c68e5bcbb579ade4e0829792d55fce13c5247d41a05b1bc9f17779a20698ca13446c8ac25432557efcdc07958b391211b344124176b85f74ffc8f6207e36e038606a6c42fa3b0186ae6cc7656d79704154359c73300e68606c801abf58e025adba0513f14d6a0db3337a5ede9a70b9d83a9331e30e44d3a0bda15d9938cbe54306136efc91b4feb3416117fa05c5924f81a256943660932f554b240eae5838729802b104f2b187d5ecd72ecd83534d61866d891ce96428c35c0b182b78a769a9e951e4e5b1f478aa658098891890a1d9dd1827007e76412648f601dcc46492893c96e0e9ed6e0aa43e504d61c0195ca2e274c76bb1bf4170f502b1e07945b9b081ca42b3eda98e8da3725710c69e284f47cdbbb10f2ec9350f3c3ed526ea1451e476bb0fa288209e20c94c89ee7d7949314f9d90f8fde72256f1c32dc2571526be95602e36f09780b3c74c8816923c8fc44ec58169b9e6ee6b9e671c913f269595d89bd2f55c77a4da85e2fe40db9561108ff873d89e46d46a5a0c3396d2a8711c1dab7c07ec0a022eb0acd9012941ef9e78db529f22c3da7c1ab3563a4503217702ba3d1b043522e96aa030cec6910bf5c49556f8a47ae9eb93240da995e3c71d34b7fc8d816898d7941926c4084094f70537f6182d276b521bf332e49d510335e4343086782b1ce244cc599c657dc3ef76a403f26fd4e78ced7a67a3c3db414baf1d85cd44d6db7c874b578a87625a921af23519220fb45e8e4c6976fc76bff37e7213190e66948b9f70fd0c9eefeb298a1c8553cfcf84d37d5c8448b6b09c715535176e8d913e7a4bdd5a3865b228456a0b84bfe64f12dc43d9aa1be9de61e888b1cb58d30a6d7b8f01718224e7838946384e20c86abd7f2111f316dc8b9eceaf788b72b741d6072e0b8ee0bc20745320ee0b9adc86de7f80ab5da5f30f4014b82a065a88212e2c9889dbf9a901c7bb1323b6e3df10e2d0b61e97524c8f9bfbe807f811f3c8d159ea3352bad35bb2af3096e8989d49c9491a784067cbffb56fa1191190c49820e72da0947026677b1f7d1a5d0c44e1f1bc5e21340c2a73df1d849b27e689ea25ea9815f6218607cac5f988d97bf9717338749ab31515991a561c1d7bd5a45001abba5afdbf9fef1ace79d441b1b34c679f790565fc4091a9d3a45b9af51a960064f20a811dcbbd42d2971c738c20c4d83211cea1daf82b162f5013a0d97d125a4caaa81e3ddfd9e039fa3c1f0331a573d0efd81135e9d2f224a42e2ba9954ae92349c69ab8c87ec9a6c40f8651f154d8ba146e871c0fa067698a87af24e63a97d866b3cf0dabf61b1ff7918ac876f19204d2d98a8c110d4430507c71ac9d4d2cee308401ea08fb839fc9bc68a217ea15b8027e22454ca4592535319481faf576fa04b5e3f10a6e78bae93178cf1f7dee2b234f6c00ad3bc92f970a48630cbb22de221027925d2abfd8538d8a7e00843a62b84c3e18804b96f44de93ed632abfb48a78dadd791e28213a887378eff9b135b1988f61b753e794fb6c08f4c23717705d08aa1eeafd679e697078423caec20de1bf3b39e5dc6bd642781849123bff36afe84959af35ef2bc9ab74f9a7c183e730e2cd9e71fa9e3b249f0a0a91adb2b26f0d46bf61b98552e8b7ace570ead619b2c75dd9406c8a8145cfd2bea9c239f11c5dfcee453cbeb06cfc78be9e096f81a83fe2519adb44a1dd8c6a7af97ad5cbf69b7d1a7a047c8555f30d584b57416a6fce5ed7d4e95d3679b0231eb1d9ae9858757f61d930359782eb08b338fc79ce9e89c9796f680fe81bc4aaab482aeeac5e0a1b9e8a33886256326812c7bcfb8fb4c592554cf1a892cbb9d7ac20c0aa4646303284f9751be717ed80bd3165296530c7c6b5ac21c14e70fc40c7c91e96ca40097a713026d60050176acb18d80cd73f4e83ce10c95117af4464b9521d2127da2a1dce16a19bb7f7c842f3542e05d6d52a09134fc4108d52cdaeba290d692f378968966bafc532a88531d687cf3e7bd4eb56e786c7701ecbd95e88adb8e9c51aec10b77188e50d9278b3374884d43556f4a6d2a158c77ab8307c9e5d3418f3d3c0b81c5ef114ec1bbbf19ff7add20cf29a8962aa1d4e7c80980a4439e81c081b6d492e1b5bb0d5d349ae99027665869d570471f3aef02c1554a388beb7ca03c91170d269de93caece9532b05b600f64f82037d1c7c9c9255f8cbe0aabd422f03db8c0765a66f467efca584ff2813f0a35fb35e8c959956fc42dd1e4ac136cd2ac8a21e1b054ca81e74d8d6e270b9ed4494d1cb8b92ae710ca2c4d79372b12f2d2566ba0faca2b84413539eacef8879fde814a495feb593638cffe32d5d2b57ee2246e024321b05a0472f0ebf6da9c3d1459a286ca49f37f10516990d4811d63aa82680bcda60ee9fe2475c8f887db63bc177e4a8bae756287bec7ad5f4f512c9b86a64d8967cfae2b20fc6cc2d17c1e8f3552a78f63f191d08258ecae0b7c08a9b09f02a2b5d1286d116b6b0090d5829e76cce2f05a9c6ea2dfaea1f0f10120055da9e12aca3f835be6290c195f3de8f71271a8f4554c64c58a77b97762d5146c6736a3e01971ce12b96a17fbeebbc9dc5992a284231085a665ebd009cb05e721ca76b9061ebf1a2fb31fe98e30b694592dc351b9d89029cb7ebd406803853570e6c98f1bb684c13678945cebb22e95241c0d29be160ca26479e566c333b4ac37a7e5ff2a3f28f5dc5ea790b3939f4fef20933f5a463ba0de92949075f914655f692189f302eae776676e0882207b6215ea8d6e17f7b8d00434554a98e78fdb1d2bb29b24b75de4c10e31738a1eb54f3343549a55ba26e79b19b7a68f0a4dc9da7d709e17d739c2f12d63264e43852530da7a7d94b9fd8de5fbb1e2dc70bb52253b1492ca169fc1f6cc388967a25754353803f16c2bcc7781e27081dd5ca1a1dae5c3c23f03a8e047e092ce46cd07ea23b630e6cbd6e4dcdd55d3f2440f5e5105e9185e3c704a262fc6e77a4a764f83243b94cda9db9f3430018e9cf756f557cf627a51e3c55af0e9a91775d51eb2de5d4617bf131aa7092690df547fe6eff553caefda3d062af6b2a28fff92b04550b62ef64d1dd24a560b60cb77a48214c2665d9d89425c45f74aabb181ead37dc65399a4cd99ecc8f5befb9c3ac0acf8adb9cbc291b642e89652db6d7b1bddda50f3d1ae14c862cd19f43dfceb7fda3b1ec7fa8d38d1b4f25e646eb19f9af9d6a0572f0f5772dc26438f6a6bdb9f48bd522c5f7d963cacd83e3ea62fdbae4cb4ca4419b075eaefe9b3f469ed500e9b1f7cb4a6d9caa26cd1ac123dfd5d37bc73a6aaeffeebe1b4ba53ce9d56c89639ad793f053a03240e335a9b4f37ad0ef382fbb90f0e1b20100e16c0d16e26285a2b94ed79508c80ac6366d686e1f811dd998618041b66df12eaa3ff443b8f96f7ac18113fa3c6533f3a8d63a8569648737b578078fac1b70aa57ec6e52b3d3dc3e65f38a1bf9f8beef1de389c22ba4b03b88fe0a9c434c5d08c5482a64fbaa2a48c94a3ce3510b7ef46a9d596c677b9137f11a86e390a507754c8f4b8c54a41666f78a4e17767230d36be3124491353a8e4b5d3eaaf8463b778052279970698886e7ffff416efdeb671bc3fc4ffece54260f7715241add48b464b0c5558fe2d39637e75956b35c4185d01173cf1d3994d7aea9d30fdb8a97e087af7d2223500f8d95f9789cf017d3b1e2e3532a25cbead6fffba2a02bbe0425182a07788242d56ba7935ed68c0950b4e6487c64c3a4ba6286c9ce94e20a777116d7cb37d5408c6fc4ef4f62766b0e237ab346fd4d8fae5199bfda0d1c06787dc34115a2ecc8bb6e4d59d20da2bcca8af7eb38d7a88f1b6cf078eaa39a6f107cf938a3cf9dbc92d287e4366f5d608767441ddc7e11d990dec8452a39efacc63b913a7ec67b600c307cf8895a263498b1b04e1c093176faef24674dd68c46ae1e1dfa1a69667cea407dd5615c4a786b5f10aab74b3d3d88189ae539baaedbd8b98b7e92461893d6c7d048ce6292629b71834a317f31e2edc1cd37d1783f725f970d88388454ec613d64eaa2cfe6978ddbc7e7da76d74944cffd4285e20eed7b0da3e310527603f7d28c3994c4ce6b7573b2b266a1396e86661938dac68e8fdb32a3546c9a9a313467659d8609a2fe6a329d3b479f415af9f952c9a6499580206cf3c23a40f6e8ffba674aeab246d32d1f4298847c6f85f0ce49e56ad1194f0ca536cc823bf32b3c8143dd72be7478d7f416aaf786a76e95f1258268be120bc9e489ff89876229dae1f80837b0093ee497d2ea783fbe408726fbe614e3cbb9710e95df5d4d2673e8d379b47660337113e39e96a91395ce5d72a9f7e9dd1744de97e16cd7a134119c677ba5b1478f81acbd51cff83798f5449364d50155c22250306385c29a4280c5f533a7c36aa10919ec3de6e482c1c2ed276b8a030dcb283d5c5ea0537991de40924595003ebac4ebf1b4beebd9d3c73cdf799153be8b458e3ca6afc527f2140c9339d62595953d77ffae0cceec7308557247fb300aa8368d3daa2814e889011ac81c6e75cd733e6c46a8381c78c09a3d27de40ef57981c72b15a193bbcc4d8de17116e91819c911cfc53eca8327f76622d00912775aa0a327c1b529d0117ad41e9ee2b448ce5bdde1aecaace63474b4c47ed5f9739ebcf84a982fa84afbd0d0f0918f8d27efbfb21fcab4d55ad7bb52e38edd375a4f3391071144ea327daa2ef6018659a44ed211dad23ebdda2643cb434576ddb6e9203b50f27fecc871cca20869e833b6d1472a4d04de371fb63e80b840b5423c71e189eb4f6e66b051d1656d3a32e58f20da8644ba2e49a6ab00e4ee50760f4bfca775787a61d586a2076c151d5e27f8510f1e01bdd0c05ad7b5a124738bf2a9a30e0b2fe919ec11be8968c6b378b46addfc984fc7b43655af7a089ae80a17e6668bcf03979a25fc2a584a155ba3903407d92f2997655224e565e25ece7b34e1baca7a1a00b65fa4ed18574704da2a8f1aba671ea6f56c7105655362464e713ce14f34d754cc2fc8da6ed3c21927384a892c48bcf8e7989c4ff794ccccc3712e16fc9e5bc3e6fa86d88ac9a5f504450e5381e44967b742f580acbb0c4f671809be06678c3a3669a5faf4bea33b108c415e22f0cc3bc8f8708038132b85ce0eaa53d86e76b019834bf0fd291b29797bf2ec8f91a6262a2a2ec446e61e91e6bf364e3944d484bcef92a082b875df62eeff51771f2ec5c5ddcb666467fd0be7c3c9c8a3408019dacba606ae379ab5bf2646843606e10ccc018dab095fb44015b31bd1decd6ced6c77984a98b6e672b1ae3e0263c6ced7ef6d903986c1fdbff81b117a908825c91f2670355e4a848f2f707d5f4fccce67ac8718eb57e9917ff0dec4c61ad59dc1114bdefbfe5efd0a51cc3929c01eccf1902bbce83aee06b4279fb77bc4a50fafbfdcabea666ae49a28075174f72197ef077516770511f54555130fda0f55e62010aac9fe634ddad5e923757c6257948227dd3018a064ca59da349111bae0d7801ac7545e519758811b0c0deaa2a0f5b38fc43c8dc30631e45a16dbb06cf97c967c74cce0d505ba26b02aa1ce87bac7d87b491cab79254b79b735a51258bbd401efa0d54d1fed6e9945761b7682cba4a8bbd1a08b94413fefd0ecd46d896f2a4811bb830f368663a44d65b2116da1b5f883de0db60159210a2e3c873094ca19f2181aaa174ae1aba8685bb4585522ac185a05ac7077a1cb623a8c49ba72d39e08169e49ebb3bcd48915ad7b132a16549e976a0da2f437cdaff44187bbd924310293ead1ab2e71ea9dadf174319b57ab162e6fea08f1185e95367fd433ebaa013ff7728f7702aa1d98cfcd700cca2dace7fc63662dc27be3484a05739603dc9de5471c917d6629fb1b0c1673b923842369f05b453f15a479b4e6edd90a4728216c1b7fd67f5b23907989b0a277c3d6da044026c39c035b845737bc1f547416d683ad9c3ff68af07ad6e7a94750a09abe84b0fb1b77612004aecb969f75713158e8f7ae8f975423e92daa6956eac38387ebe06a0ffa590cff4b7553d3c879e808500d0d2e1b9b3ebc5cdc2ca9159d7a30270733563a35a84e980200b754de8832b5b502c152a91a732f74a0a8a4e9cdbef71bded914c9be172ab110c6a582f37c40c6ca2b315055ddbad48250b0467b5ad704476d845c1ec817e8c86789581c576066ec710dd2209e4e4fba9afeb4d0047d54d1953ec6ecd29a1d5596e6648d0092b481b630b89b484b47167607a2d03b14c9d19eaa360963e556f34e1dffc75fb3bd53cb0d94890c510546bd1ae0bdd2161704fa10c3bec3946346b63564d83adead449d4031786f85a2a80ac846a390e9f3e303d6402769cf2db6f226286032188252082fe22c74f8aafd3be581757bb47af8a9a1530937e2e7ae4ab2353f7b12da883433ae88349d0a5cd833f597557b80584b1a0e51fac860a4f6466469a7abf675c5060d73dbbd2a4e1a93b280700527dded2d6e250636e40fd79a2f4ed3f6565174739eb68b48cbd5107a11025efa4a78d81e8a873c8b9f3884e8d875a21cde7234d6aac2874f06fcc1c8ddd578b93c38fcb91676fe38ea1fa5e1ce8bf37f9bce5175862bb51cf5c13211762b56551065f2d243e87a13f28b0b865f14b27518897a419a3c4cf94577a1c22dbde080f6895a90bda64278e94d4eb8fd98295cad8f98819b522abd5f4eae16a5d42f087adecd4d9df6d1eff99244d6deb544e2d3d65f0a9cd7991054c33f9d2dca3b49c860b7178fc9935e36960e2f11a3816765c09349ba4871a6afa94bed01283cc7857fdcacfbc0e7a8f3b1feedc8a85264e3a508daa1d8807ea631be8755b72e7b6ade6b9baff748575299a65dc58ea487b8ba540e55bf66473b47a6a859dda985b0c6d3d272a79264439c8bb4838ec3f6c86a18b1b29bcfce69c6f614ef13608683732cb356c1e41537da797cdae767301facb81890103a47ef1b60263035f5062ef94dbb80077f4ff4b283eaa6f9f6ce989b6d10f060037e90bf7f123ba7826147d5e43a9c8bd5cb70ee276bb8b594a84855c75dc875b23d21ec66e92481e1483313ba5f487e53536d89fa018d41d30437b174d8c0ed3eadcb35a345533dd662c1c6a78cc94ab0ac1f14427cefdd6ddf0378803dde07211a8016e74172dcc68eb0b503a044dc386b80a048afa48b9c50c408372f45c093d3f8c8cfabbe7e268bf62ec26c6494ff853c0a162098a989786fa45822a0b6b8a0b449a00471c45cb9fc5da9ef77536734889c5053614f8a4bebea555c113ca874f733140de23f69173846c46be09b01d71b7899b008673c2d1b6095acb174f7f4cfa526e3bd2d441527ad7e94cac3b87f230178218444ac7578377a4a95eb86edaccd9e029782749285387405ac0a979bc007052ea4c59cda0503b9b622ba29cd27755a1e5613addbc4f5d6e1988ddce0428522ada4a090b03e82ee55c9e2596cf02f82881c92d6a2e4480d1e822b280942bd407621d58847f2f22a47e472dbb96637c43217a49ec938a7808c23da36b1e101a6e3fdd08572f366049720ca127e2ec26f17da591f878691ae216dcdb8d4f3b0b273ba44edc2532ddf299f12c55c17770a48b2b220671c3c008edd04f9e52529423913e40956aa9349eaca6818c71e8db1d580bcc20667b0b2f61b59d71a98b848c48b55cda345cdd7d96394592a324c621ccd8ae1579d1d26471019e7675917999d8ce3422bae14c46ecdfb7f47ef1690bc1e97c841800f35d7b9a85c6700ab250e7254132df41aec517fabf2e97714186704f556e41634e2f9d7060ef78e39dded7a1bfb3e5ab0289fe98df752b4db994b35f1585140f673638e8a567fcc4953a40b3399f188c746664c8be6fe764e8d8fba0b249deedd554a7fabb92425faf360ee79fe2bc5788868e2630b0c9a582969e1b1ee132d242ca0ed15ae8183ab8ba74631d267eab4d6331e3505de87a81de92734649e954dfe65465758dd41f41e8f2f2ca0d2c0a4ee05fad43120e77b65f8f74bd588413b9751d6e3be44355d9dbeea3d172dd62e3c32bf1e59e30f817cf2f9c16c56f17ea4eb731d11bd685006213cecb5403a15cff0f9276d5decd0bd7bcfa3685be29c8f453cf7ffb9f59acc61286e19d3d4cca7c356e97933092699618828cf95caff294326d7cc814fb46fec43e3813c1c105617455c7de1443e106c9e24223d1be496b912252f60a612a65cb2a76d7d319b038fa0c839318a7eaca878c82f0782fcdf587e6b1226afbc626b92810a36e8a35a4d906d4f1d1e7b7672313d94f6b39e5490ee1e0a1d1535c1cfa6afd0579853d1bacf1dff640ff0dbe88c55091319d94e75d883ba9467d07ac65b7c26e3a53d60b9aa68c47ac2a0cd7a8badb62287847f6bdeafa380fbec64ec0d77c299892df01bda82db3d8fc5e8380a1092e39d3aa6aa1a1e28db1b17e5565707c998d62a8fdda09320798a62b256d15f74e587bea9a84581c536e2d36d38ebd0fd259c6114e97451c55229b4e95bce9f8933ece0922a3b728107bc8a1926522d7b6bb8e2b95a9c137263b647cb1f2a57aa46449b691b88785fd8aab135a9860806c2bd21ce47eea714d997bb0e42f2c4554e2eae93f57df7b4b335f4e9b3be06685042c806bcf8c1304a3179254ef765c7f8eec9c4be2c741c2b5e789e46a2298229c3b2f8e1b3f28fcad72d9591337279dc4236b52eb5e30c2039cf0dd76e942fbecdeff5100f1febf885fef3de096e8e4df36fe81c77e5351d318f3b92f011a94df65805ca50e280720831c43e3d89349668b03f7de1a1ae5124c00c89b4840580dd49aadcb67bddc92e12262e19a145965709b16a56c4cd0016ef607eae49bbe14e332bad9b9997bf6781d2be97545e769174ab9f0210ef47e6aa190d42f8eb7cf4f5c4e942a34504467477846c5d503b0e12d59d55596bc1e5a17cc8e1765e166e2ad7fec601498b029fe5eeb8b1a6fe5f25dcc0eac67fba5fba602acd80e0d94b55469d8d9bc11a9c305525cfab9d25491008647dd25e0c1d88c51f918cf792052908e9fce91db2c27c270e6aeeefee9fedda8bdd175b335abe2fc9628eb2447d355dfa9448c4d9cbf6c62cb56878f407bb3ccf03457bf31b1b718f0dd0a44b99be594934618b3c83e350a428323b7af87cb11d902a9274f6a3d7f775e6b84bc36826f11af0792c39fd7bc2adff2b1bc7d0f2f125ff49c818a5db2ecf82c4053c982df95dc50fbeb17236b91c8a9a23ee7464f0530aa7eb3ff74c799e163a245ef174bf0b5294334942f9e32cc21e7072a573705caa657cd0ad51fd214433d8e3eeed8874a1a80d483484ac56aedaf0af8e4cbe1c6c0d9ed5be63f82f5ad3d0bccc1398beec5ca82bea1164741a173509ea8de7483ae60ec1a54eae8f8821c7d5a5766b3cf895543b3ff82e34f579a6227b10dd6d32aa5c2e380fe192d3aac4df39bb870e1d237a6654602cf616906d8ae73f33325db9e97e11be65b6531ad7ca84954db01d770446f3400170a832454f8d49bcffe0ec9a6ee38ce2c6bf7d374e9dcf1301001867222ea0efaf135c12f9dabf1126ab093b226e03350ef310757cd2908d30151913023f598b2905038abe4a4cbfc06b1183981906627ee13fc1354074c801e60475decf46a0b4b3b84a38e54d3b904f8ee94b57f9c709659dff1116fa4d395e217495cdd999028ec08445bca943d1806ae7acb71903bd1df10d3cedf381379a24380e67ae3f5f189a4ca2140789f80b1392878ad7fdd39b7b7e1ab6606049627fdf2d322f32190c53b36906773ca1bd143529e6bf97671e4e57ead5a9a8932eb1f2e4e158f33c73d2ea52012cddfd7e49efc893e3852edf45856fbfb2a75b3784895d9a5498ef9f35ffc849496a9710e765aa287e1666765ceb159c98776ec97a079e9e23d8512ee1ca67428d7addf08e27a6dbda0a5ab3830c11fa66459aa82f6b1f897fce205d3b70035570b574531c97b6e685c4489b0a6ee8d82baf2dd76d0ec20a824bf252265ddc1b9f8af0e02dfea1abd451788d06b26084c05a3ce33411cd336777374dc74d3861afd328e4314682d1c3617ddf241a892a2df030f847669b0510c241573bbcbb5d61a86aa845a7f9f5384df3c5c241494c7854950bd58d28032e0772f8637839fd52d9da8fdfbf522652f1fbc5208a4d3c1eb5bd0c275ad87fcf4103db14015f3a7a0e9a14f42b20e57dbf7cec6f0a74a857bd819b2d5f54bbb2f1dbb43e67b0f64a7a9c5b4e3d879fcc11a06185510a75f49cf8704c2605b7744ccbf16b2ad3bc8db235a52aa4891418fe3b4d10c1c36d1a12f40b396cd3424d9f8e58ca2ea07eb9b62ce858a3b0c771891a6436b5e07214bd278b7bbe97ef3ccffe15415eab70670217307558f375c3faa02632cb20c9e92ca1f27ec0a08fffa46109c3299883878d788c78c8c777f13f87d10e377b398e2b9584cee289584e2ac8e4aea6a4ff4eefc152bcc9606982d96d08bee59f34f8188882a65eab4671986ecab9422310ae0f82e133a2ab6ed3d5341d7a31f515467608578993bce6fa123bcde01f7a405a0d8cbbe6538db53dd228394edd5af1f08c5ebbac05d6880be7400f7e1ae131511ded6c412c1f492028b9802560192d96ded9f797c9a9ca58e8ce982649b2a3d281caf5e45cdf308ba68b891c5007e5b6ec2dd361cff0030167fb4361095e4abe5df7b874c95df3f1b6eccc9ef7558843cdaad91ef3ac71df538cbc5dd78481c337c46ddc5bdc655487b7b37074aa699245c6f69c6f47e71b5a4eda9425ff46fc5b42238a122401e6ba1c0fc237ddfc3c7a57af5cee5a5fdc73891ed9a97b2eac4fb6d68040fa8ec716b81bea3e151bbcb861af4f1d64946426ca556b85d57b10dc3661467857ea53fc4708dcb4b1a4eb4c71961a7158cf04e50c989b109131f186c2191c7733f1383e73f7d188f5922d44353fda971fa6f6802d7443dba117332adbfcc5c3be0e7dbc08079a58ff404884d6816dfc3ada1c2d8503a7192e78e0d256885e2ae818042b1e0fd1dbbf4a48d606a2d4fea7cb28821225830d46bcf6d7b0aaeecdc863c92ad059d1bae166fc9670c0517cb892a750ad1e98a9349606272630605de17a0afcf734bb03d4f9c35f21b6a5434befe9b4275be326a1f40c3a82c92a399fa78919b4263d2368cba823e0377a6f69cc3e387c0f7674930277a41d0251567aaceb2efc3246efb5994206b9979b88eebfeb2356464c7914c0693097d187cfa9ffc40d745fb120aef1614b7598dee03e30fd3f9046602d9663d57cb4f96acc7ca85084f4d09c138f98a68b1bb28653b0e439f1573c94ccafdfdeed0e2285cd9c9eeb8973b55daba71d62336961b7cb56f07f56d25edb351e739bb7254733165e2fbdc26b0e17399382a9b890aea88dd5eb0b024988b550bdd7e86e50a30dc35ea2d0eee98c146262f22cc7ed142c3b7ab9ea2039250c3456bfd0f063491d501159deab722463c38bcc26886b4d44134e659cda0955fb79cecc6cf53904471940a404497de6119afcfe04d39fcc20528dfaf92b04c17405dbbaf4965e2fe57663edd432d85dfd737079c4e3d234b731fd8a5b74bab26ec6160fd3a8ff19ca2dc361ed6273e87cdd2f7bd09d5923b3ae88acd532a1de55e42ef18796844cf587fb5633b932b83d1eaabdb1acb96ddef25b9eedd6c4c8b03f3ea8e7252fed1b5f0c7dfc9907182e047a658e079e912d7c3940064d76ca13e9e5a896b0d461fcbc7c04d1d02b4f1ac1b6d52728dcfcf543031251ce84395e72120f1a421ebf4f418715ca5aacda9e23b5e8b633e650a3cda16757a04264afa1c8221f711f1d27d89f193f79cd108927e40c30703ae49cf0b07b09eb2f2a9747f8814414da2321a9e8a72df6735c10bcc959fc8d0fd113a44d05947e2256bb5bbcc4b58362658982b7e27889479a9707bfd018709ab9015d85ffdd3e84af4480943506cc77388bdb9125ffb84480ebf832167f06b81faa7116795ca0d1c6489694495104df8fd949a43d3f4eb087d2f26a9b5d362e9113559ca2aab0c454d609b848087bc8d6fbd37869c9b3d7ab78d538aa9e9cff406084fa283a83f75cac2c50faf0d1900caf079b4dc07eab4cb49824daede0e7f3cf106d252a87fd3b2c77bbe67000c03c48c2d2707fef40b31c035874a88ec6af62184298266b07a3f89cb65f293e49a1c3d6aabf6a3b671d5d40475d93f6360772bbf3576d8df3f14d1f8774b378e60a843b601bd8a274a7619aa778df3344c8199f5faa81064b7c1498a5adba03787b05fd52a4e99eb1227650e47e9d29dcb1d08733aafea6389555d23c8035324009e52ebf773e830eb3dc6da331d634057236f1d82f811a6125fc1e8ae0204ca5e186a46caec17698eab8e545f2c8e6ba494de0443f67845948e56aa55cb234d02805f6d6e998cca2029f453f50a95bfd438edf1813a16389b2a15cb2bf0c12bfd770909df7b690b7d615f8a4f037f9106732709a9f3bf3ad65acad1ce711b3374441600e7679a231b4eb4bc1f27f2b36d13e2240b031f23847d170290ad6c8bd77ec5dc7167c622652aae008a28e15107c95f1348170d862204151d427fa371d19f2413b29d7e1a01548555b00413d46c13ee37152d27a180a3746500159505eb39b8c9c65107ab8faf381d4ad28406e41a1afc0d66a5d299a10080446457333c34606ec8d99586509311b64f362211e481f7aa67deca552c82b6b9d168caa8acad5b445c4b2c70ab3a86375250f24931f408b12362fbe21484233b5d845cbdfc2b6a112b5fbda6e9ae8ff52f40672e1dd0d2dce5960d1f22af3479f82da88c99e68009fd6aded45ec32dc00864d639ec23a4afef2f79b85877b07b55a6df36776b9c6fa5f1ef01a8429467d9694dba47af855c29017e94657f57cdfa023e55e8eb2d3d62a156cc5c5e72f4dcf18b9d5a4ca3e4ebb62e827f983b19f042b18a25ccaec6f6c8c1bad687764ef925a740a54054d2e1a1e8c3d9ede78685ef442c654faca5c35bc8d4c22f0aad4626f7062875ea0a3b9980d5bab5e2367fcd04e1e3a8e2ee73ddaacb7769f1be784ef4e90e906189a063942e9832b82e244d401e1abb2ed81946593a53ac4d80e64e7162046d218d81a7e55ffa88bc72273484d7eb3053e871e849900a6889575f758d6b49dbb5ed5eba067e538831ce7c7af542e6721e09f4c141a1e95ca8674108020d84932d78f5e90f8ab8e0611928a87afeaf853d3865372f07674c17d654451c17c1cffdff7919734ca60428a7a0c5b8395322d787bcbdde87cf780fd82f2c6bbc0e53a3c9b96b09fbfec592c3f8a3470bfe409ce0962c4bb603049c8ecdce0ca2ce4f47ff257d70da14fe33f064794bd3ab12278c0afa3ccb6cf74cb35d8f7025856b68b9d68a11ce080446c6616a82f691a2f060fc2c702926376214f6b8fb0d46e43a4503489f96bce6205a66eebe961668be6dc5ae74e08a53527fc39ebbbaf565f544877bebd60a2f29ee8f8ff97d721fe3994b017759954dfbdc6ffa977c33612053b3f75e6f94fe4bc7fd791436b6725ec3c68807748ed815f618a3653b5f235fe385bf77aa44ded030b10689e9d62de6952a5a6992552a90e8494b63f99a06d05130734d2d2a7eda287989348a5f99384a4d9768cc935ae1bb86378e632e63d606a2947a275635a3980f0d39c4f98d0f8bdeaee944be82a339c6dd89d17cc25deb9ef272719edba98be0614e67539d00ef2a71995a0b18f1f0ff098d022f571411ee255e21f4e2eb1328ac51fe8567f144229637c6f6f495921c17f3bc79ac242db43a1701be0468019b8c0be1ddc66c73778d3acbc970b5852b4024236d57668398824a98cb8e5dc37124c0e7e284179e3e0af2a9dc3afc4a779b584d2eec56a70d721fa7edc5df20cc5e235896a436d01dfedd77042d51700368e8edc049f867001e18265edb2e043043f46e3855829f47ee989bd398ca79096c72e5b166efe0bc9c367cfdfdeab647ff33c790878a36b4b79573186068ee774c0f95e0e9ee0bf8691d53f390de0efd5bb720f0feac1c21146f5401649820c79ada062eaa5b76827a1d39bee3728dde6d79d88ad5e96c96a8861afc2c2a486a17ea9b5bf3ea5f5e7e747556aa1064dac305d4331bbcd11ce7b3ecb1e88df79c867998bf68a278bedeac8ac754074da3f76890d17986eddbafe7055cba61d9c3ef0ea786825f6ade2478242d4d42a14ece3896d92802954bb98b8a78c69c7966b95abb10037263dde084013902411e7d9477cb8d9e39c2e18187f5b366190f5ee0c4b53d110f3ebb04cc4cbf9ddac0237e978cd677f14900b06647e0bc2248aeb15c723c230653cbd70f80b42f2a98f93772adbd69f7f89bbac86d945b245e5691a8bc0d842c4fd12d93cad5015fd41c2f003054ff9fc90186d7d5cde86744f7d0b55bfc85807f7687a3f8db58ca3fc86c58f6f4b2032731e659db853dba36a080f9a86ee5933e8dc8ef59c708a4e0ad38444f35c72ad5131644374d3171db69e929e1c25a85177d424280c82c048e399c8e3da9f5e315f28b44952c56a1587bad1eb7410ab652a063e8271005a46077de4c4e0a8da670d88fda9ce914e0b30735460888b749d40fe592106b5055d81d06955439dd908067d6488c2b2435d71cac37a53aca9b27c90ef1ec29e64f1cac25603466418443f2371942af2d0b10d462062b218249324fc5ef1cb557ee5234c0416694ab8db5add0edb4b830ca496750949634752f63ea55a20efce9a70ad7c3f029ae82d2bb0aecd311cec461f06623665ee0d5c65ca940c0183a7c7c56f5bff0b70f5fd7dfd51dc62ce9ba5b103ac80baaaf5e1f32b21f411e07371cf2da750488ea93fd356604ab8738e9d99ee6aca5f271034b6f26027ef54aa83c860f91ad83575fa65f7a494d4bd42c825c774d9945344ee5c7354f0fd2d3d5079147004536ca580f39ff125000bb74ec9f97b34e2356db171617140b1952ac7686d34fbcacf97bf153a238b82fe91ba6a60f0b39148bfc516036d1213dc201ca2ae9a23dea50c7b3ed508201cbe33efbfab3183303a1e9b225c4b7fa1d0db9331648f9e49a56a20e97511d74b8b5f6a72b85ccd3d4778d1232e52dbfeeb1e2aec7824a57aa0df4fdebcba65a6ba2b992da37b23b81be3fba28f86848da7579339bf41b33cf24a671d936b8e9737b063c2d6ea99bf63fe5f7ca18ae970415d77045e293bf80dbbad50e14be000a9cbd67bd571b86af3582b321995e0bcdaa2d3aea58bc19db08f7590ed4836d9be5482c5d1dd0cc4b5d151785cc18808224b29234482c9ef01b10f88e046730f01532c70547febfef99940d80fbb344df1d73b78c6a36dd8ba7e52e0e73dcaa0d4f000046ddbbafa3ecffe47da99713e1af6360ec730dd3ff2415f676547ec1ceb9043bafa7c02ac03ac3c1657a4bf10b522d5b707c60fdd08ff5faf9028937ed5c770b81ba0c3a63328db220999ae2ea07c18a6e6d080bf40a6f949700c86e713316dd05a8e4cfaecdcbfb627d7025074228e17d7d6f768420bd6806660938355ead4cf3fb83dd3b9587c5dfcffea8b077b0c09bcc87493bf1f00d8cf7537734be2f5f47873caafcda45584b6199a3b47dfae9b190e9dd9206eb3d2c030f2df4bbe3666e5e16906a9c2cddc89acf38bd5ce56bccbd786a61ff4ab4c3124b9f764085e801e83df018f54ab8bdb5582c96ed3d78ec72655aa66cc362c4cc10cc3ba82bf52e7d0af3c0eb519f26fc43df7291f024a06c5e5fe21a818e2ff67823729c6ac1a5bc96d2ed5e59062e591148a6d25ed951a4825e47b16cab150cb80151ab9fb3748b7b40195a39d9730b7d8e9400a363d4217a915f3a10a66a1a2ed695abf34d68e639fe02b8defc41fffbb33d0c19434aba858dc7cea1a093c352c963c9297e81f4bf0f1ee14a5b0fd17de72b40570e327345dba00433dd9051db5d11821853e22eaf76b9f32f6026bb5bc885c15e1ef0d7693c6138a813d3f451fa02e3f0b8edc7a6ec0b218025aa5770e2d948a30d0ff6ade27a15607d325cc91d651c063120a035c747e52b494a593d661d1d13fb42245d1da702698e9dce3b269a554098d70da5f81d39fd7e6185be3370f69e257eba226f53fa84db7e2229852e4dc8deee0d4407aaf83f60918bfe8f3f08dbc3d6f04d00bafed316cd04586dbbc41d88bdd565facc3d5c6b70b7d4976403722cb05fad165a483ab9137fdde150bc0c0cc98b6ffae98aebfdc2fa344bb7a7dd122dd3cf1c636639f570faaccf67fe4da129ba3c7790f0a21336c8543ad7553d478c974f7ef26a9f66b0adaed76e9fef06f8effdde190ff1fd26b005486d59b85a32cc99a741b8254e638115778e94af5f49e847e473ebedaaf555a86f01ccbe72d44386a6384113de88e9cdce8b7accdef70ca5ecade3ab53165dc1be1128e2ae79d9f47b0bb1cff1723203b4233ad6cc4b31e5baed9b93f0cc110c6bf53a6ded6de534afe78c047875d2eeac930a4675408198d987c90ac9278905f4784214ecb63b3fc53c877dcc25e914133d562205a9c9043fe18103f8c861147dbdf15e8824cc446a1937bdefbb33c92a096815644dcfdbe439898245aa90538a0c2a631fa14bc471f4c9250e2aeb852a2653cf34b265261d776b494dc206051eac92493dfc229cdb0c761e65f74d638f8026bb904db70df6c0ac25e6ad90564c8bbd69502c9e987a0feb660e10228df509f67870dc421c398ce38b876cab5cad9d46a049e268a06f3d55b2767740afa685538ab0e0d5ca722a21dd52a8f8d0b6050816a6a0872d883e2d3bde838b371c33df918f5a8606af0606de758b92a6a10d3518e0c2f4dce4a04e61440123bd23bf6b75772c5d248611b2b011afdb74d39f04420cb68f5ca66ae6c8bcb066be8c5de7b191c5303b69b9ab8e1e186808bd8dbf9c397c5f95bbc3d68c8aeaa4ce7cfac4183cb4cc3427ad8c305efb1738af70e4481873b8223f392a7fd28a090e2f811f9adb9e229982a50233ce7d966cfd4e751fb5fecf8d3f716045794de532fc06c1c405e11c24aebc9c8311b51bb413ef8d12c6b0aafc29270a3d2a0a18c808a33e70e3c92d391e3e76294a9fb0fbc9df9e5549ab2ce8a7225027d3717667a48fed8178bd19df6d18ded8e9d1c0541b9e01121669e3b60ab3ee84de764484577063c2b681c2a9d813c1eafea3e7c0622dab26bf43a936602071acdd2ddefa2502d14e32808cee9d3525244d561730082b96e9140d8bf90b482dfb340eec483363249de65c849b96bf57ea022e0d6a7ddc0395c5c3a7292c6a37e3b50793115ddd486fd26f7e59f474d7da722c91fcc1afc7dd0ac4cb6a1fd2393a25ca632b4f00bab748ea09b1035f695e4e93123a0b60ab45ddf68929170ac88280bb0896630ad735cee378d58536517a08ca796878ae3ca07bb7546ace1f7d34f11a56d863b192671de51f2eb6664c15b82dee5cdf78d09af1d605a2b8cd36227de449cf0f239c10950f29494557db0c3ea5f3d909f8288c421784fa2c3e98ca0807433a2c5a34d4c4469f6a15ffa7c6bc5961bf0d05fff3d725bfbd606d0c8a3632ec595df5151de5a4eb3961ebaa777465bf38a13d6bf90cef31e5130eda09429bb0ca5b3483f47bbc8ae553858744debfe4c45fd8d8b2c54798e947a931b93d050a3524399befd429f3eb46b2acbddb8bbb752e9b2f7bbe79ac91e2d9d59840d18b92d5e5f204dd7a94b4a1af7779b9eb0fad35028a032fe88a7cd44ebe87de6cabb4b7237aa940a1242741028ebc810d4f89703ea5a4eb9c8580c73af77f67e94d278c84b1f89f92c57ffedde47725ef6386096f8cbcffcffdd6af13bcf8907d49f7063863c50ecda226d94960bb4d217b48b9a31a7c61da8e69c3e1a61dd6522a4d32a508fdacdc73195d36241c9fa6246d8cdabd653c64d41937cbee8e0fcbbabdbd72d04591786fb9fad74cb79b7fc88577a837bdde7502edbb0d4c8ce22c4537650dfb098a2bbdc9960df7d1d88402f5a0bfb5d12e09045ffff9c870a96410bd97ef80da707d224fe4d7536b2cb91f8d82bee040f882b69fd14bffc4e9e5cfc244b4a7e1ae43ad43c20c2309c9a77197f9d55e56196182ec2b672f46a4a329657c0a42fa39fea53f24cea75dc0b96b7cde8fe323754013243eddfce8d06cbf6f61361e38885eb149eed131e22efaf5300406f52e30447d016c1c96e8c644f10934bfc7ed468e54abf18df2a8322bee8fb5c4579e7700a04e05899c9de19cdeffd8b8de7aff37db6125a62ddc229210ff8458d788f0225d67f62b41948289839a8f2e88fa10bb495c4b71a9d8f2188d758ba957dc68749f56f5d5d6ee138be10285f3adbea1c2c02fa5f76f8d665d4af7b0279c4e8705dab2b70b7e70ec18977e01470450d6a011348badfe1b5767e97f75e11baa62f0d1315fee987289e1a89435cedf9006b3a1bece6619d5dec19a6d5b812614431e11790aeb9393cff273668b12031d96b8a685f0146c701cbd1a0c29e05adeaff95f9e95a14bd362cf6cb3b174bfae6cf52bdca45c1ba03a711c8a3f9586d4dc58e5cce9e0e961a478fdf7a721ae725d54567705ab96f3440d964f385ca3d6f110c96a10817fdec70bc54032af2e5350f977cda3e67234ca325dc5c8e65d6e504c9b3962c98f4efd5422ba02971d09aa514f4cd47cf5caa4ae969af15cb0ca832425c03d70651a2e976ff606a48b4670ebb1e215f478924fa99b6878e82cd8ff9a14f7643ff6ea43ffa3723744e28047602757fae7f937fcdd846727ca3b7f2ffc82ff55673a4432a497763095e95bac2158d1078ebcb2ea145e9baacc09561bb03fcf8deeb6e2b0c85976b9141f3b9c1b81a67dcbae0694fad76266e5dfce765714fd2bb3ce20800001649c2536611be08f8734ff3df082874ecbd8aef45a762abaf1d26a3b78e81909dedd7693c09eb946e81c8f81bc6089e5011bccbd0d6b79c5b45ba4bc664c5f76845b1b11cb9d1c617f26f979706496dd372b800f5e5ef075178bfacc3d33ae3d3b80b64a50987bbd4cc069523fea39f0130465c3bba121b1d5ab65af919fa8693678e666d92f2254180ec48b023fc843028a8d44d588b8e812875afa2b5a5173e648003702dbcdd65a4e997f487522cf29bc640e1473fff25a267aca27e38f562b587844d1235bd72b2dc74703d6ff4cbf4699d0aa791b6b4fd646bfd59d5bf1c965407066dfe16ec3d3057ca73b0bb7265a62b6e470de735f8fb54145155478dc7e7bfbdcc91b1c1a4031cc4ab7516b3e665cf4410b58badf1b7124d4ab870f4f194bc81faf7ba0ecf34ed1c12765486f0be6ed6f9b7a5a9a7f5adad9b4f4eff55ebe71011f5475000e39d94c1cf7fb068cb7291737beb60b14834cae4392e89b4d0aa5b1f8dd65b4f67f053f18d6f79fd7637a7ad8f0dd5943216929afb0ef552f93d30ee6113b1d6a8890ba1b7d440b598836d204e026a030915bc0c742ad92b0e70a7e0cb98c5d3d5880d99574aa1405235acf392022cf1598916b66b975c4deff2ae7986d1582b6d17052c7a6eaf6e16463ec5d1b354f0235b4904b6b6feaa94f157aa96e2a41f9559e5e26bf18772462b3ebf77ece56cd8e206c41ac0008ee18f61ab7419bebc217a9c67bcb1af3761495bbfe864ac7dd78a4301ae9975f4820ee7d36eb54cb8e3517a570041508048eebb686433487be42f5ba086f2f2433ab6ddd1e722b6e09dca8b0455fc7954d8fb02c2c1d723263c7dd4ba4d314a1a4eb4f7886d6f233c14d6c8d7fa6591761680d7b97d47082670a1153e673c97c73340a5a6c6c43fa75d600b7c2e699a22a7bbef3a3cb7b44162e5fb8776a09fa545609227123ded5b255f27f884f525f765672c3ccc1e601948d61865b7c71a73860624e1179a451cc4dbd0bdfad8230042560ef62884f1ecac491ec4975a8344cef4145f13b04a12fff6c4e489d0ca624c52e7026a0490e9a1c77c0199f7150c7b8c51023be138e683e2a0277dd2eb4b175b3f3ee015189bf97984425cf1fbb1620ec44b0b07e6e758a660e4c5d28f1633f0245210ac7b3e6a1fcc8da9f5cb82b57b9d957bbb9f7aa673e453ce370beaf7f10d79a67649fd89836ea05f0631bfc20e0c1e69008efee31552e5276a8fbee6636432f3dea91dd5b53513ee60696248e8a7c871a889700065fe124f0a70eb1dc77971b52688be87cd944c87d88e9ba496e48008fc8ba6d94be7d5a0aca372741661d0f78f69aca935d6ed16952aba31cdd7eb863b2c3a6ed714f27ea8a91b6a59f07abd1679da2688d43792bb6daefa7cff318b43ec0f1d8b5ae65be1ba667473c130776c9dbe8da9627d22b6ad7c53e0ec87a9e3e6259c99a2fee50e273f786b919836363c8bfb24e0b7caa1770b2330726478dcaca93f1cb5103167e7dcaada74327dba2c6fcb6a71bcb32f39ebf53bf54b2a3c1cd5e38cbdcf4d54b6aece37784ff87b6c7c499e8c90613bdd20568466e44f9a97427f687170a7f5e4beae4cf85c458d1e167c41b045f26553dcadc05be41a6e3c0ac18fe2e7d859c1a9111643d6c5b60ace894787833a3b5c11be8c01fbffca878a1a2629d7996e114f3b3d45bb6431ed48fedbcd7276cb033a4aadec938ef5b20fc050838850999c13c19b2de1a45891dbbdd02f044438f96ed33062e08b95cc0c6dd1ce3ce9cfcbcb89e433e82d36e049e864399c8d031433723c9f50f3f5b4d938aabb1cfaff6d963a3057622d6dcb91371d8079bb619346c9ede699dcb3b7f66cd5b8eca86306b2715bf65bd42112f35d60ffe1fc3d6e3b97b0ca6270fda13a1f113fa2d9c4645f3acd55fbaaf60abeafd8e45ad1f7bf9486649f7ce48752c99a14b135d560e16c796339297b956c1516343e84afe0bb335e6c47f12243731a49989caec63d1ddb01a1207c4a5a3737abba169e85c886346254c96deb1a3daa989444ae93c1b3a0d00639c2d92451f52116d9a8530b7db5d669b0ad42c3ba8315f186e578f7d686f0d8852ba595eb0210c310e3dbd9a3dfcaf0522700dd41149f9abd6454693aa4240457ee69a4b9ec01b5537ea4325235792a7783c31d70712df7c9e3f210b596c56982461b77b3e6919c545c2b610f42a07d0e5b74d8c0cec7ea6b674b31cfbe881af7d93d66df68c95c3eea166c3b14497ef48d5e2d0b182418b2f5f6857dcab3f032e583be9ace85aac81242608836867e58d29a0512ed9fa6213b6e5c86318055a4d14d7407ee86348517a199f08932e0f92523eb1e545a875acd0602d295be16c66bc1ac3694c5e3f070104112cb315344c6b9daa34e9d60f867fe65066ffb36bad4eb976e9dee576050ec40334bc9edb8c0b260935626885e24a50c99c0e6700aeeba4e4d17ab726348cf47c28e0ff5797d6d4141c76cb4cd13664d1c43c1efd270dc8e47c079df10bd51b741c5ad7138c34d10ca0b8d76cd5d5707fa5841e8b4667a6b324bf2b772d44eb2e698ac70c79d41b607bcffc5bb4eb837753c6ab83077442c8d07502e877fd5cf9e3754a7d7cd7acbdc27550c90c95b3e8df5c0daf6285ef391b7fbdfd86e8cae6d98101c75553e9349170b8fde76e500e858619cf280d59f1e0e1f30b8cbf15a49296a9362ded7aa64cd9faae16dd68e22c2e1ff90a131d1df7ede5136ac85ddcd93f61ee540679d380a9eea656ee8b8ab68b57556a08e8c8e0b9851988038098c201eb6f01ec5b978c2bc6ac3a78423beffe8ba2b97ea884bc23784cb9aea6bddf1d12549e6d50171246356fb6b84db144d815cf4585c596e6bf39c25b873931b21f02e856b20b392895b5a2d1c092beac9753dc73a69a4dda1ca9c67270a3140ae222978f668b51790cc2706d9d330fa109e5fbd08a41c571533035d2479b636cc4fe4f79a962b64947040de00813e1acf9a9feb6b7cb061035d431243c59748da74fa94ec65ca911057f965ab16379d6267a9235d97caae7435e3274c9e3c07d36a61546cb41cfaa3b2b31c7c3f7e30420a0ac81719592a17932cd09b5af64e1342c75dbd7d50febb9c4ec8d77cee02a3a1ef05a4a8f0b3c5514b3d9afee3c274b0404209053fa5e288e8791ac69560f067392fa78461aa4134dd211dba5f168177e66e280c9c34ee33d43f9219a6f3487be182c87beb1c45494780ac11c3792d8873442dbf51f75d713a958255e87a261f4d1d02e845978f084f0546151964f63f597816aee977d7be29034ceed7f377f0750ebfc4312c0a6f404e098dea98fa726a69562e1445036864f97fd28d50fba164bada5e2a5ed8c634fb8efe9d901228584923445897b34f9ba785ff3ed53a379a2df37f098fade0605ea1d39614272102a1d24d5f6f87f6bb18fc5b2b77fb3fd2487f93f505ee6117950823e25d0a3cad34526df21b6eda4f591924be6472f90ba1b016a8a7c464188f81eba1e508b58abf06fab29ced8818dba3ccf2a41e0309dc72ed0781676f8c90899feb9214b2686d68dad3c42b4f58ecb806c45b42d8e71e4ff9d503b0cbbac769a9aca1d44719b083bf1c2f0bffa91f45fdc9a1996b719cbbb4808b46bed1cc6fd9818c8a5261f1a2b955687fe5b415b8038a6727e4a44ddbde64042bdc25e69b5d3c18f35abe581669af0a9458a01f41f3da793a92e71d8e96fede1ec6d9c98fb110faae31e419a94908a16a6bc7994959e7ebac813f083303df65c09b8fd1a135e94f9993027072a09f1ce72a1ebffa0ecb160885b5d0ef78c8e9c71d81da80295959b8b6dc605c81865e2913b75e1a15966421e8aed4331f3c42241419be51bb9eafc133edf48503763d0ee31f2eaeaf95888ad8060451c1bd1aacd1b2190752df15336098cc035570775da86b56ddb858b0352f538cb813077c3134a39a0079f2016cbb0384d1aea53df8fb74a8f18daead5af0ed32d14996abb37a4d7f330d5c6fd74d330894e9908e56bf4cf9d4b49dc156db1c72cdce514e6520b94cc429d76060dd24ebb21051a1fdc1a41c3424e3befe6d42d96fe1bd259520c38cf329b7980d7a00255be43717b47fbcb4b9699ea6c88df49388bfa16aae77744b390c2555efe82143b2cc646448baf4ac8cc95598278146d36a94cbb0dca5f72ff6c7ae06f8af3e26d3fa867298adeb584bbf75e08e05e2d52cdad0d1f998efc073b2c33db3eee5eb9abba31b12410b914f459d4850350884ffafdbc9de178c547fc05da4114566d6c1a42113934f1bbed5153d5801ac06fca337c242288b3e18b0d1797c83a0893d80c801d2f02cf77a5be6013992de7ae9f9aa84c9d15484c05fa748798fa1b811f4c0e2fe45c7a0f2b1b2d40e83eaebd21928b8cdd2e2e6f22fcc48e556406b051ba9a7c80981ea8c1240955df31903f47b003c89ba258a41210a7b50516f59493a61eca991cf325c4c5a1b65a1152675adc6c1fcdbbd61d83b9b2994fd981c28bac1d37e98d8bb681d0187b5dd25bc4bcdcfb5d89cdcab52a9882e92ecb8f41aa82dd062a1a71f40c4fcd309de74cc4995122facc93d2dd3bd4214ac98794019fafd646e599f02b178a8208e37cba46ff669622ae833621e1402a632362c74c21b5014d58ef0c569db86bd263e5dc43fdfdb2eb51e26aecdcd9195ebbd69cf9eb8700840bdd407a8d520bcac967d09763eee2d4bf3144346dff330dd88eb8c9bb9d4fef30f34daa1dc1fd8c5c587a0859409f1d19d124b9b099a299254007d741b128a880b18aef253f5f87469d663c08a2fa78118e66f049059439819f99426987af9caa991dd7343642c27170ffd36ae5a36ca4df0781bb93a1caef0208a3c47cf5cda4eb297900fdd11248298677951a3007626c78ecc9c691c756f29bc310394d7c440388cf732757071e527972efdf362c8082cc986e2c5164c6357f0bfe7e492358317e89c01ec749cd9afeecd9aa1465280aad17e77ef49af4565104f569f1ad4ae9248112a9f8286a5964ce9b578e81436602148be8f2174a5c63d470dc6317e1f22f954ee39ad426094bab94aee56cd1e1d8f1b11cd36d71bd9c0d5c834266d00c139a97e23459dcacf5aaa98c715b2c65c51549b74fac67125f441582ca57bda4a1b1e874ad2210b6e493ca58ec1dc6039b4452f8bc19a34ad20e2f8418e0fd122eaf855ff3a4c65f2912f3ef3d01f32e167fd6ad0137485220b97a21ed265d1f8a050d5c4d2533ed6aacef0eb250af0e6c1cfb7c41f4849182ac1a0f5bd9ed4237ed7905a53d9f7b7b40ba848dc9f96ea3d91052f2115a0339bb7138eddcfe8df62f1a4464528ec34af5910c4edeef035cc1cf2dec362dae021f1272fcb4574409c94fbce4e61ae8d000bf762395422cbddd8416398ae4650038b43afb87b73097474ed00235a608047d788b4d3a4e1915448a0c3d95a3151c0504846be1612a34c846ad8e1b90848a9191871cd076e4233beb97623e6ba497de6683de67f17bfbf3440643a3eaa38b3a41b81e9925bf6ac8175151ba26d69ddbcef9db65728c923708a230f75dd0285b7085e19cd422bcf03d0b93ceb1e994c9086453b3f09ef7a896e5c73b3237a5f067f7bf8e5408dec7d0077e11c27abcd3980245399669f76fc2e2f1130bb13d2b40c47977798f65609ea43bfe37c341e06db7d7bd5c332ada86f9f7f5a621445b02f484b4db72a2011244c54cf03e2138470879206501581dddf92984f1954331775c8e16423141291b7a688defb84fcdf6b5a89b9bcd31fbecebaa83618b19c77544ffa6171d7cbbb7a1a874134e1189afa9f6250054da4b1f00da8e553cac80170f451386d5726065300b3af4230e863150a48916626a958f73253e4bd079e5e6856c42790bb7aa98ee6ea68fcad591848dbd50efc4b49aec023cba0851230614a3d18e4b900c30f86dcb7d1adc4cdb4ce9f411ac2d27f05623b2f9c8669bf0318c4584fa39a0b0c223d66cc3443cc72114c6f2e8392195717f4e3ed299bf4febd1a90491d7eeeb1f9d0d420067c89edd6f982338232fb18622ec6ea92165164f82673251b32fead03036d3f788c7399b456bab26182f20210414291d01aca4acd84e7b01050592b962bbf66a2cb4226e5001a5ce8aa8ec714d7f4fc9aa3e095a68ebe245af258ac448efbf8bd852f73622bf718324fe706cfd2f1a9e325178e562c6e976eb37b5517957cfcf8901f7fe08f9877f937c9b714914a898161622eabf0325f0acf92dc66a0e818909239d5dc1236adae01bb6d276afa3878a4672a848d6ea6b029b7d5d6d3c004495d5312a96a17c6649b0e86714d6a6636db38f04b5e760d6eb3e7bf1c704cd5adc577067fc447fed9e3451f425400890e8fe7004913553d4eb0000b9a2cd2dcdc9efc1fb5d55b94ee7abb7e4803f2065232e5e18d832487684b947cf0a1ee5b07b242fc3a007849c0cfc8f7ff20a5fd9c65f6bf16117161e8bb0d21ee8a030feae768152647703b931036545ee58da052bd7d23535f294833fdbd24473868d4662660c9e7bbf0b8c7be4d0f22899b97302fd30297d56e277bc954e41e7f05d3c5cd00056c390a7614b16f1b1e62919d9be3e6b4ddd10aff2e3af45f5044a6218cd471154691f41aa435d0efddc4040a2dd0cc320710613ed3b160617b4549ddc3feb7c8c26e789e6bd6f011c119eeb8a59aa2ac6208e770d8bfc01b2961a1d181a3d26b8a05b6aca479a011b8a7b05b81c67815d37ae567dc5346a2a9bc5c0c10539f3031cd784a23350f324111b3142d4fa2325478abd294c557b18f5a70b65fb42a23704116db0644fda7ad50306ce979c1dc990f882ddbdc9b2ac0fb2f5722b5620e97098df8444d9eabb5635627ca682491d786aa931cf953de7aff23fd4968a080246f68e9610ff7a8b1419b4044c095f92d8a4d3475f82d53980b485b78022f5316461e7839cbb627af32e1405c5ef3b747bdb4ffec1a94cdd79f8e26f55ab851491d1a7b6f517cb4419f32a55bd2674759bf0240faede13afe51e8c24b99433d564403ef2dac77c9878bdb1b2444a59445e9135ddeafc0595f4005a6fcc8c5814b22854201f4254dcf0c256f9dd5ea4d188792642b162fe4d46aafa5564030783387ad235c50f260a68c7c8f8fa90635877bf1d311fe314fb513ce80dbdcf108b87699e9e23831339b5f5e22b913dfdf000a4cd971da9f0cda9e7592ce5246873d92099dc21793c26eb8685b0eb82a2b4ea0db233828fb018a99d63578d5ca6c5206636f124178ba340e3e01aba29d196d229a0493dbbf81b72d79a3b1a7deb4497d346641ad498d4ac71005e84e47aa5f704ba7c3f9f51fd8154476f45e76024ef768bcd6b5ee2687354e7285c01a499f13be7c92cb7a9d5b0624efad1fc0a2daa617b9c3ca65168fad5e1a20cc7fbd3bc1384aa2a0194577d3c5864450d06670bd5f96644fc003fa25595b80c11fc1b1c5b47fff4e668f4bb38cbcfd7e47abea408e0543bcb5a42c8e7c3e4bc50b74e6a19ca4ea83b4e3dc6732344b6438043d5be4cc3b57ae298c33418b527c019e1724ac48c5c1551b04dcde2b1facba146ffa07b859b505f62eaf5b4f9f59724540b021b33af92a7b72ece36d9adf0cedba1e612103cc4c0723655338e97b8f0c3a267aaec0be795c63f2397737dcd6f62b55a6bd67184e97c6e9f5ce69e6aee69548c400247aac7a2e7ca9f75d5f27198b45e2e880eb3ae00a14e0f9749902d02052234780e8532c80ae949d11d2642954849d7f87442902b3b24302504c5441fd548b743fb37a175eeef6d0c282d828517230fd3f9fe7ca8f5cb5acf43a0f47c97609e0fe2f097582dad0879bed42ce2c734cf7483fc93b8f04ae4f9002629d07c08b0d0382a2eff5814ca703495cec7a58f8bb9326dc83d3fd36c16e9bb1071b42410b44a8c8a7b228c1837b2ee5358554b5ae55ecd77f451e4a78aaf2c057eafc36b1d4b8457b83ff172a035462dd7454b9e58d6f37573af8c9e9fceeb78b65e1058bdeb89dc914690d441a85f303b1ac698ede60ab606dccb8717baa304712667d9988deb72ef0f203c845fad7c04c1a6986f7c1d039ddd05ccecbb055c530c298147f654812be64abc7c1ff901a6b549a13dd6fb0c4e4ee7d8c353ff78f43f6784ec50c10c6fd86d04ba0a1aae758835c57adaa2beea9f26871b812d1a1bafc1b47483e3bc1066b4bdde6ae29933363cf9e1a60dc3f63fb6a2533ea7cb45a1d2bbf0e3a34e20e90728715070f92d709c3f6979ef7ea1ec8be0a38d7703bbabe0a4a1a5ebe982c78612f5055c6fea7af707ec7ecf0097015429bff9a2427f78c30c4006e53fa4e072472037c325b2c614c2e0babca768939c0b3cd3b96d940dec3ead096d5095a11c8e02bcdb8d0961fb53927b98f9f83d19e4503b032707cf2235a705ea25e8fb5c98b8187f2426061837aad1cb82c2a5267ef23df5d698578e6e8e5de1aa1329a7a92597cc5914789911dd302897e28824a08f78a8d5b1410666ef2bb7e198fe16c8168bef4b13b76d826dc270fc85fc76338ec3ffca1a407a98ac8c55992604ce7712c4b995ecb0ed6bffca874e1887cd604b9a824af8c94b915407964dd30aad9695896db708571516d51a455e1e6a1659d3febf6966f6b6b923e095cd795b76937f373a1bcd74066995b403fb7c85e24745a853f96acd296aa253669dad67e88343ba073e2f5f52ca0cfae345ec676fa8738f86ee1686473355f0597f37850240407ff5350d1e703f0b3283acf2d12717485cce169c2ec084fe57294d58d904e24e0046938ee2e6f6188bc2eeb14533eef98243dc6a03a6dc88a578f2355c8bb9ac6dd39c9f54f95440646b44eeb2ce2fd254f670d6c3501e847398f8fcbc55932696dc9608106321e8fbc4d9d449591e3be43a9f44c053b1e83657fb7d0c9ddce53cff1d75e51625b68fbc554145e9a2590c2b290addf2970b02b2a385a7c01cd7a793d942c467db21ed474b01ce726af5da0a56895d869f0b55a6810e6302e9f149fce04ca4d4f701343393480b16d05afad16ab30f853d8b33504f40d9143d78dfda297a3052eec669399f45eace979a3ca20899aee6e375a829a91cf304d5a3d73b8901dabff7c1c5b958233377cf838ecd117b037936a6ec60aa11fd16a93b8866a0def74c7c21f4e630e40577f4f7528791a9eea45112a650d3c37cd4eb36b30607853faafa49a5c41c32539d623bfaea5065c6fa90a4189b2b88868706207e8f1369496bc78111232a422ce96afadf439aa8c2d4a6bdc97e11f951a7401aabfd29d009b2752ca809a45e954e4694642eabb68e863a116a42bc5903b6b1cae026e60680e8185a0083a5099f1897e030dbdfcbc72906369aa7a27c40d77b2fe32ddc8b7e0142fee7af3aaf857b4c89086873336c29e65c729396ad79cf821b2d18eda4ad4fd504975952eb73966be24e440670a8eaf85ec38aa67d35b12866929c66b7108035c7970c8f95eccc770e9c4da70935f75a72822cf3bf6a75969e207746d0a40c92037424eca37df82bc25124e882c184e659f47c8d7fa876b87ea134875f1b2d5abde21c781f614724d6cf263b1b4289eb0a550f0ad038820aebb6df8782290e9c95d9fd3ecf051105688fc03049b162e7c593a24642d0791cf3de53880f591676a1af01c21814c56f5cea0ca4b987a5a3225f966bab90cfbd852ec2225ab9c15053db781ccef07c42bfa8ed5e962e8d9f6895342a8ee68f102120491a4620c7d957f10f42b6f4dfe1d041ded29503a8c6828d7f7f96886d5de28e50f6e48fc78bc2c51a922586b2747b9ed629b1517c869ba956924c67c583c99ea1ae7c9b91f7f338867baac3abe0fea35a47af7fe15e096d86a55b2d4f0a54571dc8c9a3415bc34f7e326638482987ad4d9d44c0faab3dd63fc39ccf6e0e0c168b09c8547fdff240884850839803e519d9b773216ccbef56d2a12c7d1edb12b5513794fd8d1747c48d04b03d6d4113e8a9af4ec89892a48260c5543c0febc6cade1d0216751fecf2fb558e790f668135044988aca25f0316a4f7487ed4def10adff500c1e4bc1299d054f5335e593777d2058d996c6adf5d16fcb5eba4e8504d1fb2a1fdb604261f9f80e40ebb27375b7e6f364c81573902a3dec2b260e6c23ab9d9fb57705692522c6592ccb16a59fdf938ba3233acf57b55d8a2cc3a7ce61f17146befd01d1763ca31b9f0ac0c979f249b27b7e177062137cd3297e088c98d82302ee7548693f7eef36634c32ea4ef797966208c6949f67dec7a65a372c413349cfac57127b9e257e3af2eb66acbef1da0b42e1cc054fc964e05599cb3981efb0675d805467989a40e969910ff51aed94813e84d1c3d2bd5882b94cbba9acbcba6579f9cad99e2ea208fbf1483cbb583d417c7338b6187b50611cd7afa21c637a56eac175fe2177eaeb282089666e923ec6b07cb198f1a7750421db37dccace14c1cf9cf3954b028ea95689fef7ed2cd335793711dba1327c9e918e94fff3efe840ababf3212731664dfd87400ad5a1c1e977493f04836a53b331f4d285fe3e1434ff216da1539cbcdcd6caa7bdf59f85508b58a9ac622e67353e25d1abce32b6fa1a1fe2211324b95cf292776220bc0373525e8c8ccda22ed520a8c6002b576182e266ff8790003b936ccfeb5362ab9cce202ae6cd92329183313e2722742af9519ae535bd862bf239402cbba415309fd1a60cde884f2ee5f92995d563cbb55e72bbac3c78112ba6934a687179ea666ed4a74230229f4eb528980b39b362241ace99a321f7da30fabe32a1ccc77a72c4c79ad49f812e469e716d456b9a8ef1eb972dc2948d75c74a874c02ab7b7bcdba2f9fdcf96416e180df717153b76d2bfcb825aa4525b3258d48e10214cadb7f63fc0e03f0c1fa6ed7b207a57f7336a95c6c76afd04dbfc0d59a4b0769d9a7b2149e77adda818eaa713d153fe2ba1483acb53b9e0765fab49bd96675ac685284f4f6040155e85ed31eaac1acb6c57082912c5c6992fc33191bedff3bfd75ca650d481635bfbcb6b28af1a0e7b3c6bbc24d645d8889a47cb7a66b5ea6b9b46997e42ed7335ed00b525d0512cfc5dff7920a8420a49606efa272d6b06a25ffe3f21b280ead1b3449cb1c9336faf6b378c2a1dff06df60ccab580f8f648ca1a23a7cd90d609e489f30f17743f0a27b16685dbf2ae92e40cc99a40f0563415e322c60898782e89fa00fb4b58913eba2ede0a5fd5993c6bf7fe40cb98b47f2c043da58d5cb1e155b6a48984cc261aea4e9869da0dbddc52f54503f4d88e420b2f9a29eddb4c9a8e6fd47df1b8a5f8b6fef9df351bff9e7fea66d7c7deec5bdbdcb066b83981976e1c568aca7877ef99283184e33184720983b0c63f5668d02155a05eed955531176b319cc2d1feb0c41512a14b72e9c4138cf136d3ac9ffce58dbe910e8abc9c59f493921ac07b305e37a03634348ab7f8128145e60c0b2a551e040af98a6c8eda10d1998311cca0be7b4d6671c0fb13790f673a33f9abc915a5f3ca29674a097f037ef8df59efdb9afc9a201d95091268a4131b8330b570229cbdb2937b8a176fa0b75fda11de1cd0bafb789926eda4a24ef7d8edf22046e62db9c07c9bf770ca45625bd628e3911c1c629c6577a8e794a3dd7f83211f7916b9e021a589357c8df78ad90183f059cbca5a0d384c11e93015f691b6482877d393709837a7cab36cf7e7c6b3f5ff3472d4119fdd161e324a04b6341e3d7c940e1f0397057ee1d6d6fda5f846d8dee4440cdb9d3895c4f604b687e22e1d44490377e18ce44d6a73c37b64f6f74a10d349fdd0b6a20f2be5307ea1232b3571110ed0084aac38c95f5e7a8a6aad4851a14652406788411ccb118b2e1a71548861779426b92f1d41c034ce3e2adad6b79418cc1ab8a99e98a25b596cebf934b9ddca541ad45f07bbc8534dc97356a1e36ae011a306383d1fa3d3e6c1642f463433f1791b01fdfd50d644619962e64c8bebecb5f7629d9fbc8101be2f2a3e28f3d8af7ef3d2576bcd040f29d543291bd63f34ba9d4ce86061e1c45c89d680a2d16932c495a8cb812922de242ec5c9d2a6ff8ca67785a519e342809da0010034165339a53f3c4eb2f30a23fe7bbc8a432d0c9b4f83b2a056fd30623500025cf8f908965ce0de745401d12050c7c0282c2bde058a1187808ceea79b6a3e4c0cbe0b7d0748041680a1b946ca40deab3de076fd983c74677fb0198fb0075ec812f9981791513fff6524410fa62931a66411d0b6daa1f817208542072e873a7e63143107b56958e0a531e8f4e2f18277b546cb3417f592c8d8a5ebe2a2a3521a559b65ffc58631dd1f41df1f3bad6c0c42259bccfd85e3fada5de4b3a7ae8c775ae32dbd2214680c4869f554f50230c87eb6b1ee6121e042ec352db1325f9358f976dfad11ed65ba1a8354c1cd0099f8a36adf9b06279be548f8e6348126f14e4ac9d450ef0ee8b9797522dc8b0b6f17104c023d1e3bac72ff5431c3d85afa73c9dab3f0de1dd6f358be4688428b2e0ed82ae0082571f8d6b77286a0414e687e21c9781caee6063c3db7d87c05dc83a021ff81e7cfeab4d2272e7a6b55d29f12f6fd26e5f397ae766cf950691da4d9de23937b1fa502a7cfb1549ad056235ba8cab88a7235333af57aa6f3e951dda8b651d14f44e8afcf985fe03b43e12bb858bce294d8a915205f2135672019685b674cb6a6fa79116feb9cce19f52ec3bc18dd6568c732646e6232c7a8144cd9914ed44b654bbf07d85b53820387b1043fe0a20669c198ba6803218c8888799aed68acf846a7d203fa0f0265a32c5b34df3f2a6320bde8897d207ccc647e472b0b39ac19e8ad9bbfa8eb289fd2f71ce6c84ddb74661e6fa0001c731e50553bb0e97c636cb5e4815d6a5b2d6d5fb9a16678eeb96178f4a1b1c19b4c2fbd48c38dce69fdcb8666903b4187578ad767c9ba8ab817076a643122d7a34e3e9b2308fefd652b6bbcbd7952d90e157eeea69d6e9157e3ef1fcb3586c6e88bffff6f5e6899c9249bbce73bfa4d899bc4c1bd9d575c61494ecc1bedcfaf792dbcb60c70c1873c5c62ff198b4b48688977a4c461356623c7784555c8e60d78aa743f27646d1009b0869f0fde45844b4fa3c977ae86e42566948e243b679777ff16de38dd221f5651e13b302ee8bd6b65e0d327d8828a0669479771aaecbd5a3a6b224b998163d98ef20e147491b2a9c330eeaa34865281fdce72d433d28fb6f24b63091d07103da7506dce15eae2617b338233b72dd3399c6f83933b4ab047a4fac1a8de03e9333a03c2b078169bfb13a2cf046882e575c9ec1539f985661fddf4f5bde9394ad77591728e4d98ea4f1b3c49a11e915d2de910055f06065f022126558d2188fdf294465983bef420b39383aee0991b1114d737642f93c9235f1dfcf6de581af7f34305855365d7a4beacfe0b47f90dc4c194f494475fa99d1125bbc8be5b240d220e55de01c152bdf4e83fdb50aa4edaf37a3c2af0b43662c275b072c99d2fbd175783c8de407dbba439060d09e32958384266b72e9a867d162d4bc9171c827ebc4dd2ed1c7e51f1b7f4f2c02db10a3ff6743cf4f523641c963faf1bd2305693bf4a21f7be553dccdd9bf6dcd0449403361a294d501593195aaaa1ab2b8e5a48979010d654068da154d7e8eb0d9c5793c61bd4f4898b5a900d0754e844f0f1bd7ec9758382ba4ad331a2fd6c09831beb9154aed0ca1535c52ae87eff5d6eb79fe8c17f300bf74be7b6b33421f78f496a20e16e467f1910290e59f8d745bbe7328735b82bff52c8b9ae1678052752e1176e8d9c23c95d40225a1a7d0e4cfe6fdcbad0b855dddb1d057bd1e93cd515b3ee27874003be98ae6c6bbe7ed8f49f89a5e3902d48f027249ad280b88ee1f20ce63561e24761def2331f33f83706d9f193fd05a9482ed0ca6fed433d4bfd6a04ce13e441ec4eb12b681119d0a5f142932e838d3c0d4a8765492254a67a173c0418c571f49fe6dda0acbec4cc1746e6fd900206387914c706e7fb487ce6964e2843762c82d5a65b0c91f6e263f0cbf283458e3486dd8e8c5cec201f0e97068cf363364821937cad8239c029246594e16acbe6bc722835e0a24916750979170097cde95512e220db4d176e2c8ffa8eb54a246c65128ca475404215dbb3860ab94a94d9f6be59f7a227b9aaf7136f0f71124e5d9fba3541f5d988b8e7971347ce376016f2c9102bebe0faf0a660fed7cfdb0ecd6dc1644d8162b19a6a9c8eed4723120dc286747000c5864b28da27d45fa108e7cf57adee85b4fb459ee4a1a2dc0b62bc04da80b4dd25ff58399b3e2962e5b05e10821e0a9c5833a32ff70d533362cf50b8842486ef6c08320d4b4dfc07d44d3aafcc733c1b82c3b87772c7f37c5bfdc9c51926f1bc250d98408fd7958aa4d4d7f0f7d1eb4b25ec78aa28bcc09a0627a01422a927dfa34c4101e0d48bb03424eddce94f8f3af3d115caa47b2c3c15b4d92eca40b152682f81fac37a11ebbfa38c011b307f52a7a815987c2c3544581150f9a7401ccff6b22285c727d2f9ce812d31b45c1b6f5f841adbe1d1479fde2515303c48676fd759d5191fef0611223dbb8684df96862e4b0480caea96c3c41a384268a862f912c2cf21d5e83a6dca54741e2e784cf1ab097db29c562856a5f0a478e75dc35d2c16fa239f8c1f1f401181908afc494a567dc047c085015f44e0a26234bbe8c68253659ebd02af0852c22e6dd0afe9aaacb8db1f06083adaadb705537a3e0e6c648837ed9ce3c44ffa82a3594e1a96ba978c516795de0c76bcb999e5ae67ba0b3339bc21c21574788c8d4062ded801c679b1437882c8b30a29e12f96b06d4a64fbc5119cde1ea9f734bdb9b6ab61e87f4289107d22b6df400546fbd7202f714919bfdcbc3e4c36b84264994029fbf59ca04ca7fbb4327425b2d22aa2b72d768e99d3a7ac36c910c4676f0e4302d88bf8d80854a27eeed1eaebc3916eddf49a309acc36f8410b51186efa9110bcc79bed4ead583bdada268352d3969b58f5e320781c4497b62323d3898340aee6701c0c797e609e670237c1a2aa1447b56f52952ef1002c8437adfa90d4ab75fff18f0642f536a3e83b35416e6628c5dd0f7cb693af4d6da77a2ffe06daf2784ad8bbc70c0bfcb7099625bace0cc18af0d86d81e4498ea802dd35569e31aff586cfed883f6952ac0e2763e46720e209fffac1c175d6b3878ce2e5f0ca62a71b60610dfa168ff65e3ae53709cf53ce06b3b5b2001b942337c4a46308f0f51f20f4242858ca9002f26113a2b14de223fea68d959dea4e352db4dc3dcde58d9bcd370d0480fd37d1e454a99ed31b828b9709d1094cc0235c0aada24a3d658d34c73c31e0ce0a74251ea236f337662c9e2b16c2d5faf5139e24b784dea340e15a6067e1a8e0418a68e9cfb4f9cdac2c9594d4552385cd5b2dbc63167e35ebb9b9c7aa44ab42a2f51045906cf48fc77b7d50dcfc34952b7eb1ed7b6de13d04ec0f3d9a3417df18f60decfe316791789464ee9ef597a202dfaf677b2a16dc80043f159e7b5886c665c5799fe51b8c98fdca6d66acc1df6a6b7348575d07ba7a3ba96d68347c15f3fd1c134d83cec5c61c019362d498801ad4c07091a9dcd820cd4f44a1d500eb4f2731ae3eab35c7161c089244045d3b661cb6af580afe676457210d08c42a85de6aec2f72659661179af41e5350cb78d86ac622e2df57b2de8a4474e53ce074394dae39b5689ded972679d1114100ee7bc0332562f53fca0f5ae35380c622591ef0f1666eae83f5f374c173598aeb5ce68ddf22f747cdcc92d89236b4ccc1affc87e55a63198a22e25f8ffda4411352aed65930a2191a2e6fbdd7616bfd6eb4d353feee65c1b8f0a31a3ab2b6d4eb1c08fc93b8d9312cc55bf8dd8a7217dc75f5f085404b9f40c5ccb2507d8643db1c7d099b1a0767f120aa6ccd33d66aa850504fbd1f15ff1c28e33ad05b641d6392e83fd06b1ca8e5d2d9a9ac5119e23c440165278660cb559363049480de33286e9b0cd2dbaa731d12b6ee4198d67b51c5d65ba647f98479c1d35fc8bca3486ebff70a445e8822a46220fcaf2e1393db3601cb1868cc1f2b4be5db0b4cda8cd49822a7e316429c7e7c812450d1a7326f4c6ba287234fb43d254494c612ce9ab2a84a3e5ca59504469510f10cd321565ee11416058ac86bd68441950cbfaef80c39819bdd1049b3f88e3dd222716aa34a21db5727731073cfb0a323a1ce9a7c97d2856c5d9d59317f9020b75708d54b7a2848c104cad8aa181660da52ed90991b075c552c3314992a6c08bb3904fb87c8f2995a2d49c2ecce295763406ce48bc5eb9b876ca4c5196738bffeaca3c4d34d7f0af157d817edfc58c11b7b13f5c64651dfc8584244beb0b5221a7430ac67d2f2aa10937b36759f8074abfaae2bcd4476aa5a587f2b46a0f95c6df9e3cb3ca0e59c72f5c4134e360fce1671be45195b80a8438c85d72d281dc0ac0fb3777a7f169841d62a5c79b94f28ca2929fed954a24564c9a593e3d5244bbfc7ffc38522c0dbbd3d3c0a8d043b3114f6431d5520368a01f2510d4f89d21765efcaa3a8856ff64c861984e2d891f4800f746227ae534193ee355c195ff2edd9bf4d72905eb00ee706c63d02352844da397289c04c2f90437931ac813077f8ee13f459c1f4cb0bc72740486c7196d2acc61bd8279fe7908cc05c4f6809bfd5abeb6ea1495d1d25f3ce45ddfd10d960abb8506c529beaa8993b5f4d6fff58423bbbacd59c873e319b0a85c406a1e8df9524fc77f8195fc50d30900584964f58c6a028c1b3f50418c91c2048cec7152285b0b8d2d17f85ddc79d006ba9c8b111d136625fb792321260628f80d5bd8e2536cb9676b7009a3bc923c800f7a82df0238e514bde58429f1f830adc466b5b0520fb358a7d1239a3443d247f7724859465995bfd88fa5b9a7a5b10ed604c672ab5342bf717c3197f4ebb090a01eab0186022c3dca8517c17ba4c9a7f76386f6055709fcdd8e31686c919271073ad175f311dc35bc2d652b4fb03fb1f43aeeb3c453c34591085956e79c0365886e5c5de2a76dbd6a5df824be5afd1816eebbe18351b612ac0255a9a93241b793229a6b4b5ad2641d28a2bc674e916dcac6c61ad1809eb86ffb5c940e921b2ae9bd79d66cb87afa4fa987b3c0afbc9fad376d9e9b77ca2da76c09fc69e2f0f229fae435f9135537a1b25f0bf5fa821ee18b369fd204e133b4e1246d5492a95e1abc0e4914729e5810aed1ce9dbfb1f90e3be8af88fec7b9463ce8e2041ec1ed324d096c1b841c592c453e2f86b6b4088bc6265bc1f61091201ded658dfd59d9a295b0d1144d46545ce147f38b0bae32a5948e2dced78e231940e3475a18ec078696ee5dfe2093457d5d35e5abd759c279a19fa120cc1ad7aa204f376581dad4206e48b172b7ace083a529aec083201fa9e625ac475a3ac248826324732266510642240142ca27d387a27f4c4361a3fa13ed76296dc443c8700018f770c73613b5de714ab13a770938286222419ae1b9b5cf0c05cc0c98728292c19bc266453f5b80032be0d3c4abacc480184af8d6970ebc44f7defa0d1c3ca57bce83dd90bbb2e26e8b55203bc82b77e8bd9ee17519b856536b166038e324890f8eea7fead9fb6e4235f8b42fc55938098c0f990013928132ff4033ef697a5a41a9ca064f6d280066a5f85c76807956a3e83dc32ba3034184da49882c8213e96198005aa9a587e876b5b9aa417d1f885d2e1778e9985f87d428516ff028692fca65d8d64a1f065d24207c1fd7e94ad46ff8cd1b68ead062f24f00edba9ce7bf8a2c4159793737323b523122fc0cadcf2f2fb3cf715632906c9802a569935c01d7e9bfe24bf6da8a197432539cd27bee480623470cdd21ff9fbee5758ba92032fbc9bcb7e2a4c25ef33f1df57443b5318f5ba9edb4db735c4779b320966a8f1682d73ae3f8e04618612f71e2e757d72ede6bde049293d89ddb55f1ca7a46a5e991a3da2aea9e095da26740ec8de3fb6e876a5ea121e4674f533a9af2f04d684859c326a5cd877d8885e4f1f83e4f950d3098db11be3734de6e50c6492c7fca7a577f572248c22c2c04b21385db7df2d3df68d5fdc96b1f57e52cb3e528f0329707a784e673c9538a3bf27910e7f6109894f75cff4a4a56703688832e6b45f7b433180f10135c90685f7017cd22cf1502ae82f3e1cb75344f1a7335b04620dae7d894e27bfde2d6b27ab379b474850d1cd9025dacbf369225e51206378bf451e141e5116233bda7888022bd1b98ccb30c077c65fe3ab8c73207cb5ddca942d60c33238c64ea0eff3386b9f51a5a55132d62659fc33743283cd451edd7d35c816235f6fcf15e2e88a5d8beff5e812229b47d92fd62af81a5ebbba4bcdcdc733a2375e2b2c74c2b55af75675f9c265957d7d170d76437264e05c39f1b96c5dcb72de6f66bec48433e91f1c88e88bb0767bf6c178eb97d2e6c0f255e835aa97a7a5522dca10bb65d97f9c70e5fb07d1a7e246c3b518a51c5074225a3ff4e75eab8cb80c4b41c39bc71609399fa71a1dad386a298ce47acc13f7b0de0a7a0fac88bc3dc9fafbc98fda0afaf3310ee293a8da42ede64100d855b5babfde66eaf0affbfb7901f03b28a6edd58b3ea96f4630c88fa26f7241a0def6685cf41c42d94413ebee9bbb7f523b9b844e9c270029d1b5fe8d4927b7fd9d3a6137467b9f3d458abccffa900ba92ed6e3510635223cc15dcbc8c445864398713617f46380241e2a54dfb81040a7076352edc7d5dff16eee3a176f265caa0c230786b94676808fbfabce74e2cf7d2ac9769ae64d56ec3cd965a2097be8daee7e25bd22576274a788d7b31cae8a0b0c360ed86118662a4cb885ab193fc22e9b556df698d3ed66dec8816231909257d1f69f314daefe2912c2a4f567f6c24be8d4db7ced930f19d2b2a7cb9d4e45569fd1b8acaee1f6d24cebbbafdff2741e93755ad7df117711131a278e5a6332c6f9e86d3a7baacc33692e283003d29f523dfc86f9d6311db72619ff0761c15a185d1fd371f9e8670e801d06cc4aae76e9f5306ca18f7e1f1056df993b87bed2fb98333c77ff62ddf0353a2fc761a2ac31b071690d6887d4f2a8598e3251c17b645630de85f48ed6a73fc47aa547dc3775ac7a51345effbbd8827b60cbf30e742a9cde9bc085e832fe37a1a9d3effa638e3355245cfd07bfebedd1158248d098f66ba409bdf9c4499a375837d4210dba987994c7f58aa5483153fa27148140899710d7e3a0206626d451158d1e6d07527febee4bd816559f909db809ef13f182139d77e218bfde063bf616b5f15ff18cf92e559659df83af942608548ffe6e84a67abff1ab35c93df0207ba7924e400b2dccd1f971cb37a6c881c312012c49a371a494b19568b054d886742f529fed8a44557bb881a89d8ec231e54958c85391f064bd84bf5f7887acdcba4a60969edeecd1b3429bf26428132143f38ee1a879dc71eaec3c47db4c56769464970b0c076a12743f339eb256f063919cde01ec548512d2aea9627ea045395e2736ab3e8de0ff35fe533ef4642a4fc2b26e89d7545ae084597b57e607ffbd72762225bc82c39148aa50b41793810aa0123704de5bfa3051699596959fa87530c6573e33961e1ab7720c177dfc34d39527e264de3e5d16a7e6ad5b8d71d452c0a2eea134437d1e7cdd4c13c5da34c3a54c19d4ab090fa27f488f61655ab9e0de073a21a9d5c6a60b18a891f163221d2d645becfb376c632bca779ded1f7db197a74560945b3d13eb49a65b29dd7d9ff7aa168a6bf54e327c5aa77e60297fcd7ec48473d5eb96fc8d22f683cf6f67bf20b9b9445c5be09b3238a6191dece76087476520f3785abacb214a2b91e1c65e563df9aa805018afa0f7c6d9c3884b9cdb50138a28ffc6b39f509b01bea89781026ea3369807fa1df15951b1a2c94112cdd7adaa8b93caf7d08237d6fb3886d656c6d776b2a99d9d15797c713f752c3c90b321260a47ef99de38ec51f5f0bfbaa1f34aa560a9eb1684fd9cc119cd8053ac446fb91ee4bffc71fda42d1b6b2d662625a572de1197a80e5c808ee76aca8da237e8eedcdfa2b1b42417139602d76c4a48de21c021ae0dea135a9662a281484ce6dc7e2d25def3f1e3c0909d46a46f49a86871c60992344308ab62f5e17ebc7a4c2cce260987514023f2407141001eb318c8f324ac8057c59dc139950b7c3738f02d7e6561abe8c6cc5f22b44a887d0919a32f6939a4752aa315434dfe9a1f829c919973eb6194ced0b4144397c9558ae9f4ca472c63590f21f6d865cdfc478604d7cf426cf1d5274026285823a153af9e3aea00627c0b366af7ec3d320fb89115c3b79a0cde50fff15f26dedc743fc3d039a777988f4c016ff29297f6b8d02cb26ff697c8f70bb3ea4cc6542e96e3e01388feede35d9a915a1442a1a12d5d213ef0cb96c7dff32db1904ae560b785a3f74bda5cc44c2360f263347815b95bb01f2f72dfca8372f5cb99ee9b0312460b6821a96dd493e1fbe25405dc2dbab8d91a52a61f8a70c27077526605f482bb0ce54f0de870952b0161d03eea0dc4c6bf0a99995c82570aba82277a096f69d138c16df19188431aa6df2669a85e879783b7f4ae28b3d410bf97b1124c4fbfecf198566852c744b132918048f2e6f9380e16e62c01f4cdef87b4d84a8c5613e92e9414eed8d363b5452587059fa24423e7e76ce3429e1e403a246e3f3e6b43e1efaf8bd73932c5d5ca2398a66aecfc30940add58cb86f039164ed4ff4045b29df99d58f98bb20124c06015ed324b5296851f1dfcb0f9ccf7d90ae0f052c3dadae65020e1c1db3eea22ea9fa64ee0645b5f8e36e5cb81ca40cbe8ef94a2dcd3b41e5bd4576d45e61f47d48ae02df8454f0672bcc93fd081a4e6f57b56e6a457722e55c9a872b5a8375967c7e71884a6cfe1ba26d52e6d3c8067bc8269f2bdf1da3e837413c0a62eae126fc6edb32c6b68bda5e503edbd399dc17b2fdb23860e40be7f3c61d08bf07f151af33c3826526f7225e6eaa8786baa4e0abe353ddb30bb590dcd2db02c9cdcc7e03f45692f7ba0d22060152fcdebbe6e3b391d38e34da965682c5bf913613b8ffc2af5f9db26af02c3f2bb23d608b951736d6db9f4220f953d5382bda1371643c65e2df9a62b654101ca3ddbafc2251decd78cf3e9195e6f21bf86ae71bb9d510e50da2e94564a2435489b009f17bd6f3dabde7c323bc17f899dac2c5ba459acb4ccf1926135d1ebe9601c06859cab7b1a0483662f18e7b45c47e3823ec52bebee9376b4f3cd79d2591c5a91cf92b6d0c5f05c355cef38639a33728a382bc2337707a0066003b030e0e7ca3298da588742a1029155025cbee1eb8a44b95b3d41dc4f03cb8beae2f534591f54b2462f5375fa7d47496978a2315a3a86d54951db37e3e5351cede994b27c30315ea057b616ecb044cacfa77f63959b28e9d93df0e9c96ed7f1cfa840783652166e80c8630d994ea18680b1b4290e2f5d19582fc60194d60b29818e34b2c1d867560f2133236c081be5975cb17bf9c6139902039dcf67b1e740305110ac9cbdd81ab404997cda8d5a81fad3d25fee193c4722e1efd185e0fa43a08212537c638dd142913a3ec43d38887a8a91dedd2168ab6273d5a6864b1a262aaf33ecdf445588de0a5406fb1f013f1b82505a2aaf8a950060dd9a85362b61ca612c50949d8f0d63635e0ba04d9c557f120f20c10e0dfe44d89c09a053da937d68aad491cbb025cd252a7dafdb13efd3947e66dfe92ab3296903bcdf56342e653cd43bb83e067bb02a5467fa39efe801835006dea4a04ca7d3ad2088b2a2594253a36f5dd8aed95db8ec983f07864002d197cba7cba211fbe9891514aa2b5653cbf505258affe702a22501f3e35608830260801035df56797e815b2bb88a948097e55680a105e929e020484b4cb3b548c4ea044a138f59ed7037fb1dafe01eef9d7f2f40a6b0d3c86634bb1e51108456dc2a3aa3060564daea53abc687f88f269ccb052a2f4254f1d38b6b29b8cf7ae0ff9bd15f0f177c7437521756c65e1d1b9d1dab4a71b2ec9fcce5d56815975d6b001efa56e6e33270be8308df27f15a38018520a7316c10d4fe8d3d15eb06a405132d33faa80c986aac9193a3fe41ffb34952a238d4eb304cabf513abc51220c157fdc636cdf4ab68fce16533d71eb849f23998d77139404e6b4fa2a9d5ac1774832b514abf991b9daaac49b61fd1234349f6b651184de2c51b57a0ccc7b355164a4800fc791b792addb7ca7eddf619afd8cc0d5848ac57fb90ed6396385dff5e3ce0de0a35347ddd4023182f955a6fa2efb687c503de9a129c4f8ce5b52f6346989dcdd96a6c22c8e308268d8f7c0b43df71366222a15dc8629f29f26a3713cfcbcbcd1714da91e26ee4431e312b9f1c69909ddfa3ab2049f979ba97bb5e620b479fd9720b1cc1583aacf12a41d8d9642a3e11dd2a5a8c53a669c2032235bc2facfdc36666b242ce05a7608eeca0aad58006773d52a0a6fc52f3cc64fc3dd6f3c99d618089241c9d8f5c7654e9d05468565d66feb8104280845a68e11322e3be8f250387e9a85a763ea149438ba1fd22121bab272421b63b967b43fd50bd3800d75ddc87f6a66bb4742927a8f4ac7f87ccf2e5772aae026b9e5dcc89560dc4f8ed1cc00d5356bd89796286846ea2ef505b4ca259d05e45011c9953b626606935a4db705acb1f9670a3e0096ad4e3fa4ba70267d506719124b15fe80794c7f7d67beaf32f0a6ef0462d89c5bcf29e5262277e8a354511689dcd76bf3a82b42d36757aff86c86c618c25ae0517564462e131ff88989e91ab2188a2a69f776332d13c12ca5c1342f42f6f722c845e2f9ce4347eec4857c0e981cc23f3e5f26536d43c9416b7cf14d8e7296079a40deca37ab5a9eac64644afe8633beb1a914ccd604d461163e5da82b8520348227c396d65c6cb800abcbb1eef88b8b0b178aa4456d51f01354fbd9bab9d3bfac05ea078bcfba59a0b88a4ceb5535a480462f3bb543ac21b88de7ba210a6fed50b3a2b05fa7df0d54d9208c32c46110d2e55d770a2a301e6758a529c558d56781f2e84c863b9f59fbb8f3fabec4493ba3f658c3a824bdedcd783ca15b48ede3fe2b81b526c733211f026432ee92af56499d06d42671192a04bad5bbd1173bb6ff46941912fc351ce65812afa5f1db0f565a8f6905ebfb207fcf09df71bc4fdc073f41517b4979aa745be705f8ab01a8516c556b36b8f02164901305529028c4c6e6f5d11c362921e9b389aa833a9ccdf5873ee56556be8e660ef6b6014f5820d1662e0ef9ee19dc50542cdc9d74b57f1e192bf35bbae3d5311c7c951d1bdf11a8d8c37d8724b5b8ea9dace941e8faae248d6baa95bba14794c65f51cc93d0cc4e6efc0d0de6f99ad277253d02f04ec992e8f26a8cf3278ba0dbb263b459cca112b98c201dd7f4180bc6c72789abdd5456268ec8a6bbc4f4502b702e0a9e9a349a424520a1def56eada3935c2c2c8f184a3a9ec968f3f738d8f303c6e3e8c30f63ff68cac2a1cec7fac68ee64d5acf4bcd694c8eb1decff6deaf1994924338c195bf4a2dc31a090c6f4ce546394801b213bbbf48c6ae6e4f4ae27d4f34638837bc8bcc44129f43fd2ec55b3b2c28883bd5685ecd622a5fd20b76253574cf39c1befe640edee4d341f1fd4680829d9e1619f606e61f3406b0ae5c57ef0a7375bc85738c8d559b499b95f041ec6c8dcc573ed5296363fdbfe4d64e8fb1545ecaef0dfb74201613c366465b96bd538d35abf10e4cf7a4604224ab37110ca6b3dacd315ed32fd75e98884f7f07e4326d1e0e6e17cdd1d0f165d23647b1c01590786466d97f9e0967236cb8147c23a2780fb182a258197d480676cc3948814bd255b58061b02811bf0a43ba0683a74fb023dd463c60ad2d9a635bcf55a4bd7b517a121b780c1c0190e22be226958df5276f9cd4f0b1f38c722a65ef1c37d21e8a21c8f60a5470aa6d31dd237395711f0cd9f3c4980decc4f44ea3ecaed2ad9e05217f9163d9f253ce50b4a11a6cfed2423866aa293cf82069dd67c0649d9930b06206aa180940fd54d8d66b441627a9bff2665417c6b233ac5591efe1fe9e5839d635349f2c248636c3f6141005c509af59965fe85f1743c4f0e508e61baffee977d2510940813d437fa39b1ea15e4218426c2ea89600661e89521372de1559209705f811da64405bb88964a554c504c7edb37f174cb6a93927e2658d59a2d5789ce2fc2ead6b6e7e4a9429b55ae236fbf90e4f7302ff41b205275be589c8bdb15746133cb922cbe5bc6e18b5d1633edf921589cfec198261522f3de61ffd29faf26a7618ea50be3da31514e587001c738146255ef5561058f30c87108819afa5016e850384c5411f986d1d7b501bc1eac119d6b8eb2789acfa955d6542b751f8eb526c0bd71686e7289b066a576f2b2e5f7961577bca78c174202a0bed0885f78447cdafbd0c2b714f56094765b6403a79604fe30908ae78023b7e3018f6142a9e16947d3076f2e3f70c29b8bd2178cf61efb15382ca9d0a9eba1b520d8e6038cc1b4973f7a9ad1fbf559166732a053395a7cb8eea99c9d2a31aff07bbbf4daf4bbc5d95e3e2ebdb285e2be9a5be1921900d68b95af4fad6169a3153b5d62fc78cddd259474fbb7309647f415e635d9709349e29a75cad596cc1872e5420e6c8a6e0aaed035a3e7a17b277c3d51ab42caa6723e41cd74860c9962cc340704fbe0129cc891e1d873169ad93f1eeb50eb81224f4eccca98ca64b093b53d9976403a1fbbec00e1d252d01b20594fbd8947399031fd826b36d15c38c2ea14af62adf845b7da7c073544a1b5fa30cae72eb517011b090ccd5fafb4978c38176f10097f56ab4b245017444356447a412944a228e645c8e3eb900faa6a5d4a558cfef62be337502bc36775a181adf37863d9719f0594b2a0024aea5b0fc7b15975c31f2553f72c041559a22643224485112787651caa022442d0a85321471cbfe6afa886bceacd99aba1118acc95257b0634580533bb0149d7bc3bb0cc38403aee25a425b27cd6b72107ec0d55c66976c5cd23631bef3b2ba2fc813bff1fe705aafe719929eca308946c036fcd6b6f55b762d0ffc8cc0b2d169ab7f8be30ef1151f3959d467895861e16d4558e85402b60ab84dca0a2a40b3b71861d2b23dff3d064d5d306f2c280b0c21da82f3eea28062fced26d2a803efa15db72a3ea2ee98638b428b02ca55578df4055f4de39ab044450d5e6595dda92624af75223e82dc191c18685713ab3c31ed37f469f8ea491375b3a5bbcee7603db9b2967f065b62c5240da6b4ce8d326da368d973f90451ac503098b47e0c03b8b58e8e260991bffaf70750818e0d5f4430d0dc44aea7831e8b646894d0f0e15f1d66fbcad9bb9d8aea189a445b23345fffbf18f5091b480d798e802f29f71256931d84e8ebd62454c3e20636060c086ca169ea07808cf97f4a151ea0c00d2c035294e93c49e62755bab6a0ec0f922297fb9d1e344c666969e3ca43a8fef081c0d8d039afa51a94484d51a78d6894233f4d700b9c6abde9d86f8b0627d1f2bf7e7e996f59c46e7d14474198f903819d5de20aeac6bd37d72256097988bf169c8cab74ec60ec21bc7aab4f61b6329bc748bf1e4ad29da3419bcd8f1a0639b297d0339c7122aceba3575b8e4034320361c108bd95b3f521f3cd03f6876bd0132cb9da7327074b9123bd91f92f0cc49e6ba991eeba505f82d938e05a6a8e89b11b4fe33fc2a43d6c801990a7bbe990ef4ad05050beb557e4a6d817907f0541bff5abde06429904f6e9c50fcc5e5de4b03382ebab4e4f4f23a4b3dfbf554f375f252fb65e61fabaddecd2099c4f7edad1cd8752d2d77edcc57cc211260cefd6b857856bfef196e249cdf2b5ccdcf11b9bdcbc80e1e670ff398a4ec7fbb57d84007e0a70dcc7e0878d514f3490f757d58f582b2be9bff0fd479039dc8e0754508a273cc3f69517e560351317eec4fbe34db51b7126b112dc4cacfe53bcfc92c18ca58b1a1669bfd441e5072456073a84709ad8d6551a006bcc384f2c75dda73d2d7f7d625594065b2cecda2c5e112df6a3b0172f61e61975a889141df6d8d5defd83664e4a9c85d78ab4a1875cfb591d17ae4c215ef86f9a99c40cb21c2b0aa68315333e17c3a6672f383fb429c71c893ff26d28984caff13675e48960bdbcf4bb529ff660b084f931a2a3f44d6afa20eb37bc8201580dc20e4fc60d1d0c5e95ffcc27a58cd828ee25026fae64396e0664d2c8d45b0fd97a038bf276195f6b5185db9af5a482880813a977747dd488e228b9457ce5a90d72cad485502664224720afadb4e6cedb1ca28037348f5e5f0b7bef13aeb8935051067052163d315d5dce6bcaa0a802e17e0ab87f108d4effa9e12756cbbb71dcd146ab78072668a2837c14e894145f34e830403b3b46739d00ce187952e960ec8e68b79eb7bedbe4085d0b3772cc75254095b8d632981d1e1abe2be5bc75776ac7f89eb6f994f1f9f020d0eb2dbe5058bf894f9a5d797854c28ea298964b7cc96c6bf921808568fd9188d04476c79c5e76a1df7b9b9930aa7e3db7c891ecf7d8a745d3eeca204474c783a1d2ad6174e35e2ba9dc160730d9259b219fc6047eb3202d2254f02965f22214f6901f7626b05bdac369a04d5c669e9ecc93cc3cc02e16364a07e6a6de6c61f127e2cc9d033150e61417631fca87e0095acb52085ad6f9e7b72ec63cb84853ec43fd3b0686984f827e194b51ccf158819bb0affa0a3f8b515fc7332d75cad2e32dfee0b2a3a4d28057926366489a499910d111da944ccb6b8f6c4deedec909899b8e6c375f4f4046435d0217cdb88ff454f45bcfac4b2aa47cb3b328f013b2bde0958f50a7948318f227b406fa9952477ff50cbee2310c06f5ce6c915b3abba3c96003e16a7825fa6d37f3a94062099b13c48a127dabe261534ad488dfd76bf2a14d27ae9ec508d593818827720453ef53da31c7a05b2c5d8e8eaac8bad250a0ff581f867a2b60049db6bf6a132b2eafb0d67015c04d95e70bff04924a5d0356423878ed7bfbedd806fb54d01983ede2974a3088450eab85be4ba816bf78c33c08647107058eb1acfb07068c03a6ad97ee586d57d8f4bbe6fc2a50fc92affee8e7d739cd1ecc9c868f41f25c48739d3e5ad5545c1196f4a572b6efab97d901474eccaa4d6e9382ef64209ad811fa0aa1faf9818359dd98e1c78cb0863dd8a3a02fc7b295528ea26f272f4aec399444456e290a891bc61273e7a23a90a1275f8be18af00ced475ad68ed6e05bfae8df44cacc0df488acedb098f8501c70350922284561951b30bb83ff00f36bc825decc71152691a6a6a1075574f21e09e7478af9b5b1808bb441ead351c9c5259ddcca02ac13296e473ae1e5c83ef2ac84c55650ff601520237c2fb77bb79a26e00fe49d1679faaa5e2e1fe2cf91de43315990f1d8f1dd47fdd774a4158aed21ff3190b10a9e8b28f44dfde07e8e64431ee68c4f774f43b159a25124ba52812a5e10ec073569deba9dabd499f235ad1295ea82d6fd24e3e81cc3f8a0e4a8071599016db975d661148c8d86dd623e23ec9856e559787c9e0c312cfd265428245face95af8dff3b4eb536ea40a58a05fadfd674a0ffb4f6daceab0a40b625e4863cd97d9daa99e530a3119ef3c887ca2e80414060e9f0d30c233bf5834bdc7e4b854e0165db004bb84fa5d0f063c90ef943a32e216406e3a695931f18c13362e55320428283e2f96a307d93f2f6430dfd702d955ef7e8603d62bcd681a001879ffbe39945bc8b2d0e35249d9f060122670a7bd54118397a8f7bf847e4a51db44d980abcc35148141d89ec8a7d11d02f12a13552297c911eee25a0861889ffc7b9716f048bca23bc0977827fc2b73042a63e6c6a8c052f4bf3d6e3262e2ba1565e83cfe1331b7dcb0b0641a389241319dccef845b29903fa6af6e755ab8180c0cc9c588d83fa21aa96a26845cb641cc148ced38bea97b9d0d9e6a5f909ea4f50001e5a87658ed5200d8976429f04ee803c9bbd014dea7324a0951795c2dd8989b03b3baeb411aaaafaaee513667b2f08411efc0cb84914eb07ea481f5bee5bf2b61d8d5d540af9bbb3ada7f7aa28c6231d487d8e010399e4d31825552339094644dadf759b3d569b051f7538bcc366d2cb9640c5eeba34159ee9b247e3f6437035bfa7b10ff8c733d3ad5baf7b8fe357b0ccb5bdedbf6cebfae8d70f26237c8cfb484b56a26b697b173085d892c8180bf181a1d8220d529018529ac2c34dd7aeec43bd838d5a5abce9cf5a06eccb0611b7df5790abf6f0d96304c5a301104c9ec68d3d7632d12747b93afc9717162e779055b7220c74da37155097f38906479d921b2e11b33b092064a479863ac2becce64ba030b4d53041d237661dd3414b70c3ad5d64627dc89a6566d380d996a3f505de76789f640e2f59d8d79abcee9385b254ebac2091299b7106a208d5acb193f0bd0a342560c57d5b3ef4da4cc368ea17c6dd176e24ccfb6915117f3c97ebe0939b59ce2b08d78fe034ce6e0d9e3b0a84da0b67d7816b606a381dd3a5b2a02995388e3006085df1430fbef5eadbd7f03027f99d799205c816dffb0811f5fcace8f0ffbaa327eac5a8b96e52a7de15f209ab373e9e374c61ba2587c2f0ad55954f66838eb0369e2525ea700b495c090199ad278df53b42cdb1f9f3cf09f457916fbd555aa80df4fb6dae0e824db0aef94e4ebc630e8552662ff7816c439b5d71aa92252b4ab61615c334db8b72a6416febaac5c639d50553b739e440a7a39e2cbd9ecb79cbf67e90c605aaf0bc209947fe65bb8e66fdeb4e0556dba9b7e68f150c8602e7926f42ad7d5eca90077596a4313686ec8ea6a95e2da7ef377b68bc2883882e542953e5fb72fd0818d4f501a669bad537555deae1ede19314b0a7c6054ba5f1bc2485c380518447c9e3219dc221d6ca8c8ef0c75f42eb3a912447cb451773690c54bf4da8dd2313651c9a04f93707fbcec5b2daccfb7a85313a7439c66086737cc3a7382fb15a65f9a579051a3b4c665dad33a10ba2cd624ff3882e5c1e82654b4bff372d7c0a8c486aa5b7a3a3948609284ac999c4b9fddb5df8435c66852c48e4ed144932cc669cd1573afccf5467e9a98ae8c9b2f9147cd8a55aa161aead5059942d231f080076dd9d57e98da97c6fb7087f8fc23bf1a44a49701d409e61818ad882cb0882c9b41b9e431cfabc4fd8a2a9bc8a61ebb117b81b7c7673c6c4fd7d1f475878ae2e5007cce713d5ee61bcaa4e4ad9e7aa28f4ed6d7a0874a956a053b9814c2822f97ab62740bb52c2736380349ea4c22682f17db429038b97ea7c8293c40efcf2dc7fe1145e11830e3b5967c1cde9d3b4013d00af87939922eec3c4b701721e3052ed9c99fe29ff9b9bc1be78d3ce14b456aa267931b8c47bb813bdfd7a10185be855ab0f75bc46b102f06df9500a65bcecdf943f1965fc776b0fd8f422514e789274fe2b883bbdb58d4af86aa5148586e82e6222532c70772b98d61b1f47ac986b363667f3d5aa40d9ba1bc823e50e8420894b9d7668b8a976d920b9007ae227df6696fbee51fa73161767cabfbb473bd3c6d9873ea47b885388bf7b2b51e376bb6810bebc24747ade5f21eb2cd95cf912f884d71739d3eb6a4a68e6a3608ec976e277ca853d6ed6e464869589feafdab8888c006145f73f968ac4c6e449453f6c4a511905e4e36fdac9b868f0ceb3cb34e1a7464fba584def54635f3139de1ed523c36cee9e2a3a850efecedfb5074d1aef75d2bbbfddc0dd0a98f4cff6f55f4035a1c14db7746ec60cc84a564640441ba30f341d12faa89f8afd9e01e595d9f7b2d93404af33ecedaf389d706397cf4a1676e66249814bd792d070fd64b7c2f4ebb0d9fd89e9ab0ce5d012cfe10aea868aa461048763ef0766b8523a370b510203e90e645475f23dc9065954c5aa23baa1ab4532f31f2a66dfa6892a1c5348479cefa83010aaf9da1523f252c5da77cd51a551006caadd6af3da51c074bde6670f50eb0b8e234ec8736e02e3f33bab59666fa92475e1627dd843100257572a9de0440ace09078068da0254767c5fc66b90ee5d32c7b22951e801d5e88bc1826c51bada2be3adee3ffdcdc8f6adec7a34c333b095749d67f2c039c9d1a0971a425b6244a46884a1813ab190c19c10ba5c95cbbbe0e4c49fff68cb704806f4439bb00cca73da933230eeaee82ac07aca8ecd6dea1859a0b07d3f8a36010b53105c01e5fad7ad3e7663919689113dd37efb703897e5816b1c6c9f9217e10a0ac678420df8be848d38fc102e15a16121e6bdc02f40c7fa29aad5bfd02e5998e287ae010e290b19aaf6069ee56909a2f8466ac56802af878582e82d9825e34f3844c268ded1b9154dfb35b5b74854c8d2d0d0ee1846c9b1f6291e3fad61b8cb4e91c6faeb006731f804a930cf8bce119f5f7b10613563a1bd0c2cd529f05c2d325405e11aaf57e6e7f6e75b72647b29f037452f766695b616124d688790a3f7d7e0e29611f8d498e44e793810ec2f6092283ab57cc23064a71c96dd637e5cad248623b927ed186cfca4b63c902db059b3b6df101c914efba2ecbe06d679826a513e5d0785cb0faac07ac0aab666c777858120cc001a7b454a4135f2b233bfe37c2011b427cffec935f9aa0e1626cb7d3b02f46e306c48caa206f8ab0bff8f497a241f782be78065303a9c04cb38ad11b7f3a373da88b2c65dee2aa2e81beb8a8de2b025f08133f2e2af434d9604e2cc56c1509effad542038a774bb9aafe26450e953332674bbbc3b4eed51d664cef80497f8560493537951d9a59aab8e276a47462ca511c4bd77ce29a0a1094abb3e607591a4b39895abc984fdfb3903fd80a8caf5a1d1d3a51f70eafcf1636c8dbf55ee2053dffe78093666c835900988b1bf5ba769f5b507d8488d3e4ca2b3832621049d8394dc9b4f4e5acd23b13f6a99f0cd45001b59d282a5a9721eed0cd851f64ce7ef5e26e92bc7d83d21a34d0d3eef33d50fd52c718e4b0a63169b65168495134684d6d4d84df1306e5292f08f83f867939a82e4440c2159d7280a116ade735183f201f77c7a058610c7b7c7ef34a1d617e86b96abc63c5cb369265fd1f8938fa2496f078ca7d494148066e8377fbee6d4dec13af0cd414c635a3278c039bbc7466843b921e37b1b51c29cc91966d5b6096e615db4e399e31214799b4ec3e30710ab995c6765bc011778954d2a9c9d0c03b5502c7a28bda707280872a4752c197616577532a8c230ac647c97b42653d9aff16c0f21327543ed615ec245f05cb03f65b653c5c58d6b868b7a5764c58587041047fce3f6479eb923da54ee12898e99c4cc931adf3f2d5e85b1c76e580a357d4e50345bd8b6b5eab547ec2310036965eee51d7ce633741709fbe7ead793c8cc3c37c16715b691d5783adda2283ac86cd2a69549f34b1d5ced966e75fc4e65e011397dd8a230d5a9dc7b833ab2950eead22b26b28e9419e0b294238fb1edcd41446990e6b90ffc725ec8979883a1677e29202a899032dce7487d8c5600d65c88dc8cb51973903f164923a3a0419ef73ca373d7b3a13a4d94d88a1d68ddcac7d8b99d223565c6c6319e74501663384cc250f39d4723130d06f123c23ad03e12d0a4f34f250fb6b69c75593a81fa4a6ba4de42a78aed85b8dabe641e73cdaa2ba4f5ba58767eb8b63d934b7d8121c5c6f499ae7ec736d906c4549273247afc6fc18690175a4168d1f7fff317c5391661a9b6c4673397b36fd4dcddd9c7d8eb835a6956b801effd5f6f3a34bf778cc0b3675a470f043a568ea8903c2f45c9dd4c8e691297423f5750a468114cccc957dfdcf49aa5d4f44968431920587bcd61010121b397342f36922e2acfd4ff03bd87600d19a261b64300d6eeda3594c519154d585bc88f7a0d656c7bef06fc62fa9448a57728bfa425fbc79db3ad5f3c5cf286191a96e8daedd8d1b94a238817491f961ae27821a52cce90cd09d4e1f9f07c91bad9c7edf7f9a49610d599288e77556f184dcb1f0c1d3d4993858b1a320584e203b0eda8ac337090bd2472ebdaa1288b612a707a73db7c252695aa2f643a104b6048248b876af0a7f8c8b3ee1b08a46ab11106b39781745b6ce37ff03bb98b982513b0e4cb471708c0297fe0881f06cc2091ee4cf52b5e8ffdde07854c626f69061dbe13aa8cd730b599e137bf751d4ae0e3a7b224a61822e4bf13c0847319046f6c7149b9892c44c4fbee4a4a2443d56d273534d05a19bb8638508be708cf9088ade7e1a149f4b19301c261dc9c11d6e899bdffd5012d75c745871eeeaab2ba87a2fb32364cb7f8c8e3a1fae3c096e91f56d03b82bd6d44b57e5c4a95179f2087a4d734bffd7131cfe33518f3242d7e42ea766c138f49527563842caf7fbc9705671e67ad6fba14e80bfd675be433c6c36f9c2b0de6d8ceea6764c8a595f9868d5c028a590d130c6b8311a604b4f2c07eef460cecb6412f25f46a964d4075e74d54833da6579e9b8970406f98e3852270dd5651dbb887780d3fe6914442c9588874c904b1508aa994f5361314bb987614155900374a7be2da21182d72a0c2bd6764b81c30bf07c2f0e6c2a142da637631855732d31f239c2f91144765f5d3a6bf2572cf3e7ed35d980b8857f22b95735a7e03fc1cbc4ae2b37d2d27f61ec2567366f1bfc9d6a9fc6922eb93aa6fd961509f09c2df8a412c903470a9b56ba544537635c846a0ec6b00297216d92c17d9d5d1b6432ebcc5103a9ac955560c8afeba00470f90299ffee1d04d64e99039bad277d183f6f8937919908d1bdaf0da0ed9c58a45825d23a8864c715ef07a3730924dbf5fc942b2fcc463436dc3fd031971240fef3ca4be9a273aead7deb1833803876fd6deeb1dfecc57be2991c826803632d7d042a2b83aeb427076e189d8b04d60a444fcb4e6ccd996c81dfc7fe6eb31e86f93400c162ddaa7104f52a8cfdfbdfa262b426b5b144a8c6a8ddd69e2f7c0550bf43f8cd793a39fceb0d6b471a9abcaf8a8a0996b4d4d11ae7a1d8a698015cd1b75b4e731ef93d15e7581f3f028ca0ca7b7009ff0fb565bdd1d4c519fd0622f71959928f8b7ba5087cf50963d42ede54561740755f591cff6b189fe94f32938dd628298ef82beb73ceaab0ef9fcd961c6abb08b2f3a57395617f09ec603967eaa586fae94480c879486a1c5938607f92a1bf8fa4e279e504ae960b9bafbc49cfef077431ab4b6b98d79d2e843b94e6969e09f4ac7a100d3c5fcc2b0d8f9e67ec21593d3d8ad1fa9bb3bd8604e8630d3e0ebfa362a9a9ae1f7d3fa34a24a4ef188dbe2831c34bb7b86e0a93a93241f7914cb6f7ad1f3962a087a142bacb414d8836eca94a3e10067f441cb1f12a9902fe99805bf9da37a1a0f3a748453d392d687e28e1da319c96ebfc49c97dae69509c2a8bdbb6d26dfdbbc0f686f705dd30734c8e0936a027875a3d2e5d5e8bb2daefc438ce35d5ccd55fdf26baf6cb5cbb2e273658d1c7a9cbba8e3023de3e36421855d3acc4a814dc1bc022befc524512936028986e4948914a13c4c13d7b1270467faa9507b14dfa560ea2a096ea67c9fd81b329a77a870a4cefa02e4b5a8e2ea9f866197ae23ae337ad83068c1688736f4078b56a498fb7c3ad7b6d35a84608902ae130e377f6cbf415cb7b045e65a43203bab210a6bf245713920330fa29185f56ef621bf28ab4f92a04fbf70424f3eb4ebca23fdf2928e8cb1253fadcbf259ef393df63ff40199713ef6bc1a1f2e1d4f53d39ebd02b961fbc2615f2dc501c6e6167971777d8c6174038f49a65e9790aa102247c10dabb721b5aab456a9d08a8b02230834275829edb87b64cd9c3db0e414c8db7aeeb9f8faef09feb35b18eddb7dd3f4ec09c4c8fcbe2c0cc35e70707ea3d3abd4b434ba09b122f0384c5dbab71264ba27a556fcf3acfba518dc1893a163966f62e70bacaef5dac9adb759d6a07337be86df1c4bdd762f3e4f28b5da3fec5aee13bdab4a8a4701bda323221822be2b4efc4cfe666d8959ed919be43b32908ca8e5c673de44809b2ef5b2402b2093442e00a6d4e7ca08602827e40c565c4688cecb89bc830299141ab57c7496ad65f6ade2150bbc9aa162faaac40e6894907690512548473509c95f1d25e546c6a4040b3352ebc7c5e3d675de5834ed7d2c0fd8341799e0715c792ba4b9d14f19edf6806bf69384e0af3a0380ea00c088c9f2354466f18fce3fabc1df7f63fd9b499db1e6320d77bbcb2e72c6c64b0f436766029026ff5055a2dbc8f1ff623f9148fb1f572dc526a63f193cb9690d72f26f9a3a338f39884954705f39fa42c1eaa6003d7807cf89f3eb79101b0a3b4b2ad5e157cbbd7f1ef5209bdd7e730f60c37efaf2f7d40c508c996ac421c0cf17ce59c873921b98c04977d82a22e2d4ccac0a4c3d99487ec5eeb07dd4a581dc8e92e2825a324d10f98344a64af9e71c5cec4bdd4e831fecace9949cc36e6e456cb8187fa8df62bc6b3e42e1c3f993a5fa93e66e2be2ef24653ad606306785f26933b9ead0ec4d8b52567e6a82ea0d9fcfd0515632cbce4af92b9026877b56021e7f3c1aaf4264f1d64a39910d0ec902497134bb258082f9af0cea4a520b46d010f01671c04ce02d9e679437003435a1452b5d8da1c72890db65baae4ff7e8497c9b9a40686dda1483f24867018299c1c827732d19d8854b150a7162e8693c8fa03a46f3cbdbedaf127e0b029d906efe3700830f7fa8dcf971eb3ffc937e3c663e3c1539a6cf6e7299c297808f0d4c4663792a592330dd33a628f1801f37fff55deff6606a3487c31c7dc544f2f57f4ed260fc4d2fc58008381c6baac11d0528d6b8f108a0316c78a6b73acf2027b83ec203cd4d248afb7bef8967f4254c0ff09661036546c86bd15d6f2544c2a55c82353fd3bd0df1e4909fb969769e44c659b07e41beae83ebe04162b0f60cb2801334b039ff187aefa6ac727ee3123b9dca7ae88273b40e7d3f0add665bc4202063050479af1ffb4aaa7d3b7a4a8db2cad95bd245640d06a0c8d31e288f8af475b732fed5589ad724b179a4a4ce4ecc13f8299d8cf14b8aa8fa230d7661c2057fee17612842ce6744cb00573affc990d80362dadd5011a7b50b841e2c41dcaaee123abea3ac150e8a62a9482142c87bed04a45bebfa013469b75da86a3aa7ea3eb23dae312d0d106bed6848c30c6f0692dcd3d52be4194fe034e318ecdaeb74819ea806a0b0a2ce7c32f85641fe2bdb0cc017cc97571dde2f09ee5479b7886dbb791505c22270308aed30493150c3c33e22d9e200abd02debe90322a61669c54c0a9a59cb2a05f775e80a464cc5cb03cbf4a8cecec2005fb2d69329116b696cbe8752b65cc4e85ddbb39a13cd793898e2addb91db00aea522a3c7f46424d4352a9030409006204e3a09a902e27f4b358942689dac078a565f2ec11667f8480c7849c000719de540891df47376db41c167d590aba23f21ab5002aa2f3361c487e58f90d84cc8fb8bd1c9bb690c52d71b3b004fa299496f46f6284253f9f1e7caa9e1361ac1fdea2049ea810565053aa76fa9190242d913e44c5cc000e190d0cb59a5c6025bec5235fe8bf105956a62ca392d82f576245a5d371d7ab1966b8f03949aacda790e65a05279d64389586a13ed07289760e615ee1178b57a7ee7647b6f7035b3a0b85aacb18b1ad9c572ce5a30f23fd995ed087c50a6bb9fd12d40ec08087828ce572b47745978967c5237c75bd676fc160af99abd58e05ec3590c2f3fcdab1724e5bdd1c131812c845f7d794901e057e8ccc2d9b3943407f02fa0d7bc45e136ddac1ee076fb3f0feae11159200b7e8b05ff59ca5d3f2c17720065ce6ce0ab89c14594253bdc7d9bcd9d1c7d56afebb79a67dc15cb1a285138f9403ace43c740a07ec5bf383ed600c21d449516854e2cb801a733f8feb2d6b46e1197393f0d65fced0c70bc9b4ff83de43ee1cb9ff0ec93cc50d5eba16e7cd8c8063568457383be92630ed583404811c9de099f20aae06db5f879d1cf0ff128e0b9d696ffac092329686b200dbbf3ce96f0d20c6c4f9ef4948f9cde182036cb78ebee6bc8edefdebfae26caddd88474064d570711d263328fa025a483549487c18700d5937426aa14124aaaf431fab4fea291d2995a1cfbbd27ccd66161c853208684edf8037b2ff20f93f716958c93e411cb2239d8ec7d0496543a52f2d2ba8e4ff0bcbc0815e7528f265803ed6781" diff --git a/custom/auth/ante/spamming_prevention.go b/custom/auth/ante/spamming_prevention.go index ea954bdee..1081e4923 100644 --- a/custom/auth/ante/spamming_prevention.go +++ b/custom/auth/ante/spamming_prevention.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - oracleexported "github.com/classic-terra/core/v2/x/oracle/exported" + oracleexported "github.com/classic-terra/core/v3/x/oracle/exported" ) // SpammingPreventionDecorator will check if the transaction's gas is smaller than diff --git a/custom/auth/ante/spamming_prevention_test.go b/custom/auth/ante/spamming_prevention_test.go index 577232a70..63ad02235 100644 --- a/custom/auth/ante/spamming_prevention_test.go +++ b/custom/auth/ante/spamming_prevention_test.go @@ -1,13 +1,14 @@ package ante_test import ( + errorsmod "cosmossdk.io/errors" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/classic-terra/core/v2/custom/auth/ante" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/custom/auth/ante" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" ) func (suite *AnteTestSuite) TestOracleSpamming() { @@ -84,5 +85,5 @@ func (ok dummyOracleKeeper) ValidateFeeder(_ sdk.Context, feederAddr sdk.AccAddr return nil } - return sdkerrors.Wrap(sdkerrors.ErrUnauthorized, "cannot ensure feeder right") + return errorsmod.Wrap(sdkerrors.ErrUnauthorized, "cannot ensure feeder right") } diff --git a/custom/auth/client/cli/estimate_fee.go b/custom/auth/client/cli/estimate_fee.go index aa0666934..921c0e6d7 100644 --- a/custom/auth/client/cli/estimate_fee.go +++ b/custom/auth/client/cli/estimate_fee.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" authclient "github.com/cosmos/cosmos-sdk/x/auth/client" - feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v3/custom/auth/client/utils" ) // GetTxFeesEstimateCommand will create a send tx and sign it with the given key. diff --git a/custom/auth/client/utils/feeutils.go b/custom/auth/client/utils/feeutils.go index 5d5325cad..cd45132ce 100644 --- a/custom/auth/client/utils/feeutils.go +++ b/custom/auth/client/utils/feeutils.go @@ -3,6 +3,7 @@ package utils import ( "context" + "cosmossdk.io/math" "github.com/spf13/pflag" "github.com/cosmos/cosmos-sdk/client" @@ -13,9 +14,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - wasmexported "github.com/CosmWasm/wasmd/x/wasm" - marketexported "github.com/classic-terra/core/v2/x/market/exported" - treasuryexported "github.com/classic-terra/core/v2/x/treasury/exported" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + marketexported "github.com/classic-terra/core/v3/x/market/exported" + treasuryexported "github.com/classic-terra/core/v3/x/treasury/exported" ) type ( @@ -41,7 +42,10 @@ type ComputeReqParams struct { func ComputeFeesWithCmd( clientCtx client.Context, flagSet *pflag.FlagSet, msgs ...sdk.Msg, ) (*legacytx.StdFee, error) { - txf := tx.NewFactoryCLI(clientCtx, flagSet) + txf, err := tx.NewFactoryCLI(clientCtx, flagSet) + if err != nil { + return nil, err + } gas := txf.Gas() if txf.SimulateAndExecute() { @@ -140,7 +144,7 @@ func FilterMsgAndComputeTax(clientCtx client.Context, msgs ...sdk.Msg) (taxes sd taxes = taxes.Add(tax...) - case *wasmexported.MsgInstantiateContract: + case *wasmtypes.MsgInstantiateContract: tax, err := computeTax(clientCtx, taxRate, msg.Funds) if err != nil { return nil, err @@ -148,7 +152,7 @@ func FilterMsgAndComputeTax(clientCtx client.Context, msgs ...sdk.Msg) (taxes sd taxes = taxes.Add(tax...) - case *wasmexported.MsgInstantiateContract2: + case *wasmtypes.MsgInstantiateContract2: tax, err := computeTax(clientCtx, taxRate, msg.Funds) if err != nil { return nil, err @@ -156,7 +160,7 @@ func FilterMsgAndComputeTax(clientCtx client.Context, msgs ...sdk.Msg) (taxes sd taxes = taxes.Add(tax...) - case *wasmexported.MsgExecuteContract: + case *wasmtypes.MsgExecuteContract: tax, err := computeTax(clientCtx, taxRate, msg.Funds) if err != nil { return nil, err @@ -205,7 +209,7 @@ func queryTaxRate(clientCtx client.Context) (sdk.Dec, error) { return res.TaxRate, err } -func queryTaxCap(clientCtx client.Context, denom string) (sdk.Int, error) { +func queryTaxCap(clientCtx client.Context, denom string) (math.Int, error) { queryClient := treasuryexported.NewQueryClient(clientCtx) res, err := queryClient.TaxCap(context.Background(), &treasuryexported.QueryTaxCapRequest{Denom: denom}) diff --git a/custom/auth/module.go b/custom/auth/module.go index 439c9181b..37f56b412 100644 --- a/custom/auth/module.go +++ b/custom/auth/module.go @@ -4,11 +4,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/cosmos/cosmos-sdk/x/auth/exported" "github.com/cosmos/cosmos-sdk/x/auth/keeper" "github.com/cosmos/cosmos-sdk/x/auth/types" - customsim "github.com/classic-terra/core/v2/custom/auth/simulation" - customtypes "github.com/classic-terra/core/v2/custom/auth/types" + customsim "github.com/classic-terra/core/v3/custom/auth/simulation" + customtypes "github.com/classic-terra/core/v3/custom/auth/types" ) var ( @@ -38,9 +39,9 @@ type AppModule struct { } // NewAppModule creates a new AppModule object -func NewAppModule(cdc codec.Codec, accountKeeper keeper.AccountKeeper, randGenAccountsFn types.RandomGenesisAccountsFn) AppModule { +func NewAppModule(cdc codec.Codec, accountKeeper keeper.AccountKeeper, randGenAccountsFn types.RandomGenesisAccountsFn, subspace exported.Subspace) AppModule { return AppModule{ - AppModule: auth.NewAppModule(cdc, accountKeeper, randGenAccountsFn), + AppModule: auth.NewAppModule(cdc, accountKeeper, randGenAccountsFn, subspace), accountKeeper: accountKeeper, randGenAccountsFn: randGenAccountsFn, } diff --git a/custom/auth/post/post.go b/custom/auth/post/post.go index b906a1f07..95f0f1867 100644 --- a/custom/auth/post/post.go +++ b/custom/auth/post/post.go @@ -1,8 +1,8 @@ package post import ( - dyncommkeeper "github.com/classic-terra/core/v2/x/dyncomm/keeper" - dyncommpost "github.com/classic-terra/core/v2/x/dyncomm/post" + dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper" + dyncommpost "github.com/classic-terra/core/v3/x/dyncomm/post" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -11,11 +11,10 @@ type HandlerOptions struct { DyncommKeeper dyncommkeeper.Keeper } -// NewAnteHandler returns an AnteHandler that checks and increments sequence -// numbers, checks signatures & account numbers, and deducts fees from the first -// signer. -func NewPostHandler(options HandlerOptions) (sdk.AnteHandler, error) { - return sdk.ChainAnteDecorators( +// NewPostHandler returns an PostHandler that checks and set target +// commission rate for msg create validator and msg edit validator +func NewPostHandler(options HandlerOptions) (sdk.PostHandler, error) { + return sdk.ChainPostDecorators( dyncommpost.NewDyncommPostDecorator(options.DyncommKeeper), ), nil } diff --git a/custom/auth/simulation/genesis.go b/custom/auth/simulation/genesis.go index 3932a1938..dd3ce45c0 100644 --- a/custom/auth/simulation/genesis.go +++ b/custom/auth/simulation/genesis.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/auth/types" - core "github.com/classic-terra/core/v2/types" - customvestingtypes "github.com/classic-terra/core/v2/x/vesting/types" + core "github.com/classic-terra/core/v3/types" + customvestingtypes "github.com/classic-terra/core/v3/x/vesting/types" ) // Simulation parameter constants diff --git a/custom/auth/tx/service.go b/custom/auth/tx/service.go index 06997e42d..63710d04e 100644 --- a/custom/auth/tx/service.go +++ b/custom/auth/tx/service.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - customante "github.com/classic-terra/core/v2/custom/auth/ante" + customante "github.com/classic-terra/core/v3/custom/auth/ante" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/custom/auth/tx/service.pb.go b/custom/auth/tx/service.pb.go index 72f0375d3..91774cc05 100644 --- a/custom/auth/tx/service.pb.go +++ b/custom/auth/tx/service.pb.go @@ -6,30 +6,27 @@ package tx import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" tx "github.com/cosmos/cosmos-sdk/types/tx" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" golang_proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = golang_proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = golang_proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -53,11 +50,9 @@ func (*ComputeTaxRequest) ProtoMessage() {} func (*ComputeTaxRequest) Descriptor() ([]byte, []int) { return fileDescriptor_0b3c73e5d85273f4, []int{0} } - func (m *ComputeTaxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *ComputeTaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_ComputeTaxRequest.Marshal(b, m, deterministic) @@ -70,15 +65,12 @@ func (m *ComputeTaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } - func (m *ComputeTaxRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_ComputeTaxRequest.Merge(m, src) } - func (m *ComputeTaxRequest) XXX_Size() int { return m.Size() } - func (m *ComputeTaxRequest) XXX_DiscardUnknown() { xxx_messageInfo_ComputeTaxRequest.DiscardUnknown(m) } @@ -113,11 +105,9 @@ func (*ComputeTaxResponse) ProtoMessage() {} func (*ComputeTaxResponse) Descriptor() ([]byte, []int) { return fileDescriptor_0b3c73e5d85273f4, []int{1} } - func (m *ComputeTaxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *ComputeTaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_ComputeTaxResponse.Marshal(b, m, deterministic) @@ -130,15 +120,12 @@ func (m *ComputeTaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *ComputeTaxResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_ComputeTaxResponse.Merge(m, src) } - func (m *ComputeTaxResponse) XXX_Size() int { return m.Size() } - func (m *ComputeTaxResponse) XXX_DiscardUnknown() { xxx_messageInfo_ComputeTaxResponse.DiscardUnknown(m) } @@ -165,40 +152,38 @@ func init() { } var fileDescriptor_0b3c73e5d85273f4 = []byte{ - // 406 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x6e, 0xd5, 0x30, - 0x14, 0xc6, 0xe3, 0x20, 0x51, 0x70, 0x19, 0x20, 0x02, 0x29, 0x8d, 0xc0, 0xbd, 0x0a, 0x0c, 0x01, - 0xa9, 0x36, 0x0d, 0x1b, 0x1b, 0xe9, 0xcc, 0x12, 0xba, 0xc0, 0x72, 0xe5, 0x18, 0x2b, 0x0d, 0x34, - 0x39, 0x21, 0x3e, 0xb9, 0x72, 0x37, 0x60, 0x47, 0x42, 0xe2, 0x2d, 0x78, 0x0a, 0xc6, 0x8e, 0x95, - 0x58, 0x98, 0x00, 0xdd, 0xf0, 0x20, 0xe8, 0xc6, 0xa1, 0x44, 0x54, 0x62, 0x4a, 0xac, 0xdf, 0xf9, - 0xf3, 0x7d, 0xdf, 0xa1, 0x0c, 0x75, 0xd7, 0x49, 0x81, 0x56, 0xac, 0xf6, 0x0b, 0x8d, 0x72, 0x5f, - 0x18, 0xdd, 0xad, 0x2a, 0xa5, 0x79, 0xdb, 0x01, 0x42, 0x70, 0x7d, 0xe4, 0x1c, 0x2d, 0x9f, 0x78, - 0x74, 0xb3, 0x84, 0x12, 0x46, 0x28, 0x36, 0x7f, 0xae, 0x2e, 0xba, 0x5d, 0x02, 0x94, 0xc7, 0x5a, - 0xc8, 0xb6, 0x12, 0xb2, 0x69, 0x00, 0x25, 0x56, 0xd0, 0x98, 0x89, 0x32, 0x05, 0xa6, 0x06, 0x23, - 0x0a, 0x69, 0xf4, 0xf9, 0x22, 0x05, 0x55, 0x33, 0xf1, 0x68, 0xe2, 0x33, 0x19, 0x68, 0x1d, 0x8b, - 0x9f, 0xd3, 0x1b, 0x07, 0x50, 0xb7, 0x3d, 0xea, 0x43, 0x69, 0x73, 0xfd, 0xa6, 0xd7, 0x06, 0x83, - 0xfb, 0xd4, 0x47, 0x1b, 0x92, 0x05, 0x49, 0xb6, 0xd3, 0x5b, 0xdc, 0x75, 0xcf, 0x44, 0xf2, 0x43, - 0x9b, 0xf9, 0x21, 0xc9, 0x7d, 0xb4, 0xc1, 0x0e, 0xbd, 0x82, 0x76, 0x59, 0x9c, 0xa0, 0x36, 0xa1, - 0xbf, 0x20, 0xc9, 0xb5, 0x7c, 0x0b, 0x6d, 0xb6, 0x79, 0xc6, 0x6f, 0x09, 0x0d, 0xe6, 0xb3, 0x4d, - 0x0b, 0x8d, 0xd1, 0xc1, 0x2b, 0x4a, 0x51, 0xda, 0xa5, 0xac, 0xa1, 0x6f, 0x30, 0x24, 0x8b, 0x4b, - 0xc9, 0x76, 0xba, 0xf3, 0x67, 0xc9, 0xc6, 0xc2, 0xf9, 0x9a, 0x03, 0xa8, 0x9a, 0xec, 0xe1, 0xe9, - 0xf7, 0x5d, 0xef, 0xf3, 0x8f, 0xdd, 0xa4, 0xac, 0xf0, 0xa8, 0x2f, 0xb8, 0x82, 0x5a, 0x4c, 0x7e, - 0xdc, 0x67, 0xcf, 0xbc, 0x7c, 0x2d, 0xf0, 0xa4, 0xd5, 0x66, 0x6c, 0x30, 0xf9, 0x55, 0x94, 0xf6, - 0xc9, 0x38, 0x3d, 0xfd, 0x40, 0xe8, 0xd6, 0x33, 0x97, 0x78, 0xf0, 0x8e, 0x50, 0xfa, 0x57, 0x4e, - 0x70, 0x97, 0xff, 0x9b, 0x3d, 0xbf, 0x10, 0x44, 0x74, 0xef, 0xff, 0x45, 0xce, 0x51, 0x9c, 0xbc, - 0xff, 0xfa, 0xeb, 0x93, 0x1f, 0xc7, 0x77, 0xc4, 0x85, 0x73, 0x2b, 0x57, 0xbd, 0x44, 0x69, 0x1f, - 0x93, 0x07, 0xd9, 0xd3, 0xd3, 0x35, 0x23, 0x67, 0x6b, 0x46, 0x7e, 0xae, 0x19, 0xf9, 0x38, 0x30, - 0xef, 0xcb, 0xc0, 0xc8, 0xd9, 0xc0, 0xbc, 0x6f, 0x03, 0xf3, 0x5e, 0x88, 0xb9, 0xc5, 0x63, 0x69, - 0x4c, 0xa5, 0xf6, 0xdc, 0x44, 0x05, 0x9d, 0x16, 0xab, 0x54, 0xa8, 0xde, 0x20, 0xd4, 0x42, 0xf6, - 0x78, 0x24, 0xd0, 0x16, 0x97, 0xc7, 0x1b, 0x3e, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x20, - 0xf4, 0xe0, 0x67, 0x02, 0x00, 0x00, + // 407 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xb1, 0x6e, 0xd5, 0x30, + 0x14, 0x8d, 0x83, 0x44, 0xc1, 0x65, 0x80, 0x08, 0xa4, 0x34, 0x02, 0xf7, 0x29, 0x30, 0x04, 0xa4, + 0xda, 0xf4, 0x75, 0x63, 0x23, 0x9d, 0x59, 0x42, 0x17, 0x58, 0x9e, 0x1c, 0x63, 0xa5, 0x81, 0x26, + 0x37, 0xc4, 0x37, 0x4f, 0xee, 0x06, 0xec, 0x48, 0x48, 0xfc, 0x05, 0x5f, 0xc1, 0xd8, 0xb1, 0x12, + 0x0b, 0x13, 0xa0, 0x17, 0x3e, 0x04, 0xbd, 0x38, 0x94, 0x88, 0x27, 0x75, 0xf2, 0xb5, 0x8f, 0xcf, + 0xb9, 0xf7, 0x9c, 0x4b, 0x19, 0xea, 0xb6, 0x95, 0x02, 0xad, 0x58, 0xee, 0xe7, 0x1a, 0xe5, 0xbe, + 0x30, 0xba, 0x5d, 0x96, 0x4a, 0xf3, 0xa6, 0x05, 0x84, 0xe0, 0xe6, 0x80, 0x73, 0xb4, 0x7c, 0xc4, + 0x23, 0xa6, 0xc0, 0x54, 0x60, 0x44, 0x2e, 0x8d, 0xbe, 0x20, 0x29, 0x28, 0x6b, 0xc7, 0x88, 0xa2, + 0x11, 0x9f, 0x48, 0xa2, 0x1d, 0xb1, 0xdb, 0x05, 0x14, 0x30, 0x94, 0x62, 0x5d, 0x8d, 0xaf, 0x77, + 0x0b, 0x80, 0xe2, 0x44, 0x0b, 0xd9, 0x94, 0x42, 0xd6, 0x35, 0xa0, 0xc4, 0x12, 0x6a, 0xe3, 0xd0, + 0xf8, 0x05, 0xbd, 0x75, 0x08, 0x55, 0xd3, 0xa1, 0x3e, 0x92, 0x36, 0xd3, 0x6f, 0x3b, 0x6d, 0x30, + 0x78, 0x48, 0x7d, 0xb4, 0x21, 0x99, 0x91, 0x64, 0x7b, 0x7e, 0x87, 0xbb, 0x8e, 0x93, 0x21, 0xf9, + 0x91, 0x4d, 0xfd, 0x90, 0x64, 0x3e, 0xda, 0x60, 0x87, 0x5e, 0x43, 0xbb, 0xc8, 0x4f, 0x51, 0x9b, + 0xd0, 0x9f, 0x91, 0xe4, 0x46, 0xb6, 0x85, 0x36, 0x5d, 0x5f, 0xe3, 0x77, 0x84, 0x06, 0x53, 0x6d, + 0xd3, 0x40, 0x6d, 0x74, 0xf0, 0x9a, 0x52, 0x94, 0x76, 0x21, 0x2b, 0xe8, 0x6a, 0x0c, 0xc9, 0xec, + 0x4a, 0xb2, 0x3d, 0xdf, 0xf9, 0xdb, 0x64, 0x6d, 0xfb, 0xa2, 0xcd, 0x21, 0x94, 0x75, 0xfa, 0xf8, + 0xec, 0xc7, 0xae, 0xf7, 0xe5, 0xe7, 0x6e, 0x52, 0x94, 0x78, 0xdc, 0xe5, 0x5c, 0x41, 0x25, 0xc6, + 0x0c, 0xdc, 0xb1, 0x67, 0x5e, 0xbd, 0x11, 0x78, 0xda, 0x68, 0x33, 0x10, 0x4c, 0x76, 0x1d, 0xa5, + 0x7d, 0x3a, 0xa8, 0xcf, 0x3f, 0x12, 0xba, 0xf5, 0xdc, 0x25, 0x1e, 0xbc, 0x27, 0x94, 0xfe, 0x1b, + 0x27, 0xb8, 0xcf, 0xff, 0xcf, 0x9e, 0x6f, 0x04, 0x11, 0x3d, 0xb8, 0xfc, 0x93, 0x73, 0x14, 0x27, + 0x1f, 0xbe, 0xfd, 0xfe, 0xec, 0xc7, 0x4f, 0xc8, 0xa3, 0xf8, 0x9e, 0xd8, 0xd8, 0xb8, 0x72, 0x84, + 0x05, 0x4a, 0x9b, 0x3e, 0x3b, 0x5b, 0x31, 0x72, 0xbe, 0x62, 0xe4, 0xd7, 0x8a, 0x91, 0x4f, 0x3d, + 0xf3, 0xbe, 0xf6, 0x8c, 0x9c, 0xf7, 0xcc, 0xfb, 0xde, 0x33, 0xef, 0xa5, 0x98, 0x5a, 0x3c, 0x91, + 0xc6, 0x94, 0x6a, 0xcf, 0xc9, 0x29, 0x68, 0xb5, 0x58, 0x1e, 0x08, 0xd5, 0x19, 0x84, 0x4a, 0xc8, + 0x0e, 0x8f, 0x05, 0xda, 0xfc, 0xea, 0xb0, 0xc3, 0x83, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x59, + 0x9e, 0xc4, 0x41, 0x67, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -236,7 +221,8 @@ type ServiceServer interface { } // UnimplementedServiceServer can be embedded to have forward compatible implementations. -type UnimplementedServiceServer struct{} +type UnimplementedServiceServer struct { +} func (*UnimplementedServiceServer) ComputeTax(ctx context.Context, req *ComputeTaxRequest) (*ComputeTaxResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ComputeTax not implemented") @@ -367,7 +353,6 @@ func encodeVarintService(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *ComputeTaxRequest) Size() (n int) { if m == nil { return 0 @@ -403,11 +388,9 @@ func (m *ComputeTaxResponse) Size() (n int) { func sovService(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozService(x uint64) (n int) { return sovService(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *ComputeTaxRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -528,7 +511,6 @@ func (m *ComputeTaxRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *ComputeTaxResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -613,7 +595,6 @@ func (m *ComputeTaxResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipService(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/custom/auth/tx/service.pb.gw.go b/custom/auth/tx/service.pb.gw.go index 0c636666e..5aee1553a 100644 --- a/custom/auth/tx/service.pb.gw.go +++ b/custom/auth/tx/service.pb.gw.go @@ -25,15 +25,13 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = runtime.String - _ = utilities.NewDoubleArray - _ = descriptor.ForMessage - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join func request_Service_ComputeTax_0(ctx context.Context, marshaler runtime.Marshaler, client ServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ComputeTaxRequest @@ -49,6 +47,7 @@ func request_Service_ComputeTax_0(ctx context.Context, marshaler runtime.Marshal msg, err := client.ComputeTax(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Service_ComputeTax_0(ctx context.Context, marshaler runtime.Marshaler, server ServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -65,6 +64,7 @@ func local_request_Service_ComputeTax_0(ctx context.Context, marshaler runtime.M msg, err := server.ComputeTax(ctx, &protoReq) return msg, metadata, err + } // RegisterServiceHandlerServer registers the http handlers for service Service to "mux". @@ -72,6 +72,7 @@ func local_request_Service_ComputeTax_0(ctx context.Context, marshaler runtime.M // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterServiceHandlerFromEndpoint instead. func RegisterServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ServiceServer) error { + mux.Handle("POST", pattern_Service_ComputeTax_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -92,6 +93,7 @@ func RegisterServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, se } forward_Service_ComputeTax_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -134,6 +136,7 @@ func RegisterServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *gr // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "ServiceClient" to call the correct interceptors. func RegisterServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ServiceClient) error { + mux.Handle("POST", pattern_Service_ComputeTax_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -151,11 +154,16 @@ func RegisterServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl } forward_Service_ComputeTax_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil } -var pattern_Service_ComputeTax_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"terra", "tx", "v1beta1", "compute_tax"}, "", runtime.AssumeColonVerbOpt(false))) +var ( + pattern_Service_ComputeTax_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"terra", "tx", "v1beta1", "compute_tax"}, "", runtime.AssumeColonVerbOpt(false))) +) -var forward_Service_ComputeTax_0 = runtime.ForwardResponseMessage +var ( + forward_Service_ComputeTax_0 = runtime.ForwardResponseMessage +) diff --git a/custom/authz/client/cli/tx.go b/custom/authz/client/cli/tx.go index 6b076802c..1739b43c2 100644 --- a/custom/authz/client/cli/tx.go +++ b/custom/authz/client/cli/tx.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" "github.com/cosmos/cosmos-sdk/x/authz/client/cli" - feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v3/custom/auth/client/utils" ) // GetTxCmd returns the transaction commands for this module @@ -68,7 +68,10 @@ Example: } // Generate transaction factory for gas simulation - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } msg := authz.NewMsgExec(grantee, theTx.GetMsgs()) if err := msg.ValidateBasic(); err != nil { return err diff --git a/custom/authz/module.go b/custom/authz/module.go index 7c3b91725..10e36cfef 100644 --- a/custom/authz/module.go +++ b/custom/authz/module.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" authz "github.com/cosmos/cosmos-sdk/x/authz/module" - customcli "github.com/classic-terra/core/v2/custom/authz/client/cli" - customtypes "github.com/classic-terra/core/v2/custom/authz/types" + customcli "github.com/classic-terra/core/v3/custom/authz/client/cli" + customtypes "github.com/classic-terra/core/v3/custom/authz/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/bank/client/cli/tx.go b/custom/bank/client/cli/tx.go index 6f0484dca..f10b05155 100644 --- a/custom/bank/client/cli/tx.go +++ b/custom/bank/client/cli/tx.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/types" - feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v3/custom/auth/client/utils" ) var FlagSplit = "split" @@ -65,7 +65,10 @@ ignored as it is implied from [from_key_or_address].`, } // Generate transaction factory for gas simulation - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } if !clientCtx.GenerateOnly && txf.Fees().IsZero() { // estimate tax and gas @@ -155,7 +158,10 @@ Using the '--split' flag, the [amount] is split equally between the addresses.`, } // Generate transaction factory for gas simulation - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } if !clientCtx.GenerateOnly && txf.Fees().IsZero() { // estimate tax and gas diff --git a/custom/bank/module.go b/custom/bank/module.go index 885fa9873..e651b647b 100644 --- a/custom/bank/module.go +++ b/custom/bank/module.go @@ -7,12 +7,13 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/bank" + "github.com/cosmos/cosmos-sdk/x/bank/exported" "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/types" - customcli "github.com/classic-terra/core/v2/custom/bank/client/cli" - customsim "github.com/classic-terra/core/v2/custom/bank/simulation" - customtypes "github.com/classic-terra/core/v2/custom/bank/types" + customcli "github.com/classic-terra/core/v3/custom/bank/client/cli" + customsim "github.com/classic-terra/core/v3/custom/bank/simulation" + customtypes "github.com/classic-terra/core/v3/custom/bank/types" ) var ( @@ -45,9 +46,9 @@ type AppModule struct { } // NewAppModule creates a new AppModule object -func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, accountKeeper types.AccountKeeper) AppModule { +func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, accountKeeper types.AccountKeeper, subspace exported.Subspace) AppModule { return AppModule{ - AppModule: bank.NewAppModule(cdc, keeper, accountKeeper), + AppModule: bank.NewAppModule(cdc, keeper, accountKeeper, subspace), keeper: keeper, accountKeeper: accountKeeper, } diff --git a/custom/bank/simulation/genesis.go b/custom/bank/simulation/genesis.go index f6c0f1659..431ba26a7 100644 --- a/custom/bank/simulation/genesis.go +++ b/custom/bank/simulation/genesis.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank/simulation" "github.com/cosmos/cosmos-sdk/x/bank/types" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" ) // RandomGenesisBalances returns a slice of account balances. Each account has @@ -33,16 +33,16 @@ func RandomGenesisBalances(simState *module.SimulationState) []types.Balance { // RandomizedGenState generates a random GenesisState for bank func RandomizedGenState(simState *module.SimulationState) { - var sendEnabledParams types.SendEnabledParams + var sendEnabledParams []types.SendEnabled simState.AppParams.GetOrGenerate( simState.Cdc, string(types.KeySendEnabled), &sendEnabledParams, simState.Rand, - func(r *rand.Rand) { sendEnabledParams = simulation.RandomGenesisSendParams(r) }, + func(r *rand.Rand) { sendEnabledParams = simulation.RandomGenesisSendEnabled(r) }, ) var defaultSendEnabledParam bool simState.AppParams.GetOrGenerate( simState.Cdc, string(types.KeyDefaultSendEnabled), &defaultSendEnabledParam, simState.Rand, - func(r *rand.Rand) { defaultSendEnabledParam = simulation.RandomGenesisDefaultSendParam(r) }, + func(r *rand.Rand) { defaultSendEnabledParam = simulation.RandomGenesisDefaultSendEnabledParam(r) }, ) numAccs := int64(len(simState.Accounts)) @@ -54,12 +54,10 @@ func RandomizedGenState(simState *module.SimulationState) { ) bankGenesis := types.GenesisState{ - Params: types.Params{ - SendEnabled: sendEnabledParams, - DefaultSendEnabled: defaultSendEnabledParam, - }, - Balances: RandomGenesisBalances(simState), - Supply: supply, + Params: types.NewParams(defaultSendEnabledParam), + Balances: RandomGenesisBalances(simState), + Supply: supply, + SendEnabled: sendEnabledParams, } paramsBytes, err := json.MarshalIndent(&bankGenesis.Params, "", " ") diff --git a/custom/bank/simulation/operations.go b/custom/bank/simulation/operations.go index 816663680..9245ecf46 100644 --- a/custom/bank/simulation/operations.go +++ b/custom/bank/simulation/operations.go @@ -4,13 +4,14 @@ import ( "math/rand" "strings" + simappparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp/helpers" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/keeper" + banksim "github.com/cosmos/cosmos-sdk/x/bank/simulation" "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/simulation" @@ -30,13 +31,13 @@ func WeightedOperations( var weightMsgSend, weightMsgMultiSend int appParams.GetOrGenerate(cdc, OpWeightMsgSend, &weightMsgSend, nil, func(*rand.Rand) { - weightMsgSend = simappparams.DefaultWeightMsgSend + weightMsgSend = banksim.DefaultWeightMsgSend }, ) appParams.GetOrGenerate(cdc, OpWeightMsgMultiSend, &weightMsgMultiSend, nil, func(*rand.Rand) { - weightMsgMultiSend = simappparams.DefaultWeightMsgMultiSend + weightMsgMultiSend = banksim.DefaultWeightMsgMultiSend }, ) @@ -113,12 +114,12 @@ func sendMsgSend( } } txGen := simappparams.MakeTestEncodingConfig().TxConfig - tx, err := helpers.GenSignedMockTx( + tx, err := simtestutil.GenSignedMockTx( r, txGen, []sdk.Msg{msg}, fees, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, chainID, []uint64{account.GetAccountNumber()}, []uint64{account.GetSequence()}, @@ -144,7 +145,7 @@ func SimulateMsgMultiSend(ak types.AccountKeeper, bk keeper.Keeper) simtypes.Ope accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { // random number of inputs/outputs between [1, 3] - inputs := make([]types.Input, r.Intn(3)+1) + inputs := make([]types.Input, 1) outputs := make([]types.Output, r.Intn(3)+1) // collect signer privKeys @@ -152,34 +153,23 @@ func SimulateMsgMultiSend(ak types.AccountKeeper, bk keeper.Keeper) simtypes.Ope // use map to check if address already exists as input usedAddrs := make(map[string]bool) + simAccount, _, coins, skip := randomSendFields(r, ctx, accs, bk, ak) - var totalSentCoins sdk.Coins - for i := range inputs { - // generate random input fields, ignore to address - simAccount, _, coins, skip := randomSendFields(r, ctx, accs, bk, ak) - - // make sure account is fresh and not used in previous input - for usedAddrs[simAccount.Address.String()] { - simAccount, _, coins, skip = randomSendFields(r, ctx, accs, bk, ak) - } - - if skip { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgMultiSend, "skip all transfers"), nil, nil - } + if skip { + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgMultiSend, "skip all transfers"), nil, nil + } - // set input address in used address map - usedAddrs[simAccount.Address.String()] = true + // set input address in used address map + usedAddrs[simAccount.Address.String()] = true - // set signer privkey - privs[i] = simAccount.PrivKey + // set signer privkey + privs[0] = simAccount.PrivKey - // set next input and accumulate total sent coins - inputs[i] = types.NewInput(simAccount.Address, coins) - totalSentCoins = totalSentCoins.Add(coins...) - } + // set next input and accumulate total sent coins + inputs[0] = types.NewInput(simAccount.Address, coins) // Check send_enabled status of each sent coin denom - if err := bk.IsSendEnabledCoins(ctx, totalSentCoins...); err != nil { + if err := bk.IsSendEnabledCoins(ctx, coins...); err != nil { return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgMultiSend, err.Error()), nil, nil } @@ -189,12 +179,12 @@ func SimulateMsgMultiSend(ak types.AccountKeeper, bk keeper.Keeper) simtypes.Ope var outCoins sdk.Coins // split total sent coins into random subsets for output if o == len(outputs)-1 { - outCoins = totalSentCoins + outCoins = coins } else { // take random subset of remaining coins for output // and update remaining coins - outCoins = simtypes.RandSubsetCoins(r, totalSentCoins) - totalSentCoins = totalSentCoins.Sub(outCoins...) + outCoins = simtypes.RandSubsetCoins(r, coins) + coins = coins.Sub(outCoins...) } outputs[o] = types.NewOutput(outAddr.Address, outCoins) @@ -273,12 +263,12 @@ func sendMsgMultiSend( } txGen := simappparams.MakeTestEncodingConfig().TxConfig - tx, err := helpers.GenSignedMockTx( + tx, err := simtestutil.GenSignedMockTx( r, txGen, []sdk.Msg{msg}, fees, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, chainID, accountNumbers, sequenceNumbers, diff --git a/custom/crisis/module.go b/custom/crisis/module.go index 05e466add..ece2a7e00 100644 --- a/custom/crisis/module.go +++ b/custom/crisis/module.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" "github.com/cosmos/cosmos-sdk/x/crisis/types" - customtypes "github.com/classic-terra/core/v2/custom/crisis/types" - core "github.com/classic-terra/core/v2/types" + customtypes "github.com/classic-terra/core/v3/custom/crisis/types" + core "github.com/classic-terra/core/v3/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/distribution/module.go b/custom/distribution/module.go index f031fead0..70a4e92b0 100644 --- a/custom/distribution/module.go +++ b/custom/distribution/module.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/distribution" "github.com/cosmos/cosmos-sdk/x/distribution/types" - customtypes "github.com/classic-terra/core/v2/custom/distribution/types" + customtypes "github.com/classic-terra/core/v3/custom/distribution/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/distribution/types/codec.go b/custom/distribution/types/codec.go index 11c822fdc..ca563fcb1 100644 --- a/custom/distribution/types/codec.go +++ b/custom/distribution/types/codec.go @@ -6,7 +6,7 @@ import ( cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/x/distribution/types" - govtypes "github.com/classic-terra/core/v2/custom/gov/types" + govtypes "github.com/classic-terra/core/v3/custom/gov/types" ) // RegisterLegacyAminoCodec registers the necessary x/distribution interfaces and concrete types diff --git a/custom/evidence/module.go b/custom/evidence/module.go index 45e026b2d..73c85f1d8 100644 --- a/custom/evidence/module.go +++ b/custom/evidence/module.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/evidence" "github.com/cosmos/cosmos-sdk/x/evidence/types" - customtypes "github.com/classic-terra/core/v2/custom/evidence/types" + customtypes "github.com/classic-terra/core/v3/custom/evidence/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/feegrant/module.go b/custom/feegrant/module.go index c0323b335..f59139f9a 100644 --- a/custom/feegrant/module.go +++ b/custom/feegrant/module.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" feegrant "github.com/cosmos/cosmos-sdk/x/feegrant/module" - customtypes "github.com/classic-terra/core/v2/custom/feegrant/types" + customtypes "github.com/classic-terra/core/v3/custom/feegrant/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/gov/module.go b/custom/gov/module.go index f620f9088..360d2a13f 100644 --- a/custom/gov/module.go +++ b/custom/gov/module.go @@ -7,11 +7,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/gov" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" + govcodec "github.com/cosmos/cosmos-sdk/x/gov/codec" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - customtypes "github.com/classic-terra/core/v2/custom/gov/types" - core "github.com/classic-terra/core/v2/types" + customtypes "github.com/classic-terra/core/v3/custom/gov/types" + core "github.com/classic-terra/core/v3/types" ) var _ module.AppModuleBasic = AppModuleBasic{} @@ -29,7 +29,7 @@ func NewAppModuleBasic(proposalHandlers []govclient.ProposalHandler) AppModuleBa // RegisterLegacyAminoCodec registers the gov module's types for the given codec. func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { customtypes.RegisterLegacyAminoCodec(cdc) - *v1beta1.ModuleCdc = *customtypes.ModuleCdc + *govcodec.ModuleCdc = *customtypes.ModuleCdc v1.RegisterLegacyAminoCodec(cdc) } @@ -38,7 +38,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { func (am AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { // customize to set default genesis state deposit denom to uluna defaultGenesisState := v1.DefaultGenesisState() - defaultGenesisState.DepositParams.MinDeposit[0].Denom = core.MicroLunaDenom + defaultGenesisState.Params.MinDeposit[0].Denom = core.MicroLunaDenom return cdc.MustMarshalJSON(defaultGenesisState) } diff --git a/custom/mint/module.go b/custom/mint/module.go index 1a500f8a3..f69677f7c 100644 --- a/custom/mint/module.go +++ b/custom/mint/module.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/mint" "github.com/cosmos/cosmos-sdk/x/mint/types" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/params/module.go b/custom/params/module.go index d03dea6e9..6b22fdb2a 100644 --- a/custom/params/module.go +++ b/custom/params/module.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/params" - customtypes "github.com/classic-terra/core/v2/custom/params/types" + customtypes "github.com/classic-terra/core/v3/custom/params/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/params/types/codec.go b/custom/params/types/codec.go index 16ac6d2d8..8548a0b6e 100644 --- a/custom/params/types/codec.go +++ b/custom/params/types/codec.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - govtypes "github.com/classic-terra/core/v2/custom/gov/types" + govtypes "github.com/classic-terra/core/v3/custom/gov/types" ) // RegisterLegacyAminoCodec registers all necessary param module types with a given LegacyAmino codec. diff --git a/custom/slashing/module.go b/custom/slashing/module.go index 4c6391f62..da339232e 100644 --- a/custom/slashing/module.go +++ b/custom/slashing/module.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/slashing/types" - customtypes "github.com/classic-terra/core/v2/custom/slashing/types" + customtypes "github.com/classic-terra/core/v3/custom/slashing/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/staking/module.go b/custom/staking/module.go index 7364ff12b..86c589fb8 100644 --- a/custom/staking/module.go +++ b/custom/staking/module.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking/types" - customtypes "github.com/classic-terra/core/v2/custom/staking/types" - core "github.com/classic-terra/core/v2/types" + customtypes "github.com/classic-terra/core/v3/custom/staking/types" + core "github.com/classic-terra/core/v3/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/staking/module_test.go b/custom/staking/module_test.go index f6b0b8fc7..028c83f19 100644 --- a/custom/staking/module_test.go +++ b/custom/staking/module_test.go @@ -3,13 +3,14 @@ package staking_test import ( "testing" - apptesting "github.com/classic-terra/core/v2/app/testing" - "github.com/classic-terra/core/v2/types" - simapp "github.com/cosmos/cosmos-sdk/simapp" + "cosmossdk.io/math" + apptesting "github.com/classic-terra/core/v3/app/testing" + "github.com/classic-terra/core/v3/types" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" disttypes "github.com/cosmos/cosmos-sdk/x/distribution/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - teststaking "github.com/cosmos/cosmos-sdk/x/staking/teststaking" + "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/suite" ) @@ -22,7 +23,7 @@ func TestStakingTestSuite(t *testing.T) { suite.Run(t, new(StakingTestSuite)) } -// go test -v -run=TestStakingTestSuite/TestValidatorVPLimit github.com/classic-terra/core/v2/custom/staking +// go test -v -run=TestStakingTestSuite/TestValidatorVPLimit github.com/classic-terra/core/v3/custom/staking func (s *StakingTestSuite) TestValidatorVPLimit() { s.KeeperTestHelper.Setup(s.T(), types.ColumbusChainID) @@ -34,17 +35,17 @@ func (s *StakingTestSuite) TestValidatorVPLimit() { err := s.App.BankKeeper.DelegateCoinsFromAccountToModule(s.Ctx, addrDels[i], stakingtypes.NotBondedPoolName, sdk.NewCoins(sdk.NewInt64Coin("uluna", 1000000))) s.Require().NoError(err) } - valAddrs := simapp.ConvertAddrsToValAddrs(addrDels) - PKs := simapp.CreateTestPubKeys(num) + valAddrs := simtestutil.ConvertAddrsToValAddrs(addrDels) + PKs := simtestutil.CreateTestPubKeys(num) - var amts [9]sdk.Int + var amts [9]math.Int for i := range amts { amts[i] = sdk.NewInt(1000000) } var validators [9]stakingtypes.Validator for i, amt := range amts { - validators[i] = teststaking.NewValidator(s.T(), valAddrs[i], PKs[i]) + validators[i] = testutil.NewValidator(s.T(), valAddrs[i], PKs[i]) validators[i], _ = validators[i].AddTokensFromDel(amt) } diff --git a/custom/upgrade/module.go b/custom/upgrade/module.go index 5b6b77c94..dd43928dc 100644 --- a/custom/upgrade/module.go +++ b/custom/upgrade/module.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/upgrade" - customtypes "github.com/classic-terra/core/v2/custom/upgrade/types" + customtypes "github.com/classic-terra/core/v3/custom/upgrade/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/upgrade/types/codec.go b/custom/upgrade/types/codec.go index dd89300ea..bc63758e9 100644 --- a/custom/upgrade/types/codec.go +++ b/custom/upgrade/types/codec.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/x/upgrade/types" - govtypes "github.com/classic-terra/core/v2/custom/gov/types" + govtypes "github.com/classic-terra/core/v3/custom/gov/types" ) // RegisterLegacyAminoCodec registers concrete types on the LegacyAmino codec diff --git a/custom/wasm/client/cli/tx.go b/custom/wasm/client/cli/tx.go index c435ea6bf..66cb2dfea 100644 --- a/custom/wasm/client/cli/tx.go +++ b/custom/wasm/client/cli/tx.go @@ -18,7 +18,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/CosmWasm/wasmd/x/wasm/client/cli" - feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v3/custom/auth/client/utils" ) const ( @@ -66,7 +66,10 @@ func ExecuteContractCmd() *cobra.Command { } // Generate transaction factory for gas simulation - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } msg, err := parseExecuteArgs(args[0], args[1], clientCtx.GetFromAddress(), cmd.Flags()) if err != nil { @@ -128,7 +131,10 @@ $ %s tx wasm instantiate 1 '{"foo":"bar"}' --admin="$(%s keys show mykey -a)" \ } // Generate transaction factory for gas simulation - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } if !clientCtx.GenerateOnly && txf.Fees().IsZero() { // estimate tax and gas @@ -208,7 +214,10 @@ $ %s tx wasm instantiate2 1 '{"foo":"bar"}' $(echo -n "testing" | xxd -ps) --adm } // Generate transaction factory for gas simulation - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } if !clientCtx.GenerateOnly && txf.Fees().IsZero() { // estimate tax and gas diff --git a/custom/wasm/keeper/handler_plugin.go b/custom/wasm/keeper/handler_plugin.go index 192fee75e..f3a24801b 100644 --- a/custom/wasm/keeper/handler_plugin.go +++ b/custom/wasm/keeper/handler_plugin.go @@ -1,8 +1,8 @@ package keeper import ( - "github.com/classic-terra/core/v2/custom/auth/ante" - treasurykeeper "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v3/custom/auth/ante" + treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper" wasmvmtypes "github.com/CosmWasm/wasmvm/types" "github.com/cosmos/cosmos-sdk/baseapp" @@ -39,6 +39,7 @@ type SDKMessageHandler struct { func NewMessageHandler( router MessageRouter, + ics4Wrapper wasmtypes.ICS4Wrapper, channelKeeper wasmtypes.ChannelKeeper, capabilityKeeper wasmtypes.CapabilityKeeper, bankKeeper bankKeeper.Keeper, @@ -54,7 +55,7 @@ func NewMessageHandler( } return wasmkeeper.NewMessageHandlerChain( NewSDKMessageHandler(router, encoders, treasuryKeeper, accountKeeper, bankKeeper), - wasmkeeper.NewIBCRawPacketHandler(channelKeeper, capabilityKeeper), + wasmkeeper.NewIBCRawPacketHandler(ics4Wrapper, channelKeeper, capabilityKeeper), wasmkeeper.NewBurnCoinMessageHandler(bankKeeper), ) } diff --git a/custom/wasm/module.go b/custom/wasm/module.go index a12975f5f..6c4bbe7cd 100644 --- a/custom/wasm/module.go +++ b/custom/wasm/module.go @@ -11,8 +11,8 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/simulation" "github.com/CosmWasm/wasmd/x/wasm/types" - customcli "github.com/classic-terra/core/v2/custom/wasm/client/cli" - customtypes "github.com/classic-terra/core/v2/custom/wasm/types/legacy" + customcli "github.com/classic-terra/core/v3/custom/wasm/client/cli" + customtypes "github.com/classic-terra/core/v3/custom/wasm/types/legacy" ) var _ module.AppModuleBasic = AppModuleBasic{} @@ -38,7 +38,7 @@ type AppModule struct { wasm.AppModule appModuleBasic AppModuleBasic cdc codec.Codec - keeper *wasm.Keeper + keeper *keeper.Keeper validatorSetSource keeper.ValidatorSetSource accountKeeper types.AccountKeeper // for simulation bankKeeper simulation.BankKeeper @@ -47,7 +47,7 @@ type AppModule struct { // NewAppModule creates a new AppModule object func NewAppModule( cdc codec.Codec, - keeper *wasm.Keeper, + keeper *keeper.Keeper, validatorSetSource keeper.ValidatorSetSource, ak types.AccountKeeper, bk simulation.BankKeeper, diff --git a/custom/wasm/simulation/operations.go b/custom/wasm/simulation/operations.go index 495760d16..925e96f87 100644 --- a/custom/wasm/simulation/operations.go +++ b/custom/wasm/simulation/operations.go @@ -32,6 +32,7 @@ const ( // WasmKeeper is a subset of the wasm keeper used by simulations type WasmKeeper interface { GetParams(ctx sdk.Context) types.Params + GetAuthority() string IterateCodeInfos(ctx sdk.Context, cb func(uint64, types.CodeInfo) bool) IterateContractInfo(ctx sdk.Context, cb func(sdk.AccAddress, types.ContractInfo) bool) QuerySmart(ctx sdk.Context, contractAddr sdk.AccAddress, req []byte) ([]byte, error) @@ -109,7 +110,7 @@ func WeightedOperations( return simulation.WeightedOperations{ simulation.NewWeightedOperation( weightMsgStoreCode, - wasmsim.SimulateMsgStoreCode(ak, bk, wasmKeeper, wasmBz, 5_000_000), + wasmsim.SimulateMsgStoreCode(ak, bk, wasmKeeper, wasmBz), ), simulation.NewWeightedOperation( weightMsgInstantiateContract, diff --git a/custom/wasm/types/legacy/genesis.pb.go b/custom/wasm/types/legacy/genesis.pb.go index c99a6afa5..1d6abdebd 100644 --- a/custom/wasm/types/legacy/genesis.pb.go +++ b/custom/wasm/types/legacy/genesis.pb.go @@ -5,20 +5,17 @@ package legacy import ( fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -38,11 +35,9 @@ func (*Model) ProtoMessage() {} func (*Model) Descriptor() ([]byte, []int) { return fileDescriptor_bd15c5bc3571c951, []int{0} } - func (m *Model) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Model) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Model.Marshal(b, m, deterministic) @@ -55,15 +50,12 @@ func (m *Model) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Model) XXX_Merge(src proto.Message) { xxx_messageInfo_Model.Merge(m, src) } - func (m *Model) XXX_Size() int { return m.Size() } - func (m *Model) XXX_DiscardUnknown() { xxx_messageInfo_Model.DiscardUnknown(m) } @@ -96,11 +88,9 @@ func (*Code) ProtoMessage() {} func (*Code) Descriptor() ([]byte, []int) { return fileDescriptor_bd15c5bc3571c951, []int{1} } - func (m *Code) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Code) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Code.Marshal(b, m, deterministic) @@ -113,15 +103,12 @@ func (m *Code) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Code) XXX_Merge(src proto.Message) { xxx_messageInfo_Code.Merge(m, src) } - func (m *Code) XXX_Size() int { return m.Size() } - func (m *Code) XXX_DiscardUnknown() { xxx_messageInfo_Code.DiscardUnknown(m) } @@ -154,11 +141,9 @@ func (*Contract) ProtoMessage() {} func (*Contract) Descriptor() ([]byte, []int) { return fileDescriptor_bd15c5bc3571c951, []int{2} } - func (m *Contract) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Contract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Contract.Marshal(b, m, deterministic) @@ -171,15 +156,12 @@ func (m *Contract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Contract) XXX_Merge(src proto.Message) { xxx_messageInfo_Contract.Merge(m, src) } - func (m *Contract) XXX_Size() int { return m.Size() } - func (m *Contract) XXX_DiscardUnknown() { xxx_messageInfo_Contract.DiscardUnknown(m) } @@ -209,28 +191,28 @@ func init() { func init() { proto.RegisterFile("terra/wasm/v1beta1/genesis.proto", fileDescriptor_bd15c5bc3571c951) } var fileDescriptor_bd15c5bc3571c951 = []byte{ - // 336 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xcb, 0x4e, 0xf2, 0x40, - 0x14, 0x6e, 0x7f, 0xe0, 0x0f, 0x0e, 0x68, 0xcc, 0x84, 0x05, 0x92, 0x50, 0x49, 0x17, 0x86, 0x8d, - 0x9d, 0x80, 0x2b, 0xb7, 0x10, 0x4d, 0x4c, 0x74, 0x21, 0xec, 0xdc, 0x98, 0xe9, 0x70, 0xa8, 0x8d, - 0xa5, 0x87, 0xcc, 0x0c, 0x98, 0xbe, 0x85, 0x2f, 0xe1, 0xbb, 0xb0, 0x64, 0xe9, 0xca, 0x18, 0x78, - 0x11, 0x33, 0xd3, 0x86, 0x90, 0x48, 0xdc, 0x9d, 0xcb, 0x77, 0x39, 0x33, 0x1f, 0xe9, 0x68, 0x90, - 0x92, 0xb3, 0x37, 0xae, 0x66, 0x6c, 0xd9, 0x0b, 0x41, 0xf3, 0x1e, 0x8b, 0x20, 0x05, 0x15, 0xab, - 0x60, 0x2e, 0x51, 0x23, 0xa5, 0x16, 0x11, 0x18, 0x44, 0x50, 0x20, 0x5a, 0x8d, 0x08, 0x23, 0xb4, - 0x6b, 0x66, 0xaa, 0x1c, 0xd9, 0x6a, 0x1f, 0xd0, 0xb2, 0x34, 0xbb, 0xf6, 0x19, 0xa9, 0x3c, 0xe0, - 0x04, 0x12, 0x7a, 0x4a, 0x4a, 0xaf, 0x90, 0x35, 0xdd, 0x8e, 0xdb, 0xad, 0x8f, 0x4c, 0x49, 0x1b, - 0xa4, 0xb2, 0xe4, 0xc9, 0x02, 0x9a, 0xff, 0xec, 0x2c, 0x6f, 0xfc, 0x84, 0x94, 0x87, 0x38, 0x01, - 0x7a, 0x43, 0x8e, 0x04, 0x4e, 0xe0, 0x39, 0x4e, 0xa7, 0x68, 0x59, 0xb5, 0xbe, 0x1f, 0xfc, 0xbe, - 0x2a, 0xb8, 0x87, 0x88, 0x8b, 0xcc, 0x50, 0xee, 0xd2, 0x29, 0x0e, 0xca, 0xab, 0xaf, 0x73, 0x67, - 0x54, 0x15, 0x45, 0x4f, 0xdb, 0x84, 0x58, 0x99, 0x30, 0xd3, 0xa0, 0x0a, 0x27, 0x2b, 0x3c, 0x30, - 0x03, 0xff, 0xc3, 0x25, 0xd5, 0x21, 0xa6, 0x5a, 0x72, 0xa1, 0xe9, 0x23, 0x39, 0x16, 0x45, 0xbd, - 0x6f, 0x7b, 0xf1, 0x97, 0x6d, 0x0e, 0xdf, 0xb3, 0xae, 0x8b, 0xbd, 0x19, 0xbd, 0x25, 0x27, 0x3b, - 0x49, 0xa5, 0x51, 0x9a, 0xc7, 0x96, 0xba, 0xb5, 0xfe, 0xd9, 0x21, 0x4d, 0xfb, 0x51, 0x85, 0xcc, - 0xee, 0x92, 0xb1, 0x61, 0x0d, 0xc6, 0xab, 0x8d, 0xe7, 0xae, 0x37, 0x9e, 0xfb, 0xbd, 0xf1, 0xdc, - 0xf7, 0xad, 0xe7, 0xac, 0xb7, 0x9e, 0xf3, 0xb9, 0xf5, 0x9c, 0xa7, 0xeb, 0x28, 0xd6, 0x2f, 0x8b, - 0x30, 0x10, 0x38, 0x63, 0x22, 0xe1, 0x4a, 0xc5, 0xe2, 0x32, 0x8f, 0x44, 0xa0, 0x04, 0xb6, 0xec, - 0x33, 0xb1, 0x50, 0x1a, 0x67, 0x79, 0x42, 0x3a, 0x9b, 0x83, 0x62, 0x89, 0x3d, 0x3e, 0xfc, 0x6f, - 0x23, 0xba, 0xfa, 0x09, 0x00, 0x00, 0xff, 0xff, 0x21, 0x1c, 0x42, 0xea, 0x0f, 0x02, 0x00, 0x00, + // 335 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xbf, 0x4e, 0xc2, 0x40, + 0x18, 0x6f, 0x05, 0x0c, 0x1e, 0x68, 0xcc, 0x85, 0x01, 0x49, 0xa8, 0xa4, 0x83, 0x61, 0xb1, 0x17, + 0x60, 0x72, 0x85, 0x68, 0x62, 0xa2, 0x83, 0xb0, 0xb9, 0x98, 0xeb, 0xf1, 0x51, 0x1b, 0x4b, 0x3f, + 0xd2, 0x3b, 0x30, 0x7d, 0x0b, 0x5f, 0xc2, 0x77, 0x61, 0x64, 0x74, 0x32, 0x06, 0x5e, 0xc4, 0xdc, + 0xb5, 0x21, 0x4d, 0x24, 0x6e, 0xdf, 0x9f, 0xdf, 0x9f, 0xef, 0xee, 0x47, 0x3a, 0x0a, 0x92, 0x84, + 0xb3, 0x77, 0x2e, 0xe7, 0x6c, 0xd5, 0xf3, 0x41, 0xf1, 0x1e, 0x0b, 0x20, 0x06, 0x19, 0x4a, 0x6f, + 0x91, 0xa0, 0x42, 0x4a, 0x0d, 0xc2, 0xd3, 0x08, 0x2f, 0x47, 0xb4, 0x1a, 0x01, 0x06, 0x68, 0xd6, + 0x4c, 0x57, 0x19, 0xb2, 0xd5, 0x3e, 0xa0, 0x65, 0x68, 0x66, 0xed, 0x32, 0x52, 0x79, 0xc4, 0x29, + 0x44, 0xf4, 0x9c, 0x94, 0xde, 0x20, 0x6d, 0xda, 0x1d, 0xbb, 0x5b, 0x1f, 0xeb, 0x92, 0x36, 0x48, + 0x65, 0xc5, 0xa3, 0x25, 0x34, 0x8f, 0xcc, 0x2c, 0x6b, 0xdc, 0x88, 0x94, 0x47, 0x38, 0x05, 0x7a, + 0x4b, 0x4e, 0x04, 0x4e, 0xe1, 0x25, 0x8c, 0x67, 0x68, 0x58, 0xb5, 0xbe, 0xeb, 0xfd, 0xbd, 0xca, + 0x7b, 0x80, 0x80, 0x8b, 0x54, 0x53, 0xee, 0xe3, 0x19, 0x0e, 0xcb, 0xeb, 0xef, 0x4b, 0x6b, 0x5c, + 0x15, 0x79, 0x4f, 0xdb, 0x84, 0x18, 0x19, 0x3f, 0x55, 0x20, 0x73, 0x27, 0x23, 0x3c, 0xd4, 0x03, + 0xf7, 0xd3, 0x26, 0xd5, 0x11, 0xc6, 0x2a, 0xe1, 0x42, 0xd1, 0x27, 0x72, 0x2a, 0xf2, 0xba, 0x68, + 0x7b, 0xf5, 0x9f, 0x6d, 0x06, 0x2f, 0x58, 0xd7, 0x45, 0x61, 0x46, 0xef, 0xc8, 0xd9, 0x5e, 0x52, + 0x2a, 0x4c, 0xf4, 0x63, 0x4b, 0xdd, 0x5a, 0xff, 0xe2, 0x90, 0xa6, 0xf9, 0xa8, 0x5c, 0x66, 0x7f, + 0xc9, 0x44, 0xb3, 0x86, 0x93, 0xf5, 0xd6, 0xb1, 0x37, 0x5b, 0xc7, 0xfe, 0xd9, 0x3a, 0xf6, 0xc7, + 0xce, 0xb1, 0x36, 0x3b, 0xc7, 0xfa, 0xda, 0x39, 0xd6, 0xf3, 0x4d, 0x10, 0xaa, 0xd7, 0xa5, 0xef, + 0x09, 0x9c, 0x33, 0x11, 0x71, 0x29, 0x43, 0x71, 0x9d, 0x45, 0x22, 0x30, 0x01, 0xb6, 0x1a, 0x30, + 0xb1, 0x94, 0x0a, 0xe7, 0x59, 0x42, 0x2a, 0x5d, 0x80, 0x64, 0x91, 0x39, 0xde, 0x3f, 0x36, 0x11, + 0x0d, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x17, 0x4d, 0xc0, 0xce, 0x0f, 0x02, 0x00, 0x00, } func (m *Model) Marshal() (dAtA []byte, err error) { @@ -368,7 +350,6 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *Model) Size() (n int) { if m == nil { return 0 @@ -421,11 +402,9 @@ func (m *Contract) Size() (n int) { func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozGenesis(x uint64) (n int) { return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *Model) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -544,7 +523,6 @@ func (m *Model) Unmarshal(dAtA []byte) error { } return nil } - func (m *Code) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -662,7 +640,6 @@ func (m *Code) Unmarshal(dAtA []byte) error { } return nil } - func (m *Contract) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -780,7 +757,6 @@ func (m *Contract) Unmarshal(dAtA []byte) error { } return nil } - func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/custom/wasm/types/legacy/msgs.go b/custom/wasm/types/legacy/msgs.go index e6b5879d9..d95786c3d 100644 --- a/custom/wasm/types/legacy/msgs.go +++ b/custom/wasm/types/legacy/msgs.go @@ -3,10 +3,11 @@ package legacy import ( "encoding/json" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - wasm "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" ) // ensure Msg interface compliance at compile time @@ -47,7 +48,7 @@ func NewMsgStoreCode(sender sdk.AccAddress, wasmByteCode []byte) *MsgStoreCode { } // Route implements sdk.Msg -func (msg MsgStoreCode) Route() string { return wasm.RouterKey } +func (msg MsgStoreCode) Route() string { return wasmtypes.RouterKey } // Type implements sdk.Msg func (msg MsgStoreCode) Type() string { return TypeMsgStoreCode } @@ -71,15 +72,15 @@ func (msg MsgStoreCode) GetSigners() []sdk.AccAddress { func (msg MsgStoreCode) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } if len(msg.WASMByteCode) == 0 { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "empty wasm code") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "empty wasm code") } if uint64(len(msg.WASMByteCode)) > EnforcedMaxContractSize { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "wasm code too large") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "wasm code too large") } return nil @@ -96,7 +97,7 @@ func NewMsgMigrateCode(codeID uint64, sender sdk.AccAddress, wasmByteCode []byte } // Route implements sdk.Msg -func (msg MsgMigrateCode) Route() string { return wasm.RouterKey } +func (msg MsgMigrateCode) Route() string { return wasmtypes.RouterKey } // Type implements sdk.Msg func (msg MsgMigrateCode) Type() string { return TypeMsgMigrateCode } @@ -120,15 +121,15 @@ func (msg MsgMigrateCode) GetSigners() []sdk.AccAddress { func (msg MsgMigrateCode) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } if len(msg.WASMByteCode) == 0 { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "empty wasm code") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "empty wasm code") } if uint64(len(msg.WASMByteCode)) > EnforcedMaxContractSize { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "wasm code too large") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "wasm code too large") } return nil @@ -152,7 +153,7 @@ func NewMsgInstantiateContract(sender, admin sdk.AccAddress, codeID uint64, init // Route implements sdk.Msg func (msg MsgInstantiateContract) Route() string { - return wasm.RouterKey + return wasmtypes.RouterKey } // Type implements sdk.Msg @@ -164,26 +165,26 @@ func (msg MsgInstantiateContract) Type() string { func (msg MsgInstantiateContract) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } if len(msg.Admin) != 0 { _, err := sdk.AccAddressFromBech32(msg.Admin) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid admin address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid admin address (%s)", err) } } if !msg.InitCoins.IsValid() { - return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.InitCoins.String()) + return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, msg.InitCoins.String()) } if uint64(len(msg.InitMsg)) > EnforcedMaxContractMsgSize { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte size is too huge") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte size is too huge") } if !json.Valid(msg.InitMsg) { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte format is invalid json") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte format is invalid json") } return nil @@ -216,7 +217,7 @@ func NewMsgExecuteContract(sender sdk.AccAddress, contract sdk.AccAddress, execM // Route implements sdk.Msg func (msg MsgExecuteContract) Route() string { - return wasm.RouterKey + return wasmtypes.RouterKey } // Type implements sdk.Msg @@ -228,24 +229,24 @@ func (msg MsgExecuteContract) Type() string { func (msg MsgExecuteContract) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Sender) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Contract) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid contract address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid contract address (%s)", err) } if !msg.Coins.IsValid() { - return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.Coins.String()) + return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, msg.Coins.String()) } if uint64(len(msg.ExecuteMsg)) > EnforcedMaxContractMsgSize { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte size is too huge") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte size is too huge") } if !json.Valid(msg.ExecuteMsg) { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte format is invalid json") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte format is invalid json") } return nil @@ -278,7 +279,7 @@ func NewMsgMigrateContract(admin, contract sdk.AccAddress, newCodeID uint64, mig // Route implements sdk.Msg func (msg MsgMigrateContract) Route() string { - return wasm.RouterKey + return wasmtypes.RouterKey } // Type implements sdk.Msg @@ -289,25 +290,25 @@ func (msg MsgMigrateContract) Type() string { // ValidateBasic implements sdk.Msg func (msg MsgMigrateContract) ValidateBasic() error { if msg.NewCodeID == 0 { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "missing new_code_id") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "missing new_code_id") } _, err := sdk.AccAddressFromBech32(msg.Admin) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid admin address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid admin address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Contract) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid contract address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid contract address (%s)", err) } if uint64(len(msg.MigrateMsg)) > EnforcedMaxContractMsgSize { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte size is too huge") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte size is too huge") } if !json.Valid(msg.MigrateMsg) { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte format is invalid json") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "wasm msg byte format is invalid json") } return nil @@ -339,7 +340,7 @@ func NewMsgUpdateContractAdmin(admin, newAdmin, contract sdk.AccAddress) *MsgUpd // Route implements sdk.Msg func (msg MsgUpdateContractAdmin) Route() string { - return wasm.RouterKey + return wasmtypes.RouterKey } // Type implements sdk.Msg @@ -351,17 +352,17 @@ func (msg MsgUpdateContractAdmin) Type() string { func (msg MsgUpdateContractAdmin) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Admin) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid admin address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid admin address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.NewAdmin) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid new admin address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid new admin address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Contract) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid contract address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid contract address (%s)", err) } return nil @@ -391,7 +392,7 @@ func NewMsgClearContractAdmin(admin, contract sdk.AccAddress) *MsgClearContractA // Route implements sdk.Msg func (msg MsgClearContractAdmin) Route() string { - return wasm.RouterKey + return wasmtypes.RouterKey } // Type implements sdk.Msg @@ -403,12 +404,12 @@ func (msg MsgClearContractAdmin) Type() string { func (msg MsgClearContractAdmin) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Admin) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid owner address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid owner address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Contract) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid contract address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid contract address (%s)", err) } return nil diff --git a/custom/wasm/types/legacy/tx.pb.go b/custom/wasm/types/legacy/tx.pb.go index 023ace758..46aec15c8 100644 --- a/custom/wasm/types/legacy/tx.pb.go +++ b/custom/wasm/types/legacy/tx.pb.go @@ -7,26 +7,23 @@ import ( context "context" encoding_json "encoding/json" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -49,11 +46,9 @@ func (*MsgStoreCode) ProtoMessage() {} func (*MsgStoreCode) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{0} } - func (m *MsgStoreCode) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgStoreCode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgStoreCode.Marshal(b, m, deterministic) @@ -66,15 +61,12 @@ func (m *MsgStoreCode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } - func (m *MsgStoreCode) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgStoreCode.Merge(m, src) } - func (m *MsgStoreCode) XXX_Size() int { return m.Size() } - func (m *MsgStoreCode) XXX_DiscardUnknown() { xxx_messageInfo_MsgStoreCode.DiscardUnknown(m) } @@ -93,11 +85,9 @@ func (*MsgStoreCodeResponse) ProtoMessage() {} func (*MsgStoreCodeResponse) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{1} } - func (m *MsgStoreCodeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgStoreCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgStoreCodeResponse.Marshal(b, m, deterministic) @@ -110,15 +100,12 @@ func (m *MsgStoreCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } - func (m *MsgStoreCodeResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgStoreCodeResponse.Merge(m, src) } - func (m *MsgStoreCodeResponse) XXX_Size() int { return m.Size() } - func (m *MsgStoreCodeResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgStoreCodeResponse.DiscardUnknown(m) } @@ -149,11 +136,9 @@ func (*MsgMigrateCode) ProtoMessage() {} func (*MsgMigrateCode) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{2} } - func (m *MsgMigrateCode) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgMigrateCode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgMigrateCode.Marshal(b, m, deterministic) @@ -166,15 +151,12 @@ func (m *MsgMigrateCode) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return b[:n], nil } } - func (m *MsgMigrateCode) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgMigrateCode.Merge(m, src) } - func (m *MsgMigrateCode) XXX_Size() int { return m.Size() } - func (m *MsgMigrateCode) XXX_DiscardUnknown() { xxx_messageInfo_MsgMigrateCode.DiscardUnknown(m) } @@ -182,7 +164,8 @@ func (m *MsgMigrateCode) XXX_DiscardUnknown() { var xxx_messageInfo_MsgMigrateCode proto.InternalMessageInfo // MsgMigrateCodeResponse defines the Msg/MigrateCode response type. -type MsgMigrateCodeResponse struct{} +type MsgMigrateCodeResponse struct { +} func (m *MsgMigrateCodeResponse) Reset() { *m = MsgMigrateCodeResponse{} } func (m *MsgMigrateCodeResponse) String() string { return proto.CompactTextString(m) } @@ -190,11 +173,9 @@ func (*MsgMigrateCodeResponse) ProtoMessage() {} func (*MsgMigrateCodeResponse) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{3} } - func (m *MsgMigrateCodeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgMigrateCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgMigrateCodeResponse.Marshal(b, m, deterministic) @@ -207,15 +188,12 @@ func (m *MsgMigrateCodeResponse) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } - func (m *MsgMigrateCodeResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgMigrateCodeResponse.Merge(m, src) } - func (m *MsgMigrateCodeResponse) XXX_Size() int { return m.Size() } - func (m *MsgMigrateCodeResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgMigrateCodeResponse.DiscardUnknown(m) } @@ -244,11 +222,9 @@ func (*MsgInstantiateContract) ProtoMessage() {} func (*MsgInstantiateContract) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{4} } - func (m *MsgInstantiateContract) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgInstantiateContract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgInstantiateContract.Marshal(b, m, deterministic) @@ -261,15 +237,12 @@ func (m *MsgInstantiateContract) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } - func (m *MsgInstantiateContract) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgInstantiateContract.Merge(m, src) } - func (m *MsgInstantiateContract) XXX_Size() int { return m.Size() } - func (m *MsgInstantiateContract) XXX_DiscardUnknown() { xxx_messageInfo_MsgInstantiateContract.DiscardUnknown(m) } @@ -290,11 +263,9 @@ func (*MsgInstantiateContractResponse) ProtoMessage() {} func (*MsgInstantiateContractResponse) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{5} } - func (m *MsgInstantiateContractResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgInstantiateContractResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgInstantiateContractResponse.Marshal(b, m, deterministic) @@ -307,15 +278,12 @@ func (m *MsgInstantiateContractResponse) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } - func (m *MsgInstantiateContractResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgInstantiateContractResponse.Merge(m, src) } - func (m *MsgInstantiateContractResponse) XXX_Size() int { return m.Size() } - func (m *MsgInstantiateContractResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgInstantiateContractResponse.DiscardUnknown(m) } @@ -355,11 +323,9 @@ func (*MsgExecuteContract) ProtoMessage() {} func (*MsgExecuteContract) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{6} } - func (m *MsgExecuteContract) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgExecuteContract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgExecuteContract.Marshal(b, m, deterministic) @@ -372,15 +338,12 @@ func (m *MsgExecuteContract) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *MsgExecuteContract) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgExecuteContract.Merge(m, src) } - func (m *MsgExecuteContract) XXX_Size() int { return m.Size() } - func (m *MsgExecuteContract) XXX_DiscardUnknown() { xxx_messageInfo_MsgExecuteContract.DiscardUnknown(m) } @@ -399,11 +362,9 @@ func (*MsgExecuteContractResponse) ProtoMessage() {} func (*MsgExecuteContractResponse) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{7} } - func (m *MsgExecuteContractResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgExecuteContractResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgExecuteContractResponse.Marshal(b, m, deterministic) @@ -416,15 +377,12 @@ func (m *MsgExecuteContractResponse) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } - func (m *MsgExecuteContractResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgExecuteContractResponse.Merge(m, src) } - func (m *MsgExecuteContractResponse) XXX_Size() int { return m.Size() } - func (m *MsgExecuteContractResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgExecuteContractResponse.DiscardUnknown(m) } @@ -457,11 +415,9 @@ func (*MsgMigrateContract) ProtoMessage() {} func (*MsgMigrateContract) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{8} } - func (m *MsgMigrateContract) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgMigrateContract) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgMigrateContract.Marshal(b, m, deterministic) @@ -474,15 +430,12 @@ func (m *MsgMigrateContract) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *MsgMigrateContract) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgMigrateContract.Merge(m, src) } - func (m *MsgMigrateContract) XXX_Size() int { return m.Size() } - func (m *MsgMigrateContract) XXX_DiscardUnknown() { xxx_messageInfo_MsgMigrateContract.DiscardUnknown(m) } @@ -501,11 +454,9 @@ func (*MsgMigrateContractResponse) ProtoMessage() {} func (*MsgMigrateContractResponse) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{9} } - func (m *MsgMigrateContractResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgMigrateContractResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgMigrateContractResponse.Marshal(b, m, deterministic) @@ -518,15 +469,12 @@ func (m *MsgMigrateContractResponse) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } - func (m *MsgMigrateContractResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgMigrateContractResponse.Merge(m, src) } - func (m *MsgMigrateContractResponse) XXX_Size() int { return m.Size() } - func (m *MsgMigrateContractResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgMigrateContractResponse.DiscardUnknown(m) } @@ -557,11 +505,9 @@ func (*MsgUpdateContractAdmin) ProtoMessage() {} func (*MsgUpdateContractAdmin) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{10} } - func (m *MsgUpdateContractAdmin) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgUpdateContractAdmin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgUpdateContractAdmin.Marshal(b, m, deterministic) @@ -574,15 +520,12 @@ func (m *MsgUpdateContractAdmin) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } - func (m *MsgUpdateContractAdmin) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgUpdateContractAdmin.Merge(m, src) } - func (m *MsgUpdateContractAdmin) XXX_Size() int { return m.Size() } - func (m *MsgUpdateContractAdmin) XXX_DiscardUnknown() { xxx_messageInfo_MsgUpdateContractAdmin.DiscardUnknown(m) } @@ -590,7 +533,8 @@ func (m *MsgUpdateContractAdmin) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateContractAdmin proto.InternalMessageInfo // MsgUpdateContractAdminResponse defines the Msg/UpdateContractAdmin response type. -type MsgUpdateContractAdminResponse struct{} +type MsgUpdateContractAdminResponse struct { +} func (m *MsgUpdateContractAdminResponse) Reset() { *m = MsgUpdateContractAdminResponse{} } func (m *MsgUpdateContractAdminResponse) String() string { return proto.CompactTextString(m) } @@ -598,11 +542,9 @@ func (*MsgUpdateContractAdminResponse) ProtoMessage() {} func (*MsgUpdateContractAdminResponse) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{11} } - func (m *MsgUpdateContractAdminResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgUpdateContractAdminResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgUpdateContractAdminResponse.Marshal(b, m, deterministic) @@ -615,15 +557,12 @@ func (m *MsgUpdateContractAdminResponse) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } - func (m *MsgUpdateContractAdminResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgUpdateContractAdminResponse.Merge(m, src) } - func (m *MsgUpdateContractAdminResponse) XXX_Size() int { return m.Size() } - func (m *MsgUpdateContractAdminResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgUpdateContractAdminResponse.DiscardUnknown(m) } @@ -645,11 +584,9 @@ func (*MsgClearContractAdmin) ProtoMessage() {} func (*MsgClearContractAdmin) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{12} } - func (m *MsgClearContractAdmin) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgClearContractAdmin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgClearContractAdmin.Marshal(b, m, deterministic) @@ -662,15 +599,12 @@ func (m *MsgClearContractAdmin) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } - func (m *MsgClearContractAdmin) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgClearContractAdmin.Merge(m, src) } - func (m *MsgClearContractAdmin) XXX_Size() int { return m.Size() } - func (m *MsgClearContractAdmin) XXX_DiscardUnknown() { xxx_messageInfo_MsgClearContractAdmin.DiscardUnknown(m) } @@ -678,7 +612,8 @@ func (m *MsgClearContractAdmin) XXX_DiscardUnknown() { var xxx_messageInfo_MsgClearContractAdmin proto.InternalMessageInfo // MsgClearContractAdminResponse defines the Msg/ClearContractAdmin response type. -type MsgClearContractAdminResponse struct{} +type MsgClearContractAdminResponse struct { +} func (m *MsgClearContractAdminResponse) Reset() { *m = MsgClearContractAdminResponse{} } func (m *MsgClearContractAdminResponse) String() string { return proto.CompactTextString(m) } @@ -686,11 +621,9 @@ func (*MsgClearContractAdminResponse) ProtoMessage() {} func (*MsgClearContractAdminResponse) Descriptor() ([]byte, []int) { return fileDescriptor_5834e4e1a84cce82, []int{13} } - func (m *MsgClearContractAdminResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgClearContractAdminResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgClearContractAdminResponse.Marshal(b, m, deterministic) @@ -703,15 +636,12 @@ func (m *MsgClearContractAdminResponse) XXX_Marshal(b []byte, deterministic bool return b[:n], nil } } - func (m *MsgClearContractAdminResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgClearContractAdminResponse.Merge(m, src) } - func (m *MsgClearContractAdminResponse) XXX_Size() int { return m.Size() } - func (m *MsgClearContractAdminResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgClearContractAdminResponse.DiscardUnknown(m) } @@ -738,74 +668,72 @@ func init() { func init() { proto.RegisterFile("terra/wasm/v1beta1/tx.proto", fileDescriptor_5834e4e1a84cce82) } var fileDescriptor_5834e4e1a84cce82 = []byte{ - // 960 bytes of a gzipped FileDescriptorProto + // 959 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6f, 0xe3, 0x44, 0x14, 0x8e, 0x9b, 0xb6, 0xdb, 0x4c, 0x42, 0xdb, 0x75, 0xbb, 0x10, 0xb2, 0x90, 0x89, 0x66, 0xa5, - 0x55, 0x8a, 0xb4, 0xb6, 0x1a, 0xc4, 0x81, 0x3d, 0x91, 0x94, 0x45, 0x2a, 0x92, 0x41, 0x72, 0x85, - 0x56, 0x42, 0x42, 0xd1, 0xc4, 0x1e, 0x19, 0x43, 0xe3, 0x29, 0x1e, 0x67, 0xb3, 0xe1, 0xc2, 0x95, - 0x0b, 0x12, 0x48, 0xfc, 0x01, 0x7b, 0xe6, 0xc0, 0x1f, 0xc1, 0x69, 0x2f, 0x48, 0x3d, 0x72, 0x32, - 0x28, 0xbd, 0x70, 0xb6, 0xc4, 0x01, 0x4e, 0xc8, 0x33, 0x63, 0x77, 0xda, 0x38, 0x4d, 0x52, 0xed, - 0xc9, 0xd6, 0xbc, 0xef, 0xfd, 0x98, 0xef, 0x7b, 0x6f, 0x66, 0xc0, 0xfd, 0x88, 0x84, 0x21, 0x36, - 0xc7, 0x98, 0x0d, 0xcd, 0x67, 0x87, 0x03, 0x12, 0xe1, 0x43, 0x33, 0x7a, 0x6e, 0x9c, 0x85, 0x34, - 0xa2, 0xba, 0xce, 0x8d, 0x46, 0x6a, 0x34, 0xa4, 0xb1, 0xb1, 0xef, 0x51, 0x8f, 0x72, 0xb3, 0x99, - 0xfe, 0x09, 0x64, 0xa3, 0xe9, 0x50, 0x36, 0xa4, 0xcc, 0x1c, 0x60, 0x46, 0xf2, 0x38, 0x0e, 0xf5, - 0x03, 0x61, 0x47, 0x3f, 0x6b, 0xa0, 0x66, 0x31, 0xef, 0x24, 0xa2, 0x21, 0x39, 0xa2, 0x2e, 0xd1, - 0x0f, 0xc0, 0x26, 0x23, 0x81, 0x4b, 0xc2, 0xba, 0xd6, 0xd2, 0xda, 0x95, 0xde, 0xdd, 0x24, 0x86, - 0xaf, 0x4d, 0xf0, 0xf0, 0xf4, 0x31, 0x12, 0xeb, 0xc8, 0x96, 0x00, 0xfd, 0x53, 0xb0, 0x9d, 0x56, - 0xd0, 0x1f, 0x4c, 0x22, 0xd2, 0x77, 0xa8, 0x4b, 0xea, 0x6b, 0x2d, 0xad, 0x5d, 0xeb, 0x1d, 0x4c, - 0x63, 0x58, 0x7b, 0xda, 0x3d, 0xb1, 0x7a, 0x93, 0x88, 0x07, 0x4d, 0x62, 0x78, 0x4f, 0x84, 0xb8, - 0x8a, 0x47, 0x76, 0x2d, 0x5d, 0xc8, 0x60, 0x8f, 0xb7, 0xbe, 0x7f, 0x01, 0x4b, 0x7f, 0xbf, 0x80, - 0x25, 0x64, 0x81, 0x7d, 0xb5, 0x2a, 0x9b, 0xb0, 0x33, 0x1a, 0x30, 0xa2, 0xbf, 0x07, 0xee, 0xa4, - 0x8e, 0x7d, 0xdf, 0xe5, 0xe5, 0xad, 0xf7, 0xde, 0x9a, 0xc6, 0x70, 0x33, 0x85, 0x1c, 0x7f, 0x98, - 0xc4, 0x70, 0x5b, 0x64, 0x91, 0x10, 0x64, 0x6f, 0xa6, 0x7f, 0xc7, 0x2e, 0xfa, 0x5d, 0x03, 0xdb, - 0x16, 0xf3, 0x2c, 0xdf, 0x0b, 0xb1, 0xc8, 0x75, 0xcb, 0x48, 0x0a, 0x3d, 0x6b, 0xab, 0xd3, 0x53, - 0x7e, 0x55, 0xf4, 0xd4, 0xc1, 0xeb, 0x57, 0xb7, 0x93, 0x11, 0x84, 0xfe, 0x5d, 0xe3, 0xa6, 0xe3, - 0x80, 0x45, 0x38, 0x88, 0x7c, 0x6e, 0x0e, 0xa2, 0x10, 0x3b, 0xd1, 0x2a, 0xca, 0x3e, 0x04, 0x1b, - 0xd8, 0x1d, 0xfa, 0x81, 0xdc, 0xe4, 0x6e, 0x12, 0xc3, 0x9a, 0x40, 0xf2, 0x65, 0x64, 0x0b, 0xb3, - 0x4a, 0x62, 0x79, 0x05, 0x12, 0x3f, 0x06, 0x5b, 0x7e, 0xe0, 0x47, 0xfd, 0x21, 0xf3, 0xea, 0xeb, - 0x9c, 0x13, 0x33, 0x89, 0xe1, 0x8e, 0x40, 0x67, 0x16, 0xf4, 0x5f, 0x0c, 0xeb, 0x24, 0x70, 0xa8, - 0xeb, 0x07, 0x9e, 0xf9, 0x15, 0xa3, 0x81, 0x61, 0xe3, 0xb1, 0x45, 0x18, 0xc3, 0x1e, 0xb1, 0xef, - 0xa4, 0x30, 0x8b, 0x79, 0xfa, 0x77, 0x00, 0x70, 0x8f, 0xb4, 0xa7, 0x59, 0x7d, 0xa3, 0x55, 0x6e, - 0x57, 0x3b, 0x6f, 0x1a, 0xa2, 0xeb, 0x8d, 0xb4, 0xeb, 0xb3, 0x01, 0x31, 0x8e, 0xa8, 0x1f, 0xf4, - 0x9e, 0xbc, 0x8c, 0x61, 0x29, 0x89, 0xe1, 0x5d, 0x25, 0x19, 0x77, 0x45, 0xbf, 0xfc, 0x09, 0xdb, - 0x9e, 0x1f, 0x7d, 0x39, 0x1a, 0x18, 0x0e, 0x1d, 0x9a, 0x72, 0x6e, 0xc4, 0xe7, 0x11, 0x73, 0xbf, - 0x36, 0xa3, 0xc9, 0x19, 0x61, 0x3c, 0x0a, 0xb3, 0x2b, 0xa9, 0x23, 0xff, 0x55, 0x54, 0xf9, 0x41, - 0x03, 0xcd, 0x62, 0xee, 0xf3, 0xfe, 0xfd, 0x08, 0xec, 0x3a, 0x72, 0xad, 0x8f, 0x5d, 0x37, 0x24, - 0x8c, 0x49, 0x35, 0xee, 0x27, 0x31, 0x7c, 0x23, 0xe3, 0xeb, 0x2a, 0x02, 0xd9, 0x3b, 0xd9, 0x52, - 0x57, 0xac, 0xe8, 0x0f, 0xc0, 0xba, 0x8b, 0x23, 0x2c, 0x07, 0x6e, 0x27, 0x89, 0x61, 0x55, 0xf8, - 0xa6, 0xab, 0xc8, 0xe6, 0x46, 0xf4, 0xdb, 0x1a, 0xd0, 0x2d, 0xe6, 0x3d, 0x79, 0x4e, 0x9c, 0xd1, - 0xed, 0xfa, 0xc0, 0x04, 0x5b, 0x59, 0x66, 0xd9, 0x0a, 0x7b, 0x97, 0x42, 0x65, 0x16, 0x64, 0xe7, - 0x20, 0xfd, 0x04, 0x54, 0x89, 0x48, 0xc7, 0xc5, 0x15, 0x0d, 0xdf, 0x49, 0x62, 0xa8, 0x0b, 0x1f, - 0xc5, 0x78, 0xb3, 0xbe, 0x40, 0x22, 0x53, 0x89, 0xbf, 0x01, 0x1b, 0x4b, 0xaa, 0xfb, 0x81, 0x54, - 0xb7, 0x96, 0x55, 0xb8, 0xb2, 0xb0, 0x22, 0x93, 0x22, 0x6a, 0x17, 0x34, 0x66, 0x39, 0xcc, 0xf5, - 0xcc, 0x74, 0xd0, 0x6e, 0xd2, 0xe1, 0x27, 0xa1, 0x43, 0x3e, 0xae, 0x92, 0xab, 0x7c, 0xc8, 0xb4, - 0x9b, 0x87, 0x6c, 0x65, 0x11, 0x8e, 0x40, 0x35, 0x20, 0xe3, 0xfe, 0xd5, 0xc9, 0x7c, 0x30, 0x8d, - 0x61, 0xe5, 0x13, 0x32, 0xce, 0x87, 0x53, 0x2a, 0xa2, 0x20, 0x91, 0x5d, 0x09, 0x24, 0xc0, 0x4d, - 0x95, 0x1c, 0x8a, 0x82, 0x95, 0x31, 0x55, 0x94, 0x54, 0x8c, 0x0b, 0x94, 0x94, 0x48, 0x8b, 0x79, - 0x33, 0xb4, 0x5e, 0xa3, 0x64, 0x35, 0x5a, 0x7f, 0xd5, 0xf8, 0x51, 0xf7, 0xd9, 0x99, 0xab, 0x84, - 0xe8, 0x72, 0xca, 0x96, 0xa5, 0xf6, 0x10, 0xa4, 0x3b, 0xee, 0xab, 0x67, 0xdd, 0x7e, 0x12, 0xc3, - 0xdd, 0x4b, 0x6a, 0x24, 0x7e, 0x2b, 0x20, 0xe3, 0xee, 0x8c, 0x1a, 0xe5, 0x25, 0xd4, 0x50, 0xf6, - 0xdc, 0xe2, 0xc7, 0x43, 0x41, 0xbd, 0xf9, 0xe9, 0xfd, 0x2d, 0xb8, 0x67, 0x31, 0xef, 0xe8, 0x94, - 0xe0, 0xf0, 0x76, 0x1b, 0x5a, 0xb5, 0x57, 0x94, 0xea, 0x20, 0x78, 0xbb, 0x30, 0x77, 0x56, 0x5c, - 0xe7, 0x9f, 0x0d, 0x50, 0x4e, 0xc7, 0xf1, 0x29, 0xa8, 0x5c, 0x3e, 0x17, 0x5a, 0xc6, 0xec, 0x53, - 0xc4, 0x50, 0xaf, 0xee, 0x46, 0x7b, 0x11, 0x22, 0x57, 0xfd, 0x0b, 0x50, 0x55, 0x6f, 0x68, 0x34, - 0xc7, 0x51, 0xc1, 0x34, 0xde, 0x59, 0x8c, 0xc9, 0xc3, 0x8f, 0xc0, 0x5e, 0xd1, 0xb5, 0x38, 0x2f, - 0x44, 0x01, 0xb6, 0xd1, 0x59, 0x1e, 0x9b, 0xa7, 0xf5, 0xc1, 0xce, 0xf5, 0x13, 0xf8, 0xe1, 0x9c, - 0x30, 0xd7, 0x70, 0x0d, 0x63, 0x39, 0x9c, 0x9a, 0x6a, 0xe6, 0x90, 0x59, 0x44, 0xd0, 0x82, 0x54, - 0xf3, 0x26, 0x74, 0x04, 0xf6, 0x8a, 0x06, 0x6f, 0x1e, 0x99, 0x05, 0xd8, 0xb9, 0x64, 0xde, 0x30, - 0x20, 0x7a, 0x08, 0xf4, 0x82, 0xe9, 0x38, 0x98, 0x13, 0x69, 0x16, 0xda, 0x38, 0x5c, 0x1a, 0x9a, - 0xe5, 0xec, 0x9d, 0xbc, 0x9c, 0x36, 0xb5, 0xf3, 0x69, 0x53, 0xfb, 0x6b, 0xda, 0xd4, 0x7e, 0xbc, - 0x68, 0x96, 0xce, 0x2f, 0x9a, 0xa5, 0x3f, 0x2e, 0x9a, 0xa5, 0xcf, 0xdf, 0x57, 0xaf, 0x95, 0x53, - 0xcc, 0x98, 0xef, 0x3c, 0x12, 0xcf, 0x76, 0x87, 0x86, 0xc4, 0x7c, 0xd6, 0x31, 0x9d, 0x11, 0x8b, - 0xe8, 0x50, 0xbc, 0xe2, 0xf9, 0x35, 0x63, 0x9e, 0x12, 0x0f, 0x3b, 0x93, 0xc1, 0x26, 0x7f, 0x7e, - 0xbf, 0xfb, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdd, 0xa9, 0xe9, 0x3a, 0xe7, 0x0b, 0x00, 0x00, + 0x55, 0x8a, 0xb4, 0xb6, 0xda, 0x15, 0x07, 0xf6, 0x44, 0x52, 0x16, 0xa9, 0x48, 0x06, 0xc9, 0x15, + 0x5a, 0x09, 0x09, 0x45, 0x13, 0x7b, 0x64, 0x0c, 0x8d, 0xa7, 0x78, 0x9c, 0xcd, 0x86, 0x0b, 0x57, + 0x2e, 0x48, 0x20, 0xf1, 0x07, 0xec, 0x99, 0x03, 0x7f, 0x04, 0xa7, 0xbd, 0x20, 0xf5, 0xc8, 0xc9, + 0xa0, 0xf4, 0xc2, 0xd9, 0x12, 0x07, 0x38, 0x21, 0xcf, 0x8c, 0xdd, 0x69, 0xe3, 0xfc, 0xaa, 0x38, + 0xd9, 0x9a, 0xf7, 0xbd, 0x1f, 0xf3, 0x7d, 0xef, 0xcd, 0x0c, 0xb8, 0x1f, 0x91, 0x30, 0xc4, 0xe6, + 0x08, 0xb3, 0x81, 0xf9, 0xfc, 0xb0, 0x4f, 0x22, 0x7c, 0x68, 0x46, 0x2f, 0x8c, 0xf3, 0x90, 0x46, + 0x54, 0xd7, 0xb9, 0xd1, 0x48, 0x8d, 0x86, 0x34, 0x36, 0xf6, 0x3d, 0xea, 0x51, 0x6e, 0x36, 0xd3, + 0x3f, 0x81, 0x6c, 0x34, 0x1d, 0xca, 0x06, 0x94, 0x99, 0x7d, 0xcc, 0x48, 0x1e, 0xc7, 0xa1, 0x7e, + 0x20, 0xec, 0xe8, 0x27, 0x0d, 0xd4, 0x2c, 0xe6, 0x9d, 0x46, 0x34, 0x24, 0xc7, 0xd4, 0x25, 0xfa, + 0x01, 0xd8, 0x64, 0x24, 0x70, 0x49, 0x58, 0xd7, 0x5a, 0x5a, 0xbb, 0xd2, 0xbd, 0x9b, 0xc4, 0xf0, + 0xb5, 0x31, 0x1e, 0x9c, 0x3d, 0x41, 0x62, 0x1d, 0xd9, 0x12, 0xa0, 0x7f, 0x02, 0xb6, 0xd3, 0x0a, + 0x7a, 0xfd, 0x71, 0x44, 0x7a, 0x0e, 0x75, 0x49, 0x7d, 0xad, 0xa5, 0xb5, 0x6b, 0xdd, 0x83, 0x49, + 0x0c, 0x6b, 0xcf, 0x3a, 0xa7, 0x56, 0x77, 0x1c, 0xf1, 0xa0, 0x49, 0x0c, 0xef, 0x89, 0x10, 0xd7, + 0xf1, 0xc8, 0xae, 0xa5, 0x0b, 0x19, 0xec, 0xc9, 0xd6, 0x77, 0x2f, 0x61, 0xe9, 0xaf, 0x97, 0xb0, + 0x84, 0x2c, 0xb0, 0xaf, 0x56, 0x65, 0x13, 0x76, 0x4e, 0x03, 0x46, 0xf4, 0x77, 0xc1, 0x9d, 0xd4, + 0xb1, 0xe7, 0xbb, 0xbc, 0xbc, 0xf5, 0xee, 0x5b, 0x93, 0x18, 0x6e, 0xa6, 0x90, 0x93, 0x0f, 0x92, + 0x18, 0x6e, 0x8b, 0x2c, 0x12, 0x82, 0xec, 0xcd, 0xf4, 0xef, 0xc4, 0x45, 0xbf, 0x69, 0x60, 0xdb, + 0x62, 0x9e, 0xe5, 0x7b, 0x21, 0x16, 0xb9, 0x6e, 0x19, 0x49, 0xa1, 0x67, 0x6d, 0x75, 0x7a, 0xca, + 0xff, 0x17, 0x3d, 0x75, 0xf0, 0xfa, 0xf5, 0xed, 0x64, 0x04, 0xa1, 0x7f, 0xd6, 0xb8, 0xe9, 0x24, + 0x60, 0x11, 0x0e, 0x22, 0x9f, 0x9b, 0x83, 0x28, 0xc4, 0x4e, 0xb4, 0x8a, 0xb2, 0x0f, 0xc1, 0x06, + 0x76, 0x07, 0x7e, 0x20, 0x37, 0xb9, 0x9b, 0xc4, 0xb0, 0x26, 0x90, 0x7c, 0x19, 0xd9, 0xc2, 0xac, + 0x92, 0x58, 0x5e, 0x81, 0xc4, 0x8f, 0xc0, 0x96, 0x1f, 0xf8, 0x51, 0x6f, 0xc0, 0xbc, 0xfa, 0x3a, + 0xe7, 0xc4, 0x4c, 0x62, 0xb8, 0x23, 0xd0, 0x99, 0x05, 0xfd, 0x1b, 0xc3, 0x3a, 0x09, 0x1c, 0xea, + 0xfa, 0x81, 0x67, 0x7e, 0xc9, 0x68, 0x60, 0xd8, 0x78, 0x64, 0x11, 0xc6, 0xb0, 0x47, 0xec, 0x3b, + 0x29, 0xcc, 0x62, 0x9e, 0xfe, 0x2d, 0x00, 0xdc, 0x23, 0xed, 0x69, 0x56, 0xdf, 0x68, 0x95, 0xdb, + 0xd5, 0xa3, 0x37, 0x0d, 0xd1, 0xf5, 0x46, 0xda, 0xf5, 0xd9, 0x80, 0x18, 0xc7, 0xd4, 0x0f, 0xba, + 0x4f, 0x5f, 0xc5, 0xb0, 0x94, 0xc4, 0xf0, 0xae, 0x92, 0x8c, 0xbb, 0xa2, 0x9f, 0xff, 0x80, 0x6d, + 0xcf, 0x8f, 0xbe, 0x18, 0xf6, 0x0d, 0x87, 0x0e, 0x4c, 0x39, 0x37, 0xe2, 0xf3, 0x88, 0xb9, 0x5f, + 0x99, 0xd1, 0xf8, 0x9c, 0x30, 0x1e, 0x85, 0xd9, 0x95, 0xd4, 0x91, 0xff, 0x2a, 0xaa, 0x7c, 0xaf, + 0x81, 0x66, 0x31, 0xf7, 0x79, 0xff, 0x7e, 0x08, 0x76, 0x1d, 0xb9, 0xd6, 0xc3, 0xae, 0x1b, 0x12, + 0xc6, 0xa4, 0x1a, 0xf7, 0x93, 0x18, 0xbe, 0x91, 0xf1, 0x75, 0x1d, 0x81, 0xec, 0x9d, 0x6c, 0xa9, + 0x23, 0x56, 0xf4, 0x07, 0x60, 0xdd, 0xc5, 0x11, 0x96, 0x03, 0xb7, 0x93, 0xc4, 0xb0, 0x2a, 0x7c, + 0xd3, 0x55, 0x64, 0x73, 0x23, 0xfa, 0x75, 0x0d, 0xe8, 0x16, 0xf3, 0x9e, 0xbe, 0x20, 0xce, 0xf0, + 0x76, 0x7d, 0x60, 0x82, 0xad, 0x2c, 0xb3, 0x6c, 0x85, 0xbd, 0x2b, 0xa1, 0x32, 0x0b, 0xb2, 0x73, + 0x90, 0x7e, 0x0a, 0xaa, 0x44, 0xa4, 0xe3, 0xe2, 0x8a, 0x86, 0x3f, 0x4a, 0x62, 0xa8, 0x0b, 0x1f, + 0xc5, 0x38, 0x5f, 0x5f, 0x20, 0x91, 0xa9, 0xc4, 0x5f, 0x83, 0x8d, 0x25, 0xd5, 0x7d, 0x5f, 0xaa, + 0x5b, 0xcb, 0x2a, 0x5c, 0x59, 0x58, 0x91, 0x49, 0x11, 0xb5, 0x03, 0x1a, 0xd3, 0x1c, 0xe6, 0x7a, + 0x66, 0x3a, 0x68, 0xf3, 0x74, 0xf8, 0x51, 0xe8, 0x90, 0x8f, 0xab, 0xe4, 0x2a, 0x1f, 0x32, 0x6d, + 0xfe, 0x90, 0xad, 0x2c, 0xc2, 0x31, 0xa8, 0x06, 0x64, 0xd4, 0xbb, 0x3e, 0x99, 0x0f, 0x26, 0x31, + 0xac, 0x7c, 0x4c, 0x46, 0xf9, 0x70, 0x4a, 0x45, 0x14, 0x24, 0xb2, 0x2b, 0x81, 0x04, 0xb8, 0xa9, + 0x92, 0x03, 0x51, 0xb0, 0x32, 0xa6, 0x8a, 0x92, 0x8a, 0x71, 0x81, 0x92, 0x12, 0x69, 0x31, 0x6f, + 0x8a, 0xd6, 0x1b, 0x94, 0xac, 0x46, 0xeb, 0x2f, 0x1a, 0x3f, 0xea, 0x3e, 0x3d, 0x77, 0x95, 0x10, + 0x1d, 0x4e, 0xd9, 0xb2, 0xd4, 0x1e, 0x82, 0x74, 0xc7, 0x3d, 0xf5, 0xac, 0xdb, 0x4f, 0x62, 0xb8, + 0x7b, 0x45, 0x8d, 0xc4, 0x6f, 0x05, 0x64, 0xd4, 0x99, 0x52, 0xa3, 0xbc, 0x84, 0x1a, 0xca, 0x9e, + 0x5b, 0xfc, 0x78, 0x28, 0xa8, 0x37, 0x3f, 0xbd, 0xbf, 0x01, 0xf7, 0x2c, 0xe6, 0x1d, 0x9f, 0x11, + 0x1c, 0xde, 0x6e, 0x43, 0xab, 0xf6, 0x8a, 0x52, 0x1d, 0x04, 0x6f, 0x17, 0xe6, 0xce, 0x8a, 0x3b, + 0xfa, 0x7b, 0x03, 0x94, 0xd3, 0x71, 0x7c, 0x06, 0x2a, 0x57, 0xcf, 0x85, 0x96, 0x31, 0xfd, 0x14, + 0x31, 0xd4, 0xab, 0xbb, 0xd1, 0x5e, 0x84, 0xc8, 0x55, 0xff, 0x1c, 0x54, 0xd5, 0x1b, 0x1a, 0xcd, + 0x70, 0x54, 0x30, 0x8d, 0x77, 0x16, 0x63, 0xf2, 0xf0, 0x43, 0xb0, 0x57, 0x74, 0x2d, 0xce, 0x0a, + 0x51, 0x80, 0x6d, 0x1c, 0x2d, 0x8f, 0xcd, 0xd3, 0xfa, 0x60, 0xe7, 0xe6, 0x09, 0xfc, 0x70, 0x46, + 0x98, 0x1b, 0xb8, 0x86, 0xb1, 0x1c, 0x4e, 0x4d, 0x35, 0x75, 0xc8, 0x2c, 0x22, 0x68, 0x41, 0xaa, + 0x59, 0x13, 0x3a, 0x04, 0x7b, 0x45, 0x83, 0x37, 0x8b, 0xcc, 0x02, 0xec, 0x4c, 0x32, 0xe7, 0x0c, + 0x88, 0x1e, 0x02, 0xbd, 0x60, 0x3a, 0x0e, 0x66, 0x44, 0x9a, 0x86, 0x36, 0x0e, 0x97, 0x86, 0x66, + 0x39, 0xbb, 0xa7, 0xaf, 0x26, 0x4d, 0xed, 0x62, 0xd2, 0xd4, 0xfe, 0x9c, 0x34, 0xb5, 0x1f, 0x2e, + 0x9b, 0xa5, 0x8b, 0xcb, 0x66, 0xe9, 0xf7, 0xcb, 0x66, 0xe9, 0xb3, 0xf7, 0xd4, 0x6b, 0xe5, 0x0c, + 0x33, 0xe6, 0x3b, 0x8f, 0xc4, 0xb3, 0xdd, 0xa1, 0x21, 0x31, 0x9f, 0x3f, 0x36, 0x9d, 0x21, 0x8b, + 0xe8, 0x40, 0xbc, 0xe2, 0xf9, 0x35, 0x63, 0x9e, 0x11, 0x0f, 0x3b, 0xe3, 0xfe, 0x26, 0x7f, 0x7e, + 0x3f, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xeb, 0xf8, 0x6b, 0x1e, 0xe7, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -819,7 +747,7 @@ type MsgClient interface { StoreCode(ctx context.Context, in *MsgStoreCode, opts ...grpc.CallOption) (*MsgStoreCodeResponse, error) // MigrateCode to submit new version Wasm code to the system MigrateCode(ctx context.Context, in *MsgMigrateCode, opts ...grpc.CallOption) (*MsgMigrateCodeResponse, error) - // Instantiate creates a new smart contract instance for the given code id. + // Instantiate creates a new smart contract instance for the given code id. InstantiateContract(ctx context.Context, in *MsgInstantiateContract, opts ...grpc.CallOption) (*MsgInstantiateContractResponse, error) // Execute submits the given message data to a smart contract ExecuteContract(ctx context.Context, in *MsgExecuteContract, opts ...grpc.CallOption) (*MsgExecuteContractResponse, error) @@ -908,7 +836,7 @@ type MsgServer interface { StoreCode(context.Context, *MsgStoreCode) (*MsgStoreCodeResponse, error) // MigrateCode to submit new version Wasm code to the system MigrateCode(context.Context, *MsgMigrateCode) (*MsgMigrateCodeResponse, error) - // Instantiate creates a new smart contract instance for the given code id. + // Instantiate creates a new smart contract instance for the given code id. InstantiateContract(context.Context, *MsgInstantiateContract) (*MsgInstantiateContractResponse, error) // Execute submits the given message data to a smart contract ExecuteContract(context.Context, *MsgExecuteContract) (*MsgExecuteContractResponse, error) @@ -921,32 +849,27 @@ type MsgServer interface { } // UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct{} +type UnimplementedMsgServer struct { +} func (*UnimplementedMsgServer) StoreCode(ctx context.Context, req *MsgStoreCode) (*MsgStoreCodeResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method StoreCode not implemented") } - func (*UnimplementedMsgServer) MigrateCode(ctx context.Context, req *MsgMigrateCode) (*MsgMigrateCodeResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method MigrateCode not implemented") } - func (*UnimplementedMsgServer) InstantiateContract(ctx context.Context, req *MsgInstantiateContract) (*MsgInstantiateContractResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method InstantiateContract not implemented") } - func (*UnimplementedMsgServer) ExecuteContract(ctx context.Context, req *MsgExecuteContract) (*MsgExecuteContractResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ExecuteContract not implemented") } - func (*UnimplementedMsgServer) MigrateContract(ctx context.Context, req *MsgMigrateContract) (*MsgMigrateContractResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method MigrateContract not implemented") } - func (*UnimplementedMsgServer) UpdateContractAdmin(ctx context.Context, req *MsgUpdateContractAdmin) (*MsgUpdateContractAdminResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateContractAdmin not implemented") } - func (*UnimplementedMsgServer) ClearContractAdmin(ctx context.Context, req *MsgClearContractAdmin) (*MsgClearContractAdminResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ClearContractAdmin not implemented") } @@ -1653,7 +1576,6 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *MsgStoreCode) Size() (n int) { if m == nil { return 0 @@ -1895,11 +1817,9 @@ func (m *MsgClearContractAdminResponse) Size() (n int) { func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *MsgStoreCode) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2016,7 +1936,6 @@ func (m *MsgStoreCode) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgStoreCodeResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2086,7 +2005,6 @@ func (m *MsgStoreCodeResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgMigrateCode) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2222,7 +2140,6 @@ func (m *MsgMigrateCode) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgMigrateCodeResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2273,7 +2190,6 @@ func (m *MsgMigrateCodeResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgInstantiateContract) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2475,7 +2391,6 @@ func (m *MsgInstantiateContract) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgInstantiateContractResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2592,7 +2507,6 @@ func (m *MsgInstantiateContractResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgExecuteContract) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2775,7 +2689,6 @@ func (m *MsgExecuteContract) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgExecuteContractResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2860,7 +2773,6 @@ func (m *MsgExecuteContractResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgMigrateContract) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3028,7 +2940,6 @@ func (m *MsgMigrateContract) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgMigrateContractResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3113,7 +3024,6 @@ func (m *MsgMigrateContractResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgUpdateContractAdmin) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3260,7 +3170,6 @@ func (m *MsgUpdateContractAdmin) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgUpdateContractAdminResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3311,7 +3220,6 @@ func (m *MsgUpdateContractAdminResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgClearContractAdmin) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3426,7 +3334,6 @@ func (m *MsgClearContractAdmin) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgClearContractAdminResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3477,7 +3384,6 @@ func (m *MsgClearContractAdminResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/custom/wasm/types/legacy/wasm.pb.go b/custom/wasm/types/legacy/wasm.pb.go index fe7a60f48..88cc0e153 100644 --- a/custom/wasm/types/legacy/wasm.pb.go +++ b/custom/wasm/types/legacy/wasm.pb.go @@ -7,20 +7,17 @@ import ( bytes "bytes" encoding_json "encoding/json" fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -44,11 +41,9 @@ func (*LegacyCodeInfo) ProtoMessage() {} func (*LegacyCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor_2bd5d0123068c880, []int{0} } - func (m *LegacyCodeInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *LegacyCodeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_LegacyCodeInfo.Marshal(b, m, deterministic) @@ -61,15 +56,12 @@ func (m *LegacyCodeInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return b[:n], nil } } - func (m *LegacyCodeInfo) XXX_Merge(src proto.Message) { xxx_messageInfo_LegacyCodeInfo.Merge(m, src) } - func (m *LegacyCodeInfo) XXX_Size() int { return m.Size() } - func (m *LegacyCodeInfo) XXX_DiscardUnknown() { xxx_messageInfo_LegacyCodeInfo.DiscardUnknown(m) } @@ -117,11 +109,9 @@ func (*LegacyContractInfo) ProtoMessage() {} func (*LegacyContractInfo) Descriptor() ([]byte, []int) { return fileDescriptor_2bd5d0123068c880, []int{1} } - func (m *LegacyContractInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *LegacyContractInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_LegacyContractInfo.Marshal(b, m, deterministic) @@ -134,15 +124,12 @@ func (m *LegacyContractInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *LegacyContractInfo) XXX_Merge(src proto.Message) { xxx_messageInfo_LegacyContractInfo.Merge(m, src) } - func (m *LegacyContractInfo) XXX_Size() int { return m.Size() } - func (m *LegacyContractInfo) XXX_DiscardUnknown() { xxx_messageInfo_LegacyContractInfo.DiscardUnknown(m) } @@ -195,30 +182,30 @@ var fileDescriptor_2bd5d0123068c880 = []byte{ // 407 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x31, 0x6f, 0xd4, 0x30, 0x14, 0xc7, 0xcf, 0xc7, 0xf5, 0xae, 0xb5, 0xaa, 0x52, 0x59, 0x1d, 0x22, 0x04, 0xc9, 0xc9, 0x03, - 0xba, 0xa1, 0x9c, 0x75, 0x20, 0x06, 0x3a, 0x06, 0x06, 0x8a, 0xe8, 0x12, 0x36, 0x96, 0xca, 0x67, - 0x1b, 0xc7, 0xe8, 0x62, 0x57, 0xb6, 0xdb, 0xea, 0xbe, 0x05, 0x1f, 0x01, 0x36, 0x3e, 0x0a, 0x63, - 0x47, 0xa6, 0x08, 0xe5, 0x16, 0xe6, 0x8c, 0x4c, 0x28, 0x4e, 0x22, 0x85, 0x09, 0x75, 0x7b, 0xf6, - 0xef, 0xa7, 0xf7, 0x9e, 0xfe, 0x7a, 0xf0, 0x89, 0x17, 0xd6, 0x52, 0x72, 0x4b, 0x5d, 0x41, 0x6e, - 0x56, 0x6b, 0xe1, 0xe9, 0x2a, 0x3c, 0x96, 0x57, 0xd6, 0x78, 0x83, 0x50, 0xc0, 0xcb, 0xf0, 0xd3, - 0xe1, 0x47, 0x27, 0xd2, 0x48, 0x13, 0x30, 0x69, 0xaa, 0xd6, 0xc4, 0xdf, 0x01, 0x3c, 0x7a, 0x2f, - 0x24, 0x65, 0xdb, 0xd7, 0x86, 0x8b, 0x73, 0xfd, 0xc9, 0xa0, 0x97, 0x70, 0xc6, 0x0c, 0x17, 0x97, - 0x8a, 0x47, 0x60, 0x0e, 0x16, 0x93, 0xf4, 0x71, 0x55, 0x26, 0xd3, 0x80, 0xdf, 0xd4, 0x65, 0x72, - 0xb4, 0xa5, 0xc5, 0xe6, 0x0c, 0x77, 0x0a, 0xce, 0xa6, 0x4d, 0x75, 0xce, 0xd1, 0x0a, 0x1e, 0x84, - 0xbf, 0x9c, 0xba, 0x3c, 0x1a, 0xcf, 0xc1, 0xe2, 0x30, 0x3d, 0xa9, 0xcb, 0xe4, 0x78, 0xa0, 0x37, - 0x08, 0x67, 0xfb, 0x4d, 0xfd, 0x96, 0xba, 0x1c, 0x9d, 0xc2, 0x19, 0xb3, 0x82, 0x7a, 0x63, 0xa3, - 0x07, 0x73, 0xb0, 0x38, 0x48, 0xd1, 0xa0, 0x7f, 0x0b, 0x70, 0xd6, 0x2b, 0xf8, 0xdb, 0x18, 0xa2, - 0x7e, 0x55, 0xed, 0x2d, 0x65, 0x3e, 0xac, 0x7b, 0x0a, 0x67, 0x94, 0x73, 0x2b, 0x9c, 0x0b, 0xeb, - 0xfe, 0xd3, 0xa4, 0x03, 0x38, 0xeb, 0x95, 0xe1, 0xc8, 0xf1, 0x7f, 0x47, 0xa2, 0xa7, 0x70, 0x8f, - 0xf2, 0x42, 0xe9, 0x6e, 0xbd, 0xe3, 0xba, 0x4c, 0x0e, 0xfb, 0xce, 0x85, 0xd2, 0x38, 0x6b, 0xf1, - 0x30, 0xb2, 0xc9, 0x3d, 0x22, 0x7b, 0x07, 0xf7, 0x95, 0x56, 0xfe, 0xb2, 0x70, 0x32, 0xda, 0x0b, - 0x89, 0x91, 0xba, 0x4c, 0x1e, 0xb6, 0x76, 0x4f, 0xf0, 0x9f, 0x32, 0x89, 0x84, 0x66, 0x86, 0x2b, - 0x2d, 0xc9, 0x67, 0x67, 0xf4, 0x32, 0xa3, 0xb7, 0x17, 0xc2, 0x39, 0x2a, 0x45, 0x36, 0x6b, 0xb4, - 0x0b, 0x27, 0xcf, 0x26, 0xbf, 0xbf, 0x26, 0x20, 0xfd, 0xf0, 0xa3, 0x8a, 0xc1, 0x5d, 0x15, 0x83, - 0x5f, 0x55, 0x0c, 0xbe, 0xec, 0xe2, 0xd1, 0xdd, 0x2e, 0x1e, 0xfd, 0xdc, 0xc5, 0xa3, 0x8f, 0xaf, - 0xa4, 0xf2, 0xf9, 0xf5, 0x7a, 0xc9, 0x4c, 0x41, 0xd8, 0x86, 0x3a, 0xa7, 0xd8, 0xb3, 0xf6, 0x88, - 0x98, 0xb1, 0x82, 0xdc, 0x3c, 0x27, 0xec, 0xda, 0x79, 0x53, 0xb4, 0x37, 0xe5, 0xb7, 0x57, 0xc2, - 0x91, 0x4d, 0x48, 0x7b, 0x3d, 0x0d, 0xa7, 0xf2, 0xe2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, - 0x5e, 0x7e, 0xf3, 0x75, 0x02, 0x00, 0x00, + 0xba, 0xa1, 0x9c, 0x75, 0xaa, 0x18, 0xe8, 0x18, 0x18, 0x28, 0xa2, 0x4b, 0xd8, 0x58, 0x2a, 0x9f, + 0x6d, 0x1c, 0xa3, 0x8b, 0x5d, 0xd9, 0x6e, 0xab, 0xfb, 0x16, 0x7c, 0x04, 0xd8, 0xf8, 0x28, 0x8c, + 0x1d, 0x99, 0x22, 0x94, 0x5b, 0x98, 0x33, 0x32, 0xa1, 0x38, 0x89, 0x14, 0x26, 0xd4, 0xed, 0xd9, + 0xbf, 0x9f, 0xde, 0x7b, 0xfa, 0xeb, 0xc1, 0x67, 0x5e, 0x58, 0x4b, 0xc9, 0x1d, 0x75, 0x05, 0xb9, + 0x5d, 0xad, 0x85, 0xa7, 0xab, 0xf0, 0x58, 0x5e, 0x5b, 0xe3, 0x0d, 0x42, 0x01, 0x2f, 0xc3, 0x4f, + 0x87, 0x9f, 0x9c, 0x48, 0x23, 0x4d, 0xc0, 0xa4, 0xa9, 0x5a, 0x13, 0x7f, 0x07, 0xf0, 0xe8, 0xbd, + 0x90, 0x94, 0x6d, 0x5f, 0x1b, 0x2e, 0x2e, 0xf4, 0x27, 0x83, 0x5e, 0xc2, 0x19, 0x33, 0x5c, 0x5c, + 0x29, 0x1e, 0x81, 0x39, 0x58, 0x4c, 0xd2, 0xa7, 0x55, 0x99, 0x4c, 0x03, 0x7e, 0x53, 0x97, 0xc9, + 0xd1, 0x96, 0x16, 0x9b, 0x73, 0xdc, 0x29, 0x38, 0x9b, 0x36, 0xd5, 0x05, 0x47, 0x2b, 0x78, 0x10, + 0xfe, 0x72, 0xea, 0xf2, 0x68, 0x3c, 0x07, 0x8b, 0xc3, 0xf4, 0xa4, 0x2e, 0x93, 0xe3, 0x81, 0xde, + 0x20, 0x9c, 0xed, 0x37, 0xf5, 0x5b, 0xea, 0x72, 0x74, 0x0a, 0x67, 0xcc, 0x0a, 0xea, 0x8d, 0x8d, + 0x1e, 0xcd, 0xc1, 0xe2, 0x20, 0x45, 0x83, 0xfe, 0x2d, 0xc0, 0x59, 0xaf, 0xe0, 0x6f, 0x63, 0x88, + 0xfa, 0x55, 0xb5, 0xb7, 0x94, 0xf9, 0xb0, 0xee, 0x29, 0x9c, 0x51, 0xce, 0xad, 0x70, 0x2e, 0xac, + 0xfb, 0x4f, 0x93, 0x0e, 0xe0, 0xac, 0x57, 0x86, 0x23, 0xc7, 0xff, 0x1d, 0x89, 0x9e, 0xc3, 0x3d, + 0xca, 0x0b, 0xa5, 0xbb, 0xf5, 0x8e, 0xeb, 0x32, 0x39, 0xec, 0x3b, 0x17, 0x4a, 0xe3, 0xac, 0xc5, + 0xc3, 0xc8, 0x26, 0x0f, 0x88, 0xec, 0x1d, 0xdc, 0x57, 0x5a, 0xf9, 0xab, 0xc2, 0xc9, 0x68, 0x2f, + 0x24, 0x46, 0xea, 0x32, 0x79, 0xdc, 0xda, 0x3d, 0xc1, 0x7f, 0xca, 0x24, 0x12, 0x9a, 0x19, 0xae, + 0xb4, 0x24, 0x9f, 0x9d, 0xd1, 0xcb, 0x8c, 0xde, 0x5d, 0x0a, 0xe7, 0xa8, 0x14, 0xd9, 0xac, 0xd1, + 0x2e, 0x9d, 0x3c, 0x9f, 0xfc, 0xfe, 0x9a, 0x80, 0xf4, 0xc3, 0x8f, 0x2a, 0x06, 0xf7, 0x55, 0x0c, + 0x7e, 0x55, 0x31, 0xf8, 0xb2, 0x8b, 0x47, 0xf7, 0xbb, 0x78, 0xf4, 0x73, 0x17, 0x8f, 0x3e, 0xbe, + 0x92, 0xca, 0xe7, 0x37, 0xeb, 0x25, 0x33, 0x05, 0x61, 0x1b, 0xea, 0x9c, 0x62, 0x2f, 0xda, 0x23, + 0x62, 0xc6, 0x0a, 0x72, 0x7b, 0x46, 0xd8, 0x8d, 0xf3, 0xa6, 0x68, 0x6f, 0xca, 0x6f, 0xaf, 0x85, + 0x23, 0x9b, 0x90, 0xf6, 0x7a, 0x1a, 0x4e, 0xe5, 0xec, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdb, + 0x0f, 0xfc, 0xd7, 0x75, 0x02, 0x00, 0x00, } func (this *LegacyContractInfo) Equal(that interface{}) bool { @@ -257,7 +244,6 @@ func (this *LegacyContractInfo) Equal(that interface{}) bool { } return true } - func (m *LegacyCodeInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -367,7 +353,6 @@ func encodeVarintWasm(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *LegacyCodeInfo) Size() (n int) { if m == nil { return 0 @@ -419,11 +404,9 @@ func (m *LegacyContractInfo) Size() (n int) { func sovWasm(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozWasm(x uint64) (n int) { return sovWasm(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *LegacyCodeInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -559,7 +542,6 @@ func (m *LegacyCodeInfo) Unmarshal(dAtA []byte) error { } return nil } - func (m *LegacyContractInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -759,7 +741,6 @@ func (m *LegacyContractInfo) Unmarshal(dAtA []byte) error { } return nil } - func skipWasm(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/go.mod b/go.mod index 445c4ad0d..992398a07 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,19 @@ go 1.20 -module github.com/classic-terra/core/v2 +module github.com/classic-terra/core/v3 require ( + cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 - github.com/CosmWasm/wasmd v0.30.0 - github.com/CosmWasm/wasmvm v1.1.2 - github.com/cosmos/cosmos-sdk v0.46.15 - github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/gogoproto v1.4.11 - github.com/cosmos/ibc-go/v6 v6.3.0 + cosmossdk.io/simapp v0.0.0-20230602123434-616841b9704d + github.com/CosmWasm/wasmd v0.45.0 + github.com/CosmWasm/wasmvm v1.5.0 + github.com/cometbft/cometbft v0.37.4 + github.com/cometbft/cometbft-db v0.8.0 + github.com/cosmos/cosmos-sdk v0.47.10 + github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240321032823-2733d24a1b99 + github.com/cosmos/ibc-go/v7 v7.4.0 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.4 github.com/google/gofuzz v1.2.0 @@ -21,33 +25,74 @@ require ( github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.9.0 - github.com/tendermint/tendermint v0.34.29 - github.com/tendermint/tm-db v0.6.8-0.20221109095132-774cdfe7e6b0 - github.com/terra-money/core/v2 v2.4.1 - google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de - google.golang.org/grpc v1.63.2 + google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 + google.golang.org/grpc v1.62.1 gopkg.in/yaml.v2 v2.4.0 ) +require ( + cosmossdk.io/api v0.3.1 // indirect + cosmossdk.io/core v0.6.1 // indirect + cosmossdk.io/depinject v1.0.0-alpha.4 // indirect + cosmossdk.io/log v1.3.1 // indirect + cosmossdk.io/tools/rosetta v0.2.1 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Microsoft/go-winio v0.6.0 // indirect + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect + github.com/cockroachdb/errors v1.10.0 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/containerd/continuity v0.3.0 // indirect + github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect + github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect + github.com/docker/cli v23.0.1+incompatible // indirect + github.com/docker/docker v24.0.9+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect + github.com/getsentry/sentry-go v0.23.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/gogo/googleapis v1.4.1 // indirect + github.com/golang/mock v1.6.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/huandu/skiplist v1.2.0 // indirect + github.com/imdario/mergo v0.3.13 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/linxGnu/grocksdb v1.7.16 // indirect + github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect + github.com/opencontainers/image-spec v1.1.0-rc2 // indirect + github.com/opencontainers/runc v1.1.12 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect + go.opentelemetry.io/otel v1.22.0 // indirect + go.opentelemetry.io/otel/metric v1.22.0 // indirect + go.opentelemetry.io/otel/trace v1.22.0 // indirect + golang.org/x/mod v0.11.0 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.7.0 // indirect + pgregory.net/rapid v1.1.0 // indirect +) + require ( cloud.google.com/go v0.112.0 // indirect cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.6 // indirect cloud.google.com/go/storage v1.36.0 // indirect - cosmossdk.io/errors v1.0.0-beta.7 // indirect - filippo.io/edwards25519 v1.0.0-rc.1 // indirect + filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect - github.com/99designs/keyring v1.2.1 // indirect - github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/99designs/keyring v1.2.2 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/Microsoft/go-winio v0.6.0 // indirect - github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect - github.com/Workiva/go-datastructures v1.0.53 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.122 // indirect + github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect @@ -55,42 +100,33 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect + github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect - github.com/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect - github.com/containerd/continuity v0.3.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect - github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect - github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.7 // indirect - github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect + github.com/cosmos/cosmos-proto v1.0.0-beta.4 + github.com/cosmos/go-bip39 v1.0.0 + github.com/cosmos/iavl v0.20.1 // indirect + github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect github.com/cosmos/ledger-go v0.9.3 // indirect - github.com/creachadair/taskgroup v0.3.2 // indirect + github.com/creachadair/taskgroup v0.4.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect + github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/docker/cli v20.10.17+incompatible // indirect github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v20.10.19+incompatible // indirect - github.com/docker/go-connections v0.4.0 // indirect - github.com/docker/go-units v0.5.0 // indirect - github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect - github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect - github.com/gogo/gateway v1.1.0 // indirect github.com/golang/glog v1.2.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect @@ -98,7 +134,6 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.7 // indirect - github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect @@ -115,77 +150,60 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect - github.com/imdario/mergo v0.3.13 // indirect + github.com/hdevalence/ed25519consensus v0.1.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.16.7 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.1.0-rc2 // indirect - github.com/opencontainers/runc v1.1.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect + github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/regen-network/cosmos-proto v0.3.1 // indirect - github.com/rs/cors v1.8.2 // indirect - github.com/rs/zerolog v1.29.1 // indirect + github.com/rs/cors v1.8.3 // indirect + github.com/rs/zerolog v1.32.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/sirupsen/logrus v1.9.0 // indirect - github.com/spf13/afero v1.9.3 // indirect + github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/viper v1.16.0 github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tidwall/btree v1.5.0 // indirect - github.com/ulikunitz/xz v0.5.10 // indirect - github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect - github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect - github.com/xeipuuv/gojsonschema v1.2.0 // indirect - github.com/zondax/hid v0.9.1 // indirect - go.etcd.io/bbolt v1.3.6 // indirect + github.com/tidwall/btree v1.6.0 // indirect + github.com/ulikunitz/xz v0.5.11 // indirect + github.com/zondax/hid v0.9.2 // indirect + go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect - go.opentelemetry.io/otel v1.22.0 // indirect - go.opentelemetry.io/otel/metric v1.22.0 // indirect - go.opentelemetry.io/otel/trace v1.22.0 // indirect golang.org/x/crypto v0.19.0 // indirect golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect - golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.7.0 // indirect google.golang.org/api v0.162.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect + google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -207,14 +225,14 @@ replace ( ) replace ( - github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.30.0-terra.3 - github.com/CosmWasm/wasmvm => github.com/classic-terra/wasmvm v1.1.1-terra.2-rc.0 - github.com/cosmos/cosmos-sdk => github.com/classic-terra/cosmos-sdk v0.46.14-terra.4 - github.com/cosmos/ibc-go/v6 => github.com/classic-terra/ibc-go/v6 v6.3.0-classic.0 + github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.45.0-terra.3 + // use cometbft + github.com/cometbft/cometbft => github.com/classic-terra/cometbft v0.37.4-terra1 + github.com/cometbft/cometbft-db => github.com/cometbft/cometbft-db v0.8.0 + github.com/cosmos/cosmos-sdk => github.com/classic-terra/cosmos-sdk v0.47.10-terra.1 + github.com/cosmos/ibc-go/v7 => github.com/classic-terra/ibc-go/v7 v7.4.0-terra github.com/cosmos/ledger-cosmos-go => github.com/terra-money/ledger-terra-go v0.11.2 // replace goleveldb to optimized one github.com/syndtr/goleveldb => github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121 - // use cometbft - github.com/tendermint/tendermint => github.com/classic-terra/cometbft v0.34.29-terra.0 - github.com/tendermint/tm-db => github.com/terra-money/tm-db v0.6.7-performance.3 + golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb ) diff --git a/go.sum b/go.sum index 37fefbe84..d5e71c43c 100644 --- a/go.sum +++ b/go.sum @@ -191,13 +191,25 @@ cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuW cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= -cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= +cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= +cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= +cosmossdk.io/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= +cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= +cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98okJopc= +cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= +cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= +cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= +cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= +cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= +cosmossdk.io/simapp v0.0.0-20230602123434-616841b9704d h1:G24nV8KQ5tcSLJEYPUEpKxuX4usvpQg5r7LhCLYPs1o= +cosmossdk.io/simapp v0.0.0-20230602123434-616841b9704d/go.mod h1:xbjky3L3DJEylaho6gXplkrMvJ5sFgv+qNX+Nn47bzY= +cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= +cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= +filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= @@ -208,9 +220,10 @@ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= +github.com/CosmWasm/wasmvm v1.5.0 h1:3hKeT9SfwfLhxTGKH3vXaKFzBz1yuvP8SlfwfQXbQfw= +github.com/CosmWasm/wasmvm v1.5.0/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -227,8 +240,6 @@ github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrU github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig= -github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= @@ -254,8 +265,9 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.44.122 h1:p6mw01WBaNpbdP2xrisz5tIkcNwzj/HysobNoaAHjgo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= +github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= @@ -321,32 +333,31 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= +github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= +github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= +github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/classic-terra/cometbft v0.34.29-terra.0 h1:HnRGt7tijI2n5zSVrg/xh1mYYm4Gb4QFlknq+dRP8Jw= -github.com/classic-terra/cometbft v0.34.29-terra.0/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= -github.com/classic-terra/cosmos-sdk v0.46.14-terra.4 h1:GRgKTxC5n+5CqxtqkoJ+fNwGO4y+F9UATvolzfhEc38= -github.com/classic-terra/cosmos-sdk v0.46.14-terra.4/go.mod h1:3VKRzlOtvuqZA29wRqdx6rPsJmYhvxjJyc3tvQWpjf4= +github.com/classic-terra/cometbft v0.37.4-terra1 h1:eT5B2n5KKi5WVW+3ZNOVTmtfKKaZrXOLX9G80m9mhZo= +github.com/classic-terra/cometbft v0.37.4-terra1/go.mod h1:vFqj7Qe3uFFJvHZleTJPQDmJ/WscXHi4rKWqiCAaNZk= +github.com/classic-terra/cosmos-sdk v0.47.10-terra.1 h1:ek0vQ435fpeP3xGhszDO2yMIRy5XGMj9MCTlvpMUIkw= +github.com/classic-terra/cosmos-sdk v0.47.10-terra.1/go.mod h1:4mBvTB8zevoeTuQufWwTcNnthGG2afXO+9D42BKzlRo= github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121 h1:fjpWDB0hm225wYg9vunyDyTH8ftd5xEUgINJKidj+Tw= github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/classic-terra/ibc-go/v6 v6.3.0-classic.0 h1:xtfxQBJM1tSzDh/uxx7SWIRzBoU5PhsBKB+J8O7GLt0= -github.com/classic-terra/ibc-go/v6 v6.3.0-classic.0/go.mod h1:Dm14j9s094bGyCEE8W4fD+2t8IneHv+cz+80Mvwjr1w= -github.com/classic-terra/wasmd v0.30.0-terra.3 h1:qruhiaAIRl14UVtHzfh81pr0YmW94QE4+hqivIi9AYg= -github.com/classic-terra/wasmd v0.30.0-terra.3/go.mod h1:Ug607EsX+EkW3/xOFaP56kZA7WklN+ZrwUEsaJ22xH0= -github.com/classic-terra/wasmvm v1.1.1-terra.2-rc.0 h1:nx6mpQuwGkY6aata/4QTVGe19ziHPSMkXC9k3pGh8wQ= -github.com/classic-terra/wasmvm v1.1.1-terra.2-rc.0/go.mod h1:ei0xpvomwSdONsxDuONzV7bL1jSET1M8brEx0FCXc+A= +github.com/classic-terra/ibc-go/v7 v7.4.0-terra h1:hawaq62XKlxyc8xLyIcc6IujDDEbqDBU+2U15SF+hj8= +github.com/classic-terra/ibc-go/v7 v7.4.0-terra/go.mod h1:s0lxNkjVIqsb8AVltL0qhzxeLgOKvWZrknPuvgjlEQ8= +github.com/classic-terra/wasmd v0.45.0-terra.3 h1:Fpjrjco0ig4dLwX6KrT+z0Zjo2iJCggM2X0JppyA/ko= +github.com/classic-terra/wasmd v0.45.0-terra.3/go.mod h1:pTPOut260rZ3J0WROheOgNWDV/vk/AeRdXmM1JOtMjk= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= @@ -363,58 +374,67 @@ github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/P github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU= +github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= -github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= -github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= +github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= +github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= github.com/consensys/gnark-crypto v0.5.3/go.mod h1:hOdPlWQV1gDLp7faZVeg8Y0iEPFaOUnCc4XeCCk96p0= -github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= 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/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= 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.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= -github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o= -github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I= +github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48OdY7lIWTLG7oU= +github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= -github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g= -github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y= -github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= -github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.7 h1:ij32FaEnwxfEurtK0QKDNhTWFnz6NUmrI5gky/WnoY0= -github.com/cosmos/iavl v0.19.7/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/interchain-accounts v0.4.3 h1:WedxEa/Hj/2GY7AF6CafkEPJ/Z9rhl3rT1mRwNHsdts= +github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= +github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= +github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= +github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= +github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240321032823-2733d24a1b99 h1:AC05pevT3jIVTxJ0mABlN3hxyHESPpELhVQjwQVT6Pw= +github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240321032823-2733d24a1b99/go.mod h1:JwHFbo1oX/ht4fPpnPvmhZr+dCkYK1Vihw+vZE9umR4= +github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= +github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= github.com/cosmos/ledger-go v0.9.3 h1:WGyZK4ikuLIkbxJm3lEr1tdQYDdTdveTwoVla7hqfhQ= github.com/cosmos/ledger-go v0.9.3/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= +github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= +github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM= -github.com/creachadair/taskgroup v0.3.2/go.mod h1:wieWwecHVzsidg2CsUnFinW1faVN4+kq+TDlRJQ0Wbk= +github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= +github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= @@ -437,8 +457,8 @@ github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdw github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= +github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= +github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= @@ -447,24 +467,23 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M= -github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v23.0.1+incompatible h1:LRyWITpGzl2C9e9uGxzisptnxAn1zfZKXy13Ul2Q5oM= +github.com/docker/cli v23.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.19+incompatible h1:lzEmjivyNHFHMNAFLXORMBXyGIhw/UP4DvJwvyKYq64= -github.com/docker/docker v20.10.19+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= +github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= 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.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac h1:opbrjaN/L8gg6Xh5D04Tem+8xVcz6ajZlGCs49mQgyg= -github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY= github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -485,9 +504,6 @@ github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go. github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= -github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= @@ -498,7 +514,6 @@ github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -507,6 +522,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= +github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -515,9 +532,7 @@ github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH8 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= 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= @@ -528,8 +543,8 @@ github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBj 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.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +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.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -561,11 +576,11 @@ github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG 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= -github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= -github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= +github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= @@ -714,7 +729,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaD github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= @@ -763,11 +777,15 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 h1:aSVUgRRRtOrZOC1fYmY9gV0e9z/Iu+xNVSASWjsuyGU= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3/go.mod h1:5PC6ZNPde8bBqU/ewGZig35+UIZtw9Ytxez8/q5ZyFE= +github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= +github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= 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= +github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= +github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= @@ -831,8 +849,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= @@ -847,6 +865,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -864,6 +883,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/linxGnu/grocksdb v1.7.16 h1:Q2co1xrpdkr5Hx3Fp+f+f7fRGhQFQhvi/+226dtLmA8= +github.com/linxGnu/grocksdb v1.7.16/go.mod h1:JkS7pl5qWpGpuVb3bPqTz8nC12X3YtPZT+Xq7+QfQo4= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -879,7 +900,6 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -890,8 +910,9 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -923,7 +944,6 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= -github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -934,7 +954,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= @@ -953,8 +972,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -975,10 +994,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= -github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= -github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss= +github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -999,8 +1016,8 @@ github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChl github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= -github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= @@ -1008,9 +1025,9 @@ github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCr github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1028,8 +1045,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1054,16 +1071,14 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= -github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= @@ -1073,13 +1088,15 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= -github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= +github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= +github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1088,7 +1105,6 @@ github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0 github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= @@ -1099,7 +1115,6 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -1110,8 +1125,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= @@ -1127,8 +1142,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1148,34 +1163,26 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/terra-money/core/v2 v2.4.1 h1:r90bEXWai2hBs+8KP2ZyT7CBRsEHLb35qgsx1+lc2Fs= -github.com/terra-money/core/v2 v2.4.1/go.mod h1:WSFA0LWlni0X2Lj01gFAP7z/A3H92D/j7JkFZ4CXOn4= github.com/terra-money/ledger-terra-go v0.11.2 h1:BVXZl+OhJOri6vFNjjVaTabRLApw9MuG7mxWL4V718c= github.com/terra-money/ledger-terra-go v0.11.2/go.mod h1:ClJ2XMj1ptcnONzKH+GhVPi7Y8pXIT+UzJ0TNt0tfZE= -github.com/terra-money/tm-db v0.6.7-performance.3 h1:7d2lsU67QNwIPcsqaEzGJe1jpQEFIWpXdH3yCRwdx38= -github.com/terra-money/tm-db v0.6.7-performance.3/go.mod h1:K6twQf1PGDxC6K6V+G2l0nrYsQAxsypb4PpbJnyzwJw= -github.com/tidwall/btree v1.5.0 h1:iV0yVY/frd7r6qGBXfEYs7DH0gTDgrKTrDjS7xt/IyQ= -github.com/tidwall/btree v1.5.0/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= +github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= +github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/sjson v1.2.4/go.mod h1:098SZ494YoMWPmMO6ct4dcFnqxwj9r/gF0Etp19pSNM= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= @@ -1184,16 +1191,15 @@ github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= +github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= @@ -1214,11 +1220,11 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= -github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= +github.com/zondax/hid v0.9.2 h1:WCJFnEDMiqGF64nlZz28E9qLVZ0KSJ7xpc5DLEyma2U= +github.com/zondax/hid v0.9.2/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -1276,29 +1282,14 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA= -golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1311,18 +1302,15 @@ golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPI golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -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.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1378,6 +1366,7 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1449,23 +1438,19 @@ golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1493,7 +1478,6 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1522,18 +1506,16 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1547,10 +1529,12 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1591,7 +1575,6 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1601,9 +1584,7 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1619,7 +1600,6 @@ golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1635,7 +1615,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -1649,6 +1628,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1803,6 +1783,7 @@ google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= @@ -1837,15 +1818,14 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0= -google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= +google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe h1:USL2DhxfgRchafRvt/wYyyQNzwgL7ZiURcozOE/Pkvo= +google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 h1:x9PwdEgd11LgK+orcck69WVRo7DezSO4VUMPI4xpc8A= +google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go.mod h1:rbHMSEDyoYX62nRVLOCc4Qt1HbsdytAYoVwgjiOhF3I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1885,8 +1865,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= -google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1944,7 +1924,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1956,7 +1936,8 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= +pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= +pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/ictest.Dockerfile b/ictest.Dockerfile index 530fd6f3b..4398ec08d 100644 --- a/ictest.Dockerfile +++ b/ictest.Dockerfile @@ -52,8 +52,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ # Cosmwasm - Download correct libwasmvm version and verify checksum RUN set -eux &&\ - WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 5) && \ - WASMVM_DOWNLOADS="https://github.com/classic-terra/wasmvm/releases/download/${WASMVM_VERSION}"; \ + WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 2) && \ + WASMVM_DOWNLOADS="https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}"; \ wget ${WASMVM_DOWNLOADS}/checksums.txt -O /tmp/checksums.txt; \ if [ ${BUILDPLATFORM} = "linux/amd64" ]; then \ WASMVM_URL="${WASMVM_DOWNLOADS}/libwasmvm_muslc.x86_64.a"; \ diff --git a/proto/buf.lock b/proto/buf.lock index 08a5cdfc7..7a2810e68 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -5,15 +5,19 @@ deps: owner: cosmos repository: cosmos-proto commit: 1935555c206d4afb9e94615dfd0fad31 + digest: shake256:c74d91a3ac7ae07d579e90eee33abf9b29664047ac8816500cf22c081fec0d72d62c89ce0bebafc1f6fec7aa5315be72606717740ca95007248425102c365377 - remote: buf.build owner: cosmos repository: cosmos-sdk - commit: 65ea24d045c846028b0c1b8d8723a29c + commit: 954f7b05f38440fc8250134b15adec47 + digest: shake256:2ab4404fd04a7d1d52df0e2d0f2d477a3d83ffd88d876957bf3fedfd702c8e52833d65b3ce1d89a3c5adf2aab512616b0e4f51d8463f07eda9a8a3317ee3ac54 - remote: buf.build owner: cosmos repository: gogo-proto commit: 34d970b699f84aa382f3c29773a60836 + digest: shake256:3d3bee5229ba579e7d19ffe6e140986a228b48a8c7fe74348f308537ab95e9135210e81812489d42cd8941d33ff71f11583174ccc5972e86e6112924b6ce9f04 - remote: buf.build owner: googleapis repository: googleapis - commit: 75b4300737fb4efca0831636be94e517 + commit: 8d7204855ec14631a499bd7393ce1970 + digest: shake256:40bf4112960cad01281930beed85829910768e32e80e986791596853eccd42c0cbd9d96690b918f658020d2d427e16f8b6514e2ac7f4a10306fd32e77be44329 diff --git a/proto/buf.yaml b/proto/buf.yaml index 97ad6ba22..be9d2c000 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,10 +1,10 @@ version: v1 deps: - - buf.build/cosmos/cosmos-sdk - - buf.build/cosmos/cosmos-proto - - buf.build/cosmos/gogo-proto - - buf.build/googleapis/googleapis + - buf.build/cosmos/cosmos-sdk:v0.47.0 + - buf.build/cosmos/cosmos-proto:1935555c206d4afb9e94615dfd0fad31 + - buf.build/cosmos/gogo-proto:a14993478f40695898ed8a86931094b6656e8a5d + - buf.build/googleapis/googleapis:8d7204855ec14631a499bd7393ce1970 breaking: use: - FILE diff --git a/proto/terra/dyncomm/v1beta1/dyncomm.proto b/proto/terra/dyncomm/v1beta1/dyncomm.proto index 00ca1115d..4f0802ec3 100644 --- a/proto/terra/dyncomm/v1beta1/dyncomm.proto +++ b/proto/terra/dyncomm/v1beta1/dyncomm.proto @@ -1,9 +1,10 @@ syntax = "proto3"; package terra.dyncomm.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/x/dyncomm/types"; +option go_package = "github.com/classic-terra/core/v3/x/dyncomm/types"; // Params defines the parameters for the dyncomm module. message Params { @@ -11,24 +12,28 @@ message Params { option (gogoproto.goproto_stringer) = false; string max_zero = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"max_zero\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string slope_base = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"slope_base\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string slope_vp_impact = 3 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"slope_vp_impact\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string cap = 4 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"cap\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false diff --git a/proto/terra/dyncomm/v1beta1/genesis.proto b/proto/terra/dyncomm/v1beta1/genesis.proto index 5d96359bc..3b41b973c 100644 --- a/proto/terra/dyncomm/v1beta1/genesis.proto +++ b/proto/terra/dyncomm/v1beta1/genesis.proto @@ -1,22 +1,25 @@ syntax = "proto3"; package terra.dyncomm.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "terra/dyncomm/v1beta1/dyncomm.proto"; -option go_package = "github.com/classic-terra/core/v2/x/dyncomm/types"; +option go_package = "github.com/classic-terra/core/v3/x/dyncomm/types"; // GenesisState defines the dyncomm module's genesis state. message GenesisState { // params defines all the paramaters of the module. - Params params = 1 [(gogoproto.nullable) = false]; + Params params = 1 [(gogoproto.nullable) = false]; repeated ValidatorCommissionRate validator_commission_rates = 2 [(gogoproto.nullable) = false]; } // MinDynCommission defines a validator - min commission rate // pair to be enforced by the blockchain message ValidatorCommissionRate { - string validator_address = 1; - string min_commission_rate = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; - string target_commission_rate = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string min_commission_rate = 2 + [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; + string target_commission_rate = 3 + [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; } \ No newline at end of file diff --git a/proto/terra/dyncomm/v1beta1/query.proto b/proto/terra/dyncomm/v1beta1/query.proto index 6980220b8..20d8842df 100644 --- a/proto/terra/dyncomm/v1beta1/query.proto +++ b/proto/terra/dyncomm/v1beta1/query.proto @@ -1,11 +1,12 @@ syntax = "proto3"; package terra.dyncomm.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "terra/dyncomm/v1beta1/dyncomm.proto"; -option go_package = "github.com/classic-terra/core/v2/x/dyncomm/types"; +option go_package = "github.com/classic-terra/core/v3/x/dyncomm/types"; // Query defines the gRPC querier service. service Query { @@ -14,7 +15,7 @@ service Query { option (google.api.http).get = "/terra/dyncomm/v1beta1/params"; } - rpc Rate(QueryRateRequest) returns (QueryRateResponse){ + rpc Rate(QueryRateRequest) returns (QueryRateResponse) { option (google.api.http).get = "/terra/dyncomm/v1beta1/rate/{validator_addr}"; } } @@ -31,11 +32,13 @@ message QueryParamsResponse { // QueryRateRequest is the request type for the Query/Rate RPC method. message QueryRateRequest { // validator_addr defines the validator address to query for. - string validator_addr = 1; + string validator_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // QueryRateResponse is the response type for the Query/Rate RPC method. message QueryRateResponse { - string rate = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; - string target = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; + string rate = 1 + [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; + string target = 2 + [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec"]; } diff --git a/proto/terra/market/v1beta1/genesis.proto b/proto/terra/market/v1beta1/genesis.proto index 23a47d4f8..2a0014592 100644 --- a/proto/terra/market/v1beta1/genesis.proto +++ b/proto/terra/market/v1beta1/genesis.proto @@ -1,10 +1,11 @@ syntax = "proto3"; package terra.market.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "terra/market/v1beta1/market.proto"; -option go_package = "github.com/classic-terra/core/v2/x/market/types"; +option go_package = "github.com/classic-terra/core/v3/x/market/types"; // GenesisState defines the market module's genesis state. message GenesisState { @@ -12,6 +13,9 @@ message GenesisState { Params params = 1 [(gogoproto.nullable) = false]; // the gap between the TerraPool and the BasePool - bytes terra_pool_delta = 2 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + bytes terra_pool_delta = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } diff --git a/proto/terra/market/v1beta1/market.proto b/proto/terra/market/v1beta1/market.proto index 756b89197..d7faea3d0 100644 --- a/proto/terra/market/v1beta1/market.proto +++ b/proto/terra/market/v1beta1/market.proto @@ -1,9 +1,10 @@ syntax = "proto3"; package terra.market.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/x/market/types"; +option go_package = "github.com/classic-terra/core/v3/x/market/types"; // Params defines the parameters for the market module. message Params { @@ -11,12 +12,14 @@ message Params { option (gogoproto.goproto_stringer) = false; bytes base_pool = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"base_pool\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; uint64 pool_recovery_period = 2 [(gogoproto.moretags) = "yaml:\"pool_recovery_period\""]; bytes min_stability_spread = 3 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"min_stability_spread\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false diff --git a/proto/terra/market/v1beta1/query.proto b/proto/terra/market/v1beta1/query.proto index 9c72d1c6f..d387ce108 100644 --- a/proto/terra/market/v1beta1/query.proto +++ b/proto/terra/market/v1beta1/query.proto @@ -1,12 +1,14 @@ syntax = "proto3"; package terra.market.v1beta1; +import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; + import "terra/market/v1beta1/market.proto"; -import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/classic-terra/core/v2/x/market/types"; +option go_package = "github.com/classic-terra/core/v3/x/market/types"; // Query defines the gRPC querier service. service Query { @@ -49,8 +51,11 @@ message QueryTerraPoolDeltaRequest {} // QueryTerraPoolDeltaResponse is the response type for the Query/TerraPoolDelta RPC method. message QueryTerraPoolDeltaResponse { // terra_pool_delta defines the gap between the TerraPool and the TerraBasePool - bytes terra_pool_delta = 1 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + bytes terra_pool_delta = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // QueryParamsRequest is the request type for the Query/Params RPC method. diff --git a/proto/terra/market/v1beta1/tx.proto b/proto/terra/market/v1beta1/tx.proto index 7451f10b6..208b4fcbe 100644 --- a/proto/terra/market/v1beta1/tx.proto +++ b/proto/terra/market/v1beta1/tx.proto @@ -1,10 +1,11 @@ syntax = "proto3"; package terra.market.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/x/market/types"; +option go_package = "github.com/classic-terra/core/v3/x/market/types"; // Msg defines the market Msg service. service Msg { @@ -38,8 +39,9 @@ message MsgSwapSend { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; - string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; + string from_address = 1 + [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"from_address\""]; + string to_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"to_address\""]; cosmos.base.v1beta1.Coin offer_coin = 3 [(gogoproto.moretags) = "yaml:\"offer_coin\"", (gogoproto.nullable) = false]; string ask_denom = 4 [(gogoproto.moretags) = "yaml:\"ask_denom\""]; } diff --git a/proto/terra/oracle/v1beta1/genesis.proto b/proto/terra/oracle/v1beta1/genesis.proto index b1ad95e79..847851722 100644 --- a/proto/terra/oracle/v1beta1/genesis.proto +++ b/proto/terra/oracle/v1beta1/genesis.proto @@ -1,10 +1,11 @@ syntax = "proto3"; package terra.oracle.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "terra/oracle/v1beta1/oracle.proto"; -option go_package = "github.com/classic-terra/core/v2/x/oracle/types"; +option go_package = "github.com/classic-terra/core/v3/x/oracle/types"; // GenesisState defines the oracle module's genesis state. message GenesisState { @@ -22,14 +23,14 @@ message GenesisState { // delegated to. By default this struct is only used at genesis to feed in // default feeder addresses. message FeederDelegation { - string feeder_address = 1; - string validator_address = 2; + string feeder_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // MissCounter defines an miss counter and validator address pair used in // oracle module's genesis state message MissCounter { - string validator_address = 1; + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; uint64 miss_counter = 2; } @@ -37,6 +38,9 @@ message MissCounter { // oracle module's genesis state message TobinTax { string denom = 1; - string tobin_tax = 2 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string tobin_tax = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } \ No newline at end of file diff --git a/proto/terra/oracle/v1beta1/oracle.proto b/proto/terra/oracle/v1beta1/oracle.proto index c61ad663d..a8263e1df 100644 --- a/proto/terra/oracle/v1beta1/oracle.proto +++ b/proto/terra/oracle/v1beta1/oracle.proto @@ -1,9 +1,10 @@ syntax = "proto3"; package terra.oracle.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/x/oracle/types"; +option go_package = "github.com/classic-terra/core/v3/x/oracle/types"; // Params defines the parameters for the oracle module. message Params { @@ -12,11 +13,13 @@ message Params { uint64 vote_period = 1 [(gogoproto.moretags) = "yaml:\"vote_period\""]; string vote_threshold = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"vote_threshold\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string reward_band = 3 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"reward_band\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false @@ -28,12 +31,14 @@ message Params { (gogoproto.nullable) = false ]; string slash_fraction = 6 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"slash_fraction\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; uint64 slash_window = 7 [(gogoproto.moretags) = "yaml:\"slash_window\""]; string min_valid_per_window = 8 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"min_valid_per_window\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false @@ -48,6 +53,7 @@ message Denom { string name = 1 [(gogoproto.moretags) = "yaml:\"name\""]; string tobin_tax = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"tobin_tax\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false @@ -91,6 +97,7 @@ message ExchangeRateTuple { string denom = 1 [(gogoproto.moretags) = "yaml:\"denom\""]; string exchange_rate = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"exchange_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false diff --git a/proto/terra/oracle/v1beta1/query.proto b/proto/terra/oracle/v1beta1/query.proto index 3372055d3..9bfcb36c2 100644 --- a/proto/terra/oracle/v1beta1/query.proto +++ b/proto/terra/oracle/v1beta1/query.proto @@ -1,12 +1,14 @@ syntax = "proto3"; package terra.oracle.v1beta1; +import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; + import "terra/oracle/v1beta1/oracle.proto"; -import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/classic-terra/core/v2/x/oracle/types"; +option go_package = "github.com/classic-terra/core/v3/x/oracle/types"; // Query defines the gRPC querier service. service Query { @@ -89,8 +91,11 @@ message QueryExchangeRateRequest { // Query/ExchangeRate RPC method. message QueryExchangeRateResponse { // exchange_rate defines the exchange rate of Luna denominated in various Terra - string exchange_rate = 1 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string exchange_rate = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // QueryExchangeRatesRequest is the request type for the Query/ExchangeRates RPC method. @@ -117,8 +122,11 @@ message QueryTobinTaxRequest { // Query/TobinTax RPC method. message QueryTobinTaxResponse { // tobin_taxe defines the tobin tax of a denom - string tobin_tax = 1 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string tobin_tax = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // QueryTobinTaxesRequest is the request type for the Query/TobinTaxes RPC method. @@ -162,14 +170,14 @@ message QueryFeederDelegationRequest { option (gogoproto.goproto_getters) = false; // validator defines the validator address to query for. - string validator_addr = 1; + string validator_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // QueryFeederDelegationResponse is response type for the // Query/FeederDelegation RPC method. message QueryFeederDelegationResponse { // feeder_addr defines the feeder delegation of a validator - string feeder_addr = 1; + string feeder_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // QueryMissCounterRequest is the request type for the Query/MissCounter RPC method. @@ -178,7 +186,7 @@ message QueryMissCounterRequest { option (gogoproto.goproto_getters) = false; // validator defines the validator address to query for. - string validator_addr = 1; + string validator_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // QueryMissCounterResponse is response type for the @@ -194,7 +202,7 @@ message QueryAggregatePrevoteRequest { option (gogoproto.goproto_getters) = false; // validator defines the validator address to query for. - string validator_addr = 1; + string validator_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // QueryAggregatePrevoteResponse is response type for the @@ -221,7 +229,7 @@ message QueryAggregateVoteRequest { option (gogoproto.goproto_getters) = false; // validator defines the validator address to query for. - string validator_addr = 1; + string validator_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // QueryAggregateVoteResponse is response type for the diff --git a/proto/terra/oracle/v1beta1/tx.proto b/proto/terra/oracle/v1beta1/tx.proto index c23d3626f..a39edf386 100644 --- a/proto/terra/oracle/v1beta1/tx.proto +++ b/proto/terra/oracle/v1beta1/tx.proto @@ -3,7 +3,7 @@ package terra.oracle.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/x/oracle/types"; +option go_package = "github.com/classic-terra/core/v3/x/oracle/types"; // Msg defines the oracle Msg service. service Msg { diff --git a/proto/terra/treasury/v1beta1/genesis.proto b/proto/terra/treasury/v1beta1/genesis.proto index e1eca82ee..c514745b6 100644 --- a/proto/terra/treasury/v1beta1/genesis.proto +++ b/proto/terra/treasury/v1beta1/genesis.proto @@ -1,18 +1,27 @@ syntax = "proto3"; package terra.treasury.v1beta1; +import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; + import "terra/treasury/v1beta1/treasury.proto"; -import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/classic-terra/core/v2/x/treasury/types"; +option go_package = "github.com/classic-terra/core/v3/x/treasury/types"; // GenesisState defines the oracle module's genesis state. message GenesisState { Params params = 1 [(gogoproto.nullable) = false]; - string tax_rate = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; - string reward_weight = 3 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string tax_rate = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; + string reward_weight = 3 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; repeated TaxCap tax_caps = 4 [(gogoproto.nullable) = false]; repeated cosmos.base.v1beta1.Coin tax_proceeds = 5 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; @@ -24,16 +33,29 @@ message GenesisState { // TaxCap is the max tax amount can be charged for the given denom message TaxCap { string denom = 1; - string tax_cap = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string tax_cap = 2 [ + (cosmos_proto.scalar) = "cosmos.Int", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; } // EpochState is the record for each epoch state message EpochState { uint64 epoch = 1; - string tax_reward = 2 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; - string seigniorage_reward = 3 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; - string total_staked_luna = 4 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string tax_reward = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; + string seigniorage_reward = 3 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; + string total_staked_luna = 4 [ + (cosmos_proto.scalar) = "cosmos.Int", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; } \ No newline at end of file diff --git a/proto/terra/treasury/v1beta1/gov.proto b/proto/terra/treasury/v1beta1/gov.proto index ede9bfcb4..d6dbd6c1b 100644 --- a/proto/terra/treasury/v1beta1/gov.proto +++ b/proto/terra/treasury/v1beta1/gov.proto @@ -1,9 +1,10 @@ syntax = "proto3"; package terra.treasury.v1beta1; +import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/x/treasury/types"; +option go_package = "github.com/classic-terra/core/v3/x/treasury/types"; // proposal request structure for adding burn tax exemption address(es) message AddBurnTaxExemptionAddressProposal { @@ -13,14 +14,16 @@ message AddBurnTaxExemptionAddressProposal { string title = 1; string description = 2; - repeated string addresses = 3 [(gogoproto.moretags) = "yaml:\"addresses\""]; + repeated string addresses = 3 + [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"addresses\""]; } // proposal request structure for removing burn tax exemption address(es) message RemoveBurnTaxExemptionAddressProposal { - option (gogoproto.equal) = true; - option (gogoproto.goproto_getters) = false; - option (gogoproto.goproto_stringer) = false; + option (gogoproto.equal) = true; + option (gogoproto.goproto_getters) = false; + option (gogoproto.goproto_stringer) = false; + option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content"; string title = 1; string description = 2; diff --git a/proto/terra/treasury/v1beta1/query.proto b/proto/terra/treasury/v1beta1/query.proto index 3096dd6a3..4affac16e 100644 --- a/proto/terra/treasury/v1beta1/query.proto +++ b/proto/terra/treasury/v1beta1/query.proto @@ -1,13 +1,16 @@ syntax = "proto3"; package terra.treasury.v1beta1; +import "cosmos_proto/cosmos.proto"; +import "cosmos/base/query/v1beta1/pagination.proto"; +import "cosmos/base/v1beta1/coin.proto"; + import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "cosmos/base/query/v1beta1/pagination.proto"; + import "terra/treasury/v1beta1/treasury.proto"; -import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/classic-terra/core/v2/x/treasury/types"; +option go_package = "github.com/classic-terra/core/v3/x/treasury/types"; // Query defines the gRPC querier service. service Query { @@ -63,7 +66,11 @@ message QueryTaxRateRequest {} // QueryTaxRateResponse is response type for the // Query/TaxRate RPC method. message QueryTaxRateResponse { - string tax_rate = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string tax_rate = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // QueryTaxCapRequest is the request type for the Query/TaxCap RPC method. @@ -78,7 +85,11 @@ message QueryTaxCapRequest { // QueryTaxCapResponse is response type for the // Query/TaxCap RPC method. message QueryTaxCapResponse { - string tax_cap = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string tax_cap = 1 [ + (cosmos_proto.scalar) = "cosmos.Int", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; } // QueryTaxCapsRequest is the request type for the Query/TaxCaps RPC method. @@ -91,7 +102,11 @@ message QueryTaxCapsRequest { // Query/TaxCaps RPC method. message QueryTaxCapsResponseItem { string denom = 1; - string tax_cap = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string tax_cap = 2 [ + (cosmos_proto.scalar) = "cosmos.Int", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; } // QueryTaxCapsResponse is response type for the @@ -106,8 +121,11 @@ message QueryRewardWeightRequest {} // QueryRewardWeightResponse is response type for the // Query/RewardWeight RPC method. message QueryRewardWeightResponse { - string reward_weight = 1 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; + string reward_weight = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // QueryTaxProceedsRequest is the request type for the Query/TaxProceeds RPC method. @@ -126,8 +144,11 @@ message QuerySeigniorageProceedsRequest {} // QuerySeigniorageProceedsResponse is response type for the // Query/SeigniorageProceeds RPC method. message QuerySeigniorageProceedsResponse { - string seigniorage_proceeds = 1 - [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; + string seigniorage_proceeds = 1 [ + (cosmos_proto.scalar) = "cosmos.Int", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.nullable) = false + ]; } // QueryIndicatorsRequest is the request type for the Query/Indicators RPC method. @@ -137,11 +158,13 @@ message QueryIndicatorsRequest {} // Query/Indicators RPC method. message QueryIndicatorsResponse { string trl_year = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false, (gogoproto.customname) = "TRLYear" ]; string trl_month = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false, (gogoproto.customname) = "TRLMonth" diff --git a/proto/terra/treasury/v1beta1/treasury.proto b/proto/terra/treasury/v1beta1/treasury.proto index 56fc6c4a9..1d91a9c63 100644 --- a/proto/terra/treasury/v1beta1/treasury.proto +++ b/proto/terra/treasury/v1beta1/treasury.proto @@ -1,10 +1,11 @@ syntax = "proto3"; package terra.treasury.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/x/treasury/types"; +option go_package = "github.com/classic-terra/core/v3/x/treasury/types"; // Params defines the parameters for the oracle module. message Params { @@ -14,11 +15,13 @@ message Params { PolicyConstraints tax_policy = 1 [(gogoproto.moretags) = "yaml:\"tax_policy\"", (gogoproto.nullable) = false]; PolicyConstraints reward_policy = 2 [(gogoproto.moretags) = "yaml:\"reward_policy\"", (gogoproto.nullable) = false]; string seigniorage_burden_target = 3 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"seigniorage_burden_target\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string mining_increment = 4 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"mining_increment\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false @@ -27,11 +30,13 @@ message Params { uint64 window_long = 6 [(gogoproto.moretags) = "yaml:\"window_long\""]; uint64 window_probation = 7 [(gogoproto.moretags) = "yaml:\"window_probation\""]; string burn_tax_split = 8 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"burn_tax_split\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string min_initial_deposit_ratio = 9 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"min_initial_deposit_ratio\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false @@ -44,17 +49,20 @@ message PolicyConstraints { option (gogoproto.goproto_stringer) = false; string rate_min = 1 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"rate_min\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string rate_max = 2 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"rate_max\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; cosmos.base.v1beta1.Coin cap = 3 [(gogoproto.moretags) = "yaml:\"cap\"", (gogoproto.nullable) = false]; string change_rate_max = 4 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"change_rate_max\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false diff --git a/proto/terra/tx/v1beta1/service.proto b/proto/terra/tx/v1beta1/service.proto index d046d0984..914332a80 100644 --- a/proto/terra/tx/v1beta1/service.proto +++ b/proto/terra/tx/v1beta1/service.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package terra.tx.v1beta1; -import "gogoproto/gogo.proto"; -import "google/api/annotations.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/tx/v1beta1/tx.proto"; +import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; option (gogoproto.goproto_registration) = true; -option go_package = "github.com/classic-terra/core/v2/custom/auth/tx"; +option go_package = "github.com/classic-terra/core/v3/custom/auth/tx"; // Service defines a gRPC service for interacting with transactions. service Service { diff --git a/proto/terra/vesting/v1beta1/vesting.proto b/proto/terra/vesting/v1beta1/vesting.proto index c837a6ce6..8efe3b970 100644 --- a/proto/terra/vesting/v1beta1/vesting.proto +++ b/proto/terra/vesting/v1beta1/vesting.proto @@ -1,10 +1,11 @@ syntax = "proto3"; package terra.vesting.v1beta1; -import "gogoproto/gogo.proto"; import "cosmos/vesting/v1beta1/vesting.proto"; +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/x/vesting/types"; +option go_package = "github.com/classic-terra/core/v3/x/vesting/types"; // LazyGradedVestingAccount implements the LazyGradedVestingAccount interface. It vests all // coins according to a predefined schedule. @@ -27,6 +28,7 @@ message Schedule { int64 start_time = 1 [(gogoproto.moretags) = "yaml:\"start_time\""]; int64 end_time = 2 [(gogoproto.moretags) = "yaml:\"end_time\""]; string ratio = 3 [ + (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.moretags) = "yaml:\"ratio\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false diff --git a/proto/terra/wasm/v1beta1/genesis.proto b/proto/terra/wasm/v1beta1/genesis.proto index 013590676..a3cfa6e4a 100644 --- a/proto/terra/wasm/v1beta1/genesis.proto +++ b/proto/terra/wasm/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package terra.wasm.v1beta1; import "gogoproto/gogo.proto"; import "terra/wasm/v1beta1/wasm.proto"; -option go_package = "github.com/classic-terra/core/v2/custom/wasm/types/legacy"; +option go_package = "github.com/classic-terra/core/v3/custom/wasm/types/legacy"; // Model is a struct that holds a KV pair message Model { @@ -15,11 +15,11 @@ message Model { // Code struct encompasses CodeInfo and CodeBytes message Code { LegacyCodeInfo code_info = 1 [(gogoproto.nullable) = false]; - bytes code_bytes = 2; + bytes code_bytes = 2; } // Contract struct encompasses ContractAddress, ContractInfo, and ContractState message Contract { - LegacyContractInfo contract_info = 1 [(gogoproto.nullable) = false]; - repeated Model contract_store = 2 [(gogoproto.nullable) = false]; + LegacyContractInfo contract_info = 1 [(gogoproto.nullable) = false]; + repeated Model contract_store = 2 [(gogoproto.nullable) = false]; } diff --git a/proto/terra/wasm/v1beta1/tx.proto b/proto/terra/wasm/v1beta1/tx.proto index ae32ceee8..2c5179075 100644 --- a/proto/terra/wasm/v1beta1/tx.proto +++ b/proto/terra/wasm/v1beta1/tx.proto @@ -4,7 +4,7 @@ package terra.wasm.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/classic-terra/core/v2/custom/wasm/types/legacy"; +option go_package = "github.com/classic-terra/core/v3/custom/wasm/types/legacy"; // Msg defines the oracle Msg service. service Msg { diff --git a/proto/terra/wasm/v1beta1/wasm.proto b/proto/terra/wasm/v1beta1/wasm.proto index a62dcbba8..a563059c3 100644 --- a/proto/terra/wasm/v1beta1/wasm.proto +++ b/proto/terra/wasm/v1beta1/wasm.proto @@ -3,7 +3,7 @@ package terra.wasm.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/classic-terra/core/v2/custom/wasm/types/legacy"; +option go_package = "github.com/classic-terra/core/v3/custom/wasm/types/legacy"; // CodeInfo is data for the uploaded contract WASM code message LegacyCodeInfo { diff --git a/scripts/protoc-swagger-gen.sh b/scripts/protoc-swagger-gen.sh index ccc0da896..537270cde 100755 --- a/scripts/protoc-swagger-gen.sh +++ b/scripts/protoc-swagger-gen.sh @@ -13,7 +13,7 @@ mkdir -p ./tmp-swagger-gen # Get the path of the cosmos-sdk repo from go/pkg/mod cosmos_sdk_dir=$(go list -f '{{ .Dir }}' -m github.com/cosmos/cosmos-sdk) -ibc_go_dir=$(go list -f '{{ .Dir }}' -m github.com/cosmos/ibc-go/v6) +ibc_go_dir=$(go list -f '{{ .Dir }}' -m github.com/cosmos/ibc-go/v7) wasm_dir=$(go list -f '{{ .Dir }}' -m github.com/CosmWasm/wasmd) proto_dirs=$(find ./proto "$cosmos_sdk_dir"/proto "$ibc_go_dir"/proto "$wasm_dir"/proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq) diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 9c78f8760..bfcae1a32 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -19,5 +19,5 @@ done cd .. # move proto files to the right places -cp -r github.com/classic-terra/core/v2/* ./ +cp -r github.com/classic-terra/core/v3/* ./ rm -rf github.com \ No newline at end of file diff --git a/scripts/run-node.sh b/scripts/run-node.sh index 38cff39e6..30243cac4 100755 --- a/scripts/run-node.sh +++ b/scripts/run-node.sh @@ -61,7 +61,6 @@ $BINARY add-genesis-account $KEY "1000000000000${DENOM}" --keyring-backend $KEYR $BINARY add-genesis-account $KEY1 "1000000000000${DENOM}" --keyring-backend $KEYRING --home $HOME_DIR $BINARY add-genesis-account $KEY2 "1000000000000${DENOM}" --keyring-backend $KEYRING --home $HOME_DIR -update_test_genesis '.app_state["gov"]["voting_params"]["voting_period"]="50s"' update_test_genesis '.app_state["mint"]["params"]["mint_denom"]="'$DENOM'"' update_test_genesis '.app_state["gov"]["deposit_params"]["min_deposit"]=[{"denom":"'$DENOM'","amount": "1000000"}]' update_test_genesis '.app_state["crisis"]["constant_fee"]={"denom":"'$DENOM'","amount":"1000"}' diff --git a/tests/e2e/configurer/base.go b/tests/e2e/configurer/base.go index f91bcbb27..fb61f17a8 100644 --- a/tests/e2e/configurer/base.go +++ b/tests/e2e/configurer/base.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/classic-terra/core/v2/tests/e2e/configurer/chain" - "github.com/classic-terra/core/v2/tests/e2e/containers" - "github.com/classic-terra/core/v2/tests/e2e/initialization" - "github.com/classic-terra/core/v2/tests/e2e/util" + "github.com/classic-terra/core/v3/tests/e2e/configurer/chain" + "github.com/classic-terra/core/v3/tests/e2e/containers" + "github.com/classic-terra/core/v3/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/util" ) // baseConfigurer is the base implementation for the @@ -75,8 +75,8 @@ func (bc *baseConfigurer) RunIBC() error { if err := bc.runIBCRelayer(bc.chainConfigs[0], bc.chainConfigs[1], containers.HermesContainerName1); err != nil { return err } - bc.t.Log("Run relayer 2 between chain b and chain c") - if err := bc.runIBCRelayer(bc.chainConfigs[1], bc.chainConfigs[2], containers.HermesContainerName2); err != nil { + bc.t.Log("Run relayer 2 between chain b and chain a") + if err := bc.runIBCRelayer(bc.chainConfigs[1], bc.chainConfigs[0], containers.HermesContainerName2); err != nil { return err } @@ -172,15 +172,14 @@ func (bc *baseConfigurer) runIBCRelayer(chainConfigA *chain.Config, chainConfigB time.Sleep(10 * time.Second) // create the client, connection and channel between the two Terra chains - return bc.connectIBCChains(chainConfigA, chainConfigB, hermesContainerName) + return bc.connectIBCChains(chainConfigA, chainConfigB) } -func (bc *baseConfigurer) connectIBCChains(chainA *chain.Config, chainB *chain.Config, hermesContainerName string) error { +func (bc *baseConfigurer) connectIBCChains(chainA *chain.Config, chainB *chain.Config) error { bc.t.Logf("connecting %s and %s chains via IBC", chainA.ChainMeta.ID, chainB.ChainMeta.ID) - cmd := []string{"hermes", "create", "channel", "--a-chain", chainA.ChainMeta.ID, "--b-chain", chainB.ChainMeta.ID, "--a-port", "transfer", "--b-port", "transfer", "--new-client-connection", "--yes"} bc.t.Log(cmd) - _, _, err := bc.containerManager.ExecHermesCmd(bc.t, cmd, hermesContainerName, "SUCCESS") + _, _, err := bc.containerManager.ExecHermesCmd(bc.t, cmd, "SUCCESS") if err != nil { return err } diff --git a/tests/e2e/configurer/chain/chain.go b/tests/e2e/configurer/chain/chain.go index 8667a808a..dd5f72e55 100644 --- a/tests/e2e/configurer/chain/chain.go +++ b/tests/e2e/configurer/chain/chain.go @@ -8,14 +8,13 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" + coretypes "github.com/cometbft/cometbft/rpc/core/types" "github.com/stretchr/testify/require" - coretypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/classic-terra/core/v2/tests/e2e/configurer/config" - "github.com/classic-terra/core/v2/tests/e2e/containers" - "github.com/classic-terra/core/v2/tests/e2e/initialization" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/tests/e2e/configurer/config" + "github.com/classic-terra/core/v3/tests/e2e/containers" + "github.com/classic-terra/core/v3/tests/e2e/initialization" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" ) type Config struct { @@ -114,42 +113,6 @@ func (c *Config) WaitForNumHeights(heightsToWait int64) { c.WaitUntilHeight(currentHeight + heightsToWait) } -func (c *Config) SendIBC(dstChain *Config, recipient string, token sdk.Coin, hermesContainerName string) { - c.t.Logf("IBC sending %s from %s to %s (%s)", token, c.ID, dstChain.ID, recipient) - - dstNode, err := dstChain.GetDefaultNode() - require.NoError(c.t, err) - - balancesDstPre, err := dstNode.QueryBalances(recipient) - require.NoError(c.t, err) - - cmd := []string{"hermes", "tx", "raw", "ft-transfer", dstChain.ID, c.ID, "transfer", "channel-0", token.Amount.String(), fmt.Sprintf("--denom=%s", token.Denom), fmt.Sprintf("--receiver=%s", recipient), "--timeout-height-offset=1000"} - _, _, err = c.containerManager.ExecHermesCmd(c.t, cmd, hermesContainerName, "Success") - require.NoError(c.t, err) - - require.Eventually( - c.t, - func() bool { - balancesDstPost, err := dstNode.QueryBalances(recipient) - require.NoError(c.t, err) - ibcCoin := balancesDstPost.Sub(balancesDstPre...) - if ibcCoin.Len() == 1 { - tokenPre := balancesDstPre.AmountOfNoDenomValidation(ibcCoin[0].Denom) - tokenPost := balancesDstPost.AmountOfNoDenomValidation(ibcCoin[0].Denom) - resPre := token.Amount - resPost := tokenPost.Sub(tokenPre) - return resPost.Uint64() == resPre.Uint64() - } - return false - }, - initialization.FiveMin, - time.Second, - "tx not received on destination chain", - ) - - c.t.Log("successfully sent IBC tokens") -} - func (c *Config) GetDefaultNode() (*NodeConfig, error) { return c.getNodeAtIndex(defaultNodeIndex) } diff --git a/tests/e2e/configurer/chain/commands.go b/tests/e2e/configurer/chain/commands.go index d0a45bd88..954868ece 100644 --- a/tests/e2e/configurer/chain/commands.go +++ b/tests/e2e/configurer/chain/commands.go @@ -11,21 +11,21 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/p2p" - coretypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/cometbft/cometbft/libs/bytes" + "github.com/cometbft/cometbft/p2p" + coretypes "github.com/cometbft/cometbft/rpc/core/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - app "github.com/classic-terra/core/v2/app" - "github.com/classic-terra/core/v2/tests/e2e/initialization" - "github.com/classic-terra/core/v2/types/assets" + app "github.com/classic-terra/core/v3/app" + "github.com/classic-terra/core/v3/tests/e2e/initialization" + "github.com/classic-terra/core/v3/types/assets" ) func (n *NodeConfig) StoreWasmCode(wasmFile, from string) { n.LogActionF("storing wasm code from file %s", wasmFile) - cmd := []string{"terrad", "tx", "wasm", "store", wasmFile, fmt.Sprintf("--from=%s", from), "--gas=auto", "--gas-prices=0uluna", "--gas-adjustment=1.3"} + cmd := []string{"terrad", "tx", "wasm", "store", wasmFile, fmt.Sprintf("--from=%s", from)} _, _, err := n.containerManager.ExecTxCmd(n.t, n.chainID, n.Name, cmd) require.NoError(n.t, err) n.LogActionF("successfully stored") @@ -33,7 +33,7 @@ func (n *NodeConfig) StoreWasmCode(wasmFile, from string) { func (n *NodeConfig) InstantiateWasmContract(codeID, initMsg, amount, from string) { n.LogActionF("instantiating wasm contract %s with %s", codeID, initMsg) - cmd := []string{"terrad", "tx", "wasm", "instantiate", codeID, initMsg, fmt.Sprintf("--from=%s", from), "--no-admin", "--label=ratelimit", "--gas=auto", "--gas-prices=0.0uluna", "--gas-adjustment=1.3"} + cmd := []string{"terrad", "tx", "wasm", "instantiate", codeID, initMsg, fmt.Sprintf("--from=%s", from), "--no-admin", "--label=ratelimit"} if amount != "" { cmd = append(cmd, fmt.Sprintf("--amount=%s", amount)) } @@ -49,7 +49,7 @@ func (n *NodeConfig) Instantiate2WasmContract(codeID, initMsg, salt, amount, fee n.LogActionF("instantiating wasm contract %s with %s", codeID, initMsg) encodedSalt := make([]byte, hex.EncodedLen(len([]byte(salt)))) hex.Encode(encodedSalt, []byte(salt)) - cmd := []string{"terrad", "tx", "wasm", "instantiate2", codeID, initMsg, string(encodedSalt), fmt.Sprintf("--from=%s", from), "--no-admin", "--label=ratelimit", "--gas=auto", "--gas-prices=0.0uluna", "--gas-adjustment=1.3"} + cmd := []string{"terrad", "tx", "wasm", "instantiate2", codeID, initMsg, string(encodedSalt), fmt.Sprintf("--from=%s", from), "--no-admin", "--label=ratelimit"} if amount != "" { cmd = append(cmd, fmt.Sprintf("--amount=%s", amount)) } @@ -64,7 +64,7 @@ func (n *NodeConfig) Instantiate2WasmContract(codeID, initMsg, salt, amount, fee func (n *NodeConfig) WasmExecute(contract, execMsg, amount, fee, from string) { n.LogActionF("executing %s on wasm contract %s from %s", execMsg, contract, from) - cmd := []string{"terrad", "tx", "wasm", "execute", contract, execMsg, fmt.Sprintf("--from=%s", from), "--gas=auto", "--gas-prices=0.0uluna", "--gas-adjustment=1.3"} + cmd := []string{"terrad", "tx", "wasm", "execute", contract, execMsg, fmt.Sprintf("--from=%s", from)} if amount != "" { cmd = append(cmd, fmt.Sprintf("--amount=%s", amount)) } @@ -82,7 +82,7 @@ func (n *NodeConfig) WasmExecute(contract, execMsg, amount, fee, from string) { func (n *NodeConfig) QueryParams(subspace, key string, result any) { cmd := []string{"terrad", "query", "params", "subspace", subspace, key, "--output=json"} - out, _, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "") + out, _, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "", false) require.NoError(n.t, err) err = json.Unmarshal(out.Bytes(), &result) @@ -127,6 +127,7 @@ func (n *NodeConfig) SubmitAddBurnTaxExemptionAddressProposal(addresses []string resp, _, err := n.containerManager.ExecTxCmd(n.t, n.chainID, n.Name, cmd) require.NoError(n.t, err) + fmt.Println("resp: ", resp.String()) proposalID, err := extractProposalIDFromResponse(resp.String()) require.NoError(n.t, err) @@ -150,7 +151,7 @@ func (n *NodeConfig) SendIBCTransfer(from, recipient, amount, memo string) { cmd := []string{"terrad", "tx", "ibc-transfer", "transfer", "transfer", "channel-0", recipient, amount, fmt.Sprintf("--from=%s", from), "--memo", memo} - _, _, err := n.containerManager.ExecTxCmdWithSuccessString(n.t, n.chainID, n.Name, cmd, "code: 0") + _, _, err := n.containerManager.ExecTxCmdWithSuccessString(n.t, n.chainID, n.Name, cmd, "\"code\":0") require.NoError(n.t, err) n.LogActionF("successfully submitted sent IBC transfer") @@ -258,7 +259,7 @@ func (n *NodeConfig) GrantAddress(granter, gratee string, spendLimit string, wal func (n *NodeConfig) CreateWallet(walletName string) string { n.LogActionF("creating wallet %s", walletName) cmd := []string{"terrad", "keys", "add", walletName, "--keyring-backend=test"} - outBuf, _, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "") + outBuf, _, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "", false) require.NoError(n.t, err) re := regexp.MustCompile("terra1(.{38})") walletAddr := fmt.Sprintf("%s\n", re.FindString(outBuf.String())) @@ -270,7 +271,7 @@ func (n *NodeConfig) CreateWallet(walletName string) string { func (n *NodeConfig) GetWallet(walletName string) string { n.LogActionF("retrieving wallet %s", walletName) cmd := []string{"terrad", "keys", "show", walletName, "--keyring-backend=test"} - outBuf, _, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "") + outBuf, _, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "", false) require.NoError(n.t, err) re := regexp.MustCompile("terra1(.{38})") walletAddr := fmt.Sprintf("%s\n", re.FindString(outBuf.String())) @@ -295,7 +296,7 @@ type resultStatus struct { func (n *NodeConfig) Status() (resultStatus, error) { //nolint cmd := []string{"terrad", "status"} - _, errBuf, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "") + _, errBuf, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "", false) if err != nil { return resultStatus{}, err } diff --git a/tests/e2e/configurer/chain/node.go b/tests/e2e/configurer/chain/node.go index 85336f230..584318e90 100644 --- a/tests/e2e/configurer/chain/node.go +++ b/tests/e2e/configurer/chain/node.go @@ -8,12 +8,12 @@ import ( "testing" "time" + rpchttp "github.com/cometbft/cometbft/rpc/client/http" + coretypes "github.com/cometbft/cometbft/rpc/core/types" "github.com/stretchr/testify/require" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - coretypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/classic-terra/core/v2/tests/e2e/containers" - "github.com/classic-terra/core/v2/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/containers" + "github.com/classic-terra/core/v3/tests/e2e/initialization" ) type NodeConfig struct { @@ -119,7 +119,7 @@ func (n *NodeConfig) extractOperatorAddressIfValidator() error { cmd := []string{"terrad", "debug", "addr", n.PublicKey} n.t.Logf("extracting validator operator addresses for validator: %s", n.Name) - _, errBuf, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "") + _, errBuf, err := n.containerManager.ExecCmd(n.t, n.Name, cmd, "", false) if err != nil { return err } diff --git a/tests/e2e/configurer/chain/queries.go b/tests/e2e/configurer/chain/queries.go index e9f6619a6..7929817ab 100644 --- a/tests/e2e/configurer/chain/queries.go +++ b/tests/e2e/configurer/chain/queries.go @@ -9,18 +9,19 @@ import ( "net/http" "time" + "cosmossdk.io/math" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + tmabcitypes "github.com/cometbft/cometbft/abci/types" "github.com/stretchr/testify/require" - tmabcitypes "github.com/tendermint/tendermint/abci/types" - "github.com/classic-terra/core/v2/tests/e2e/initialization" - "github.com/classic-terra/core/v2/tests/e2e/util" + "github.com/classic-terra/core/v3/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/util" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" ) func (n *NodeConfig) QueryGRPCGateway(path string, parameters ...string) ([]byte, error) { @@ -28,7 +29,7 @@ func (n *NodeConfig) QueryGRPCGateway(path string, parameters ...string) ([]byte return nil, fmt.Errorf("invalid number of parameters, must follow the format of key + value") } - // add the URL for the given validator ID, and pre-pend to to path. + // add the URL for the given validator ID, and prepend to to path. hostPort, err := n.containerManager.GetHostPort(n.Name, "1317/tcp") require.NoError(n.t, err) endpoint := fmt.Sprintf("http://%s", hostPort) @@ -97,7 +98,7 @@ func (n *NodeConfig) QuerySpecificBalance(addr, denom string) (sdk.Coin, error) return sdk.Coin{}, nil } -func (n *NodeConfig) QuerySupplyOf(denom string) (sdk.Int, error) { +func (n *NodeConfig) QuerySupplyOf(denom string) (math.Int, error) { path := fmt.Sprintf("cosmos/bank/v1beta1/supply/%s", denom) bz, err := n.QueryGRPCGateway(path) require.NoError(n.t, err) diff --git a/tests/e2e/configurer/current.go b/tests/e2e/configurer/current.go index 94a2c0a9e..4fcd3a088 100644 --- a/tests/e2e/configurer/current.go +++ b/tests/e2e/configurer/current.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "github.com/classic-terra/core/v2/tests/e2e/configurer/chain" - "github.com/classic-terra/core/v2/tests/e2e/containers" - "github.com/classic-terra/core/v2/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/configurer/chain" + "github.com/classic-terra/core/v3/tests/e2e/containers" + "github.com/classic-terra/core/v3/tests/e2e/initialization" ) type CurrentBranchConfigurer struct { diff --git a/tests/e2e/configurer/factory.go b/tests/e2e/configurer/factory.go index d64efde4f..3bf5407bf 100644 --- a/tests/e2e/configurer/factory.go +++ b/tests/e2e/configurer/factory.go @@ -3,9 +3,9 @@ package configurer import ( "testing" - "github.com/classic-terra/core/v2/tests/e2e/configurer/chain" - "github.com/classic-terra/core/v2/tests/e2e/containers" - "github.com/classic-terra/core/v2/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/configurer/chain" + "github.com/classic-terra/core/v3/tests/e2e/containers" + "github.com/classic-terra/core/v3/tests/e2e/initialization" ) type Configurer interface { @@ -94,35 +94,35 @@ var ( IsValidator: true, }, } - validatorConfigsChainC = []*initialization.NodeConfig{ - { - Name: "prune-default-snapshot", - Pruning: "default", - PruningKeepRecent: "0", - PruningInterval: "0", - SnapshotInterval: 1500, - SnapshotKeepRecent: 2, - IsValidator: true, - }, - { - Name: "prune-nothing-snapshot", - Pruning: "nothing", - PruningKeepRecent: "0", - PruningInterval: "0", - SnapshotInterval: 1500, - SnapshotKeepRecent: 2, - IsValidator: true, - }, - { - Name: "prune-custom-snapshot", - Pruning: "custom", - PruningKeepRecent: "10000", - PruningInterval: "13", - SnapshotInterval: 1500, - SnapshotKeepRecent: 2, - IsValidator: true, - }, - } + // validatorConfigsChainC = []*initialization.NodeConfig{ + // { + // Name: "prune-default-snapshot", + // Pruning: "default", + // PruningKeepRecent: "0", + // PruningInterval: "0", + // SnapshotInterval: 1500, + // SnapshotKeepRecent: 2, + // IsValidator: true, + // }, + // { + // Name: "prune-nothing-snapshot", + // Pruning: "nothing", + // PruningKeepRecent: "0", + // PruningInterval: "0", + // SnapshotInterval: 1500, + // SnapshotKeepRecent: 2, + // IsValidator: true, + // }, + // { + // Name: "prune-custom-snapshot", + // Pruning: "custom", + // PruningKeepRecent: "10000", + // PruningInterval: "13", + // SnapshotInterval: 1500, + // SnapshotKeepRecent: 2, + // IsValidator: true, + // }, + // } ) // New returns a new Configurer depending on the values of its parameters. @@ -139,7 +139,7 @@ func New(t *testing.T, isIBCEnabled, isDebugLogEnabled bool) (Configurer, error) []*chain.Config{ chain.New(t, containerManager, initialization.ChainAID, validatorConfigsChainA), chain.New(t, containerManager, initialization.ChainBID, validatorConfigsChainB), - chain.New(t, containerManager, initialization.ChainCID, validatorConfigsChainC), + // chain.New(t, containerManager, initialization.ChainCID, validatorConfigsChainC), }, withIBC(baseSetup), // base set up with IBC containerManager, diff --git a/tests/e2e/containers/containers.go b/tests/e2e/containers/containers.go index e914f9041..8ffbbbd80 100644 --- a/tests/e2e/containers/containers.go +++ b/tests/e2e/containers/containers.go @@ -3,6 +3,7 @@ package containers import ( "bytes" "context" + "encoding/json" "fmt" "os" "regexp" @@ -13,17 +14,24 @@ import ( "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" + "gopkg.in/yaml.v2" ) const ( + hermesContainerName = "hermes-relayer" + HermesContainerName1 = "hermes-relayer" HermesContainerName2 = "hermes-relayer2" // The maximum number of times debug logs are printed to console // per CLI command. maxDebugLogsPerCommand = 3 + GasLimit = 4000000 ) -var defaultErrRegex = regexp.MustCompile(`(E|e)rror`) +var ( + defaultErrRegex = regexp.MustCompile(`(E|e)rror`) + txDefaultGasArgs = []string{fmt.Sprintf("--gas=%d", GasLimit), "--fees=0uluna"} +) // Manager is a wrapper around all Docker instances, and the Docker API. // It provides utilities to run and interact with all Docker containers used within e2e testing. @@ -35,6 +43,22 @@ type Manager struct { isDebugLogEnabled bool } +type TxResponse struct { + Code int `yaml:"code" json:"code"` + Codespace string `yaml:"codespace" json:"codespace"` + Data string `yaml:"data" json:"data"` + GasUsed string `yaml:"gas_used" json:"gas_used"` + GasWanted string `yaml:"gas_wanted" json:"gas_wanted"` + Height string `yaml:"height" json:"height"` + Info string `yaml:"info" json:"info"` + Logs []string `yaml:"logs" json:"logs"` + Timestamp string `yaml:"timestamp" json:"timestamp"` + Tx string `yaml:"tx" json:"tx"` + TxHash string `yaml:"txhash" json:"txhash"` + RawLog string `yaml:"raw_log" json:"raw_log"` + Events []string `yaml:"events" json:"events"` +} + // NewManager creates a new Manager instance and initializes // all Docker specific utilies. Returns an error if initialiation fails. func NewManager(isDebugLogEnabled bool) (docker *Manager, err error) { @@ -56,24 +80,34 @@ func NewManager(isDebugLogEnabled bool) (docker *Manager, err error) { // ExecTxCmd Runs ExecTxCmdWithSuccessString searching for `code: 0` func (m *Manager) ExecTxCmd(t *testing.T, chainID string, containerName string, command []string) (bytes.Buffer, bytes.Buffer, error) { - return m.ExecTxCmdWithSuccessString(t, chainID, containerName, command, "code: 0") + return m.ExecTxCmdWithSuccessString(t, chainID, containerName, command, "\"code\":0") } // ExecTxCmdWithSuccessString Runs ExecCmd, with flags for txs added. -// namely adding flags `--chain-id={chain-id} -b=block --yes --keyring-backend=test "--log_format=json"`, +// namely adding flags `--chain-id={chain-id} --yes --keyring-backend=test "--log_format=json"`, // and searching for `successStr` func (m *Manager) ExecTxCmdWithSuccessString(t *testing.T, chainID string, containerName string, command []string, successStr string) (bytes.Buffer, bytes.Buffer, error) { - allTxArgs := []string{fmt.Sprintf("--chain-id=%s", chainID), "-b=block", "--yes", "--keyring-backend=test", "--log_format=json"} + allTxArgs := []string{fmt.Sprintf("--chain-id=%s", chainID), "--yes", "--keyring-backend=test", "--log_format=json"} + // parse to see if command has gas flags. If not, add default gas flags. + addGasFlags := true + for _, cmd := range command { + if strings.HasPrefix(cmd, "--gas") || strings.HasPrefix(cmd, "--fees") { + addGasFlags = false + } + } + if addGasFlags { + allTxArgs = append(allTxArgs, txDefaultGasArgs...) + } txCommand := append(command, allTxArgs...) //nolint - return m.ExecCmd(t, containerName, txCommand, successStr) + return m.ExecCmd(t, containerName, txCommand, successStr, true) } // ExecHermesCmd executes command on the hermes relayer 1 container. -func (m *Manager) ExecHermesCmd(t *testing.T, command []string, hermesContainerName string, success string) (bytes.Buffer, bytes.Buffer, error) { - return m.ExecCmd(t, hermesContainerName, command, success) +func (m *Manager) ExecHermesCmd(t *testing.T, command []string, success string) (bytes.Buffer, bytes.Buffer, error) { + return m.ExecCmd(t, hermesContainerName, command, success, false) } -func (m *Manager) ExecCmd(t *testing.T, containerName string, command []string, success string) (bytes.Buffer, bytes.Buffer, error) { +func (m *Manager) ExecCmd(t *testing.T, containerName string, command []string, success string, checkTxHash bool) (bytes.Buffer, bytes.Buffer, error) { if _, ok := m.resources[containerName]; !ok { return bytes.Buffer{}, bytes.Buffer{}, fmt.Errorf("no resource %s found", containerName) } @@ -88,15 +122,18 @@ func (m *Manager) ExecCmd(t *testing.T, containerName string, command []string, defer cancel() if m.isDebugLogEnabled { - t.Logf("\n\nRunning: \"%s\", success condition is \"%s\"", command, success) + t.Logf("\n\nRunning: \"%s\", success condition is -- %s --", command, success) } maxDebugLogTriesLeft := maxDebugLogsPerCommand - + var lastErr error // We use the `require.Eventually` function because it is only allowed to do one transaction per block without // sequence numbers. For simplicity, we avoid keeping track of the sequence number and just use the `require.Eventually`. require.Eventually( t, func() bool { + outBuf.Reset() + errBuf.Reset() + exec, err := m.pool.Client.CreateExec(docker.CreateExecOptions{ Context: ctx, AttachStdout: true, @@ -114,6 +151,7 @@ func (m *Manager) ExecCmd(t *testing.T, containerName string, command []string, ErrorStream: &errBuf, }) if err != nil { + lastErr = err return false } @@ -135,21 +173,121 @@ func (m *Manager) ExecCmd(t *testing.T, containerName string, command []string, maxDebugLogTriesLeft-- } - if success != "" { - return strings.Contains(outBuf.String(), success) || strings.Contains(errBufString, success) + // If the success string is not empty and we are checking the tx hash, check if the output or error string contains the success string + if success != "" && checkTxHash { + // Now that sdk got rid of block.. we need to query the txhash to get the result + var txResponse TxResponse + txResponse, err = parseTxResponse(outBuf.String()) + if err != nil { + lastErr = err + return false + } + + // Don't even attempt to query the tx hash if the initial response code is not 0 + if txResponse.Code != 0 { + return false + } + + // This method attempts to query the txhash until the block is committed, at which point it returns an error here, + // causing the tx to be submitted again. + outBuf, errBuf, err = m.ExecQueryTxHash(t, containerName, txResponse.TxHash) + if err != nil { + lastErr = err + return false + } + + t.Log("pass") + return strings.Contains(outBuf.String(), success) || strings.Contains(errBuf.String(), success) } - return true + return strings.Contains(outBuf.String(), success) || strings.Contains(errBuf.String(), success) }, time.Minute, 50*time.Millisecond, - fmt.Sprintf("success condition (%s) was not met.\nstdout:\n %s\nstderr:\n %s\n", - success, outBuf.String(), errBuf.String()), + fmt.Sprintf("success condition (%s) was not met.\nstdout:\n %s\nstderr:\n %s\n errors:\n %v\n", + success, outBuf.String(), errBuf.String(), lastErr), ) return outBuf, errBuf, nil } +func (m *Manager) ExecQueryTxHash(t *testing.T, containerName, txHash string) (bytes.Buffer, bytes.Buffer, error) { + t.Helper() + if _, ok := m.resources[containerName]; !ok { + return bytes.Buffer{}, bytes.Buffer{}, fmt.Errorf("no resource %s found", containerName) + } + containerID := m.resources[containerName].Container.ID + + var ( + exec *docker.Exec + outBuf bytes.Buffer + errBuf bytes.Buffer + err error + ) + + command := []string{"terrad", "query", "tx", txHash, "-o=json"} + + ctx, cancel := context.WithTimeout(context.Background(), time.Minute) + defer cancel() + + if m.isDebugLogEnabled { + t.Logf("\n\nRunning: \"%s\", success condition is \"code: 0\"", txHash) + } + maxDebugLogTriesLeft := maxDebugLogsPerCommand + + successConditionMet := false + startTime := time.Now() + for time.Since(startTime) < time.Second*5 { + outBuf.Reset() + errBuf.Reset() + + exec, err = m.pool.Client.CreateExec(docker.CreateExecOptions{ + Context: ctx, + AttachStdout: true, + AttachStderr: true, + Container: containerID, + User: "root", + Cmd: command, + }) + if err != nil { + return outBuf, errBuf, err + } + + err = m.pool.Client.StartExec(exec.ID, docker.StartExecOptions{ + Context: ctx, + Detach: false, + OutputStream: &outBuf, + ErrorStream: &errBuf, + }) + if err != nil { + return outBuf, errBuf, err + } + + if (defaultErrRegex.MatchString(errBuf.String()) || m.isDebugLogEnabled) && maxDebugLogTriesLeft > 0 && + !strings.Contains(errBuf.String(), "not found") { + t.Log("\nstderr:") + t.Log(errBuf.String()) + + t.Log("\nstdout:") + t.Log(outBuf.String()) + maxDebugLogTriesLeft-- + } + + successConditionMet = strings.Contains(outBuf.String(), "code\":0") || strings.Contains(errBuf.String(), "code\":0") + if successConditionMet { + break + } + + time.Sleep(100 * time.Millisecond) + } + + if !successConditionMet { + return outBuf, errBuf, fmt.Errorf("success condition for txhash %s \"code: 0\" command %s was not met.\t stdout:\t %s \t stderr: \t %s \t", txHash, command, outBuf.String(), errBuf.String()) + } + + return outBuf, errBuf, nil +} + // RunHermesResource runs a Hermes container. Returns the container resource and error if any. // the name of the hermes container is "--relayer" func (m *Manager) RunHermesResource(chainAID, terraARelayerNodeName, terraAValMnemonic, chainBID, terraBRelayerNodeName, terraBValMnemonic string, hermesContainerName string, hermesCfgPath string) (*dockertest.Resource, error) { @@ -325,3 +463,32 @@ func noRestart(config *docker.HostConfig) { Name: "no", } } + +func parseTxResponse(outStr string) (txResponse TxResponse, err error) { + if strings.Contains(outStr, "{\"height\":\"") { + startIdx := strings.Index(outStr, "{\"height\":\"") + if startIdx == -1 { + return txResponse, fmt.Errorf("start of JSON data not found") + } + // Trim the string to start from the identified index + outStrTrimmed := outStr[startIdx:] + // JSON format + err = json.Unmarshal([]byte(outStrTrimmed), &txResponse) + if err != nil { + return txResponse, fmt.Errorf("JSON Unmarshal error: %v", err) + } + } else { + // Find the start of the YAML data + startIdx := strings.Index(outStr, "code: ") + if startIdx == -1 { + return txResponse, fmt.Errorf("start of YAML data not found") + } + // Trim the string to start from the identified index + outStrTrimmed := outStr[startIdx:] + err = yaml.Unmarshal([]byte(outStrTrimmed), &txResponse) + if err != nil { + return txResponse, fmt.Errorf("YAML Unmarshal error: %v", err) + } + } + return txResponse, err +} diff --git a/tests/e2e/e2e.Dockerfile b/tests/e2e/e2e.Dockerfile index 6d5c54d06..bc03e04b5 100644 --- a/tests/e2e/e2e.Dockerfile +++ b/tests/e2e/e2e.Dockerfile @@ -52,8 +52,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ # Cosmwasm - Download correct libwasmvm version and verify checksum RUN set -eux &&\ - WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 5) && \ - WASMVM_DOWNLOADS="https://github.com/classic-terra/wasmvm/releases/download/${WASMVM_VERSION}"; \ + WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 2) && \ + WASMVM_DOWNLOADS="https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}"; \ wget ${WASMVM_DOWNLOADS}/checksums.txt -O /tmp/checksums.txt; \ if [ ${BUILDPLATFORM} = "linux/amd64" ]; then \ WASMVM_URL="${WASMVM_DOWNLOADS}/libwasmvm_muslc.x86_64.a"; \ diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index 60bd98bb0..c68ccfd26 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/suite" - configurer "github.com/classic-terra/core/v2/tests/e2e/configurer" + configurer "github.com/classic-terra/core/v3/tests/e2e/configurer" ) const ( diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 5c504f3eb..d14e84dff 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -8,7 +8,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/initialization" ) func (s *IntegrationTestSuite) TestIBCWasmHooks() { @@ -185,7 +185,6 @@ func (s *IntegrationTestSuite) TestFeeTaxWasm() { transferAmount := sdkmath.NewInt(100000000) transferCoin := sdk.NewCoin(initialization.TerraDenom, transferAmount) node.BankSend(fmt.Sprintf("%suluna", transferAmount.Mul(sdk.NewInt(4))), initialization.ValidatorWalletName, testAddr) - node.StoreWasmCode("counter.wasm", initialization.ValidatorWalletName) chain.LatestCodeID = int(node.QueryLatestWasmCodeID()) // instantiate contract and transfer 100000000uluna diff --git a/tests/e2e/initialization/chain.go b/tests/e2e/initialization/chain.go index 48657683e..a32da6faf 100644 --- a/tests/e2e/initialization/chain.go +++ b/tests/e2e/initialization/chain.go @@ -12,13 +12,12 @@ type internalChain struct { nodes []*internalNode } -func new(id, dataDir string) (*internalChain, error) { - chainMeta := ChainMeta{ - ID: id, - DataDir: dataDir, - } +func newChain(id, dataDir string) (*internalChain, error) { return &internalChain{ - chainMeta: chainMeta, + chainMeta: ChainMeta{ + ID: id, + DataDir: dataDir, + }, }, nil } diff --git a/tests/e2e/initialization/chain/main.go b/tests/e2e/initialization/chain/main.go index ef9e226eb..b63871d9d 100644 --- a/tests/e2e/initialization/chain/main.go +++ b/tests/e2e/initialization/chain/main.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/classic-terra/core/v2/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/initialization" ) func main() { diff --git a/tests/e2e/initialization/config.go b/tests/e2e/initialization/config.go index d93346f96..79a5bac58 100644 --- a/tests/e2e/initialization/config.go +++ b/tests/e2e/initialization/config.go @@ -6,6 +6,7 @@ import ( "path/filepath" "time" + tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cosmos/cosmos-sdk/server" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -17,12 +18,11 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" staketypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/gogo/protobuf/proto" - tmjson "github.com/tendermint/tendermint/libs/json" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/classic-terra/core/v2/tests/e2e/util" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/tests/e2e/util" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" ) // NodeConfig is a confiuration for the node supplied from the test runner @@ -59,11 +59,11 @@ const ( StakeAmountB = 400000000000 GenesisFeeBalance = 100000000000 WalletFeeBalance = 100000000 - // chainC - ChainCID = "terra-test-c" - TerraBalanceC = 500000000000 - StakeBalanceC = 440000000000 - StakeAmountC = 400000000000 + // // chainC + // ChainCID = "terra-test-c" + // TerraBalanceC = 500000000000 + // StakeBalanceC = 440000000000 + // StakeAmountC = 400000000000 ) var ( @@ -74,13 +74,13 @@ var ( InitBalanceStrA = fmt.Sprintf("%d%s", TerraBalanceA, TerraDenom) InitBalanceStrB = fmt.Sprintf("%d%s", TerraBalanceB, TerraDenom) - InitBalanceStrC = fmt.Sprintf("%d%s", TerraBalanceC, TerraDenom) - LunaToken = sdk.NewInt64Coin(TerraDenom, IbcSendAmount) // 3,300luna - tenTerra = sdk.Coins{sdk.NewInt64Coin(TerraDenom, 10_000_000)} + // InitBalanceStrC = fmt.Sprintf("%d%s", TerraBalanceC, TerraDenom) + LunaToken = sdk.NewInt64Coin(TerraDenom, IbcSendAmount) // 3,300luna + tenTerra = sdk.Coins{sdk.NewInt64Coin(TerraDenom, 10_000_000)} - OneMin = time.Minute // nolint - TwoMin = 2 * time.Minute // nolint - FiveMin = 5 * time.Minute // nolint + OneMin = time.Minute // nolint + TwoMin = 2 * time.Minute // nolint + FiveMin = 5 * time.Minute // nolint TaxRate = sdk.NewDecWithPrec(2, 2) // 0.02 ) @@ -191,10 +191,10 @@ func initGenesis(chain *internalChain, forkHeight int) error { if err := addAccount(configDir, "", InitBalanceStrB, accAdd, forkHeight); err != nil { return err } - case ChainCID: - if err := addAccount(configDir, "", InitBalanceStrC, accAdd, forkHeight); err != nil { - return err - } + // case ChainCID: + // if err := addAccount(configDir, "", InitBalanceStrC, accAdd, forkHeight); err != nil { + // return err + // } } } @@ -313,12 +313,13 @@ func updateTreasuryGenesis(treasuryGenState *treasurytypes.GenesisState) { } func updateGovGenesis(govGenState *govv1.GenesisState) { - govGenState.VotingParams.VotingPeriod = &OneMin - govGenState.TallyParams.Quorum = sdk.NewDecWithPrec(2, 1).String() - govGenState.DepositParams.MinDeposit = tenTerra + govGenState.Params.VotingPeriod = &OneMin + govGenState.Params.Quorum = sdk.NewDecWithPrec(2, 1).String() + govGenState.Params.MinDeposit = tenTerra } func updateGenUtilGenesis(c *internalChain) func(*genutiltypes.GenesisState) { + genutilErr := "genutil genesis setup failed: " return func(genUtilGenState *genutiltypes.GenesisState) { // generate genesis txs genTxs := make([]json.RawMessage, 0, len(c.nodes)) @@ -333,17 +334,17 @@ func updateGenUtilGenesis(c *internalChain) func(*genutiltypes.GenesisState) { } createValmsg, err := node.buildCreateValidatorMsg(stakeAmountCoin) if err != nil { - panic("genutil genesis setup failed: " + err.Error()) + panic(genutilErr + err.Error()) } signedTx, err := node.signMsg(createValmsg) if err != nil { - panic("genutil genesis setup failed: " + err.Error()) + panic(genutilErr + err.Error()) } txRaw, err := util.Cdc.MarshalJSON(signedTx) if err != nil { - panic("genutil genesis setup failed: " + err.Error()) + panic(genutilErr + err.Error()) } genTxs = append(genTxs, txRaw) } diff --git a/tests/e2e/initialization/init.go b/tests/e2e/initialization/init.go index 90bf6b814..c3bfbcb33 100644 --- a/tests/e2e/initialization/init.go +++ b/tests/e2e/initialization/init.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/classic-terra/core/v2/tests/e2e/util" - coreutil "github.com/classic-terra/core/v2/types/util" + "github.com/classic-terra/core/v3/tests/e2e/util" + coreutil "github.com/classic-terra/core/v3/types/util" ) func init() { @@ -45,7 +45,7 @@ func SetAddressPrefixes() { } func InitChain(id, dataDir string, nodeConfigs []*NodeConfig, forkHeight int) (*Chain, error) { - chain, err := new(id, dataDir) + chain, err := newChain(id, dataDir) if err != nil { return nil, err } @@ -84,7 +84,7 @@ func InitSingleNode(chainID, dataDir string, existingGenesisDir string, nodeConf return nil, errors.New("creating individual validator nodes after starting up chain is not currently supported") } - chain, err := new(chainID, dataDir) + chain, err := newChain(chainID, dataDir) if err != nil { return nil, err } diff --git a/tests/e2e/initialization/init_test.go b/tests/e2e/initialization/init_test.go index 4796de6af..4dbdcabe8 100644 --- a/tests/e2e/initialization/init_test.go +++ b/tests/e2e/initialization/init_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/classic-terra/core/v2/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/initialization" "github.com/stretchr/testify/require" ) diff --git a/tests/e2e/initialization/node.go b/tests/e2e/initialization/node.go index b5c41693a..959c1ca66 100644 --- a/tests/e2e/initialization/node.go +++ b/tests/e2e/initialization/node.go @@ -8,6 +8,11 @@ import ( "path/filepath" "strings" + tmconfig "github.com/cometbft/cometbft/config" + tmos "github.com/cometbft/cometbft/libs/os" + "github.com/cometbft/cometbft/p2p" + "github.com/cometbft/cometbft/privval" + tmtypes "github.com/cometbft/cometbft/types" sdkcrypto "github.com/cosmos/cosmos-sdk/crypto" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/hd" @@ -23,14 +28,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/go-bip39" "github.com/spf13/viper" - tmconfig "github.com/tendermint/tendermint/config" - tmos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" - tmtypes "github.com/tendermint/tendermint/types" - - terraApp "github.com/classic-terra/core/v2/app" - "github.com/classic-terra/core/v2/tests/e2e/util" + + terraApp "github.com/classic-terra/core/v3/app" + "github.com/classic-terra/core/v3/tests/e2e/util" ) type internalNode struct { @@ -120,6 +120,8 @@ func (n *internalNode) createAppConfig(nodeConfig *NodeConfig) { appConfig.MinGasPrices = fmt.Sprintf("%s%s", MinGasPrice, TerraDenom) appConfig.StateSync.SnapshotInterval = nodeConfig.SnapshotInterval appConfig.StateSync.SnapshotKeepRecent = nodeConfig.SnapshotKeepRecent + appConfig.GRPC.Address = "0.0.0.0:9090" + appConfig.API.Address = "tcp://0.0.0.0:1317" srvconfig.WriteConfigFile(appCfgPath, appConfig) } @@ -180,10 +182,6 @@ func (n *internalNode) createKeyFromMnemonic(name, mnemonic string) error { return err } - if err != nil { - return err - } - privKeyArmor, err := kb.ExportPrivKeyArmor(name, keyringPassphrase) if err != nil { return err diff --git a/tests/e2e/initialization/node/main.go b/tests/e2e/initialization/node/main.go index 26431022c..364d37734 100644 --- a/tests/e2e/initialization/node/main.go +++ b/tests/e2e/initialization/node/main.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/classic-terra/core/v2/tests/e2e/initialization" + "github.com/classic-terra/core/v3/tests/e2e/initialization" ) func main() { diff --git a/tests/e2e/initialization/util.go b/tests/e2e/initialization/util.go index d723855a8..a6f8b7765 100644 --- a/tests/e2e/initialization/util.go +++ b/tests/e2e/initialization/util.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec/unknownproto" sdktx "github.com/cosmos/cosmos-sdk/types/tx" - "github.com/classic-terra/core/v2/tests/e2e/util" + "github.com/classic-terra/core/v3/tests/e2e/util" ) func decodeTx(txBytes []byte) (*sdktx.Tx, error) { diff --git a/tests/e2e/scripts/add_burn_tax_exemption_address_proposal.json b/tests/e2e/scripts/add_burn_tax_exemption_address_proposal.json index c32934964..9a4fe33da 100644 --- a/tests/e2e/scripts/add_burn_tax_exemption_address_proposal.json +++ b/tests/e2e/scripts/add_burn_tax_exemption_address_proposal.json @@ -1 +1 @@ -{"title":"Add Burn Tax Exemption Address","description":"Add terra1r6xhjf82szvu476gjqu0c5lsz4n3gtc4cuqszw,terra1sju803llkgg9xpkwr438s2x375dzeknf4sa4gr to the burn tax exemption address list","addresses":["terra1r6xhjf82szvu476gjqu0c5lsz4n3gtc4cuqszw","terra1sju803llkgg9xpkwr438s2x375dzeknf4sa4gr"]} \ No newline at end of file +{"title":"Add Burn Tax Exemption Address","description":"Add terra1pr327cmvezg8y35n67c0vexm6ayvuwktzdrfea,terra1emg70e3u4lyuspvh5k3u9fwrqqtxsw9zm29wxz to the burn tax exemption address list","addresses":["terra1pr327cmvezg8y35n67c0vexm6ayvuwktzdrfea","terra1emg70e3u4lyuspvh5k3u9fwrqqtxsw9zm29wxz"]} \ No newline at end of file diff --git a/tests/e2e/util/codec.go b/tests/e2e/util/codec.go index 6307a7163..63ba8b661 100644 --- a/tests/e2e/util/codec.go +++ b/tests/e2e/util/codec.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - terraApp "github.com/classic-terra/core/v2/app" - "github.com/classic-terra/core/v2/app/params" + terraApp "github.com/classic-terra/core/v3/app" + "github.com/classic-terra/core/v3/app/params" ) var ( diff --git a/tests/interchaintest/chain_start_test.go b/tests/interchaintest/chain_start_test.go index 4df9d48ce..255b5cadc 100644 --- a/tests/interchaintest/chain_start_test.go +++ b/tests/interchaintest/chain_start_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/strangelove-ventures/interchaintest/v6" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v6/testreporter" + "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/testreporter" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/tests/interchaintest/go.mod b/tests/interchaintest/go.mod index b85c35cdb..de104d518 100644 --- a/tests/interchaintest/go.mod +++ b/tests/interchaintest/go.mod @@ -1,119 +1,151 @@ -module github.com/classic-terra/core/v2/test/interchaintest +module github.com/classic-terra/core/v3/test/interchaintest go 1.20 require ( - cosmossdk.io/math v1.0.0-rc.0 - github.com/cosmos/cosmos-sdk v0.46.13 - github.com/cosmos/ibc-go/v6 v6.3.0 - github.com/docker/docker v24.0.9+incompatible + cosmossdk.io/math v1.3.0 + github.com/cosmos/cosmos-sdk v0.47.10 + github.com/cosmos/ibc-go/v7 v7.4.0 github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 - github.com/strangelove-ventures/interchaintest/v6 v6.0.0 - github.com/stretchr/testify v1.8.4 - go.uber.org/zap v1.24.0 + github.com/strangelove-ventures/interchaintest/v7 v7.0.0 + github.com/stretchr/testify v1.9.0 + go.uber.org/zap v1.26.0 ) require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.19.1 // indirect + cloud.google.com/go v0.111.0 // indirect + cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.13.0 // indirect - cloud.google.com/go/storage v1.28.1 // indirect - cosmossdk.io/errors v1.0.0-beta.7 // indirect - filippo.io/edwards25519 v1.0.0-rc.1 // indirect + cloud.google.com/go/iam v1.1.5 // indirect + cloud.google.com/go/storage v1.30.1 // indirect + cosmossdk.io/api v0.3.1 // indirect + cosmossdk.io/core v0.6.1 // indirect + cosmossdk.io/depinject v1.0.0-alpha.4 // indirect + cosmossdk.io/errors v1.0.1 // indirect + cosmossdk.io/log v1.3.1 // indirect + cosmossdk.io/tools/rosetta v0.2.1 // indirect + filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/ComposableFi/go-substrate-rpc-client/v4 v4.0.1-0.20220921072213-b36dd716026d // indirect - github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/ComposableFi/go-substrate-rpc-client/v4 v4.0.0-00010101000000-000000000000 // indirect + github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect + github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect + github.com/Microsoft/go-winio v0.6.0 // indirect github.com/StirlingMarketingGroup/go-namecase v1.0.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/avast/retry-go/v4 v4.3.4 // indirect - github.com/aws/aws-sdk-go v1.44.122 // indirect - github.com/benbjohnson/clock v1.3.0 // indirect + github.com/avast/retry-go/v4 v4.5.0 // indirect + github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect - github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect - github.com/cockroachdb/apd/v2 v2.0.2 // indirect + github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect + github.com/cometbft/cometbft v0.37.4 // indirect + github.com/cometbft/cometbft-db v0.8.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect - github.com/cosmos/cosmos-proto v1.0.0-alpha8 // indirect + github.com/cosmos/cosmos-proto v1.0.0-beta.4 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.7 // indirect - github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect + github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/gogoproto v1.4.10 // indirect + github.com/cosmos/iavl v0.20.1 // indirect + github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1 // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect + github.com/cosmos/interchain-security/v3 v3.1.1-0.20231102122221-81650a84f989 // indirect + github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect + github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect + github.com/creachadair/taskgroup v0.4.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/deckarep/golang-set v1.8.0 // indirect github.com/decred/base58 v1.0.4 // indirect - github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect + github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.1 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect + github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect + github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect + github.com/docker/docker v24.0.7+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect - github.com/ethereum/go-ethereum v1.13.5 // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/ethereum/go-ethereum v1.10.20 // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/getsentry/sentry-go v0.23.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-stack/stack v1.8.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect - github.com/gogo/gateway v1.1.0 // indirect + github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.3 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v1.1.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/go-cmp v0.5.9 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.1 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/orderedcode v0.0.1 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.4.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.4 // indirect + github.com/hashicorp/go-getter v1.7.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect - github.com/holiman/uint256 v1.2.3 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/hdevalence/ed25519consensus v0.1.0 // indirect + github.com/huandu/skiplist v1.2.0 // indirect + github.com/improbable-eng/grpc-web v0.15.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ipfs/go-cid v0.4.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect - github.com/klauspost/compress v1.16.4 // indirect + github.com/klauspost/compress v1.16.7 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-libp2p v0.27.8 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/linxGnu/grocksdb v1.8.0 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect + github.com/minio/highwayhash v1.0.2 // indirect github.com/minio/sha256-simd v1.0.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect @@ -127,77 +159,82 @@ require ( github.com/multiformats/go-multicodec v0.8.1 // indirect github.com/multiformats/go-multihash v0.2.1 // indirect github.com/multiformats/go-varint v0.0.7 // indirect - github.com/onsi/gomega v1.27.4 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.7 // indirect - github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect + github.com/pelletier/go-toml/v2 v2.0.9 // indirect + github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect github.com/pierrec/xxHash v0.1.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect + github.com/prometheus/client_golang v1.17.0 // indirect + github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.11.1 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect - github.com/rs/cors v1.8.2 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/rs/cors v1.8.3 // indirect + github.com/rs/zerolog v1.32.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/spf13/afero v1.9.2 // indirect - github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/cobra v1.6.1 // indirect + github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/cast v1.5.1 // indirect + github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.14.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect + github.com/spf13/viper v1.16.0 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tendermint/tendermint v0.34.29 // indirect - github.com/tendermint/tm-db v0.6.7 // indirect - github.com/tidwall/btree v1.5.0 // indirect - github.com/ulikunitz/xz v0.5.10 // indirect + github.com/tidwall/btree v1.6.0 // indirect + github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tyler-smith/go-bip32 v1.0.0 // indirect + github.com/tyler-smith/go-bip39 v1.1.0 // indirect + github.com/ulikunitz/xz v0.5.11 // indirect github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect - github.com/zondax/hid v0.9.1 // indirect - go.etcd.io/bbolt v1.3.6 // indirect + github.com/zondax/hid v0.9.2 // indirect + go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - go.uber.org/atomic v1.10.0 // indirect + go.opentelemetry.io/otel v1.19.0 // indirect + go.opentelemetry.io/otel/metric v1.19.0 // indirect + go.opentelemetry.io/otel/trace v1.19.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/crypto v0.16.0 // indirect + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/term v0.18.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect + golang.org/x/sync v0.4.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.13.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.114.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.56.3 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/api v0.149.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect + google.golang.org/grpc v1.60.1 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.1.7 // indirect lukechampine.com/uint128 v1.2.0 // indirect modernc.org/cc/v3 v3.40.0 // indirect modernc.org/ccgo/v3 v3.16.13 // indirect - modernc.org/libc v1.22.5 // indirect + modernc.org/libc v1.24.1 // indirect modernc.org/mathutil v1.5.0 // indirect - modernc.org/memory v1.5.0 // indirect + modernc.org/memory v1.6.0 // indirect modernc.org/opt v0.1.3 // indirect - modernc.org/sqlite v1.23.1 // indirect + modernc.org/sqlite v1.25.0 // indirect modernc.org/strutil v1.1.3 // indirect modernc.org/token v1.0.1 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + nhooyr.io/websocket v1.8.7 // indirect + pgregory.net/rapid v1.1.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) replace ( @@ -208,19 +245,18 @@ replace ( ) replace ( - github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.30.0-terra.3 - github.com/CosmWasm/wasmvm => github.com/classic-terra/wasmvm v1.1.1-terra.1 - github.com/classic-terra/core/v2 => ../../ - github.com/cosmos/cosmos-sdk => github.com/classic-terra/cosmos-sdk v0.46.14-terra.4 - github.com/cosmos/ibc-go/v6 => github.com/classic-terra/ibc-go/v6 v6.3.0-classic.0 + github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.45.0-classic + github.com/classic-terra/core/v3 => ../../ + github.com/cometbft/cometbft => github.com/classic-terra/cometbft v0.37.4-classic + github.com/cosmos/cosmos-sdk => github.com/classic-terra/cosmos-sdk v0.47.10-classic + github.com/cosmos/ibc-go/v7 => github.com/classic-terra/ibc-go/v7 v7.0.0-20240419072319-aa9d74dc39ae github.com/cosmos/ledger-cosmos-go => github.com/terra-money/ledger-terra-go v0.11.2 // replace goleveldb to optimized one github.com/syndtr/goleveldb => github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121 - github.com/tendermint/tendermint => github.com/classic-terra/cometbft v0.34.29-terra.0 ) replace ( // replace interchaintest and go-substrate-rpc-client to avoid github.com/ChainSafe/go-schnorrkel/1 - github.com/ComposableFi/go-substrate-rpc-client/v4 => github.com/Genuine-labs/go-substrate-rpc-client/v4 v4.0.0-terra.1 - github.com/strangelove-ventures/interchaintest/v6 => github.com/Genuine-labs/interchaintest/v6 v6.0.0-terra.1 + github.com/ComposableFi/go-substrate-rpc-client/v4 => github.com/Genuine-labs/go-substrate-rpc-client/v4 v4.0.0-terra47.1 + github.com/strangelove-ventures/interchaintest/v7 => github.com/Genuine-labs/interchaintest/v7 v7.0.0-terra.1 ) diff --git a/tests/interchaintest/go.sum b/tests/interchaintest/go.sum index 53c69b171..9290144da 100644 --- a/tests/interchaintest/go.sum +++ b/tests/interchaintest/go.sum @@ -32,8 +32,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM= +cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -70,8 +70,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= -cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= +cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -111,13 +111,12 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= -cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= +cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -175,8 +174,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= -cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= +cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= +cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= @@ -188,13 +187,23 @@ cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xX cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= -cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= -cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.0-rc.0 h1:ml46ukocrAAoBpYKMidF0R2tQJ1Uxfns0yH8wqgMAFc= -cosmossdk.io/math v1.0.0-rc.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= +cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= +cosmossdk.io/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= +cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= +cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98okJopc= +cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= +cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= +cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= +cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= +cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= +cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= +cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= +cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= +cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= -filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= +filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= @@ -207,42 +216,63 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/Genuine-labs/go-substrate-rpc-client/v4 v4.0.0-terra.1 h1:BtlSC6WDwljwv4T5HpbOee72b+wBXvKu1QDqUSvV9EQ= -github.com/Genuine-labs/go-substrate-rpc-client/v4 v4.0.0-terra.1/go.mod h1:Nnn7mr+Dgy8zqmuX7q3Ye0ItS8obZj2MnsZ4R7bYugk= -github.com/Genuine-labs/interchaintest/v6 v6.0.0-terra.1 h1:20lnbvTDOL29sk3hx1FV0PdMNUbm8sToRVpEXVv7LQg= -github.com/Genuine-labs/interchaintest/v6 v6.0.0-terra.1/go.mod h1:d17c2tRver1bMmBJFTCmKUyKZLM69nsSjSsyK66AMGQ= -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/FactomProject/basen v0.0.0-20150613233007-fe3947df716e h1:ahyvB3q25YnZWly5Gq1ekg6jcmWaGj/vG/MhF4aisoc= +github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e/go.mod h1:kGUqhHd//musdITWjFvNTHn90WG9bMLBEPQZ17Cmlpw= +github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec h1:1Qb69mGp/UtRPn422BH4/Y4Q3SLUrD9KHuDkm8iodFc= +github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec/go.mod h1:CD8UlnlLDiqb36L110uqiP2iSflVjx9g/3U9hCI4q2U= +github.com/Genuine-labs/go-substrate-rpc-client/v4 v4.0.0-terra47.1 h1:btysh0qNiVHNK8UVLO3TQWCvfbzpHBD8PTBhZWIp060= +github.com/Genuine-labs/go-substrate-rpc-client/v4 v4.0.0-terra47.1/go.mod h1:8MHxCSMZYv1Y8Q/DyGtKPCVIO1vIPJSIy+b/Tyq5hlI= +github.com/Genuine-labs/interchaintest/v7 v7.0.0-terra.1 h1:NTo126fOwvr188/3IM3eEtHP0Pz0a6/0ZqTITRRsLIU= +github.com/Genuine-labs/interchaintest/v7 v7.0.0-terra.1/go.mod h1:CQkrkfD91W2A92b6a4EQvP6xeuo2RENMdz194eqlm9o= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StirlingMarketingGroup/go-namecase v1.0.0 h1:2CzaNtCzc4iNHirR+5ru9OzGg8rQp860gqLBFqRI02Y= github.com/StirlingMarketingGroup/go-namecase v1.0.0/go.mod h1:ZsoSKcafcAzuBx+sndbxHu/RjDcDTrEdT4UvhniHfio= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= -github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= -github.com/avast/retry-go/v4 v4.3.4 h1:pHLkL7jvCvP317I8Ge+Km2Yhntv3SdkJm7uekkqbKhM= -github.com/avast/retry-go/v4 v4.3.4/go.mod h1:rv+Nla6Vk3/ilU0H51VHddWHiwimzX66yZ0JT6T+UvE= -github.com/aws/aws-sdk-go v1.44.122 h1:p6mw01WBaNpbdP2xrisz5tIkcNwzj/HysobNoaAHjgo= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/avast/retry-go/v4 v4.5.0 h1:QoRAZZ90cj5oni2Lsgl2GW8mNTnUCnmpx/iKpwVisHg= +github.com/avast/retry-go/v4 v4.5.0/go.mod h1:7hLEXp0oku2Nir2xBAsg0PTphp9z71bN5Aq1fboC3+I= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= -github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= +github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= -github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= +github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/btcsuite/btcd v0.22.2 h1:vBZ+lGGd1XubpOWO67ITJpAEsICWhA0YzqkcpkgNBfo= github.com/btcsuite/btcd v0.22.2/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= @@ -258,8 +288,13 @@ github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEh github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -278,15 +313,18 @@ github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= -github.com/classic-terra/cometbft v0.34.29-terra.0 h1:HnRGt7tijI2n5zSVrg/xh1mYYm4Gb4QFlknq+dRP8Jw= -github.com/classic-terra/cometbft v0.34.29-terra.0/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= -github.com/classic-terra/cosmos-sdk v0.46.14-terra.4 h1:GRgKTxC5n+5CqxtqkoJ+fNwGO4y+F9UATvolzfhEc38= -github.com/classic-terra/cosmos-sdk v0.46.14-terra.4/go.mod h1:3VKRzlOtvuqZA29wRqdx6rPsJmYhvxjJyc3tvQWpjf4= +github.com/classic-terra/cometbft v0.37.4-classic h1:7HfuM/VfD7hBTIiF/pCWsyH6gh9YrsD05Xv1TErEwN8= +github.com/classic-terra/cometbft v0.37.4-classic/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8= +github.com/classic-terra/cosmos-sdk v0.47.10-classic h1:HJMcVfw4b3t9jOFUxwQuFwgxO49mmojLP2pr4vo6FNk= +github.com/classic-terra/cosmos-sdk v0.47.10-classic/go.mod h1:fLbF9OIrgXq5W7LxvOSzAM9tOMfqxYeprlMH7RFmozs= github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121 h1:fjpWDB0hm225wYg9vunyDyTH8ftd5xEUgINJKidj+Tw= github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/classic-terra/ibc-go/v6 v6.3.0-classic.0 h1:xtfxQBJM1tSzDh/uxx7SWIRzBoU5PhsBKB+J8O7GLt0= -github.com/classic-terra/ibc-go/v6 v6.3.0-classic.0/go.mod h1:Dm14j9s094bGyCEE8W4fD+2t8IneHv+cz+80Mvwjr1w= +github.com/classic-terra/ibc-go/v7 v7.0.0-20240419072319-aa9d74dc39ae h1:dPxkxNcORnKN/ZWqzH4zxfi42FK2bes02LgIj5P/f4k= +github.com/classic-terra/ibc-go/v7 v7.0.0-20240419072319-aa9d74dc39ae/go.mod h1:L/KaEhzV5TGUCTfGysVgMBQtl5Dm7hHitfpk+GIeoAo= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cmars/basen v0.0.0-20150613233007-fe3947df716e h1:0XBUw73chJ1VYSsfvcPvVT7auykAJce9FpRr10L6Qhw= +github.com/cmars/basen v0.0.0-20150613233007-fe3947df716e/go.mod h1:P13beTBKr5Q18lJe1rIoLUqjM+CB1zYrRg44ZqGuQSA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -297,30 +335,58 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= -github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= -github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= -github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= +github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= +github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= +github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= +github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= +github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= 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= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= -github.com/cosmos/cosmos-proto v1.0.0-alpha8 h1:d3pCRuMYYvGA5bM0ZbbjKn+AoQD4A7dyNG2wzwWalUw= -github.com/cosmos/cosmos-proto v1.0.0-alpha8/go.mod h1:6/p+Bc4O8JKeZqe0VqUGTX31eoYqemTT4C1hLCWsO7I= +github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48OdY7lIWTLG7oU= +github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= -github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= -github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.7 h1:ij32FaEnwxfEurtK0QKDNhTWFnz6NUmrI5gky/WnoY0= -github.com/cosmos/iavl v0.19.7/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= +github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= +github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= +github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= +github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1 h1:BvSKnPFKxL+TTSLxGKwJN4x0ndCZj0yfXhSvmsQztSA= +github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1/go.mod h1:A+CxAQdn2j6ihDTbClpEEBdHthWgAUAcHbRAQPY8sl4= +github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= +github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= +github.com/cosmos/interchain-security/v3 v3.1.1-0.20231102122221-81650a84f989 h1:Yk/2X33hHuS0mqjr4rE0ShiwPE/YflXgdyXPIYdwl+Q= +github.com/cosmos/interchain-security/v3 v3.1.1-0.20231102122221-81650a84f989/go.mod h1:5B29fgUbUDTpBTqCnEzA2g3gI5rQG0YE/ir4isb2MEw= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= +github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= +github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM= +github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= +github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -328,40 +394,48 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= -github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI= github.com/decred/base58 v1.0.4 h1:QJC6B0E0rXOPA8U/kw2rP+qiRJsUaE2Er+pYb3siUeA= github.com/decred/base58 v1.0.4/go.mod h1:jJswKPEdvpFpvf7dsDvFZyLT22xZ9lWqEByX38oGd9E= github.com/decred/dcrd/chaincfg/chainhash v1.0.2 h1:rt5Vlq/jM3ZawwiacWjPa+smINyLRN07EO0cNBV6DGU= github.com/decred/dcrd/chaincfg/chainhash v1.0.2/go.mod h1:BpbrGgrPTr3YJYRN3Bm+D9NuaFd+zGyNeIKgrhCXK60= -github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.1 h1:18HurQ6DfHeNvwIjvOmrgr44bPdtVaQAe/WWwHg9goM= github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.1/go.mod h1:XmyzkaXBy7ZvHdrTAlXAjpog8qKSAWa3ze7yqzWmgmc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= 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/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= +github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= +github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/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/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= -github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= +github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= 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= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY= github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -372,45 +446,80 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/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.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= +github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= +github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= +github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= +github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= 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/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= +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.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +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.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= +github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= 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/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= -github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= +github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +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-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -446,10 +555,10 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= -github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= @@ -468,11 +577,12 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa h1:Q75Upo5UN4JbPFURXZ8nLKYUvF85dyFRop/vQ0Rv+64= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -480,6 +590,7 @@ github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= +github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -497,14 +608,18 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b h1:Qcx5LM0fSiks9uCyFZwDBUasd3lxd1RM0GYpL+Li5o4= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= -github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -514,19 +629,28 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= -github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= @@ -536,114 +660,174 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0= -github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= +github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= -github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 h1:aSVUgRRRtOrZOC1fYmY9gV0e9z/Iu+xNVSASWjsuyGU= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3/go.mod h1:5PC6ZNPde8bBqU/ewGZig35+UIZtw9Ytxez8/q5ZyFE= -github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= -github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= +github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= 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= +github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= +github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 h1:H+uM0Bv88eur3ZSsd2NGKg3YIiuXxwxtlN7HjE66UTU= github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845/go.mod h1:c1tRKs5Tx7E2+uHGSyyncziFjvGpgv4H2HrqXeUQ/Uk= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= +github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s= github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU= -github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/libp2p/go-libp2p v0.27.8 h1:IX5x/4yKwyPQeVS2AXHZ3J4YATM9oHBGH1gBc23jBAI= github.com/libp2p/go-libp2p v0.27.8/go.mod h1:eCFFtd0s5i/EVKR7+5Ki8bM7qwkNW3TPTTSSW9sz8NE= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/linxGnu/grocksdb v1.8.0 h1:H4L/LhP7GOMf1j17oQAElHgVlbEje2h14A8Tz9cM2BE= +github.com/linxGnu/grocksdb v1.8.0/go.mod h1:09CeBborffXhXdNpEcOeZrLKEnRtrZFEpFdPNI9Zjjg= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b h1:QrHweqAtyJ9EwCaGHBu1fghwxIPiopAHV06JlXrMHjk= github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b/go.mod h1:xxLb2ip6sSUts3g1irPVHyk/DGslwQsNOo9I7smJfNU= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= +github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= @@ -664,68 +848,114 @@ github.com/multiformats/go-multihash v0.2.1/go.mod h1:WxoMcYG85AZVQUyRyo9s4wULvW github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8= github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76/go.mod h1:x5OoJHDHqxHS801UIuhqGl6QdSAEJvtausosHSdazIo= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= -github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= +github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= +github.com/oxyno-zeta/gomock-extra-matcher v1.1.0 h1:Yyk5ov0ZPKBXtVEeIWtc4J2XVrHuNoIK+0F2BUJgtsc= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= -github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= +github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= -github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 h1:W04oB3d0J01W5jgYRGKsV8LCM6g9EkCvPkZcmFuy0OE= +github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/xxHash v0.1.5 h1:n/jBpwTHiER4xYvK3/CdPVnLDPchj8eTJFFLUb4QHBo= github.com/pierrec/xxHash v0.1.5/go.mod h1:w2waW5Zoa/Wc4Yqe0wgrIYAGKqRMf7czn2HNKXmuL+I= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= +github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM= +github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= +github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= -github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= @@ -734,44 +964,66 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qq github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= +github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= -github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= -github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -781,28 +1033,39 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= -github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= github.com/terra-money/ledger-terra-go v0.11.2 h1:BVXZl+OhJOri6vFNjjVaTabRLApw9MuG7mxWL4V718c= github.com/terra-money/ledger-terra-go v0.11.2/go.mod h1:ClJ2XMj1ptcnONzKH+GhVPi7Y8pXIT+UzJ0TNt0tfZE= -github.com/tidwall/btree v1.5.0 h1:iV0yVY/frd7r6qGBXfEYs7DH0gTDgrKTrDjS7xt/IyQ= -github.com/tidwall/btree v1.5.0/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= -github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= -github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= +github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= +github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/tyler-smith/go-bip32 v1.0.0 h1:sDR9juArbUgX+bO/iblgZnMPeWY1KZMUC2AFUJdv5KE= +github.com/tyler-smith/go-bip32 v1.0.0/go.mod h1:onot+eHknzV4BVPwrzqY5OoVpyCvnwD7lMawL5aQupE= +github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= +github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= +github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vedhavyas/go-subkey/v2 v2.0.0 h1:LemDIsrVtRSOkp0FA8HxP6ynfKjeOj3BY2U9UNfeDMA= github.com/vedhavyas/go-subkey/v2 v2.0.0/go.mod h1:95aZ+XDCWAUUynjlmi7BtPExjXgXxByE0WfBwbmIRH4= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -811,10 +1074,14 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= -github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +github.com/zondax/hid v0.9.2 h1:WCJFnEDMiqGF64nlZz28E9qLVZ0KSJ7xpc5DLEyma2U= +github.com/zondax/hid v0.9.2/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +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.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -824,22 +1091,39 @@ 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/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= +go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= +go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= +go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +golang.org/x/crypto v0.0.0-20170613210332-850760c427c5/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -848,9 +1132,9 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -861,8 +1145,9 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -895,9 +1180,12 @@ golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73r 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= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -908,6 +1196,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -915,6 +1204,7 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= @@ -934,6 +1224,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -946,8 +1238,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -973,8 +1265,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -989,15 +1281,18 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1008,13 +1303,19 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1022,15 +1323,17 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1051,9 +1354,11 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1061,6 +1366,7 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1072,16 +1378,19 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1091,19 +1400,23 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1113,6 +1426,9 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1120,6 +1436,7 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1164,6 +1481,7 @@ golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNq golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1212,22 +1530,25 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= -google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= +google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -1261,6 +1582,7 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1294,6 +1616,7 @@ google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= @@ -1328,13 +1651,21 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 h1:gphdwh0npgs8elJ4T6J+DQJHPVF7RsuJHCfwztUb4J4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -1344,6 +1675,7 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +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.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= @@ -1366,8 +1698,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= -google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= +google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1384,17 +1716,19 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= @@ -1402,6 +1736,7 @@ gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHN gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1411,11 +1746,13 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1423,6 +1760,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54= +launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM= lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0= lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA= lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= @@ -1433,26 +1772,31 @@ modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw= modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY= modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk= modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM= -modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= -modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= +modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM= +modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak= modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= -modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/memory v1.6.0 h1:i6mzavxrE9a30whzMfwf7XWVODx2r5OYXvU46cirX7o= +modernc.org/memory v1.6.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= -modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= +modernc.org/sqlite v1.25.0 h1:AFweiwPNd/b3BoKnBOfFm+Y260guGMF+0UFk0savqeA= +modernc.org/sqlite v1.25.0/go.mod h1:FL3pVXie73rg3Rii6V/u5BoHlSoyeZeIgKZEgHARyCU= modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY= modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY= modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg= modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY= +nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= -pgregory.net/rapid v0.5.3 h1:163N50IHFqr1phZens4FQOdPgfJscR7a562mjQqeo4M= +nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= +pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= +pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/tests/interchaintest/helpers/cosmwams.go b/tests/interchaintest/helpers/cosmwams.go index 4cb618bd7..8d0e5df59 100644 --- a/tests/interchaintest/helpers/cosmwams.go +++ b/tests/interchaintest/helpers/cosmwams.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v6/ibc" - "github.com/strangelove-ventures/interchaintest/v6/testutil" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" ) @@ -27,7 +27,8 @@ func SetupContract(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, func ExecuteMsgWithAmount(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, contractAddr, amount, message string) { chainNode := chain.FullNodes[0] - cmd := []string{"terrad", "tx", "wasm", "execute", contractAddr, message, + cmd := []string{ + "terrad", "tx", "wasm", "execute", contractAddr, message, "--amount", amount, } _, err := chainNode.ExecTx(ctx, user.KeyName(), cmd...) @@ -40,7 +41,8 @@ func ExecuteMsgWithAmount(t *testing.T, ctx context.Context, chain *cosmos.Cosmo func ExecuteMsgWithFee(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, contractAddr, amount, feeCoin, message string) { chainNode := chain.FullNodes[0] - cmd := []string{"terrad", "tx", "wasm", "execute", contractAddr, message, + cmd := []string{ + "terrad", "tx", "wasm", "execute", contractAddr, message, "--fees", feeCoin, } diff --git a/tests/interchaintest/helpers/ibc_hooks.go b/tests/interchaintest/helpers/ibc_hooks.go index b5ef7af42..bcb12240d 100644 --- a/tests/interchaintest/helpers/ibc_hooks.go +++ b/tests/interchaintest/helpers/ibc_hooks.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/stretchr/testify/require" ) diff --git a/tests/interchaintest/helpers/pfm.go b/tests/interchaintest/helpers/pfm.go deleted file mode 100644 index f7db22f72..000000000 --- a/tests/interchaintest/helpers/pfm.go +++ /dev/null @@ -1,320 +0,0 @@ -package helpers - -import ( - "context" - "encoding/json" - "testing" - - "github.com/docker/docker/client" - "go.uber.org/zap/zaptest" - - "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" - - transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - "github.com/strangelove-ventures/interchaintest/v6" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v6/ibc" - "github.com/strangelove-ventures/interchaintest/v6/testreporter" - "github.com/strangelove-ventures/interchaintest/v6/testutil" - "github.com/stretchr/testify/require" -) - -func PFMTestFlow(t *testing.T, ctx context.Context, chain1, chain2, chain3 *cosmos.CosmosChain, client *client.Client, network string, path1, path2, path3 string, genesisWalletAmount math.Int) { - // Create relayer factory to utilize the go-relayer - r := interchaintest.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t)). - Build(t, client, network) - - // Create a new Interchain object which describes the chains, relayers, and IBC connections we want to use - ic := interchaintest.NewInterchain(). - AddChain(chain1). - AddChain(chain2). - AddChain(chain3). - AddRelayer(r, "relayer"). - AddLink(interchaintest.InterchainLink{ - Chain1: chain1, - Chain2: chain2, - Relayer: r, - Path: path1, - }). - AddLink(interchaintest.InterchainLink{ - Chain1: chain2, - Chain2: chain3, - Relayer: r, - Path: path2, - }). - AddLink(interchaintest.InterchainLink{ - Chain1: chain1, - Chain2: chain3, - Relayer: r, - Path: path3, - }) - - // Build interchain - rep := testreporter.NewNopReporter() - eRep := rep.RelayerExecReporter(t) - err := ic.Build(ctx, eRep, interchaintest.InterchainBuildOptions{ - TestName: t.Name(), - Client: client, - NetworkID: network, - BlockDatabaseFile: interchaintest.DefaultBlockDatabaseFilepath(), - SkipPathCreation: true, - }) - require.NoError(t, err) - - t.Cleanup(func() { - _ = ic.Close() - }) - - users := interchaintest.GetAndFundTestUsers(t, ctx, t.Name(), genesisWalletAmount, chain1, chain2, chain3) - chain1User := users[0] - chain2User := users[1] - chain3User := users[2] - - chain1UserAddr := chain1User.FormattedAddress() - chain2UserAddr := chain2User.FormattedAddress() - chain3UserAddr := chain3User.FormattedAddress() - - err = testutil.WaitForBlocks(ctx, 10, chain1, chain2, chain3) - require.NoError(t, err) - - // rly chain1-chain2 - // Generate new path - err = r.GeneratePath(ctx, eRep, chain1.Config().ChainID, chain2.Config().ChainID, path1) - require.NoError(t, err) - // Create client - err = r.CreateClients(ctx, eRep, path1, ibc.DefaultClientOpts()) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain1, chain2) - require.NoError(t, err) - - // Create connection - err = r.CreateConnections(ctx, eRep, path1) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain1, chain2) - require.NoError(t, err) - // Create channel - err = r.CreateChannel(ctx, eRep, path1, ibc.CreateChannelOptions{ - SourcePortName: "transfer", - DestPortName: "transfer", - Order: ibc.Unordered, - Version: "ics20-1", - }) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain1, chain2) - require.NoError(t, err) - - channelsChain1, err := r.GetChannels(ctx, eRep, chain1.Config().ChainID) - require.NoError(t, err) - - channelsChain2, err := r.GetChannels(ctx, eRep, chain2.Config().ChainID) - require.NoError(t, err) - - require.Len(t, channelsChain1, 1) - require.Len(t, channelsChain2, 1) - - channelChain1Chain2 := channelsChain1[0] - require.NotEmpty(t, channelChain1Chain2.ChannelID) - channelChain2Chain1 := channelsChain2[0] - require.NotEmpty(t, channelChain2Chain1.ChannelID) - - // rly chain1-chain3 - // Generate new path - err = r.GeneratePath(ctx, eRep, chain1.Config().ChainID, chain3.Config().ChainID, path3) - require.NoError(t, err) - // Create clients - err = r.CreateClients(ctx, eRep, path3, ibc.DefaultClientOpts()) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain1, chain3) - require.NoError(t, err) - - // Create connection - err = r.CreateConnections(ctx, eRep, path3) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain1, chain3) - require.NoError(t, err) - - // Create channel - err = r.CreateChannel(ctx, eRep, path3, ibc.CreateChannelOptions{ - SourcePortName: "transfer", - DestPortName: "transfer", - Order: ibc.Unordered, - Version: "ics20-1", - }) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain1, chain3) - require.NoError(t, err) - - channelsChain1, err = r.GetChannels(ctx, eRep, chain1.Config().ChainID) - require.NoError(t, err) - - channelsChain3, err := r.GetChannels(ctx, eRep, chain3.Config().ChainID) - require.NoError(t, err) - - require.Len(t, channelsChain1, 2) - require.Len(t, channelsChain3, 1) - - var channelChain1Chain3 ibc.ChannelOutput - for _, chann := range channelsChain1 { - if chann.ChannelID != channelChain1Chain2.ChannelID { - channelChain1Chain3 = chann - } - } - require.NotEmpty(t, channelChain1Chain3.ChannelID) - - channelChain3Chain1 := channelsChain3[0] - require.NotEmpty(t, channelChain3Chain1.ChannelID) - - // rly chain2-chain3 - // Generate new path - err = r.GeneratePath(ctx, eRep, chain2.Config().ChainID, chain3.Config().ChainID, path2) - require.NoError(t, err) - - // Create clients - err = r.CreateClients(ctx, eRep, path2, ibc.DefaultClientOpts()) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain2, chain3) - require.NoError(t, err) - - // Create connection - err = r.CreateConnections(ctx, eRep, path2) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain2, chain3) - require.NoError(t, err) - - // Create channel - err = r.CreateChannel(ctx, eRep, path2, ibc.CreateChannelOptions{ - SourcePortName: "transfer", - DestPortName: "transfer", - Order: ibc.Unordered, - Version: "ics20-1", - }) - require.NoError(t, err) - - err = testutil.WaitForBlocks(ctx, 5, chain2, chain3) - require.NoError(t, err) - - channelsChain2, err = r.GetChannels(ctx, eRep, chain2.Config().ChainID) - require.NoError(t, err) - - channelsChain3, err = r.GetChannels(ctx, eRep, chain3.Config().ChainID) - require.NoError(t, err) - - require.Len(t, channelsChain2, 2) - require.Len(t, channelsChain3, 2) - - var channelChain2Chain3 ibc.ChannelOutput - for _, chann := range channelsChain2 { - if chann.ChannelID != channelChain2Chain1.ChannelID { - channelChain2Chain3 = chann - } - } - require.NotEmpty(t, channelChain2Chain3.ChannelID) - - var channelChain3Chain2 ibc.ChannelOutput - for _, chann := range channelsChain3 { - if chann.ChannelID != channelChain3Chain1.ChannelID { - channelChain3Chain2 = chann - } - } - require.NotEmpty(t, channelChain3Chain2.ChannelID) - - // Start the relayer on both paths - err = r.StartRelayer(ctx, eRep, path1, path2, path3) - require.NoError(t, err) - - t.Cleanup( - func() { - err := r.StopRelayer(ctx, eRep) - if err != nil { - t.Logf("an error occurred while stopping the relayer: %s", err) - } - }, - ) - - // Send a transfer from Chain 2 -> Chain 1 - transferAmount := math.NewInt(1000) - transfer := ibc.WalletAmount{ - Address: chain1UserAddr, - Denom: chain2.Config().Denom, - Amount: transferAmount, - } - - transferTx, err := chain2.SendIBCTransfer(ctx, channelChain2Chain1.ChannelID, chain2User.KeyName(), transfer, ibc.TransferOptions{}) - require.NoError(t, err) - - chain2Height, err := chain2.Height(ctx) - require.NoError(t, err) - - _, err = testutil.PollForAck(ctx, chain2, chain2Height, chain2Height+30, transferTx.Packet) - require.NoError(t, err) - err = testutil.WaitForBlocks(ctx, 5, chain2) - require.NoError(t, err) - - chain2Onchain1TokenDenom := transfertypes.GetPrefixedDenom(channelChain2Chain1.Counterparty.PortID, channelChain2Chain1.Counterparty.ChannelID, chain2.Config().Denom) - chain2Onchain1IBCDenom := transfertypes.ParseDenomTrace(chain2Onchain1TokenDenom).IBCDenom() - - chain2Onchain3TokenDenom := transfertypes.GetPrefixedDenom(channelChain2Chain3.Counterparty.PortID, channelChain2Chain3.Counterparty.ChannelID, chain2.Config().Denom) - chain2Onchain3IBCDenom := transfertypes.ParseDenomTrace(chain2Onchain3TokenDenom).IBCDenom() - - chain1UserUpdateBal, err := chain1.GetBalance(ctx, chain1UserAddr, chain2Onchain1IBCDenom) - require.NoError(t, err) - require.Equal(t, transferAmount, chain1UserUpdateBal) - - // Send a transfer with pfm from Chain 1 -> Chain 3 - // The PacketForwardMiddleware will forward the packet Chain 2 -> Chain 3 - metadata := &PacketMetadata{ - Forward: &ForwardMetadata{ - Receiver: chain3UserAddr, - Channel: channelChain2Chain3.ChannelID, - Port: channelChain2Chain3.PortID, - }, - } - transfer = ibc.WalletAmount{ - Address: chain2UserAddr, - Denom: chain2Onchain1IBCDenom, - Amount: transferAmount, - } - - memo, err := json.Marshal(metadata) - require.NoError(t, err) - - transferTx, err = chain1.SendIBCTransfer(ctx, channelChain1Chain2.ChannelID, chain1User.KeyName(), transfer, ibc.TransferOptions{Memo: string(memo)}) - require.NoError(t, err) - - chain1Height, err := chain1.Height(ctx) - require.NoError(t, err) - - _, err = testutil.PollForAck(ctx, chain1, chain1Height, chain1Height+30, transferTx.Packet) - require.NoError(t, err) - err = testutil.WaitForBlocks(ctx, 5, chain1) - require.NoError(t, err) - - // chain2 user send 1000uatom at the begining so the balance should be 1000uatom less - chain2UserUpdateBal, err := chain2.GetBalance(ctx, chain2UserAddr, chain2.Config().Denom) - require.NoError(t, err) - require.Equal(t, chain2UserUpdateBal, genesisWalletAmount.Sub(transferAmount)) - - chain1UserUpdateBal, err = chain1.GetBalance(ctx, chain1UserAddr, chain2Onchain1IBCDenom) - require.NoError(t, err) - require.Equal(t, math.ZeroInt(), chain1UserUpdateBal) - - chain3UserUpdateBal, err := chain3.GetBalance(ctx, chain3UserAddr, chain2Onchain3IBCDenom) - require.NoError(t, err) - require.Equal(t, chain3UserUpdateBal, transferAmount) - - // Check Escrow Balance - escrowAccount := sdk.MustBech32ifyAddressBytes(chain2.Config().Bech32Prefix, transfertypes.GetEscrowAddress(channelChain2Chain3.PortID, channelChain2Chain3.ChannelID)) - escrowBalance, err := chain2.GetBalance(ctx, escrowAccount, chain2.Config().Denom) - require.NoError(t, err) - require.Equal(t, transferAmount, escrowBalance) - -} diff --git a/tests/interchaintest/helpers/validator.go b/tests/interchaintest/helpers/validator.go index e4d41a8ef..06643bb2f 100644 --- a/tests/interchaintest/helpers/validator.go +++ b/tests/interchaintest/helpers/validator.go @@ -5,13 +5,13 @@ import ( "fmt" "strconv" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/types/module/testutil" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) -func UnmarshalValidators(config simappparams.EncodingConfig, data []byte) (stakingtypes.Validators, []cryptotypes.PubKey, error) { +func UnmarshalValidators(config testutil.TestEncodingConfig, data []byte) (stakingtypes.Validators, []cryptotypes.PubKey, error) { var validators stakingtypes.Validators var pubKeys []cryptotypes.PubKey @@ -43,6 +43,14 @@ func UnmarshalValidators(config simappparams.EncodingConfig, data []byte) (staki } delete(validator, "unbonding_height") + unbondingOnHoldRefCount, ok := validator["unbonding_on_hold_ref_count"].(string) + if !ok { + return nil, nil, fmt.Errorf("invalid UnbondingOnHoldRefCount") + } + delete(validator, "unbonding_on_hold_ref_count") + + delete(validator, "unbonding_ids") + concensusPubkey, ok := validator["consensus_pubkey"].(map[string]interface{}) if !ok { return nil, nil, fmt.Errorf("invalid consensus_pubkey") @@ -80,6 +88,13 @@ func UnmarshalValidators(config simappparams.EncodingConfig, data []byte) (staki } val.UnbondingHeight = unbondingHeightInt + // Convert UnbondingOnHoldRefCount to int64 + unbondingOnHoldRefCountInt, err := strconv.ParseInt(unbondingOnHoldRefCount, 10, 64) + if err != nil { + return nil, nil, err + } + val.UnbondingOnHoldRefCount = unbondingOnHoldRefCountInt + // Convert consensus_pubkey to PubKey concensusPubkeyBz, err := json.Marshal(concensusPubkey) if err != nil { diff --git a/tests/interchaintest/ibc_hooks_test.go b/tests/interchaintest/ibc_hooks_test.go index d8bd562b2..adcdc88b5 100644 --- a/tests/interchaintest/ibc_hooks_test.go +++ b/tests/interchaintest/ibc_hooks_test.go @@ -7,16 +7,16 @@ import ( "testing" "cosmossdk.io/math" - "github.com/classic-terra/core/v2/test/interchaintest/helpers" - "github.com/strangelove-ventures/interchaintest/v6" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v6/ibc" - "github.com/strangelove-ventures/interchaintest/v6/testreporter" - "github.com/strangelove-ventures/interchaintest/v6/testutil" + "github.com/classic-terra/core/v3/test/interchaintest/helpers" + "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + "github.com/strangelove-ventures/interchaintest/v7/testreporter" + "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" - transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ) // TestIBCHooks ensures the ibc-hooks middleware from osmosis works. diff --git a/tests/interchaintest/ibc_pfm_terra_test.go b/tests/interchaintest/ibc_pfm_terra_test.go deleted file mode 100644 index f804a76e9..000000000 --- a/tests/interchaintest/ibc_pfm_terra_test.go +++ /dev/null @@ -1,75 +0,0 @@ -package interchaintest - -import ( - "context" - "testing" - - "github.com/stretchr/testify/require" - "go.uber.org/zap/zaptest" - - "github.com/strangelove-ventures/interchaintest/v6" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - - "github.com/classic-terra/core/v2/test/interchaintest/helpers" -) - -// TestTerraPFM setup up 3 Terra Classic networks, initializes an IBC connection between them, -// and sends an ICS20 token transfer among them to make sure that the IBC denom not being hashed again. -func TestTerraPFM(t *testing.T) { - if testing.Short() { - t.Skip() - } - - t.Parallel() - - // Create chain factory with Terra Classic - numVals := 3 - numFullNodes := 3 - - client, network := interchaintest.DockerSetup(t) - - ctx := context.Background() - - config1, err := createConfig() - require.NoError(t, err) - config2 := config1.Clone() - config2.ChainID = "core-2" - config3 := config1.Clone() - config3.ChainID = "core-3" - - cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{ - { - Name: "terra", - ChainConfig: config1, - NumValidators: &numVals, - NumFullNodes: &numFullNodes, - }, - { - Name: "terra", - ChainConfig: config2, - NumValidators: &numVals, - NumFullNodes: &numFullNodes, - }, - { - Name: "terra", - ChainConfig: config3, - NumValidators: &numVals, - NumFullNodes: &numFullNodes, - }, - }) - - const ( - path1 = "ibc-path-1" - path2 = "ibc-path-2" - path3 = "ibc-path-3" - ) - - // Get chains from the chain factory - chains, err := cf.Chains(t.Name()) - require.NoError(t, err) - - terra1, terra2, terra3 := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain), chains[2].(*cosmos.CosmosChain) - - // Start the test flow - helpers.PFMTestFlow(t, ctx, terra1, terra2, terra3, client, network, path1, path2, path3, genesisWalletAmount) -} diff --git a/tests/interchaintest/ibc_pfm_test.go b/tests/interchaintest/ibc_pfm_test.go deleted file mode 100644 index 18ae5b045..000000000 --- a/tests/interchaintest/ibc_pfm_test.go +++ /dev/null @@ -1,72 +0,0 @@ -package interchaintest - -import ( - "context" - "testing" - - "github.com/stretchr/testify/require" - "go.uber.org/zap/zaptest" - - "github.com/strangelove-ventures/interchaintest/v6" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v6/ibc" - - "github.com/classic-terra/core/v2/test/interchaintest/helpers" -) - -// TestTerraGaiaOsmoPFM setup up a Terra Classic, Osmosis and Gaia network, initializes an IBC connection between them, -// and sends an ICS20 token transfer from Terra Classic -> Gaia -> Osmosis to make sure that the IBC denom not being hashed again. -func TestTerraGaiaOsmoPFM(t *testing.T) { - if testing.Short() { - t.Skip() - } - - t.Parallel() - - // Create chain factory with Terra Classic - numVals := 3 - numFullNodes := 3 - - client, network := interchaintest.DockerSetup(t) - - ctx := context.Background() - - config, err := createConfig() - require.NoError(t, err) - - cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{ - { - Name: "terra", - ChainConfig: config, - NumValidators: &numVals, - NumFullNodes: &numFullNodes, - }, - { - Name: "gaia", - Version: "v12.0.0", - NumValidators: &numVals, - NumFullNodes: &numFullNodes, - ChainConfig: ibc.ChainConfig{ - GasPrices: "0.0uatom", - }, - }, - { - Name: "osmosis", - Version: "v18.0.0", - NumValidators: &numVals, - NumFullNodes: &numFullNodes, - ChainConfig: ibc.ChainConfig{ - GasPrices: "0.005uosmo", - }, - }, - }) - - // Get chains from the chain factory - chains, err := cf.Chains(t.Name()) - require.NoError(t, err) - - terra, gaia, osmo := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain), chains[2].(*cosmos.CosmosChain) - - // Start the test flow - helpers.PFMTestFlow(t, ctx, terra, gaia, osmo, client, network, pathTerraGaia, pathTerraOsmo, pathGaiaOsmo, genesisWalletAmount) -} diff --git a/tests/interchaintest/ibc_transfer_test.go b/tests/interchaintest/ibc_transfer_test.go index d149053e7..e06ef0125 100644 --- a/tests/interchaintest/ibc_transfer_test.go +++ b/tests/interchaintest/ibc_transfer_test.go @@ -6,12 +6,12 @@ import ( "testing" "cosmossdk.io/math" - transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - "github.com/strangelove-ventures/interchaintest/v6" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v6/ibc" - "github.com/strangelove-ventures/interchaintest/v6/testreporter" - "github.com/strangelove-ventures/interchaintest/v6/testutil" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" + "github.com/strangelove-ventures/interchaintest/v7/testreporter" + "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) @@ -111,11 +111,11 @@ func TestTerraGaiaIBCTranfer(t *testing.T) { terraUserInitialBal, err := terra.GetBalance(ctx, terraUserAddr, terra.Config().Denom) require.NoError(t, err) - require.Equal(t, genesisWalletAmount.String(), terraUserInitialBal.String()) + require.Equal(t, genesisWalletBalance, terraUserInitialBal) gaiaUserInitialBal, err := gaia.GetBalance(ctx, gaiaUserAddr, gaia.Config().Denom) require.NoError(t, err) - require.Equal(t, genesisWalletAmount.String(), gaiaUserInitialBal.String()) + require.Equal(t, genesisWalletBalance, gaiaUserInitialBal) // Compose an IBC transfer and send from Terra Classic -> Gaia transferAmount := math.NewInt(1000) diff --git a/tests/interchaintest/setup.go b/tests/interchaintest/setup.go index 055b000e0..336c0b389 100644 --- a/tests/interchaintest/setup.go +++ b/tests/interchaintest/setup.go @@ -4,13 +4,13 @@ import ( "encoding/json" "fmt" + "cosmossdk.io/math" "github.com/icza/dyno" - "cosmossdk.io/math" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/types/module/testutil" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v6/ibc" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/ibc" ) var ( @@ -25,13 +25,14 @@ var ( UidGid: "1025:1025", } - pathTerraGaia = "terra-gaia" - pathTerraOsmo = "terra-osmo" - pathGaiaOsmo = "gaia-osmo" - genesisWalletAmount = math.NewInt(10_000_000_000) - votingPeriod = "30s" - maxDepositPeriod = "10s" - signedBlocksWindow = int64(20) + pathTerraGaia = "terra-gaia" + pathTerraOsmo = "terra-osmo" + pathGaiaOsmo = "gaia-osmo" + genesisWalletAmount = int64(10000000000) + genesisWalletBalance = math.NewInt(genesisWalletAmount) + votingPeriod = "30s" + maxDepositPeriod = "10s" + signedBlocksWindow = int64(20) ) func createConfig() (ibc.ChainConfig, error) { @@ -56,7 +57,7 @@ func createConfig() (ibc.ChainConfig, error) { // coreEncoding registers the Terra Classic specific module codecs so that the associated types and msgs // will be supported when writing to the blocksdb sqlite database. -func coreEncoding() *simappparams.EncodingConfig { +func coreEncoding() *testutil.TestEncodingConfig { cfg := cosmos.DefaultEncoding() // register custom types @@ -71,13 +72,13 @@ func ModifyGenesis() func(ibc.ChainConfig, []byte) ([]byte, error) { return nil, fmt.Errorf("failed to unmarshal genesis file: %w", err) } // Modify short proposal - if err := dyno.Set(g, votingPeriod, "app_state", "gov", "voting_params", "voting_period"); err != nil { + if err := dyno.Set(g, votingPeriod, "app_state", "gov", "params", "voting_period"); err != nil { return nil, fmt.Errorf("failed to set voting period in genesis json: %w", err) } - if err := dyno.Set(g, maxDepositPeriod, "app_state", "gov", "deposit_params", "max_deposit_period"); err != nil { + if err := dyno.Set(g, maxDepositPeriod, "app_state", "gov", "params", "max_deposit_period"); err != nil { return nil, fmt.Errorf("failed to set voting period in genesis json: %w", err) } - if err := dyno.Set(g, chainConfig.Denom, "app_state", "gov", "deposit_params", "min_deposit", 0, "denom"); err != nil { + if err := dyno.Set(g, chainConfig.Denom, "app_state", "gov", "params", "min_deposit", 0, "denom"); err != nil { return nil, fmt.Errorf("failed to set voting period in genesis json: %w", err) } // Modify signed blocks window diff --git a/tests/interchaintest/validator_test.go b/tests/interchaintest/validator_test.go index 60d2c0f12..7a49dafed 100644 --- a/tests/interchaintest/validator_test.go +++ b/tests/interchaintest/validator_test.go @@ -11,14 +11,14 @@ import ( "github.com/cosmos/cosmos-sdk/types/bech32" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/strangelove-ventures/interchaintest/v6" - "github.com/strangelove-ventures/interchaintest/v6/chain/cosmos" - "github.com/strangelove-ventures/interchaintest/v6/testreporter" - "github.com/strangelove-ventures/interchaintest/v6/testutil" + "github.com/strangelove-ventures/interchaintest/v7" + "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" + "github.com/strangelove-ventures/interchaintest/v7/testreporter" + "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" - "github.com/classic-terra/core/v2/test/interchaintest/helpers" + "github.com/classic-terra/core/v3/test/interchaintest/helpers" ) // TestValidator is a basic test to accrue enough token to join active validator set, gets slashed for missing or tombstoned for double signing diff --git a/types/alias.go b/types/alias.go index 000f794a9..38bb456d3 100644 --- a/types/alias.go +++ b/types/alias.go @@ -1,12 +1,12 @@ // autogenerated code using github.com/rigelrozanski/multitool // aliases generated for the following subdirectories: -// ALIASGEN: github.com/classic-terra/core/v2/types/assets/ -// ALIASGEN: github.com/classic-terra/core/v2/types/util/ +// ALIASGEN: github.com/classic-terra/core/v3/types/assets/ +// ALIASGEN: github.com/classic-terra/core/v3/types/util/ package types import ( - "github.com/classic-terra/core/v2/types/assets" - "github.com/classic-terra/core/v2/types/util" + "github.com/classic-terra/core/v3/types/assets" + "github.com/classic-terra/core/v3/types/util" ) const ( diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index 467265eed..cd06c9e2d 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -2,8 +2,8 @@ package bindings import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - markettypes "github.com/classic-terra/core/v2/x/market/types" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + markettypes "github.com/classic-terra/core/v3/x/market/types" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" ) // ExchangeRateQueryParams query request params for exchange rates diff --git a/wasmbinding/helper.go b/wasmbinding/helper.go index ef5f80a7a..12465981e 100644 --- a/wasmbinding/helper.go +++ b/wasmbinding/helper.go @@ -44,16 +44,3 @@ func ConvertSdkCoinToWasmCoin(coin sdk.Coin) wasmvmtypes.Coin { Amount: coin.Amount.String(), } } - -// parseAddress parses address from bech32 string and verifies its format. -// func parseAddress(addr string) (sdk.AccAddress, error) { -// parsed, err := sdk.AccAddressFromBech32(addr) -// if err != nil { -// return nil, sdkerrors.Wrap(err, "address from bech32") -// } -// err = sdk.VerifyAddressFormat(parsed) -// if err != nil { -// return nil, sdkerrors.Wrap(err, "verify address format") -// } -// return parsed, nil -// } diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index ce4b5695f..7f0520bdd 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -3,16 +3,15 @@ package wasmbinding import ( "encoding/json" - wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - wasmvmtypes "github.com/CosmWasm/wasmvm/types" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - // bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmvmtypes "github.com/CosmWasm/wasmvm/types" - "github.com/classic-terra/core/v2/wasmbinding/bindings" - marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" - markettypes "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/wasmbinding/bindings" + marketkeeper "github.com/classic-terra/core/v3/x/market/keeper" + markettypes "github.com/classic-terra/core/v3/x/market/types" ) // CustomMessageDecorator returns decorator for custom CosmWasm bindings messages @@ -37,21 +36,21 @@ func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddre if msg.Custom != nil { var contractMsg bindings.TerraMsg if err := json.Unmarshal(msg.Custom, &contractMsg); err != nil { - return nil, nil, sdkerrors.Wrap(err, "terra msg") + return nil, nil, errorsmod.Wrap(err, "terra msg") } switch { case contractMsg.Swap != nil: _, bz, err := m.swap(ctx, contractAddr, contractMsg.Swap) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "swap msg failed") + return nil, nil, errorsmod.Wrap(err, "swap msg failed") } return nil, bz, nil case contractMsg.SwapSend != nil: _, bz, err := m.swapSend(ctx, contractAddr, contractMsg.SwapSend) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "swap msg failed") + return nil, nil, errorsmod.Wrap(err, "swap msg failed") } return nil, bz, nil @@ -66,12 +65,12 @@ func (m *CustomMessenger) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddre func (m *CustomMessenger) swap(ctx sdk.Context, contractAddr sdk.AccAddress, contractMsg *bindings.Swap) ([]sdk.Event, [][]byte, error) { res, err := PerformSwap(m.marketKeeper, ctx, contractAddr, contractMsg) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "perform swap") + return nil, nil, errorsmod.Wrap(err, "perform swap") } bz, err := json.Marshal(res) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "error marshal swap response") + return nil, nil, errorsmod.Wrap(err, "error marshal swap response") } return nil, [][]byte{bz}, nil @@ -88,7 +87,7 @@ func PerformSwap(f *marketkeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAd msgSwap := markettypes.NewMsgSwap(contractAddr, contractMsg.OfferCoin, contractMsg.AskDenom) if err := msgSwap.ValidateBasic(); err != nil { - return nil, sdkerrors.Wrap(err, "failed validating MsgSwap") + return nil, errorsmod.Wrap(err, "failed validating MsgSwap") } // swap @@ -97,7 +96,7 @@ func PerformSwap(f *marketkeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAd msgSwap, ) if err != nil { - return nil, sdkerrors.Wrap(err, "swapping") + return nil, errorsmod.Wrap(err, "swapping") } return res, nil } @@ -106,12 +105,12 @@ func PerformSwap(f *marketkeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAd func (m *CustomMessenger) swapSend(ctx sdk.Context, contractAddr sdk.AccAddress, contractMsg *bindings.SwapSend) ([]sdk.Event, [][]byte, error) { res, err := PerformSwapSend(m.marketKeeper, ctx, contractAddr, contractMsg) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "perform swap send") + return nil, nil, errorsmod.Wrap(err, "perform swap send") } bz, err := json.Marshal(res) if err != nil { - return nil, nil, sdkerrors.Wrap(err, "error marshal swap send response") + return nil, nil, errorsmod.Wrap(err, "error marshal swap send response") } return nil, [][]byte{bz}, nil @@ -133,7 +132,7 @@ func PerformSwapSend(f *marketkeeper.Keeper, ctx sdk.Context, contractAddr sdk.A msgSwapSend := markettypes.NewMsgSwapSend(contractAddr, toAddr, contractMsg.OfferCoin, contractMsg.AskDenom) if err := msgSwapSend.ValidateBasic(); err != nil { - return nil, sdkerrors.Wrap(err, "failed validating MsgSwapSend") + return nil, errorsmod.Wrap(err, "failed validating MsgSwapSend") } // swap @@ -142,7 +141,7 @@ func PerformSwapSend(f *marketkeeper.Keeper, ctx sdk.Context, contractAddr sdk.A msgSwapSend, ) if err != nil { - return nil, sdkerrors.Wrap(err, "swapping and sending") + return nil, errorsmod.Wrap(err, "swapping and sending") } return res, nil } diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index 0fb6580c6..3845ec4a6 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -5,10 +5,10 @@ import ( // sdk "github.com/cosmos/cosmos-sdk/types" - // "github.com/classic-terra/core/v2/wasmbinding/bindings" - marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" - oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" - treasurykeeper "github.com/classic-terra/core/v2/x/treasury/keeper" + // "github.com/classic-terra/core/v3/wasmbinding/bindings" + marketkeeper "github.com/classic-terra/core/v3/x/market/keeper" + oraclekeeper "github.com/classic-terra/core/v3/x/oracle/keeper" + treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper" ) type QueryPlugin struct { diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go index 8594787c0..30aab1c1a 100644 --- a/wasmbinding/query_plugin.go +++ b/wasmbinding/query_plugin.go @@ -4,16 +4,19 @@ import ( "encoding/json" "fmt" - wasmvmtypes "github.com/CosmWasm/wasmvm/types" + errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/classic-terra/core/v2/wasmbinding/bindings" - marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" - markettypes "github.com/classic-terra/core/v2/x/market/types" + abci "github.com/cometbft/cometbft/abci/types" + + wasmvmtypes "github.com/CosmWasm/wasmvm/types" + + "github.com/classic-terra/core/v3/wasmbinding/bindings" + marketkeeper "github.com/classic-terra/core/v3/x/market/keeper" + markettypes "github.com/classic-terra/core/v3/x/market/types" ) // TaxCapQueryResponse - tax cap query response for wasm module @@ -57,7 +60,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag return func(ctx sdk.Context, request json.RawMessage) ([]byte, error) { var contractQuery bindings.TerraQuery if err := json.Unmarshal(request, &contractQuery); err != nil { - return nil, sdkerrors.Wrap(err, "terra query") + return nil, errorsmod.Wrap(err, "terra query") } switch { @@ -73,7 +76,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag bz, err := json.Marshal(bindings.SwapQueryResponse{Receive: ConvertSdkCoinToWasmCoin(res.ReturnCoin)}) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) + return nil, errorsmod.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) } return bz, nil @@ -105,7 +108,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag ExchangeRates: items, }) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) + return nil, errorsmod.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) } return bz, nil @@ -114,7 +117,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag taxRate := qp.treasuryKeeper.GetTaxRate(ctx) bz, err := json.Marshal(bindings.TaxRateQueryResponse{Rate: taxRate.String()}) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) + return nil, errorsmod.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) } return bz, nil @@ -123,7 +126,7 @@ func CustomQuerier(qp *QueryPlugin) func(ctx sdk.Context, request json.RawMessag taxCap := qp.treasuryKeeper.GetTaxCap(ctx, contractQuery.TaxCap.Denom) bz, err := json.Marshal(TaxCapQueryResponse{Cap: taxCap.String()}) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) + return nil, errorsmod.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) } return bz, nil diff --git a/wasmbinding/stargate_whitelist.go b/wasmbinding/stargate_whitelist.go index 88784eaa9..abdfec750 100644 --- a/wasmbinding/stargate_whitelist.go +++ b/wasmbinding/stargate_whitelist.go @@ -5,9 +5,9 @@ import ( "sync" wasmvmtypes "github.com/CosmWasm/wasmvm/types" - markettypes "github.com/classic-terra/core/v2/x/market/types" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + markettypes "github.com/classic-terra/core/v3/x/market/types" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" "github.com/cosmos/cosmos-sdk/codec" ) diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 2c4d90bee..36ecaa480 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -7,12 +7,12 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmvmtypes "github.com/CosmWasm/wasmvm/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/wasmbinding/bindings" - markettypes "github.com/classic-terra/core/v2/x/market/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/wasmbinding/bindings" + markettypes "github.com/classic-terra/core/v3/x/market/types" ) -// go test -v -run ^TestSwap$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestSwap$ github.com/classic-terra/core/v3/wasmbinding/test // oracle rate: 1 uluna = 1.7 usdr // 1000 uluna from trader goes to contract // 1666 usdr (after 2% tax) is swapped into which goes back to contract @@ -59,7 +59,7 @@ func (s *WasmTestSuite) Swap(contractPath string, executeFunc func(contract sdk. s.Require().Equal(contractBeforeSwap.AmountOf(core.MicroSDRDenom).Add(expectedSwappedSDR.TruncateInt()), contractAfterSwap.AmountOf(core.MicroSDRDenom)) } -// go test -v -run ^TestSwapSend$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestSwapSend$ github.com/classic-terra/core/v3/wasmbinding/test // oracle rate: 1 uluna = 1.7 usdr // 1000 uluna from trader goes to contract // 1666 usdr (after 2% tax) is swapped into which goes back to contract diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index f7c44efc2..e46d06233 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -5,14 +5,14 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/wasmbinding/bindings" - markettypes "github.com/classic-terra/core/v2/x/market/types" - treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/wasmbinding/bindings" + markettypes "github.com/classic-terra/core/v3/x/market/types" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) -// go test -v -run ^TestQuerySwap$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestQuerySwap$ github.com/classic-terra/core/v3/wasmbinding/test // oracle rate: 1 uluna = 1.7 usdr // 1000 uluna from trader goes to contract // 1666 usdr (after 2% tax) is swapped into @@ -51,7 +51,7 @@ func (s *WasmTestSuite) QuerySwap(contractPath string, queryFunc func(contract s s.Require().Equal(expectedSwappedSDR.TruncateInt().String(), resp.Receive.Amount) } -// go test -v -run ^TestQueryExchangeRates$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestQueryExchangeRates$ github.com/classic-terra/core/v3/wasmbinding/test func (s *WasmTestSuite) QueryExchangeRates(contractPath string, queryFunc func(contract sdk.AccAddress, request bindings.TerraQuery, response interface{})) { s.SetupTest() actor := s.RandomAccountAddresses(1)[0] @@ -79,7 +79,7 @@ func (s *WasmTestSuite) QueryExchangeRates(contractPath string, queryFunc func(c s.Require().Equal(lunaPriceInSDR, sdk.MustNewDecFromStr(resp.ExchangeRates[0].ExchangeRate)) } -// go test -v -run ^TestQueryTaxRate$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestQueryTaxRate$ github.com/classic-terra/core/v3/wasmbinding/test func (s *WasmTestSuite) QueryTaxRate(contractPath string, queryFunc func(contract sdk.AccAddress, request bindings.TerraQuery, response interface{})) { s.SetupTest() actor := s.RandomAccountAddresses(1)[0] @@ -101,7 +101,7 @@ func (s *WasmTestSuite) QueryTaxRate(contractPath string, queryFunc func(contrac s.Require().Equal(treasurytypes.DefaultTaxRate, sdk.MustNewDecFromStr(resp.Rate)) } -// go test -v -run ^TestQueryTaxCap$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestQueryTaxCap$ github.com/classic-terra/core/v3/wasmbinding/test func (s *WasmTestSuite) QueryTaxCap(contractPath string, queryFunc func(contract sdk.AccAddress, request bindings.TerraQuery, response interface{})) { s.SetupTest() actor := s.RandomAccountAddresses(1)[0] diff --git a/wasmbinding/test/custom_test.go b/wasmbinding/test/custom_test.go index d48f5d080..380111de3 100644 --- a/wasmbinding/test/custom_test.go +++ b/wasmbinding/test/custom_test.go @@ -1,7 +1,7 @@ package wasmbinding_test import ( - "github.com/classic-terra/core/v2/wasmbinding/bindings" + "github.com/classic-terra/core/v3/wasmbinding/bindings" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -11,7 +11,7 @@ const ( TerraStargateQueryPath = "../testdata/stargate_tester.wasm" ) -// go test -v -run ^TestWasmTestSuite/TestExecuteBindingsAll$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestWasmTestSuite/TestExecuteBindingsAll$ github.com/classic-terra/core/v3/wasmbinding/test func (s *WasmTestSuite) TestExecuteBindingsAll() { cases := []struct { name string @@ -46,7 +46,7 @@ func (s *WasmTestSuite) TestExecuteBindingsAll() { } } -// go test -v -run ^TestWasmTestSuite/TestQueryBindingsAll$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestWasmTestSuite/TestQueryBindingsAll$ github.com/classic-terra/core/v3/wasmbinding/test func (s *WasmTestSuite) TestQueryBindingsAll() { cases := []struct { name string diff --git a/wasmbinding/test/helpers_test.go b/wasmbinding/test/helpers_test.go index 830fc10bd..030cdf433 100644 --- a/wasmbinding/test/helpers_test.go +++ b/wasmbinding/test/helpers_test.go @@ -6,7 +6,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - apptesting "github.com/classic-terra/core/v2/app/testing" + apptesting "github.com/classic-terra/core/v3/app/testing" "github.com/stretchr/testify/suite" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/wasmbinding/test/tax_test.go b/wasmbinding/test/tax_test.go index 115e99b14..6d53c3494 100644 --- a/wasmbinding/test/tax_test.go +++ b/wasmbinding/test/tax_test.go @@ -5,11 +5,11 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmvmtypes "github.com/CosmWasm/wasmvm/types" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" ) -// go test -v -run ^TestWasmTestSuite/TestTax$ github.com/classic-terra/core/v2/wasmbinding/test +// go test -v -run ^TestWasmTestSuite/TestTax$ github.com/classic-terra/core/v3/wasmbinding/test func (s *WasmTestSuite) TestTax() { s.SetupTest() taxRate := sdk.NewDecWithPrec(11, 2) // 11% diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go index e27940f51..723cafc39 100644 --- a/wasmbinding/wasm.go +++ b/wasmbinding/wasm.go @@ -1,15 +1,14 @@ package wasmbinding import ( - "github.com/CosmWasm/wasmd/x/wasm" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" - oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" - treasurykeeper "github.com/classic-terra/core/v2/x/treasury/keeper" + marketkeeper "github.com/classic-terra/core/v3/x/market/keeper" + oraclekeeper "github.com/classic-terra/core/v3/x/oracle/keeper" + treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper" ) func RegisterCustomPlugins( @@ -30,7 +29,7 @@ func RegisterCustomPlugins( CustomMessageDecorator(marketKeeper), ) - return []wasm.Option{ + return []wasmkeeper.Option{ queryPluginOpt, messengerDecoratorOpt, } @@ -41,7 +40,7 @@ func RegisterStargateQueries(queryRouter baseapp.GRPCQueryRouter, codec codec.Co Stargate: StargateQuerier(queryRouter, codec), }) - return []wasm.Option{ + return []wasmkeeper.Option{ queryPluginOpt, } } diff --git a/x/dyncomm/abci.go b/x/dyncomm/abci.go index b745bc74e..a3105c623 100644 --- a/x/dyncomm/abci.go +++ b/x/dyncomm/abci.go @@ -6,10 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/dyncomm/keeper" - "github.com/classic-terra/core/v2/x/dyncomm/types" + "github.com/classic-terra/core/v3/x/dyncomm/keeper" + "github.com/classic-terra/core/v3/x/dyncomm/types" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" ) // EndBlocker is called at the end of every block diff --git a/x/dyncomm/ante/ante.go b/x/dyncomm/ante/ante.go index fba980012..133c7a1ff 100644 --- a/x/dyncomm/ante/ante.go +++ b/x/dyncomm/ante/ante.go @@ -3,26 +3,29 @@ package ante import ( "fmt" - dyncommkeeper "github.com/classic-terra/core/v2/x/dyncomm/keeper" + errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authz "github.com/cosmos/cosmos-sdk/x/authz" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" + + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + + dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper" ) // DyncommDecorator checks for EditValidator and rejects // edits that do not conform with dyncomm type DyncommDecorator struct { dyncommKeeper dyncommkeeper.Keeper - stakingKeeper stakingkeeper.Keeper + stakingKeeper *stakingkeeper.Keeper cdc codec.BinaryCodec } -func NewDyncommDecorator(cdc codec.BinaryCodec, dk dyncommkeeper.Keeper, sk stakingkeeper.Keeper) DyncommDecorator { +func NewDyncommDecorator(cdc codec.BinaryCodec, dk dyncommkeeper.Keeper, sk *stakingkeeper.Keeper) DyncommDecorator { return DyncommDecorator{ dyncommKeeper: dk, stakingKeeper: sk, @@ -73,7 +76,7 @@ func (dd DyncommDecorator) FilterMsgsAndProcessMsgs(ctx sdk.Context, msgs ...sdk } if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, err.Error()) + return errorsmod.Wrapf(sdkerrors.ErrUnauthorized, err.Error()) } } diff --git a/x/dyncomm/ante/ante_test.go b/x/dyncomm/ante/ante_test.go index e4ba039cb..98a19ba3a 100644 --- a/x/dyncomm/ante/ante_test.go +++ b/x/dyncomm/ante/ante_test.go @@ -5,9 +5,9 @@ import ( "testing" "cosmossdk.io/math" - "github.com/classic-terra/core/v2/app" - core "github.com/classic-terra/core/v2/types" - "github.com/gogo/protobuf/proto" + "github.com/classic-terra/core/v3/app" + core "github.com/classic-terra/core/v3/types" + "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/client" @@ -18,17 +18,17 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx/signing" xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - appparams "github.com/classic-terra/core/v2/app/params" - apptesting "github.com/classic-terra/core/v2/app/testing" - dyncommante "github.com/classic-terra/core/v2/x/dyncomm/ante" + appparams "github.com/classic-terra/core/v3/app/params" + apptesting "github.com/classic-terra/core/v3/app/testing" + dyncommante "github.com/classic-terra/core/v3/x/dyncomm/ante" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" authz "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" ) // AnteTestSuite is a test suite to be used with ante handler tests. @@ -333,7 +333,7 @@ func (suite *AnteTestSuite) TestAnte_EnsureDynCommissionIsMinCommICA() { suite.Require().NoError(err) } -// go test -v -run ^TestAnteTestSuite/TestAnte_EditValidatorAccountSequence$ github.com/classic-terra/core/v2/x/dyncomm/ante +// go test -v -run ^TestAnteTestSuite/TestAnte_EditValidatorAccountSequence$ github.com/classic-terra/core/v3/x/dyncomm/ante // check that account keeper sequence no longer increases when editing validator unsuccessfully func (suite *AnteTestSuite) TestAnte_EditValidatorAccountSequence() { suite.SetupTest() // setup diff --git a/x/dyncomm/client/cli/query.go b/x/dyncomm/client/cli/query.go index f2aa9f929..8cad5340b 100644 --- a/x/dyncomm/client/cli/query.go +++ b/x/dyncomm/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/dyncomm/types" + "github.com/classic-terra/core/v3/x/dyncomm/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/dyncomm/genesis.go b/x/dyncomm/genesis.go index 50be6e1bd..30886d5ca 100644 --- a/x/dyncomm/genesis.go +++ b/x/dyncomm/genesis.go @@ -3,8 +3,8 @@ package dyncomm import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/dyncomm/keeper" - "github.com/classic-terra/core/v2/x/dyncomm/types" + "github.com/classic-terra/core/v3/x/dyncomm/keeper" + "github.com/classic-terra/core/v3/x/dyncomm/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) diff --git a/x/dyncomm/keeper/dyncomm.go b/x/dyncomm/keeper/dyncomm.go index 4350f4760..66e09479e 100644 --- a/x/dyncomm/keeper/dyncomm.go +++ b/x/dyncomm/keeper/dyncomm.go @@ -1,7 +1,7 @@ package keeper import ( - types "github.com/classic-terra/core/v2/x/dyncomm/types" + types "github.com/classic-terra/core/v3/x/dyncomm/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) diff --git a/x/dyncomm/keeper/dyncomm_test.go b/x/dyncomm/keeper/dyncomm_test.go index b0cb66c07..ba4c57082 100644 --- a/x/dyncomm/keeper/dyncomm_test.go +++ b/x/dyncomm/keeper/dyncomm_test.go @@ -4,15 +4,15 @@ import ( "testing" "time" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/staking/teststaking" + "github.com/cosmos/cosmos-sdk/x/staking/testutil" "github.com/stretchr/testify/require" ) func TestCalculateVotingPower(t *testing.T) { input := CreateTestInput(t) - helper := teststaking.NewHelper( + helper := testutil.NewHelper( t, input.Ctx, input.StakingKeeper, ) helper.Denom = core.MicroLunaDenom @@ -30,7 +30,7 @@ func TestCalculateVotingPower(t *testing.T) { func TestCalculateDynCommission(t *testing.T) { input := CreateTestInput(t) - helper := teststaking.NewHelper( + helper := testutil.NewHelper( t, input.Ctx, input.StakingKeeper, ) helper.Denom = core.MicroLunaDenom diff --git a/x/dyncomm/keeper/keeper.go b/x/dyncomm/keeper/keeper.go index 2bc8d6ae0..cde6da3ab 100644 --- a/x/dyncomm/keeper/keeper.go +++ b/x/dyncomm/keeper/keeper.go @@ -3,14 +3,14 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/classic-terra/core/v2/x/dyncomm/types" + "github.com/classic-terra/core/v3/x/dyncomm/types" ) // Keeper of the market store diff --git a/x/dyncomm/keeper/legacy_querier.go b/x/dyncomm/keeper/legacy_querier.go deleted file mode 100644 index f93efc958..000000000 --- a/x/dyncomm/keeper/legacy_querier.go +++ /dev/null @@ -1,30 +0,0 @@ -package keeper - -import ( - "github.com/classic-terra/core/v2/x/dyncomm/types" - abci "github.com/tendermint/tendermint/abci/types" - - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" -) - -// NewLegacyQuerier is the module level router for state queries -func NewLegacyQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return func(ctx sdk.Context, path []string, req abci.RequestQuery) (res []byte, err error) { - switch path[0] { - case types.QueryParameters: - return queryParameters(ctx, k, legacyQuerierCdc) - default: - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown %s query endpoint: %s", types.ModuleName, path[0]) - } - } -} - -func queryParameters(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, k.GetParams(ctx)) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} diff --git a/x/dyncomm/keeper/params.go b/x/dyncomm/keeper/params.go index 3149690c2..3c24d7a9e 100644 --- a/x/dyncomm/keeper/params.go +++ b/x/dyncomm/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/v2/x/dyncomm/types" + "github.com/classic-terra/core/v3/x/dyncomm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/dyncomm/keeper/querier.go b/x/dyncomm/keeper/querier.go index 153bd4e07..53f1f8d23 100644 --- a/x/dyncomm/keeper/querier.go +++ b/x/dyncomm/keeper/querier.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/dyncomm/types" + "github.com/classic-terra/core/v3/x/dyncomm/types" ) // querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over q diff --git a/x/dyncomm/keeper/test_utils.go b/x/dyncomm/keeper/test_utils.go index 4e7a4d215..267cee822 100644 --- a/x/dyncomm/keeper/test_utils.go +++ b/x/dyncomm/keeper/test_utils.go @@ -10,26 +10,26 @@ import ( "cosmossdk.io/math" "github.com/stretchr/testify/require" - customauth "github.com/classic-terra/core/v2/custom/auth" - custombank "github.com/classic-terra/core/v2/custom/bank" - customdistr "github.com/classic-terra/core/v2/custom/distribution" - customparams "github.com/classic-terra/core/v2/custom/params" - customstaking "github.com/classic-terra/core/v2/custom/staking" - core "github.com/classic-terra/core/v2/types" - - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" - - types "github.com/classic-terra/core/v2/x/dyncomm/types" + customauth "github.com/classic-terra/core/v3/custom/auth" + custombank "github.com/classic-terra/core/v3/custom/bank" + customdistr "github.com/classic-terra/core/v3/custom/distribution" + customparams "github.com/classic-terra/core/v3/custom/params" + customstaking "github.com/classic-terra/core/v3/custom/staking" + core "github.com/classic-terra/core/v3/types" + + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + + simparams "cosmossdk.io/simapp/params" + types "github.com/classic-terra/core/v3/x/dyncomm/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdkcrypto "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp" - simparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" @@ -39,6 +39,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" @@ -85,7 +86,7 @@ func MakeEncodingConfig(_ *testing.T) simparams.EncodingConfig { // Test Account var ( - PubKeys = simapp.CreateTestPubKeys(32) + PubKeys = simtestutil.CreateTestPubKeys(32) InitTokens = sdk.TokensFromConsensusPower(10_000, sdk.DefaultPowerReduction) InitCoins = sdk.NewCoins(sdk.NewCoin(core.MicroLunaDenom, InitTokens)) @@ -115,7 +116,7 @@ type TestInput struct { AccountKeeper authkeeper.AccountKeeper BankKeeper bankkeeper.Keeper DistrKeeper distrkeeper.Keeper - StakingKeeper stakingkeeper.Keeper + StakingKeeper *stakingkeeper.Keeper DyncommKeeper Keeper } @@ -145,8 +146,8 @@ func CreateTestInput(t *testing.T) TestInput { require.NoError(t, ms.LoadLatestVersion()) paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, keyParams, tKeyParams) - accountKeeper := authkeeper.NewAccountKeeper(appCodec, keyAcc, paramsKeeper.Subspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix()) - bankKeeper := bankkeeper.NewBaseKeeper(appCodec, keyBank, accountKeeper, paramsKeeper.Subspace(banktypes.ModuleName), blackListAddrs) + accountKeeper := authkeeper.NewAccountKeeper(appCodec, keyAcc, authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), authtypes.NewModuleAddress(govtypes.ModuleName).String()) + bankKeeper := bankkeeper.NewBaseKeeper(appCodec, keyBank, accountKeeper, blackListAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String()) totalSupply := sdk.NewCoins(sdk.NewCoin(core.MicroLunaDenom, math.Int(math.LegacyNewDec(1_000_000_000_000)))) err := bankKeeper.MintCoins(ctx, faucetAccountName, totalSupply) @@ -157,7 +158,7 @@ func CreateTestInput(t *testing.T) TestInput { keyStaking, accountKeeper, bankKeeper, - paramsKeeper.Subspace(stakingtypes.ModuleName), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) stakingParams := stakingtypes.DefaultParams() @@ -165,10 +166,11 @@ func CreateTestInput(t *testing.T) TestInput { stakingKeeper.SetParams(ctx, stakingParams) distrKeeper := distrkeeper.NewKeeper( - appCodec, - keyDistr, paramsKeeper.Subspace(distrtypes.ModuleName), - accountKeeper, bankKeeper, &stakingKeeper, - authtypes.FeeCollectorName) + appCodec, keyDistr, + accountKeeper, bankKeeper, stakingKeeper, + authtypes.FeeCollectorName, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + ) distrKeeper.SetFeePool(ctx, distrtypes.InitialFeePool()) distrParams := distrtypes.DefaultParams() diff --git a/x/dyncomm/module.go b/x/dyncomm/module.go index f5d1c160d..624ea310b 100644 --- a/x/dyncomm/module.go +++ b/x/dyncomm/module.go @@ -6,20 +6,20 @@ import ( "fmt" "math/rand" - "github.com/classic-terra/core/v2/x/dyncomm/client/cli" - "github.com/classic-terra/core/v2/x/dyncomm/keeper" - "github.com/classic-terra/core/v2/x/dyncomm/types" - "github.com/classic-terra/core/v2/x/market/simulation" + "github.com/classic-terra/core/v3/x/dyncomm/client/cli" + "github.com/classic-terra/core/v3/x/dyncomm/keeper" + "github.com/classic-terra/core/v3/x/dyncomm/types" + "github.com/classic-terra/core/v3/x/market/simulation" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - abci "github.com/tendermint/tendermint/abci/types" ) var ( @@ -114,11 +114,6 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json. return nil } -// LegacyQuerierHandler returns the dyncomm module sdk.Querier. -func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return keeper.NewLegacyQuerier(am.keeper, legacyQuerierCdc) -} - // QuerierRoute returns the dyncomm module's querier route name. func (AppModule) QuerierRoute() string { return types.QuerierRoute } @@ -137,11 +132,6 @@ func (am AppModule) NewHandler() sdk.Handler { return nil } -// Route returns the message routing key for the dyncomm module. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, nil) -} - // GenerateGenesisState creates a randomized GenState of the dyncomm module. func (AppModule) GenerateGenesisState(simState *module.SimulationState) { // workaround so that the staking module @@ -166,9 +156,9 @@ func (am AppModule) ProposalContents(_ module.SimulationState) []simtypes.Weight } // RandomizedParams creates randomized dyncomm param changes for the simulator. -func (AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(_ *rand.Rand) []simtypes.LegacyParamChange { // workaround to make the sim work with staking module - return []simtypes.ParamChange{} + return []simtypes.LegacyParamChange{} } // RegisterStoreDecoder registers a decoder for dyncomm module's types diff --git a/x/dyncomm/post/post.go b/x/dyncomm/post/post.go index 519c450ba..13f598a72 100644 --- a/x/dyncomm/post/post.go +++ b/x/dyncomm/post/post.go @@ -1,7 +1,7 @@ package post import ( - dyncommkeeper "github.com/classic-terra/core/v2/x/dyncomm/keeper" + dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) @@ -18,19 +18,19 @@ func NewDyncommPostDecorator(dk dyncommkeeper.Keeper) DyncommDecorator { } } -func (dd DyncommDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) { +func (dd DyncommDecorator) PostHandle(ctx sdk.Context, tx sdk.Tx, simulate, success bool, next sdk.PostHandler) (sdk.Context, error) { if simulate { - return next(ctx, tx, simulate) + return next(ctx, tx, simulate, success) } if ctx.IsCheckTx() { - return next(ctx, tx, simulate) + return next(ctx, tx, simulate, success) } msgs := tx.GetMsgs() dd.FilterMsgsAndProcessMsgs(ctx, msgs...) - return next(ctx, tx, simulate) + return next(ctx, tx, simulate, success) } func (dd DyncommDecorator) FilterMsgsAndProcessMsgs(ctx sdk.Context, msgs ...sdk.Msg) { diff --git a/x/dyncomm/types/dyncomm.pb.go b/x/dyncomm/types/dyncomm.pb.go index 95d447e66..4c10a4bc6 100644 --- a/x/dyncomm/types/dyncomm.pb.go +++ b/x/dyncomm/types/dyncomm.pb.go @@ -5,21 +5,19 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -40,11 +38,9 @@ func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { return fileDescriptor_960758a428b59bad, []int{0} } - func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Params.Marshal(b, m, deterministic) @@ -57,15 +53,12 @@ func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Params) XXX_Merge(src proto.Message) { xxx_messageInfo_Params.Merge(m, src) } - func (m *Params) XXX_Size() int { return m.Size() } - func (m *Params) XXX_DiscardUnknown() { xxx_messageInfo_Params.DiscardUnknown(m) } @@ -81,29 +74,30 @@ func init() { } var fileDescriptor_960758a428b59bad = []byte{ - // 338 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x31, 0x4f, 0xc2, 0x40, - 0x14, 0xc7, 0x5b, 0x31, 0x08, 0x97, 0x18, 0x62, 0xa3, 0xa6, 0x71, 0x68, 0x4d, 0x4d, 0x8c, 0x0b, - 0x3d, 0xd1, 0x8d, 0xb8, 0x88, 0x0e, 0xea, 0x60, 0x4c, 0x07, 0x07, 0x62, 0x42, 0x5e, 0x8f, 0x0b, - 0x12, 0x39, 0xdf, 0xe5, 0xae, 0x12, 0xf0, 0x53, 0x38, 0x19, 0x47, 0x3e, 0x0e, 0x23, 0xa3, 0x71, - 0x20, 0x06, 0x16, 0x67, 0x3f, 0x81, 0xe1, 0x0a, 0xc8, 0xda, 0xe9, 0xee, 0xff, 0xee, 0x9f, 0xdf, - 0x6f, 0xb8, 0x47, 0x0e, 0x12, 0xae, 0x14, 0xd0, 0x66, 0xff, 0x99, 0xa1, 0x10, 0xb4, 0x5b, 0x89, - 0x79, 0x02, 0x95, 0x45, 0x0e, 0xa5, 0xc2, 0x04, 0x9d, 0x1d, 0x53, 0x0a, 0x17, 0xc3, 0x79, 0x69, - 0x6f, 0xbb, 0x85, 0x2d, 0x34, 0x0d, 0x3a, 0xbb, 0xa5, 0xe5, 0xe0, 0x3d, 0x47, 0xf2, 0x77, 0xa0, - 0x40, 0x68, 0xe7, 0x81, 0x14, 0x04, 0xf4, 0x1a, 0xaf, 0x5c, 0xa1, 0x6b, 0xef, 0xdb, 0x47, 0xc5, - 0xda, 0xf9, 0x70, 0xec, 0x5b, 0x5f, 0x63, 0xff, 0xb0, 0xd5, 0x4e, 0x1e, 0x5f, 0xe2, 0x90, 0xa1, - 0xa0, 0x0c, 0xb5, 0x40, 0x3d, 0x3f, 0xca, 0xba, 0xf9, 0x44, 0x93, 0xbe, 0xe4, 0x3a, 0xbc, 0xe4, - 0xec, 0x77, 0xec, 0x97, 0xfa, 0x20, 0x3a, 0xd5, 0x60, 0xc1, 0x09, 0xa2, 0x0d, 0x01, 0xbd, 0x3a, - 0x57, 0xe8, 0xc4, 0x84, 0xe8, 0x0e, 0x4a, 0xde, 0x88, 0x41, 0x73, 0x77, 0xcd, 0xf0, 0x2f, 0x32, - 0xf3, 0xb7, 0x52, 0xfe, 0x3f, 0x29, 0x88, 0x8a, 0x26, 0xd4, 0x40, 0x73, 0x47, 0x92, 0x52, 0xfa, - 0xd2, 0x95, 0x8d, 0xb6, 0x90, 0xc0, 0x12, 0x37, 0x67, 0x44, 0x57, 0x99, 0x45, 0xbb, 0xab, 0xa2, - 0x25, 0x2e, 0x88, 0x36, 0xcd, 0xe4, 0x5e, 0x5e, 0x9b, 0xec, 0xdc, 0x92, 0x1c, 0x03, 0xe9, 0xae, - 0x1b, 0xcb, 0x59, 0x66, 0x0b, 0x49, 0x2d, 0x0c, 0x64, 0x10, 0xcd, 0x40, 0xd5, 0xc2, 0xc7, 0xc0, - 0xb7, 0x7e, 0x06, 0xbe, 0x5d, 0xbb, 0x19, 0x4e, 0x3c, 0x7b, 0x34, 0xf1, 0xec, 0xef, 0x89, 0x67, - 0xbf, 0x4d, 0x3d, 0x6b, 0x34, 0xf5, 0xac, 0xcf, 0xa9, 0x67, 0xd5, 0x8f, 0x57, 0xf1, 0x1d, 0xd0, - 0xba, 0xcd, 0xca, 0xe9, 0x5e, 0x30, 0x54, 0x9c, 0x76, 0x4f, 0x68, 0x6f, 0xb9, 0x21, 0x46, 0x16, - 0xe7, 0xcd, 0x5f, 0x9f, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x3a, 0x1d, 0x57, 0x3f, 0x02, - 0x00, 0x00, + // 360 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0xd2, 0x3f, 0x4f, 0xfa, 0x40, + 0x18, 0x07, 0xf0, 0xf6, 0xc7, 0x2f, 0x08, 0x97, 0x18, 0x62, 0xa3, 0xa6, 0x32, 0xb4, 0x06, 0x13, + 0xe3, 0x42, 0x2b, 0x61, 0x63, 0x24, 0x2c, 0xb2, 0xf8, 0x67, 0x60, 0x20, 0x26, 0xcd, 0xd3, 0xe3, + 0x82, 0x28, 0xe7, 0x5d, 0xee, 0x4e, 0x02, 0x0e, 0xbe, 0x06, 0x47, 0x47, 0x5e, 0x84, 0x2f, 0x82, + 0xc9, 0x10, 0x27, 0xe3, 0x40, 0x0c, 0x2c, 0xce, 0xbe, 0x02, 0xc3, 0x5d, 0x41, 0xc2, 0xc6, 0xd4, + 0x3e, 0x7f, 0xfa, 0xfd, 0x74, 0x78, 0xd0, 0x91, 0x22, 0x42, 0x40, 0xd8, 0x1a, 0xdc, 0x63, 0x46, + 0x69, 0xd8, 0x2b, 0xc5, 0x44, 0x41, 0x69, 0x51, 0x07, 0x5c, 0x30, 0xc5, 0x9c, 0x3d, 0xbd, 0x14, + 0x2c, 0x9a, 0xc9, 0x52, 0xfe, 0x00, 0x33, 0x49, 0x99, 0x8c, 0xf4, 0x52, 0x68, 0x0a, 0xf3, 0x45, + 0x7e, 0xb7, 0xcd, 0xda, 0xcc, 0xf4, 0xe7, 0x6f, 0xa6, 0x5b, 0x78, 0x4b, 0xa1, 0xf4, 0x05, 0x08, + 0xa0, 0xd2, 0xb9, 0x45, 0x19, 0x0a, 0xfd, 0xe8, 0x91, 0x08, 0xe6, 0xda, 0x87, 0xf6, 0x49, 0xb6, + 0x7a, 0x3e, 0x9a, 0xf8, 0xd6, 0xe7, 0xc4, 0x3f, 0x6e, 0x77, 0xd4, 0xcd, 0x43, 0x1c, 0x60, 0x46, + 0x93, 0xcc, 0xe4, 0x51, 0x94, 0xad, 0xbb, 0x50, 0x0d, 0x38, 0x91, 0x41, 0x8d, 0xe0, 0x9f, 0x89, + 0x9f, 0x1b, 0x00, 0xed, 0x56, 0x0a, 0x8b, 0x9c, 0xc2, 0xfb, 0x6b, 0x11, 0x25, 0x7f, 0x51, 0x23, + 0xf8, 0x6a, 0x8b, 0x42, 0xbf, 0x49, 0x04, 0x73, 0x38, 0x42, 0xb2, 0xcb, 0x38, 0x89, 0x62, 0x90, + 0xc4, 0xfd, 0xa7, 0xb5, 0xcb, 0x8d, 0xb5, 0x1d, 0xa3, 0xfd, 0x25, 0xad, 0x7b, 0x59, 0x3d, 0xaa, + 0x82, 0x24, 0xce, 0x13, 0xca, 0x99, 0xbd, 0x1e, 0x8f, 0x3a, 0x94, 0x03, 0x56, 0x6e, 0x4a, 0xb3, + 0x8d, 0x8d, 0xd9, 0xfd, 0x55, 0x76, 0x19, 0xb7, 0x6e, 0x6f, 0xeb, 0x79, 0x83, 0x9f, 0xe9, 0xa9, + 0x73, 0x8d, 0x52, 0x18, 0xb8, 0xfb, 0x5f, 0x9b, 0xf5, 0x8d, 0x4d, 0x64, 0x4c, 0x0c, 0x7c, 0xdd, + 0x99, 0xc7, 0x56, 0x32, 0x2f, 0x43, 0xdf, 0xfa, 0x1e, 0xfa, 0x76, 0xb5, 0x3e, 0x9a, 0x7a, 0xf6, + 0x78, 0xea, 0xd9, 0x5f, 0x53, 0xcf, 0x7e, 0x9e, 0x79, 0xd6, 0x78, 0xe6, 0x59, 0x1f, 0x33, 0xcf, + 0x6a, 0x9e, 0xae, 0x62, 0x5d, 0x90, 0xb2, 0x83, 0x8b, 0xe6, 0xd4, 0x30, 0x13, 0x24, 0xec, 0x95, + 0xc3, 0xfe, 0xf2, 0xe8, 0x34, 0x1d, 0xa7, 0xf5, 0x8d, 0x94, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, + 0xb4, 0x58, 0x6a, 0x24, 0x92, 0x02, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -139,7 +133,6 @@ func (this *Params) Equal(that interface{}) bool { } return true } - func (m *Params) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -214,7 +207,6 @@ func encodeVarintDyncomm(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *Params) Size() (n int) { if m == nil { return 0 @@ -235,11 +227,9 @@ func (m *Params) Size() (n int) { func sovDyncomm(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozDyncomm(x uint64) (n int) { return sovDyncomm(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *Params) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -426,7 +416,6 @@ func (m *Params) Unmarshal(dAtA []byte) error { } return nil } - func skipDyncomm(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/dyncomm/types/genesis.pb.go b/x/dyncomm/types/genesis.pb.go index f00a56da2..9be988410 100644 --- a/x/dyncomm/types/genesis.pb.go +++ b/x/dyncomm/types/genesis.pb.go @@ -5,21 +5,19 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -40,11 +38,9 @@ func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { return fileDescriptor_ac14a232c2479651, []int{0} } - func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) @@ -57,15 +53,12 @@ func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } - func (m *GenesisState) XXX_Merge(src proto.Message) { xxx_messageInfo_GenesisState.Merge(m, src) } - func (m *GenesisState) XXX_Size() int { return m.Size() } - func (m *GenesisState) XXX_DiscardUnknown() { xxx_messageInfo_GenesisState.DiscardUnknown(m) } @@ -100,11 +93,9 @@ func (*ValidatorCommissionRate) ProtoMessage() {} func (*ValidatorCommissionRate) Descriptor() ([]byte, []int) { return fileDescriptor_ac14a232c2479651, []int{1} } - func (m *ValidatorCommissionRate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *ValidatorCommissionRate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_ValidatorCommissionRate.Marshal(b, m, deterministic) @@ -117,15 +108,12 @@ func (m *ValidatorCommissionRate) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } - func (m *ValidatorCommissionRate) XXX_Merge(src proto.Message) { xxx_messageInfo_ValidatorCommissionRate.Merge(m, src) } - func (m *ValidatorCommissionRate) XXX_Size() int { return m.Size() } - func (m *ValidatorCommissionRate) XXX_DiscardUnknown() { xxx_messageInfo_ValidatorCommissionRate.DiscardUnknown(m) } @@ -149,30 +137,32 @@ func init() { } var fileDescriptor_ac14a232c2479651 = []byte{ - // 358 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x41, 0x4b, 0x02, 0x41, - 0x1c, 0xc5, 0x77, 0x35, 0x84, 0xc6, 0x0e, 0xb9, 0x59, 0x2d, 0x42, 0xab, 0x18, 0x84, 0x14, 0xce, - 0xa4, 0x1d, 0x3b, 0x65, 0x41, 0xd0, 0x29, 0x36, 0xe8, 0xe0, 0xc5, 0xc6, 0xdd, 0x61, 0x1b, 0x72, - 0x76, 0x64, 0xfe, 0xd3, 0x92, 0xf7, 0x3e, 0x40, 0xdf, 0xa8, 0xab, 0x47, 0x8f, 0xd1, 0x41, 0x42, - 0xbf, 0x48, 0xb8, 0xbb, 0x5a, 0x98, 0x1e, 0x3a, 0xed, 0x32, 0xff, 0xdf, 0x7b, 0xef, 0x3f, 0xc3, - 0x43, 0x87, 0x9a, 0x29, 0x45, 0x89, 0x3f, 0x08, 0x3d, 0x29, 0x04, 0x89, 0x1a, 0x5d, 0xa6, 0x69, - 0x83, 0x04, 0x2c, 0x64, 0xc0, 0x01, 0xf7, 0x95, 0xd4, 0xd2, 0xda, 0x8d, 0x21, 0x9c, 0x42, 0x38, - 0x85, 0x4a, 0xc5, 0x40, 0x06, 0x32, 0x26, 0xc8, 0xec, 0x2f, 0x81, 0x4b, 0x6b, 0x1c, 0xe7, 0xe2, - 0x18, 0xaa, 0xbe, 0x9b, 0x68, 0xeb, 0x3a, 0xc9, 0xb8, 0xd3, 0x54, 0x33, 0xeb, 0x1c, 0xe5, 0xfa, - 0x54, 0x51, 0x01, 0xb6, 0x59, 0x31, 0x6b, 0xf9, 0xe6, 0x01, 0x5e, 0x99, 0x89, 0x6f, 0x63, 0xa8, - 0xb5, 0x31, 0x1c, 0x97, 0x0d, 0x37, 0x95, 0x58, 0x0a, 0x95, 0x22, 0xda, 0xe3, 0x3e, 0xd5, 0x52, - 0x75, 0x66, 0x38, 0x07, 0xe0, 0x32, 0xec, 0x28, 0xaa, 0x19, 0xd8, 0x99, 0x4a, 0xb6, 0x96, 0x6f, - 0xe2, 0x35, 0x86, 0xf7, 0x73, 0xe1, 0xe5, 0x42, 0xe7, 0x52, 0xcd, 0xd2, 0x04, 0x3b, 0x5a, 0x3d, - 0x86, 0xea, 0x6b, 0x06, 0xed, 0xaf, 0xd1, 0x5a, 0x27, 0xa8, 0xf0, 0xb3, 0x0f, 0xf5, 0x7d, 0xc5, - 0x20, 0xb9, 0xd7, 0xa6, 0xbb, 0xbd, 0x18, 0x5c, 0x24, 0xe7, 0x56, 0x1b, 0xed, 0x08, 0x1e, 0x2e, - 0xaf, 0x6d, 0x67, 0x66, 0x78, 0xeb, 0xf8, 0x73, 0x5c, 0x3e, 0x0a, 0xb8, 0x7e, 0x7c, 0xee, 0x62, - 0x4f, 0x0a, 0xe2, 0x49, 0x10, 0x12, 0xd2, 0x4f, 0x1d, 0xfc, 0x27, 0xa2, 0x07, 0x7d, 0x06, 0xf8, - 0x8a, 0x79, 0x6e, 0x41, 0xf0, 0x70, 0x69, 0x91, 0x07, 0xb4, 0xa7, 0xa9, 0x0a, 0x98, 0xfe, 0x63, - 0x9f, 0xfd, 0xb7, 0x7d, 0x31, 0x71, 0x5a, 0x7a, 0xa6, 0x9b, 0xe1, 0xc4, 0x31, 0x47, 0x13, 0xc7, - 0xfc, 0x9a, 0x38, 0xe6, 0xdb, 0xd4, 0x31, 0x46, 0x53, 0xc7, 0xf8, 0x98, 0x3a, 0x46, 0xfb, 0xf4, - 0xb7, 0x6f, 0x8f, 0x02, 0x70, 0xaf, 0x9e, 0x54, 0xc3, 0x93, 0x8a, 0x91, 0xa8, 0x49, 0x5e, 0x16, - 0x25, 0x89, 0x53, 0xba, 0xb9, 0xb8, 0x1b, 0x67, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xea, 0x0a, - 0x36, 0xd6, 0x94, 0x02, 0x00, 0x00, + // 391 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0x31, 0x4f, 0xfa, 0x40, + 0x18, 0xc6, 0x5b, 0xf8, 0x87, 0xe4, 0x7f, 0x38, 0x48, 0x45, 0xad, 0x24, 0x16, 0x82, 0x89, 0x61, + 0xe9, 0x55, 0x60, 0x31, 0x71, 0x12, 0x31, 0x26, 0x4e, 0xa6, 0x24, 0x0e, 0x2e, 0xe4, 0x68, 0x2f, + 0xe5, 0x22, 0xed, 0x91, 0xbb, 0xb3, 0x91, 0x6f, 0xe1, 0x87, 0x61, 0x72, 0x71, 0x65, 0x24, 0x4c, + 0xc6, 0x81, 0x18, 0xf8, 0x22, 0x86, 0xde, 0x81, 0x06, 0x61, 0x72, 0x6a, 0xfb, 0xde, 0xf3, 0x3c, + 0xbf, 0xf7, 0xde, 0xbe, 0xe0, 0x44, 0x60, 0xc6, 0x90, 0xe3, 0x0f, 0x22, 0x8f, 0x86, 0xa1, 0x13, + 0x57, 0x3b, 0x58, 0xa0, 0xaa, 0x13, 0xe0, 0x08, 0x73, 0xc2, 0x61, 0x9f, 0x51, 0x41, 0x8d, 0xfd, + 0x44, 0x04, 0x95, 0x08, 0x2a, 0x51, 0xe1, 0xc8, 0xa3, 0x3c, 0xa4, 0xbc, 0x9d, 0x88, 0x1c, 0xf9, + 0x21, 0x1d, 0x85, 0x7c, 0x40, 0x03, 0x2a, 0xeb, 0x8b, 0x37, 0x55, 0xdd, 0x02, 0x5b, 0xe6, 0x26, + 0xa2, 0xf2, 0x9b, 0x0e, 0x76, 0x6e, 0x24, 0xbe, 0x25, 0x90, 0xc0, 0xc6, 0x05, 0xc8, 0xf4, 0x11, + 0x43, 0x21, 0x37, 0xf5, 0x92, 0x5e, 0xc9, 0xd6, 0x8e, 0xe1, 0xc6, 0x76, 0xe0, 0x5d, 0x22, 0x6a, + 0xfc, 0x1b, 0x4d, 0x8b, 0x9a, 0xab, 0x2c, 0x06, 0x03, 0x85, 0x18, 0xf5, 0x88, 0x8f, 0x04, 0x65, + 0xed, 0x85, 0x9c, 0x70, 0x4e, 0x68, 0xd4, 0x66, 0x48, 0x60, 0x6e, 0xa6, 0x4a, 0xe9, 0x4a, 0xb6, + 0x06, 0xb7, 0x04, 0xde, 0x2f, 0x8d, 0x57, 0x2b, 0x9f, 0x8b, 0x04, 0x56, 0x04, 0x33, 0xde, 0x7c, + 0xcc, 0xcb, 0xaf, 0x29, 0x70, 0xb8, 0xc5, 0x6b, 0x5c, 0x83, 0xdc, 0x77, 0x3f, 0xc8, 0xf7, 0x19, + 0xe6, 0xf2, 0x5e, 0xff, 0x1b, 0xe6, 0x64, 0x68, 0xe7, 0xd5, 0x14, 0x2f, 0xe5, 0x49, 0x4b, 0x30, + 0x12, 0x05, 0xee, 0xee, 0xca, 0xa2, 0xea, 0x46, 0x17, 0xec, 0x85, 0x24, 0x5a, 0xbf, 0x90, 0x99, + 0x4a, 0x82, 0xce, 0x3f, 0xa6, 0xc5, 0xd3, 0x80, 0x88, 0xee, 0x53, 0x07, 0x7a, 0x34, 0x54, 0x7f, + 0x46, 0x3d, 0x6c, 0xee, 0x3f, 0x3a, 0x62, 0xd0, 0xc7, 0x1c, 0x36, 0xb1, 0x37, 0x19, 0xda, 0x40, + 0x21, 0x9b, 0xd8, 0x73, 0x73, 0x21, 0x89, 0xd6, 0x1a, 0x8e, 0xc0, 0x81, 0x40, 0x2c, 0xc0, 0xe2, + 0x17, 0x2c, 0xfd, 0x47, 0x58, 0x5e, 0xe6, 0xae, 0x0d, 0xf7, 0x76, 0x34, 0xb3, 0xf4, 0xf1, 0xcc, + 0xd2, 0x3f, 0x67, 0x96, 0xfe, 0x32, 0xb7, 0xb4, 0xf1, 0xdc, 0xd2, 0xde, 0xe7, 0x96, 0xf6, 0x70, + 0xf6, 0x93, 0xd2, 0x43, 0x9c, 0x13, 0xcf, 0x96, 0x0b, 0xe5, 0x51, 0x86, 0x9d, 0xb8, 0xee, 0x3c, + 0xaf, 0x56, 0x2b, 0x61, 0x76, 0x32, 0xc9, 0x46, 0xd5, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcf, + 0x05, 0xce, 0x08, 0xe5, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -287,7 +277,6 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *GenesisState) Size() (n int) { if m == nil { return 0 @@ -329,11 +318,9 @@ func (m *ValidatorCommissionRate) Size() (n int) { func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozGenesis(x uint64) (n int) { return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *GenesisState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -451,7 +438,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } - func (m *ValidatorCommissionRate) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -606,7 +592,6 @@ func (m *ValidatorCommissionRate) Unmarshal(dAtA []byte) error { } return nil } - func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/dyncomm/types/query.pb.go b/x/dyncomm/types/query.pb.go index afe35a145..bab1569d6 100644 --- a/x/dyncomm/types/query.pb.go +++ b/x/dyncomm/types/query.pb.go @@ -6,26 +6,24 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -34,7 +32,8 @@ var ( const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QueryParamsRequest is the request type for the Query/Params RPC method. -type QueryParamsRequest struct{} +type QueryParamsRequest struct { +} func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } @@ -42,11 +41,9 @@ func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_6284eb8921642edc, []int{0} } - func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) @@ -59,15 +56,12 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsRequest.Merge(m, src) } - func (m *QueryParamsRequest) XXX_Size() int { return m.Size() } - func (m *QueryParamsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) } @@ -86,11 +80,9 @@ func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_6284eb8921642edc, []int{1} } - func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) @@ -103,15 +95,12 @@ func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsResponse.Merge(m, src) } - func (m *QueryParamsResponse) XXX_Size() int { return m.Size() } - func (m *QueryParamsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) } @@ -137,11 +126,9 @@ func (*QueryRateRequest) ProtoMessage() {} func (*QueryRateRequest) Descriptor() ([]byte, []int) { return fileDescriptor_6284eb8921642edc, []int{2} } - func (m *QueryRateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryRateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryRateRequest.Marshal(b, m, deterministic) @@ -154,15 +141,12 @@ func (m *QueryRateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } - func (m *QueryRateRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryRateRequest.Merge(m, src) } - func (m *QueryRateRequest) XXX_Size() int { return m.Size() } - func (m *QueryRateRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryRateRequest.DiscardUnknown(m) } @@ -188,11 +172,9 @@ func (*QueryRateResponse) ProtoMessage() {} func (*QueryRateResponse) Descriptor() ([]byte, []int) { return fileDescriptor_6284eb8921642edc, []int{3} } - func (m *QueryRateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryRateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryRateResponse.Marshal(b, m, deterministic) @@ -205,15 +187,12 @@ func (m *QueryRateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } - func (m *QueryRateResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryRateResponse.Merge(m, src) } - func (m *QueryRateResponse) XXX_Size() int { return m.Size() } - func (m *QueryRateResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryRateResponse.DiscardUnknown(m) } @@ -230,41 +209,42 @@ func init() { func init() { proto.RegisterFile("terra/dyncomm/v1beta1/query.proto", fileDescriptor_6284eb8921642edc) } var fileDescriptor_6284eb8921642edc = []byte{ - // 429 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x4d, 0x8b, 0xd3, 0x40, - 0x18, 0xce, 0x94, 0x1a, 0x70, 0x44, 0xd1, 0xb1, 0x42, 0x09, 0x36, 0xd5, 0x48, 0xb5, 0x16, 0x3b, - 0x63, 0xab, 0x17, 0x11, 0x04, 0x83, 0x27, 0x4f, 0x9a, 0xa3, 0x17, 0x99, 0x26, 0x43, 0x0c, 0x36, - 0x99, 0x74, 0x66, 0x5a, 0x2c, 0xe2, 0xc5, 0x83, 0x57, 0x05, 0x0f, 0xde, 0xfd, 0x35, 0x3d, 0x16, - 0xbc, 0xc8, 0x1e, 0xca, 0xd2, 0xee, 0x0f, 0x59, 0x32, 0x99, 0x2d, 0x2d, 0xdb, 0xee, 0xc7, 0x29, - 0xe1, 0xcd, 0xf3, 0xf5, 0x3e, 0x6f, 0xe0, 0x7d, 0xc5, 0x84, 0xa0, 0x24, 0x9a, 0x66, 0x21, 0x4f, - 0x53, 0x32, 0xe9, 0x0d, 0x98, 0xa2, 0x3d, 0x32, 0x1a, 0x33, 0x31, 0xc5, 0xb9, 0xe0, 0x8a, 0xa3, - 0x3b, 0x1a, 0x82, 0x0d, 0x04, 0x1b, 0x88, 0x53, 0x8b, 0x79, 0xcc, 0x35, 0x82, 0x14, 0x6f, 0x25, - 0xd8, 0xb9, 0x1b, 0x73, 0x1e, 0x0f, 0x19, 0xa1, 0x79, 0x42, 0x68, 0x96, 0x71, 0x45, 0x55, 0xc2, - 0x33, 0x69, 0xbe, 0x3e, 0xd8, 0xed, 0x76, 0x22, 0xad, 0x41, 0x5e, 0x0d, 0xa2, 0xf7, 0x85, 0xfd, - 0x3b, 0x2a, 0x68, 0x2a, 0x03, 0x36, 0x1a, 0x33, 0xa9, 0xbc, 0x00, 0xde, 0xde, 0x9a, 0xca, 0x9c, - 0x67, 0x92, 0xa1, 0x97, 0xd0, 0xce, 0xf5, 0xa4, 0x0e, 0xee, 0x81, 0xf6, 0xb5, 0x7e, 0x03, 0xef, - 0x4c, 0x8b, 0x4b, 0x9a, 0x5f, 0x9d, 0x2d, 0x9a, 0x56, 0x60, 0x28, 0xde, 0x0b, 0x78, 0x53, 0x6b, - 0x06, 0x54, 0x31, 0xe3, 0x83, 0x5a, 0xf0, 0xc6, 0x84, 0x0e, 0x93, 0x88, 0x2a, 0x2e, 0x3e, 0xd2, - 0x28, 0x12, 0x5a, 0xf8, 0x6a, 0x70, 0x7d, 0x3d, 0x7d, 0x1d, 0x45, 0xc2, 0xfb, 0x03, 0xe0, 0xad, - 0x0d, 0xae, 0x49, 0xf3, 0x0a, 0x56, 0x05, 0x55, 0xac, 0xa4, 0xf8, 0x9d, 0x83, 0x45, 0xf3, 0x61, - 0x9c, 0xa8, 0x4f, 0xe3, 0x01, 0x0e, 0x79, 0x4a, 0x42, 0x2e, 0x53, 0x2e, 0xcd, 0xa3, 0x2b, 0xa3, - 0xcf, 0x44, 0x4d, 0x73, 0x26, 0xf1, 0x1b, 0x16, 0x06, 0x9a, 0x87, 0x7c, 0x68, 0x2b, 0x2a, 0x62, - 0xa6, 0xea, 0x95, 0x4b, 0x2b, 0x18, 0x66, 0xff, 0x6f, 0x05, 0x5e, 0xd1, 0xc9, 0xd0, 0x0f, 0x00, - 0xed, 0x72, 0x6f, 0xf4, 0x78, 0x4f, 0x2d, 0xa7, 0x8b, 0x76, 0x3a, 0x17, 0x81, 0x96, 0xfb, 0x7a, - 0xad, 0xef, 0xff, 0x8e, 0x7e, 0x57, 0x9a, 0xa8, 0x41, 0x76, 0x1f, 0xb6, 0xec, 0x19, 0xfd, 0x04, - 0xb0, 0x5a, 0xf4, 0x84, 0x1e, 0x9d, 0xa5, 0xbd, 0x71, 0x05, 0xa7, 0x7d, 0x3e, 0xd0, 0x44, 0x78, - 0xae, 0x23, 0x60, 0xf4, 0x64, 0x4f, 0x84, 0xa2, 0x57, 0xf2, 0x75, 0xfb, 0xa4, 0xdf, 0xfc, 0xb7, - 0xb3, 0xa5, 0x0b, 0xe6, 0x4b, 0x17, 0x1c, 0x2e, 0x5d, 0xf0, 0x6b, 0xe5, 0x5a, 0xf3, 0x95, 0x6b, - 0xfd, 0x5f, 0xb9, 0xd6, 0x87, 0xa7, 0x9b, 0x75, 0x0f, 0xa9, 0x94, 0x49, 0xd8, 0x2d, 0x95, 0x43, - 0x2e, 0x18, 0x99, 0xf4, 0xc9, 0x97, 0xb5, 0x87, 0x2e, 0x7f, 0x60, 0xeb, 0xdf, 0xf6, 0xd9, 0x71, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x60, 0x43, 0x79, 0xba, 0x4b, 0x03, 0x00, 0x00, + // 467 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x33, 0xa5, 0x06, 0x1c, 0x51, 0x74, 0xac, 0x50, 0x83, 0x9b, 0x6a, 0x44, 0x5d, 0xc5, + 0xcc, 0xb8, 0xbb, 0x1e, 0x04, 0x0f, 0x62, 0xd9, 0x93, 0x78, 0x58, 0xb3, 0x37, 0x2f, 0xcb, 0x34, + 0x19, 0x62, 0xb0, 0xc9, 0x64, 0x67, 0xa6, 0xc5, 0x22, 0x5e, 0x3c, 0x78, 0x55, 0xf0, 0x1b, 0xf8, + 0x15, 0xdc, 0x0f, 0xd1, 0x63, 0xa9, 0x17, 0xf1, 0x50, 0xa4, 0xf5, 0x83, 0x48, 0x66, 0xa6, 0xa5, + 0xc5, 0x56, 0x85, 0x3d, 0x25, 0x79, 0xfc, 0xdf, 0xef, 0xfd, 0xf3, 0x7f, 0x0f, 0xde, 0x50, 0x4c, + 0x08, 0x4a, 0x92, 0x41, 0x11, 0xf3, 0x3c, 0x27, 0xfd, 0x9d, 0x0e, 0x53, 0x74, 0x87, 0x1c, 0xf7, + 0x98, 0x18, 0xe0, 0x52, 0x70, 0xc5, 0xd1, 0x15, 0x2d, 0xc1, 0x56, 0x82, 0xad, 0xc4, 0xbb, 0x1a, + 0x73, 0x99, 0x73, 0x79, 0xa4, 0x45, 0xc4, 0x7c, 0x98, 0x0e, 0xaf, 0x91, 0xf2, 0x94, 0x9b, 0x7a, + 0xf5, 0x66, 0xab, 0xd7, 0x52, 0xce, 0xd3, 0x2e, 0x23, 0xb4, 0xcc, 0x08, 0x2d, 0x0a, 0xae, 0xa8, + 0xca, 0x78, 0x31, 0xef, 0xb9, 0xb9, 0xde, 0xc8, 0x7c, 0xaa, 0x16, 0x05, 0x0d, 0x88, 0x5e, 0x54, + 0xce, 0x0e, 0xa8, 0xa0, 0xb9, 0x8c, 0xd8, 0x71, 0x8f, 0x49, 0x15, 0x44, 0xf0, 0xf2, 0x4a, 0x55, + 0x96, 0xbc, 0x90, 0x0c, 0x3d, 0x86, 0x6e, 0xa9, 0x2b, 0x4d, 0x70, 0x1d, 0x6c, 0x9f, 0xdb, 0xdd, + 0xc2, 0x6b, 0x7f, 0x04, 0x9b, 0xb6, 0x76, 0x7d, 0x38, 0x69, 0x39, 0x91, 0x6d, 0x09, 0x0e, 0xe1, + 0x45, 0xcd, 0x8c, 0xa8, 0x62, 0x76, 0x0e, 0x7a, 0x02, 0x2f, 0xf4, 0x69, 0x37, 0x4b, 0xa8, 0xe2, + 0xe2, 0x88, 0x26, 0x89, 0xd0, 0xe0, 0xb3, 0xed, 0xe6, 0xf8, 0x24, 0x6c, 0xd8, 0x00, 0x9e, 0x26, + 0x89, 0x60, 0x52, 0x1e, 0x2a, 0x91, 0x15, 0x69, 0x74, 0x7e, 0xa1, 0xaf, 0xea, 0xc1, 0x57, 0x00, + 0x2f, 0x2d, 0x51, 0xad, 0xcf, 0xe7, 0xb0, 0x2e, 0xa8, 0x62, 0x16, 0xf6, 0xe8, 0xc7, 0xa4, 0x75, + 0x3b, 0xcd, 0xd4, 0xab, 0x5e, 0x07, 0xc7, 0x3c, 0xb7, 0xc1, 0xda, 0x47, 0x28, 0x93, 0xd7, 0x44, + 0x0d, 0x4a, 0x26, 0xf1, 0x3e, 0x8b, 0xc7, 0x27, 0x21, 0xb4, 0x63, 0xf7, 0x59, 0x1c, 0x69, 0x0a, + 0x3a, 0x80, 0xae, 0xa2, 0x22, 0x65, 0xaa, 0x59, 0x3b, 0x25, 0xcf, 0x72, 0x76, 0xbf, 0xd4, 0xe0, + 0x19, 0xed, 0x1a, 0x7d, 0x00, 0xd0, 0x35, 0x69, 0xa1, 0xbb, 0x1b, 0xc2, 0xfc, 0x73, 0x3d, 0xde, + 0xbd, 0xff, 0x91, 0x9a, 0x2c, 0x82, 0x5b, 0xef, 0xbf, 0xfd, 0xfa, 0x5c, 0x6b, 0xa1, 0x2d, 0xb2, + 0xfe, 0x1c, 0xcc, 0x76, 0xd0, 0x47, 0x00, 0xeb, 0x55, 0x86, 0xe8, 0xce, 0xdf, 0xd8, 0x4b, 0xbb, + 0xf3, 0xb6, 0xff, 0x2d, 0xb4, 0x16, 0x1e, 0x6a, 0x0b, 0x18, 0xdd, 0xdf, 0x60, 0xa1, 0x4a, 0x99, + 0xbc, 0x5d, 0x3d, 0x84, 0x77, 0xed, 0x67, 0xc3, 0xa9, 0x0f, 0x46, 0x53, 0x1f, 0xfc, 0x9c, 0xfa, + 0xe0, 0xd3, 0xcc, 0x77, 0x46, 0x33, 0xdf, 0xf9, 0x3e, 0xf3, 0x9d, 0x97, 0x0f, 0x96, 0xc3, 0xef, + 0x52, 0x29, 0xb3, 0x38, 0x34, 0xe4, 0x98, 0x0b, 0x46, 0xfa, 0x7b, 0xe4, 0xcd, 0x62, 0x86, 0x5e, + 0x45, 0xc7, 0xd5, 0xc7, 0xbe, 0xf7, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x5a, 0xe8, 0x7e, 0xcf, 0x9c, + 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -313,12 +293,12 @@ type QueryServer interface { } // UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct{} +type UnimplementedQueryServer struct { +} func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } - func (*UnimplementedQueryServer) Rate(ctx context.Context, req *QueryRateRequest) (*QueryRateResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Rate not implemented") } @@ -524,7 +504,6 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *QueryParamsRequest) Size() (n int) { if m == nil { return 0 @@ -578,11 +557,9 @@ func (m *QueryRateResponse) Size() (n int) { func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -633,7 +610,6 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -717,7 +693,6 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryRateRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -800,7 +775,6 @@ func (m *QueryRateRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryRateResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -923,7 +897,6 @@ func (m *QueryRateResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/dyncomm/types/query.pb.gw.go b/x/dyncomm/types/query.pb.gw.go index b5d2a4f13..f82dfd69b 100644 --- a/x/dyncomm/types/query.pb.gw.go +++ b/x/dyncomm/types/query.pb.gw.go @@ -25,15 +25,13 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = runtime.String - _ = utilities.NewDoubleArray - _ = descriptor.ForMessage - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryParamsRequest @@ -41,6 +39,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -49,6 +48,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal msg, err := server.Params(ctx, &protoReq) return msg, metadata, err + } func request_Query_Rate_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -75,6 +75,7 @@ func request_Query_Rate_0(ctx context.Context, marshaler runtime.Marshaler, clie msg, err := client.Rate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Rate_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -101,6 +102,7 @@ func local_request_Query_Rate_0(ctx context.Context, marshaler runtime.Marshaler msg, err := server.Rate(ctx, &protoReq) return msg, metadata, err + } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". @@ -108,6 +110,7 @@ func local_request_Query_Rate_0(ctx context.Context, marshaler runtime.Marshaler // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { + mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -128,6 +131,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Rate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -150,6 +154,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Rate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -192,6 +197,7 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { + mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -209,6 +215,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Rate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -228,6 +235,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Rate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil diff --git a/x/market/abci.go b/x/market/abci.go index 91322b508..f8a7503eb 100644 --- a/x/market/abci.go +++ b/x/market/abci.go @@ -3,7 +3,7 @@ package market import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v3/x/market/keeper" ) // EndBlocker is called at the end of every block diff --git a/x/market/abci_test.go b/x/market/abci_test.go index 2fba640cf..37f41ffc4 100644 --- a/x/market/abci_test.go +++ b/x/market/abci_test.go @@ -3,7 +3,7 @@ package market import ( "testing" - "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v3/x/market/keeper" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/market/client/cli/query.go b/x/market/client/cli/query.go index 50b1d412a..7d5b6bf01 100644 --- a/x/market/client/cli/query.go +++ b/x/market/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/market/client/cli/tx.go b/x/market/client/cli/tx.go index fa46365e0..e13678fa2 100644 --- a/x/market/client/cli/tx.go +++ b/x/market/client/cli/tx.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" - "github.com/classic-terra/core/v2/x/market/types" + feeutils "github.com/classic-terra/core/v3/custom/auth/client/utils" + "github.com/classic-terra/core/v3/x/market/types" ) // GetTxCmd returns the transaction commands for this module @@ -53,7 +53,10 @@ $ terrad market swap "1000ukrw" "uusd" "terra1..." } // Generate transaction factory for gas simulation - txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags()) + if err != nil { + return err + } offerCoinStr := args[0] offerCoin, err := sdk.ParseCoinNormalized(offerCoinStr) diff --git a/x/market/common_test.go b/x/market/common_test.go index 7a2a34c27..530331335 100644 --- a/x/market/common_test.go +++ b/x/market/common_test.go @@ -3,8 +3,8 @@ package market import ( "testing" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/market/keeper" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/market/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/market/exported/alias.go b/x/market/exported/alias.go index bffd31f2b..a138b7852 100644 --- a/x/market/exported/alias.go +++ b/x/market/exported/alias.go @@ -1,7 +1,7 @@ // DONTCOVER package exported -import "github.com/classic-terra/core/v2/x/market/types" +import "github.com/classic-terra/core/v3/x/market/types" type ( MsgSwap = types.MsgSwap diff --git a/x/market/genesis.go b/x/market/genesis.go index f274e93a4..30dc6cf60 100644 --- a/x/market/genesis.go +++ b/x/market/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/market/keeper" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/keeper" + "github.com/classic-terra/core/v3/x/market/types" ) // InitGenesis initialize default parameters diff --git a/x/market/genesis_test.go b/x/market/genesis_test.go index 9e7845d0b..9ca1e57ab 100644 --- a/x/market/genesis_test.go +++ b/x/market/genesis_test.go @@ -3,7 +3,7 @@ package market import ( "testing" - "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v3/x/market/keeper" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/market/handler.go b/x/market/handler.go index a1579997c..65346637c 100644 --- a/x/market/handler.go +++ b/x/market/handler.go @@ -1,11 +1,12 @@ package market import ( + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/classic-terra/core/v2/x/market/keeper" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/keeper" + "github.com/classic-terra/core/v3/x/market/types" ) // NewHandler creates a new handler for all market type messages. @@ -23,7 +24,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler { res, err := msgServer.SwapSend(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) default: - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized market message type: %T", msg) + return nil, errorsmod.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized market message type: %T", msg) } } } diff --git a/x/market/handler_test.go b/x/market/handler_test.go index 19a33161e..7c458351a 100644 --- a/x/market/handler_test.go +++ b/x/market/handler_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/market/keeper" - "github.com/classic-terra/core/v2/x/market/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/market/keeper" + "github.com/classic-terra/core/v3/x/market/types" ) func TestMarketFilters(t *testing.T) { diff --git a/x/market/keeper/alias_functions.go b/x/market/keeper/alias_functions.go index e0f99b6f6..6ab049353 100644 --- a/x/market/keeper/alias_functions.go +++ b/x/market/keeper/alias_functions.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/market/keeper/keeper.go b/x/market/keeper/keeper.go index 5193e17b1..f87a76e7f 100644 --- a/x/market/keeper/keeper.go +++ b/x/market/keeper/keeper.go @@ -3,14 +3,14 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" ) // Keeper of the market store diff --git a/x/market/keeper/keeper_test.go b/x/market/keeper/keeper_test.go index 4ceea432e..94b19c267 100644 --- a/x/market/keeper/keeper_test.go +++ b/x/market/keeper/keeper_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/market/keeper/legacy_querier.go b/x/market/keeper/legacy_querier.go deleted file mode 100644 index 705da47af..000000000 --- a/x/market/keeper/legacy_querier.go +++ /dev/null @@ -1,63 +0,0 @@ -package keeper - -import ( - "github.com/classic-terra/core/v2/x/market/types" - abci "github.com/tendermint/tendermint/abci/types" - - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" -) - -// NewLegacyQuerier is the module level router for state queries -func NewLegacyQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return func(ctx sdk.Context, path []string, req abci.RequestQuery) (res []byte, err error) { - switch path[0] { - case types.QuerySwap: - return querySwap(ctx, req, k, legacyQuerierCdc) - case types.QueryTerraPoolDelta: - return queryTerraPoolDelta(ctx, k, legacyQuerierCdc) - case types.QueryParameters: - return queryParameters(ctx, k, legacyQuerierCdc) - default: - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown %s query endpoint: %s", types.ModuleName, path[0]) - } - } -} - -func querySwap(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QuerySwapParams - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - retCoin, err := k.simulateSwap(ctx, params.OfferCoin, params.AskDenom) - if err != nil { - return nil, err - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, retCoin) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryTerraPoolDelta(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, k.GetTerraPoolDelta(ctx)) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryParameters(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, k.GetParams(ctx)) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} diff --git a/x/market/keeper/legacy_querier_test.go b/x/market/keeper/legacy_querier_test.go deleted file mode 100644 index 3a03cc0d2..000000000 --- a/x/market/keeper/legacy_querier_test.go +++ /dev/null @@ -1,137 +0,0 @@ -package keeper - -import ( - "testing" - - "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - - sdk "github.com/cosmos/cosmos-sdk/types" - - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/market/types" -) - -func TestNewLegacyQuerier(t *testing.T) { - input := CreateTestInput(t) - - querier := NewLegacyQuerier(input.MarketKeeper, input.Cdc) - - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - - _, err := querier(input.Ctx, []string{types.QueryParameters}, query) - require.NoError(t, err) - - _, err = querier(input.Ctx, []string{"INVALID_PATH"}, query) - require.Error(t, err) -} - -func TestLegacyQueryParams(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.MarketKeeper, input.Cdc) - - req := abci.RequestQuery{ - Path: "", - Data: nil, - } - - res, err := querier(input.Ctx, []string{types.QueryParameters}, req) - require.NoError(t, err) - - var params types.Params - err = input.Cdc.UnmarshalJSON(res, ¶ms) - require.NoError(t, err) - require.Equal(t, input.MarketKeeper.GetParams(input.Ctx), params) -} - -func TestLegacyQuerySwap(t *testing.T) { - input := CreateTestInput(t) - - price := sdk.NewDecWithPrec(17, 1) - input.OracleKeeper.SetLunaExchangeRate(input.Ctx, core.MicroSDRDenom, price) - - querier := NewLegacyQuerier(input.MarketKeeper, input.Cdc) - var err error - - // empty data will occur error - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - - _, err = querier(input.Ctx, []string{types.QuerySwap}, query) - require.Error(t, err) - - // recursive query - offerCoin := sdk.NewCoin(core.MicroLunaDenom, sdk.NewInt(10)) - queryParams := types.NewQuerySwapParams(offerCoin, core.MicroLunaDenom) - bz, err := input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - query = abci.RequestQuery{ - Path: "", - Data: bz, - } - - _, err = querier(input.Ctx, []string{types.QuerySwap}, query) - require.Error(t, err) - - // overflow query - overflowAmt, _ := sdk.NewIntFromString("1000000000000000000000000000000000") - overflowOfferCoin := sdk.NewCoin(core.MicroLunaDenom, overflowAmt) - queryParams = types.NewQuerySwapParams(overflowOfferCoin, core.MicroSDRDenom) - bz, err = input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - query = abci.RequestQuery{ - Path: "", - Data: bz, - } - - _, err = querier(input.Ctx, []string{types.QuerySwap}, query) - require.Error(t, err) - - // valid query - queryParams = types.NewQuerySwapParams(offerCoin, core.MicroSDRDenom) - bz, err = input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - query = abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err := querier(input.Ctx, []string{types.QuerySwap}, query) - require.NoError(t, err) - - var swapCoin sdk.Coin - err = input.Cdc.UnmarshalJSON(res, &swapCoin) - require.NoError(t, err) - require.Equal(t, core.MicroSDRDenom, swapCoin.Denom) - require.True(t, sdk.NewInt(17).GTE(swapCoin.Amount)) - require.True(t, swapCoin.Amount.IsPositive()) -} - -func TestLegacyQueryMintPool(t *testing.T) { - input := CreateTestInput(t) - - poolDelta := sdk.NewDecWithPrec(17, 1) - input.MarketKeeper.SetTerraPoolDelta(input.Ctx, poolDelta) - - querier := NewLegacyQuerier(input.MarketKeeper, input.Cdc) - query := abci.RequestQuery{ - Path: "", - Data: nil, - } - - res, errRes := querier(input.Ctx, []string{types.QueryTerraPoolDelta}, query) - require.NoError(t, errRes) - - var retPool sdk.Dec - err := input.Cdc.UnmarshalJSON(res, &retPool) - require.NoError(t, err) - require.Equal(t, poolDelta, retPool) -} diff --git a/x/market/keeper/msg_server.go b/x/market/keeper/msg_server.go index 550c8c7b8..23bf881bd 100644 --- a/x/market/keeper/msg_server.go +++ b/x/market/keeper/msg_server.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/market/types" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/market/types" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" ) type msgServer struct { diff --git a/x/market/keeper/params.go b/x/market/keeper/params.go index ccf6ebf7f..19fc774a0 100644 --- a/x/market/keeper/params.go +++ b/x/market/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/market/keeper/querier.go b/x/market/keeper/querier.go index d7b44a929..96c91f4ef 100644 --- a/x/market/keeper/querier.go +++ b/x/market/keeper/querier.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" ) // querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over q diff --git a/x/market/keeper/querier_test.go b/x/market/keeper/querier_test.go index 45f29d242..0bef85e45 100644 --- a/x/market/keeper/querier_test.go +++ b/x/market/keeper/querier_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/market/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/market/types" "github.com/stretchr/testify/require" ) diff --git a/x/market/keeper/swap.go b/x/market/keeper/swap.go index 82c2c78c8..75d577b7d 100644 --- a/x/market/keeper/swap.go +++ b/x/market/keeper/swap.go @@ -1,12 +1,12 @@ package keeper import ( + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/market/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/market/types" ) // ApplySwapToPool updates each pool with offerCoin and askCoin taken from swap operation, @@ -52,7 +52,7 @@ func (k Keeper) ApplySwapToPool(ctx sdk.Context, offerCoin sdk.Coin, askCoin sdk func (k Keeper) ComputeSwap(ctx sdk.Context, offerCoin sdk.Coin, askDenom string) (retDecCoin sdk.DecCoin, spread sdk.Dec, err error) { // Return invalid recursive swap err if offerCoin.Denom == askDenom { - return sdk.DecCoin{}, sdk.ZeroDec(), sdkerrors.Wrap(types.ErrRecursiveSwap, askDenom) + return sdk.DecCoin{}, sdk.ZeroDec(), errorsmod.Wrap(types.ErrRecursiveSwap, askDenom) } // Swap offer coin to base denom for simplicity of swap process @@ -140,17 +140,17 @@ func (k Keeper) ComputeInternalSwap(ctx sdk.Context, offerCoin sdk.DecCoin, askD offerRate, err := k.OracleKeeper.GetLunaExchangeRate(ctx, offerCoin.Denom) if err != nil { - return sdk.DecCoin{}, sdkerrors.Wrap(types.ErrNoEffectivePrice, offerCoin.Denom) + return sdk.DecCoin{}, errorsmod.Wrap(types.ErrNoEffectivePrice, offerCoin.Denom) } askRate, err := k.OracleKeeper.GetLunaExchangeRate(ctx, askDenom) if err != nil { - return sdk.DecCoin{}, sdkerrors.Wrap(types.ErrNoEffectivePrice, askDenom) + return sdk.DecCoin{}, errorsmod.Wrap(types.ErrNoEffectivePrice, askDenom) } retAmount := offerCoin.Amount.Mul(askRate).Quo(offerRate) if retAmount.LTE(sdk.ZeroDec()) { - return sdk.DecCoin{}, sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, offerCoin.String()) + return sdk.DecCoin{}, errorsmod.Wrap(sdkerrors.ErrInvalidCoins, offerCoin.String()) } return sdk.NewDecCoinFromDec(askDenom, retAmount), nil @@ -159,16 +159,16 @@ func (k Keeper) ComputeInternalSwap(ctx sdk.Context, offerCoin sdk.DecCoin, askD // simulateSwap interface for simulate swap func (k Keeper) simulateSwap(ctx sdk.Context, offerCoin sdk.Coin, askDenom string) (sdk.Coin, error) { if askDenom == offerCoin.Denom { - return sdk.Coin{}, sdkerrors.Wrap(types.ErrRecursiveSwap, askDenom) + return sdk.Coin{}, errorsmod.Wrap(types.ErrRecursiveSwap, askDenom) } if offerCoin.Amount.BigInt().BitLen() > 100 { - return sdk.Coin{}, sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, offerCoin.String()) + return sdk.Coin{}, errorsmod.Wrap(sdkerrors.ErrInvalidCoins, offerCoin.String()) } swapCoin, spread, err := k.ComputeSwap(ctx, offerCoin, askDenom) if err != nil { - return sdk.Coin{}, sdkerrors.Wrap(sdkerrors.ErrPanic, err.Error()) + return sdk.Coin{}, errorsmod.Wrap(sdkerrors.ErrPanic, err.Error()) } if spread.IsPositive() { diff --git a/x/market/keeper/swap_test.go b/x/market/keeper/swap_test.go index 82b885555..9252ffd97 100644 --- a/x/market/keeper/swap_test.go +++ b/x/market/keeper/swap_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/market/keeper/test_utils.go b/x/market/keeper/test_utils.go index 76ac24578..a1e396d86 100644 --- a/x/market/keeper/test_utils.go +++ b/x/market/keeper/test_utils.go @@ -9,26 +9,26 @@ import ( "github.com/stretchr/testify/require" - customauth "github.com/classic-terra/core/v2/custom/auth" - custombank "github.com/classic-terra/core/v2/custom/bank" - customdistr "github.com/classic-terra/core/v2/custom/distribution" - customparams "github.com/classic-terra/core/v2/custom/params" - customstaking "github.com/classic-terra/core/v2/custom/staking" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/market/types" - "github.com/classic-terra/core/v2/x/oracle" - oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" - - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/secp256k1" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" - + customauth "github.com/classic-terra/core/v3/custom/auth" + custombank "github.com/classic-terra/core/v3/custom/bank" + customdistr "github.com/classic-terra/core/v3/custom/distribution" + customparams "github.com/classic-terra/core/v3/custom/params" + customstaking "github.com/classic-terra/core/v3/custom/staking" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/market/types" + "github.com/classic-terra/core/v3/x/oracle" + oraclekeeper "github.com/classic-terra/core/v3/x/oracle/keeper" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" + + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + + simparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - simparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" @@ -41,6 +41,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" @@ -165,8 +166,8 @@ func CreateTestInput(t *testing.T) TestInput { } paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, keyParams, tKeyParams) - accountKeeper := authkeeper.NewAccountKeeper(appCodec, keyAcc, paramsKeeper.Subspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix()) - bankKeeper := bankkeeper.NewBaseKeeper(appCodec, keyBank, accountKeeper, paramsKeeper.Subspace(banktypes.ModuleName), blackListAddrs) + accountKeeper := authkeeper.NewAccountKeeper(appCodec, keyAcc, authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), authtypes.NewModuleAddress(govtypes.ModuleName).String()) + bankKeeper := bankkeeper.NewBaseKeeper(appCodec, keyBank, accountKeeper, blackListAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String()) totalSupply := sdk.NewCoins(sdk.NewCoin(core.MicroLunaDenom, InitTokens.MulRaw(int64(len(Addrs)*10)))) err := bankKeeper.MintCoins(ctx, faucetAccountName, totalSupply) @@ -177,7 +178,7 @@ func CreateTestInput(t *testing.T) TestInput { keyStaking, accountKeeper, bankKeeper, - paramsKeeper.Subspace(stakingtypes.ModuleName), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) stakingParams := stakingtypes.DefaultParams() @@ -185,10 +186,11 @@ func CreateTestInput(t *testing.T) TestInput { stakingKeeper.SetParams(ctx, stakingParams) distrKeeper := distrkeeper.NewKeeper( - appCodec, - keyDistr, paramsKeeper.Subspace(distrtypes.ModuleName), - accountKeeper, bankKeeper, &stakingKeeper, - authtypes.FeeCollectorName) + appCodec, keyDistr, + accountKeeper, bankKeeper, stakingKeeper, + authtypes.FeeCollectorName, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + ) distrKeeper.SetFeePool(ctx, distrtypes.InitialFeePool()) distrParams := distrtypes.DefaultParams() diff --git a/x/market/module.go b/x/market/module.go index f550edc17..d37a4c0be 100644 --- a/x/market/module.go +++ b/x/market/module.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -19,10 +19,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/classic-terra/core/v2/x/market/client/cli" - "github.com/classic-terra/core/v2/x/market/keeper" - "github.com/classic-terra/core/v2/x/market/simulation" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/client/cli" + "github.com/classic-terra/core/v3/x/market/keeper" + "github.com/classic-terra/core/v3/x/market/simulation" + "github.com/classic-terra/core/v3/x/market/types" ) var ( @@ -117,19 +117,9 @@ func (AppModule) Name() string { return types.ModuleName } // RegisterInvariants performs a no-op. func (AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} -// Route returns the message routing key for the market module. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - // QuerierRoute returns the market module's querier route name. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the market module sdk.Querier. -func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return keeper.NewLegacyQuerier(am.keeper, legacyQuerierCdc) -} - // RegisterServices registers module services. func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) @@ -182,7 +172,7 @@ func (am AppModule) ProposalContents(_ module.SimulationState) []simtypes.Weight } // RandomizedParams creates randomized market param changes for the simulator. -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return simulation.ParamChanges(r) } diff --git a/x/market/simulation/decoder.go b/x/market/simulation/decoder.go index 1b4ee57a5..73ef841c5 100644 --- a/x/market/simulation/decoder.go +++ b/x/market/simulation/decoder.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/market/simulation/decoder_test.go b/x/market/simulation/decoder_test.go index 29b8c3510..bf04bc560 100644 --- a/x/market/simulation/decoder_test.go +++ b/x/market/simulation/decoder_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/v2/x/market/keeper" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/keeper" + "github.com/classic-terra/core/v3/x/market/types" ) func TestDecodeDistributionStore(t *testing.T) { diff --git a/x/market/simulation/genesis.go b/x/market/simulation/genesis.go index 612c48fb0..dbc12e1b8 100644 --- a/x/market/simulation/genesis.go +++ b/x/market/simulation/genesis.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" ) // Simulation parameter constants diff --git a/x/market/simulation/operations.go b/x/market/simulation/operations.go index 12dc56839..521fac684 100644 --- a/x/market/simulation/operations.go +++ b/x/market/simulation/operations.go @@ -6,17 +6,18 @@ import ( "math/rand" "strings" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" + simappparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/simapp/helpers" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + banksim "github.com/cosmos/cosmos-sdk/x/bank/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" ) // Simulation operation weights constants @@ -35,7 +36,7 @@ func WeightedOperations( var weightMsgSwap int appParams.GetOrGenerate(cdc, OpWeightMsgSwap, &weightMsgSwap, nil, func(*rand.Rand) { - weightMsgSwap = simappparams.DefaultWeightMsgSend + weightMsgSwap = banksim.DefaultWeightMsgSend }, ) @@ -95,12 +96,12 @@ func SimulateMsgSwap( msg := types.NewMsgSwap(simAccount.Address, sdk.NewCoin(offerDenom, amount), askDenom) txGen := simappparams.MakeTestEncodingConfig().TxConfig - tx, err := helpers.GenSignedMockTx( + tx, err := simtestutil.GenSignedMockTx( r, txGen, []sdk.Msg{msg}, fees, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, chainID, []uint64{account.GetAccountNumber()}, []uint64{account.GetSequence()}, @@ -173,12 +174,12 @@ func SimulateMsgSwapSend( msg := types.NewMsgSwapSend(simAccount.Address, receiverAccount.Address, sdk.NewCoin(offerDenom, amount), askDenom) txGen := simappparams.MakeTestEncodingConfig().TxConfig - tx, err := helpers.GenSignedMockTx( + tx, err := simtestutil.GenSignedMockTx( r, txGen, []sdk.Msg{msg}, fees, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, chainID, []uint64{account.GetAccountNumber()}, []uint64{account.GetSequence()}, diff --git a/x/market/simulation/params.go b/x/market/simulation/params.go index 441ee825a..965075b3e 100644 --- a/x/market/simulation/params.go +++ b/x/market/simulation/params.go @@ -9,24 +9,24 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v3/x/market/types" ) // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(*rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{ - simulation.NewSimParamChange(types.ModuleName, string(types.KeyBasePool), +func ParamChanges(*rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyBasePool), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenBasePool(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyPoolRecoveryPeriod), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyPoolRecoveryPeriod), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenPoolRecoveryPeriod(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyMinStabilitySpread), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyMinStabilitySpread), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenMinSpread(r)) }, diff --git a/x/market/types/errors.go b/x/market/types/errors.go index d35be021e..e56caa48d 100644 --- a/x/market/types/errors.go +++ b/x/market/types/errors.go @@ -1,12 +1,12 @@ package types import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + errorsmod "cosmossdk.io/errors" ) // Market errors var ( - ErrRecursiveSwap = sdkerrors.Register(ModuleName, 2, "recursive swap") - ErrNoEffectivePrice = sdkerrors.Register(ModuleName, 3, "no price registered with oracle") - ErrZeroSwapCoin = sdkerrors.Register(ModuleName, 4, "zero swap coin") + ErrRecursiveSwap = errorsmod.Register(ModuleName, 2, "recursive swap") + ErrNoEffectivePrice = errorsmod.Register(ModuleName, 3, "no price registered with oracle") + ErrZeroSwapCoin = errorsmod.Register(ModuleName, 4, "zero swap coin") ) diff --git a/x/market/types/genesis.pb.go b/x/market/types/genesis.pb.go index ade034394..f5cbf5430 100644 --- a/x/market/types/genesis.pb.go +++ b/x/market/types/genesis.pb.go @@ -5,21 +5,19 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -41,11 +39,9 @@ func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { return fileDescriptor_e30414b001901db3, []int{0} } - func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) @@ -58,15 +54,12 @@ func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } - func (m *GenesisState) XXX_Merge(src proto.Message) { xxx_messageInfo_GenesisState.Merge(m, src) } - func (m *GenesisState) XXX_Size() int { return m.Size() } - func (m *GenesisState) XXX_DiscardUnknown() { xxx_messageInfo_GenesisState.DiscardUnknown(m) } @@ -89,25 +82,26 @@ func init() { } var fileDescriptor_e30414b001901db3 = []byte{ - // 274 bytes of a gzipped FileDescriptorProto + // 293 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2a, 0x49, 0x2d, 0x2a, 0x4a, 0xd4, 0xcf, 0x4d, 0x2c, 0xca, 0x4e, 0x2d, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, - 0x01, 0xab, 0xd1, 0x83, 0xa8, 0xd1, 0x83, 0xaa, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, - 0xd0, 0x07, 0xb1, 0x20, 0x6a, 0xa5, 0x14, 0xb1, 0x9a, 0x07, 0xd5, 0x0a, 0x56, 0xa2, 0xb4, 0x84, - 0x91, 0x8b, 0xc7, 0x1d, 0x62, 0x41, 0x70, 0x49, 0x62, 0x49, 0xaa, 0x90, 0x15, 0x17, 0x5b, 0x41, - 0x62, 0x51, 0x62, 0x6e, 0xb1, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x8c, 0x1e, 0x36, 0x0b, - 0xf5, 0x02, 0xc0, 0x6a, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0xea, 0x10, 0x8a, 0xe0, - 0x12, 0x00, 0x2b, 0x8e, 0x2f, 0xc8, 0xcf, 0xcf, 0x89, 0x4f, 0x49, 0xcd, 0x29, 0x49, 0x94, 0x60, - 0x52, 0x60, 0xd4, 0xe0, 0x71, 0xd2, 0x03, 0xa9, 0xbb, 0x75, 0x4f, 0x5e, 0x2d, 0x3d, 0xb3, 0x24, - 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, - 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xb9, 0xa4, 0x26, 0x07, 0xf1, 0x81, - 0xcd, 0x09, 0xc8, 0xcf, 0xcf, 0x71, 0x01, 0x99, 0xe2, 0xe4, 0x79, 0xe2, 0x91, 0x1c, 0xe3, 0x85, - 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, - 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0xfa, 0xc8, 0x26, 0xe6, 0x24, 0x16, 0x17, 0x67, 0x26, 0xeb, 0x42, - 0xbc, 0x9d, 0x9c, 0x5f, 0x94, 0xaa, 0x5f, 0x66, 0xa4, 0x5f, 0x01, 0x0b, 0x00, 0xb0, 0xf1, 0x49, - 0x6c, 0x60, 0x8f, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xed, 0x8e, 0x8f, 0x04, 0x6d, 0x01, - 0x00, 0x00, + 0x01, 0xab, 0xd1, 0x83, 0xa8, 0xd1, 0x83, 0xaa, 0x91, 0x92, 0x4c, 0xce, 0x2f, 0xce, 0xcd, 0x2f, + 0x8e, 0x07, 0xab, 0xd1, 0x87, 0x70, 0x20, 0x1a, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0x21, 0xe2, + 0x20, 0x16, 0x54, 0x54, 0x11, 0xab, 0x55, 0x50, 0x53, 0xc1, 0x4a, 0x94, 0x36, 0x31, 0x72, 0xf1, + 0xb8, 0x43, 0xec, 0x0e, 0x2e, 0x49, 0x2c, 0x49, 0x15, 0xb2, 0xe2, 0x62, 0x2b, 0x48, 0x2c, 0x4a, + 0xcc, 0x2d, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x92, 0xd1, 0xc3, 0xe6, 0x16, 0xbd, 0x00, + 0xb0, 0x1a, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0x3a, 0x84, 0xd2, 0xb8, 0x04, 0xc0, + 0x8a, 0xe3, 0x0b, 0xf2, 0xf3, 0x73, 0xe2, 0x53, 0x52, 0x73, 0x4a, 0x12, 0x25, 0x98, 0x14, 0x18, + 0x35, 0x78, 0x9c, 0x6c, 0x40, 0xea, 0x6e, 0xdd, 0x93, 0x57, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, + 0xd2, 0x4b, 0xce, 0xcf, 0x85, 0x7a, 0x00, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x54, 0x16, + 0xa4, 0x16, 0xeb, 0xb9, 0xa4, 0x26, 0x5f, 0xda, 0xa2, 0xcb, 0x05, 0xf5, 0x9f, 0x4b, 0x6a, 0x72, + 0x10, 0x1f, 0xd8, 0xd4, 0x80, 0xfc, 0xfc, 0x1c, 0x17, 0x90, 0x99, 0x4e, 0x9e, 0x27, 0x1e, 0xc9, + 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, + 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x8f, 0x6c, 0x7e, 0x4e, 0x62, 0x71, 0x71, 0x66, + 0xb2, 0x2e, 0x24, 0x10, 0x92, 0xf3, 0x8b, 0x52, 0xf5, 0xcb, 0x8c, 0xf5, 0x2b, 0x60, 0xc1, 0x01, + 0xb6, 0x2c, 0x89, 0x0d, 0x1c, 0x0c, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x2d, 0xee, + 0x66, 0x96, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -164,7 +158,6 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *GenesisState) Size() (n int) { if m == nil { return 0 @@ -181,11 +174,9 @@ func (m *GenesisState) Size() (n int) { func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozGenesis(x uint64) (n int) { return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *GenesisState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -302,7 +293,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } - func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/market/types/market.pb.go b/x/market/types/market.pb.go index 53f7a0481..9391d0f8e 100644 --- a/x/market/types/market.pb.go +++ b/x/market/types/market.pb.go @@ -5,21 +5,19 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -39,11 +37,9 @@ func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { return fileDescriptor_114ea92c5ae3e66f, []int{0} } - func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Params.Marshal(b, m, deterministic) @@ -56,15 +52,12 @@ func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Params) XXX_Merge(src proto.Message) { xxx_messageInfo_Params.Merge(m, src) } - func (m *Params) XXX_Size() int { return m.Size() } - func (m *Params) XXX_DiscardUnknown() { xxx_messageInfo_Params.DiscardUnknown(m) } @@ -85,28 +78,30 @@ func init() { func init() { proto.RegisterFile("terra/market/v1beta1/market.proto", fileDescriptor_114ea92c5ae3e66f) } var fileDescriptor_114ea92c5ae3e66f = []byte{ - // 334 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xb1, 0x4e, 0xeb, 0x30, - 0x14, 0x86, 0xe3, 0xde, 0xab, 0xaa, 0x44, 0x0c, 0x28, 0xca, 0x50, 0x81, 0x14, 0x97, 0x0c, 0xa8, - 0x4b, 0x63, 0x15, 0xb6, 0x8e, 0x11, 0x0b, 0x03, 0x52, 0x49, 0x37, 0x96, 0xc8, 0x49, 0xad, 0x62, - 0x35, 0xee, 0x89, 0x6c, 0x53, 0x91, 0x89, 0x57, 0x60, 0x64, 0xec, 0xdb, 0xd0, 0xb1, 0x23, 0x62, - 0x88, 0x50, 0xbb, 0x30, 0xf7, 0x09, 0x50, 0xdc, 0x14, 0x31, 0x74, 0x61, 0xf2, 0xf1, 0xa7, 0xcf, - 0xc7, 0xbf, 0xf4, 0xdb, 0xe7, 0x9a, 0x49, 0x49, 0x89, 0xa0, 0x72, 0xca, 0x34, 0x99, 0xf7, 0x13, - 0xa6, 0x69, 0xbf, 0xbe, 0x06, 0xb9, 0x04, 0x0d, 0x8e, 0x6b, 0x94, 0xa0, 0x66, 0xb5, 0x72, 0xea, - 0x4e, 0x60, 0x02, 0x46, 0x20, 0xd5, 0xb4, 0x73, 0xfd, 0xb7, 0x86, 0xdd, 0x1c, 0x52, 0x49, 0x85, - 0x72, 0x62, 0xfb, 0x28, 0xa1, 0x8a, 0xc5, 0x39, 0x40, 0xd6, 0x46, 0x1d, 0xd4, 0x3d, 0x0e, 0xc3, - 0x65, 0x89, 0xad, 0x8f, 0x12, 0x5f, 0x4c, 0xb8, 0x7e, 0x78, 0x4c, 0x82, 0x14, 0x04, 0x49, 0x41, - 0x09, 0x50, 0xf5, 0xd1, 0x53, 0xe3, 0x29, 0xd1, 0x45, 0xce, 0x54, 0x70, 0xcd, 0xd2, 0x6d, 0x89, - 0x4f, 0x0a, 0x2a, 0xb2, 0x81, 0xff, 0xb3, 0xc8, 0x8f, 0x5a, 0xd5, 0x3c, 0x04, 0xc8, 0x9c, 0x3b, - 0xdb, 0xad, 0x50, 0x2c, 0x59, 0x0a, 0x73, 0x26, 0x8b, 0x38, 0x67, 0x92, 0xc3, 0xb8, 0xdd, 0xe8, - 0xa0, 0xee, 0xff, 0x10, 0x6f, 0x4b, 0x7c, 0xb6, 0x7b, 0x7d, 0xc8, 0xf2, 0x23, 0xa7, 0xc2, 0x51, - 0x4d, 0x87, 0x06, 0x3a, 0xcf, 0xb6, 0x2b, 0xf8, 0x2c, 0x56, 0x9a, 0x26, 0x3c, 0xe3, 0xba, 0x88, - 0x55, 0x2e, 0x19, 0x1d, 0xb7, 0xff, 0x99, 0xf8, 0xb7, 0x7f, 0x8e, 0x5f, 0x07, 0x38, 0xb4, 0xd3, - 0x8f, 0x1c, 0xc1, 0x67, 0xa3, 0x3d, 0x1d, 0x19, 0x38, 0x68, 0xbd, 0x2e, 0xb0, 0xf5, 0xb5, 0xc0, - 0x28, 0xbc, 0x59, 0xae, 0x3d, 0xb4, 0x5a, 0x7b, 0xe8, 0x73, 0xed, 0xa1, 0x97, 0x8d, 0x67, 0xad, - 0x36, 0x9e, 0xf5, 0xbe, 0xf1, 0xac, 0x7b, 0xf2, 0xfb, 0xfb, 0x8c, 0x2a, 0xc5, 0xd3, 0xde, 0xae, - 0xc5, 0x14, 0x24, 0x23, 0xf3, 0x4b, 0xf2, 0xb4, 0xef, 0xd3, 0x64, 0x49, 0x9a, 0xa6, 0x9b, 0xab, - 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0xb4, 0xbb, 0x6d, 0xec, 0x01, 0x00, 0x00, + // 358 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xb1, 0x6e, 0xea, 0x30, + 0x18, 0x85, 0x63, 0xee, 0x15, 0xe2, 0x46, 0x77, 0xb8, 0x8a, 0x32, 0x70, 0xa9, 0x94, 0xd0, 0x0c, + 0x15, 0x0b, 0x89, 0x10, 0x1b, 0x23, 0x62, 0xe9, 0x96, 0xc2, 0xd6, 0x0e, 0x91, 0x13, 0x2c, 0x6a, + 0x11, 0xf3, 0x47, 0xb6, 0x8b, 0x9a, 0x87, 0xa8, 0xd4, 0xb1, 0x23, 0x0f, 0xd1, 0x87, 0x60, 0x44, + 0x9d, 0xaa, 0x0e, 0x51, 0x05, 0x1d, 0x3a, 0xf3, 0x04, 0x55, 0x1c, 0x53, 0x55, 0x15, 0x4b, 0xa7, + 0xe4, 0x3f, 0xfe, 0x7c, 0x74, 0x8e, 0x7e, 0x9b, 0xa7, 0x92, 0x70, 0x8e, 0x03, 0x86, 0xf9, 0x9c, + 0xc8, 0x60, 0xd9, 0x8b, 0x89, 0xc4, 0x3d, 0x3d, 0xfa, 0x19, 0x07, 0x09, 0x96, 0xad, 0x10, 0x5f, + 0x6b, 0x1a, 0x69, 0xfd, 0x4f, 0x40, 0x30, 0x10, 0x91, 0x62, 0x82, 0x6a, 0xa8, 0x2e, 0xb4, 0xec, + 0x19, 0xcc, 0xa0, 0xd2, 0xcb, 0xbf, 0x4a, 0xf5, 0xde, 0x6a, 0x66, 0x3d, 0xc4, 0x1c, 0x33, 0x61, + 0x31, 0xf3, 0x4f, 0x8c, 0x05, 0x89, 0x32, 0x80, 0xb4, 0x89, 0xda, 0xa8, 0xf3, 0x77, 0x18, 0xae, + 0x0b, 0xd7, 0x78, 0x29, 0xdc, 0xb3, 0x19, 0x95, 0xd7, 0x37, 0xb1, 0x9f, 0x00, 0xd3, 0xa6, 0xfa, + 0xd3, 0x15, 0xd3, 0x79, 0x20, 0xf3, 0x8c, 0x08, 0x7f, 0x44, 0x92, 0x7d, 0xe1, 0xfe, 0xcb, 0x31, + 0x4b, 0x07, 0xde, 0xa7, 0x91, 0xf7, 0xf4, 0xd8, 0x35, 0x75, 0x8e, 0x11, 0x49, 0xc6, 0x8d, 0xf2, + 0x24, 0x04, 0x48, 0xad, 0x0b, 0xd3, 0x2e, 0x81, 0x88, 0x93, 0x04, 0x96, 0x84, 0xe7, 0x51, 0x46, + 0x38, 0x85, 0x69, 0xb3, 0xd6, 0x46, 0x9d, 0xdf, 0x43, 0x77, 0x5f, 0xb8, 0x27, 0x95, 0xd7, 0x31, + 0xca, 0x1b, 0x5b, 0xa5, 0x3c, 0xd6, 0x6a, 0xa8, 0x44, 0xeb, 0x0e, 0x99, 0x36, 0xa3, 0x8b, 0x48, + 0x48, 0x1c, 0xd3, 0x94, 0xca, 0x3c, 0x12, 0x19, 0x27, 0x78, 0xda, 0xfc, 0xa5, 0xda, 0x5c, 0xfd, + 0xb8, 0x8d, 0x4e, 0x70, 0xcc, 0xf3, 0x7b, 0x31, 0x8b, 0xd1, 0xc5, 0xe4, 0xc0, 0x4c, 0x14, 0x32, + 0x68, 0x3c, 0xac, 0x5c, 0xe3, 0x7d, 0xe5, 0xa2, 0xe1, 0xf9, 0x7a, 0xeb, 0xa0, 0xcd, 0xd6, 0x41, + 0xaf, 0x5b, 0x07, 0xdd, 0xef, 0x1c, 0x63, 0xb3, 0x73, 0x8c, 0xe7, 0x9d, 0x63, 0x5c, 0x06, 0x5f, + 0xc3, 0xa4, 0x58, 0x08, 0x9a, 0x74, 0xab, 0xed, 0x27, 0xc0, 0x49, 0xb0, 0xec, 0x07, 0xb7, 0x87, + 0x77, 0xa0, 0x92, 0xc5, 0x75, 0xb5, 0xb8, 0xfe, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xcb, + 0xc4, 0xb5, 0x24, 0x02, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -139,7 +134,6 @@ func (this *Params) Equal(that interface{}) bool { } return true } - func (m *Params) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -199,7 +193,6 @@ func encodeVarintMarket(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *Params) Size() (n int) { if m == nil { return 0 @@ -219,11 +212,9 @@ func (m *Params) Size() (n int) { func sovMarket(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozMarket(x uint64) (n int) { return sovMarket(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *Params) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -359,7 +350,6 @@ func (m *Params) Unmarshal(dAtA []byte) error { } return nil } - func skipMarket(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/market/types/msgs.go b/x/market/types/msgs.go index cb76e35db..79434e1ac 100644 --- a/x/market/types/msgs.go +++ b/x/market/types/msgs.go @@ -1,6 +1,7 @@ package types import ( + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -54,15 +55,15 @@ func (msg MsgSwap) GetSigners() []sdk.AccAddress { func (msg MsgSwap) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Trader) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid trader address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid trader address (%s)", err) } if msg.OfferCoin.Amount.LTE(sdk.ZeroInt()) || msg.OfferCoin.Amount.BigInt().BitLen() > 100 { - return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.OfferCoin.String()) + return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, msg.OfferCoin.String()) } if msg.OfferCoin.Denom == msg.AskDenom { - return sdkerrors.Wrap(ErrRecursiveSwap, msg.AskDenom) + return errorsmod.Wrap(ErrRecursiveSwap, msg.AskDenom) } return nil @@ -103,20 +104,20 @@ func (msg MsgSwapSend) GetSigners() []sdk.AccAddress { func (msg MsgSwapSend) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.FromAddress) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid from address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid from address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.ToAddress) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid to address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid to address (%s)", err) } if msg.OfferCoin.Amount.LTE(sdk.ZeroInt()) || msg.OfferCoin.Amount.BigInt().BitLen() > 100 { - return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, msg.OfferCoin.String()) + return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, msg.OfferCoin.String()) } if msg.OfferCoin.Denom == msg.AskDenom { - return sdkerrors.Wrap(ErrRecursiveSwap, msg.AskDenom) + return errorsmod.Wrap(ErrRecursiveSwap, msg.AskDenom) } return nil diff --git a/x/market/types/msgs_test.go b/x/market/types/msgs_test.go index 0ad640a92..a6f5af344 100644 --- a/x/market/types/msgs_test.go +++ b/x/market/types/msgs_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" "github.com/stretchr/testify/require" diff --git a/x/market/types/params.go b/x/market/types/params.go index 5f3ddbe12..8eedde9fa 100644 --- a/x/market/types/params.go +++ b/x/market/types/params.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" ) // Parameter keys diff --git a/x/market/types/query.pb.go b/x/market/types/query.pb.go index c5bb72818..20de90c87 100644 --- a/x/market/types/query.pb.go +++ b/x/market/types/query.pb.go @@ -6,27 +6,25 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -48,11 +46,9 @@ func (*QuerySwapRequest) ProtoMessage() {} func (*QuerySwapRequest) Descriptor() ([]byte, []int) { return fileDescriptor_c172d0f188bf2fb6, []int{0} } - func (m *QuerySwapRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QuerySwapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QuerySwapRequest.Marshal(b, m, deterministic) @@ -65,15 +61,12 @@ func (m *QuerySwapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } - func (m *QuerySwapRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QuerySwapRequest.Merge(m, src) } - func (m *QuerySwapRequest) XXX_Size() int { return m.Size() } - func (m *QuerySwapRequest) XXX_DiscardUnknown() { xxx_messageInfo_QuerySwapRequest.DiscardUnknown(m) } @@ -92,11 +85,9 @@ func (*QuerySwapResponse) ProtoMessage() {} func (*QuerySwapResponse) Descriptor() ([]byte, []int) { return fileDescriptor_c172d0f188bf2fb6, []int{1} } - func (m *QuerySwapResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QuerySwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QuerySwapResponse.Marshal(b, m, deterministic) @@ -109,15 +100,12 @@ func (m *QuerySwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } - func (m *QuerySwapResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QuerySwapResponse.Merge(m, src) } - func (m *QuerySwapResponse) XXX_Size() int { return m.Size() } - func (m *QuerySwapResponse) XXX_DiscardUnknown() { xxx_messageInfo_QuerySwapResponse.DiscardUnknown(m) } @@ -132,7 +120,8 @@ func (m *QuerySwapResponse) GetReturnCoin() types.Coin { } // QueryTerraPoolDeltaRequest is the request type for the Query/TerraPoolDelta RPC method. -type QueryTerraPoolDeltaRequest struct{} +type QueryTerraPoolDeltaRequest struct { +} func (m *QueryTerraPoolDeltaRequest) Reset() { *m = QueryTerraPoolDeltaRequest{} } func (m *QueryTerraPoolDeltaRequest) String() string { return proto.CompactTextString(m) } @@ -140,11 +129,9 @@ func (*QueryTerraPoolDeltaRequest) ProtoMessage() {} func (*QueryTerraPoolDeltaRequest) Descriptor() ([]byte, []int) { return fileDescriptor_c172d0f188bf2fb6, []int{2} } - func (m *QueryTerraPoolDeltaRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTerraPoolDeltaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTerraPoolDeltaRequest.Marshal(b, m, deterministic) @@ -157,15 +144,12 @@ func (m *QueryTerraPoolDeltaRequest) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } - func (m *QueryTerraPoolDeltaRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTerraPoolDeltaRequest.Merge(m, src) } - func (m *QueryTerraPoolDeltaRequest) XXX_Size() int { return m.Size() } - func (m *QueryTerraPoolDeltaRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTerraPoolDeltaRequest.DiscardUnknown(m) } @@ -184,11 +168,9 @@ func (*QueryTerraPoolDeltaResponse) ProtoMessage() {} func (*QueryTerraPoolDeltaResponse) Descriptor() ([]byte, []int) { return fileDescriptor_c172d0f188bf2fb6, []int{3} } - func (m *QueryTerraPoolDeltaResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTerraPoolDeltaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTerraPoolDeltaResponse.Marshal(b, m, deterministic) @@ -201,15 +183,12 @@ func (m *QueryTerraPoolDeltaResponse) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *QueryTerraPoolDeltaResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTerraPoolDeltaResponse.Merge(m, src) } - func (m *QueryTerraPoolDeltaResponse) XXX_Size() int { return m.Size() } - func (m *QueryTerraPoolDeltaResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTerraPoolDeltaResponse.DiscardUnknown(m) } @@ -217,7 +196,8 @@ func (m *QueryTerraPoolDeltaResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryTerraPoolDeltaResponse proto.InternalMessageInfo // QueryParamsRequest is the request type for the Query/Params RPC method. -type QueryParamsRequest struct{} +type QueryParamsRequest struct { +} func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } @@ -225,11 +205,9 @@ func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_c172d0f188bf2fb6, []int{4} } - func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) @@ -242,15 +220,12 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsRequest.Merge(m, src) } - func (m *QueryParamsRequest) XXX_Size() int { return m.Size() } - func (m *QueryParamsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) } @@ -269,11 +244,9 @@ func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_c172d0f188bf2fb6, []int{5} } - func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) @@ -286,15 +259,12 @@ func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsResponse.Merge(m, src) } - func (m *QueryParamsResponse) XXX_Size() int { return m.Size() } - func (m *QueryParamsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) } @@ -320,48 +290,47 @@ func init() { func init() { proto.RegisterFile("terra/market/v1beta1/query.proto", fileDescriptor_c172d0f188bf2fb6) } var fileDescriptor_c172d0f188bf2fb6 = []byte{ - // 539 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x3d, 0x6f, 0x13, 0x41, - 0x10, 0xbd, 0x0b, 0x21, 0x8a, 0x37, 0x28, 0x0a, 0x8b, 0x8b, 0x70, 0x31, 0xe7, 0x70, 0x42, 0xc6, - 0x14, 0xd9, 0xc5, 0xa6, 0x4b, 0x85, 0x8c, 0x1b, 0xba, 0xc4, 0x80, 0x14, 0xd1, 0x58, 0xeb, 0xf3, - 0xc6, 0x9c, 0xec, 0xbb, 0xb9, 0xec, 0xae, 0x13, 0x22, 0x3a, 0x68, 0x28, 0x91, 0xf8, 0x03, 0x69, - 0xf8, 0x03, 0xfc, 0x8a, 0x94, 0x91, 0x68, 0x10, 0x45, 0x84, 0x6c, 0x0a, 0x7e, 0x06, 0xda, 0x0f, - 0x43, 0x1c, 0x9d, 0x02, 0x54, 0xf6, 0xcd, 0xbc, 0x79, 0xef, 0xdd, 0x9b, 0x39, 0xb4, 0xa9, 0xb8, - 0x10, 0x8c, 0xa6, 0x4c, 0x0c, 0xb9, 0xa2, 0x87, 0x8d, 0x1e, 0x57, 0xac, 0x41, 0x0f, 0xc6, 0x5c, - 0x1c, 0x93, 0x5c, 0x80, 0x02, 0x5c, 0x36, 0x08, 0x62, 0x11, 0xc4, 0x21, 0x82, 0xf2, 0x00, 0x06, - 0x60, 0x00, 0x54, 0xff, 0xb3, 0xd8, 0xa0, 0x32, 0x00, 0x18, 0x8c, 0x38, 0x65, 0x79, 0x42, 0x59, - 0x96, 0x81, 0x62, 0x2a, 0x81, 0x4c, 0xba, 0xee, 0xdd, 0x42, 0x2d, 0x47, 0x6c, 0x21, 0x61, 0x0c, - 0x32, 0x05, 0x49, 0x7b, 0x4c, 0xf2, 0xdf, 0x88, 0x18, 0x92, 0xcc, 0xf6, 0xa3, 0x3d, 0xb4, 0xb6, - 0xab, 0xbd, 0x3d, 0x3b, 0x62, 0x79, 0x87, 0x1f, 0x8c, 0xb9, 0x54, 0xf8, 0x0e, 0x42, 0xb0, 0xbf, - 0xcf, 0x45, 0x57, 0xe3, 0xd6, 0xfd, 0x4d, 0xbf, 0x5e, 0xea, 0x94, 0x4c, 0xe5, 0x09, 0x24, 0x19, - 0xde, 0x40, 0x25, 0x26, 0x87, 0xdd, 0x3e, 0xcf, 0x20, 0x5d, 0x5f, 0x30, 0xdd, 0x65, 0x26, 0x87, - 0x6d, 0xfd, 0xbc, 0xbd, 0xfc, 0xfe, 0xa4, 0xea, 0xfd, 0x3c, 0xa9, 0x7a, 0xd1, 0x0b, 0x74, 0xf3, - 0x02, 0xb3, 0xcc, 0x21, 0x93, 0x1c, 0x3f, 0x46, 0x2b, 0x82, 0xab, 0xb1, 0xc8, 0xfe, 0x70, 0xaf, - 0x34, 0x6f, 0x13, 0x6b, 0x92, 0x68, 0x93, 0xb3, 0x40, 0x88, 0xd6, 0x6a, 0x2d, 0x9e, 0x9e, 0x57, - 0xbd, 0x0e, 0xb2, 0x33, 0xba, 0x12, 0x55, 0x50, 0x60, 0x68, 0x9f, 0xeb, 0x57, 0xdf, 0x01, 0x18, - 0xb5, 0xf9, 0x48, 0x31, 0x67, 0x3d, 0x3a, 0x42, 0x1b, 0x85, 0x5d, 0x27, 0xbf, 0x87, 0xd6, 0x4c, - 0x64, 0xdd, 0x1c, 0x60, 0xd4, 0xed, 0xeb, 0x9e, 0xf1, 0x70, 0xa3, 0x45, 0xb4, 0xd0, 0xb7, 0xf3, - 0x6a, 0x6d, 0x90, 0xa8, 0x57, 0xe3, 0x1e, 0x89, 0x21, 0xa5, 0x2e, 0x3a, 0xfb, 0xb3, 0x25, 0xfb, - 0x43, 0xaa, 0x8e, 0x73, 0x2e, 0x49, 0x9b, 0xc7, 0x9d, 0x55, 0x35, 0xa7, 0x10, 0x95, 0x11, 0x36, - 0xc2, 0x3b, 0x4c, 0xb0, 0x54, 0xce, 0xec, 0xec, 0xa2, 0x5b, 0x73, 0x55, 0x67, 0x63, 0x1b, 0x2d, - 0xe5, 0xa6, 0xe2, 0x02, 0xa8, 0x90, 0xa2, 0x93, 0x20, 0x76, 0xca, 0x65, 0xe0, 0x26, 0x9a, 0x9f, - 0xaf, 0xa1, 0xeb, 0x86, 0x13, 0xbf, 0x41, 0x8b, 0x3a, 0x5b, 0x5c, 0x2b, 0x9e, 0xbe, 0xbc, 0xd6, - 0xe0, 0xfe, 0x5f, 0x71, 0xd6, 0x5e, 0x14, 0xbd, 0xfd, 0xf2, 0xe3, 0xe3, 0x42, 0x05, 0x07, 0xb4, - 0xf0, 0xbe, 0xa4, 0x16, 0xfd, 0xe4, 0xa3, 0xd5, 0xf9, 0x90, 0xf1, 0xc3, 0x2b, 0xf8, 0x0b, 0xb7, - 0x15, 0x34, 0xfe, 0x63, 0xc2, 0x79, 0x23, 0xc6, 0x5b, 0x1d, 0xd7, 0x8a, 0xbd, 0x5d, 0xde, 0x2e, - 0x7e, 0xe7, 0xa3, 0x25, 0x9b, 0x23, 0xae, 0x5f, 0xa1, 0x36, 0xb7, 0xb6, 0xe0, 0xc1, 0x3f, 0x20, - 0x9d, 0x9f, 0x7b, 0xc6, 0x4f, 0x88, 0x2b, 0xc5, 0x7e, 0xec, 0xd2, 0x5a, 0x4f, 0x4f, 0x27, 0xa1, - 0x7f, 0x36, 0x09, 0xfd, 0xef, 0x93, 0xd0, 0xff, 0x30, 0x0d, 0xbd, 0xb3, 0x69, 0xe8, 0x7d, 0x9d, - 0x86, 0xde, 0x4b, 0x7a, 0xf1, 0xde, 0x46, 0x4c, 0xca, 0x24, 0xde, 0xb2, 0x4c, 0x31, 0x08, 0x4e, - 0x0f, 0x9b, 0xf4, 0xf5, 0x8c, 0xd3, 0x1c, 0x5f, 0x6f, 0xc9, 0x7c, 0xb7, 0x8f, 0x7e, 0x05, 0x00, - 0x00, 0xff, 0xff, 0xc9, 0x1f, 0x13, 0x80, 0x68, 0x04, 0x00, 0x00, + // 558 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xbf, 0x6e, 0x13, 0x41, + 0x10, 0xc6, 0xef, 0x42, 0xb0, 0xe2, 0x0d, 0x8a, 0xc2, 0xe2, 0x22, 0xb9, 0x98, 0x73, 0x38, 0x21, + 0x63, 0x0a, 0xdf, 0xe2, 0xa4, 0x8b, 0x28, 0x90, 0x71, 0x43, 0x97, 0x18, 0x90, 0x10, 0x8d, 0xb5, + 0x3e, 0xaf, 0xcd, 0xc9, 0xbe, 0x9b, 0xcb, 0xee, 0x3a, 0x10, 0xd1, 0x81, 0x90, 0x28, 0x91, 0x78, + 0x81, 0x34, 0xbc, 0x00, 0xe2, 0x21, 0x52, 0x46, 0xd0, 0x20, 0x8a, 0x08, 0xd9, 0x14, 0x3c, 0x06, + 0xda, 0x3f, 0x86, 0x38, 0x3a, 0x05, 0xa8, 0xec, 0x9d, 0x99, 0x6f, 0xe6, 0xb7, 0xdf, 0xec, 0xa1, + 0x4d, 0xc9, 0x38, 0xa7, 0x24, 0xa1, 0x7c, 0xc8, 0x24, 0x39, 0x68, 0x74, 0x99, 0xa4, 0x0d, 0xb2, + 0x3f, 0x66, 0xfc, 0x30, 0xcc, 0x38, 0x48, 0xc0, 0x25, 0x5d, 0x11, 0x9a, 0x8a, 0xd0, 0x56, 0x78, + 0x7e, 0x04, 0x22, 0x01, 0x41, 0xba, 0x54, 0xb0, 0xdf, 0xb2, 0x08, 0xe2, 0xd4, 0xa8, 0xbc, 0x75, + 0x93, 0xef, 0xe8, 0x13, 0x31, 0x07, 0x9b, 0x2a, 0x0d, 0x60, 0x00, 0x26, 0xae, 0xfe, 0xd9, 0x68, + 0x79, 0x00, 0x30, 0x18, 0x31, 0x42, 0xb3, 0x98, 0xd0, 0x34, 0x05, 0x49, 0x65, 0x0c, 0xe9, 0x4c, + 0x73, 0x23, 0x17, 0xd3, 0x32, 0xe9, 0x92, 0xe0, 0x09, 0x5a, 0xdd, 0x53, 0xd8, 0x0f, 0x9f, 0xd3, + 0xac, 0xcd, 0xf6, 0xc7, 0x4c, 0x48, 0x7c, 0x1d, 0x21, 0xe8, 0xf7, 0x19, 0xef, 0x28, 0xb2, 0x35, + 0x77, 0xd3, 0xad, 0x15, 0xdb, 0x45, 0x1d, 0xb9, 0x0f, 0x71, 0x8a, 0x37, 0x50, 0x91, 0x8a, 0x61, + 0xa7, 0xc7, 0x52, 0x48, 0xd6, 0x16, 0x74, 0x76, 0x89, 0x8a, 0x61, 0x4b, 0x9d, 0x77, 0x96, 0xde, + 0x1e, 0x55, 0x9c, 0x9f, 0x47, 0x15, 0x27, 0x78, 0x8c, 0xae, 0x9e, 0xe9, 0x2c, 0x32, 0x48, 0x05, + 0xc3, 0xf7, 0xd0, 0x32, 0x67, 0x72, 0xcc, 0xd3, 0x3f, 0xbd, 0x97, 0xb7, 0xd6, 0x43, 0x7b, 0x53, + 0x65, 0xcb, 0xcc, 0xab, 0x50, 0xcd, 0x6a, 0x2e, 0x1e, 0x9f, 0x56, 0x9c, 0x36, 0x32, 0x1a, 0x15, + 0x09, 0xca, 0xc8, 0xd3, 0x6d, 0x1f, 0xa9, 0xab, 0xed, 0x02, 0x8c, 0x5a, 0x6c, 0x24, 0xa9, 0x45, + 0x0f, 0xde, 0xb8, 0x68, 0x23, 0x37, 0x6d, 0xe7, 0xf7, 0xd1, 0xaa, 0xf6, 0xa4, 0x93, 0x01, 0x8c, + 0x3a, 0x3d, 0x95, 0xd3, 0x10, 0x57, 0x9a, 0x77, 0xd5, 0xa4, 0x6f, 0xa7, 0x95, 0xea, 0x20, 0x96, + 0xcf, 0xc6, 0xdd, 0x30, 0x82, 0xc4, 0x2e, 0xc0, 0xfe, 0xd4, 0x45, 0x6f, 0x48, 0xe4, 0x61, 0xc6, + 0x44, 0xd8, 0x62, 0xd1, 0xe7, 0x4f, 0x75, 0x64, 0xa9, 0x5b, 0x2c, 0x6a, 0xaf, 0xc8, 0xb9, 0x79, + 0x41, 0x09, 0x61, 0x8d, 0xb1, 0x4b, 0x39, 0x4d, 0xc4, 0x8c, 0x6e, 0x0f, 0x5d, 0x9b, 0x8b, 0x5a, + 0xa8, 0x1d, 0x54, 0xc8, 0x74, 0xc4, 0xfa, 0x51, 0x0e, 0xf3, 0x1e, 0x4f, 0x68, 0x54, 0xd6, 0x12, + 0xab, 0xd8, 0xfa, 0x78, 0x09, 0x5d, 0xd6, 0x3d, 0xf1, 0x4b, 0xb4, 0xa8, 0xac, 0xc6, 0xd5, 0x7c, + 0xf5, 0xf9, 0x2d, 0x7b, 0xb7, 0xfe, 0x5a, 0x67, 0xf0, 0x82, 0xe0, 0xd5, 0x97, 0x1f, 0xef, 0x17, + 0xca, 0xd8, 0x23, 0xb9, 0xcf, 0x49, 0xa8, 0xa1, 0x1f, 0x5c, 0xb4, 0x32, 0x6f, 0x39, 0xbe, 0x73, + 0x41, 0xff, 0xdc, 0xe5, 0x79, 0x8d, 0xff, 0x50, 0x58, 0xb6, 0x50, 0xb3, 0xd5, 0x70, 0x35, 0x9f, + 0xed, 0xfc, 0xae, 0xf1, 0x6b, 0x17, 0x15, 0x8c, 0x8f, 0xb8, 0x76, 0xc1, 0xb4, 0xb9, 0xb5, 0x79, + 0xb7, 0xff, 0xa1, 0xd2, 0xf2, 0xdc, 0xd4, 0x3c, 0x3e, 0x2e, 0xe7, 0xf3, 0x98, 0xa5, 0x35, 0x1f, + 0x1c, 0x4f, 0x7c, 0xf7, 0x64, 0xe2, 0xbb, 0xdf, 0x27, 0xbe, 0xfb, 0x6e, 0xea, 0x3b, 0x27, 0x53, + 0xdf, 0xf9, 0x3a, 0xf5, 0x9d, 0xa7, 0xe4, 0xec, 0xeb, 0x1b, 0x51, 0x21, 0xe2, 0xa8, 0x6e, 0x3a, + 0x45, 0xc0, 0x19, 0x39, 0xd8, 0x26, 0x2f, 0x66, 0x3d, 0xf5, 0x53, 0xec, 0x16, 0xf4, 0x67, 0xbc, + 0xfd, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x80, 0xf9, 0x35, 0x1f, 0x92, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -425,16 +394,15 @@ type QueryServer interface { } // UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct{} +type UnimplementedQueryServer struct { +} func (*UnimplementedQueryServer) Swap(ctx context.Context, req *QuerySwapRequest) (*QuerySwapResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Swap not implemented") } - func (*UnimplementedQueryServer) TerraPoolDelta(ctx context.Context, req *QueryTerraPoolDeltaRequest) (*QueryTerraPoolDeltaResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TerraPoolDelta not implemented") } - func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } @@ -711,7 +679,6 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *QuerySwapRequest) Size() (n int) { if m == nil { return 0 @@ -783,11 +750,9 @@ func (m *QueryParamsResponse) Size() (n int) { func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *QuerySwapRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -902,7 +867,6 @@ func (m *QuerySwapRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QuerySwapResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -986,7 +950,6 @@ func (m *QuerySwapResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTerraPoolDeltaRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1037,7 +1000,6 @@ func (m *QueryTerraPoolDeltaRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTerraPoolDeltaResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1121,7 +1083,6 @@ func (m *QueryTerraPoolDeltaResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1172,7 +1133,6 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1256,7 +1216,6 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/market/types/query.pb.gw.go b/x/market/types/query.pb.gw.go index dbbbea97f..67f7fef14 100644 --- a/x/market/types/query.pb.gw.go +++ b/x/market/types/query.pb.gw.go @@ -25,18 +25,18 @@ import ( ) // Suppress "imported and not used" errors +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join + var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = runtime.String - _ = utilities.NewDoubleArray - _ = descriptor.ForMessage - _ = metadata.Join + filter_Query_Swap_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) -var filter_Query_Swap_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} - func request_Query_Swap_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QuerySwapRequest var metadata runtime.ServerMetadata @@ -50,6 +50,7 @@ func request_Query_Swap_0(ctx context.Context, marshaler runtime.Marshaler, clie msg, err := client.Swap(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Swap_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -65,6 +66,7 @@ func local_request_Query_Swap_0(ctx context.Context, marshaler runtime.Marshaler msg, err := server.Swap(ctx, &protoReq) return msg, metadata, err + } func request_Query_TerraPoolDelta_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -73,6 +75,7 @@ func request_Query_TerraPoolDelta_0(ctx context.Context, marshaler runtime.Marsh msg, err := client.TerraPoolDelta(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_TerraPoolDelta_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -81,6 +84,7 @@ func local_request_Query_TerraPoolDelta_0(ctx context.Context, marshaler runtime msg, err := server.TerraPoolDelta(ctx, &protoReq) return msg, metadata, err + } func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -89,6 +93,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -97,6 +102,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal msg, err := server.Params(ctx, &protoReq) return msg, metadata, err + } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". @@ -104,6 +110,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { + mux.Handle("GET", pattern_Query_Swap_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -124,6 +131,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Swap_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TerraPoolDelta_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -146,6 +154,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TerraPoolDelta_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -168,6 +177,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -210,6 +220,7 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { + mux.Handle("GET", pattern_Query_Swap_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -227,6 +238,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Swap_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TerraPoolDelta_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -246,6 +258,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TerraPoolDelta_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -265,6 +278,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil diff --git a/x/market/types/tx.pb.go b/x/market/types/tx.pb.go index b2d003025..09405c884 100644 --- a/x/market/types/tx.pb.go +++ b/x/market/types/tx.pb.go @@ -6,25 +6,23 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - + _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -45,11 +43,9 @@ func (*MsgSwap) ProtoMessage() {} func (*MsgSwap) Descriptor() ([]byte, []int) { return fileDescriptor_7dcd4b152743bd0f, []int{0} } - func (m *MsgSwap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgSwap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSwap.Marshal(b, m, deterministic) @@ -62,15 +58,12 @@ func (m *MsgSwap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *MsgSwap) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSwap.Merge(m, src) } - func (m *MsgSwap) XXX_Size() int { return m.Size() } - func (m *MsgSwap) XXX_DiscardUnknown() { xxx_messageInfo_MsgSwap.DiscardUnknown(m) } @@ -89,11 +82,9 @@ func (*MsgSwapResponse) ProtoMessage() {} func (*MsgSwapResponse) Descriptor() ([]byte, []int) { return fileDescriptor_7dcd4b152743bd0f, []int{1} } - func (m *MsgSwapResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgSwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSwapResponse.Marshal(b, m, deterministic) @@ -106,15 +97,12 @@ func (m *MsgSwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } - func (m *MsgSwapResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSwapResponse.Merge(m, src) } - func (m *MsgSwapResponse) XXX_Size() int { return m.Size() } - func (m *MsgSwapResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgSwapResponse.DiscardUnknown(m) } @@ -149,11 +137,9 @@ func (*MsgSwapSend) ProtoMessage() {} func (*MsgSwapSend) Descriptor() ([]byte, []int) { return fileDescriptor_7dcd4b152743bd0f, []int{2} } - func (m *MsgSwapSend) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgSwapSend) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSwapSend.Marshal(b, m, deterministic) @@ -166,15 +152,12 @@ func (m *MsgSwapSend) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } - func (m *MsgSwapSend) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSwapSend.Merge(m, src) } - func (m *MsgSwapSend) XXX_Size() int { return m.Size() } - func (m *MsgSwapSend) XXX_DiscardUnknown() { xxx_messageInfo_MsgSwapSend.DiscardUnknown(m) } @@ -193,11 +176,9 @@ func (*MsgSwapSendResponse) ProtoMessage() {} func (*MsgSwapSendResponse) Descriptor() ([]byte, []int) { return fileDescriptor_7dcd4b152743bd0f, []int{3} } - func (m *MsgSwapSendResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgSwapSendResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSwapSendResponse.Marshal(b, m, deterministic) @@ -210,15 +191,12 @@ func (m *MsgSwapSendResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *MsgSwapSendResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSwapSendResponse.Merge(m, src) } - func (m *MsgSwapSendResponse) XXX_Size() int { return m.Size() } - func (m *MsgSwapSendResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgSwapSendResponse.DiscardUnknown(m) } @@ -249,47 +227,46 @@ func init() { func init() { proto.RegisterFile("terra/market/v1beta1/tx.proto", fileDescriptor_7dcd4b152743bd0f) } var fileDescriptor_7dcd4b152743bd0f = []byte{ - // 513 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xbf, 0x6e, 0xd3, 0x40, - 0x18, 0xf7, 0x25, 0x55, 0x1b, 0x5f, 0x40, 0xa5, 0x6e, 0x50, 0xd3, 0x48, 0xb5, 0xcb, 0x49, 0x48, - 0xed, 0x80, 0xad, 0x04, 0xa6, 0x6c, 0x04, 0x84, 0x84, 0x44, 0x24, 0xe4, 0x2c, 0x88, 0x25, 0xba, - 0xd8, 0x9f, 0x4d, 0x94, 0xda, 0x67, 0xdd, 0x1d, 0xfd, 0xf3, 0x06, 0x8c, 0xf0, 0x06, 0x7d, 0x01, - 0x16, 0x06, 0x1e, 0x01, 0x75, 0xec, 0xc8, 0x64, 0xa1, 0x64, 0x61, 0xce, 0x13, 0x20, 0xfb, 0x1c, - 0x27, 0x48, 0x28, 0x11, 0x03, 0x03, 0xdb, 0x77, 0xfe, 0xfd, 0xb9, 0xdf, 0x77, 0x9f, 0xef, 0xf0, - 0x91, 0x04, 0xce, 0xa9, 0x13, 0x51, 0x3e, 0x01, 0xe9, 0x9c, 0xb7, 0x47, 0x20, 0x69, 0xdb, 0x91, - 0x97, 0x76, 0xc2, 0x99, 0x64, 0x46, 0x23, 0x87, 0x6d, 0x05, 0xdb, 0x05, 0xdc, 0x6a, 0x84, 0x2c, - 0x64, 0x39, 0xc1, 0xc9, 0x2a, 0xc5, 0x6d, 0x99, 0x1e, 0x13, 0x11, 0x13, 0xce, 0x88, 0x0a, 0x28, - 0x9d, 0x3c, 0x36, 0x8e, 0x15, 0x4e, 0xbe, 0x21, 0xbc, 0xd3, 0x17, 0xe1, 0xe0, 0x82, 0x26, 0xc6, - 0x29, 0xde, 0x96, 0x9c, 0xfa, 0xc0, 0x9b, 0xe8, 0x18, 0x9d, 0xe8, 0xbd, 0xbd, 0x79, 0x6a, 0xdd, - 0xbd, 0xa2, 0xd1, 0x59, 0x97, 0xa8, 0xef, 0xc4, 0x2d, 0x08, 0xc6, 0x00, 0x63, 0x16, 0x04, 0xc0, - 0x87, 0x99, 0x55, 0xb3, 0x72, 0x8c, 0x4e, 0xea, 0x9d, 0x43, 0x5b, 0xed, 0x65, 0x67, 0x7b, 0x2d, - 0x62, 0xd9, 0xcf, 0xd8, 0x38, 0xee, 0x1d, 0xde, 0xa4, 0x96, 0x36, 0x4f, 0xad, 0x3d, 0xe5, 0xb6, - 0x94, 0x12, 0x57, 0xcf, 0x17, 0x19, 0xcb, 0x68, 0x63, 0x9d, 0x8a, 0xc9, 0xd0, 0x87, 0x98, 0x45, - 0xcd, 0x6a, 0x1e, 0xa1, 0x31, 0x4f, 0xad, 0x7b, 0x4a, 0x54, 0x42, 0xc4, 0xad, 0x51, 0x31, 0x79, - 0x9e, 0x95, 0xdd, 0xda, 0x87, 0x6b, 0x4b, 0xfb, 0x79, 0x6d, 0x69, 0xe4, 0x0b, 0xc2, 0xbb, 0x45, - 0x23, 0x2e, 0x88, 0x84, 0xc5, 0x02, 0x8c, 0xd7, 0x58, 0x17, 0x17, 0x34, 0x51, 0x21, 0xd1, 0xa6, - 0x90, 0xcd, 0x22, 0x64, 0xb1, 0x5f, 0xa9, 0x24, 0x6e, 0x2d, 0xab, 0xf3, 0x88, 0x7d, 0x9c, 0xd7, - 0xc3, 0x00, 0x60, 0x73, 0xd7, 0x07, 0x85, 0xe1, 0xee, 0x8a, 0x61, 0x00, 0x40, 0xdc, 0x9d, 0xac, - 0x7c, 0x01, 0x40, 0x3e, 0x55, 0x70, 0xbd, 0x08, 0x3d, 0x80, 0xd8, 0x37, 0xba, 0xf8, 0x4e, 0xc0, - 0x59, 0x34, 0xa4, 0xbe, 0xcf, 0x41, 0x88, 0x62, 0x0e, 0x07, 0xf3, 0xd4, 0xda, 0x57, 0x1e, 0xab, - 0x28, 0x71, 0xeb, 0xd9, 0xf2, 0xa9, 0x5a, 0x19, 0x4f, 0x30, 0x96, 0xac, 0x54, 0x56, 0x72, 0xe5, - 0xfd, 0xe5, 0x99, 0x2f, 0x31, 0xe2, 0xea, 0x92, 0x2d, 0x54, 0xbf, 0x0f, 0xb2, 0xfa, 0x0f, 0x06, - 0xb9, 0xf5, 0x97, 0x83, 0xfc, 0x8a, 0xf0, 0xfe, 0xca, 0x99, 0xfc, 0x37, 0xc3, 0xec, 0x7c, 0x46, - 0xb8, 0xda, 0x17, 0xa1, 0xf1, 0x0a, 0x6f, 0xe5, 0xd7, 0xe9, 0xc8, 0xfe, 0xd3, 0x3d, 0xb5, 0x8b, - 0xde, 0x5a, 0x0f, 0xd7, 0xc2, 0x65, 0xdb, 0x6f, 0x70, 0xad, 0xfc, 0x3d, 0x1e, 0xac, 0x95, 0x64, - 0x94, 0xd6, 0xe9, 0x46, 0xca, 0xc2, 0xb9, 0xf7, 0xf2, 0x66, 0x6a, 0xa2, 0xdb, 0xa9, 0x89, 0x7e, - 0x4c, 0x4d, 0xf4, 0x71, 0x66, 0x6a, 0xb7, 0x33, 0x53, 0xfb, 0x3e, 0x33, 0xb5, 0xb7, 0x4e, 0x38, - 0x96, 0xef, 0xde, 0x8f, 0x6c, 0x8f, 0x45, 0x8e, 0x77, 0x46, 0x85, 0x18, 0x7b, 0x8f, 0xd4, 0x93, - 0xe4, 0x31, 0x0e, 0xce, 0x79, 0xc7, 0xb9, 0x5c, 0x3c, 0x4e, 0xf2, 0x2a, 0x01, 0x31, 0xda, 0xce, - 0x1f, 0x93, 0xc7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x72, 0x00, 0x08, 0x9f, 0xb9, 0x04, 0x00, - 0x00, + // 537 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0x3f, 0x6f, 0xd3, 0x4e, + 0x18, 0xf6, 0x25, 0x55, 0x9b, 0x5c, 0x7e, 0x3f, 0x95, 0xba, 0x91, 0x48, 0x22, 0xd5, 0x2e, 0x27, + 0x21, 0xb5, 0x43, 0x7c, 0x4a, 0xbb, 0x75, 0x23, 0x20, 0x24, 0xa4, 0x46, 0x42, 0xce, 0x82, 0x58, + 0xa2, 0x8b, 0x7d, 0x36, 0x56, 0x6a, 0x9f, 0x75, 0x77, 0xf4, 0xcf, 0x37, 0x60, 0xe4, 0x23, 0xf4, + 0x0b, 0xb0, 0x20, 0xc4, 0xce, 0x82, 0x3a, 0x56, 0x4c, 0x4c, 0x16, 0x4a, 0x16, 0xe6, 0x7c, 0x02, + 0x64, 0xdf, 0xc5, 0x09, 0x12, 0x34, 0x62, 0x60, 0x60, 0x7b, 0xef, 0x7d, 0xde, 0xf7, 0x79, 0x9f, + 0xd7, 0x8f, 0xef, 0xe0, 0x9e, 0xa4, 0x9c, 0x13, 0x1c, 0x13, 0x3e, 0xa1, 0x12, 0x9f, 0xf7, 0xc6, + 0x54, 0x92, 0x1e, 0x96, 0x97, 0x4e, 0xca, 0x99, 0x64, 0x66, 0xb3, 0x80, 0x1d, 0x05, 0x3b, 0x1a, + 0xee, 0x58, 0x1e, 0x13, 0x31, 0x13, 0x78, 0x4c, 0x04, 0x2d, 0x7b, 0x3c, 0x16, 0x25, 0xaa, 0xab, + 0xd3, 0x56, 0xf8, 0xa8, 0x38, 0x61, 0x75, 0xd0, 0x50, 0x33, 0x64, 0x21, 0x53, 0xf9, 0x3c, 0x52, + 0x59, 0xf4, 0x19, 0xc0, 0xad, 0x81, 0x08, 0x87, 0x17, 0x24, 0x35, 0x0f, 0xe1, 0xa6, 0xe4, 0xc4, + 0xa7, 0xbc, 0x05, 0xf6, 0xc1, 0x41, 0xbd, 0xbf, 0x33, 0xcf, 0xec, 0xff, 0xaf, 0x48, 0x7c, 0x76, + 0x82, 0x54, 0x1e, 0xb9, 0xba, 0xc0, 0x1c, 0x42, 0xc8, 0x82, 0x80, 0xf2, 0x51, 0x3e, 0xbb, 0x55, + 0xd9, 0x07, 0x07, 0x8d, 0xa3, 0xb6, 0xa3, 0xe7, 0xe5, 0xe2, 0x16, 0x8a, 0x9d, 0xc7, 0x2c, 0x4a, + 0xfa, 0xed, 0x9b, 0xcc, 0x36, 0xe6, 0x99, 0xbd, 0xa3, 0xd8, 0x96, 0xad, 0xc8, 0xad, 0x17, 0x87, + 0xbc, 0xca, 0xec, 0xc1, 0x3a, 0x11, 0x93, 0x91, 0x4f, 0x13, 0x16, 0xb7, 0xaa, 0x85, 0x84, 0xe6, + 0x3c, 0xb3, 0xef, 0xa9, 0xa6, 0x12, 0x42, 0x6e, 0x8d, 0x88, 0xc9, 0x93, 0x3c, 0x3c, 0xa9, 0xbd, + 0xb9, 0xb6, 0x8d, 0xef, 0xd7, 0xb6, 0x81, 0xde, 0x03, 0xb8, 0xad, 0x17, 0x71, 0xa9, 0x48, 0x59, + 0x22, 0xa8, 0xf9, 0x1c, 0xd6, 0xc5, 0x05, 0x49, 0x95, 0x48, 0xb0, 0x4e, 0x64, 0x4b, 0x8b, 0xd4, + 0xf3, 0xca, 0x4e, 0xe4, 0xd6, 0xf2, 0xb8, 0x90, 0x38, 0x80, 0x45, 0x3c, 0x0a, 0x28, 0x5d, 0xbf, + 0xf5, 0x7d, 0x4d, 0xb8, 0xbd, 0x42, 0x18, 0x50, 0x8a, 0xdc, 0xad, 0x3c, 0x7c, 0x4a, 0x29, 0xfa, + 0x54, 0x81, 0x0d, 0x2d, 0x7a, 0x48, 0x13, 0xdf, 0x74, 0xe1, 0x7f, 0x01, 0x67, 0xf1, 0x88, 0xf8, + 0x3e, 0xa7, 0x42, 0x68, 0x1f, 0xf0, 0x3c, 0xb3, 0x77, 0x15, 0xc7, 0x2a, 0x8a, 0xbe, 0x7c, 0xe8, + 0x36, 0xf5, 0xf0, 0x47, 0x2a, 0x35, 0x94, 0x3c, 0x4a, 0x42, 0xb7, 0x91, 0x97, 0xe9, 0x94, 0x79, + 0x0a, 0xa1, 0x64, 0x25, 0x63, 0xa5, 0x60, 0xec, 0x2e, 0xbd, 0x58, 0x62, 0xbf, 0xe7, 0xab, 0x4b, + 0xb6, 0x60, 0xfb, 0xd9, 0xf8, 0xea, 0x5f, 0x30, 0x7e, 0xe3, 0x0f, 0x8d, 0xff, 0x08, 0xe0, 0xee, + 0xca, 0x37, 0xfc, 0x67, 0xcc, 0x3f, 0x7a, 0x07, 0x60, 0x75, 0x20, 0x42, 0xf3, 0x14, 0x6e, 0x14, + 0xd7, 0x6f, 0xcf, 0xf9, 0xd5, 0x95, 0x77, 0xf4, 0x6e, 0x9d, 0x87, 0x77, 0xc2, 0xe5, 0xda, 0x2f, + 0x60, 0xad, 0xfc, 0x9d, 0x1e, 0xdc, 0xd9, 0x92, 0x97, 0x74, 0x0e, 0xd7, 0x96, 0x2c, 0x98, 0xfb, + 0xcf, 0x6e, 0xa6, 0x16, 0xb8, 0x9d, 0x5a, 0xe0, 0xdb, 0xd4, 0x02, 0x6f, 0x67, 0x96, 0x71, 0x3b, + 0xb3, 0x8c, 0xaf, 0x33, 0xcb, 0x78, 0x89, 0xc3, 0x48, 0xbe, 0x7a, 0x3d, 0x76, 0x3c, 0x16, 0x63, + 0xef, 0x8c, 0x08, 0x11, 0x79, 0x5d, 0xf5, 0xba, 0x79, 0x8c, 0x53, 0x7c, 0x7e, 0x8c, 0x2f, 0x17, + 0xef, 0x9c, 0xbc, 0x4a, 0xa9, 0x18, 0x6f, 0x16, 0x8f, 0xcf, 0xf1, 0x8f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x13, 0x31, 0x8c, 0x62, 0x04, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -344,12 +321,12 @@ type MsgServer interface { } // UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct{} +type UnimplementedMsgServer struct { +} func (*UnimplementedMsgServer) Swap(ctx context.Context, req *MsgSwap) (*MsgSwapResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Swap not implemented") } - func (*UnimplementedMsgServer) SwapSend(ctx context.Context, req *MsgSwapSend) (*MsgSwapSendResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SwapSend not implemented") } @@ -609,7 +586,6 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *MsgSwap) Size() (n int) { if m == nil { return 0 @@ -681,11 +657,9 @@ func (m *MsgSwapSendResponse) Size() (n int) { func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *MsgSwap) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -833,7 +807,6 @@ func (m *MsgSwap) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgSwapResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -950,7 +923,6 @@ func (m *MsgSwapResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgSwapSend) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1130,7 +1102,6 @@ func (m *MsgSwapSend) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgSwapSendResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1247,7 +1218,6 @@ func (m *MsgSwapSendResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/oracle/abci.go b/x/oracle/abci.go index 9985ed9c9..4aa97780e 100644 --- a/x/oracle/abci.go +++ b/x/oracle/abci.go @@ -3,9 +3,9 @@ package oracle import ( "time" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/oracle/abci_test.go b/x/oracle/abci_test.go index 38cde1771..257ea423f 100644 --- a/x/oracle/abci_test.go +++ b/x/oracle/abci_test.go @@ -6,16 +6,16 @@ import ( "sort" "testing" + "github.com/cometbft/cometbft/libs/rand" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/rand" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/types" ) func TestOracleThreshold(t *testing.T) { diff --git a/x/oracle/client/cli/query.go b/x/oracle/client/cli/query.go index 26e6d3e5f..6dcff7e4b 100644 --- a/x/oracle/client/cli/query.go +++ b/x/oracle/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/oracle/client/cli/tx.go b/x/oracle/client/cli/tx.go index df48ba302..b98e4fd16 100644 --- a/x/oracle/client/cli/tx.go +++ b/x/oracle/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/oracle/common_test.go b/x/oracle/common_test.go index 2328331e5..efb406b07 100644 --- a/x/oracle/common_test.go +++ b/x/oracle/common_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/classic-terra/core/v2/x/oracle" - "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle" + "github.com/classic-terra/core/v3/x/oracle/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/oracle/exported/alias.go b/x/oracle/exported/alias.go index 5146a1288..734c796a5 100644 --- a/x/oracle/exported/alias.go +++ b/x/oracle/exported/alias.go @@ -1,7 +1,7 @@ // DONTCOVER package exported -import "github.com/classic-terra/core/v2/x/oracle/types" +import "github.com/classic-terra/core/v3/x/oracle/types" type ( MsgAggregateExchangeRatePrevote = types.MsgAggregateExchangeRatePrevote diff --git a/x/oracle/genesis.go b/x/oracle/genesis.go index 1fc0768d8..4273ba26f 100644 --- a/x/oracle/genesis.go +++ b/x/oracle/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/types" ) // InitGenesis initialize default parameters diff --git a/x/oracle/genesis_test.go b/x/oracle/genesis_test.go index ede1f2edc..11099dcd1 100644 --- a/x/oracle/genesis_test.go +++ b/x/oracle/genesis_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/classic-terra/core/v2/x/oracle" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/handler.go b/x/oracle/handler.go index b6d48bdb1..fa653e928 100644 --- a/x/oracle/handler.go +++ b/x/oracle/handler.go @@ -1,11 +1,12 @@ package oracle import ( + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/types" ) // NewHandler returns a handler for "oracle" type messages. @@ -26,7 +27,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler { res, err := msgServer.AggregateExchangeRateVote(sdk.WrapSDKContext(ctx), msg) return sdk.WrapServiceResult(ctx, res, err) default: - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized oracle message type: %T", msg) + return nil, errorsmod.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized oracle message type: %T", msg) } } } diff --git a/x/oracle/handler_test.go b/x/oracle/handler_test.go index a3280c4eb..efc937cd6 100644 --- a/x/oracle/handler_test.go +++ b/x/oracle/handler_test.go @@ -6,14 +6,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto/secp256k1" + "github.com/cometbft/cometbft/crypto/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/types" ) func TestOracleFilters(t *testing.T) { diff --git a/x/oracle/keeper/alias_functions.go b/x/oracle/keeper/alias_functions.go index b39706833..e57fbdab1 100644 --- a/x/oracle/keeper/alias_functions.go +++ b/x/oracle/keeper/alias_functions.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) // GetOracleAccount returns oracle ModuleAccount diff --git a/x/oracle/keeper/ballot.go b/x/oracle/keeper/ballot.go index c58e2622d..9a9836008 100644 --- a/x/oracle/keeper/ballot.go +++ b/x/oracle/keeper/ballot.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/x/oracle/keeper/ballot_test.go b/x/oracle/keeper/ballot_test.go index 5d09d24ea..ab27059c7 100644 --- a/x/oracle/keeper/ballot_test.go +++ b/x/oracle/keeper/ballot_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/oracle/keeper/keeper.go b/x/oracle/keeper/keeper.go index 45e77fdf4..05d9b9665 100644 --- a/x/oracle/keeper/keeper.go +++ b/x/oracle/keeper/keeper.go @@ -3,19 +3,19 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" gogotypes "github.com/gogo/protobuf/types" + errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) // Keeper of the oracle store @@ -82,7 +82,7 @@ func (k Keeper) GetLunaExchangeRate(ctx sdk.Context, denom string) (sdk.Dec, err store := ctx.KVStore(k.storeKey) b := store.Get(types.GetExchangeRateKey(denom)) if b == nil { - return sdk.ZeroDec(), sdkerrors.Wrap(types.ErrUnknownDenom, denom) + return sdk.ZeroDec(), errorsmod.Wrap(types.ErrUnknownDenom, denom) } dp := sdk.DecProto{} @@ -225,7 +225,7 @@ func (k Keeper) GetAggregateExchangeRatePrevote(ctx sdk.Context, voter sdk.ValAd store := ctx.KVStore(k.storeKey) b := store.Get(types.GetAggregateExchangeRatePrevoteKey(voter)) if b == nil { - err = sdkerrors.Wrap(types.ErrNoAggregatePrevote, voter.String()) + err = errorsmod.Wrap(types.ErrNoAggregatePrevote, voter.String()) return } k.cdc.MustUnmarshal(b, &aggregatePrevote) @@ -270,7 +270,7 @@ func (k Keeper) GetAggregateExchangeRateVote(ctx sdk.Context, voter sdk.ValAddre store := ctx.KVStore(k.storeKey) b := store.Get(types.GetAggregateExchangeRateVoteKey(voter)) if b == nil { - err = sdkerrors.Wrap(types.ErrNoAggregateVote, voter.String()) + err = errorsmod.Wrap(types.ErrNoAggregateVote, voter.String()) return } k.cdc.MustUnmarshal(b, &aggregateVote) @@ -311,7 +311,7 @@ func (k Keeper) GetTobinTax(ctx sdk.Context, denom string) (sdk.Dec, error) { store := ctx.KVStore(k.storeKey) bz := store.Get(types.GetTobinTaxKey(denom)) if bz == nil { - err := sdkerrors.Wrap(types.ErrNoTobinTax, denom) + err := errorsmod.Wrap(types.ErrNoTobinTax, denom) return sdk.Dec{}, err } @@ -359,13 +359,13 @@ func (k Keeper) ValidateFeeder(ctx sdk.Context, feederAddr sdk.AccAddress, valid if !feederAddr.Equals(validatorAddr) { delegate := k.GetFeederDelegation(ctx, validatorAddr) if !delegate.Equals(feederAddr) { - return sdkerrors.Wrap(types.ErrNoVotingPermission, feederAddr.String()) + return errorsmod.Wrap(types.ErrNoVotingPermission, feederAddr.String()) } } // Check that the given validator exists if val := k.StakingKeeper.Validator(ctx, validatorAddr); val == nil || !val.IsBonded() { - return sdkerrors.Wrapf(stakingtypes.ErrNoValidatorFound, "validator %s is not active set", validatorAddr.String()) + return errorsmod.Wrapf(stakingtypes.ErrNoValidatorFound, "validator %s is not active set", validatorAddr.String()) } return nil diff --git a/x/oracle/keeper/keeper_test.go b/x/oracle/keeper/keeper_test.go index 07b06b418..95db998bb 100644 --- a/x/oracle/keeper/keeper_test.go +++ b/x/oracle/keeper/keeper_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" diff --git a/x/oracle/keeper/legacy_querier.go b/x/oracle/keeper/legacy_querier.go deleted file mode 100644 index f5c24a54c..000000000 --- a/x/oracle/keeper/legacy_querier.go +++ /dev/null @@ -1,250 +0,0 @@ -package keeper - -import ( - "github.com/cosmos/cosmos-sdk/codec" - - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - - abci "github.com/tendermint/tendermint/abci/types" - - "github.com/classic-terra/core/v2/x/oracle/types" -) - -// NewLegacyQuerier is the module level router for state queries -func NewLegacyQuerier(keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return func(ctx sdk.Context, path []string, req abci.RequestQuery) (res []byte, err error) { - switch path[0] { - case types.QueryExchangeRate: - return queryExchangeRate(ctx, req, keeper, legacyQuerierCdc) - case types.QueryExchangeRates: - return queryExchangeRates(ctx, keeper, legacyQuerierCdc) - case types.QueryActives: - return queryActives(ctx, keeper, legacyQuerierCdc) - case types.QueryParameters: - return queryParameters(ctx, keeper, legacyQuerierCdc) - case types.QueryFeederDelegation: - return queryFeederDelegation(ctx, req, keeper, legacyQuerierCdc) - case types.QueryMissCounter: - return queryMissCounter(ctx, req, keeper, legacyQuerierCdc) - case types.QueryAggregatePrevote: - return queryAggregatePrevote(ctx, req, keeper, legacyQuerierCdc) - case types.QueryAggregatePrevotes: - return queryAggregatePrevotes(ctx, keeper, legacyQuerierCdc) - case types.QueryAggregateVote: - return queryAggregateVote(ctx, req, keeper, legacyQuerierCdc) - case types.QueryAggregateVotes: - return queryAggregateVotes(ctx, keeper, legacyQuerierCdc) - case types.QueryVoteTargets: - return queryVoteTargets(ctx, keeper, legacyQuerierCdc) - case types.QueryTobinTax: - return queryTobinTax(ctx, req, keeper, legacyQuerierCdc) - case types.QueryTobinTaxes: - return queryTobinTaxes(ctx, keeper, legacyQuerierCdc) - default: - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown %s query endpoint: %s", types.ModuleName, path[0]) - } - } -} - -func queryExchangeRate(ctx sdk.Context, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryExchangeRateParams - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - rate, err := keeper.GetLunaExchangeRate(ctx, params.Denom) - if err != nil { - return nil, sdkerrors.Wrap(types.ErrUnknownDenom, params.Denom) - } - - bz, err2 := codec.MarshalJSONIndent(legacyQuerierCdc, rate) - if err2 != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryExchangeRates(ctx sdk.Context, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var rates sdk.DecCoins - - keeper.IterateLunaExchangeRates(ctx, func(denom string, rate sdk.Dec) (stop bool) { - rates = append(rates, sdk.NewDecCoinFromDec(denom, rate)) - return false - }) - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, rates) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryActives(ctx sdk.Context, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - denoms := []string{} - - keeper.IterateLunaExchangeRates(ctx, func(denom string, rate sdk.Dec) (stop bool) { - denoms = append(denoms, denom) - return false - }) - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, denoms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryParameters(ctx sdk.Context, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, keeper.GetParams(ctx)) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryFeederDelegation(ctx sdk.Context, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryFeederDelegationParams - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - delegate := keeper.GetFeederDelegation(ctx, params.Validator) - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, delegate) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryMissCounter(ctx sdk.Context, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryMissCounterParams - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - missCounter := keeper.GetMissCounter(ctx, params.Validator) - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, missCounter) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryAggregatePrevote(ctx sdk.Context, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryAggregatePrevoteParams - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - aggregateExchangeRatePrevote, err := keeper.GetAggregateExchangeRatePrevote(ctx, params.Validator) - if err != nil { - return nil, err - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, aggregateExchangeRatePrevote) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryAggregatePrevotes(ctx sdk.Context, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var aggregatePrevotes []types.AggregateExchangeRatePrevote - keeper.IterateAggregateExchangeRatePrevotes(ctx, func(_ sdk.ValAddress, aggregatePrevote types.AggregateExchangeRatePrevote) bool { - aggregatePrevotes = append(aggregatePrevotes, aggregatePrevote) - return false - }) - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, aggregatePrevotes) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryAggregateVote(ctx sdk.Context, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryAggregateVoteParams - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - aggregateExchangeRateVote, err := keeper.GetAggregateExchangeRateVote(ctx, params.Validator) - if err != nil { - return nil, err - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, aggregateExchangeRateVote) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryAggregateVotes(ctx sdk.Context, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var aggregateVotes []types.AggregateExchangeRateVote - keeper.IterateAggregateExchangeRateVotes(ctx, func(_ sdk.ValAddress, aggregateVote types.AggregateExchangeRateVote) bool { - aggregateVotes = append(aggregateVotes, aggregateVote) - return false - }) - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, aggregateVotes) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryVoteTargets(ctx sdk.Context, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - voteTargets := keeper.GetVoteTargets(ctx) - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, voteTargets) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryTobinTax(ctx sdk.Context, req abci.RequestQuery, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryTobinTaxParams - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - tobinTax, err := keeper.GetTobinTax(ctx, params.Denom) - if err != nil { - return nil, err - } - - bz, err2 := codec.MarshalJSONIndent(legacyQuerierCdc, tobinTax) - if err2 != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryTobinTaxes(ctx sdk.Context, keeper Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var denoms types.DenomList - - keeper.IterateTobinTaxes(ctx, func(denom string, tobinTax sdk.Dec) (stop bool) { - denoms = append(denoms, types.Denom{Name: denom, TobinTax: tobinTax}) - return false - }) - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, denoms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} diff --git a/x/oracle/keeper/legacy_querier_test.go b/x/oracle/keeper/legacy_querier_test.go deleted file mode 100644 index 0f1547b1a..000000000 --- a/x/oracle/keeper/legacy_querier_test.go +++ /dev/null @@ -1,414 +0,0 @@ -package keeper - -import ( - "bytes" - "sort" - "testing" - - "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - - sdk "github.com/cosmos/cosmos-sdk/types" - - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" -) - -func TestLegacyNewLegacyQuerier(t *testing.T) { - input := CreateTestInput(t) - - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - - _, err := querier(input.Ctx, []string{types.QueryParameters}, query) - require.NoError(t, err) -} - -func TestLegacyFilter(t *testing.T) { - input := CreateTestInput(t) - - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - - _, err := querier(input.Ctx, []string{"invalid"}, query) - require.Error(t, err) -} - -func TestLegacyQueryParams(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - req := abci.RequestQuery{ - Path: "", - Data: nil, - } - - res, err := querier(input.Ctx, []string{types.QueryParameters}, req) - require.NoError(t, err) - - var params types.Params - err = input.Cdc.UnmarshalJSON(res, ¶ms) - require.NoError(t, err) - require.Equal(t, input.OracleKeeper.GetParams(input.Ctx), params) -} - -func TestLegacyQueryMissCounter(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - queryParams := types.NewQueryMissCounterParams(ValAddrs[0]) - bz, err := input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - _, err = querier(input.Ctx, []string{types.QueryMissCounter}, abci.RequestQuery{}) - require.Error(t, err) - - req := abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err := querier(input.Ctx, []string{types.QueryMissCounter}, req) - require.NoError(t, err) - - var missCounter uint64 - err = input.Cdc.UnmarshalJSON(res, &missCounter) - require.NoError(t, err) - require.Equal(t, input.OracleKeeper.GetMissCounter(input.Ctx, ValAddrs[0]), missCounter) -} - -func TestLegacyQueryExchangeRate(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - rate := sdk.NewDec(1700) - input.OracleKeeper.SetLunaExchangeRate(input.Ctx, core.MicroSDRDenom, rate) - - // denom query params - queryParams := types.NewQueryExchangeRateParams(core.MicroSDRDenom) - bz, err := input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - _, err = querier(input.Ctx, []string{types.QueryExchangeRate}, abci.RequestQuery{}) - require.Error(t, err) - - req := abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err := querier(input.Ctx, []string{types.QueryExchangeRate}, req) - require.NoError(t, err) - - var queriedRate sdk.Dec - err = input.Cdc.UnmarshalJSON(res, &queriedRate) - require.NoError(t, err) - require.Equal(t, rate, queriedRate) -} - -func TestLegacyQueryExchangeRates(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - rate := sdk.NewDec(1700) - input.OracleKeeper.SetLunaExchangeRate(input.Ctx, core.MicroSDRDenom, rate) - input.OracleKeeper.SetLunaExchangeRate(input.Ctx, core.MicroUSDDenom, rate) - - res, err := querier(input.Ctx, []string{types.QueryExchangeRates}, abci.RequestQuery{}) - require.NoError(t, err) - - var queriedRate sdk.DecCoins - err2 := input.Cdc.UnmarshalJSON(res, &queriedRate) - require.NoError(t, err2) - require.Equal(t, sdk.DecCoins{ - sdk.NewDecCoinFromDec(core.MicroSDRDenom, rate), - sdk.NewDecCoinFromDec(core.MicroUSDDenom, rate), - }, queriedRate) -} - -func TestLegacyQueryActives(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - rate := sdk.NewDec(1700) - input.OracleKeeper.SetLunaExchangeRate(input.Ctx, core.MicroSDRDenom, rate) - input.OracleKeeper.SetLunaExchangeRate(input.Ctx, core.MicroKRWDenom, rate) - input.OracleKeeper.SetLunaExchangeRate(input.Ctx, core.MicroUSDDenom, rate) - - res, err := querier(input.Ctx, []string{types.QueryActives}, abci.RequestQuery{}) - require.NoError(t, err) - - targetDenoms := []string{ - core.MicroKRWDenom, - core.MicroSDRDenom, - core.MicroUSDDenom, - } - - var denoms []string - err2 := input.Cdc.UnmarshalJSON(res, &denoms) - require.NoError(t, err2) - require.Equal(t, targetDenoms, denoms) -} - -func TestLegacyQueryFeederDelegation(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - input.OracleKeeper.SetFeederDelegation(input.Ctx, ValAddrs[0], Addrs[1]) - - queryParams := types.NewQueryFeederDelegationParams(ValAddrs[0]) - bz, err := input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - _, err = querier(input.Ctx, []string{types.QueryFeederDelegation}, abci.RequestQuery{}) - require.Error(t, err) - - req := abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err := querier(input.Ctx, []string{types.QueryFeederDelegation}, req) - require.NoError(t, err) - - var delegate sdk.AccAddress - input.Cdc.UnmarshalJSON(res, &delegate) - require.Equal(t, Addrs[1], delegate) -} - -func TestLegacyQueryAggregatePrevote(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - prevote1 := types.NewAggregateExchangeRatePrevote(types.AggregateVoteHash{}, ValAddrs[0], 0) - input.OracleKeeper.SetAggregateExchangeRatePrevote(input.Ctx, ValAddrs[0], prevote1) - prevote2 := types.NewAggregateExchangeRatePrevote(types.AggregateVoteHash{}, ValAddrs[1], 0) - input.OracleKeeper.SetAggregateExchangeRatePrevote(input.Ctx, ValAddrs[1], prevote2) - prevote3 := types.NewAggregateExchangeRatePrevote(types.AggregateVoteHash{}, ValAddrs[2], 0) - input.OracleKeeper.SetAggregateExchangeRatePrevote(input.Ctx, ValAddrs[2], prevote3) - - // validator 0 address params - queryParams := types.NewQueryAggregatePrevoteParams(ValAddrs[0]) - bz, err := input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - _, err = querier(input.Ctx, []string{types.QueryAggregatePrevote}, abci.RequestQuery{}) - require.Error(t, err) - - req := abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err := querier(input.Ctx, []string{types.QueryAggregatePrevote}, req) - require.NoError(t, err) - - var prevote types.AggregateExchangeRatePrevote - err = input.Cdc.UnmarshalJSON(res, &prevote) - require.NoError(t, err) - require.Equal(t, prevote1, prevote) - - // validator 1 address params - queryParams = types.NewQueryAggregatePrevoteParams(ValAddrs[1]) - bz, err = input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - req = abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err = querier(input.Ctx, []string{types.QueryAggregatePrevote}, req) - require.NoError(t, err) - - err = input.Cdc.UnmarshalJSON(res, &prevote) - require.NoError(t, err) - require.Equal(t, prevote2, prevote) -} - -func TestLegacyQueryAggregatePrevotes(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - prevote1 := types.NewAggregateExchangeRatePrevote(types.AggregateVoteHash{}, ValAddrs[0], 0) - input.OracleKeeper.SetAggregateExchangeRatePrevote(input.Ctx, ValAddrs[0], prevote1) - prevote2 := types.NewAggregateExchangeRatePrevote(types.AggregateVoteHash{}, ValAddrs[1], 0) - input.OracleKeeper.SetAggregateExchangeRatePrevote(input.Ctx, ValAddrs[1], prevote2) - prevote3 := types.NewAggregateExchangeRatePrevote(types.AggregateVoteHash{}, ValAddrs[2], 0) - input.OracleKeeper.SetAggregateExchangeRatePrevote(input.Ctx, ValAddrs[2], prevote3) - - expectedPrevotes := []types.AggregateExchangeRatePrevote{prevote1, prevote2, prevote3} - sort.SliceStable(expectedPrevotes, func(i, j int) bool { - addr1, _ := sdk.ValAddressFromBech32(expectedPrevotes[i].Voter) - addr2, _ := sdk.ValAddressFromBech32(expectedPrevotes[j].Voter) - return bytes.Compare(addr1, addr2) == -1 - }) - - res, err := querier(input.Ctx, []string{types.QueryAggregatePrevotes}, abci.RequestQuery{}) - require.NoError(t, err) - - var prevotes []types.AggregateExchangeRatePrevote - err = input.Cdc.UnmarshalJSON(res, &prevotes) - require.NoError(t, err) - require.Equal(t, expectedPrevotes, prevotes) -} - -func TestLegacyQueryAggregateVote(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - vote1 := types.NewAggregateExchangeRateVote(types.ExchangeRateTuples{{Denom: "", ExchangeRate: sdk.OneDec()}}, ValAddrs[0]) - input.OracleKeeper.SetAggregateExchangeRateVote(input.Ctx, ValAddrs[0], vote1) - vote2 := types.NewAggregateExchangeRateVote(types.ExchangeRateTuples{{Denom: "", ExchangeRate: sdk.OneDec()}}, ValAddrs[1]) - input.OracleKeeper.SetAggregateExchangeRateVote(input.Ctx, ValAddrs[1], vote2) - vote3 := types.NewAggregateExchangeRateVote(types.ExchangeRateTuples{{Denom: "", ExchangeRate: sdk.OneDec()}}, ValAddrs[2]) - input.OracleKeeper.SetAggregateExchangeRateVote(input.Ctx, ValAddrs[2], vote3) - - // validator 0 address params - queryParams := types.NewQueryAggregateVoteParams(ValAddrs[0]) - bz, err := input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - _, err = querier(input.Ctx, []string{types.QueryAggregateVote}, abci.RequestQuery{}) - require.Error(t, err) - - req := abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err := querier(input.Ctx, []string{types.QueryAggregateVote}, req) - require.NoError(t, err) - - var vote types.AggregateExchangeRateVote - err = input.Cdc.UnmarshalJSON(res, &vote) - require.NoError(t, err) - require.Equal(t, vote1, vote) - - // validator 1 address params - queryParams = types.NewQueryAggregateVoteParams(ValAddrs[1]) - bz, err = input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - req = abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err = querier(input.Ctx, []string{types.QueryAggregateVote}, req) - require.NoError(t, err) - - err = input.Cdc.UnmarshalJSON(res, &vote) - require.NoError(t, err) - require.Equal(t, vote2, vote) -} - -func TestLegacyQueryAggregateVotes(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - vote1 := types.NewAggregateExchangeRateVote(types.ExchangeRateTuples{{Denom: "", ExchangeRate: sdk.OneDec()}}, ValAddrs[0]) - input.OracleKeeper.SetAggregateExchangeRateVote(input.Ctx, ValAddrs[0], vote1) - vote2 := types.NewAggregateExchangeRateVote(types.ExchangeRateTuples{{Denom: "", ExchangeRate: sdk.OneDec()}}, ValAddrs[1]) - input.OracleKeeper.SetAggregateExchangeRateVote(input.Ctx, ValAddrs[1], vote2) - vote3 := types.NewAggregateExchangeRateVote(types.ExchangeRateTuples{{Denom: "", ExchangeRate: sdk.OneDec()}}, ValAddrs[2]) - input.OracleKeeper.SetAggregateExchangeRateVote(input.Ctx, ValAddrs[2], vote3) - - expectedVotes := []types.AggregateExchangeRateVote{vote1, vote2, vote3} - sort.SliceStable(expectedVotes, func(i, j int) bool { - addr1, _ := sdk.ValAddressFromBech32(expectedVotes[i].Voter) - addr2, _ := sdk.ValAddressFromBech32(expectedVotes[j].Voter) - return bytes.Compare(addr1, addr2) == -1 - }) - - res, err := querier(input.Ctx, []string{types.QueryAggregateVotes}, abci.RequestQuery{}) - require.NoError(t, err) - - var votes []types.AggregateExchangeRateVote - err = input.Cdc.UnmarshalJSON(res, &votes) - require.NoError(t, err) - require.Equal(t, expectedVotes, votes) -} - -func TestLegacyQueryVoteTargets(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - // clear tobin taxes - input.OracleKeeper.ClearTobinTaxes(input.Ctx) - - voteTargets := []string{"denom", "denom2", "denom3"} - for _, target := range voteTargets { - input.OracleKeeper.SetTobinTax(input.Ctx, target, sdk.OneDec()) - } - - res, err := querier(input.Ctx, []string{types.QueryVoteTargets}, abci.RequestQuery{}) - require.NoError(t, err) - - var voteTargetsRes []string - err2 := input.Cdc.UnmarshalJSON(res, &voteTargetsRes) - require.NoError(t, err2) - require.Equal(t, voteTargets, voteTargetsRes) -} - -func TestLegacyQueryTobinTaxes(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - // clear tobin taxes - input.OracleKeeper.ClearTobinTaxes(input.Ctx) - - tobinTaxes := types.DenomList{{ - Name: core.MicroKRWDenom, - TobinTax: sdk.OneDec(), - }, { - Name: core.MicroSDRDenom, - TobinTax: sdk.NewDecWithPrec(123, 2), - }} - for _, item := range tobinTaxes { - input.OracleKeeper.SetTobinTax(input.Ctx, item.Name, item.TobinTax) - } - - res, err := querier(input.Ctx, []string{types.QueryTobinTaxes}, abci.RequestQuery{}) - require.NoError(t, err) - - var tobinTaxesRes types.DenomList - err2 := input.Cdc.UnmarshalJSON(res, &tobinTaxesRes) - require.NoError(t, err2) - require.Equal(t, tobinTaxes, tobinTaxesRes) -} - -func TestLegacyQueryTobinTax(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.OracleKeeper, input.Cdc) - - denom := types.Denom{Name: core.MicroKRWDenom, TobinTax: sdk.OneDec()} - input.OracleKeeper.SetTobinTax(input.Ctx, denom.Name, denom.TobinTax) - - queryParams := types.NewQueryTobinTaxParams(core.MicroKRWDenom) - bz, err := input.Cdc.MarshalJSON(queryParams) - require.NoError(t, err) - - _, err = querier(input.Ctx, []string{types.QueryTobinTax}, abci.RequestQuery{}) - require.Error(t, err) - - req := abci.RequestQuery{ - Path: "", - Data: bz, - } - - res, err := querier(input.Ctx, []string{types.QueryTobinTax}, req) - require.NoError(t, err) - - var tobinTaxRes sdk.Dec - input.Cdc.UnmarshalJSON(res, &tobinTaxRes) - require.Equal(t, denom.TobinTax, tobinTaxRes) -} diff --git a/x/oracle/keeper/msg_server.go b/x/oracle/keeper/msg_server.go index 53b60c120..a1a8d1ebc 100644 --- a/x/oracle/keeper/msg_server.go +++ b/x/oracle/keeper/msg_server.go @@ -3,11 +3,12 @@ package keeper import ( "context" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) type msgServer struct { @@ -40,7 +41,7 @@ func (ms msgServer) AggregateExchangeRatePrevote(goCtx context.Context, msg *typ // Convert hex string to votehash voteHash, err := types.AggregateVoteHashFromHexString(msg.Hash) if err != nil { - return nil, sdkerrors.Wrap(types.ErrInvalidHash, err.Error()) + return nil, errorsmod.Wrap(types.ErrInvalidHash, err.Error()) } aggregatePrevote := types.NewAggregateExchangeRatePrevote(voteHash, valAddr, uint64(ctx.BlockHeight())) @@ -82,7 +83,7 @@ func (ms msgServer) AggregateExchangeRateVote(goCtx context.Context, msg *types. aggregatePrevote, err := ms.GetAggregateExchangeRatePrevote(ctx, valAddr) if err != nil { - return nil, sdkerrors.Wrap(types.ErrNoAggregatePrevote, msg.Validator) + return nil, errorsmod.Wrap(types.ErrNoAggregatePrevote, msg.Validator) } // Check a msg is submitted proper period @@ -92,20 +93,20 @@ func (ms msgServer) AggregateExchangeRateVote(goCtx context.Context, msg *types. exchangeRateTuples, err := types.ParseExchangeRateTuples(msg.ExchangeRates) if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, err.Error()) + return nil, errorsmod.Wrap(sdkerrors.ErrInvalidCoins, err.Error()) } // check all denoms are in the vote target for _, tuple := range exchangeRateTuples { if !ms.IsVoteTarget(ctx, tuple.Denom) { - return nil, sdkerrors.Wrap(types.ErrUnknownDenom, tuple.Denom) + return nil, errorsmod.Wrap(types.ErrUnknownDenom, tuple.Denom) } } // Verify a exchange rate with aggregate prevote hash hash := types.GetAggregateVoteHash(msg.Salt, msg.ExchangeRates, valAddr) if aggregatePrevote.Hash != hash.String() { - return nil, sdkerrors.Wrapf(types.ErrVerificationFailed, "must be given %s not %s", aggregatePrevote.Hash, hash) + return nil, errorsmod.Wrapf(types.ErrVerificationFailed, "must be given %s not %s", aggregatePrevote.Hash, hash) } // Move aggregate prevote to aggregate vote with given exchange rates @@ -144,7 +145,7 @@ func (ms msgServer) DelegateFeedConsent(goCtx context.Context, msg *types.MsgDel // Check the delegator is a validator val := ms.StakingKeeper.Validator(ctx, operatorAddr) if val == nil { - return nil, sdkerrors.Wrap(stakingtypes.ErrNoValidatorFound, msg.Operator) + return nil, errorsmod.Wrap(stakingtypes.ErrNoValidatorFound, msg.Operator) } // Set the delegation diff --git a/x/oracle/keeper/msg_server_test.go b/x/oracle/keeper/msg_server_test.go index 4e124c813..039adadb2 100644 --- a/x/oracle/keeper/msg_server_test.go +++ b/x/oracle/keeper/msg_server_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/cosmos/cosmos-sdk/x/staking" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" diff --git a/x/oracle/keeper/params.go b/x/oracle/keeper/params.go index 8bebe0606..dd35c975f 100644 --- a/x/oracle/keeper/params.go +++ b/x/oracle/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/keeper/querier.go b/x/oracle/keeper/querier.go index b2d30e6df..19a9d5d26 100644 --- a/x/oracle/keeper/querier.go +++ b/x/oracle/keeper/querier.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) // querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over q diff --git a/x/oracle/keeper/querier_test.go b/x/oracle/keeper/querier_test.go index 6ef4cee32..8dd0c911d 100644 --- a/x/oracle/keeper/querier_test.go +++ b/x/oracle/keeper/querier_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) func TestQueryParams(t *testing.T) { diff --git a/x/oracle/keeper/reward.go b/x/oracle/keeper/reward.go index 7c15088f3..88117d983 100644 --- a/x/oracle/keeper/reward.go +++ b/x/oracle/keeper/reward.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) // RewardBallotWinners implements diff --git a/x/oracle/keeper/reward_test.go b/x/oracle/keeper/reward_test.go index d6df245b6..455b69a30 100644 --- a/x/oracle/keeper/reward_test.go +++ b/x/oracle/keeper/reward_test.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) // Test a reward giving mechanism diff --git a/x/oracle/keeper/test_utils.go b/x/oracle/keeper/test_utils.go index 36674b8c7..5e3b29655 100644 --- a/x/oracle/keeper/test_utils.go +++ b/x/oracle/keeper/test_utils.go @@ -4,29 +4,30 @@ import ( "testing" "time" - customauth "github.com/classic-terra/core/v2/custom/auth" - custombank "github.com/classic-terra/core/v2/custom/bank" - customdistr "github.com/classic-terra/core/v2/custom/distribution" - customparams "github.com/classic-terra/core/v2/custom/params" - customstaking "github.com/classic-terra/core/v2/custom/staking" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + customauth "github.com/classic-terra/core/v3/custom/auth" + custombank "github.com/classic-terra/core/v3/custom/bank" + customdistr "github.com/classic-terra/core/v3/custom/distribution" + customparams "github.com/classic-terra/core/v3/custom/params" + customstaking "github.com/classic-terra/core/v3/custom/staking" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/secp256k1" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "cosmossdk.io/math" + simparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp" - simparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" @@ -36,6 +37,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" @@ -79,7 +81,7 @@ func MakeEncodingConfig(_ *testing.T) simparams.EncodingConfig { // Test addresses var ( - ValPubKeys = simapp.CreateTestPubKeys(5) + ValPubKeys = simtestutil.CreateTestPubKeys(5) pubKeys = []crypto.PubKey{ secp256k1.GenPrivKey().PubKey(), @@ -117,7 +119,7 @@ type TestInput struct { AccountKeeper authkeeper.AccountKeeper BankKeeper bankkeeper.Keeper OracleKeeper Keeper - StakingKeeper stakingkeeper.Keeper + StakingKeeper *stakingkeeper.Keeper DistrKeeper distrkeeper.Keeper } @@ -164,8 +166,8 @@ func CreateTestInput(t *testing.T) TestInput { } paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, keyParams, tKeyParams) - accountKeeper := authkeeper.NewAccountKeeper(appCodec, keyAcc, paramsKeeper.Subspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix()) - bankKeeper := bankkeeper.NewBaseKeeper(appCodec, keyBank, accountKeeper, paramsKeeper.Subspace(banktypes.ModuleName), blackListAddrs) + accountKeeper := authkeeper.NewAccountKeeper(appCodec, keyAcc, authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), authtypes.NewModuleAddress(govtypes.ModuleName).String()) + bankKeeper := bankkeeper.NewBaseKeeper(appCodec, keyBank, accountKeeper, blackListAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String()) totalSupply := sdk.NewCoins(sdk.NewCoin(core.MicroLunaDenom, InitTokens.MulRaw(int64(len(Addrs)*10)))) bankKeeper.MintCoins(ctx, faucetAccountName, totalSupply) @@ -175,7 +177,7 @@ func CreateTestInput(t *testing.T) TestInput { keyStaking, accountKeeper, bankKeeper, - paramsKeeper.Subspace(stakingtypes.ModuleName), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) stakingParams := stakingtypes.DefaultParams() @@ -183,10 +185,11 @@ func CreateTestInput(t *testing.T) TestInput { stakingKeeper.SetParams(ctx, stakingParams) distrKeeper := distrkeeper.NewKeeper( - appCodec, - keyDistr, paramsKeeper.Subspace(distrtypes.ModuleName), + appCodec, keyDistr, accountKeeper, bankKeeper, stakingKeeper, - authtypes.FeeCollectorName) + authtypes.FeeCollectorName, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + ) distrKeeper.SetFeePool(ctx, distrtypes.InitialFeePool()) distrParams := distrtypes.DefaultParams() @@ -238,7 +241,7 @@ func CreateTestInput(t *testing.T) TestInput { } // NewTestMsgCreateValidator test msg creator -func NewTestMsgCreateValidator(address sdk.ValAddress, pubKey cryptotypes.PubKey, amt sdk.Int) *stakingtypes.MsgCreateValidator { +func NewTestMsgCreateValidator(address sdk.ValAddress, pubKey cryptotypes.PubKey, amt math.Int) *stakingtypes.MsgCreateValidator { commission := stakingtypes.NewCommissionRates(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()) msg, _ := stakingtypes.NewMsgCreateValidator( address, pubKey, sdk.NewCoin(core.MicroLunaDenom, amt), diff --git a/x/oracle/module.go b/x/oracle/module.go index 5cd6eb800..711fd194d 100644 --- a/x/oracle/module.go +++ b/x/oracle/module.go @@ -9,7 +9,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -18,10 +18,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/classic-terra/core/v2/x/oracle/client/cli" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/simulation" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/client/cli" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/simulation" + "github.com/classic-terra/core/v3/x/oracle/types" ) var ( @@ -112,19 +112,9 @@ func (AppModule) Name() string { return types.ModuleName } // RegisterInvariants performs a no-op. func (AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} -// Route returns the message routing key for the oracle module. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - // QuerierRoute returns the oracle module's querier route name. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the oracle module sdk.Querier. -func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return keeper.NewLegacyQuerier(am.keeper, legacyQuerierCdc) -} - // RegisterServices registers module services. func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) @@ -177,7 +167,7 @@ func (am AppModule) ProposalContents(_ module.SimulationState) []simtypes.Weight } // RandomizedParams creates randomized oracle param changes for the simulator. -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return simulation.ParamChanges(r) } diff --git a/x/oracle/simulation/decoder.go b/x/oracle/simulation/decoder.go index eb57a8cf5..55592f03d 100644 --- a/x/oracle/simulation/decoder.go +++ b/x/oracle/simulation/decoder.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/oracle/simulation/decoder_test.go b/x/oracle/simulation/decoder_test.go index 29e63561a..7747d497e 100644 --- a/x/oracle/simulation/decoder_test.go +++ b/x/oracle/simulation/decoder_test.go @@ -7,15 +7,15 @@ import ( gogotypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto/ed25519" + "github.com/cometbft/cometbft/crypto/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/keeper" - sim "github.com/classic-terra/core/v2/x/oracle/simulation" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/keeper" + sim "github.com/classic-terra/core/v3/x/oracle/simulation" + "github.com/classic-terra/core/v3/x/oracle/types" ) var ( diff --git a/x/oracle/simulation/genesis.go b/x/oracle/simulation/genesis.go index c07b3ea5f..6ed2be1a5 100644 --- a/x/oracle/simulation/genesis.go +++ b/x/oracle/simulation/genesis.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) // Simulation parameter constants diff --git a/x/oracle/simulation/operations.go b/x/oracle/simulation/operations.go index 96f589cf8..c24e4b119 100644 --- a/x/oracle/simulation/operations.go +++ b/x/oracle/simulation/operations.go @@ -6,17 +6,19 @@ import ( "math/rand" "strings" + simappparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/simapp/helpers" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + banksim "github.com/cosmos/cosmos-sdk/x/bank/simulation" + distrsim "github.com/cosmos/cosmos-sdk/x/distribution/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/types" ) // Simulation operation weights constants @@ -48,19 +50,19 @@ func WeightedOperations( ) appParams.GetOrGenerate(cdc, OpWeightMsgAggregateExchangeRatePrevote, &weightMsgAggregateExchangeRatePrevote, nil, func(*rand.Rand) { - weightMsgAggregateExchangeRatePrevote = simappparams.DefaultWeightMsgSend * 2 + weightMsgAggregateExchangeRatePrevote = banksim.DefaultWeightMsgSend * 2 }, ) appParams.GetOrGenerate(cdc, OpWeightMsgAggregateExchangeRateVote, &weightMsgAggregateExchangeRateVote, nil, func(*rand.Rand) { - weightMsgAggregateExchangeRateVote = simappparams.DefaultWeightMsgSend * 2 + weightMsgAggregateExchangeRateVote = banksim.DefaultWeightMsgSend * 2 }, ) appParams.GetOrGenerate(cdc, OpWeightMsgDelegateFeedConsent, &weightMsgDelegateFeedConsent, nil, func(*rand.Rand) { - weightMsgDelegateFeedConsent = simappparams.DefaultWeightMsgSetWithdrawAddress + weightMsgDelegateFeedConsent = distrsim.DefaultWeightMsgSetWithdrawAddress }, ) @@ -118,12 +120,12 @@ func SimulateMsgAggregateExchangeRatePrevote(ak types.AccountKeeper, bk types.Ba msg := types.NewMsgAggregateExchangeRatePrevote(voteHash, feederAddr, address) txGen := simappparams.MakeTestEncodingConfig().TxConfig - tx, err := helpers.GenSignedMockTx( + tx, err := simtestutil.GenSignedMockTx( r, txGen, []sdk.Msg{msg}, fees, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, chainID, []uint64{feederAccount.GetAccountNumber()}, []uint64{feederAccount.GetSequence()}, @@ -189,12 +191,12 @@ func SimulateMsgAggregateExchangeRateVote(ak types.AccountKeeper, bk types.BankK msg := types.NewMsgAggregateExchangeRateVote(salt, exchangeRatesStr, feederAddr, address) txGen := simappparams.MakeTestEncodingConfig().TxConfig - tx, err := helpers.GenSignedMockTx( + tx, err := simtestutil.GenSignedMockTx( r, txGen, []sdk.Msg{msg}, fees, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, chainID, []uint64{feederAccount.GetAccountNumber()}, []uint64{feederAccount.GetSequence()}, @@ -246,12 +248,12 @@ func SimulateMsgDelegateFeedConsent(ak types.AccountKeeper, bk types.BankKeeper, msg := types.NewMsgDelegateFeedConsent(valAddress, delegateAccount.Address) txGen := simappparams.MakeTestEncodingConfig().TxConfig - tx, err := helpers.GenSignedMockTx( + tx, err := simtestutil.GenSignedMockTx( r, txGen, []sdk.Msg{msg}, fees, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, chainID, []uint64{account.GetAccountNumber()}, []uint64{account.GetSequence()}, diff --git a/x/oracle/simulation/params.go b/x/oracle/simulation/params.go index b7a0f884e..6fc23bed3 100644 --- a/x/oracle/simulation/params.go +++ b/x/oracle/simulation/params.go @@ -9,39 +9,39 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(*rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{ - simulation.NewSimParamChange(types.ModuleName, string(types.KeyVotePeriod), +func ParamChanges(*rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyVotePeriod), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenVotePeriod(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyVoteThreshold), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyVoteThreshold), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenVoteThreshold(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyRewardBand), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyRewardBand), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenRewardBand(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyRewardDistributionWindow), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyRewardDistributionWindow), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenRewardDistributionWindow(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeySlashFraction), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeySlashFraction), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenSlashFraction(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeySlashWindow), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeySlashWindow), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenSlashWindow(r)) }, diff --git a/x/oracle/tally.go b/x/oracle/tally.go index f4ef8f3b0..aa7261f9d 100644 --- a/x/oracle/tally.go +++ b/x/oracle/tally.go @@ -1,10 +1,11 @@ package oracle import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/oracle/keeper" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/keeper" + "github.com/classic-terra/core/v3/x/oracle/types" ) // Tally calculates the median and returns it. Sets the set of voters to be rewarded, i.e. voted within @@ -37,7 +38,7 @@ func Tally(pb types.ExchangeRateBallot, rewardBand sdk.Dec, validatorClaimMap ma } // ballot for the asset is passing the threshold amount of voting power -func ballotIsPassing(ballot types.ExchangeRateBallot, thresholdVotes sdk.Int) (sdk.Int, bool) { +func ballotIsPassing(ballot types.ExchangeRateBallot, thresholdVotes math.Int) (math.Int, bool) { ballotPower := sdk.NewInt(ballot.Power()) return ballotPower, !ballotPower.IsZero() && ballotPower.GTE(thresholdVotes) } diff --git a/x/oracle/tally_fuzz_test.go b/x/oracle/tally_fuzz_test.go index d3c67cdaa..6ea4a3cf0 100644 --- a/x/oracle/tally_fuzz_test.go +++ b/x/oracle/tally_fuzz_test.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/v2/x/oracle" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle" + "github.com/classic-terra/core/v3/x/oracle/types" ) func TestFuzz_Tally(t *testing.T) { diff --git a/x/oracle/types/ballot_test.go b/x/oracle/types/ballot_test.go index 362bc6247..69633ccaa 100644 --- a/x/oracle/types/ballot_test.go +++ b/x/oracle/types/ballot_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto/secp256k1" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/cometbft/cometbft/crypto/secp256k1" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" ) func TestToMap(t *testing.T) { diff --git a/x/oracle/types/denom_test.go b/x/oracle/types/denom_test.go index 0b8002b06..b2966b06e 100644 --- a/x/oracle/types/denom_test.go +++ b/x/oracle/types/denom_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/oracle/types/errors.go b/x/oracle/types/errors.go index c795cbb57..91bc7898d 100644 --- a/x/oracle/types/errors.go +++ b/x/oracle/types/errors.go @@ -3,24 +3,24 @@ package types import ( "fmt" - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/cometbft/cometbft/crypto/tmhash" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + errorsmod "cosmossdk.io/errors" ) // Oracle Errors var ( - ErrInvalidExchangeRate = sdkerrors.Register(ModuleName, 2, "invalid exchange rate") - ErrNoPrevote = sdkerrors.Register(ModuleName, 3, "no prevote") - ErrNoVote = sdkerrors.Register(ModuleName, 4, "no vote") - ErrNoVotingPermission = sdkerrors.Register(ModuleName, 5, "unauthorized voter") - ErrInvalidHash = sdkerrors.Register(ModuleName, 6, "invalid hash") - ErrInvalidHashLength = sdkerrors.Register(ModuleName, 7, fmt.Sprintf("invalid hash length; should equal %d", tmhash.TruncatedSize)) - ErrVerificationFailed = sdkerrors.Register(ModuleName, 8, "hash verification failed") - ErrRevealPeriodMissMatch = sdkerrors.Register(ModuleName, 9, "reveal period of submitted vote do not match with registered prevote") - ErrInvalidSaltLength = sdkerrors.Register(ModuleName, 10, "invalid salt length; should be 1~4") - ErrNoAggregatePrevote = sdkerrors.Register(ModuleName, 11, "no aggregate prevote") - ErrNoAggregateVote = sdkerrors.Register(ModuleName, 12, "no aggregate vote") - ErrNoTobinTax = sdkerrors.Register(ModuleName, 13, "no tobin tax") - ErrUnknownDenom = sdkerrors.Register(ModuleName, 14, "unknown denom") + ErrInvalidExchangeRate = errorsmod.Register(ModuleName, 2, "invalid exchange rate") + ErrNoPrevote = errorsmod.Register(ModuleName, 3, "no prevote") + ErrNoVote = errorsmod.Register(ModuleName, 4, "no vote") + ErrNoVotingPermission = errorsmod.Register(ModuleName, 5, "unauthorized voter") + ErrInvalidHash = errorsmod.Register(ModuleName, 6, "invalid hash") + ErrInvalidHashLength = errorsmod.Register(ModuleName, 7, fmt.Sprintf("invalid hash length; should equal %d", tmhash.TruncatedSize)) + ErrVerificationFailed = errorsmod.Register(ModuleName, 8, "hash verification failed") + ErrRevealPeriodMissMatch = errorsmod.Register(ModuleName, 9, "reveal period of submitted vote do not match with registered prevote") + ErrInvalidSaltLength = errorsmod.Register(ModuleName, 10, "invalid salt length; should be 1~4") + ErrNoAggregatePrevote = errorsmod.Register(ModuleName, 11, "no aggregate prevote") + ErrNoAggregateVote = errorsmod.Register(ModuleName, 12, "no aggregate vote") + ErrNoTobinTax = errorsmod.Register(ModuleName, 13, "no tobin tax") + ErrUnknownDenom = errorsmod.Register(ModuleName, 14, "unknown denom") ) diff --git a/x/oracle/types/expected_keeper.go b/x/oracle/types/expected_keeper.go index 79d1ab253..838ecfcf8 100644 --- a/x/oracle/types/expected_keeper.go +++ b/x/oracle/types/expected_keeper.go @@ -1,6 +1,7 @@ package types import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -10,13 +11,13 @@ import ( // StakingKeeper is expected keeper for staking module type StakingKeeper interface { Validator(ctx sdk.Context, address sdk.ValAddress) stakingtypes.ValidatorI // get validator by operator address; nil when validator not found - TotalBondedTokens(sdk.Context) sdk.Int // total bonded tokens within the validator set + TotalBondedTokens(sdk.Context) math.Int // total bonded tokens within the validator set // slash the validator and delegators of the validator, specifying offence height, offence power, and slash fraction - Slash(sdk.Context, sdk.ConsAddress, int64, int64, sdk.Dec) sdk.Int + Slash(sdk.Context, sdk.ConsAddress, int64, int64, sdk.Dec) math.Int Jail(sdk.Context, sdk.ConsAddress) // jail a validator ValidatorsPowerStoreIterator(ctx sdk.Context) sdk.Iterator // an iterator for the current validator power store MaxValidators(sdk.Context) uint32 // MaxValidators returns the maximum amount of bonded validators - PowerReduction(ctx sdk.Context) (res sdk.Int) + PowerReduction(ctx sdk.Context) (res math.Int) } // DistributionKeeper is expected keeper for distribution module diff --git a/x/oracle/types/genesis.pb.go b/x/oracle/types/genesis.pb.go index 0ef529aee..c5aa1a1e3 100644 --- a/x/oracle/types/genesis.pb.go +++ b/x/oracle/types/genesis.pb.go @@ -5,21 +5,19 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -44,11 +42,9 @@ func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { return fileDescriptor_7ff46fd82c752f1f, []int{0} } - func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) @@ -61,15 +57,12 @@ func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } - func (m *GenesisState) XXX_Merge(src proto.Message) { xxx_messageInfo_GenesisState.Merge(m, src) } - func (m *GenesisState) XXX_Size() int { return m.Size() } - func (m *GenesisState) XXX_DiscardUnknown() { xxx_messageInfo_GenesisState.DiscardUnknown(m) } @@ -139,11 +132,9 @@ func (*FeederDelegation) ProtoMessage() {} func (*FeederDelegation) Descriptor() ([]byte, []int) { return fileDescriptor_7ff46fd82c752f1f, []int{1} } - func (m *FeederDelegation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *FeederDelegation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_FeederDelegation.Marshal(b, m, deterministic) @@ -156,15 +147,12 @@ func (m *FeederDelegation) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } - func (m *FeederDelegation) XXX_Merge(src proto.Message) { xxx_messageInfo_FeederDelegation.Merge(m, src) } - func (m *FeederDelegation) XXX_Size() int { return m.Size() } - func (m *FeederDelegation) XXX_DiscardUnknown() { xxx_messageInfo_FeederDelegation.DiscardUnknown(m) } @@ -198,11 +186,9 @@ func (*MissCounter) ProtoMessage() {} func (*MissCounter) Descriptor() ([]byte, []int) { return fileDescriptor_7ff46fd82c752f1f, []int{2} } - func (m *MissCounter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MissCounter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MissCounter.Marshal(b, m, deterministic) @@ -215,15 +201,12 @@ func (m *MissCounter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } - func (m *MissCounter) XXX_Merge(src proto.Message) { xxx_messageInfo_MissCounter.Merge(m, src) } - func (m *MissCounter) XXX_Size() int { return m.Size() } - func (m *MissCounter) XXX_DiscardUnknown() { xxx_messageInfo_MissCounter.DiscardUnknown(m) } @@ -257,11 +240,9 @@ func (*TobinTax) ProtoMessage() {} func (*TobinTax) Descriptor() ([]byte, []int) { return fileDescriptor_7ff46fd82c752f1f, []int{3} } - func (m *TobinTax) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *TobinTax) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_TobinTax.Marshal(b, m, deterministic) @@ -274,15 +255,12 @@ func (m *TobinTax) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *TobinTax) XXX_Merge(src proto.Message) { xxx_messageInfo_TobinTax.Merge(m, src) } - func (m *TobinTax) XXX_Size() int { return m.Size() } - func (m *TobinTax) XXX_DiscardUnknown() { xxx_messageInfo_TobinTax.DiscardUnknown(m) } @@ -308,42 +286,45 @@ func init() { } var fileDescriptor_7ff46fd82c752f1f = []byte{ - // 559 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcf, 0x6e, 0xd3, 0x4e, - 0x10, 0xc7, 0xe3, 0xfe, 0xfb, 0xb5, 0x9b, 0xb6, 0x6a, 0x57, 0x39, 0x44, 0xd1, 0xaf, 0xce, 0x1f, - 0x89, 0x52, 0x09, 0xd5, 0x56, 0xc3, 0x8d, 0x5b, 0x43, 0x0b, 0x42, 0x80, 0x54, 0x99, 0x88, 0x03, - 0x08, 0x59, 0x1b, 0x7b, 0xe2, 0x1a, 0x62, 0x6f, 0xb4, 0xb3, 0x89, 0xc2, 0x91, 0x37, 0xe0, 0x29, - 0x38, 0xf0, 0x24, 0x3d, 0xf6, 0x88, 0x38, 0x14, 0x94, 0xbc, 0x08, 0xf2, 0xee, 0x26, 0x31, 0xc5, - 0x45, 0xe2, 0x94, 0xec, 0xec, 0x67, 0xbe, 0xdf, 0x99, 0xf5, 0x68, 0x48, 0x4b, 0x82, 0x10, 0xcc, - 0xe5, 0x82, 0x05, 0x03, 0x70, 0xc7, 0x27, 0x3d, 0x90, 0xec, 0xc4, 0x8d, 0x20, 0x05, 0x8c, 0xd1, - 0x19, 0x0a, 0x2e, 0x39, 0xad, 0x28, 0xc6, 0xd1, 0x8c, 0x63, 0x98, 0x5a, 0x25, 0xe2, 0x11, 0x57, - 0x80, 0x9b, 0xfd, 0xd3, 0x6c, 0xad, 0x59, 0xa8, 0x67, 0x52, 0x15, 0xd2, 0xfa, 0xb2, 0x4e, 0xb6, - 0x9f, 0x6a, 0x83, 0x57, 0x92, 0x49, 0xa0, 0x8f, 0xc8, 0xc6, 0x90, 0x09, 0x96, 0x60, 0xd5, 0x6a, - 0x58, 0x47, 0xe5, 0xf6, 0xff, 0x4e, 0x91, 0xa1, 0x73, 0xa1, 0x98, 0xce, 0xda, 0xd5, 0x4d, 0xbd, - 0xe4, 0x99, 0x0c, 0xfa, 0x96, 0xd0, 0x3e, 0x40, 0x08, 0xc2, 0x0f, 0x61, 0x00, 0x11, 0x93, 0x31, - 0x4f, 0xb1, 0xba, 0xd2, 0x58, 0x3d, 0x2a, 0xb7, 0x0f, 0x8b, 0x75, 0x9e, 0x28, 0xfe, 0x6c, 0x81, - 0x1b, 0xc5, 0xfd, 0xfe, 0xad, 0x38, 0xd2, 0xf7, 0x64, 0x17, 0x26, 0xc1, 0x25, 0x4b, 0x23, 0xf0, - 0x05, 0x93, 0x80, 0xd5, 0x55, 0x25, 0x7c, 0xbf, 0x58, 0xf8, 0xdc, 0xb0, 0x1e, 0x93, 0xd0, 0x1d, - 0x0d, 0x07, 0xd0, 0xa9, 0x65, 0xca, 0x5f, 0x7f, 0xd4, 0xe9, 0x1f, 0x57, 0xe8, 0xed, 0x40, 0x2e, - 0x86, 0xf4, 0x05, 0xd9, 0x49, 0x62, 0x44, 0x3f, 0xe0, 0xa3, 0x54, 0x82, 0xc0, 0xea, 0x9a, 0xb2, - 0x6a, 0x16, 0x5b, 0xbd, 0x8c, 0x11, 0x1f, 0x6b, 0xd2, 0x94, 0xbf, 0x9d, 0x2c, 0x43, 0x48, 0x3f, - 0x59, 0xa4, 0xc1, 0xa2, 0x48, 0x64, 0xad, 0x80, 0xff, 0x5b, 0x13, 0xfe, 0x50, 0xc0, 0x98, 0x67, - 0xcd, 0xac, 0x2b, 0x87, 0x76, 0xb1, 0xc3, 0xe9, 0x3c, 0x3b, 0x5f, 0xfa, 0x85, 0x4e, 0x35, 0x96, - 0x07, 0xec, 0x2f, 0x0c, 0xd2, 0x09, 0x39, 0xb8, 0xab, 0x04, 0xed, 0xbf, 0xa1, 0xfc, 0xdd, 0x7f, - 0xf0, 0x7f, 0xbd, 0x34, 0xaf, 0xb1, 0xbb, 0x00, 0xa4, 0xe7, 0xa4, 0x2c, 0x79, 0x2f, 0x4e, 0x7d, - 0xc9, 0x26, 0x80, 0xd5, 0xff, 0x94, 0x8f, 0x5d, 0xec, 0xd3, 0xcd, 0xc0, 0x2e, 0x9b, 0x18, 0x59, - 0x22, 0xcd, 0x19, 0xb0, 0xd5, 0x27, 0x7b, 0xb7, 0x67, 0x85, 0xde, 0x23, 0xbb, 0x66, 0xde, 0x58, - 0x18, 0x0a, 0x40, 0x3d, 0xb3, 0x5b, 0xde, 0x8e, 0x8e, 0x9e, 0xea, 0x20, 0x7d, 0x40, 0xf6, 0xc7, - 0x6c, 0x10, 0x87, 0x4c, 0xf2, 0x25, 0xb9, 0xa2, 0xc8, 0xbd, 0xc5, 0x85, 0x81, 0x5b, 0xef, 0x48, - 0x39, 0xf7, 0x3d, 0x8b, 0x73, 0xad, 0xe2, 0x5c, 0xda, 0x24, 0xdb, 0xf9, 0xb1, 0x51, 0x1e, 0x6b, - 0x5e, 0x39, 0x37, 0x0c, 0xad, 0x84, 0x6c, 0xce, 0x9b, 0xa4, 0x15, 0xb2, 0x1e, 0x42, 0xca, 0x13, - 0xa3, 0xa7, 0x0f, 0xf4, 0x39, 0xd9, 0x5a, 0xbc, 0x97, 0xae, 0xb2, 0xe3, 0x64, 0xaf, 0xf1, 0xfd, - 0xa6, 0x7e, 0x18, 0xc5, 0xf2, 0x72, 0xd4, 0x73, 0x02, 0x9e, 0xb8, 0x01, 0xc7, 0x84, 0xa3, 0xf9, - 0x39, 0xc6, 0xf0, 0x83, 0x2b, 0x3f, 0x0e, 0x01, 0x9d, 0x33, 0x08, 0xbc, 0xcd, 0xf9, 0xbb, 0x75, - 0x9e, 0x5d, 0x4d, 0x6d, 0xeb, 0x7a, 0x6a, 0x5b, 0x3f, 0xa7, 0xb6, 0xf5, 0x79, 0x66, 0x97, 0xae, - 0x67, 0x76, 0xe9, 0xdb, 0xcc, 0x2e, 0xbd, 0x71, 0xf3, 0x5a, 0x03, 0x86, 0x18, 0x07, 0xc7, 0x7a, - 0x5d, 0x04, 0x5c, 0x80, 0x3b, 0x6e, 0xbb, 0x93, 0xf9, 0xe2, 0x50, 0xc2, 0xbd, 0x0d, 0xb5, 0x30, - 0x1e, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x41, 0x32, 0xa6, 0xa5, 0x04, 0x00, 0x00, + // 597 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcf, 0x4f, 0x13, 0x41, + 0x14, 0xc7, 0xbb, 0xfc, 0x12, 0xa6, 0x40, 0x60, 0xd2, 0xc3, 0xda, 0xc8, 0x02, 0x3d, 0x20, 0x97, + 0xee, 0x06, 0xb8, 0x19, 0x13, 0x43, 0x05, 0x8d, 0x89, 0x26, 0x64, 0x21, 0x26, 0xea, 0x61, 0x33, + 0xdd, 0x7d, 0x2c, 0xab, 0xdd, 0x9d, 0x66, 0xde, 0x50, 0x6b, 0x3c, 0xf9, 0x1f, 0x78, 0xf6, 0x0f, + 0xf0, 0xe0, 0x99, 0x3f, 0x82, 0x23, 0xe1, 0x64, 0x3c, 0xa0, 0x81, 0x7f, 0xc4, 0xec, 0xcc, 0xb4, + 0x5d, 0x71, 0xd1, 0x70, 0x6a, 0xe7, 0xcd, 0xf7, 0x7d, 0x3f, 0xef, 0x4d, 0x5f, 0x1f, 0x69, 0x48, + 0x10, 0x82, 0x79, 0x5c, 0xb0, 0xb0, 0x03, 0x5e, 0x6f, 0xa3, 0x0d, 0x92, 0x6d, 0x78, 0x31, 0x64, + 0x80, 0x09, 0xba, 0x5d, 0xc1, 0x25, 0xa7, 0x35, 0xa5, 0x71, 0xb5, 0xc6, 0x35, 0x9a, 0xfa, 0xdd, + 0x90, 0x63, 0xca, 0x31, 0x50, 0x1a, 0x4f, 0x1f, 0x74, 0x42, 0xbd, 0x16, 0xf3, 0x98, 0xeb, 0x78, + 0xfe, 0xcd, 0x44, 0x57, 0x4b, 0x51, 0xc6, 0x55, 0x49, 0x1a, 0x5f, 0x27, 0xc9, 0xec, 0x53, 0xcd, + 0xde, 0x97, 0x4c, 0x02, 0x7d, 0x40, 0xa6, 0xba, 0x4c, 0xb0, 0x14, 0x6d, 0x6b, 0xc5, 0x5a, 0xaf, + 0x6e, 0xde, 0x73, 0xcb, 0x6a, 0x71, 0xf7, 0x94, 0xa6, 0x35, 0x71, 0x7a, 0xb1, 0x5c, 0xf1, 0x4d, + 0x06, 0x7d, 0x43, 0xe8, 0x21, 0x40, 0x04, 0x22, 0x88, 0xa0, 0x03, 0x31, 0x93, 0x09, 0xcf, 0xd0, + 0x1e, 0x5b, 0x19, 0x5f, 0xaf, 0x6e, 0xae, 0x95, 0xfb, 0x3c, 0x51, 0xfa, 0x9d, 0xa1, 0xdc, 0x38, + 0x2e, 0x1e, 0x5e, 0x8b, 0x23, 0x7d, 0x4b, 0xe6, 0xa1, 0x1f, 0x1e, 0xb1, 0x2c, 0x86, 0x40, 0x30, + 0x09, 0x68, 0x8f, 0x2b, 0xe3, 0xfb, 0xe5, 0xc6, 0xbb, 0x46, 0xeb, 0x33, 0x09, 0x07, 0xc7, 0xdd, + 0x0e, 0xb4, 0xea, 0xb9, 0xf3, 0xb7, 0x9f, 0xcb, 0xf4, 0xaf, 0x2b, 0xf4, 0xe7, 0xa0, 0x10, 0x43, + 0xfa, 0x9c, 0xcc, 0xa5, 0x09, 0x62, 0x10, 0xf2, 0xe3, 0x4c, 0x82, 0x40, 0x7b, 0x42, 0xa1, 0x56, + 0xcb, 0x51, 0x2f, 0x12, 0xc4, 0xc7, 0x5a, 0x69, 0xca, 0x9f, 0x4d, 0x47, 0x21, 0xa4, 0x9f, 0x2c, + 0xb2, 0xc2, 0xe2, 0x58, 0xe4, 0xad, 0x40, 0xf0, 0x47, 0x13, 0x41, 0x57, 0x40, 0x8f, 0xe7, 0xcd, + 0x4c, 0x2a, 0xc2, 0x66, 0x39, 0x61, 0x7b, 0x90, 0x5d, 0x2c, 0x7d, 0x4f, 0xa7, 0x1a, 0xe4, 0x12, + 0xfb, 0x87, 0x06, 0x69, 0x9f, 0x2c, 0xdd, 0x54, 0x82, 0xe6, 0x4f, 0x29, 0xbe, 0x77, 0x0b, 0xfe, + 0xcb, 0x11, 0xbc, 0xce, 0x6e, 0x12, 0x20, 0xdd, 0x25, 0x55, 0xc9, 0xdb, 0x49, 0x16, 0x48, 0xd6, + 0x07, 0xb4, 0xef, 0x28, 0x8e, 0x53, 0xce, 0x39, 0xc8, 0x85, 0x07, 0xac, 0x6f, 0x6c, 0x89, 0x34, + 0x67, 0xc0, 0xc6, 0x17, 0x8b, 0x2c, 0x5c, 0x1f, 0x16, 0xfa, 0x88, 0xcc, 0x9b, 0x81, 0x63, 0x51, + 0x24, 0x00, 0xf5, 0xd0, 0xce, 0xb4, 0xec, 0xf3, 0x93, 0x66, 0xcd, 0xfc, 0x41, 0xb6, 0xf5, 0xcd, + 0xbe, 0x14, 0x49, 0x16, 0xfb, 0x73, 0x5a, 0x6f, 0x82, 0x74, 0x97, 0x2c, 0xf6, 0x58, 0x27, 0x89, + 0x98, 0xe4, 0x23, 0x8f, 0xb1, 0xff, 0x78, 0x2c, 0x0c, 0x53, 0x4c, 0xbc, 0xf1, 0x9e, 0x54, 0x0b, + 0x43, 0x50, 0xee, 0x6a, 0xdd, 0xd6, 0x95, 0xae, 0x92, 0xd9, 0xe2, 0x14, 0xaa, 0xba, 0x26, 0xfc, + 0x6a, 0x61, 0xb6, 0x1a, 0x1f, 0xc9, 0xf4, 0xe0, 0xcd, 0x68, 0x8d, 0x4c, 0x46, 0x90, 0xf1, 0x54, + 0x93, 0x7c, 0x7d, 0xa0, 0xaf, 0xc8, 0xcc, 0xf0, 0xf9, 0x4d, 0x67, 0x0f, 0xf3, 0xc7, 0xfd, 0x71, + 0xb1, 0xbc, 0x16, 0x27, 0xf2, 0xe8, 0xb8, 0xed, 0x86, 0x3c, 0x35, 0xdb, 0xc4, 0x7c, 0x34, 0x31, + 0x7a, 0xe7, 0xc9, 0x0f, 0x5d, 0x40, 0x77, 0x07, 0xc2, 0xf3, 0x93, 0x26, 0x31, 0x15, 0xef, 0x40, + 0xe8, 0x4f, 0x0f, 0x7e, 0x94, 0xd6, 0xb3, 0xd3, 0x4b, 0xc7, 0x3a, 0xbb, 0x74, 0xac, 0x5f, 0x97, + 0x8e, 0xf5, 0xf9, 0xca, 0xa9, 0x9c, 0x5d, 0x39, 0x95, 0xef, 0x57, 0x4e, 0xe5, 0xb5, 0x57, 0x74, + 0xee, 0x30, 0xc4, 0x24, 0x6c, 0xea, 0x5d, 0x14, 0x72, 0x01, 0x5e, 0x6f, 0xcb, 0xeb, 0x0f, 0xb6, + 0x92, 0xc2, 0xb4, 0xa7, 0xd4, 0x36, 0xda, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x57, 0x1a, + 0x2c, 0x1d, 0x05, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -586,7 +567,6 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *GenesisState) Size() (n int) { if m == nil { return 0 @@ -685,11 +665,9 @@ func (m *TobinTax) Size() (n int) { func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozGenesis(x uint64) (n int) { return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *GenesisState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -977,7 +955,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } - func (m *FeederDelegation) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1092,7 +1069,6 @@ func (m *FeederDelegation) Unmarshal(dAtA []byte) error { } return nil } - func (m *MissCounter) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1194,7 +1170,6 @@ func (m *MissCounter) Unmarshal(dAtA []byte) error { } return nil } - func (m *TobinTax) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1311,7 +1286,6 @@ func (m *TobinTax) Unmarshal(dAtA []byte) error { } return nil } - func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/oracle/types/genesis_test.go b/x/oracle/types/genesis_test.go index 095f23334..c4f6d430d 100644 --- a/x/oracle/types/genesis_test.go +++ b/x/oracle/types/genesis_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "github.com/classic-terra/core/v2/app" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/app" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/stretchr/testify/require" ) diff --git a/x/oracle/types/hash.go b/x/oracle/types/hash.go index ce5fc8cdc..a740d8a56 100644 --- a/x/oracle/types/hash.go +++ b/x/oracle/types/hash.go @@ -8,7 +8,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/cometbft/cometbft/crypto/tmhash" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/types/hash_test.go b/x/oracle/types/hash_test.go index 300737a35..a84039a17 100644 --- a/x/oracle/types/hash_test.go +++ b/x/oracle/types/hash_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/types/msgs.go b/x/oracle/types/msgs.go index c0b5dcdeb..8c7cfa6af 100644 --- a/x/oracle/types/msgs.go +++ b/x/oracle/types/msgs.go @@ -1,8 +1,9 @@ package types import ( - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/cometbft/cometbft/crypto/tmhash" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) @@ -58,7 +59,7 @@ func (msg MsgAggregateExchangeRatePrevote) GetSigners() []sdk.AccAddress { func (msg MsgAggregateExchangeRatePrevote) ValidateBasic() error { _, err := AggregateVoteHashFromHexString(msg.Hash) if err != nil { - return sdkerrors.Wrapf(ErrInvalidHash, "Invalid vote hash (%s)", err) + return errorsmod.Wrapf(ErrInvalidHash, "Invalid vote hash (%s)", err) } // HEX encoding doubles the hash length @@ -68,12 +69,12 @@ func (msg MsgAggregateExchangeRatePrevote) ValidateBasic() error { _, err = sdk.AccAddressFromBech32(msg.Feeder) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid feeder address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid feeder address (%s)", err) } _, err = sdk.ValAddressFromBech32(msg.Validator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid operator address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid operator address (%s)", err) } return nil @@ -114,34 +115,34 @@ func (msg MsgAggregateExchangeRateVote) GetSigners() []sdk.AccAddress { func (msg MsgAggregateExchangeRateVote) ValidateBasic() error { _, err := sdk.AccAddressFromBech32(msg.Feeder) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid feeder address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid feeder address (%s)", err) } _, err = sdk.ValAddressFromBech32(msg.Validator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid operator address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid operator address (%s)", err) } if l := len(msg.ExchangeRates); l == 0 { - return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "must provide at least one oracle exchange rate") + return errorsmod.Wrap(sdkerrors.ErrUnknownRequest, "must provide at least one oracle exchange rate") } else if l > 4096 { - return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "exchange rates string can not exceed 4096 characters") + return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "exchange rates string can not exceed 4096 characters") } exchangeRates, err := ParseExchangeRateTuples(msg.ExchangeRates) if err != nil { - return sdkerrors.Wrap(sdkerrors.ErrInvalidCoins, "failed to parse exchange rates string cause: "+err.Error()) + return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, "failed to parse exchange rates string cause: "+err.Error()) } for _, exchangeRate := range exchangeRates { // Check overflow bit length if exchangeRate.ExchangeRate.BigInt().BitLen() > 255+sdk.DecimalPrecisionBits { - return sdkerrors.Wrap(ErrInvalidExchangeRate, "overflow") + return errorsmod.Wrap(ErrInvalidExchangeRate, "overflow") } } if len(msg.Salt) > 4 || len(msg.Salt) < 1 { - return sdkerrors.Wrap(ErrInvalidSaltLength, "salt length must be [1, 4]") + return errorsmod.Wrap(ErrInvalidSaltLength, "salt length must be [1, 4]") } return nil @@ -180,12 +181,12 @@ func (msg MsgDelegateFeedConsent) GetSigners() []sdk.AccAddress { func (msg MsgDelegateFeedConsent) ValidateBasic() error { _, err := sdk.ValAddressFromBech32(msg.Operator) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid operator address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid operator address (%s)", err) } _, err = sdk.AccAddressFromBech32(msg.Delegate) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid delegate address (%s)", err) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid delegate address (%s)", err) } return nil diff --git a/x/oracle/types/msgs_test.go b/x/oracle/types/msgs_test.go index c982bc9f2..fe28132b2 100644 --- a/x/oracle/types/msgs_test.go +++ b/x/oracle/types/msgs_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/oracle/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/stretchr/testify/require" diff --git a/x/oracle/types/oracle.pb.go b/x/oracle/types/oracle.pb.go index 4b5e93919..463be7405 100644 --- a/x/oracle/types/oracle.pb.go +++ b/x/oracle/types/oracle.pb.go @@ -5,21 +5,19 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -44,11 +42,9 @@ func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { return fileDescriptor_2a008582d55f197f, []int{0} } - func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Params.Marshal(b, m, deterministic) @@ -61,15 +57,12 @@ func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Params) XXX_Merge(src proto.Message) { xxx_messageInfo_Params.Merge(m, src) } - func (m *Params) XXX_Size() int { return m.Size() } - func (m *Params) XXX_DiscardUnknown() { xxx_messageInfo_Params.DiscardUnknown(m) } @@ -115,11 +108,9 @@ func (*Denom) ProtoMessage() {} func (*Denom) Descriptor() ([]byte, []int) { return fileDescriptor_2a008582d55f197f, []int{1} } - func (m *Denom) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Denom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Denom.Marshal(b, m, deterministic) @@ -132,15 +123,12 @@ func (m *Denom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Denom) XXX_Merge(src proto.Message) { xxx_messageInfo_Denom.Merge(m, src) } - func (m *Denom) XXX_Size() int { return m.Size() } - func (m *Denom) XXX_DiscardUnknown() { xxx_messageInfo_Denom.DiscardUnknown(m) } @@ -161,11 +149,9 @@ func (*AggregateExchangeRatePrevote) ProtoMessage() {} func (*AggregateExchangeRatePrevote) Descriptor() ([]byte, []int) { return fileDescriptor_2a008582d55f197f, []int{2} } - func (m *AggregateExchangeRatePrevote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *AggregateExchangeRatePrevote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_AggregateExchangeRatePrevote.Marshal(b, m, deterministic) @@ -178,15 +164,12 @@ func (m *AggregateExchangeRatePrevote) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *AggregateExchangeRatePrevote) XXX_Merge(src proto.Message) { xxx_messageInfo_AggregateExchangeRatePrevote.Merge(m, src) } - func (m *AggregateExchangeRatePrevote) XXX_Size() int { return m.Size() } - func (m *AggregateExchangeRatePrevote) XXX_DiscardUnknown() { xxx_messageInfo_AggregateExchangeRatePrevote.DiscardUnknown(m) } @@ -205,11 +188,9 @@ func (*AggregateExchangeRateVote) ProtoMessage() {} func (*AggregateExchangeRateVote) Descriptor() ([]byte, []int) { return fileDescriptor_2a008582d55f197f, []int{3} } - func (m *AggregateExchangeRateVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *AggregateExchangeRateVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_AggregateExchangeRateVote.Marshal(b, m, deterministic) @@ -222,15 +203,12 @@ func (m *AggregateExchangeRateVote) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } - func (m *AggregateExchangeRateVote) XXX_Merge(src proto.Message) { xxx_messageInfo_AggregateExchangeRateVote.Merge(m, src) } - func (m *AggregateExchangeRateVote) XXX_Size() int { return m.Size() } - func (m *AggregateExchangeRateVote) XXX_DiscardUnknown() { xxx_messageInfo_AggregateExchangeRateVote.DiscardUnknown(m) } @@ -248,11 +226,9 @@ func (*ExchangeRateTuple) ProtoMessage() {} func (*ExchangeRateTuple) Descriptor() ([]byte, []int) { return fileDescriptor_2a008582d55f197f, []int{4} } - func (m *ExchangeRateTuple) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *ExchangeRateTuple) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_ExchangeRateTuple.Marshal(b, m, deterministic) @@ -265,15 +241,12 @@ func (m *ExchangeRateTuple) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } - func (m *ExchangeRateTuple) XXX_Merge(src proto.Message) { xxx_messageInfo_ExchangeRateTuple.Merge(m, src) } - func (m *ExchangeRateTuple) XXX_Size() int { return m.Size() } - func (m *ExchangeRateTuple) XXX_DiscardUnknown() { xxx_messageInfo_ExchangeRateTuple.DiscardUnknown(m) } @@ -291,55 +264,56 @@ func init() { func init() { proto.RegisterFile("terra/oracle/v1beta1/oracle.proto", fileDescriptor_2a008582d55f197f) } var fileDescriptor_2a008582d55f197f = []byte{ - // 757 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbf, 0x6f, 0xdb, 0x46, - 0x14, 0x16, 0x6b, 0x5b, 0xb5, 0x4e, 0x72, 0x6b, 0xb3, 0x6a, 0xcb, 0xda, 0x85, 0x68, 0x5f, 0x61, - 0xd7, 0x8b, 0x45, 0xd8, 0x1d, 0x8a, 0x6a, 0x2b, 0xa1, 0xba, 0x28, 0xd0, 0x02, 0x02, 0x61, 0xb8, - 0x40, 0x17, 0xf6, 0x48, 0x5e, 0x44, 0xc2, 0x24, 0x4f, 0xb8, 0x3b, 0xfd, 0xf0, 0x92, 0x39, 0x63, - 0x86, 0x04, 0x08, 0x90, 0xc5, 0x73, 0xf6, 0xe4, 0x6f, 0xf0, 0xe8, 0x31, 0xc8, 0xc0, 0x04, 0xf6, - 0xe2, 0x59, 0x7f, 0x41, 0x70, 0xc7, 0x93, 0x4d, 0x59, 0x1a, 0x22, 0x64, 0x12, 0xdf, 0xfb, 0x1e, - 0xbf, 0xef, 0xbb, 0xf7, 0xee, 0x89, 0x60, 0x87, 0x63, 0x4a, 0x91, 0x45, 0x28, 0xf2, 0x63, 0x6c, - 0x0d, 0x0e, 0x3d, 0xcc, 0xd1, 0xa1, 0x0a, 0x9b, 0x3d, 0x4a, 0x38, 0xd1, 0xeb, 0xb2, 0xa4, 0xa9, - 0x72, 0xaa, 0x64, 0xb3, 0xde, 0x25, 0x5d, 0x22, 0x0b, 0x2c, 0xf1, 0x94, 0xd7, 0xc2, 0xe7, 0x65, - 0x50, 0xee, 0x20, 0x8a, 0x12, 0xa6, 0xff, 0x0a, 0xaa, 0x03, 0xc2, 0xb1, 0xdb, 0xc3, 0x34, 0x22, - 0x81, 0xa1, 0x6d, 0x6b, 0xfb, 0xcb, 0xf6, 0x77, 0xe3, 0xcc, 0xd4, 0xcf, 0x51, 0x12, 0xb7, 0x60, - 0x01, 0x84, 0x0e, 0x10, 0x51, 0x47, 0x06, 0x7a, 0x0a, 0xbe, 0x92, 0x18, 0x0f, 0x29, 0x66, 0x21, - 0x89, 0x03, 0xe3, 0x8b, 0x6d, 0x6d, 0xbf, 0x62, 0xff, 0x79, 0x99, 0x99, 0xa5, 0x77, 0x99, 0xb9, - 0xd7, 0x8d, 0x78, 0xd8, 0xf7, 0x9a, 0x3e, 0x49, 0x2c, 0x9f, 0xb0, 0x84, 0x30, 0xf5, 0x73, 0xc0, - 0x82, 0x33, 0x8b, 0x9f, 0xf7, 0x30, 0x6b, 0xb6, 0xb1, 0x3f, 0xce, 0xcc, 0x6f, 0x0b, 0x4a, 0x77, - 0x6c, 0xd0, 0x59, 0x13, 0x89, 0x93, 0x49, 0xac, 0x63, 0x50, 0xa5, 0x78, 0x88, 0x68, 0xe0, 0x7a, - 0x28, 0x0d, 0x8c, 0x25, 0x29, 0xd6, 0x5e, 0x58, 0x4c, 0x1d, 0xab, 0x40, 0x05, 0x1d, 0x90, 0x47, - 0x36, 0x4a, 0x03, 0xdd, 0x07, 0x9b, 0x0a, 0x0b, 0x22, 0xc6, 0x69, 0xe4, 0xf5, 0x79, 0x44, 0x52, - 0x77, 0x18, 0xa5, 0x01, 0x19, 0x1a, 0xcb, 0xb2, 0x3d, 0xbb, 0xe3, 0xcc, 0xdc, 0x99, 0xe2, 0x99, - 0x53, 0x0b, 0x1d, 0x23, 0x07, 0xdb, 0x05, 0xec, 0x5f, 0x09, 0xe9, 0xff, 0x83, 0xca, 0x30, 0x8c, - 0x38, 0x8e, 0x23, 0xc6, 0x8d, 0x95, 0xed, 0xa5, 0xfd, 0xea, 0xd1, 0x56, 0x73, 0xde, 0xfc, 0x9a, - 0x6d, 0x9c, 0x92, 0xc4, 0xde, 0x15, 0xc7, 0x1c, 0x67, 0xe6, 0x7a, 0x2e, 0x7a, 0xf7, 0x2e, 0x7c, - 0xf5, 0xde, 0xac, 0xc8, 0x92, 0xbf, 0x23, 0xc6, 0x9d, 0x7b, 0x52, 0x31, 0x1d, 0x16, 0x23, 0x16, - 0xba, 0x8f, 0x28, 0xf2, 0x85, 0xb2, 0x51, 0xfe, 0xbc, 0xe9, 0x4c, 0xb3, 0x41, 0x67, 0x4d, 0x26, - 0x8e, 0x55, 0xac, 0xb7, 0x40, 0x2d, 0xaf, 0x50, 0x8d, 0xfa, 0x52, 0x36, 0xea, 0xfb, 0x71, 0x66, - 0x7e, 0x53, 0x7c, 0x7f, 0xd2, 0x9a, 0xaa, 0x0c, 0x55, 0x37, 0x1e, 0x83, 0x7a, 0x12, 0xa5, 0xee, - 0x00, 0xc5, 0x51, 0x20, 0xae, 0xda, 0x84, 0x63, 0x55, 0x3a, 0xfe, 0x67, 0x61, 0xc7, 0x5b, 0xb9, - 0xe2, 0x3c, 0x4e, 0xe8, 0x6c, 0x24, 0x51, 0x7a, 0x2a, 0xb2, 0x1d, 0x4c, 0x73, 0xfd, 0xd6, 0xea, - 0x8b, 0x0b, 0xb3, 0x74, 0x7b, 0x61, 0x6a, 0xf0, 0xa5, 0x06, 0x56, 0x64, 0x3b, 0xf5, 0x9f, 0xc0, - 0x72, 0x8a, 0x12, 0x2c, 0xf7, 0xa1, 0x62, 0x7f, 0x3d, 0xce, 0xcc, 0x6a, 0xce, 0x2a, 0xb2, 0xd0, - 0x91, 0xa0, 0xee, 0x82, 0x0a, 0x27, 0x5e, 0x94, 0xba, 0x1c, 0x8d, 0xd4, 0xed, 0xb7, 0x17, 0x76, - 0xab, 0x66, 0x7a, 0x47, 0x04, 0x9d, 0x55, 0xf9, 0x7c, 0x82, 0x46, 0xad, 0xda, 0x93, 0x0b, 0xb3, - 0xa4, 0xdc, 0x95, 0xe0, 0x6b, 0x0d, 0xfc, 0xf8, 0x7b, 0xb7, 0x4b, 0x71, 0x17, 0x71, 0xfc, 0xc7, - 0xc8, 0x0f, 0x51, 0xda, 0xc5, 0x0e, 0xe2, 0xb8, 0x43, 0xb1, 0xd8, 0x15, 0x61, 0x3a, 0x44, 0x2c, - 0x9c, 0x35, 0x2d, 0xb2, 0xd0, 0x91, 0xa0, 0xbe, 0x07, 0x56, 0x44, 0x31, 0x55, 0x86, 0xd7, 0xc7, - 0x99, 0x59, 0xbb, 0x5f, 0x40, 0x0a, 0x9d, 0x1c, 0x96, 0x13, 0xed, 0x7b, 0x49, 0xc4, 0x5d, 0x2f, - 0x26, 0xfe, 0x99, 0x5c, 0xb8, 0xe9, 0x89, 0x16, 0x50, 0x31, 0x51, 0x19, 0xda, 0x22, 0x7a, 0xe0, - 0xfb, 0x56, 0x03, 0x3f, 0xcc, 0xf5, 0x7d, 0x2a, 0x4c, 0x3f, 0xd3, 0x40, 0x1d, 0xab, 0xa4, 0x4b, - 0x91, 0xf8, 0x0f, 0xe8, 0xf7, 0x62, 0xcc, 0x0c, 0x4d, 0xee, 0xc5, 0xcf, 0xf3, 0xf7, 0xa2, 0x48, - 0x73, 0x22, 0xea, 0xed, 0xdf, 0xd4, 0x8e, 0xa8, 0xe9, 0xcf, 0xa3, 0x14, 0xeb, 0xa2, 0xcf, 0xbc, - 0xc9, 0x1c, 0x1d, 0xcf, 0xe4, 0x3e, 0xb5, 0x4d, 0x0f, 0x8e, 0xfa, 0x46, 0x03, 0x1b, 0x33, 0x02, - 0x82, 0x2b, 0x10, 0xb7, 0x4a, 0x0d, 0xa6, 0xc0, 0x25, 0xd3, 0xd0, 0xc9, 0x61, 0xfd, 0x0c, 0xac, - 0x4d, 0xd9, 0x56, 0xda, 0xc7, 0x0b, 0xdf, 0xa9, 0xfa, 0x9c, 0x1e, 0x40, 0xa7, 0x56, 0x3c, 0xe6, - 0xb4, 0x71, 0xfb, 0xaf, 0xcb, 0xeb, 0x86, 0x76, 0x75, 0xdd, 0xd0, 0x3e, 0x5c, 0x37, 0xb4, 0xa7, - 0x37, 0x8d, 0xd2, 0xd5, 0x4d, 0xa3, 0xf4, 0xf6, 0xa6, 0x51, 0xfa, 0xcf, 0x2a, 0xaa, 0xc6, 0x88, - 0xb1, 0xc8, 0x3f, 0xc8, 0xbf, 0x46, 0x3e, 0xa1, 0xd8, 0x1a, 0x1c, 0x59, 0xa3, 0xc9, 0x77, 0x49, - 0x5a, 0xf0, 0xca, 0xf2, 0x1b, 0xf3, 0xcb, 0xc7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x3d, 0x00, - 0x0f, 0xb4, 0x06, 0x00, 0x00, + // 783 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbd, 0x6e, 0xdb, 0x48, + 0x10, 0x16, 0xcf, 0xb6, 0xce, 0x5a, 0xc9, 0x77, 0x36, 0x4f, 0x77, 0x47, 0xdb, 0x07, 0xd1, 0xe6, + 0xc1, 0x3e, 0x37, 0x96, 0xe0, 0x73, 0x71, 0x38, 0x75, 0x21, 0x94, 0x00, 0x01, 0x52, 0x08, 0x84, + 0xe2, 0x00, 0x49, 0xc1, 0x2c, 0xc9, 0x8d, 0x48, 0x98, 0xe4, 0x0a, 0xbb, 0xab, 0x1f, 0x03, 0x79, + 0x80, 0x14, 0x29, 0x52, 0xa4, 0x48, 0xe9, 0x36, 0xa9, 0x93, 0x37, 0x48, 0xe1, 0x2a, 0x30, 0x52, + 0x05, 0x29, 0x98, 0xc0, 0x6e, 0x5c, 0xeb, 0x09, 0x82, 0x5d, 0xae, 0x6c, 0xea, 0xa7, 0x88, 0x90, + 0x4a, 0x9a, 0xf9, 0x66, 0xbf, 0xf9, 0x66, 0x66, 0x87, 0x0b, 0xb6, 0x19, 0x22, 0x04, 0xd6, 0x30, + 0x81, 0x6e, 0x88, 0x6a, 0xbd, 0x03, 0x07, 0x31, 0x78, 0x20, 0xcd, 0x6a, 0x87, 0x60, 0x86, 0xd5, + 0xb2, 0x08, 0xa9, 0x4a, 0x9f, 0x0c, 0xd9, 0x58, 0x77, 0x31, 0x8d, 0x30, 0xb5, 0x45, 0x4c, 0x2d, + 0x35, 0xd2, 0x03, 0x1b, 0xe5, 0x36, 0x6e, 0xe3, 0xd4, 0xcf, 0xff, 0xa5, 0x5e, 0xe3, 0x43, 0x1e, + 0xe4, 0x9b, 0x90, 0xc0, 0x88, 0xaa, 0xff, 0x81, 0x62, 0x0f, 0x33, 0x64, 0x77, 0x10, 0x09, 0xb0, + 0xa7, 0x29, 0x5b, 0xca, 0xde, 0xa2, 0xf9, 0xc7, 0x30, 0xd1, 0xd5, 0x13, 0x18, 0x85, 0x75, 0x23, + 0x03, 0x1a, 0x16, 0xe0, 0x56, 0x53, 0x18, 0xea, 0x53, 0xf0, 0x8b, 0xc0, 0x98, 0x4f, 0x10, 0xf5, + 0x71, 0xe8, 0x69, 0x3f, 0x6d, 0x29, 0x7b, 0x05, 0xf3, 0xfe, 0x59, 0xa2, 0xe7, 0x3e, 0x27, 0xfa, + 0x6e, 0x3b, 0x60, 0x7e, 0xd7, 0xa9, 0xba, 0x38, 0x92, 0x92, 0xe4, 0xcf, 0x3e, 0xf5, 0x8e, 0x6b, + 0xec, 0xa4, 0x83, 0x68, 0xb5, 0x81, 0xdc, 0x61, 0xa2, 0xff, 0x9e, 0xc9, 0x74, 0xcd, 0x66, 0x7c, + 0x7c, 0xbb, 0x0f, 0x64, 0x29, 0x0d, 0xe4, 0x5a, 0x2b, 0x1c, 0x6e, 0x8d, 0x50, 0x95, 0x82, 0x22, + 0x41, 0x7d, 0x48, 0x3c, 0xdb, 0x81, 0xb1, 0xa7, 0x2d, 0x88, 0xd4, 0xd6, 0xdc, 0xa9, 0x65, 0x91, + 0x19, 0xaa, 0xc9, 0xbc, 0x20, 0xc5, 0x4c, 0x18, 0x7b, 0xaa, 0x0b, 0x36, 0x64, 0xa4, 0x17, 0x50, + 0x46, 0x02, 0xa7, 0xcb, 0x02, 0x1c, 0xdb, 0xfd, 0x20, 0xf6, 0x70, 0x5f, 0x5b, 0x14, 0xad, 0xdb, + 0x19, 0x26, 0xfa, 0xf6, 0x18, 0xeb, 0x8c, 0x58, 0xc3, 0xd2, 0x52, 0xb0, 0x91, 0xc1, 0x1e, 0x08, + 0x48, 0x7d, 0x0c, 0x0a, 0x7d, 0x3f, 0x60, 0x28, 0x0c, 0x28, 0xd3, 0x96, 0xb6, 0x16, 0xf6, 0x8a, + 0xff, 0x6e, 0x56, 0x67, 0x8d, 0xbd, 0xda, 0x40, 0x31, 0x8e, 0xcc, 0x1d, 0x5e, 0xf4, 0x30, 0xd1, + 0x57, 0xd3, 0xa4, 0xd7, 0x67, 0x8d, 0x37, 0x5f, 0xf4, 0x82, 0x08, 0xb9, 0x17, 0x50, 0x66, 0xdd, + 0x90, 0xf2, 0xc9, 0xd1, 0x10, 0x52, 0xdf, 0x7e, 0x42, 0xa0, 0xcb, 0x33, 0x6b, 0xf9, 0x1f, 0x9b, + 0xdc, 0x38, 0xdb, 0xd4, 0xe4, 0x04, 0x7c, 0x47, 0xa2, 0x6a, 0x1d, 0x94, 0xd2, 0x78, 0xd9, 0xb6, + 0x9f, 0x45, 0xdb, 0xfe, 0x1c, 0x26, 0xfa, 0x6f, 0x59, 0xb6, 0x51, 0xa3, 0x8a, 0xc2, 0x94, 0xbd, + 0x79, 0xae, 0x80, 0x72, 0x14, 0xc4, 0x76, 0x0f, 0x86, 0x81, 0xc7, 0x6f, 0xe5, 0x88, 0x64, 0x59, + 0x14, 0xf0, 0x68, 0xee, 0x02, 0x36, 0xd3, 0x94, 0xb3, 0x38, 0x27, 0xcb, 0x58, 0x8b, 0x82, 0xf8, + 0x88, 0xc7, 0x34, 0x11, 0x49, 0xe5, 0xd4, 0x97, 0x5f, 0x9d, 0xea, 0xb9, 0xab, 0x53, 0x5d, 0x31, + 0x5e, 0x2b, 0x60, 0x49, 0xf4, 0x5a, 0xfd, 0x1b, 0x2c, 0xc6, 0x30, 0x42, 0x62, 0x91, 0x0a, 0xe6, + 0xaf, 0xc3, 0x44, 0x2f, 0xa6, 0x39, 0xb8, 0xd7, 0xb0, 0x04, 0xa8, 0x46, 0xa0, 0xc0, 0xb0, 0x13, + 0xc4, 0x36, 0x83, 0x03, 0xb9, 0x36, 0xcd, 0xb9, 0xb5, 0xcb, 0x81, 0x5f, 0x13, 0x4d, 0x0a, 0x5e, + 0x16, 0x48, 0x0b, 0x0e, 0xea, 0xa5, 0x67, 0xa7, 0x7a, 0x4e, 0x6a, 0xcd, 0x19, 0xef, 0x14, 0xf0, + 0xd7, 0xad, 0x76, 0x9b, 0xa0, 0x36, 0x64, 0xe8, 0xf6, 0xc0, 0xf5, 0x61, 0xdc, 0x46, 0x16, 0x64, + 0xa8, 0x49, 0x10, 0x5f, 0x32, 0x5e, 0x82, 0x0f, 0xa9, 0x3f, 0x5d, 0x02, 0xf7, 0x1a, 0x96, 0x00, + 0xd5, 0x5d, 0xb0, 0xc4, 0x83, 0x89, 0x94, 0xbf, 0x3a, 0x4c, 0xf4, 0xd2, 0xcd, 0x1e, 0x13, 0xc3, + 0x4a, 0x61, 0x31, 0xee, 0xae, 0x13, 0x05, 0xcc, 0x76, 0x42, 0xec, 0x1e, 0x8b, 0x4d, 0x1d, 0x1f, + 0x77, 0x06, 0xe5, 0xe3, 0x16, 0xa6, 0xc9, 0xad, 0x09, 0xdd, 0x57, 0x0a, 0x58, 0x9f, 0xa9, 0xfb, + 0x88, 0x8b, 0x7e, 0xa9, 0x80, 0x32, 0x92, 0x4e, 0x9b, 0x40, 0xfe, 0x29, 0xe9, 0x76, 0x42, 0x44, + 0x35, 0x45, 0xac, 0xd0, 0x3f, 0xb3, 0x57, 0x28, 0x4b, 0xd3, 0xe2, 0xf1, 0xe6, 0xff, 0x72, 0x9d, + 0xe4, 0xcd, 0x98, 0x45, 0xc9, 0x37, 0x4b, 0x9d, 0x3a, 0x49, 0x2d, 0x15, 0x4d, 0xf9, 0xbe, 0xb7, + 0x4d, 0x13, 0xa5, 0xbe, 0x57, 0xc0, 0xda, 0x54, 0x02, 0xce, 0xe5, 0xf1, 0x3b, 0x26, 0x07, 0x93, + 0xe1, 0x12, 0x6e, 0xc3, 0x4a, 0x61, 0xf5, 0x04, 0xac, 0x8c, 0xc9, 0x96, 0xb9, 0x5b, 0x73, 0xdf, + 0xb0, 0xf2, 0x8c, 0x1e, 0x4c, 0xde, 0xb2, 0x52, 0xb6, 0xe8, 0xf1, 0x32, 0xcc, 0xbb, 0x67, 0x17, + 0x15, 0xe5, 0xfc, 0xa2, 0xa2, 0x7c, 0xbd, 0xa8, 0x28, 0x2f, 0x2e, 0x2b, 0xb9, 0xf3, 0xcb, 0x4a, + 0xee, 0xd3, 0x65, 0x25, 0xf7, 0xb0, 0x96, 0xd5, 0x10, 0x42, 0x4a, 0x03, 0x77, 0x3f, 0x7d, 0xfd, + 0x5c, 0x4c, 0x50, 0xad, 0x77, 0x58, 0x1b, 0x8c, 0xde, 0x41, 0x21, 0xc8, 0xc9, 0x8b, 0x87, 0xeb, + 0xf0, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x44, 0x2d, 0x65, 0x24, 0x07, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -392,7 +366,6 @@ func (this *Params) Equal(that interface{}) bool { } return true } - func (m *Params) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -662,7 +635,6 @@ func encodeVarintOracle(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *Params) Size() (n int) { if m == nil { return 0 @@ -767,11 +739,9 @@ func (m *ExchangeRateTuple) Size() (n int) { func sovOracle(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozOracle(x uint64) (n int) { return sovOracle(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *Params) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1049,7 +1019,6 @@ func (m *Params) Unmarshal(dAtA []byte) error { } return nil } - func (m *Denom) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1166,7 +1135,6 @@ func (m *Denom) Unmarshal(dAtA []byte) error { } return nil } - func (m *AggregateExchangeRatePrevote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1300,7 +1268,6 @@ func (m *AggregateExchangeRatePrevote) Unmarshal(dAtA []byte) error { } return nil } - func (m *AggregateExchangeRateVote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1417,7 +1384,6 @@ func (m *AggregateExchangeRateVote) Unmarshal(dAtA []byte) error { } return nil } - func (m *ExchangeRateTuple) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1534,7 +1500,6 @@ func (m *ExchangeRateTuple) Unmarshal(dAtA []byte) error { } return nil } - func skipOracle(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/oracle/types/params.go b/x/oracle/types/params.go index f54bf4cea..1b0b02381 100644 --- a/x/oracle/types/params.go +++ b/x/oracle/types/params.go @@ -5,7 +5,7 @@ import ( "gopkg.in/yaml.v2" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/oracle/types/params_test.go b/x/oracle/types/params_test.go index b9c260bfe..f37b8b60c 100644 --- a/x/oracle/types/params_test.go +++ b/x/oracle/types/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/types/query.pb.go b/x/oracle/types/query.pb.go index 25bd555da..ce0d6a773 100644 --- a/x/oracle/types/query.pb.go +++ b/x/oracle/types/query.pb.go @@ -6,27 +6,25 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -46,11 +44,9 @@ func (*QueryExchangeRateRequest) ProtoMessage() {} func (*QueryExchangeRateRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{0} } - func (m *QueryExchangeRateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryExchangeRateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryExchangeRateRequest.Marshal(b, m, deterministic) @@ -63,15 +59,12 @@ func (m *QueryExchangeRateRequest) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } - func (m *QueryExchangeRateRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryExchangeRateRequest.Merge(m, src) } - func (m *QueryExchangeRateRequest) XXX_Size() int { return m.Size() } - func (m *QueryExchangeRateRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryExchangeRateRequest.DiscardUnknown(m) } @@ -91,11 +84,9 @@ func (*QueryExchangeRateResponse) ProtoMessage() {} func (*QueryExchangeRateResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{1} } - func (m *QueryExchangeRateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryExchangeRateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryExchangeRateResponse.Marshal(b, m, deterministic) @@ -108,15 +99,12 @@ func (m *QueryExchangeRateResponse) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } - func (m *QueryExchangeRateResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryExchangeRateResponse.Merge(m, src) } - func (m *QueryExchangeRateResponse) XXX_Size() int { return m.Size() } - func (m *QueryExchangeRateResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryExchangeRateResponse.DiscardUnknown(m) } @@ -124,7 +112,8 @@ func (m *QueryExchangeRateResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryExchangeRateResponse proto.InternalMessageInfo // QueryExchangeRatesRequest is the request type for the Query/ExchangeRates RPC method. -type QueryExchangeRatesRequest struct{} +type QueryExchangeRatesRequest struct { +} func (m *QueryExchangeRatesRequest) Reset() { *m = QueryExchangeRatesRequest{} } func (m *QueryExchangeRatesRequest) String() string { return proto.CompactTextString(m) } @@ -132,11 +121,9 @@ func (*QueryExchangeRatesRequest) ProtoMessage() {} func (*QueryExchangeRatesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{2} } - func (m *QueryExchangeRatesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryExchangeRatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryExchangeRatesRequest.Marshal(b, m, deterministic) @@ -149,15 +136,12 @@ func (m *QueryExchangeRatesRequest) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } - func (m *QueryExchangeRatesRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryExchangeRatesRequest.Merge(m, src) } - func (m *QueryExchangeRatesRequest) XXX_Size() int { return m.Size() } - func (m *QueryExchangeRatesRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryExchangeRatesRequest.DiscardUnknown(m) } @@ -177,11 +161,9 @@ func (*QueryExchangeRatesResponse) ProtoMessage() {} func (*QueryExchangeRatesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{3} } - func (m *QueryExchangeRatesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryExchangeRatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryExchangeRatesResponse.Marshal(b, m, deterministic) @@ -194,15 +176,12 @@ func (m *QueryExchangeRatesResponse) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } - func (m *QueryExchangeRatesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryExchangeRatesResponse.Merge(m, src) } - func (m *QueryExchangeRatesResponse) XXX_Size() int { return m.Size() } - func (m *QueryExchangeRatesResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryExchangeRatesResponse.DiscardUnknown(m) } @@ -228,11 +207,9 @@ func (*QueryTobinTaxRequest) ProtoMessage() {} func (*QueryTobinTaxRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{4} } - func (m *QueryTobinTaxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTobinTaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTobinTaxRequest.Marshal(b, m, deterministic) @@ -245,15 +222,12 @@ func (m *QueryTobinTaxRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } - func (m *QueryTobinTaxRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTobinTaxRequest.Merge(m, src) } - func (m *QueryTobinTaxRequest) XXX_Size() int { return m.Size() } - func (m *QueryTobinTaxRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTobinTaxRequest.DiscardUnknown(m) } @@ -273,11 +247,9 @@ func (*QueryTobinTaxResponse) ProtoMessage() {} func (*QueryTobinTaxResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{5} } - func (m *QueryTobinTaxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTobinTaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTobinTaxResponse.Marshal(b, m, deterministic) @@ -290,15 +262,12 @@ func (m *QueryTobinTaxResponse) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } - func (m *QueryTobinTaxResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTobinTaxResponse.Merge(m, src) } - func (m *QueryTobinTaxResponse) XXX_Size() int { return m.Size() } - func (m *QueryTobinTaxResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTobinTaxResponse.DiscardUnknown(m) } @@ -306,7 +275,8 @@ func (m *QueryTobinTaxResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryTobinTaxResponse proto.InternalMessageInfo // QueryTobinTaxesRequest is the request type for the Query/TobinTaxes RPC method. -type QueryTobinTaxesRequest struct{} +type QueryTobinTaxesRequest struct { +} func (m *QueryTobinTaxesRequest) Reset() { *m = QueryTobinTaxesRequest{} } func (m *QueryTobinTaxesRequest) String() string { return proto.CompactTextString(m) } @@ -314,11 +284,9 @@ func (*QueryTobinTaxesRequest) ProtoMessage() {} func (*QueryTobinTaxesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{6} } - func (m *QueryTobinTaxesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTobinTaxesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTobinTaxesRequest.Marshal(b, m, deterministic) @@ -331,15 +299,12 @@ func (m *QueryTobinTaxesRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } - func (m *QueryTobinTaxesRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTobinTaxesRequest.Merge(m, src) } - func (m *QueryTobinTaxesRequest) XXX_Size() int { return m.Size() } - func (m *QueryTobinTaxesRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTobinTaxesRequest.DiscardUnknown(m) } @@ -359,11 +324,9 @@ func (*QueryTobinTaxesResponse) ProtoMessage() {} func (*QueryTobinTaxesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{7} } - func (m *QueryTobinTaxesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTobinTaxesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTobinTaxesResponse.Marshal(b, m, deterministic) @@ -376,15 +339,12 @@ func (m *QueryTobinTaxesResponse) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } - func (m *QueryTobinTaxesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTobinTaxesResponse.Merge(m, src) } - func (m *QueryTobinTaxesResponse) XXX_Size() int { return m.Size() } - func (m *QueryTobinTaxesResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTobinTaxesResponse.DiscardUnknown(m) } @@ -399,7 +359,8 @@ func (m *QueryTobinTaxesResponse) GetTobinTaxes() DenomList { } // QueryActivesRequest is the request type for the Query/Actives RPC method. -type QueryActivesRequest struct{} +type QueryActivesRequest struct { +} func (m *QueryActivesRequest) Reset() { *m = QueryActivesRequest{} } func (m *QueryActivesRequest) String() string { return proto.CompactTextString(m) } @@ -407,11 +368,9 @@ func (*QueryActivesRequest) ProtoMessage() {} func (*QueryActivesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{8} } - func (m *QueryActivesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryActivesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryActivesRequest.Marshal(b, m, deterministic) @@ -424,15 +383,12 @@ func (m *QueryActivesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryActivesRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryActivesRequest.Merge(m, src) } - func (m *QueryActivesRequest) XXX_Size() int { return m.Size() } - func (m *QueryActivesRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryActivesRequest.DiscardUnknown(m) } @@ -452,11 +408,9 @@ func (*QueryActivesResponse) ProtoMessage() {} func (*QueryActivesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{9} } - func (m *QueryActivesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryActivesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryActivesResponse.Marshal(b, m, deterministic) @@ -469,15 +423,12 @@ func (m *QueryActivesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } - func (m *QueryActivesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryActivesResponse.Merge(m, src) } - func (m *QueryActivesResponse) XXX_Size() int { return m.Size() } - func (m *QueryActivesResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryActivesResponse.DiscardUnknown(m) } @@ -492,7 +443,8 @@ func (m *QueryActivesResponse) GetActives() []string { } // QueryVoteTargetsRequest is the request type for the Query/VoteTargets RPC method. -type QueryVoteTargetsRequest struct{} +type QueryVoteTargetsRequest struct { +} func (m *QueryVoteTargetsRequest) Reset() { *m = QueryVoteTargetsRequest{} } func (m *QueryVoteTargetsRequest) String() string { return proto.CompactTextString(m) } @@ -500,11 +452,9 @@ func (*QueryVoteTargetsRequest) ProtoMessage() {} func (*QueryVoteTargetsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{10} } - func (m *QueryVoteTargetsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryVoteTargetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVoteTargetsRequest.Marshal(b, m, deterministic) @@ -517,15 +467,12 @@ func (m *QueryVoteTargetsRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } - func (m *QueryVoteTargetsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVoteTargetsRequest.Merge(m, src) } - func (m *QueryVoteTargetsRequest) XXX_Size() int { return m.Size() } - func (m *QueryVoteTargetsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryVoteTargetsRequest.DiscardUnknown(m) } @@ -546,11 +493,9 @@ func (*QueryVoteTargetsResponse) ProtoMessage() {} func (*QueryVoteTargetsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{11} } - func (m *QueryVoteTargetsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryVoteTargetsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryVoteTargetsResponse.Marshal(b, m, deterministic) @@ -563,15 +508,12 @@ func (m *QueryVoteTargetsResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } - func (m *QueryVoteTargetsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryVoteTargetsResponse.Merge(m, src) } - func (m *QueryVoteTargetsResponse) XXX_Size() int { return m.Size() } - func (m *QueryVoteTargetsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryVoteTargetsResponse.DiscardUnknown(m) } @@ -597,11 +539,9 @@ func (*QueryFeederDelegationRequest) ProtoMessage() {} func (*QueryFeederDelegationRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{12} } - func (m *QueryFeederDelegationRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryFeederDelegationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryFeederDelegationRequest.Marshal(b, m, deterministic) @@ -614,15 +554,12 @@ func (m *QueryFeederDelegationRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *QueryFeederDelegationRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryFeederDelegationRequest.Merge(m, src) } - func (m *QueryFeederDelegationRequest) XXX_Size() int { return m.Size() } - func (m *QueryFeederDelegationRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryFeederDelegationRequest.DiscardUnknown(m) } @@ -642,11 +579,9 @@ func (*QueryFeederDelegationResponse) ProtoMessage() {} func (*QueryFeederDelegationResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{13} } - func (m *QueryFeederDelegationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryFeederDelegationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryFeederDelegationResponse.Marshal(b, m, deterministic) @@ -659,15 +594,12 @@ func (m *QueryFeederDelegationResponse) XXX_Marshal(b []byte, deterministic bool return b[:n], nil } } - func (m *QueryFeederDelegationResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryFeederDelegationResponse.Merge(m, src) } - func (m *QueryFeederDelegationResponse) XXX_Size() int { return m.Size() } - func (m *QueryFeederDelegationResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryFeederDelegationResponse.DiscardUnknown(m) } @@ -693,11 +625,9 @@ func (*QueryMissCounterRequest) ProtoMessage() {} func (*QueryMissCounterRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{14} } - func (m *QueryMissCounterRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryMissCounterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryMissCounterRequest.Marshal(b, m, deterministic) @@ -710,15 +640,12 @@ func (m *QueryMissCounterRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } - func (m *QueryMissCounterRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryMissCounterRequest.Merge(m, src) } - func (m *QueryMissCounterRequest) XXX_Size() int { return m.Size() } - func (m *QueryMissCounterRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryMissCounterRequest.DiscardUnknown(m) } @@ -738,11 +665,9 @@ func (*QueryMissCounterResponse) ProtoMessage() {} func (*QueryMissCounterResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{15} } - func (m *QueryMissCounterResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryMissCounterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryMissCounterResponse.Marshal(b, m, deterministic) @@ -755,15 +680,12 @@ func (m *QueryMissCounterResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } - func (m *QueryMissCounterResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryMissCounterResponse.Merge(m, src) } - func (m *QueryMissCounterResponse) XXX_Size() int { return m.Size() } - func (m *QueryMissCounterResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryMissCounterResponse.DiscardUnknown(m) } @@ -789,11 +711,9 @@ func (*QueryAggregatePrevoteRequest) ProtoMessage() {} func (*QueryAggregatePrevoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{16} } - func (m *QueryAggregatePrevoteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryAggregatePrevoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryAggregatePrevoteRequest.Marshal(b, m, deterministic) @@ -806,15 +726,12 @@ func (m *QueryAggregatePrevoteRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *QueryAggregatePrevoteRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryAggregatePrevoteRequest.Merge(m, src) } - func (m *QueryAggregatePrevoteRequest) XXX_Size() int { return m.Size() } - func (m *QueryAggregatePrevoteRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryAggregatePrevoteRequest.DiscardUnknown(m) } @@ -834,11 +751,9 @@ func (*QueryAggregatePrevoteResponse) ProtoMessage() {} func (*QueryAggregatePrevoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{17} } - func (m *QueryAggregatePrevoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryAggregatePrevoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryAggregatePrevoteResponse.Marshal(b, m, deterministic) @@ -851,15 +766,12 @@ func (m *QueryAggregatePrevoteResponse) XXX_Marshal(b []byte, deterministic bool return b[:n], nil } } - func (m *QueryAggregatePrevoteResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryAggregatePrevoteResponse.Merge(m, src) } - func (m *QueryAggregatePrevoteResponse) XXX_Size() int { return m.Size() } - func (m *QueryAggregatePrevoteResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryAggregatePrevoteResponse.DiscardUnknown(m) } @@ -874,7 +786,8 @@ func (m *QueryAggregatePrevoteResponse) GetAggregatePrevote() AggregateExchangeR } // QueryAggregatePrevotesRequest is the request type for the Query/AggregatePrevotes RPC method. -type QueryAggregatePrevotesRequest struct{} +type QueryAggregatePrevotesRequest struct { +} func (m *QueryAggregatePrevotesRequest) Reset() { *m = QueryAggregatePrevotesRequest{} } func (m *QueryAggregatePrevotesRequest) String() string { return proto.CompactTextString(m) } @@ -882,11 +795,9 @@ func (*QueryAggregatePrevotesRequest) ProtoMessage() {} func (*QueryAggregatePrevotesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{18} } - func (m *QueryAggregatePrevotesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryAggregatePrevotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryAggregatePrevotesRequest.Marshal(b, m, deterministic) @@ -899,15 +810,12 @@ func (m *QueryAggregatePrevotesRequest) XXX_Marshal(b []byte, deterministic bool return b[:n], nil } } - func (m *QueryAggregatePrevotesRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryAggregatePrevotesRequest.Merge(m, src) } - func (m *QueryAggregatePrevotesRequest) XXX_Size() int { return m.Size() } - func (m *QueryAggregatePrevotesRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryAggregatePrevotesRequest.DiscardUnknown(m) } @@ -927,11 +835,9 @@ func (*QueryAggregatePrevotesResponse) ProtoMessage() {} func (*QueryAggregatePrevotesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{19} } - func (m *QueryAggregatePrevotesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryAggregatePrevotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryAggregatePrevotesResponse.Marshal(b, m, deterministic) @@ -944,15 +850,12 @@ func (m *QueryAggregatePrevotesResponse) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } - func (m *QueryAggregatePrevotesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryAggregatePrevotesResponse.Merge(m, src) } - func (m *QueryAggregatePrevotesResponse) XXX_Size() int { return m.Size() } - func (m *QueryAggregatePrevotesResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryAggregatePrevotesResponse.DiscardUnknown(m) } @@ -978,11 +881,9 @@ func (*QueryAggregateVoteRequest) ProtoMessage() {} func (*QueryAggregateVoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{20} } - func (m *QueryAggregateVoteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryAggregateVoteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryAggregateVoteRequest.Marshal(b, m, deterministic) @@ -995,15 +896,12 @@ func (m *QueryAggregateVoteRequest) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } - func (m *QueryAggregateVoteRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryAggregateVoteRequest.Merge(m, src) } - func (m *QueryAggregateVoteRequest) XXX_Size() int { return m.Size() } - func (m *QueryAggregateVoteRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryAggregateVoteRequest.DiscardUnknown(m) } @@ -1023,11 +921,9 @@ func (*QueryAggregateVoteResponse) ProtoMessage() {} func (*QueryAggregateVoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{21} } - func (m *QueryAggregateVoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryAggregateVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryAggregateVoteResponse.Marshal(b, m, deterministic) @@ -1040,15 +936,12 @@ func (m *QueryAggregateVoteResponse) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } - func (m *QueryAggregateVoteResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryAggregateVoteResponse.Merge(m, src) } - func (m *QueryAggregateVoteResponse) XXX_Size() int { return m.Size() } - func (m *QueryAggregateVoteResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryAggregateVoteResponse.DiscardUnknown(m) } @@ -1063,7 +956,8 @@ func (m *QueryAggregateVoteResponse) GetAggregateVote() AggregateExchangeRateVot } // QueryAggregateVotesRequest is the request type for the Query/AggregateVotes RPC method. -type QueryAggregateVotesRequest struct{} +type QueryAggregateVotesRequest struct { +} func (m *QueryAggregateVotesRequest) Reset() { *m = QueryAggregateVotesRequest{} } func (m *QueryAggregateVotesRequest) String() string { return proto.CompactTextString(m) } @@ -1071,11 +965,9 @@ func (*QueryAggregateVotesRequest) ProtoMessage() {} func (*QueryAggregateVotesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{22} } - func (m *QueryAggregateVotesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryAggregateVotesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryAggregateVotesRequest.Marshal(b, m, deterministic) @@ -1088,15 +980,12 @@ func (m *QueryAggregateVotesRequest) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } - func (m *QueryAggregateVotesRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryAggregateVotesRequest.Merge(m, src) } - func (m *QueryAggregateVotesRequest) XXX_Size() int { return m.Size() } - func (m *QueryAggregateVotesRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryAggregateVotesRequest.DiscardUnknown(m) } @@ -1116,11 +1005,9 @@ func (*QueryAggregateVotesResponse) ProtoMessage() {} func (*QueryAggregateVotesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{23} } - func (m *QueryAggregateVotesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryAggregateVotesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryAggregateVotesResponse.Marshal(b, m, deterministic) @@ -1133,15 +1020,12 @@ func (m *QueryAggregateVotesResponse) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *QueryAggregateVotesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryAggregateVotesResponse.Merge(m, src) } - func (m *QueryAggregateVotesResponse) XXX_Size() int { return m.Size() } - func (m *QueryAggregateVotesResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryAggregateVotesResponse.DiscardUnknown(m) } @@ -1156,7 +1040,8 @@ func (m *QueryAggregateVotesResponse) GetAggregateVotes() []AggregateExchangeRat } // QueryParamsRequest is the request type for the Query/Params RPC method. -type QueryParamsRequest struct{} +type QueryParamsRequest struct { +} func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } @@ -1164,11 +1049,9 @@ func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{24} } - func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) @@ -1181,15 +1064,12 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsRequest.Merge(m, src) } - func (m *QueryParamsRequest) XXX_Size() int { return m.Size() } - func (m *QueryParamsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) } @@ -1208,11 +1088,9 @@ func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_198b4e80572a772d, []int{25} } - func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) @@ -1225,15 +1103,12 @@ func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsResponse.Merge(m, src) } - func (m *QueryParamsResponse) XXX_Size() int { return m.Size() } - func (m *QueryParamsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) } @@ -1279,92 +1154,92 @@ func init() { func init() { proto.RegisterFile("terra/oracle/v1beta1/query.proto", fileDescriptor_198b4e80572a772d) } var fileDescriptor_198b4e80572a772d = []byte{ - // 1239 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x98, 0x4f, 0x6f, 0x1b, 0xc5, - 0x1b, 0xc7, 0x3d, 0xbf, 0x5f, 0x9b, 0x26, 0x8f, 0xe3, 0x90, 0x0c, 0x29, 0xa4, 0x8e, 0xb1, 0xd3, - 0x55, 0x29, 0xf9, 0xd3, 0xec, 0x26, 0x4e, 0x89, 0x22, 0x23, 0x50, 0xe2, 0xa4, 0x08, 0x68, 0x11, - 0xad, 0x89, 0x72, 0x40, 0x08, 0x6b, 0x62, 0x0f, 0xee, 0x0a, 0xdb, 0xe3, 0xee, 0x4c, 0xac, 0x84, - 0x2a, 0x12, 0x02, 0x09, 0xc1, 0x05, 0x21, 0x21, 0x71, 0xe1, 0x40, 0x6f, 0x48, 0x05, 0x89, 0x17, - 0x00, 0xbd, 0xe7, 0x58, 0x89, 0x0b, 0xe2, 0x90, 0xa2, 0x84, 0x03, 0x67, 0x5e, 0x01, 0xda, 0xd9, - 0xd9, 0xf5, 0xae, 0xbd, 0xde, 0xae, 0xc3, 0xc9, 0xf1, 0xcc, 0xf3, 0xe7, 0xf3, 0x7c, 0x67, 0x76, - 0x9f, 0xc7, 0x81, 0x19, 0x41, 0x2d, 0x8b, 0x18, 0xcc, 0x22, 0x95, 0x3a, 0x35, 0xda, 0xcb, 0xbb, - 0x54, 0x90, 0x65, 0xe3, 0xde, 0x1e, 0xb5, 0x0e, 0xf4, 0x96, 0xc5, 0x04, 0xc3, 0x93, 0xd2, 0x42, - 0x77, 0x2c, 0x74, 0x65, 0x91, 0x9e, 0xac, 0xb1, 0x1a, 0x93, 0x06, 0x86, 0xfd, 0x97, 0x63, 0x9b, - 0xce, 0xd4, 0x18, 0xab, 0xd5, 0xa9, 0x41, 0x5a, 0xa6, 0x41, 0x9a, 0x4d, 0x26, 0x88, 0x30, 0x59, - 0x93, 0xab, 0xdd, 0xcb, 0xa1, 0xb9, 0x54, 0x60, 0xc7, 0x24, 0x5b, 0x61, 0xbc, 0xc1, 0xb8, 0xb1, - 0x4b, 0x78, 0xc7, 0xa2, 0xc2, 0xcc, 0xa6, 0xb3, 0xaf, 0x15, 0x60, 0xea, 0x8e, 0xcd, 0x76, 0x63, - 0xbf, 0x72, 0x97, 0x34, 0x6b, 0xb4, 0x44, 0x04, 0x2d, 0xd1, 0x7b, 0x7b, 0x94, 0x0b, 0x3c, 0x09, - 0xe7, 0xab, 0xb4, 0xc9, 0x1a, 0x53, 0x68, 0x06, 0xcd, 0x8e, 0x94, 0x9c, 0x2f, 0x85, 0xe1, 0x2f, - 0x1e, 0xe4, 0x12, 0x7f, 0x3f, 0xc8, 0x25, 0xb4, 0x16, 0x5c, 0x0a, 0xf1, 0xe5, 0x2d, 0xd6, 0xe4, - 0x14, 0xbf, 0x0b, 0x29, 0xaa, 0xd6, 0xcb, 0x16, 0x11, 0xd4, 0x09, 0x52, 0xd4, 0x8f, 0x8e, 0x73, - 0x89, 0x3f, 0x8e, 0x73, 0x57, 0x6b, 0xa6, 0xb8, 0xbb, 0xb7, 0xab, 0x57, 0x58, 0xc3, 0x50, 0x88, - 0xce, 0xc7, 0x22, 0xaf, 0x7e, 0x64, 0x88, 0x83, 0x16, 0xe5, 0xfa, 0x16, 0xad, 0x94, 0x46, 0xa9, - 0x2f, 0xb8, 0x36, 0x1d, 0x92, 0x91, 0x2b, 0x5c, 0xed, 0x5b, 0x04, 0xe9, 0xb0, 0x5d, 0x05, 0xb4, - 0x0f, 0x63, 0x01, 0x20, 0x3e, 0x85, 0x66, 0xfe, 0x3f, 0x9b, 0xcc, 0x67, 0x74, 0x27, 0xb1, 0x6e, - 0x4b, 0xe4, 0x1e, 0x87, 0x9d, 0x7b, 0x93, 0x99, 0xcd, 0xe2, 0x8a, 0xcd, 0xfb, 0xf0, 0x49, 0x6e, - 0x21, 0x1e, 0xaf, 0xed, 0xc3, 0x4b, 0x29, 0x3f, 0x34, 0xd7, 0x56, 0x61, 0x52, 0x72, 0x6d, 0xb3, - 0x5d, 0xb3, 0xb9, 0x4d, 0xf6, 0xe3, 0xea, 0x5b, 0x85, 0x8b, 0x5d, 0x7e, 0xaa, 0x94, 0x9b, 0x30, - 0x22, 0xec, 0xb5, 0xb2, 0x20, 0xfb, 0x67, 0xd4, 0x75, 0x58, 0xa8, 0xa0, 0xda, 0x14, 0x3c, 0x17, - 0xc8, 0xd2, 0x11, 0xf4, 0x13, 0x04, 0xcf, 0xf7, 0x6c, 0x29, 0x04, 0x0a, 0x49, 0x0f, 0xc1, 0x93, - 0x72, 0x5a, 0x0f, 0xbb, 0xda, 0xfa, 0x96, 0x5d, 0x57, 0xf1, 0x25, 0x9b, 0xf0, 0x9f, 0xe3, 0x1c, - 0x3e, 0x20, 0x8d, 0x7a, 0x41, 0xf3, 0x79, 0x6b, 0x0f, 0x9f, 0xe4, 0x46, 0xa4, 0xd1, 0x2d, 0x93, - 0x8b, 0x12, 0x08, 0x2f, 0x9d, 0x76, 0x11, 0x9e, 0x95, 0x04, 0x1b, 0x15, 0x61, 0xb6, 0x3b, 0x64, - 0x4b, 0x4a, 0x51, 0x6f, 0x59, 0x51, 0x4d, 0xc1, 0x05, 0xe2, 0x2c, 0x49, 0xa2, 0x91, 0x92, 0xfb, - 0x55, 0xbb, 0xa4, 0x4a, 0xd9, 0x61, 0x82, 0x6e, 0x13, 0xab, 0x46, 0x85, 0x17, 0xec, 0x55, 0xf5, - 0x08, 0x04, 0xb6, 0x54, 0xc0, 0xcb, 0x30, 0xda, 0x66, 0x82, 0x96, 0x85, 0xb3, 0xae, 0xa2, 0x26, - 0xdb, 0x1d, 0x53, 0xed, 0x1d, 0xc8, 0x48, 0xf7, 0xd7, 0x29, 0xad, 0x52, 0x6b, 0x8b, 0xd6, 0x69, - 0x4d, 0x3e, 0xa4, 0xee, 0x29, 0xbf, 0x08, 0x63, 0x6d, 0x52, 0x37, 0xab, 0x44, 0x30, 0xab, 0x4c, - 0xaa, 0x55, 0x4b, 0x1d, 0x77, 0xca, 0x5b, 0xdd, 0xa8, 0x56, 0x2d, 0xdf, 0xb1, 0xaf, 0xc3, 0x0b, - 0x7d, 0x02, 0x2a, 0xa8, 0x1c, 0x24, 0x3f, 0x94, 0x7b, 0xfe, 0x70, 0xe0, 0x2c, 0xd9, 0xb1, 0xb4, - 0xb7, 0x54, 0xb1, 0x6f, 0x9b, 0x9c, 0x6f, 0xb2, 0xbd, 0xa6, 0xa0, 0xd6, 0x99, 0x69, 0x5c, 0x75, - 0x02, 0xb1, 0x3a, 0xea, 0x34, 0x4c, 0xce, 0xcb, 0x15, 0x67, 0x5d, 0x86, 0x3a, 0x57, 0x4a, 0x36, - 0x3a, 0xa6, 0x9e, 0x3a, 0x1b, 0xb5, 0x9a, 0x65, 0xd7, 0x41, 0x6f, 0x5b, 0xd4, 0x56, 0xef, 0xcc, - 0x3c, 0x9f, 0x23, 0x25, 0x4f, 0x6f, 0x44, 0xef, 0x6a, 0x4e, 0x10, 0x77, 0xaf, 0xdc, 0x72, 0x36, - 0x65, 0xd4, 0x64, 0x3e, 0x1f, 0x7e, 0x41, 0xbd, 0x50, 0xfe, 0x37, 0x87, 0x0a, 0x5b, 0x3c, 0x67, - 0xdf, 0xdb, 0xd2, 0x38, 0xe9, 0x4a, 0xa7, 0xe5, 0xfa, 0x70, 0x78, 0xf7, 0xea, 0x4b, 0x04, 0xd9, - 0x7e, 0x16, 0x0a, 0xb5, 0x06, 0xb8, 0x07, 0xd5, 0x7d, 0x98, 0xce, 0xce, 0x3a, 0xd1, 0xcd, 0xca, - 0xb5, 0x5b, 0xea, 0xc5, 0xe9, 0x79, 0xef, 0xfc, 0x97, 0x33, 0xf8, 0x58, 0xbd, 0x68, 0xbb, 0xa2, - 0xa9, 0xa2, 0xde, 0x87, 0xb1, 0x4e, 0x51, 0x3e, 0xf1, 0x8d, 0x01, 0x0a, 0xda, 0xe9, 0x54, 0x93, - 0x22, 0xfe, 0x2c, 0x5a, 0x26, 0x2c, 0xb7, 0xa7, 0xf9, 0x21, 0x4c, 0x87, 0xee, 0x2a, 0xb4, 0x0f, - 0xe0, 0x99, 0x20, 0x9a, 0x2b, 0xf6, 0x19, 0xd9, 0xc6, 0x02, 0x6c, 0x5c, 0x9b, 0x04, 0x2c, 0xd3, - 0xdf, 0x26, 0x16, 0x69, 0x78, 0x50, 0x77, 0xd4, 0x4b, 0xcc, 0x5d, 0x55, 0x30, 0x05, 0x18, 0x6a, - 0xc9, 0x15, 0xa5, 0x4f, 0x26, 0x9c, 0xc1, 0xf1, 0x52, 0x09, 0x95, 0x47, 0xfe, 0xd1, 0x04, 0x9c, - 0x97, 0x31, 0xf1, 0x8f, 0x08, 0x46, 0xfd, 0x74, 0x58, 0x0f, 0x0f, 0xd3, 0xaf, 0xcb, 0xa7, 0x8d, - 0xd8, 0xf6, 0x0e, 0xb7, 0x56, 0xf8, 0xf4, 0xb7, 0xbf, 0xbe, 0xf9, 0xdf, 0x75, 0x9c, 0x37, 0x42, - 0xc7, 0x0f, 0xd9, 0xc5, 0xb8, 0x71, 0x5f, 0x7e, 0x1e, 0x1a, 0x81, 0x9e, 0x8b, 0x7f, 0x40, 0x90, - 0x0a, 0xb4, 0x67, 0x1c, 0x37, 0xbd, 0xab, 0x66, 0x7a, 0x29, 0xbe, 0x83, 0x02, 0x5e, 0x91, 0xc0, - 0x8b, 0x78, 0x21, 0x12, 0x38, 0x38, 0x1c, 0xe0, 0xef, 0x10, 0x0c, 0xbb, 0x7d, 0x0f, 0xcf, 0x47, - 0xe4, 0xec, 0xea, 0xea, 0xe9, 0x85, 0x58, 0xb6, 0x0a, 0x6d, 0x55, 0xa2, 0x2d, 0x61, 0x3d, 0x96, - 0x96, 0x5e, 0xcf, 0xb4, 0xe9, 0xa0, 0xd3, 0x95, 0xf1, 0xb5, 0x18, 0x39, 0x3b, 0x0a, 0x2e, 0xc6, - 0xb4, 0x56, 0x8c, 0x4b, 0x92, 0x71, 0x1e, 0xcf, 0x46, 0x32, 0xfa, 0xfa, 0x39, 0xfe, 0x0a, 0xc1, - 0x05, 0xd5, 0x9a, 0xf1, 0x5c, 0x44, 0xb2, 0x60, 0x57, 0x4f, 0xcf, 0xc7, 0x31, 0x55, 0x50, 0xd7, - 0x24, 0xd4, 0x55, 0x7c, 0x25, 0x12, 0x4a, 0x75, 0x7f, 0xfc, 0x3d, 0x82, 0xa4, 0xaf, 0xbd, 0xe3, - 0x28, 0x05, 0x7a, 0x27, 0x84, 0xb4, 0x1e, 0xd7, 0x5c, 0xc1, 0x2d, 0x4b, 0xb8, 0x05, 0x3c, 0x17, - 0x09, 0xe7, 0x1f, 0x2c, 0xf0, 0x23, 0x04, 0xe3, 0xdd, 0x0d, 0x1f, 0xe7, 0x23, 0xf2, 0xf6, 0x19, - 0x37, 0xd2, 0x2b, 0x03, 0xf9, 0x28, 0xe0, 0x75, 0x09, 0x5c, 0xc0, 0x6b, 0xe1, 0xc0, 0x5e, 0x1f, - 0xe0, 0xc6, 0xfd, 0x60, 0xa7, 0x38, 0x34, 0x9c, 0xb1, 0x03, 0xff, 0x84, 0x20, 0xe9, 0x1b, 0x11, - 0x22, 0x15, 0xee, 0x1d, 0x4b, 0x22, 0x15, 0x0e, 0x99, 0x3c, 0xb4, 0xd7, 0x24, 0xf0, 0x1a, 0x5e, - 0x1d, 0x1c, 0xd8, 0x9e, 0x4e, 0xf0, 0x11, 0x82, 0xf1, 0xee, 0xb6, 0x1c, 0x29, 0x77, 0x9f, 0xf9, - 0x25, 0x52, 0xee, 0x7e, 0x13, 0x8a, 0x76, 0x53, 0xd2, 0xdf, 0xc0, 0x9b, 0x83, 0xd3, 0xf7, 0x8c, - 0x0b, 0xf8, 0x17, 0x04, 0x13, 0x3d, 0x13, 0x06, 0x1e, 0x84, 0xcb, 0xbb, 0xe7, 0xd7, 0x07, 0x73, - 0x52, 0xd5, 0xbc, 0x22, 0xab, 0x79, 0x19, 0xaf, 0x3c, 0xb5, 0x9a, 0xde, 0x59, 0x07, 0xff, 0x8a, - 0x20, 0x15, 0x68, 0xd6, 0x91, 0x0d, 0x21, 0x6c, 0x7c, 0x89, 0x6c, 0x08, 0xa1, 0x13, 0x8a, 0xf6, - 0x86, 0x24, 0x2e, 0xe2, 0xf5, 0xbe, 0xc4, 0x55, 0xf3, 0xa9, 0xfa, 0x4b, 0xf1, 0x7f, 0x46, 0x30, - 0x16, 0x9c, 0x35, 0x70, 0x6c, 0x1c, 0x4f, 0xf6, 0xe5, 0x01, 0x3c, 0x54, 0x05, 0x6b, 0xb2, 0x82, - 0x3c, 0x5e, 0x1a, 0x40, 0x73, 0x47, 0xf0, 0xcf, 0x10, 0x0c, 0x39, 0x23, 0x05, 0x9e, 0x8d, 0xc8, - 0x1b, 0x98, 0x60, 0xd2, 0x73, 0x31, 0x2c, 0x15, 0xd9, 0x15, 0x49, 0x96, 0xc5, 0x99, 0x70, 0x32, - 0x67, 0x7e, 0x29, 0xbe, 0x79, 0x74, 0x92, 0x45, 0x8f, 0x4f, 0xb2, 0xe8, 0xcf, 0x93, 0x2c, 0xfa, - 0xfa, 0x34, 0x9b, 0x78, 0x7c, 0x9a, 0x4d, 0xfc, 0x7e, 0x9a, 0x4d, 0xbc, 0x67, 0xf8, 0x7f, 0xc0, - 0xd6, 0x09, 0xe7, 0x66, 0x65, 0xd1, 0x89, 0x54, 0x61, 0x16, 0x35, 0xda, 0x79, 0x63, 0xdf, 0x8d, - 0x29, 0x7f, 0xcd, 0xee, 0x0e, 0xc9, 0x7f, 0x64, 0xac, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xfb, - 0x0d, 0xfb, 0xc1, 0x79, 0x11, 0x00, 0x00, + // 1276 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0xcd, 0x6f, 0x1b, 0xc5, + 0x1b, 0xc7, 0xbd, 0xbf, 0x5f, 0x9b, 0x26, 0xe3, 0x38, 0x24, 0x83, 0x0b, 0x8e, 0x63, 0xec, 0x74, + 0x55, 0x95, 0xbc, 0xd4, 0xde, 0xc4, 0x2e, 0x51, 0x30, 0x6f, 0x8d, 0x93, 0x22, 0x10, 0x20, 0xb5, + 0x26, 0x8a, 0x44, 0x85, 0xb0, 0x26, 0xf6, 0x74, 0xbb, 0xc2, 0xde, 0x75, 0x77, 0x26, 0x56, 0x42, + 0x15, 0x84, 0x40, 0x42, 0x70, 0x41, 0x48, 0x48, 0x5c, 0x38, 0xd0, 0x1b, 0x52, 0x41, 0xe2, 0xd2, + 0x1b, 0xf4, 0x9e, 0x63, 0x55, 0x2e, 0x88, 0x43, 0x8a, 0x12, 0x0e, 0x9c, 0xf9, 0x0b, 0xd0, 0xce, + 0x3e, 0xbb, 0xde, 0xb5, 0xd7, 0xdb, 0x75, 0x45, 0x4e, 0xce, 0xce, 0x3c, 0xcf, 0x3c, 0x9f, 0xe7, + 0x3b, 0x9e, 0x9d, 0xaf, 0x83, 0x66, 0x39, 0x35, 0x4d, 0xa2, 0x18, 0x26, 0xa9, 0x37, 0xa9, 0xd2, + 0x59, 0xde, 0xa6, 0x9c, 0x2c, 0x2b, 0xb7, 0x76, 0xa8, 0xb9, 0x57, 0x68, 0x9b, 0x06, 0x37, 0x70, + 0x52, 0x44, 0x14, 0xec, 0x88, 0x02, 0x44, 0xa4, 0xb3, 0x75, 0x83, 0xb5, 0x0c, 0xa6, 0x6c, 0x13, + 0xd6, 0x4d, 0xab, 0x1b, 0x9a, 0x6e, 0x67, 0xa5, 0xa7, 0xed, 0xf9, 0x9a, 0x78, 0x52, 0xec, 0x07, + 0x98, 0x4a, 0xaa, 0x86, 0x6a, 0xd8, 0xe3, 0xd6, 0x5f, 0x30, 0x9a, 0x51, 0x0d, 0x43, 0x6d, 0x52, + 0x85, 0xb4, 0x35, 0x85, 0xe8, 0xba, 0xc1, 0x09, 0xd7, 0x0c, 0xdd, 0xc9, 0x39, 0x17, 0x88, 0x09, + 0x4c, 0x22, 0x44, 0x2e, 0xa3, 0xd4, 0x35, 0x0b, 0xfb, 0xca, 0x6e, 0xfd, 0x26, 0xd1, 0x55, 0x5a, + 0x25, 0x9c, 0x56, 0xe9, 0xad, 0x1d, 0xca, 0x38, 0x4e, 0xa2, 0xd3, 0x0d, 0xaa, 0x1b, 0xad, 0x94, + 0x34, 0x2b, 0xcd, 0x8d, 0x55, 0xed, 0x87, 0xf2, 0xe8, 0x17, 0x77, 0x72, 0xb1, 0xbf, 0xef, 0xe4, + 0x62, 0xf2, 0xc7, 0x68, 0x3a, 0x20, 0x97, 0xb5, 0x0d, 0x9d, 0x51, 0x4c, 0x50, 0x82, 0xc2, 0x78, + 0xcd, 0x24, 0x9c, 0xda, 0x8b, 0x54, 0x5e, 0x3e, 0x38, 0xcc, 0xc5, 0xfe, 0x38, 0xcc, 0x5d, 0x50, + 0x35, 0x7e, 0x73, 0x67, 0xbb, 0x50, 0x37, 0x5a, 0xd0, 0x27, 0x7c, 0xe4, 0x59, 0xe3, 0x43, 0x85, + 0xef, 0xb5, 0x29, 0x2b, 0x6c, 0xd0, 0xfa, 0xc3, 0x7b, 0x79, 0x04, 0x32, 0x6c, 0xd0, 0x7a, 0x75, + 0x9c, 0x7a, 0x4a, 0xc9, 0x33, 0x01, 0xf5, 0x19, 0xc0, 0xcb, 0xdf, 0x4a, 0x28, 0x1d, 0x34, 0x0b, + 0x78, 0xbb, 0x68, 0xc2, 0x87, 0xc7, 0x52, 0xd2, 0xec, 0xff, 0xe7, 0xe2, 0xc5, 0x4c, 0x01, 0xca, + 0x59, 0x5b, 0xe4, 0xec, 0x9b, 0x55, 0x7b, 0xdd, 0xd0, 0xf4, 0x4a, 0xc9, 0xa2, 0xbf, 0xfb, 0x28, + 0xb7, 0x18, 0x8d, 0xde, 0xca, 0x61, 0xd5, 0x84, 0x17, 0x9a, 0xc9, 0x2b, 0x28, 0x29, 0xb8, 0x36, + 0x8d, 0x6d, 0x4d, 0xdf, 0x24, 0xbb, 0x51, 0xd5, 0x36, 0xd1, 0xd9, 0x9e, 0x3c, 0x68, 0xe5, 0x3d, + 0x34, 0xc6, 0xad, 0xb1, 0x1a, 0x27, 0xbb, 0xff, 0x89, 0xca, 0xa3, 0x1c, 0x4a, 0xc8, 0x29, 0xf4, + 0x8c, 0xaf, 0x66, 0x57, 0xde, 0x4f, 0x24, 0xf4, 0x6c, 0xdf, 0x14, 0x00, 0x51, 0x14, 0x77, 0x81, + 0x5c, 0x61, 0x67, 0x0a, 0x41, 0x27, 0xa2, 0xb0, 0x61, 0x75, 0x59, 0x79, 0xde, 0xe2, 0xfd, 0xe7, + 0x30, 0x87, 0xf7, 0x48, 0xab, 0x59, 0x96, 0x3d, 0xd9, 0xf2, 0xdd, 0x47, 0xb9, 0x31, 0x11, 0xf4, + 0xb6, 0xc6, 0x78, 0x15, 0x71, 0xb7, 0x9c, 0x7c, 0x16, 0x3d, 0x2d, 0x08, 0xd6, 0xea, 0x5c, 0xeb, + 0x74, 0xc9, 0x96, 0x40, 0x5f, 0x77, 0x18, 0xa8, 0x52, 0xe8, 0x0c, 0xb1, 0x87, 0x04, 0xd1, 0x58, + 0xd5, 0x79, 0x94, 0xa7, 0xa1, 0x95, 0x2d, 0x83, 0xd3, 0x4d, 0x62, 0xaa, 0x94, 0xbb, 0x8b, 0xbd, + 0x02, 0xc7, 0xc3, 0x37, 0x05, 0x0b, 0x9e, 0x43, 0xe3, 0x1d, 0x83, 0xd3, 0x1a, 0xb7, 0xc7, 0x61, + 0xd5, 0x78, 0xa7, 0x1b, 0x2a, 0x6b, 0x28, 0x23, 0xd2, 0x5f, 0xa7, 0xb4, 0x41, 0xcd, 0x0d, 0xda, + 0xa4, 0xaa, 0x38, 0xa0, 0xce, 0x9e, 0xbf, 0x86, 0x26, 0x3a, 0xa4, 0xa9, 0x35, 0x08, 0x37, 0xcc, + 0x1a, 0x69, 0x34, 0x4c, 0xd8, 0xbf, 0xd4, 0xc3, 0x7b, 0xf9, 0x24, 0xec, 0xc8, 0x5a, 0xa3, 0x61, + 0x52, 0xc6, 0xde, 0xe5, 0xa6, 0xa6, 0xab, 0xd5, 0x84, 0x1b, 0x6f, 0x8d, 0x7b, 0xbe, 0x1e, 0xd7, + 0xd1, 0x73, 0x03, 0x4a, 0x01, 0xee, 0x8b, 0x28, 0x7e, 0x43, 0xcc, 0x45, 0x2b, 0x84, 0xec, 0x60, + 0x6b, 0x50, 0x6e, 0x80, 0x40, 0xef, 0x68, 0x8c, 0xad, 0x1b, 0x3b, 0x3a, 0xa7, 0xe6, 0x09, 0x74, + 0xe0, 0x68, 0xed, 0xab, 0xd2, 0xd5, 0xba, 0xa5, 0x31, 0x56, 0xab, 0xdb, 0xe3, 0xa2, 0xc8, 0xa9, + 0x6a, 0xbc, 0xd5, 0x0d, 0x75, 0xb5, 0x5e, 0x53, 0x55, 0xd3, 0xea, 0x9d, 0x5e, 0x35, 0xa9, 0xb5, + 0x17, 0x27, 0x40, 0xfa, 0xb9, 0x04, 0x62, 0xf7, 0xd7, 0x72, 0x8f, 0xc0, 0x14, 0x71, 0xe6, 0x6a, + 0x6d, 0x7b, 0x52, 0xd4, 0x8b, 0x17, 0x8b, 0xc1, 0x07, 0xc1, 0x5d, 0xca, 0xfb, 0xbe, 0x82, 0x65, + 0x2b, 0xa7, 0xac, 0xf3, 0x51, 0x9d, 0x24, 0x3d, 0xe5, 0xe4, 0xdc, 0x00, 0x0e, 0xf7, 0xfb, 0xfb, + 0xa5, 0x84, 0xb2, 0x83, 0x22, 0x00, 0x55, 0x45, 0xb8, 0x0f, 0xd5, 0x39, 0xb4, 0x4f, 0xce, 0x3a, + 0xd5, 0xcb, 0xca, 0xe4, 0x1b, 0xf0, 0xba, 0x76, 0xb3, 0xb7, 0x4e, 0x66, 0x77, 0x3e, 0x82, 0x17, + 0x7f, 0x4f, 0x1d, 0x68, 0xf7, 0x7d, 0x34, 0xd1, 0x6d, 0xd7, 0xb3, 0x2d, 0xca, 0x10, 0xad, 0x6e, + 0x75, 0xfb, 0x4c, 0x10, 0x6f, 0x15, 0x39, 0x13, 0x54, 0xdb, 0xdd, 0x8d, 0x7d, 0x34, 0x13, 0x38, + 0x0b, 0x68, 0x1f, 0xa0, 0xa7, 0xfc, 0x68, 0xce, 0x36, 0x3c, 0x21, 0xdb, 0x84, 0x8f, 0x8d, 0xc9, + 0x49, 0x84, 0x45, 0xf9, 0xab, 0xc4, 0x24, 0x2d, 0x17, 0xea, 0x1a, 0xbc, 0x46, 0x9d, 0x51, 0x80, + 0x29, 0xa3, 0x91, 0xb6, 0x18, 0x01, 0x7d, 0x32, 0xc1, 0x0c, 0x76, 0x16, 0x14, 0x84, 0x8c, 0xe2, + 0xfd, 0x29, 0x74, 0x5a, 0xac, 0x89, 0x7f, 0x94, 0xd0, 0xb8, 0x97, 0x0e, 0x17, 0x82, 0x97, 0x19, + 0xe4, 0x41, 0xd2, 0x4a, 0xe4, 0x78, 0x9b, 0x5b, 0x2e, 0x7f, 0xfa, 0xdb, 0x5f, 0xdf, 0xfc, 0xef, + 0x12, 0x2e, 0x2a, 0x81, 0xe6, 0x47, 0xdc, 0xaa, 0x4c, 0xb9, 0x2d, 0x3e, 0xf7, 0x15, 0x9f, 0x07, + 0xc0, 0x3f, 0x48, 0x28, 0xe1, 0xb3, 0x0b, 0x38, 0x6a, 0x79, 0x47, 0xcd, 0xf4, 0x52, 0xf4, 0x04, + 0x00, 0x2e, 0x09, 0xe0, 0x3c, 0x5e, 0x0c, 0x05, 0xf6, 0x9b, 0x15, 0xfc, 0x9d, 0x84, 0x46, 0x9d, + 0x9b, 0x17, 0x2f, 0x84, 0xd4, 0xec, 0x71, 0x19, 0xe9, 0xc5, 0x48, 0xb1, 0x80, 0xb6, 0x22, 0xd0, + 0x96, 0x70, 0x21, 0x92, 0x96, 0xee, 0xad, 0x6d, 0xd1, 0xa1, 0xae, 0x2f, 0xc0, 0x17, 0x23, 0xd4, + 0xec, 0x2a, 0x98, 0x8f, 0x18, 0x0d, 0x8c, 0x4b, 0x82, 0x71, 0x01, 0xcf, 0x85, 0x32, 0x7a, 0x1c, + 0x05, 0xfe, 0x4a, 0x42, 0x67, 0xc0, 0x1c, 0xe0, 0xf9, 0x90, 0x62, 0x7e, 0x5f, 0x91, 0x5e, 0x88, + 0x12, 0x0a, 0x50, 0x17, 0x05, 0xd4, 0x05, 0x7c, 0x3e, 0x14, 0x0a, 0xfc, 0x07, 0xfe, 0x5e, 0x42, + 0x71, 0x8f, 0xc1, 0xc0, 0x61, 0x0a, 0xf4, 0x7b, 0x94, 0x74, 0x21, 0x6a, 0x38, 0xc0, 0x2d, 0x0b, + 0xb8, 0x45, 0x3c, 0x1f, 0x0a, 0xe7, 0xb5, 0x36, 0xf8, 0xbe, 0x84, 0x26, 0x7b, 0x8d, 0x05, 0x2e, + 0x86, 0xd4, 0x1d, 0x60, 0x78, 0xd2, 0xa5, 0xa1, 0x72, 0x00, 0xf8, 0xb2, 0x00, 0x2e, 0xe3, 0xd5, + 0x60, 0x60, 0xf7, 0x1e, 0x60, 0xca, 0x6d, 0xff, 0x1d, 0xb2, 0xaf, 0xd8, 0x26, 0x06, 0xff, 0x24, + 0xa1, 0xb8, 0xc7, 0x56, 0x84, 0x2a, 0xdc, 0x6f, 0x72, 0x42, 0x15, 0x0e, 0x70, 0x2b, 0xf2, 0xab, + 0x02, 0x78, 0x15, 0xaf, 0x0c, 0x0f, 0x6c, 0x39, 0x1a, 0x7c, 0x20, 0xa1, 0xc9, 0xde, 0x0b, 0x3b, + 0x54, 0xee, 0x01, 0x9e, 0x27, 0x54, 0xee, 0x41, 0xde, 0x45, 0x7e, 0x4b, 0xd0, 0x5f, 0xc1, 0xeb, + 0xc3, 0xd3, 0xf7, 0x19, 0x09, 0xfc, 0x8b, 0x84, 0xa6, 0xfa, 0xbc, 0x07, 0x1e, 0x86, 0xcb, 0xfd, + 0x9e, 0x5f, 0x1a, 0x2e, 0x09, 0xba, 0x79, 0x49, 0x74, 0xf3, 0x02, 0x2e, 0x3d, 0xb6, 0x9b, 0x7e, + 0x17, 0x84, 0x7f, 0x95, 0x50, 0xc2, 0x77, 0x59, 0x87, 0x5e, 0x08, 0x41, 0xc6, 0x26, 0xf4, 0x42, + 0x08, 0x74, 0x28, 0xf2, 0x1b, 0x82, 0xb8, 0x82, 0x2f, 0x0f, 0x24, 0x6e, 0x68, 0x8f, 0xd5, 0x5f, + 0x88, 0xff, 0xb3, 0x84, 0x26, 0xfc, 0x5e, 0x03, 0x47, 0xc6, 0x71, 0x65, 0x5f, 0x1e, 0x22, 0x03, + 0x3a, 0x58, 0x15, 0x1d, 0x14, 0xf1, 0xd2, 0x10, 0x9a, 0xdb, 0x82, 0x7f, 0x26, 0xa1, 0x11, 0xdb, + 0x52, 0xe0, 0xb9, 0x90, 0xba, 0x3e, 0x07, 0x93, 0x9e, 0x8f, 0x10, 0x09, 0x64, 0xe7, 0x05, 0x59, + 0x16, 0x67, 0x82, 0xc9, 0x6c, 0xff, 0x52, 0x79, 0xf3, 0xe0, 0x28, 0x2b, 0x3d, 0x38, 0xca, 0x4a, + 0x7f, 0x1e, 0x65, 0xa5, 0xaf, 0x8f, 0xb3, 0xb1, 0x07, 0xc7, 0xd9, 0xd8, 0xef, 0xc7, 0xd9, 0xd8, + 0x75, 0xc5, 0xfb, 0x83, 0xba, 0x49, 0x18, 0xd3, 0xea, 0x79, 0x7b, 0xa5, 0xba, 0x61, 0x52, 0xa5, + 0x53, 0x52, 0x76, 0x9d, 0x35, 0xc5, 0xaf, 0xeb, 0xed, 0x11, 0xf1, 0x6f, 0x96, 0xd2, 0xbf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x7c, 0x70, 0xc5, 0xf5, 0x32, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -1558,56 +1433,45 @@ type QueryServer interface { } // UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct{} +type UnimplementedQueryServer struct { +} func (*UnimplementedQueryServer) ExchangeRate(ctx context.Context, req *QueryExchangeRateRequest) (*QueryExchangeRateResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ExchangeRate not implemented") } - func (*UnimplementedQueryServer) ExchangeRates(ctx context.Context, req *QueryExchangeRatesRequest) (*QueryExchangeRatesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ExchangeRates not implemented") } - func (*UnimplementedQueryServer) TobinTax(ctx context.Context, req *QueryTobinTaxRequest) (*QueryTobinTaxResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TobinTax not implemented") } - func (*UnimplementedQueryServer) TobinTaxes(ctx context.Context, req *QueryTobinTaxesRequest) (*QueryTobinTaxesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TobinTaxes not implemented") } - func (*UnimplementedQueryServer) Actives(ctx context.Context, req *QueryActivesRequest) (*QueryActivesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Actives not implemented") } - func (*UnimplementedQueryServer) VoteTargets(ctx context.Context, req *QueryVoteTargetsRequest) (*QueryVoteTargetsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method VoteTargets not implemented") } - func (*UnimplementedQueryServer) FeederDelegation(ctx context.Context, req *QueryFeederDelegationRequest) (*QueryFeederDelegationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method FeederDelegation not implemented") } - func (*UnimplementedQueryServer) MissCounter(ctx context.Context, req *QueryMissCounterRequest) (*QueryMissCounterResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method MissCounter not implemented") } - func (*UnimplementedQueryServer) AggregatePrevote(ctx context.Context, req *QueryAggregatePrevoteRequest) (*QueryAggregatePrevoteResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AggregatePrevote not implemented") } - func (*UnimplementedQueryServer) AggregatePrevotes(ctx context.Context, req *QueryAggregatePrevotesRequest) (*QueryAggregatePrevotesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AggregatePrevotes not implemented") } - func (*UnimplementedQueryServer) AggregateVote(ctx context.Context, req *QueryAggregateVoteRequest) (*QueryAggregateVoteResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AggregateVote not implemented") } - func (*UnimplementedQueryServer) AggregateVotes(ctx context.Context, req *QueryAggregateVotesRequest) (*QueryAggregateVotesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AggregateVotes not implemented") } - func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } @@ -2698,7 +2562,6 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *QueryExchangeRateRequest) Size() (n int) { if m == nil { return 0 @@ -3013,11 +2876,9 @@ func (m *QueryParamsResponse) Size() (n int) { func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *QueryExchangeRateRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3100,7 +2961,6 @@ func (m *QueryExchangeRateRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryExchangeRateResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3185,7 +3045,6 @@ func (m *QueryExchangeRateResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryExchangeRatesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3236,7 +3095,6 @@ func (m *QueryExchangeRatesRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryExchangeRatesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3321,7 +3179,6 @@ func (m *QueryExchangeRatesResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTobinTaxRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3404,7 +3261,6 @@ func (m *QueryTobinTaxRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTobinTaxResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3489,7 +3345,6 @@ func (m *QueryTobinTaxResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTobinTaxesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3540,7 +3395,6 @@ func (m *QueryTobinTaxesRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTobinTaxesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3625,7 +3479,6 @@ func (m *QueryTobinTaxesResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryActivesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3676,7 +3529,6 @@ func (m *QueryActivesRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryActivesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3759,7 +3611,6 @@ func (m *QueryActivesResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryVoteTargetsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3810,7 +3661,6 @@ func (m *QueryVoteTargetsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryVoteTargetsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3893,7 +3743,6 @@ func (m *QueryVoteTargetsResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryFeederDelegationRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3976,7 +3825,6 @@ func (m *QueryFeederDelegationRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryFeederDelegationResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4059,7 +3907,6 @@ func (m *QueryFeederDelegationResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryMissCounterRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4142,7 +3989,6 @@ func (m *QueryMissCounterRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryMissCounterResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4212,7 +4058,6 @@ func (m *QueryMissCounterResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryAggregatePrevoteRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4295,7 +4140,6 @@ func (m *QueryAggregatePrevoteRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryAggregatePrevoteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4379,7 +4223,6 @@ func (m *QueryAggregatePrevoteResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryAggregatePrevotesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4430,7 +4273,6 @@ func (m *QueryAggregatePrevotesRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryAggregatePrevotesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4515,7 +4357,6 @@ func (m *QueryAggregatePrevotesResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryAggregateVoteRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4598,7 +4439,6 @@ func (m *QueryAggregateVoteRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryAggregateVoteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4682,7 +4522,6 @@ func (m *QueryAggregateVoteResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryAggregateVotesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4733,7 +4572,6 @@ func (m *QueryAggregateVotesRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryAggregateVotesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4818,7 +4656,6 @@ func (m *QueryAggregateVotesResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4869,7 +4706,6 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4953,7 +4789,6 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/oracle/types/query.pb.gw.go b/x/oracle/types/query.pb.gw.go index fa9043576..662167cc8 100644 --- a/x/oracle/types/query.pb.gw.go +++ b/x/oracle/types/query.pb.gw.go @@ -25,15 +25,13 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = runtime.String - _ = utilities.NewDoubleArray - _ = descriptor.ForMessage - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join func request_Query_ExchangeRate_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryExchangeRateRequest @@ -59,6 +57,7 @@ func request_Query_ExchangeRate_0(ctx context.Context, marshaler runtime.Marshal msg, err := client.ExchangeRate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_ExchangeRate_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -85,6 +84,7 @@ func local_request_Query_ExchangeRate_0(ctx context.Context, marshaler runtime.M msg, err := server.ExchangeRate(ctx, &protoReq) return msg, metadata, err + } func request_Query_ExchangeRates_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -93,6 +93,7 @@ func request_Query_ExchangeRates_0(ctx context.Context, marshaler runtime.Marsha msg, err := client.ExchangeRates(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_ExchangeRates_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -101,6 +102,7 @@ func local_request_Query_ExchangeRates_0(ctx context.Context, marshaler runtime. msg, err := server.ExchangeRates(ctx, &protoReq) return msg, metadata, err + } func request_Query_TobinTax_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -127,6 +129,7 @@ func request_Query_TobinTax_0(ctx context.Context, marshaler runtime.Marshaler, msg, err := client.TobinTax(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_TobinTax_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -153,6 +156,7 @@ func local_request_Query_TobinTax_0(ctx context.Context, marshaler runtime.Marsh msg, err := server.TobinTax(ctx, &protoReq) return msg, metadata, err + } func request_Query_TobinTaxes_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -161,6 +165,7 @@ func request_Query_TobinTaxes_0(ctx context.Context, marshaler runtime.Marshaler msg, err := client.TobinTaxes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_TobinTaxes_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -169,6 +174,7 @@ func local_request_Query_TobinTaxes_0(ctx context.Context, marshaler runtime.Mar msg, err := server.TobinTaxes(ctx, &protoReq) return msg, metadata, err + } func request_Query_Actives_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -177,6 +183,7 @@ func request_Query_Actives_0(ctx context.Context, marshaler runtime.Marshaler, c msg, err := client.Actives(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Actives_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -185,6 +192,7 @@ func local_request_Query_Actives_0(ctx context.Context, marshaler runtime.Marsha msg, err := server.Actives(ctx, &protoReq) return msg, metadata, err + } func request_Query_VoteTargets_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -193,6 +201,7 @@ func request_Query_VoteTargets_0(ctx context.Context, marshaler runtime.Marshale msg, err := client.VoteTargets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_VoteTargets_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -201,6 +210,7 @@ func local_request_Query_VoteTargets_0(ctx context.Context, marshaler runtime.Ma msg, err := server.VoteTargets(ctx, &protoReq) return msg, metadata, err + } func request_Query_FeederDelegation_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -227,6 +237,7 @@ func request_Query_FeederDelegation_0(ctx context.Context, marshaler runtime.Mar msg, err := client.FeederDelegation(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_FeederDelegation_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -253,6 +264,7 @@ func local_request_Query_FeederDelegation_0(ctx context.Context, marshaler runti msg, err := server.FeederDelegation(ctx, &protoReq) return msg, metadata, err + } func request_Query_MissCounter_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -279,6 +291,7 @@ func request_Query_MissCounter_0(ctx context.Context, marshaler runtime.Marshale msg, err := client.MissCounter(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_MissCounter_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -305,6 +318,7 @@ func local_request_Query_MissCounter_0(ctx context.Context, marshaler runtime.Ma msg, err := server.MissCounter(ctx, &protoReq) return msg, metadata, err + } func request_Query_AggregatePrevote_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -331,6 +345,7 @@ func request_Query_AggregatePrevote_0(ctx context.Context, marshaler runtime.Mar msg, err := client.AggregatePrevote(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_AggregatePrevote_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -357,6 +372,7 @@ func local_request_Query_AggregatePrevote_0(ctx context.Context, marshaler runti msg, err := server.AggregatePrevote(ctx, &protoReq) return msg, metadata, err + } func request_Query_AggregatePrevotes_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -365,6 +381,7 @@ func request_Query_AggregatePrevotes_0(ctx context.Context, marshaler runtime.Ma msg, err := client.AggregatePrevotes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_AggregatePrevotes_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -373,6 +390,7 @@ func local_request_Query_AggregatePrevotes_0(ctx context.Context, marshaler runt msg, err := server.AggregatePrevotes(ctx, &protoReq) return msg, metadata, err + } func request_Query_AggregateVote_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -399,6 +417,7 @@ func request_Query_AggregateVote_0(ctx context.Context, marshaler runtime.Marsha msg, err := client.AggregateVote(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_AggregateVote_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -425,6 +444,7 @@ func local_request_Query_AggregateVote_0(ctx context.Context, marshaler runtime. msg, err := server.AggregateVote(ctx, &protoReq) return msg, metadata, err + } func request_Query_AggregateVotes_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -433,6 +453,7 @@ func request_Query_AggregateVotes_0(ctx context.Context, marshaler runtime.Marsh msg, err := client.AggregateVotes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_AggregateVotes_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -441,6 +462,7 @@ func local_request_Query_AggregateVotes_0(ctx context.Context, marshaler runtime msg, err := server.AggregateVotes(ctx, &protoReq) return msg, metadata, err + } func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -449,6 +471,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -457,6 +480,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal msg, err := server.Params(ctx, &protoReq) return msg, metadata, err + } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". @@ -464,6 +488,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { + mux.Handle("GET", pattern_Query_ExchangeRate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -484,6 +509,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_ExchangeRate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_ExchangeRates_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -506,6 +532,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_ExchangeRates_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TobinTax_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -528,6 +555,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TobinTax_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TobinTaxes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -550,6 +578,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TobinTaxes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Actives_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -572,6 +601,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Actives_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_VoteTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -594,6 +624,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_VoteTargets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_FeederDelegation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -616,6 +647,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_FeederDelegation_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_MissCounter_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -638,6 +670,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_MissCounter_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_AggregatePrevote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -660,6 +693,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_AggregatePrevote_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_AggregatePrevotes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -682,6 +716,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_AggregatePrevotes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_AggregateVote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -704,6 +739,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_AggregateVote_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_AggregateVotes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -726,6 +762,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_AggregateVotes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -748,6 +785,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -790,6 +828,7 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { + mux.Handle("GET", pattern_Query_ExchangeRate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -807,6 +846,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_ExchangeRate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_ExchangeRates_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -826,6 +866,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_ExchangeRates_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TobinTax_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -845,6 +886,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TobinTax_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TobinTaxes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -864,6 +906,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TobinTaxes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Actives_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -883,6 +926,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Actives_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_VoteTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -902,6 +946,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_VoteTargets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_FeederDelegation_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -921,6 +966,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_FeederDelegation_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_MissCounter_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -940,6 +986,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_MissCounter_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_AggregatePrevote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -959,6 +1006,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_AggregatePrevote_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_AggregatePrevotes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -978,6 +1026,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_AggregatePrevotes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_AggregateVote_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -997,6 +1046,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_AggregateVote_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_AggregateVotes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -1016,6 +1066,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_AggregateVotes_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -1035,6 +1086,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil diff --git a/x/oracle/types/test_utils.go b/x/oracle/types/test_utils.go index 185077e1e..de99127c3 100644 --- a/x/oracle/types/test_utils.go +++ b/x/oracle/types/test_utils.go @@ -5,12 +5,13 @@ import ( "math/rand" "time" + sdkmath "cosmossdk.io/math" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/tendermint/tendermint/crypto/secp256k1" - tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/cometbft/cometbft/crypto/secp256k1" + tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" ) const OracleDecPrecision = 8 @@ -69,11 +70,11 @@ func (sk DummyStakingKeeper) Validator(_ sdk.Context, address sdk.ValAddress) st return nil } -func (DummyStakingKeeper) TotalBondedTokens(sdk.Context) sdk.Int { +func (DummyStakingKeeper) TotalBondedTokens(sdk.Context) sdkmath.Int { return sdk.ZeroInt() } -func (DummyStakingKeeper) Slash(sdk.Context, sdk.ConsAddress, int64, int64, sdk.Dec) sdk.Int { +func (DummyStakingKeeper) Slash(sdk.Context, sdk.ConsAddress, int64, int64, sdk.Dec) sdkmath.Int { return sdk.ZeroInt() } @@ -94,7 +95,7 @@ func (DummyStakingKeeper) MaxValidators(sdk.Context) uint32 { } // PowerReduction - is the amount of staking tokens required for 1 unit of consensus-engine power -func (DummyStakingKeeper) PowerReduction(sdk.Context) (res sdk.Int) { +func (DummyStakingKeeper) PowerReduction(sdk.Context) (res sdkmath.Int) { res = sdk.DefaultPowerReduction return } @@ -118,23 +119,32 @@ func (MockValidator) TmConsPublicKey() (tmprotocrypto.PublicKey, error) { return tmprotocrypto.PublicKey{}, nil } func (MockValidator) GetConsAddr() (sdk.ConsAddress, error) { return nil, nil } -func (v MockValidator) GetTokens() sdk.Int { +func (v MockValidator) GetTokens() sdkmath.Int { return sdk.TokensFromConsensusPower(v.power, sdk.DefaultPowerReduction) } -func (v MockValidator) GetBondedTokens() sdk.Int { +func (v MockValidator) GetBondedTokens() sdkmath.Int { return sdk.TokensFromConsensusPower(v.power, sdk.DefaultPowerReduction) } -func (v MockValidator) GetConsensusPower(_ sdk.Int) int64 { return v.power } -func (v *MockValidator) SetConsensusPower(power int64) { v.power = power } -func (v MockValidator) GetCommission() sdk.Dec { return sdk.ZeroDec() } -func (v MockValidator) GetMinSelfDelegation() sdk.Int { return sdk.OneInt() } -func (v MockValidator) GetDelegatorShares() sdk.Dec { return sdk.NewDec(v.power) } -func (v MockValidator) TokensFromShares(sdk.Dec) sdk.Dec { return sdk.ZeroDec() } -func (v MockValidator) TokensFromSharesTruncated(sdk.Dec) sdk.Dec { return sdk.ZeroDec() } -func (v MockValidator) TokensFromSharesRoundUp(sdk.Dec) sdk.Dec { return sdk.ZeroDec() } -func (v MockValidator) SharesFromTokens(_ sdk.Int) (sdk.Dec, error) { return sdk.ZeroDec(), nil } -func (v MockValidator) SharesFromTokensTruncated(_ sdk.Int) (sdk.Dec, error) { +func (v MockValidator) GetConsensusPower(_ sdkmath.Int) int64 { return v.power } +func (v *MockValidator) SetConsensusPower(power int64) { v.power = power } +func (v MockValidator) GetCommission() sdk.Dec { return sdk.ZeroDec() } +func (v MockValidator) GetMinSelfDelegation() sdkmath.Int { return sdk.OneInt() } +func (v MockValidator) GetDelegatorShares() sdk.Dec { return sdk.NewDec(v.power) } +func (v MockValidator) TokensFromShares(sdk.Dec) sdk.Dec { return sdk.ZeroDec() } +func (v MockValidator) TokensFromSharesTruncated(sdk.Dec) sdk.Dec { + return sdk.ZeroDec() +} + +func (v MockValidator) TokensFromSharesRoundUp(sdk.Dec) sdk.Dec { + return sdk.ZeroDec() +} + +func (v MockValidator) SharesFromTokens(_ sdkmath.Int) (sdk.Dec, error) { + return sdk.ZeroDec(), nil +} + +func (v MockValidator) SharesFromTokensTruncated(_ sdkmath.Int) (sdk.Dec, error) { return sdk.ZeroDec(), nil } diff --git a/x/oracle/types/tx.pb.go b/x/oracle/types/tx.pb.go index 483b310ef..1990d80b7 100644 --- a/x/oracle/types/tx.pb.go +++ b/x/oracle/types/tx.pb.go @@ -6,24 +6,21 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -45,11 +42,9 @@ func (*MsgAggregateExchangeRatePrevote) ProtoMessage() {} func (*MsgAggregateExchangeRatePrevote) Descriptor() ([]byte, []int) { return fileDescriptor_ade38ec3545c6da7, []int{0} } - func (m *MsgAggregateExchangeRatePrevote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgAggregateExchangeRatePrevote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgAggregateExchangeRatePrevote.Marshal(b, m, deterministic) @@ -62,15 +57,12 @@ func (m *MsgAggregateExchangeRatePrevote) XXX_Marshal(b []byte, deterministic bo return b[:n], nil } } - func (m *MsgAggregateExchangeRatePrevote) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgAggregateExchangeRatePrevote.Merge(m, src) } - func (m *MsgAggregateExchangeRatePrevote) XXX_Size() int { return m.Size() } - func (m *MsgAggregateExchangeRatePrevote) XXX_DiscardUnknown() { xxx_messageInfo_MsgAggregateExchangeRatePrevote.DiscardUnknown(m) } @@ -78,7 +70,8 @@ func (m *MsgAggregateExchangeRatePrevote) XXX_DiscardUnknown() { var xxx_messageInfo_MsgAggregateExchangeRatePrevote proto.InternalMessageInfo // MsgAggregateExchangeRatePrevoteResponse defines the Msg/AggregateExchangeRatePrevote response type. -type MsgAggregateExchangeRatePrevoteResponse struct{} +type MsgAggregateExchangeRatePrevoteResponse struct { +} func (m *MsgAggregateExchangeRatePrevoteResponse) Reset() { *m = MsgAggregateExchangeRatePrevoteResponse{} @@ -88,11 +81,9 @@ func (*MsgAggregateExchangeRatePrevoteResponse) ProtoMessage() {} func (*MsgAggregateExchangeRatePrevoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_ade38ec3545c6da7, []int{1} } - func (m *MsgAggregateExchangeRatePrevoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgAggregateExchangeRatePrevoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgAggregateExchangeRatePrevoteResponse.Marshal(b, m, deterministic) @@ -105,15 +96,12 @@ func (m *MsgAggregateExchangeRatePrevoteResponse) XXX_Marshal(b []byte, determin return b[:n], nil } } - func (m *MsgAggregateExchangeRatePrevoteResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgAggregateExchangeRatePrevoteResponse.Merge(m, src) } - func (m *MsgAggregateExchangeRatePrevoteResponse) XXX_Size() int { return m.Size() } - func (m *MsgAggregateExchangeRatePrevoteResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgAggregateExchangeRatePrevoteResponse.DiscardUnknown(m) } @@ -135,11 +123,9 @@ func (*MsgAggregateExchangeRateVote) ProtoMessage() {} func (*MsgAggregateExchangeRateVote) Descriptor() ([]byte, []int) { return fileDescriptor_ade38ec3545c6da7, []int{2} } - func (m *MsgAggregateExchangeRateVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgAggregateExchangeRateVote) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgAggregateExchangeRateVote.Marshal(b, m, deterministic) @@ -152,15 +138,12 @@ func (m *MsgAggregateExchangeRateVote) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *MsgAggregateExchangeRateVote) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgAggregateExchangeRateVote.Merge(m, src) } - func (m *MsgAggregateExchangeRateVote) XXX_Size() int { return m.Size() } - func (m *MsgAggregateExchangeRateVote) XXX_DiscardUnknown() { xxx_messageInfo_MsgAggregateExchangeRateVote.DiscardUnknown(m) } @@ -168,7 +151,8 @@ func (m *MsgAggregateExchangeRateVote) XXX_DiscardUnknown() { var xxx_messageInfo_MsgAggregateExchangeRateVote proto.InternalMessageInfo // MsgAggregateExchangeRateVoteResponse defines the Msg/AggregateExchangeRateVote response type. -type MsgAggregateExchangeRateVoteResponse struct{} +type MsgAggregateExchangeRateVoteResponse struct { +} func (m *MsgAggregateExchangeRateVoteResponse) Reset() { *m = MsgAggregateExchangeRateVoteResponse{} } func (m *MsgAggregateExchangeRateVoteResponse) String() string { return proto.CompactTextString(m) } @@ -176,11 +160,9 @@ func (*MsgAggregateExchangeRateVoteResponse) ProtoMessage() {} func (*MsgAggregateExchangeRateVoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_ade38ec3545c6da7, []int{3} } - func (m *MsgAggregateExchangeRateVoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgAggregateExchangeRateVoteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgAggregateExchangeRateVoteResponse.Marshal(b, m, deterministic) @@ -193,15 +175,12 @@ func (m *MsgAggregateExchangeRateVoteResponse) XXX_Marshal(b []byte, determinist return b[:n], nil } } - func (m *MsgAggregateExchangeRateVoteResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgAggregateExchangeRateVoteResponse.Merge(m, src) } - func (m *MsgAggregateExchangeRateVoteResponse) XXX_Size() int { return m.Size() } - func (m *MsgAggregateExchangeRateVoteResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgAggregateExchangeRateVoteResponse.DiscardUnknown(m) } @@ -221,11 +200,9 @@ func (*MsgDelegateFeedConsent) ProtoMessage() {} func (*MsgDelegateFeedConsent) Descriptor() ([]byte, []int) { return fileDescriptor_ade38ec3545c6da7, []int{4} } - func (m *MsgDelegateFeedConsent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgDelegateFeedConsent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgDelegateFeedConsent.Marshal(b, m, deterministic) @@ -238,15 +215,12 @@ func (m *MsgDelegateFeedConsent) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } - func (m *MsgDelegateFeedConsent) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgDelegateFeedConsent.Merge(m, src) } - func (m *MsgDelegateFeedConsent) XXX_Size() int { return m.Size() } - func (m *MsgDelegateFeedConsent) XXX_DiscardUnknown() { xxx_messageInfo_MsgDelegateFeedConsent.DiscardUnknown(m) } @@ -254,7 +228,8 @@ func (m *MsgDelegateFeedConsent) XXX_DiscardUnknown() { var xxx_messageInfo_MsgDelegateFeedConsent proto.InternalMessageInfo // MsgDelegateFeedConsentResponse defines the Msg/DelegateFeedConsent response type. -type MsgDelegateFeedConsentResponse struct{} +type MsgDelegateFeedConsentResponse struct { +} func (m *MsgDelegateFeedConsentResponse) Reset() { *m = MsgDelegateFeedConsentResponse{} } func (m *MsgDelegateFeedConsentResponse) String() string { return proto.CompactTextString(m) } @@ -262,11 +237,9 @@ func (*MsgDelegateFeedConsentResponse) ProtoMessage() {} func (*MsgDelegateFeedConsentResponse) Descriptor() ([]byte, []int) { return fileDescriptor_ade38ec3545c6da7, []int{5} } - func (m *MsgDelegateFeedConsentResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgDelegateFeedConsentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgDelegateFeedConsentResponse.Marshal(b, m, deterministic) @@ -279,15 +252,12 @@ func (m *MsgDelegateFeedConsentResponse) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } - func (m *MsgDelegateFeedConsentResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgDelegateFeedConsentResponse.Merge(m, src) } - func (m *MsgDelegateFeedConsentResponse) XXX_Size() int { return m.Size() } - func (m *MsgDelegateFeedConsentResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgDelegateFeedConsentResponse.DiscardUnknown(m) } @@ -306,46 +276,44 @@ func init() { func init() { proto.RegisterFile("terra/oracle/v1beta1/tx.proto", fileDescriptor_ade38ec3545c6da7) } var fileDescriptor_ade38ec3545c6da7 = []byte{ - // 506 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x3f, 0x6f, 0xd3, 0x4e, - 0x18, 0xc7, 0x7d, 0xbf, 0x54, 0x55, 0x7b, 0x3f, 0x95, 0x82, 0x1b, 0x50, 0x1a, 0x15, 0xbb, 0x3a, - 0x10, 0x50, 0x09, 0x6c, 0x35, 0xc0, 0x12, 0x09, 0x09, 0xca, 0x1f, 0x89, 0x21, 0x12, 0xba, 0x81, - 0x81, 0x05, 0x5d, 0x9c, 0x87, 0x4b, 0x24, 0x37, 0x17, 0xdd, 0x1d, 0x51, 0xb2, 0x33, 0x20, 0xb1, - 0x30, 0xf0, 0x02, 0xba, 0x30, 0xf3, 0x36, 0x18, 0x3b, 0x32, 0x59, 0x28, 0x59, 0x98, 0x18, 0xfc, - 0x0a, 0x90, 0xef, 0x6c, 0x13, 0x44, 0xd2, 0xca, 0x6c, 0xd6, 0x7d, 0x3f, 0xcf, 0x3d, 0xdf, 0xe7, - 0xeb, 0x47, 0x87, 0xaf, 0x6a, 0x90, 0x92, 0x85, 0x42, 0xb2, 0x28, 0x86, 0x70, 0x7c, 0xd8, 0x05, - 0xcd, 0x0e, 0x43, 0x3d, 0x09, 0x46, 0x52, 0x68, 0xe1, 0xd6, 0x8d, 0x1c, 0x58, 0x39, 0xc8, 0xe5, - 0x66, 0x9d, 0x0b, 0x2e, 0x0c, 0x10, 0x66, 0x5f, 0x96, 0x25, 0x5f, 0x10, 0xf6, 0x3b, 0x8a, 0x3f, - 0xe2, 0x5c, 0x02, 0x67, 0x1a, 0x9e, 0x4e, 0xa2, 0x3e, 0x1b, 0x72, 0xa0, 0x4c, 0xc3, 0x0b, 0x09, - 0x63, 0xa1, 0xc1, 0xbd, 0x86, 0xd7, 0xfa, 0x4c, 0xf5, 0x1b, 0x68, 0x1f, 0xdd, 0xda, 0x3c, 0xda, - 0x4e, 0x13, 0xff, 0xff, 0x29, 0x3b, 0x8e, 0xdb, 0x24, 0x3b, 0x25, 0xd4, 0x88, 0xee, 0x01, 0x5e, - 0x7f, 0x03, 0xd0, 0x03, 0xd9, 0xf8, 0xcf, 0x60, 0x97, 0xd2, 0xc4, 0xdf, 0xb2, 0x98, 0x3d, 0x27, - 0x34, 0x07, 0xdc, 0x16, 0xde, 0x1c, 0xb3, 0x78, 0xd0, 0x63, 0x5a, 0xc8, 0x46, 0xcd, 0xd0, 0xf5, - 0x34, 0xf1, 0x2f, 0x5a, 0xba, 0x94, 0x08, 0xfd, 0x8d, 0xb5, 0x37, 0xde, 0x9f, 0xf8, 0xce, 0x8f, - 0x13, 0xdf, 0x21, 0x07, 0xf8, 0xe6, 0x39, 0x86, 0x29, 0xa8, 0x91, 0x18, 0x2a, 0x20, 0x3f, 0x11, - 0xde, 0x5b, 0xc5, 0xbe, 0xcc, 0x27, 0x53, 0x2c, 0xd6, 0x7f, 0x4f, 0x96, 0x9d, 0x12, 0x6a, 0x44, - 0xf7, 0x21, 0xbe, 0x00, 0x79, 0xe1, 0x6b, 0xc9, 0x34, 0xa8, 0x7c, 0xc2, 0xdd, 0x34, 0xf1, 0x2f, - 0x5b, 0xfc, 0x4f, 0x9d, 0xd0, 0x2d, 0x58, 0xe8, 0xa4, 0x16, 0xb2, 0xa9, 0x55, 0xca, 0x66, 0xad, - 0x6a, 0x36, 0x37, 0xf0, 0xf5, 0xb3, 0xe6, 0x2d, 0x83, 0x79, 0x87, 0xf0, 0x95, 0x8e, 0xe2, 0x4f, - 0x20, 0x36, 0xdc, 0x33, 0x80, 0xde, 0xe3, 0x4c, 0x18, 0x6a, 0x37, 0xc4, 0x1b, 0x62, 0x04, 0xd2, - 0xf4, 0xb7, 0xb1, 0xec, 0xa4, 0x89, 0xbf, 0x6d, 0xfb, 0x17, 0x0a, 0xa1, 0x25, 0x94, 0x15, 0xf4, - 0xf2, 0x7b, 0xf2, 0x60, 0x16, 0x0a, 0x0a, 0x85, 0xd0, 0x12, 0x5a, 0xb0, 0xbb, 0x8f, 0xbd, 0xe5, - 0x2e, 0x0a, 0xa3, 0xad, 0xcf, 0x35, 0x5c, 0xeb, 0x28, 0xee, 0x7e, 0x42, 0x78, 0xef, 0xcc, 0x1d, - 0xbd, 0x1f, 0x2c, 0x5b, 0xfa, 0xe0, 0x9c, 0x4d, 0x69, 0x3e, 0xf8, 0xa7, 0xb2, 0xc2, 0x9e, 0xfb, - 0x01, 0xe1, 0xdd, 0xd5, 0xdb, 0xd5, 0xaa, 0x76, 0x79, 0x56, 0xd3, 0x6c, 0x57, 0xaf, 0x29, 0xdd, - 0x4c, 0xf1, 0xce, 0xb2, 0x3f, 0x7a, 0x7b, 0xe5, 0x95, 0x4b, 0xe8, 0xe6, 0xbd, 0x2a, 0x74, 0xd1, - 0xfa, 0xe8, 0xf9, 0xd7, 0x99, 0x87, 0x4e, 0x67, 0x1e, 0xfa, 0x3e, 0xf3, 0xd0, 0xc7, 0xb9, 0xe7, - 0x9c, 0xce, 0x3d, 0xe7, 0xdb, 0xdc, 0x73, 0x5e, 0x85, 0x7c, 0xa0, 0xfb, 0x6f, 0xbb, 0x41, 0x24, - 0x8e, 0xc3, 0x28, 0x66, 0x4a, 0x0d, 0xa2, 0x3b, 0xf6, 0xf9, 0x8a, 0x84, 0x84, 0x70, 0xdc, 0x0a, - 0x27, 0xc5, 0x43, 0xa6, 0xa7, 0x23, 0x50, 0xdd, 0x75, 0xf3, 0x30, 0xdd, 0xfd, 0x15, 0x00, 0x00, - 0xff, 0xff, 0x86, 0xf2, 0x83, 0x2f, 0xe5, 0x04, 0x00, 0x00, + // 505 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0x7d, 0xa4, 0xaa, 0xda, 0x43, 0xa5, 0xe0, 0x16, 0x94, 0x46, 0xc5, 0xae, 0x0e, 0x04, + 0x54, 0x02, 0x5b, 0x4d, 0x61, 0x89, 0x84, 0x04, 0xe5, 0x8f, 0xc4, 0x10, 0x09, 0xdd, 0xc0, 0xc0, + 0x82, 0x2e, 0xce, 0xcb, 0x25, 0x92, 0x9b, 0x8b, 0xee, 0x8e, 0x28, 0xd9, 0x19, 0x90, 0x58, 0x18, + 0xf8, 0x00, 0x5d, 0x98, 0xf9, 0x1a, 0x8c, 0x1d, 0x99, 0x2c, 0x94, 0x2c, 0x4c, 0x0c, 0xfe, 0x04, + 0xc8, 0x77, 0xb6, 0x09, 0x22, 0x69, 0x65, 0x36, 0xeb, 0x9e, 0xdf, 0x7b, 0xef, 0xf3, 0x3e, 0x7e, + 0x75, 0xf8, 0xba, 0x06, 0x29, 0x59, 0x28, 0x24, 0x8b, 0x62, 0x08, 0x47, 0x07, 0x1d, 0xd0, 0xec, + 0x20, 0xd4, 0xe3, 0x60, 0x28, 0x85, 0x16, 0xee, 0xb6, 0x91, 0x03, 0x2b, 0x07, 0xb9, 0xdc, 0xd8, + 0xe6, 0x82, 0x0b, 0x03, 0x84, 0xd9, 0x97, 0x65, 0xc9, 0x57, 0x84, 0xfd, 0xb6, 0xe2, 0x8f, 0x39, + 0x97, 0xc0, 0x99, 0x86, 0x67, 0xe3, 0xa8, 0xc7, 0x06, 0x1c, 0x28, 0xd3, 0xf0, 0x52, 0xc2, 0x48, + 0x68, 0x70, 0x6f, 0xe0, 0x95, 0x1e, 0x53, 0xbd, 0x3a, 0xda, 0x43, 0x77, 0xd6, 0x8f, 0x36, 0xd3, + 0xc4, 0xbf, 0x38, 0x61, 0xc7, 0x71, 0x8b, 0x64, 0xa7, 0x84, 0x1a, 0xd1, 0xdd, 0xc7, 0xab, 0x6f, + 0x01, 0xba, 0x20, 0xeb, 0x17, 0x0c, 0x76, 0x25, 0x4d, 0xfc, 0x0d, 0x8b, 0xd9, 0x73, 0x42, 0x73, + 0xc0, 0x6d, 0xe2, 0xf5, 0x11, 0x8b, 0xfb, 0x5d, 0xa6, 0x85, 0xac, 0xd7, 0x0c, 0xbd, 0x9d, 0x26, + 0xfe, 0x65, 0x4b, 0x97, 0x12, 0xa1, 0x7f, 0xb0, 0xd6, 0xda, 0x87, 0x13, 0xdf, 0xf9, 0x79, 0xe2, + 0x3b, 0x64, 0x1f, 0xdf, 0x3e, 0xc7, 0x30, 0x05, 0x35, 0x14, 0x03, 0x05, 0xe4, 0x17, 0xc2, 0xbb, + 0xcb, 0xd8, 0x57, 0xf9, 0x64, 0x8a, 0xc5, 0xfa, 0xdf, 0xc9, 0xb2, 0x53, 0x42, 0x8d, 0xe8, 0x3e, + 0xc2, 0x97, 0x20, 0x2f, 0x7c, 0x23, 0x99, 0x06, 0x95, 0x4f, 0xb8, 0x93, 0x26, 0xfe, 0x55, 0x8b, + 0xff, 0xad, 0x13, 0xba, 0x01, 0x73, 0x9d, 0xd4, 0x5c, 0x36, 0xb5, 0x4a, 0xd9, 0xac, 0x54, 0xcd, + 0xe6, 0x16, 0xbe, 0x79, 0xd6, 0xbc, 0x65, 0x30, 0xef, 0x11, 0xbe, 0xd6, 0x56, 0xfc, 0x29, 0xc4, + 0x86, 0x7b, 0x0e, 0xd0, 0x7d, 0x92, 0x09, 0x03, 0xed, 0x86, 0x78, 0x4d, 0x0c, 0x41, 0x9a, 0xfe, + 0x36, 0x96, 0xad, 0x34, 0xf1, 0x37, 0x6d, 0xff, 0x42, 0x21, 0xb4, 0x84, 0xb2, 0x82, 0x6e, 0x7e, + 0x4f, 0x1e, 0xcc, 0x5c, 0x41, 0xa1, 0x10, 0x5a, 0x42, 0x73, 0x76, 0xf7, 0xb0, 0xb7, 0xd8, 0x45, + 0x61, 0xb4, 0xf9, 0xa5, 0x86, 0x6b, 0x6d, 0xc5, 0xdd, 0xcf, 0x08, 0xef, 0x9e, 0xb9, 0xa3, 0x0f, + 0x82, 0x45, 0x4b, 0x1f, 0x9c, 0xb3, 0x29, 0x8d, 0x87, 0xff, 0x55, 0x56, 0xd8, 0x73, 0x3f, 0x22, + 0xbc, 0xb3, 0x7c, 0xbb, 0x9a, 0xd5, 0x2e, 0xcf, 0x6a, 0x1a, 0xad, 0xea, 0x35, 0xa5, 0x9b, 0x09, + 0xde, 0x5a, 0xf4, 0x47, 0xef, 0x2e, 0xbd, 0x72, 0x01, 0xdd, 0xb8, 0x5f, 0x85, 0x2e, 0x5a, 0x1f, + 0xbd, 0xf8, 0x36, 0xf5, 0xd0, 0xe9, 0xd4, 0x43, 0x3f, 0xa6, 0x1e, 0xfa, 0x34, 0xf3, 0x9c, 0xd3, + 0x99, 0xe7, 0x7c, 0x9f, 0x79, 0xce, 0xeb, 0x90, 0xf7, 0x75, 0xef, 0x5d, 0x27, 0x88, 0xc4, 0x71, + 0x18, 0xc5, 0x4c, 0xa9, 0x7e, 0x74, 0xcf, 0x3e, 0x5f, 0x91, 0x90, 0x10, 0x8e, 0x0e, 0xc3, 0x71, + 0xf1, 0x90, 0xe9, 0xc9, 0x10, 0x54, 0x67, 0xd5, 0x3c, 0x4c, 0x87, 0xbf, 0x03, 0x00, 0x00, 0xff, + 0xff, 0xa1, 0x97, 0xa6, 0xae, 0xe5, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -413,16 +381,15 @@ type MsgServer interface { } // UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct{} +type UnimplementedMsgServer struct { +} func (*UnimplementedMsgServer) AggregateExchangeRatePrevote(ctx context.Context, req *MsgAggregateExchangeRatePrevote) (*MsgAggregateExchangeRatePrevoteResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AggregateExchangeRatePrevote not implemented") } - func (*UnimplementedMsgServer) AggregateExchangeRateVote(ctx context.Context, req *MsgAggregateExchangeRateVote) (*MsgAggregateExchangeRateVoteResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AggregateExchangeRateVote not implemented") } - func (*UnimplementedMsgServer) DelegateFeedConsent(ctx context.Context, req *MsgDelegateFeedConsent) (*MsgDelegateFeedConsentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DelegateFeedConsent not implemented") } @@ -718,7 +685,6 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *MsgAggregateExchangeRatePrevote) Size() (n int) { if m == nil { return 0 @@ -812,11 +778,9 @@ func (m *MsgDelegateFeedConsentResponse) Size() (n int) { func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *MsgAggregateExchangeRatePrevote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -963,7 +927,6 @@ func (m *MsgAggregateExchangeRatePrevote) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgAggregateExchangeRatePrevoteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1014,7 +977,6 @@ func (m *MsgAggregateExchangeRatePrevoteResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgAggregateExchangeRateVote) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1193,7 +1155,6 @@ func (m *MsgAggregateExchangeRateVote) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgAggregateExchangeRateVoteResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1244,7 +1205,6 @@ func (m *MsgAggregateExchangeRateVoteResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgDelegateFeedConsent) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1359,7 +1319,6 @@ func (m *MsgDelegateFeedConsent) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgDelegateFeedConsentResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1410,7 +1369,6 @@ func (m *MsgDelegateFeedConsentResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/oracle/types/vote_test.go b/x/oracle/types/vote_test.go index 3bc4d7119..ef565a410 100644 --- a/x/oracle/types/vote_test.go +++ b/x/oracle/types/vote_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v3/x/oracle/types" "github.com/stretchr/testify/require" ) diff --git a/x/treasury/abci.go b/x/treasury/abci.go index cd4d5ee81..7938fd7f5 100644 --- a/x/treasury/abci.go +++ b/x/treasury/abci.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/keeper" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/keeper" + "github.com/classic-terra/core/v3/x/treasury/types" ) // EndBlocker is called at the end of every block diff --git a/x/treasury/abci_test.go b/x/treasury/abci_test.go index 90dd6c3c2..f01063b7f 100644 --- a/x/treasury/abci_test.go +++ b/x/treasury/abci_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/keeper" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/keeper" + "github.com/classic-terra/core/v3/x/treasury/types" ) func TestBurnAddress(t *testing.T) { diff --git a/x/treasury/client/cli/gov_tx.go b/x/treasury/client/cli/gov_tx.go index 69b3d8662..c289fe30e 100644 --- a/x/treasury/client/cli/gov_tx.go +++ b/x/treasury/client/cli/gov_tx.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/treasury/client/cli/query.go b/x/treasury/client/cli/query.go index c1fd4db1b..516cd199c 100644 --- a/x/treasury/client/cli/query.go +++ b/x/treasury/client/cli/query.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" "github.com/spf13/cobra" diff --git a/x/treasury/client/proposal_handler.go b/x/treasury/client/proposal_handler.go index e3155124c..ae1da5a40 100644 --- a/x/treasury/client/proposal_handler.go +++ b/x/treasury/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/classic-terra/core/v2/x/treasury/client/cli" + "github.com/classic-terra/core/v3/x/treasury/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/treasury/exported/alias.go b/x/treasury/exported/alias.go index 817375cf8..b335a7ac9 100644 --- a/x/treasury/exported/alias.go +++ b/x/treasury/exported/alias.go @@ -2,7 +2,7 @@ package exported import ( - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" ) var NewQueryClient = types.NewQueryClient diff --git a/x/treasury/genesis.go b/x/treasury/genesis.go index 8157be12b..ab144350a 100644 --- a/x/treasury/genesis.go +++ b/x/treasury/genesis.go @@ -3,11 +3,12 @@ package treasury import ( "fmt" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/keeper" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/keeper" + "github.com/classic-terra/core/v3/x/treasury/types" ) // InitGenesis initializes default parameters @@ -62,7 +63,7 @@ func ExportGenesis(ctx sdk.Context, keeper keeper.Keeper) (data *types.GenesisSt epochInitialIssuance := keeper.GetEpochInitialIssuance(ctx) var taxCaps []types.TaxCap - keeper.IterateTaxCap(ctx, func(denom string, taxCap sdk.Int) bool { + keeper.IterateTaxCap(ctx, func(denom string, taxCap math.Int) bool { taxCaps = append(taxCaps, types.TaxCap{ Denom: denom, TaxCap: taxCap, diff --git a/x/treasury/genesis_test.go b/x/treasury/genesis_test.go index 22780ee41..08cfc2782 100644 --- a/x/treasury/genesis_test.go +++ b/x/treasury/genesis_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/keeper" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/keeper" ) func TestExportInitGenesis(t *testing.T) { diff --git a/x/treasury/keeper/alias_functions.go b/x/treasury/keeper/alias_functions.go index 87a06c4a3..7a904f3c8 100644 --- a/x/treasury/keeper/alias_functions.go +++ b/x/treasury/keeper/alias_functions.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" ) // GetTreasuryModuleAccount returns treasury ModuleAccount diff --git a/x/treasury/keeper/burn_account.go b/x/treasury/keeper/burn_account.go index 7db0cfb68..88bd8e6f2 100644 --- a/x/treasury/keeper/burn_account.go +++ b/x/treasury/keeper/burn_account.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/burn_account_test.go b/x/treasury/keeper/burn_account_test.go index 7ae3cb7b0..ddc02dc93 100644 --- a/x/treasury/keeper/burn_account_test.go +++ b/x/treasury/keeper/burn_account_test.go @@ -3,7 +3,7 @@ package keeper import ( "testing" - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" "github.com/stretchr/testify/require" ) diff --git a/x/treasury/keeper/gov.go b/x/treasury/keeper/gov.go index 444d9ec91..4b852437d 100644 --- a/x/treasury/keeper/gov.go +++ b/x/treasury/keeper/gov.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/indicator.go b/x/treasury/keeper/indicator.go index 037d81a94..90cbae6de 100644 --- a/x/treasury/keeper/indicator.go +++ b/x/treasury/keeper/indicator.go @@ -1,7 +1,7 @@ package keeper import ( - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/indicator_test.go b/x/treasury/keeper/indicator_test.go index 44e5d24b2..59f9ab1a1 100644 --- a/x/treasury/keeper/indicator_test.go +++ b/x/treasury/keeper/indicator_test.go @@ -3,7 +3,8 @@ package keeper import ( "testing" - core "github.com/classic-terra/core/v2/types" + "cosmossdk.io/math" + core "github.com/classic-terra/core/v3/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" @@ -125,7 +126,7 @@ func TestLoadIndicatorByEpoch(t *testing.T) { input.TreasuryKeeper.SetSR(input.Ctx, int64(epoch), SR) } - TSLArr := []sdk.Int{ + TSLArr := []math.Int{ sdk.NewInt(1000000), sdk.NewInt(2000000), sdk.NewInt(3000000), diff --git a/x/treasury/keeper/keeper.go b/x/treasury/keeper/keeper.go index 3df60352f..43ede039e 100644 --- a/x/treasury/keeper/keeper.go +++ b/x/treasury/keeper/keeper.go @@ -3,17 +3,18 @@ package keeper import ( "fmt" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" ) @@ -118,21 +119,21 @@ func (k Keeper) GetRewardWeight(ctx sdk.Context) sdk.Dec { } // SetRewardWeight sets the reward weight -func (k Keeper) SetRewardWeight(ctx sdk.Context, rewardWeight sdk.Dec) { +func (k Keeper) SetRewardWeight(ctx sdk.Context, rewardWeight math.LegacyDec) { store := ctx.KVStore(k.storeKey) b := k.cdc.MustMarshal(&sdk.DecProto{Dec: rewardWeight}) store.Set(types.RewardWeightKey, b) } // SetTaxCap sets the tax cap denominated in integer units of the reference {denom} -func (k Keeper) SetTaxCap(ctx sdk.Context, denom string, cap sdk.Int) { +func (k Keeper) SetTaxCap(ctx sdk.Context, denom string, cap math.Int) { store := ctx.KVStore(k.storeKey) bz := k.cdc.MustMarshal(&sdk.IntProto{Int: cap}) store.Set(types.GetTaxCapKey(denom), bz) } // GetTaxCap gets the tax cap denominated in integer units of the reference {denom} -func (k Keeper) GetTaxCap(ctx sdk.Context, denom string) sdk.Int { +func (k Keeper) GetTaxCap(ctx sdk.Context, denom string) math.Int { store := ctx.KVStore(k.storeKey) bz := store.Get(types.GetTaxCapKey(denom)) if bz == nil { @@ -146,7 +147,7 @@ func (k Keeper) GetTaxCap(ctx sdk.Context, denom string) sdk.Int { } // IterateTaxCap iterates all tax cap -func (k Keeper) IterateTaxCap(ctx sdk.Context, handler func(denom string, taxCap sdk.Int) (stop bool)) { +func (k Keeper) IterateTaxCap(ctx sdk.Context, handler func(denom string, taxCap math.Int) (stop bool)) { store := ctx.KVStore(k.storeKey) iter := sdk.KVStorePrefixIterator(store, types.TaxCapKey) @@ -234,7 +235,7 @@ func (k Keeper) GetEpochInitialIssuance(ctx sdk.Context) sdk.Coins { } // PeekEpochSeigniorage returns epoch seigniorage -func (k Keeper) PeekEpochSeigniorage(ctx sdk.Context) sdk.Int { +func (k Keeper) PeekEpochSeigniorage(ctx sdk.Context) math.Int { epochIssuance := k.bankKeeper.GetSupply(ctx, core.MicroLunaDenom).Amount preEpochIssuance := k.GetEpochInitialIssuance(ctx).AmountOf(core.MicroLunaDenom) epochSeigniorage := preEpochIssuance.Sub(epochIssuance) @@ -315,13 +316,13 @@ func (k Keeper) ClearSRs(ctx sdk.Context) { } // GetTSL returns the total staked luna for the epoch -func (k Keeper) GetTSL(ctx sdk.Context, epoch int64) sdk.Int { +func (k Keeper) GetTSL(ctx sdk.Context, epoch int64) math.Int { store := ctx.KVStore(k.storeKey) bz := store.Get(types.GetTSLKey(epoch)) ip := sdk.IntProto{} if bz == nil { - ip.Int = sdk.ZeroInt() + ip.Int = math.ZeroInt() } else { k.cdc.MustUnmarshal(bz, &ip) } @@ -330,7 +331,7 @@ func (k Keeper) GetTSL(ctx sdk.Context, epoch int64) sdk.Int { } // SetTSL stores the total staked luna for the epoch -func (k Keeper) SetTSL(ctx sdk.Context, epoch int64, tsl sdk.Int) { +func (k Keeper) SetTSL(ctx sdk.Context, epoch int64, tsl math.Int) { store := ctx.KVStore(k.storeKey) bz := k.cdc.MustMarshal(&sdk.IntProto{Int: tsl}) diff --git a/x/treasury/keeper/keeper_test.go b/x/treasury/keeper/keeper_test.go index 5809bd9b5..33ce21ff8 100644 --- a/x/treasury/keeper/keeper_test.go +++ b/x/treasury/keeper/keeper_test.go @@ -4,14 +4,15 @@ import ( "math/rand" "testing" + "cosmossdk.io/math" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto/secp256k1" + "github.com/cometbft/cometbft/crypto/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/types" ) func TestRewardWeight(t *testing.T) { @@ -53,7 +54,7 @@ func TestIterateTaxCap(t *testing.T) { input.TreasuryKeeper.SetTaxCap(input.Ctx, core.MicroUSDDenom, usdCap) input.TreasuryKeeper.SetTaxCap(input.Ctx, core.MicroKRWDenom, krwCap) - input.TreasuryKeeper.IterateTaxCap(input.Ctx, func(denom string, taxCap sdk.Int) bool { + input.TreasuryKeeper.IterateTaxCap(input.Ctx, func(denom string, taxCap math.Int) bool { switch denom { case core.MicroCNYDenom: require.Equal(t, cnyCap, taxCap) diff --git a/x/treasury/keeper/legacy_querier.go b/x/treasury/keeper/legacy_querier.go deleted file mode 100644 index 44c20e851..000000000 --- a/x/treasury/keeper/legacy_querier.go +++ /dev/null @@ -1,199 +0,0 @@ -package keeper - -import ( - "math" - - abci "github.com/tendermint/tendermint/abci/types" - - "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/types/query" - - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/types" -) - -// NewLegacyQuerier is the module level router for state queries -func NewLegacyQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return func(ctx sdk.Context, path []string, req abci.RequestQuery) (res []byte, err error) { - switch path[0] { - case types.QueryTaxRate: - return queryTaxRate(ctx, k, legacyQuerierCdc) - case types.QueryTaxCap: - return queryTaxCap(ctx, req, k, legacyQuerierCdc) - case types.QueryTaxCaps: - return queryTaxCaps(ctx, k, legacyQuerierCdc) - case types.QueryRewardWeight: - return queryRewardWeight(ctx, k, legacyQuerierCdc) - case types.QuerySeigniorageProceeds: - return querySeigniorageProceeds(ctx, k, legacyQuerierCdc) - case types.QueryTaxProceeds: - return queryTaxProceeds(ctx, k, legacyQuerierCdc) - case types.QueryParameters: - return queryParameters(ctx, k, legacyQuerierCdc) - case types.QueryIndicators: - return queryIndicators(ctx, k, legacyQuerierCdc) - case types.QueryBurnTaxExemptionList: - return queryBurnTaxExemptionList(ctx, req, k, legacyQuerierCdc) - default: - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown %s query endpoint: %s", types.ModuleName, path[0]) - } - } -} - -func queryBurnTaxExemptionList(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryBurnTaxExemptionListRequest - - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - sub := prefix.NewStore(ctx.KVStore(k.storeKey), types.BurnTaxExemptionListPrefix) - var addresses []string - - pageRes, err := query.FilteredPaginate(sub, params.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { - address := string(key) - addresses = append(addresses, address) - - return true, nil - }) - if err != nil { - return nil, err - } - - burnTaxExemptionListRes := &types.QueryBurnTaxExemptionListResponse{ - Addresses: addresses, - Pagination: pageRes, - } - - res, err := codec.MarshalJSONIndent(legacyQuerierCdc, burnTaxExemptionListRes) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return res, nil -} - -func queryIndicators(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - // Compute Total Staked Luna (TSL) - TSL := k.stakingKeeper.TotalBondedTokens(ctx) - - // Compute Tax Rewards (TR) - taxRewards := sdk.NewDecCoinsFromCoins(k.PeekEpochTaxProceeds(ctx)...) - TR := k.alignCoins(ctx, taxRewards, core.MicroSDRDenom) - - epoch := k.GetEpoch(ctx) - var res types.IndicatorQueryResponse - if epoch == 0 { - res = types.IndicatorQueryResponse{ - TRLYear: TR.QuoInt(TSL), - TRLMonth: TR.QuoInt(TSL), - } - } else { - params := k.GetParams(ctx) - previousEpochCtx := ctx.WithBlockHeight(ctx.BlockHeight() - int64(core.BlocksPerWeek)) - trlYear := k.rollingAverageIndicator(previousEpochCtx, int64(params.WindowLong-1), TRL) - trlMonth := k.rollingAverageIndicator(previousEpochCtx, int64(params.WindowShort-1), TRL) - - computedEpochForYear := int64(math.Min(float64(params.WindowLong-1), float64(epoch))) - computedEpochForMonty := int64(math.Min(float64(params.WindowShort-1), float64(epoch))) - - trlYear = trlYear.MulInt64(computedEpochForYear).Add(TR.QuoInt(TSL)).QuoInt64(computedEpochForYear + 1) - trlMonth = trlMonth.MulInt64(computedEpochForMonty).Add(TR.QuoInt(TSL)).QuoInt64(computedEpochForMonty + 1) - - res = types.IndicatorQueryResponse{ - TRLYear: trlYear, - TRLMonth: trlMonth, - } - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, res) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryTaxRate(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - taxRate := k.GetTaxRate(ctx) - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, taxRate) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryTaxCap(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryTaxCapParams - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - taxCap := k.GetTaxCap(ctx, params.Denom) - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, taxCap) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryTaxCaps(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var taxCaps types.TaxCapsQueryResponse - k.IterateTaxCap(ctx, func(denom string, taxCap sdk.Int) bool { - taxCaps = append(taxCaps, types.TaxCapsResponseItem{ - Denom: denom, - TaxCap: taxCap, - }) - return false - }) - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, taxCaps) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func queryRewardWeight(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - taxRate := k.GetRewardWeight(ctx) - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, taxRate) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -func querySeigniorageProceeds(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - seigniorage := k.PeekEpochSeigniorage(ctx) - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, seigniorage) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryTaxProceeds(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - proceeds := k.PeekEpochTaxProceeds(ctx) - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, proceeds) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} - -func queryParameters(ctx sdk.Context, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, k.GetParams(ctx)) - if err != nil { - return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - return bz, nil -} diff --git a/x/treasury/keeper/legacy_querier_test.go b/x/treasury/keeper/legacy_querier_test.go deleted file mode 100644 index 67ece779a..000000000 --- a/x/treasury/keeper/legacy_querier_test.go +++ /dev/null @@ -1,350 +0,0 @@ -package keeper - -import ( - "strings" - "testing" - - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/types" - - "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/staking" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" -) - -const custom = "custom" - -func getQueriedTaxRate(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier, _ int64) sdk.Dec { - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryTaxRate}, "/"), - Data: nil, - } - - bz, err := querier(ctx, []string{types.QueryTaxRate}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var response sdk.Dec - err2 := cdc.UnmarshalJSON(bz, &response) - require.Nil(t, err2) - - return response -} - -func getQueriedTaxCap(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier, denom string) sdk.Int { - params := types.QueryTaxCapParams{ - Denom: denom, - } - - bz, err := cdc.MarshalJSON(params) - require.NoError(t, err) - - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryTaxCap}, "/"), - Data: bz, - } - - bz, err = querier(ctx, []string{types.QueryTaxCap}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var response sdk.Int - err2 := cdc.UnmarshalJSON(bz, &response) - require.Nil(t, err2) - - return response -} - -func getQueriedTaxCaps(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier) types.TaxCapsQueryResponse { - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryTaxCaps}, "/"), - Data: nil, - } - - bz, err := querier(ctx, []string{types.QueryTaxCaps}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var response types.TaxCapsQueryResponse - err2 := cdc.UnmarshalJSON(bz, &response) - require.Nil(t, err2) - - return response -} - -func getQueriedRewardWeight(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier, _ int64) sdk.Dec { - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryRewardWeight}, "/"), - Data: nil, - } - - bz, err := querier(ctx, []string{types.QueryRewardWeight}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var response sdk.Dec - err2 := cdc.UnmarshalJSON(bz, &response) - require.Nil(t, err2) - - return response -} - -func getQueriedTaxProceeds(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier, _ int64) sdk.Coins { - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryTaxProceeds}, "/"), - Data: nil, - } - - bz, err := querier(ctx, []string{types.QueryTaxProceeds}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var response sdk.Coins - err2 := cdc.UnmarshalJSON(bz, &response) - require.Nil(t, err2) - - return response -} - -func getQueriedSeigniorageProceeds(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier, _ int64) sdk.Int { - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QuerySeigniorageProceeds}, "/"), - Data: nil, - } - - bz, err := querier(ctx, []string{types.QuerySeigniorageProceeds}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var response sdk.Int - err2 := cdc.UnmarshalJSON(bz, &response) - require.Nil(t, err2) - - return response -} - -func getQueriedParameters(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier) types.Params { - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryParameters}, "/"), - Data: []byte{}, - } - - bz, err := querier(ctx, []string{types.QueryParameters}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var params types.Params - err2 := cdc.UnmarshalJSON(bz, ¶ms) - require.Nil(t, err2) - - return params -} - -func getQueriedIndicators(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier) types.IndicatorQueryResponse { - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryIndicators}, "/"), - Data: []byte{}, - } - - bz, err := querier(ctx, []string{types.QueryIndicators}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var indicators types.IndicatorQueryResponse - err2 := cdc.UnmarshalJSON(bz, &indicators) - require.Nil(t, err2) - - return indicators -} - -func getQueriedBurnTaxExemptionList(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, querier sdk.Querier) types.QueryBurnTaxExemptionListResponse { - params := types.NewQueryBurnTaxExemptionListParams(0, 100) - bz, err := cdc.MarshalJSON(params) - require.Nil(t, err) - - query := abci.RequestQuery{ - Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryBurnTaxExemptionList}, "/"), - Data: bz, - } - - bz, err = querier(ctx, []string{types.QueryBurnTaxExemptionList}, query) - require.Nil(t, err) - require.NotNil(t, bz) - - var response types.QueryBurnTaxExemptionListResponse - err = cdc.UnmarshalJSON(bz, &response) - require.Nil(t, err) - - return response -} - -func TestLegacyQueryParams(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - - params := types.DefaultParams() - input.TreasuryKeeper.SetParams(input.Ctx, params) - - queriedParams := getQueriedParameters(t, input.Ctx, input.Cdc, querier) - - require.Equal(t, queriedParams, params) -} - -func TestLegacyQueryRewardWeight(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - - rewardWeight := sdk.NewDecWithPrec(77, 2) - input.TreasuryKeeper.SetRewardWeight(input.Ctx, rewardWeight) - - queriedRewardWeight := getQueriedRewardWeight(t, input.Ctx, input.Cdc, querier, input.TreasuryKeeper.GetEpoch(input.Ctx)) - - require.Equal(t, queriedRewardWeight, rewardWeight) -} - -func TestLegacyQueryTaxRate(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - - taxRate := sdk.NewDecWithPrec(1, 3) - input.TreasuryKeeper.SetTaxRate(input.Ctx, taxRate) - - queriedTaxRate := getQueriedTaxRate(t, input.Ctx, input.Cdc, querier, input.TreasuryKeeper.GetEpoch(input.Ctx)) - - require.Equal(t, queriedTaxRate, taxRate) -} - -func TestLegacyQueryTaxCap(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - - params := input.TreasuryKeeper.GetParams(input.Ctx) - - // Get a currency super random; should default to policy coin. - queriedTaxCap := getQueriedTaxCap(t, input.Ctx, input.Cdc, querier, "hello") - - require.Equal(t, queriedTaxCap, params.TaxPolicy.Cap.Amount) -} - -func TestLegacyQueryTaxCaps(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - - input.TreasuryKeeper.SetTaxCap(input.Ctx, "ukrw", sdk.NewInt(1000000000)) - input.TreasuryKeeper.SetTaxCap(input.Ctx, "usdr", sdk.NewInt(1000000)) - input.TreasuryKeeper.SetTaxCap(input.Ctx, "uusd", sdk.NewInt(1200000)) - - // Get a currency super random; should default to policy coin. - queriedTaxCaps := getQueriedTaxCaps(t, input.Ctx, input.Cdc, querier) - - require.Equal(t, queriedTaxCaps, - types.TaxCapsQueryResponse{ - { - Denom: "ukrw", - TaxCap: sdk.NewInt(1000000000), - }, - { - Denom: "usdr", - TaxCap: sdk.NewInt(1000000), - }, - - { - Denom: "uusd", - TaxCap: sdk.NewInt(1200000), - }, - }, - ) -} - -func TestLegacyQueryTaxProceeds(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - - taxProceeds := sdk.Coins{ - sdk.NewCoin(core.MicroSDRDenom, sdk.NewInt(1000).MulRaw(core.MicroUnit)), - } - input.TreasuryKeeper.RecordEpochTaxProceeds(input.Ctx, taxProceeds) - - queriedTaxProceeds := getQueriedTaxProceeds(t, input.Ctx, input.Cdc, querier, input.TreasuryKeeper.GetEpoch(input.Ctx)) - - require.Equal(t, queriedTaxProceeds, taxProceeds) -} - -func TestLegacyQuerySeigniorageProceeds(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - - targetSeigniorage := sdk.NewInt(10) - input.TreasuryKeeper.RecordEpochInitialIssuance(input.Ctx) - - input.Ctx = input.Ctx.WithBlockHeight(int64(core.BlocksPerWeek)) - input.BankKeeper.BurnCoins(input.Ctx, faucetAccountName, sdk.NewCoins(sdk.NewCoin(core.MicroLunaDenom, targetSeigniorage))) - - queriedSeigniorageProceeds := getQueriedSeigniorageProceeds(t, input.Ctx, input.Cdc, querier, input.TreasuryKeeper.GetEpoch(input.Ctx)) - - require.Equal(t, targetSeigniorage, queriedSeigniorageProceeds) -} - -func TestLegacyQueryIndicators(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - stakingMsgSvr := stakingkeeper.NewMsgServerImpl(input.StakingKeeper) - - stakingAmt := sdk.TokensFromConsensusPower(1, sdk.DefaultPowerReduction) - addr, val := ValAddrs[0], ValPubKeys[0] - addr1, val1 := ValAddrs[1], ValPubKeys[1] - _, err := stakingMsgSvr.CreateValidator(input.Ctx, NewTestMsgCreateValidator(addr, val, stakingAmt)) - require.NoError(t, err) - _, err = stakingMsgSvr.CreateValidator(input.Ctx, NewTestMsgCreateValidator(addr1, val1, stakingAmt)) - require.NoError(t, err) - - staking.EndBlocker(input.Ctx.WithBlockHeight(int64(core.BlocksPerWeek)-1), input.StakingKeeper) - - proceedsAmt := sdk.NewInt(1000000000000) - taxProceeds := sdk.NewCoins(sdk.NewCoin(core.MicroSDRDenom, proceedsAmt)) - input.TreasuryKeeper.RecordEpochTaxProceeds(input.Ctx, taxProceeds) - - targetIndicators := types.IndicatorQueryResponse{ - TRLYear: sdk.NewDecFromInt(proceedsAmt).QuoInt(stakingAmt.MulRaw(2)), - TRLMonth: sdk.NewDecFromInt(proceedsAmt).QuoInt(stakingAmt.MulRaw(2)), - } - - queriedIndicators := getQueriedIndicators(t, input.Ctx, input.Cdc, querier) - require.Equal(t, targetIndicators, queriedIndicators) - - // Update indicators - input.TreasuryKeeper.UpdateIndicators(input.Ctx) - - // Record same tax proceeds to get same trl - input.TreasuryKeeper.RecordEpochTaxProceeds(input.Ctx, taxProceeds) - - // Change context to next epoch - input.Ctx = input.Ctx.WithBlockHeight(int64(core.BlocksPerWeek)) - queriedIndicators = getQueriedIndicators(t, input.Ctx, input.Cdc, querier) - require.Equal(t, targetIndicators, queriedIndicators) -} - -// go test -v -run ^TestLegacyQueryBurnTaxExemptionList$ github.com/classic-terra/core/v2/x/treasury/keeper -func TestLegacyQueryBurnTaxExemptionList(t *testing.T) { - input := CreateTestInput(t) - querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) - - // add some address to burn tax exemption list - input.TreasuryKeeper.AddBurnTaxExemptionAddress(input.Ctx, "terra1dczz24r33fwlj0q5ra7rcdryjpk9hxm8rwy39t") - - targetRes := types.QueryBurnTaxExemptionListResponse{ - Addresses: []string{"terra1dczz24r33fwlj0q5ra7rcdryjpk9hxm8rwy39t"}, - Pagination: &query.PageResponse{ - NextKey: nil, - Total: 1, - }, - } - - queriedRes := getQueriedBurnTaxExemptionList(t, input.Ctx, input.Cdc, querier) - require.Equal(t, targetRes, queriedRes) -} diff --git a/x/treasury/keeper/migrations.go b/x/treasury/keeper/migrations.go index 45dc9b32e..aaf891eeb 100644 --- a/x/treasury/keeper/migrations.go +++ b/x/treasury/keeper/migrations.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/params.go b/x/treasury/keeper/params.go index 0ad8ebd6b..c9e101c0b 100644 --- a/x/treasury/keeper/params.go +++ b/x/treasury/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/policy_test.go b/x/treasury/keeper/policy_test.go index b4fdbfd41..0e9f31afd 100644 --- a/x/treasury/keeper/policy_test.go +++ b/x/treasury/keeper/policy_test.go @@ -3,9 +3,9 @@ package keeper import ( "testing" - core "github.com/classic-terra/core/v2/types" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" + "github.com/classic-terra/core/v3/x/treasury/types" "github.com/stretchr/testify/require" diff --git a/x/treasury/keeper/querier.go b/x/treasury/keeper/querier.go index 827536c8c..6f4c8cc09 100644 --- a/x/treasury/keeper/querier.go +++ b/x/treasury/keeper/querier.go @@ -7,12 +7,13 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/types" ) // querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over q @@ -59,7 +60,7 @@ func (q querier) TaxCaps(c context.Context, _ *types.QueryTaxCapsRequest) (*type ctx := sdk.UnwrapSDKContext(c) var taxCaps []types.QueryTaxCapsResponseItem - q.IterateTaxCap(ctx, func(denom string, taxCap sdk.Int) bool { + q.IterateTaxCap(ctx, func(denom string, taxCap sdkmath.Int) bool { taxCaps = append(taxCaps, types.QueryTaxCapsResponseItem{ Denom: denom, TaxCap: taxCap, diff --git a/x/treasury/keeper/querier_test.go b/x/treasury/keeper/querier_test.go index 1b72af1ec..ce1745959 100644 --- a/x/treasury/keeper/querier_test.go +++ b/x/treasury/keeper/querier_test.go @@ -3,8 +3,8 @@ package keeper import ( "testing" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/types" "github.com/stretchr/testify/require" diff --git a/x/treasury/keeper/seigniorage.go b/x/treasury/keeper/seigniorage.go index dbedbc8f9..1f3a1c70c 100644 --- a/x/treasury/keeper/seigniorage.go +++ b/x/treasury/keeper/seigniorage.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/types" ) // SettleSeigniorage computes seigniorage and distributes it to oracle and distribution(community-pool) account diff --git a/x/treasury/keeper/seigniorage_test.go b/x/treasury/keeper/seigniorage_test.go index b4c72b347..2f568465c 100644 --- a/x/treasury/keeper/seigniorage_test.go +++ b/x/treasury/keeper/seigniorage_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" "github.com/stretchr/testify/require" diff --git a/x/treasury/keeper/test_utils.go b/x/treasury/keeper/test_utils.go index 68027fb43..4ad7b4796 100644 --- a/x/treasury/keeper/test_utils.go +++ b/x/treasury/keeper/test_utils.go @@ -6,37 +6,38 @@ import ( "github.com/stretchr/testify/require" - customauth "github.com/classic-terra/core/v2/custom/auth" - custombank "github.com/classic-terra/core/v2/custom/bank" - customdistr "github.com/classic-terra/core/v2/custom/distribution" - customparams "github.com/classic-terra/core/v2/custom/params" - customstaking "github.com/classic-terra/core/v2/custom/staking" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/market" - marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" - markettypes "github.com/classic-terra/core/v2/x/market/types" - "github.com/classic-terra/core/v2/x/oracle" - oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" - "github.com/classic-terra/core/v2/x/treasury/types" - - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/secp256k1" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + customauth "github.com/classic-terra/core/v3/custom/auth" + custombank "github.com/classic-terra/core/v3/custom/bank" + customdistr "github.com/classic-terra/core/v3/custom/distribution" + customparams "github.com/classic-terra/core/v3/custom/params" + customstaking "github.com/classic-terra/core/v3/custom/staking" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/market" + marketkeeper "github.com/classic-terra/core/v3/x/market/keeper" + markettypes "github.com/classic-terra/core/v3/x/market/types" + "github.com/classic-terra/core/v3/x/oracle" + oraclekeeper "github.com/classic-terra/core/v3/x/oracle/keeper" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" + "github.com/classic-terra/core/v3/x/treasury/types" + + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "cosmossdk.io/math" + simparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp" - simparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" @@ -48,6 +49,7 @@ import ( capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/cosmos-sdk/x/staking" @@ -92,7 +94,7 @@ func MakeEncodingConfig(_ *testing.T) simparams.EncodingConfig { } var ( - ValPubKeys = simapp.CreateTestPubKeys(5) + ValPubKeys = simtestutil.CreateTestPubKeys(5) PubKeys = []crypto.PubKey{ secp256k1.GenPrivKey().PubKey(), @@ -123,7 +125,7 @@ type TestInput struct { AccountKeeper authkeeper.AccountKeeper BankKeeper bankkeeper.Keeper DistrKeeper distrkeeper.Keeper - StakingKeeper stakingkeeper.Keeper + StakingKeeper *stakingkeeper.Keeper MarketKeeper types.MarketKeeper OracleKeeper types.OracleKeeper } @@ -186,8 +188,8 @@ func CreateTestInput(t *testing.T) TestInput { } paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, keyParams, tKeyParams) - accountKeeper := authkeeper.NewAccountKeeper(appCodec, keyAcc, paramsKeeper.Subspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix()) - bankKeeper := bankkeeper.NewBaseKeeper(appCodec, keyBank, accountKeeper, paramsKeeper.Subspace(banktypes.ModuleName), blackListAddrs) + accountKeeper := authkeeper.NewAccountKeeper(appCodec, keyAcc, authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), authtypes.NewModuleAddress(govtypes.ModuleName).String()) + bankKeeper := bankkeeper.NewBaseKeeper(appCodec, keyBank, accountKeeper, blackListAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String()) totalSupply := sdk.NewCoins(sdk.NewCoin(core.MicroLunaDenom, InitTokens.MulRaw(int64(len(Addrs)*10)))) bankKeeper.MintCoins(ctx, faucetAccountName, totalSupply) @@ -197,7 +199,7 @@ func CreateTestInput(t *testing.T) TestInput { keyStaking, accountKeeper, bankKeeper, - paramsKeeper.Subspace(stakingtypes.ModuleName), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) stakingParams := stakingtypes.DefaultParams() @@ -205,16 +207,15 @@ func CreateTestInput(t *testing.T) TestInput { stakingKeeper.SetParams(ctx, stakingParams) distrKeeper := distrkeeper.NewKeeper( - appCodec, - keyDistr, paramsKeeper.Subspace(distrtypes.ModuleName), + appCodec, keyDistr, accountKeeper, bankKeeper, stakingKeeper, - authtypes.FeeCollectorName) + authtypes.FeeCollectorName, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + ) distrKeeper.SetFeePool(ctx, distrtypes.InitialFeePool()) distrParams := distrtypes.DefaultParams() distrParams.CommunityTax = sdk.NewDecWithPrec(2, 2) - distrParams.BaseProposerReward = sdk.NewDecWithPrec(1, 2) - distrParams.BonusProposerReward = sdk.NewDecWithPrec(4, 2) distrKeeper.SetParams(ctx, distrParams) stakingKeeper.SetHooks(stakingtypes.NewMultiStakingHooks(distrKeeper.Hooks())) @@ -260,11 +261,11 @@ func CreateTestInput(t *testing.T) TestInput { wasmOpts := []wasmkeeper.Option{} wasmKeeper := wasmkeeper.NewKeeper( appCodec, keyWasm, - paramsKeeper.Subspace(wasmtypes.ModuleName), accountKeeper, bankKeeper, stakingKeeper, - distrKeeper, + distrkeeper.NewQuerier(distrKeeper), + nil, nil, nil, scopedWasmKeeper, @@ -274,6 +275,7 @@ func CreateTestInput(t *testing.T) TestInput { "", wasmConfig, supportedFeatures, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), wasmOpts..., ) @@ -322,7 +324,7 @@ func CreateTestInput(t *testing.T) TestInput { } // NewTestMsgCreateValidator test msg creator -func NewTestMsgCreateValidator(address sdk.ValAddress, pubKey cryptotypes.PubKey, amt sdk.Int) *stakingtypes.MsgCreateValidator { +func NewTestMsgCreateValidator(address sdk.ValAddress, pubKey cryptotypes.PubKey, amt math.Int) *stakingtypes.MsgCreateValidator { commission := stakingtypes.NewCommissionRates(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()) msg, _ := stakingtypes.NewMsgCreateValidator( address, pubKey, sdk.NewCoin(core.MicroLunaDenom, amt), diff --git a/x/treasury/module.go b/x/treasury/module.go index 1a5375e5e..ebdf58951 100644 --- a/x/treasury/module.go +++ b/x/treasury/module.go @@ -6,13 +6,13 @@ import ( "fmt" "math/rand" - "github.com/classic-terra/core/v2/x/treasury/keeper" - "github.com/classic-terra/core/v2/x/treasury/simulation" + "github.com/classic-terra/core/v3/x/treasury/keeper" + "github.com/classic-terra/core/v3/x/treasury/simulation" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -21,8 +21,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/classic-terra/core/v2/x/treasury/client/cli" - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/client/cli" + "github.com/classic-terra/core/v3/x/treasury/types" ) var ( @@ -103,11 +103,6 @@ func (AppModule) Name() string { return types.ModuleName } // RegisterInvariants registers the treasury module invariants. func (AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} -// Route returns the message routing key for the treasury module. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, nil) -} - // NewHandler returns an sdk.Handler for the treasury module. func (am AppModule) NewHandler() sdk.Handler { return nil @@ -116,11 +111,6 @@ func (am AppModule) NewHandler() sdk.Handler { // QuerierRoute returns the treasury module's querier route name. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the treasury module sdk.Querier. -func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return keeper.NewLegacyQuerier(am.keeper, legacyQuerierCdc) -} - // RegisterServices registers module services. func (am AppModule) RegisterServices(cfg module.Configurator) { querier := keeper.NewQuerier(am.keeper) @@ -183,7 +173,7 @@ func (am AppModule) ProposalContents(_ module.SimulationState) []simtypes.Weight } // RandomizedParams creates randomized distribution param changes for the simulator. -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return simulation.ParamChanges(r) } diff --git a/x/treasury/proposal_handler.go b/x/treasury/proposal_handler.go index 56f21a0e5..3d42e35fa 100644 --- a/x/treasury/proposal_handler.go +++ b/x/treasury/proposal_handler.go @@ -1,11 +1,13 @@ package treasury import ( - "github.com/classic-terra/core/v2/x/treasury/keeper" - "github.com/classic-terra/core/v2/x/treasury/types" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + + "github.com/classic-terra/core/v3/x/treasury/keeper" + "github.com/classic-terra/core/v3/x/treasury/types" ) func NewProposalHandler(k keeper.Keeper) govv1beta1.Handler { @@ -16,7 +18,7 @@ func NewProposalHandler(k keeper.Keeper) govv1beta1.Handler { case *types.RemoveBurnTaxExemptionAddressProposal: return handleRemoveBurnTaxExemptionAddressProposal(ctx, k, c) default: - return sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized treasury proposal content type: %T", c) + return errorsmod.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized treasury proposal content type: %T", c) } } } diff --git a/x/treasury/simulation/decoder.go b/x/treasury/simulation/decoder.go index 1f1e994fa..d997dd164 100644 --- a/x/treasury/simulation/decoder.go +++ b/x/treasury/simulation/decoder.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/treasury/simulation/decoder_test.go b/x/treasury/simulation/decoder_test.go index 8be8d55f1..10cc06b39 100644 --- a/x/treasury/simulation/decoder_test.go +++ b/x/treasury/simulation/decoder_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/keeper" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/keeper" + "github.com/classic-terra/core/v3/x/treasury/types" ) func TestDecodeDistributionStore(t *testing.T) { diff --git a/x/treasury/simulation/genesis.go b/x/treasury/simulation/genesis.go index af7d95b69..5a8e703cf 100644 --- a/x/treasury/simulation/genesis.go +++ b/x/treasury/simulation/genesis.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/treasury/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/treasury/types" ) // Simulation parameter constants diff --git a/x/treasury/simulation/params.go b/x/treasury/simulation/params.go index d2504741f..9a6a7fa17 100644 --- a/x/treasury/simulation/params.go +++ b/x/treasury/simulation/params.go @@ -10,46 +10,46 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v3/x/treasury/types" ) // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(*rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{ - simulation.NewSimParamChange(types.ModuleName, string(types.KeyTaxPolicy), +func ParamChanges(*rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyTaxPolicy), func(r *rand.Rand) string { bz, _ := json.Marshal(GenTaxPolicy(r)) return string(bz) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyRewardPolicy), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyRewardPolicy), func(r *rand.Rand) string { bz, _ := json.Marshal(GenRewardPolicy(r)) return string(bz) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeySeigniorageBurdenTarget), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeySeigniorageBurdenTarget), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenSeigniorageBurdenTarget(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyMiningIncrement), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyMiningIncrement), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenMiningIncrement(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyWindowShort), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyWindowShort), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenWindowShort(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyWindowLong), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyWindowLong), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenWindowLong(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyWindowProbation), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyWindowProbation), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenWindowProbation(r)) }, diff --git a/x/treasury/types/errors.go b/x/treasury/types/errors.go index 1d76a4662..d24e15eef 100644 --- a/x/treasury/types/errors.go +++ b/x/treasury/types/errors.go @@ -1,7 +1,7 @@ package types import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + errorsmod "cosmossdk.io/errors" ) -var ErrNoSuchBurnTaxExemptionAddress = sdkerrors.Register(ModuleName, 1, "no such address in extemption list") +var ErrNoSuchBurnTaxExemptionAddress = errorsmod.Register(ModuleName, 1, "no such address in extemption list") diff --git a/x/treasury/types/exptected_keepers.go b/x/treasury/types/exptected_keepers.go index 86d27fc75..6951f79ba 100644 --- a/x/treasury/types/exptected_keepers.go +++ b/x/treasury/types/exptected_keepers.go @@ -1,11 +1,12 @@ package types import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + oracletypes "github.com/classic-terra/core/v3/x/oracle/types" ) // AccountKeeper expected account keeper @@ -30,7 +31,7 @@ type MarketKeeper interface { // StakingKeeper expected keeper for staking module type StakingKeeper interface { - TotalBondedTokens(sdk.Context) sdk.Int // total bonded tokens within the validator set + TotalBondedTokens(sdk.Context) math.Int // total bonded tokens within the validator set } // DistributionKeeper expected keeper for distribution module diff --git a/x/treasury/types/genesis.pb.go b/x/treasury/types/genesis.pb.go index 7b5820449..9675457d0 100644 --- a/x/treasury/types/genesis.pb.go +++ b/x/treasury/types/genesis.pb.go @@ -5,22 +5,20 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -45,11 +43,9 @@ func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { return fileDescriptor_c440a3f50aabab34, []int{0} } - func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) @@ -62,15 +58,12 @@ func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } - func (m *GenesisState) XXX_Merge(src proto.Message) { xxx_messageInfo_GenesisState.Merge(m, src) } - func (m *GenesisState) XXX_Size() int { return m.Size() } - func (m *GenesisState) XXX_DiscardUnknown() { xxx_messageInfo_GenesisState.DiscardUnknown(m) } @@ -124,11 +117,9 @@ func (*TaxCap) ProtoMessage() {} func (*TaxCap) Descriptor() ([]byte, []int) { return fileDescriptor_c440a3f50aabab34, []int{1} } - func (m *TaxCap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *TaxCap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_TaxCap.Marshal(b, m, deterministic) @@ -141,15 +132,12 @@ func (m *TaxCap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *TaxCap) XXX_Merge(src proto.Message) { xxx_messageInfo_TaxCap.Merge(m, src) } - func (m *TaxCap) XXX_Size() int { return m.Size() } - func (m *TaxCap) XXX_DiscardUnknown() { xxx_messageInfo_TaxCap.DiscardUnknown(m) } @@ -177,11 +165,9 @@ func (*EpochState) ProtoMessage() {} func (*EpochState) Descriptor() ([]byte, []int) { return fileDescriptor_c440a3f50aabab34, []int{2} } - func (m *EpochState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *EpochState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_EpochState.Marshal(b, m, deterministic) @@ -194,15 +180,12 @@ func (m *EpochState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *EpochState) XXX_Merge(src proto.Message) { xxx_messageInfo_EpochState.Merge(m, src) } - func (m *EpochState) XXX_Size() int { return m.Size() } - func (m *EpochState) XXX_DiscardUnknown() { xxx_messageInfo_EpochState.DiscardUnknown(m) } @@ -227,42 +210,44 @@ func init() { } var fileDescriptor_c440a3f50aabab34 = []byte{ - // 559 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xc1, 0x6a, 0x13, 0x41, - 0x1c, 0xc6, 0xb3, 0x6d, 0x9a, 0x9a, 0x49, 0x44, 0x3a, 0x84, 0xb2, 0xf6, 0xb0, 0x09, 0x41, 0x25, - 0x97, 0xee, 0x9a, 0x7a, 0x15, 0x84, 0x44, 0x29, 0xa1, 0x0a, 0x65, 0x23, 0x08, 0x05, 0x09, 0xff, - 0x6c, 0xfe, 0x6c, 0x86, 0x26, 0x33, 0xcb, 0xcc, 0xa4, 0x4d, 0x8f, 0xbe, 0x81, 0xcf, 0x21, 0x3e, - 0x48, 0x8f, 0x3d, 0x8a, 0x87, 0x2a, 0xc9, 0xdd, 0x67, 0x90, 0x99, 0xd9, 0xa6, 0x3d, 0x58, 0x91, - 0xe0, 0x29, 0xd9, 0xdd, 0x6f, 0x7e, 0xdf, 0x37, 0xff, 0xf9, 0x18, 0xf2, 0x44, 0xa3, 0x94, 0x10, - 0x69, 0x89, 0xa0, 0x66, 0xf2, 0x22, 0x3a, 0x6b, 0x0f, 0x51, 0x43, 0x3b, 0x4a, 0x91, 0xa3, 0x62, - 0x2a, 0xcc, 0xa4, 0xd0, 0x82, 0xee, 0x5a, 0x55, 0x78, 0xa3, 0x0a, 0x73, 0xd5, 0x5e, 0x2d, 0x15, - 0xa9, 0xb0, 0x92, 0xc8, 0xfc, 0x73, 0xea, 0xbd, 0xa7, 0xf7, 0x30, 0x57, 0xcb, 0x9d, 0x2c, 0x48, - 0x84, 0x9a, 0x0a, 0x15, 0x0d, 0x41, 0xe1, 0x4a, 0x93, 0x08, 0xc6, 0xdd, 0xf7, 0xe6, 0xaf, 0x22, - 0xa9, 0x1e, 0xba, 0x18, 0x7d, 0x0d, 0x1a, 0xe9, 0x4b, 0x52, 0xca, 0x40, 0xc2, 0x54, 0xf9, 0x5e, - 0xc3, 0x6b, 0x55, 0x0e, 0x82, 0xf0, 0xcf, 0xb1, 0xc2, 0x63, 0xab, 0xea, 0x14, 0x2f, 0xaf, 0xeb, - 0x85, 0x38, 0x5f, 0x43, 0x7b, 0xe4, 0x81, 0x86, 0xf9, 0x40, 0x82, 0x46, 0x7f, 0xa3, 0xe1, 0xb5, - 0xca, 0x9d, 0xd0, 0x7c, 0xff, 0x7e, 0x5d, 0x7f, 0x96, 0x32, 0x3d, 0x9e, 0x0d, 0xc3, 0x44, 0x4c, - 0xa3, 0x3c, 0x93, 0xfb, 0xd9, 0x57, 0xa3, 0xd3, 0x48, 0x5f, 0x64, 0xa8, 0xc2, 0xd7, 0x98, 0xc4, - 0xdb, 0x1a, 0xe6, 0xb1, 0x09, 0xd2, 0x27, 0x0f, 0x25, 0x9e, 0x83, 0x1c, 0x0d, 0xce, 0x91, 0xa5, - 0x63, 0xed, 0x6f, 0xae, 0xc5, 0xab, 0x3a, 0xc8, 0x07, 0xcb, 0xa0, 0xaf, 0x5c, 0xbe, 0x04, 0x32, - 0xe5, 0x17, 0x1b, 0x9b, 0x7f, 0xdb, 0xdf, 0x7b, 0x98, 0x77, 0x21, 0xcb, 0xf7, 0x67, 0x52, 0x75, - 0x21, 0x53, 0x94, 0x93, 0xaa, 0x01, 0x64, 0x52, 0x24, 0x88, 0x23, 0xe5, 0x6f, 0x59, 0xc8, 0xe3, - 0xd0, 0x79, 0x87, 0x66, 0xcc, 0x2b, 0x42, 0x57, 0x30, 0xde, 0x79, 0x6e, 0xd6, 0x7f, 0xf9, 0x51, - 0x6f, 0xfd, 0x43, 0x5e, 0xb3, 0x40, 0xc5, 0x15, 0x0d, 0xf3, 0xe3, 0x9c, 0x4f, 0x3f, 0x79, 0x64, - 0x17, 0x33, 0x91, 0x8c, 0x07, 0x8c, 0x33, 0xcd, 0x60, 0x32, 0x60, 0x4a, 0xcd, 0x80, 0x27, 0xe8, - 0x97, 0xfe, 0xbf, 0x75, 0xcd, 0x5a, 0xf5, 0x9c, 0x53, 0x2f, 0x37, 0xa2, 0x47, 0xa4, 0xea, 0x22, - 0x28, 0xd3, 0x10, 0xe5, 0x6f, 0x5b, 0xe3, 0xe6, 0x7d, 0x83, 0x7b, 0x63, 0xb4, 0xb6, 0x4c, 0xf9, - 0xf0, 0x2a, 0xb8, 0x7a, 0xa3, 0x9a, 0x29, 0x29, 0xb9, 0xc9, 0xd2, 0x1a, 0xd9, 0x1a, 0x21, 0x17, - 0x53, 0x5b, 0xb4, 0x72, 0xec, 0x1e, 0xe8, 0x21, 0xd9, 0xce, 0x4f, 0x68, 0x8d, 0x02, 0xf5, 0xb8, - 0x8e, 0x4b, 0xee, 0xa8, 0x9a, 0x5f, 0x37, 0x08, 0xb9, 0x8d, 0x62, 0xdc, 0x6c, 0x0c, 0xeb, 0x56, - 0x8c, 0xdd, 0x03, 0x7d, 0x47, 0x88, 0xed, 0xab, 0xed, 0xc8, 0x9a, 0x8d, 0x2d, 0x9b, 0xc6, 0x5a, - 0x00, 0xfd, 0x48, 0xa8, 0x42, 0x96, 0x72, 0x26, 0x24, 0xa4, 0x78, 0x83, 0x5d, 0xaf, 0xb8, 0x3b, - 0x77, 0x48, 0x39, 0xfe, 0x84, 0xec, 0x68, 0xa1, 0x61, 0x62, 0x0e, 0xe2, 0x14, 0x47, 0x83, 0xc9, - 0x8c, 0x83, 0x5f, 0x5c, 0x6b, 0x4a, 0x8f, 0x2c, 0xa8, 0x6f, 0x39, 0x6f, 0x67, 0x1c, 0x3a, 0x47, - 0x97, 0x8b, 0xc0, 0xbb, 0x5a, 0x04, 0xde, 0xcf, 0x45, 0xe0, 0x7d, 0x5e, 0x06, 0x85, 0xab, 0x65, - 0x50, 0xf8, 0xb6, 0x0c, 0x0a, 0x27, 0xed, 0xbb, 0xc8, 0x09, 0x28, 0xc5, 0x92, 0x7d, 0x77, 0xf9, - 0x24, 0x42, 0x62, 0x74, 0x76, 0x10, 0xcd, 0x6f, 0xaf, 0x21, 0xeb, 0x30, 0x2c, 0xd9, 0xcb, 0xe5, - 0xc5, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0xcd, 0x01, 0x1e, 0xf9, 0x04, 0x00, 0x00, + // 581 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6b, 0x13, 0x41, + 0x14, 0xce, 0xb6, 0x69, 0x6a, 0xa7, 0x11, 0xe9, 0x50, 0xca, 0xb6, 0x87, 0x6d, 0x08, 0x2a, 0xb9, + 0x64, 0xd7, 0xd8, 0x6b, 0x41, 0x48, 0x2a, 0x12, 0xea, 0xa1, 0x6c, 0x95, 0x82, 0x1e, 0x96, 0x97, + 0xcd, 0xb0, 0x19, 0x92, 0xcc, 0x2c, 0x33, 0xb3, 0x6d, 0x7a, 0xf4, 0xea, 0xc9, 0xbf, 0xc3, 0xb3, + 0x7f, 0x44, 0x8f, 0xc5, 0x83, 0x88, 0x87, 0x2a, 0xc9, 0x3f, 0x22, 0xf3, 0xa3, 0x69, 0x0e, 0x56, + 0x44, 0x72, 0xda, 0x7d, 0x33, 0xef, 0x7d, 0xdf, 0x37, 0xef, 0x7d, 0x3c, 0xf4, 0x58, 0x11, 0x21, + 0x20, 0x52, 0x82, 0x80, 0x2c, 0xc4, 0x65, 0x74, 0xde, 0xea, 0x11, 0x05, 0xad, 0x28, 0x23, 0x8c, + 0x48, 0x2a, 0xc3, 0x5c, 0x70, 0xc5, 0xf1, 0x8e, 0xc9, 0x0a, 0x6f, 0xb3, 0x42, 0x97, 0xb5, 0x17, + 0xa4, 0x5c, 0x8e, 0xb9, 0x8c, 0x7a, 0x20, 0xc9, 0xbc, 0x34, 0xe5, 0x94, 0xd9, 0xba, 0xbd, 0x5d, + 0x7b, 0x9f, 0x98, 0x28, 0xb2, 0x81, 0xbb, 0xda, 0xce, 0x78, 0xc6, 0xed, 0xb9, 0xfe, 0x73, 0xa7, + 0x4f, 0xee, 0x91, 0x33, 0x67, 0x36, 0x69, 0xf5, 0x8f, 0x6b, 0xa8, 0xfa, 0xca, 0x2a, 0x3c, 0x55, + 0xa0, 0x08, 0x3e, 0x44, 0x95, 0x1c, 0x04, 0x8c, 0xa5, 0xef, 0xd5, 0xbc, 0xc6, 0xe6, 0xf3, 0x20, + 0xfc, 0xb3, 0xe2, 0xf0, 0xc4, 0x64, 0xb5, 0xcb, 0x57, 0x37, 0xfb, 0xa5, 0xd8, 0xd5, 0xe0, 0x33, + 0xf4, 0x40, 0xc1, 0x24, 0x11, 0xa0, 0x88, 0xbf, 0x52, 0xf3, 0x1a, 0x1b, 0xed, 0x43, 0x7d, 0xff, + 0xe3, 0x66, 0xff, 0x69, 0x46, 0xd5, 0xa0, 0xe8, 0x85, 0x29, 0x1f, 0x3b, 0xf9, 0xee, 0xd3, 0x94, + 0xfd, 0x61, 0xa4, 0x2e, 0x73, 0x22, 0xc3, 0x23, 0x92, 0x7e, 0xfd, 0xd2, 0x44, 0xee, 0x75, 0x47, + 0x24, 0x8d, 0xd7, 0x15, 0x4c, 0x62, 0x2d, 0x0b, 0xd0, 0x43, 0x41, 0x2e, 0x40, 0xf4, 0x93, 0x0b, + 0x42, 0xb3, 0x81, 0xf2, 0x57, 0x97, 0x80, 0x5e, 0xb5, 0x90, 0x67, 0x06, 0x11, 0xbf, 0xb0, 0xda, + 0x53, 0xc8, 0xa5, 0x5f, 0xae, 0xad, 0xfe, 0xed, 0xed, 0x6f, 0x60, 0xd2, 0x81, 0xdc, 0xbd, 0x5d, + 0x6b, 0xec, 0x40, 0x2e, 0x31, 0x43, 0x55, 0x0d, 0x90, 0x0b, 0x9e, 0x12, 0xd2, 0x97, 0xfe, 0x9a, + 0x01, 0xd9, 0x0d, 0x1d, 0xa3, 0x1e, 0xed, 0x1c, 0xa1, 0xc3, 0x29, 0x6b, 0x3f, 0xd3, 0xf5, 0x9f, + 0x7f, 0xee, 0x37, 0xfe, 0x41, 0xbd, 0x2e, 0x90, 0xf1, 0xa6, 0x82, 0xc9, 0x89, 0xc3, 0xc7, 0x1f, + 0x3c, 0xb4, 0x43, 0x72, 0x9e, 0x0e, 0x12, 0xca, 0xa8, 0xa2, 0x30, 0x4a, 0xa8, 0x94, 0x05, 0xb0, + 0x94, 0xf8, 0x95, 0xe5, 0x53, 0x6f, 0x1b, 0xaa, 0xae, 0x65, 0xea, 0x3a, 0x22, 0x7c, 0x8c, 0xaa, + 0x56, 0x82, 0xd4, 0xee, 0x91, 0xfe, 0xba, 0x21, 0xae, 0xdf, 0xd7, 0xb8, 0x97, 0x3a, 0xd7, 0x18, + 0xcd, 0x35, 0x6f, 0x93, 0xcc, 0x4f, 0x64, 0xbd, 0x40, 0x15, 0xdb, 0x59, 0xbc, 0x8d, 0xd6, 0xfa, + 0x84, 0xf1, 0xb1, 0x31, 0xe1, 0x46, 0x6c, 0x03, 0xfc, 0x16, 0xad, 0xbb, 0x09, 0xfd, 0x87, 0xb9, + 0xba, 0x4c, 0x2d, 0x8c, 0xbf, 0xcb, 0x54, 0x5c, 0xb1, 0x83, 0xab, 0x7f, 0x5b, 0x41, 0xe8, 0x4e, + 0x98, 0xe6, 0x36, 0xa2, 0x0c, 0x77, 0x39, 0xb6, 0x01, 0x7e, 0x8f, 0x90, 0x71, 0xb6, 0x71, 0xcc, + 0x52, 0xbc, 0xbd, 0xa1, 0xbd, 0x6d, 0xe0, 0xf0, 0x10, 0x61, 0x49, 0x68, 0xc6, 0x28, 0x17, 0x90, + 0x91, 0x5b, 0x92, 0x65, 0x58, 0x7c, 0x6b, 0x01, 0xd7, 0x91, 0x0d, 0xd0, 0x96, 0xe2, 0x0a, 0x46, + 0x7a, 0x64, 0x43, 0xd2, 0x4f, 0x46, 0x05, 0x03, 0xbf, 0xbc, 0x84, 0x7e, 0x3e, 0x32, 0xb0, 0xa7, + 0x06, 0xf5, 0x75, 0xc1, 0xa0, 0x7d, 0x7c, 0x35, 0x0d, 0xbc, 0xeb, 0x69, 0xe0, 0xfd, 0x9a, 0x06, + 0xde, 0xa7, 0x59, 0x50, 0xba, 0x9e, 0x05, 0xa5, 0xef, 0xb3, 0xa0, 0xf4, 0xae, 0xb5, 0x48, 0x30, + 0x02, 0x29, 0x69, 0xda, 0xb4, 0x0b, 0x2b, 0xe5, 0x82, 0x44, 0xe7, 0x07, 0xd1, 0xe4, 0x6e, 0x75, + 0x19, 0xbe, 0x5e, 0xc5, 0x2c, 0xac, 0x83, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x3f, 0x1d, + 0xa1, 0x68, 0x05, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -483,7 +468,6 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *GenesisState) Size() (n int) { if m == nil { return 0 @@ -559,11 +543,9 @@ func (m *EpochState) Size() (n int) { func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozGenesis(x uint64) (n int) { return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *GenesisState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -851,7 +833,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } return nil } - func (m *TaxCap) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -968,7 +949,6 @@ func (m *TaxCap) Unmarshal(dAtA []byte) error { } return nil } - func (m *EpochState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1140,7 +1120,6 @@ func (m *EpochState) Unmarshal(dAtA []byte) error { } return nil } - func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/treasury/types/gov.go b/x/treasury/types/gov.go index 8b4a31de5..f71d43c29 100644 --- a/x/treasury/types/gov.go +++ b/x/treasury/types/gov.go @@ -3,8 +3,10 @@ package types import ( fmt "fmt" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + govcodec "github.com/cosmos/cosmos-sdk/x/gov/codec" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" ) @@ -15,9 +17,9 @@ const ( func init() { govv1beta1.RegisterProposalType(ProposalTypeAddBurnTaxExemptionAddress) - govv1beta1.ModuleCdc.LegacyAmino.RegisterConcrete(&AddBurnTaxExemptionAddressProposal{}, "treasury/AddBurnTaxExemptionAddressProposal", nil) + govcodec.ModuleCdc.LegacyAmino.RegisterConcrete(&AddBurnTaxExemptionAddressProposal{}, "treasury/AddBurnTaxExemptionAddressProposal", nil) govv1beta1.RegisterProposalType(ProposalTypeRemoveBurnTaxExemptionAddress) - govv1beta1.ModuleCdc.LegacyAmino.RegisterConcrete(&RemoveBurnTaxExemptionAddressProposal{}, "treasury/RemoveBurnTaxExemptionAddressProposal", nil) + govcodec.ModuleCdc.LegacyAmino.RegisterConcrete(&RemoveBurnTaxExemptionAddressProposal{}, "treasury/RemoveBurnTaxExemptionAddressProposal", nil) } var ( @@ -62,7 +64,7 @@ func (p *AddBurnTaxExemptionAddressProposal) ValidateBasic() error { for _, address := range p.Addresses { _, err = sdk.AccAddressFromBech32(address) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "%s: %s", err, address) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "%s: %s", err, address) } } @@ -106,7 +108,7 @@ func (p *RemoveBurnTaxExemptionAddressProposal) ValidateBasic() error { for _, address := range p.Addresses { _, err = sdk.AccAddressFromBech32(address) if err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "%s: %s", err, address) + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "%s: %s", err, address) } } diff --git a/x/treasury/types/gov.pb.go b/x/treasury/types/gov.pb.go index d1b4cff64..4327b78f3 100644 --- a/x/treasury/types/gov.pb.go +++ b/x/treasury/types/gov.pb.go @@ -5,20 +5,18 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -38,11 +36,9 @@ func (*AddBurnTaxExemptionAddressProposal) ProtoMessage() {} func (*AddBurnTaxExemptionAddressProposal) Descriptor() ([]byte, []int) { return fileDescriptor_a71b37663a441645, []int{0} } - func (m *AddBurnTaxExemptionAddressProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *AddBurnTaxExemptionAddressProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_AddBurnTaxExemptionAddressProposal.Marshal(b, m, deterministic) @@ -55,15 +51,12 @@ func (m *AddBurnTaxExemptionAddressProposal) XXX_Marshal(b []byte, deterministic return b[:n], nil } } - func (m *AddBurnTaxExemptionAddressProposal) XXX_Merge(src proto.Message) { xxx_messageInfo_AddBurnTaxExemptionAddressProposal.Merge(m, src) } - func (m *AddBurnTaxExemptionAddressProposal) XXX_Size() int { return m.Size() } - func (m *AddBurnTaxExemptionAddressProposal) XXX_DiscardUnknown() { xxx_messageInfo_AddBurnTaxExemptionAddressProposal.DiscardUnknown(m) } @@ -82,11 +75,9 @@ func (*RemoveBurnTaxExemptionAddressProposal) ProtoMessage() {} func (*RemoveBurnTaxExemptionAddressProposal) Descriptor() ([]byte, []int) { return fileDescriptor_a71b37663a441645, []int{1} } - func (m *RemoveBurnTaxExemptionAddressProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *RemoveBurnTaxExemptionAddressProposal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_RemoveBurnTaxExemptionAddressProposal.Marshal(b, m, deterministic) @@ -99,15 +90,12 @@ func (m *RemoveBurnTaxExemptionAddressProposal) XXX_Marshal(b []byte, determinis return b[:n], nil } } - func (m *RemoveBurnTaxExemptionAddressProposal) XXX_Merge(src proto.Message) { xxx_messageInfo_RemoveBurnTaxExemptionAddressProposal.Merge(m, src) } - func (m *RemoveBurnTaxExemptionAddressProposal) XXX_Size() int { return m.Size() } - func (m *RemoveBurnTaxExemptionAddressProposal) XXX_DiscardUnknown() { xxx_messageInfo_RemoveBurnTaxExemptionAddressProposal.DiscardUnknown(m) } @@ -122,26 +110,29 @@ func init() { func init() { proto.RegisterFile("terra/treasury/v1beta1/gov.proto", fileDescriptor_a71b37663a441645) } var fileDescriptor_a71b37663a441645 = []byte{ - // 290 bytes of a gzipped FileDescriptorProto + // 351 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x49, 0x2d, 0x2a, 0x4a, 0xd4, 0x2f, 0x29, 0x4a, 0x4d, 0x2c, 0x2e, 0x2d, 0xaa, 0xd4, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xcf, 0x2f, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x03, 0xab, - 0xd0, 0x83, 0xa9, 0xd0, 0x83, 0xaa, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd1, 0x07, - 0xb1, 0x20, 0xaa, 0x95, 0xe6, 0x31, 0x72, 0x29, 0x39, 0xa6, 0xa4, 0x38, 0x95, 0x16, 0xe5, 0x85, - 0x24, 0x56, 0xb8, 0x56, 0xa4, 0xe6, 0x16, 0x94, 0x64, 0xe6, 0xe7, 0x39, 0xa6, 0xa4, 0x14, 0xa5, - 0x16, 0x17, 0x07, 0x14, 0xe5, 0x17, 0xe4, 0x17, 0x27, 0xe6, 0x08, 0x89, 0x70, 0xb1, 0x96, 0x64, - 0x96, 0xe4, 0xa4, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x41, 0x38, 0x42, 0x0a, 0x5c, 0xdc, - 0x29, 0xa9, 0xc5, 0xc9, 0x45, 0x99, 0x60, 0x3d, 0x12, 0x4c, 0x60, 0x39, 0x64, 0x21, 0x21, 0x23, - 0x2e, 0xce, 0x44, 0x88, 0x51, 0xa9, 0xc5, 0x12, 0xcc, 0x0a, 0xcc, 0x1a, 0x9c, 0x4e, 0x22, 0x9f, - 0xee, 0xc9, 0x0b, 0x54, 0x26, 0xe6, 0xe6, 0x58, 0x29, 0xc1, 0xa5, 0x94, 0x82, 0x10, 0xca, 0xac, - 0x78, 0x3a, 0x16, 0xc8, 0x33, 0xcc, 0x58, 0x20, 0xcf, 0xf0, 0x62, 0x81, 0x3c, 0xa3, 0xd2, 0x42, - 0x46, 0x2e, 0xd5, 0xa0, 0xd4, 0xdc, 0xfc, 0xb2, 0xd4, 0x41, 0xeb, 0x46, 0x27, 0xef, 0x13, 0x8f, - 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, - 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, - 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x49, 0x2c, 0x2e, 0xce, 0x4c, 0xd6, 0x85, 0xc4, 0x60, 0x72, - 0x7e, 0x51, 0xaa, 0x7e, 0x99, 0x91, 0x7e, 0x05, 0x22, 0x2e, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, - 0xd8, 0xc0, 0x11, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x60, 0x19, 0x26, 0x3f, 0xea, 0x01, - 0x00, 0x00, + 0xd0, 0x83, 0xa9, 0xd0, 0x83, 0xaa, 0x90, 0x92, 0x4c, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0x8e, 0x07, + 0xab, 0xd2, 0x87, 0x70, 0x20, 0x5a, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0x21, 0xe2, 0x20, 0x16, + 0x44, 0x54, 0x69, 0x1b, 0x23, 0x97, 0x92, 0x63, 0x4a, 0x8a, 0x53, 0x69, 0x51, 0x5e, 0x48, 0x62, + 0x85, 0x6b, 0x45, 0x6a, 0x6e, 0x41, 0x49, 0x66, 0x7e, 0x9e, 0x63, 0x4a, 0x4a, 0x51, 0x6a, 0x71, + 0x71, 0x40, 0x51, 0x7e, 0x41, 0x7e, 0x71, 0x62, 0x8e, 0x90, 0x08, 0x17, 0x6b, 0x49, 0x66, 0x49, + 0x4e, 0xaa, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x84, 0x23, 0xa4, 0xc0, 0xc5, 0x9d, 0x92, + 0x5a, 0x9c, 0x5c, 0x94, 0x09, 0xd6, 0x23, 0xc1, 0x04, 0x96, 0x43, 0x16, 0x12, 0xf2, 0xe2, 0xe2, + 0x4c, 0x84, 0x18, 0x95, 0x5a, 0x2c, 0xc1, 0xac, 0xc0, 0xac, 0xc1, 0xe9, 0xa4, 0xf3, 0xe9, 0x9e, + 0xbc, 0x40, 0x65, 0x62, 0x6e, 0x8e, 0x95, 0x12, 0x5c, 0x4a, 0xe9, 0xd2, 0x16, 0x5d, 0x11, 0xa8, + 0x6b, 0xa1, 0x56, 0x07, 0x97, 0x14, 0x65, 0xe6, 0xa5, 0x07, 0x21, 0xb4, 0x5b, 0xf1, 0x74, 0x2c, + 0x90, 0x67, 0x98, 0xb1, 0x40, 0x9e, 0xe1, 0xc5, 0x02, 0x79, 0x46, 0xa5, 0xfd, 0x8c, 0x5c, 0xaa, + 0x41, 0xa9, 0xb9, 0xf9, 0x65, 0xa9, 0xb4, 0x72, 0xbb, 0x11, 0xa6, 0xdb, 0x45, 0xb0, 0xb9, 0x1d, + 0xd9, 0x8d, 0x5a, 0xc8, 0x6e, 0x3c, 0xb5, 0x45, 0x57, 0x0a, 0xea, 0x29, 0x50, 0xcc, 0x41, 0xe3, + 0x48, 0xcf, 0x39, 0x3f, 0xaf, 0x24, 0x35, 0xaf, 0xc4, 0xc9, 0xfb, 0xc4, 0x23, 0x39, 0xc6, 0x0b, + 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, + 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x0c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, + 0xf5, 0x93, 0x73, 0x12, 0x8b, 0x8b, 0x33, 0x93, 0x75, 0x21, 0x49, 0x22, 0x39, 0xbf, 0x28, 0x55, + 0xbf, 0xcc, 0x58, 0xbf, 0x02, 0x91, 0x38, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xd1, + 0x69, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xf2, 0x21, 0xba, 0x3b, 0x02, 0x00, 0x00, } func (this *AddBurnTaxExemptionAddressProposal) Equal(that interface{}) bool { @@ -179,7 +170,6 @@ func (this *AddBurnTaxExemptionAddressProposal) Equal(that interface{}) bool { } return true } - func (this *RemoveBurnTaxExemptionAddressProposal) Equal(that interface{}) bool { if that == nil { return this == nil @@ -215,7 +205,6 @@ func (this *RemoveBurnTaxExemptionAddressProposal) Equal(that interface{}) bool } return true } - func (m *AddBurnTaxExemptionAddressProposal) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -319,7 +308,6 @@ func encodeVarintGov(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *AddBurnTaxExemptionAddressProposal) Size() (n int) { if m == nil { return 0 @@ -369,11 +357,9 @@ func (m *RemoveBurnTaxExemptionAddressProposal) Size() (n int) { func sovGov(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozGov(x uint64) (n int) { return sovGov(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *AddBurnTaxExemptionAddressProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -520,7 +506,6 @@ func (m *AddBurnTaxExemptionAddressProposal) Unmarshal(dAtA []byte) error { } return nil } - func (m *RemoveBurnTaxExemptionAddressProposal) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -667,7 +652,6 @@ func (m *RemoveBurnTaxExemptionAddressProposal) Unmarshal(dAtA []byte) error { } return nil } - func skipGov(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/treasury/types/keys.go b/x/treasury/types/keys.go index 2fba31c6d..f53951bd9 100644 --- a/x/treasury/types/keys.go +++ b/x/treasury/types/keys.go @@ -29,7 +29,7 @@ const BurnModuleName = "burn" // // - 0x02: sdk.Dec // -// - 0x03: sdk.Int +// - 0x03: math.Int // // - 0x04: sdk.Coins // @@ -39,7 +39,7 @@ const BurnModuleName = "burn" // // - 0x07: sdk.Dec // -// - 0x08: sdk.Int +// - 0x08: math.Int // // - 0x09: int64 var ( diff --git a/x/treasury/types/params.go b/x/treasury/types/params.go index 5bdf497dd..45eb7e8e1 100644 --- a/x/treasury/types/params.go +++ b/x/treasury/types/params.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - core "github.com/classic-terra/core/v2/types" + core "github.com/classic-terra/core/v3/types" ) // Parameter keys diff --git a/x/treasury/types/querier.go b/x/treasury/types/querier.go index 09a8bd680..001391245 100644 --- a/x/treasury/types/querier.go +++ b/x/treasury/types/querier.go @@ -3,6 +3,7 @@ package types import ( "fmt" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -34,8 +35,8 @@ func NewQueryTaxCapParams(denom string) QueryTaxCapParams { // TaxCapsResponseItem query response item of tax caps querier type TaxCapsResponseItem struct { - Denom string `json:"denom"` - TaxCap sdk.Int `json:"tax_cap"` + Denom string `json:"denom"` + TaxCap math.Int `json:"tax_cap"` } // TaxCapsQueryResponse query response body of tax caps querier diff --git a/x/treasury/types/query.pb.go b/x/treasury/types/query.pb.go index 309860704..2c95f3059 100644 --- a/x/treasury/types/query.pb.go +++ b/x/treasury/types/query.pb.go @@ -6,28 +6,26 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -36,7 +34,8 @@ var ( const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QueryTaxRateRequest is the request type for the Query/TaxRate RPC method. -type QueryTaxRateRequest struct{} +type QueryTaxRateRequest struct { +} func (m *QueryTaxRateRequest) Reset() { *m = QueryTaxRateRequest{} } func (m *QueryTaxRateRequest) String() string { return proto.CompactTextString(m) } @@ -44,11 +43,9 @@ func (*QueryTaxRateRequest) ProtoMessage() {} func (*QueryTaxRateRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{0} } - func (m *QueryTaxRateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxRateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxRateRequest.Marshal(b, m, deterministic) @@ -61,15 +58,12 @@ func (m *QueryTaxRateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryTaxRateRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxRateRequest.Merge(m, src) } - func (m *QueryTaxRateRequest) XXX_Size() int { return m.Size() } - func (m *QueryTaxRateRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxRateRequest.DiscardUnknown(m) } @@ -88,11 +82,9 @@ func (*QueryTaxRateResponse) ProtoMessage() {} func (*QueryTaxRateResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{1} } - func (m *QueryTaxRateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxRateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxRateResponse.Marshal(b, m, deterministic) @@ -105,15 +97,12 @@ func (m *QueryTaxRateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } - func (m *QueryTaxRateResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxRateResponse.Merge(m, src) } - func (m *QueryTaxRateResponse) XXX_Size() int { return m.Size() } - func (m *QueryTaxRateResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxRateResponse.DiscardUnknown(m) } @@ -132,11 +121,9 @@ func (*QueryTaxCapRequest) ProtoMessage() {} func (*QueryTaxCapRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{2} } - func (m *QueryTaxCapRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxCapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxCapRequest.Marshal(b, m, deterministic) @@ -149,15 +136,12 @@ func (m *QueryTaxCapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryTaxCapRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxCapRequest.Merge(m, src) } - func (m *QueryTaxCapRequest) XXX_Size() int { return m.Size() } - func (m *QueryTaxCapRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxCapRequest.DiscardUnknown(m) } @@ -176,11 +160,9 @@ func (*QueryTaxCapResponse) ProtoMessage() {} func (*QueryTaxCapResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{3} } - func (m *QueryTaxCapResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxCapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxCapResponse.Marshal(b, m, deterministic) @@ -193,15 +175,12 @@ func (m *QueryTaxCapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryTaxCapResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxCapResponse.Merge(m, src) } - func (m *QueryTaxCapResponse) XXX_Size() int { return m.Size() } - func (m *QueryTaxCapResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxCapResponse.DiscardUnknown(m) } @@ -209,7 +188,8 @@ func (m *QueryTaxCapResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryTaxCapResponse proto.InternalMessageInfo // QueryTaxCapsRequest is the request type for the Query/TaxCaps RPC method. -type QueryTaxCapsRequest struct{} +type QueryTaxCapsRequest struct { +} func (m *QueryTaxCapsRequest) Reset() { *m = QueryTaxCapsRequest{} } func (m *QueryTaxCapsRequest) String() string { return proto.CompactTextString(m) } @@ -217,11 +197,9 @@ func (*QueryTaxCapsRequest) ProtoMessage() {} func (*QueryTaxCapsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{4} } - func (m *QueryTaxCapsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxCapsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxCapsRequest.Marshal(b, m, deterministic) @@ -234,15 +212,12 @@ func (m *QueryTaxCapsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryTaxCapsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxCapsRequest.Merge(m, src) } - func (m *QueryTaxCapsRequest) XXX_Size() int { return m.Size() } - func (m *QueryTaxCapsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxCapsRequest.DiscardUnknown(m) } @@ -262,11 +237,9 @@ func (*QueryTaxCapsResponseItem) ProtoMessage() {} func (*QueryTaxCapsResponseItem) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{5} } - func (m *QueryTaxCapsResponseItem) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxCapsResponseItem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxCapsResponseItem.Marshal(b, m, deterministic) @@ -279,15 +252,12 @@ func (m *QueryTaxCapsResponseItem) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } - func (m *QueryTaxCapsResponseItem) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxCapsResponseItem.Merge(m, src) } - func (m *QueryTaxCapsResponseItem) XXX_Size() int { return m.Size() } - func (m *QueryTaxCapsResponseItem) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxCapsResponseItem.DiscardUnknown(m) } @@ -313,11 +283,9 @@ func (*QueryTaxCapsResponse) ProtoMessage() {} func (*QueryTaxCapsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{6} } - func (m *QueryTaxCapsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxCapsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxCapsResponse.Marshal(b, m, deterministic) @@ -330,15 +298,12 @@ func (m *QueryTaxCapsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } - func (m *QueryTaxCapsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxCapsResponse.Merge(m, src) } - func (m *QueryTaxCapsResponse) XXX_Size() int { return m.Size() } - func (m *QueryTaxCapsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxCapsResponse.DiscardUnknown(m) } @@ -353,7 +318,8 @@ func (m *QueryTaxCapsResponse) GetTaxCaps() []QueryTaxCapsResponseItem { } // QueryRewardWeightRequest is the request type for the Query/RewardWeight RPC method. -type QueryRewardWeightRequest struct{} +type QueryRewardWeightRequest struct { +} func (m *QueryRewardWeightRequest) Reset() { *m = QueryRewardWeightRequest{} } func (m *QueryRewardWeightRequest) String() string { return proto.CompactTextString(m) } @@ -361,11 +327,9 @@ func (*QueryRewardWeightRequest) ProtoMessage() {} func (*QueryRewardWeightRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{7} } - func (m *QueryRewardWeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryRewardWeightRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryRewardWeightRequest.Marshal(b, m, deterministic) @@ -378,15 +342,12 @@ func (m *QueryRewardWeightRequest) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } - func (m *QueryRewardWeightRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryRewardWeightRequest.Merge(m, src) } - func (m *QueryRewardWeightRequest) XXX_Size() int { return m.Size() } - func (m *QueryRewardWeightRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryRewardWeightRequest.DiscardUnknown(m) } @@ -405,11 +366,9 @@ func (*QueryRewardWeightResponse) ProtoMessage() {} func (*QueryRewardWeightResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{8} } - func (m *QueryRewardWeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryRewardWeightResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryRewardWeightResponse.Marshal(b, m, deterministic) @@ -422,15 +381,12 @@ func (m *QueryRewardWeightResponse) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } - func (m *QueryRewardWeightResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryRewardWeightResponse.Merge(m, src) } - func (m *QueryRewardWeightResponse) XXX_Size() int { return m.Size() } - func (m *QueryRewardWeightResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryRewardWeightResponse.DiscardUnknown(m) } @@ -438,7 +394,8 @@ func (m *QueryRewardWeightResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryRewardWeightResponse proto.InternalMessageInfo // QueryTaxProceedsRequest is the request type for the Query/TaxProceeds RPC method. -type QueryTaxProceedsRequest struct{} +type QueryTaxProceedsRequest struct { +} func (m *QueryTaxProceedsRequest) Reset() { *m = QueryTaxProceedsRequest{} } func (m *QueryTaxProceedsRequest) String() string { return proto.CompactTextString(m) } @@ -446,11 +403,9 @@ func (*QueryTaxProceedsRequest) ProtoMessage() {} func (*QueryTaxProceedsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{9} } - func (m *QueryTaxProceedsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxProceedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxProceedsRequest.Marshal(b, m, deterministic) @@ -463,15 +418,12 @@ func (m *QueryTaxProceedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } - func (m *QueryTaxProceedsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxProceedsRequest.Merge(m, src) } - func (m *QueryTaxProceedsRequest) XXX_Size() int { return m.Size() } - func (m *QueryTaxProceedsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxProceedsRequest.DiscardUnknown(m) } @@ -490,11 +442,9 @@ func (*QueryTaxProceedsResponse) ProtoMessage() {} func (*QueryTaxProceedsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{10} } - func (m *QueryTaxProceedsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryTaxProceedsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryTaxProceedsResponse.Marshal(b, m, deterministic) @@ -507,15 +457,12 @@ func (m *QueryTaxProceedsResponse) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } - func (m *QueryTaxProceedsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryTaxProceedsResponse.Merge(m, src) } - func (m *QueryTaxProceedsResponse) XXX_Size() int { return m.Size() } - func (m *QueryTaxProceedsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryTaxProceedsResponse.DiscardUnknown(m) } @@ -530,7 +477,8 @@ func (m *QueryTaxProceedsResponse) GetTaxProceeds() github_com_cosmos_cosmos_sdk } // QuerySeigniorageProceedsRequest is the request type for the Query/SeigniorageProceeds RPC method. -type QuerySeigniorageProceedsRequest struct{} +type QuerySeigniorageProceedsRequest struct { +} func (m *QuerySeigniorageProceedsRequest) Reset() { *m = QuerySeigniorageProceedsRequest{} } func (m *QuerySeigniorageProceedsRequest) String() string { return proto.CompactTextString(m) } @@ -538,11 +486,9 @@ func (*QuerySeigniorageProceedsRequest) ProtoMessage() {} func (*QuerySeigniorageProceedsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{11} } - func (m *QuerySeigniorageProceedsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QuerySeigniorageProceedsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QuerySeigniorageProceedsRequest.Marshal(b, m, deterministic) @@ -555,15 +501,12 @@ func (m *QuerySeigniorageProceedsRequest) XXX_Marshal(b []byte, deterministic bo return b[:n], nil } } - func (m *QuerySeigniorageProceedsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QuerySeigniorageProceedsRequest.Merge(m, src) } - func (m *QuerySeigniorageProceedsRequest) XXX_Size() int { return m.Size() } - func (m *QuerySeigniorageProceedsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QuerySeigniorageProceedsRequest.DiscardUnknown(m) } @@ -582,11 +525,9 @@ func (*QuerySeigniorageProceedsResponse) ProtoMessage() {} func (*QuerySeigniorageProceedsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{12} } - func (m *QuerySeigniorageProceedsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QuerySeigniorageProceedsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QuerySeigniorageProceedsResponse.Marshal(b, m, deterministic) @@ -599,15 +540,12 @@ func (m *QuerySeigniorageProceedsResponse) XXX_Marshal(b []byte, deterministic b return b[:n], nil } } - func (m *QuerySeigniorageProceedsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QuerySeigniorageProceedsResponse.Merge(m, src) } - func (m *QuerySeigniorageProceedsResponse) XXX_Size() int { return m.Size() } - func (m *QuerySeigniorageProceedsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QuerySeigniorageProceedsResponse.DiscardUnknown(m) } @@ -615,7 +553,8 @@ func (m *QuerySeigniorageProceedsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QuerySeigniorageProceedsResponse proto.InternalMessageInfo // QueryIndicatorsRequest is the request type for the Query/Indicators RPC method. -type QueryIndicatorsRequest struct{} +type QueryIndicatorsRequest struct { +} func (m *QueryIndicatorsRequest) Reset() { *m = QueryIndicatorsRequest{} } func (m *QueryIndicatorsRequest) String() string { return proto.CompactTextString(m) } @@ -623,11 +562,9 @@ func (*QueryIndicatorsRequest) ProtoMessage() {} func (*QueryIndicatorsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{13} } - func (m *QueryIndicatorsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryIndicatorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryIndicatorsRequest.Marshal(b, m, deterministic) @@ -640,15 +577,12 @@ func (m *QueryIndicatorsRequest) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } - func (m *QueryIndicatorsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryIndicatorsRequest.Merge(m, src) } - func (m *QueryIndicatorsRequest) XXX_Size() int { return m.Size() } - func (m *QueryIndicatorsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryIndicatorsRequest.DiscardUnknown(m) } @@ -668,11 +602,9 @@ func (*QueryIndicatorsResponse) ProtoMessage() {} func (*QueryIndicatorsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{14} } - func (m *QueryIndicatorsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryIndicatorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryIndicatorsResponse.Marshal(b, m, deterministic) @@ -685,15 +617,12 @@ func (m *QueryIndicatorsResponse) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } - func (m *QueryIndicatorsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryIndicatorsResponse.Merge(m, src) } - func (m *QueryIndicatorsResponse) XXX_Size() int { return m.Size() } - func (m *QueryIndicatorsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryIndicatorsResponse.DiscardUnknown(m) } @@ -701,7 +630,8 @@ func (m *QueryIndicatorsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryIndicatorsResponse proto.InternalMessageInfo // QueryParamsRequest is the request type for the Query/Params RPC method. -type QueryParamsRequest struct{} +type QueryParamsRequest struct { +} func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } @@ -709,11 +639,9 @@ func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{15} } - func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) @@ -726,15 +654,12 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsRequest.Merge(m, src) } - func (m *QueryParamsRequest) XXX_Size() int { return m.Size() } - func (m *QueryParamsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) } @@ -753,11 +678,9 @@ func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{16} } - func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) @@ -770,15 +693,12 @@ func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsResponse.Merge(m, src) } - func (m *QueryParamsResponse) XXX_Size() int { return m.Size() } - func (m *QueryParamsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) } @@ -803,11 +723,9 @@ func (*QueryBurnTaxExemptionListRequest) ProtoMessage() {} func (*QueryBurnTaxExemptionListRequest) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{17} } - func (m *QueryBurnTaxExemptionListRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryBurnTaxExemptionListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryBurnTaxExemptionListRequest.Marshal(b, m, deterministic) @@ -820,15 +738,12 @@ func (m *QueryBurnTaxExemptionListRequest) XXX_Marshal(b []byte, deterministic b return b[:n], nil } } - func (m *QueryBurnTaxExemptionListRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryBurnTaxExemptionListRequest.Merge(m, src) } - func (m *QueryBurnTaxExemptionListRequest) XXX_Size() int { return m.Size() } - func (m *QueryBurnTaxExemptionListRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryBurnTaxExemptionListRequest.DiscardUnknown(m) } @@ -854,11 +769,9 @@ func (*QueryBurnTaxExemptionListResponse) ProtoMessage() {} func (*QueryBurnTaxExemptionListResponse) Descriptor() ([]byte, []int) { return fileDescriptor_699c8c29293c9a9b, []int{18} } - func (m *QueryBurnTaxExemptionListResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryBurnTaxExemptionListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryBurnTaxExemptionListResponse.Marshal(b, m, deterministic) @@ -871,15 +784,12 @@ func (m *QueryBurnTaxExemptionListResponse) XXX_Marshal(b []byte, deterministic return b[:n], nil } } - func (m *QueryBurnTaxExemptionListResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryBurnTaxExemptionListResponse.Merge(m, src) } - func (m *QueryBurnTaxExemptionListResponse) XXX_Size() int { return m.Size() } - func (m *QueryBurnTaxExemptionListResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryBurnTaxExemptionListResponse.DiscardUnknown(m) } @@ -927,80 +837,79 @@ func init() { } var fileDescriptor_699c8c29293c9a9b = []byte{ - // 1042 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x97, 0xcd, 0x6f, 0x1b, 0x45, - 0x1f, 0xc7, 0xbd, 0x7d, 0x9e, 0x3a, 0xc9, 0x38, 0x5c, 0x26, 0xa6, 0x24, 0x56, 0xb5, 0x76, 0x57, - 0x6d, 0x6a, 0xe5, 0x65, 0x37, 0x36, 0x95, 0x4a, 0x2b, 0x4e, 0x2e, 0x50, 0x45, 0x04, 0xa9, 0xdd, - 0x58, 0xaa, 0xe0, 0x80, 0x35, 0x5e, 0x8f, 0x36, 0x0b, 0xf6, 0xce, 0x76, 0x66, 0xdc, 0xda, 0x42, - 0x5c, 0x90, 0x90, 0x80, 0x03, 0x42, 0xea, 0x89, 0x0b, 0xaa, 0x38, 0x72, 0xe7, 0xca, 0x89, 0x43, - 0x8e, 0x95, 0xb8, 0x20, 0x0e, 0x01, 0x25, 0x1c, 0xf8, 0x33, 0xd0, 0xbc, 0xac, 0x77, 0xdd, 0x7a, - 0xed, 0x4d, 0x38, 0x65, 0x33, 0xf3, 0x7b, 0xf9, 0xcc, 0xdb, 0xf7, 0x2b, 0x03, 0x8b, 0x63, 0x4a, - 0x91, 0xc3, 0x29, 0x46, 0x6c, 0x48, 0xc7, 0xce, 0x93, 0x46, 0x17, 0x73, 0xd4, 0x70, 0x1e, 0x0f, - 0x31, 0x1d, 0xdb, 0x11, 0x25, 0x9c, 0xc0, 0x2b, 0x32, 0xc6, 0x8e, 0x63, 0x6c, 0x1d, 0x53, 0x29, - 0xfb, 0xc4, 0x27, 0x32, 0xc4, 0x11, 0x5f, 0x2a, 0xba, 0x72, 0xd5, 0x27, 0xc4, 0xef, 0x63, 0x07, - 0x45, 0x81, 0x83, 0xc2, 0x90, 0x70, 0xc4, 0x03, 0x12, 0x32, 0x3d, 0xbb, 0xe5, 0x11, 0x36, 0x20, - 0xcc, 0xe9, 0x22, 0x86, 0x55, 0x93, 0x49, 0xcb, 0x08, 0xf9, 0x41, 0x28, 0x83, 0x75, 0xec, 0x8d, - 0x0c, 0xb6, 0x09, 0x88, 0x0a, 0x33, 0xd3, 0x25, 0xe3, 0x18, 0x8f, 0x04, 0xba, 0x8c, 0xf5, 0x3a, - 0x58, 0x7b, 0x28, 0x1a, 0xb5, 0xd1, 0xc8, 0x45, 0x1c, 0xbb, 0xf8, 0xf1, 0x10, 0x33, 0x6e, 0x21, - 0x50, 0x9e, 0x1e, 0x66, 0x11, 0x09, 0x19, 0x86, 0xfb, 0x60, 0x99, 0xa3, 0x51, 0x87, 0x22, 0x8e, - 0xd7, 0x8d, 0x9a, 0x51, 0x5f, 0x69, 0xd9, 0xc7, 0x27, 0xd5, 0xc2, 0x1f, 0x27, 0xd5, 0x4d, 0x3f, - 0xe0, 0x47, 0xc3, 0xae, 0xed, 0x91, 0x81, 0xa3, 0x7b, 0xaa, 0x3f, 0xbb, 0xac, 0xf7, 0xa9, 0xc3, - 0xc7, 0x11, 0x66, 0xf6, 0x3b, 0xd8, 0x73, 0x97, 0xb8, 0x2a, 0x69, 0xdd, 0x02, 0x30, 0x6e, 0x71, - 0x0f, 0x45, 0xba, 0x31, 0x2c, 0x83, 0xcb, 0x3d, 0x1c, 0x92, 0x81, 0xaa, 0xee, 0xaa, 0x7f, 0xee, - 0x2e, 0x7f, 0xf5, 0xbc, 0x5a, 0xf8, 0xe7, 0x79, 0xb5, 0x60, 0x7d, 0x9c, 0xf0, 0xca, 0x2c, 0xcd, - 0x75, 0x1f, 0x88, 0xba, 0x1d, 0x0f, 0x45, 0x17, 0xc0, 0xda, 0x0f, 0xb9, 0x5b, 0xe4, 0xb2, 0xa0, - 0x55, 0x9d, 0xaa, 0xcf, 0x34, 0x56, 0x0a, 0x60, 0x0c, 0xd6, 0xa7, 0x03, 0x14, 0xc1, 0x3e, 0xc7, - 0x83, 0xd9, 0xf0, 0x69, 0xb6, 0x4b, 0xff, 0x89, 0x2d, 0x48, 0x0e, 0x25, 0xdd, 0x1a, 0x3e, 0x54, - 0x87, 0xe2, 0xa1, 0x88, 0xad, 0x1b, 0xb5, 0xff, 0xd5, 0x4b, 0xcd, 0x3d, 0x7b, 0xf6, 0xad, 0xb4, - 0xb3, 0xd0, 0x5b, 0xff, 0x17, 0x4c, 0xf2, 0x70, 0xc4, 0x94, 0x55, 0xd1, 0xab, 0x74, 0xf1, 0x53, - 0x44, 0x7b, 0x8f, 0x70, 0xe0, 0x1f, 0xf1, 0xf8, 0x6e, 0x44, 0x60, 0x63, 0xc6, 0x9c, 0x66, 0x39, - 0x04, 0xaf, 0x51, 0x39, 0xde, 0x79, 0x2a, 0x27, 0x2e, 0x78, 0x4b, 0x56, 0x69, 0xaa, 0xb8, 0xb5, - 0x01, 0xde, 0x88, 0xc1, 0x1f, 0x50, 0xe2, 0x61, 0xdc, 0x8b, 0x0f, 0xc6, 0xfa, 0xc6, 0x48, 0xce, - 0x23, 0x99, 0xd3, 0x30, 0x21, 0x58, 0x15, 0x1b, 0x13, 0xe9, 0x71, 0xbd, 0x39, 0x1b, 0xb6, 0x6a, - 0x69, 0x8b, 0x37, 0x31, 0xd9, 0x99, 0x7b, 0x24, 0x08, 0x5b, 0x7b, 0x02, 0xf3, 0xa7, 0x3f, 0xab, - 0xf5, 0x1c, 0x98, 0x22, 0x81, 0xb9, 0x25, 0x9e, 0xf4, 0xb5, 0xae, 0x81, 0xaa, 0x64, 0x39, 0xc4, - 0x81, 0x1f, 0x06, 0x84, 0x22, 0x1f, 0xbf, 0xcc, 0xfb, 0xa5, 0x01, 0x6a, 0xd9, 0x31, 0x9a, 0x1b, - 0x81, 0x32, 0x4b, 0xa6, 0xd3, 0xfc, 0x17, 0xb9, 0x3e, 0x6b, 0xec, 0xd5, 0x56, 0xd6, 0x3a, 0xb8, - 0x22, 0x31, 0xf6, 0xc3, 0x5e, 0xe0, 0x21, 0x4e, 0xe8, 0x84, 0xf0, 0xd8, 0xd0, 0xbb, 0x9d, 0x9e, - 0xd2, 0x60, 0x6d, 0xb0, 0xcc, 0x69, 0xbf, 0x33, 0xc6, 0x88, 0x6a, 0x98, 0x3b, 0xe7, 0x3b, 0xd8, - 0xd3, 0x93, 0xea, 0x52, 0xdb, 0x3d, 0xf8, 0x10, 0x23, 0xea, 0x2e, 0x71, 0xda, 0x17, 0x1f, 0xf0, - 0x11, 0x58, 0x11, 0x55, 0x07, 0x24, 0xe4, 0x47, 0xfa, 0x89, 0xdc, 0x3d, 0x77, 0xd9, 0xe5, 0xb6, - 0x7b, 0xf0, 0x81, 0xa8, 0xe0, 0x0a, 0x44, 0xf9, 0x65, 0x95, 0xb5, 0xc4, 0x3c, 0x40, 0x14, 0x0d, - 0x26, 0x0b, 0x3c, 0xd4, 0x4f, 0x3c, 0x1e, 0xd5, 0x6b, 0x7b, 0x1b, 0x14, 0x23, 0x39, 0x22, 0x57, - 0x56, 0x6a, 0x9a, 0x59, 0x6f, 0x48, 0xe5, 0xe9, 0x17, 0xa3, 0x73, 0xac, 0x4f, 0xf4, 0xb1, 0xb6, - 0x86, 0x34, 0x6c, 0xa3, 0xd1, 0xbb, 0x23, 0x3c, 0x88, 0x84, 0x5a, 0x1f, 0x04, 0x2c, 0x7e, 0x38, - 0xf0, 0x3d, 0x00, 0x12, 0x19, 0x97, 0x0b, 0x2d, 0x35, 0x37, 0xa7, 0x2e, 0xa3, 0x32, 0x96, 0xa4, - 0x91, 0x1f, 0x0b, 0xb2, 0x9b, 0xca, 0x14, 0x77, 0xfe, 0xda, 0x9c, 0x66, 0x7a, 0x3d, 0x57, 0xc1, - 0x0a, 0xea, 0xf5, 0x28, 0x66, 0x0c, 0xab, 0x9b, 0xbf, 0xe2, 0x26, 0x03, 0xf0, 0xfe, 0x0c, 0x96, - 0x9b, 0x0b, 0x59, 0x54, 0xe9, 0x34, 0x4c, 0xf3, 0xe7, 0x12, 0xb8, 0x2c, 0x61, 0xe0, 0xb7, 0x06, - 0x58, 0xd2, 0x7e, 0x01, 0xb7, 0x17, 0x09, 0x50, 0xca, 0x6c, 0x2a, 0x3b, 0xf9, 0x82, 0x55, 0x73, - 0xab, 0xfe, 0xc5, 0x6f, 0x7f, 0x3f, 0xbb, 0x64, 0xc1, 0x9a, 0x93, 0xe5, 0x80, 0xda, 0xa0, 0xe0, - 0x33, 0x03, 0x14, 0x95, 0xd6, 0xc1, 0xad, 0x1c, 0x82, 0x18, 0xe3, 0x6c, 0xe7, 0x8a, 0xd5, 0x34, - 0x7b, 0x92, 0x66, 0x0b, 0xd6, 0xe7, 0xd1, 0x08, 0x65, 0x76, 0x3e, 0x93, 0x6e, 0xf0, 0x79, 0xbc, - 0x4d, 0x42, 0x66, 0xe1, 0x76, 0x3e, 0x9d, 0xce, 0xb9, 0x4d, 0x69, 0x51, 0xcf, 0xb7, 0x4d, 0x02, - 0x0c, 0xfe, 0x68, 0x80, 0xd5, 0xb4, 0x96, 0xc3, 0xf9, 0xee, 0x31, 0xc3, 0x12, 0x2a, 0x8d, 0x73, - 0x64, 0x68, 0xbe, 0x5d, 0xc9, 0x77, 0x13, 0xde, 0xc8, 0xe2, 0x9b, 0xb2, 0x11, 0xf8, 0x8b, 0x01, - 0xd6, 0x66, 0x48, 0x26, 0xbc, 0x3d, 0xb7, 0x73, 0xb6, 0x10, 0x57, 0xde, 0x3a, 0x7f, 0xa2, 0x26, - 0xbf, 0x25, 0xc9, 0x6d, 0xb8, 0x93, 0x45, 0x3e, 0x4b, 0xbb, 0xe1, 0x0f, 0x06, 0x28, 0xa5, 0x3c, - 0x0a, 0x3a, 0x8b, 0x4e, 0xf3, 0x65, 0xe0, 0xbd, 0xfc, 0x09, 0x1a, 0x74, 0x47, 0x82, 0x6e, 0xc2, - 0xeb, 0xf3, 0xae, 0xc0, 0x04, 0xf0, 0x7b, 0x03, 0x80, 0x44, 0xf2, 0xa1, 0x3d, 0xb7, 0xdd, 0x2b, - 0xb6, 0x51, 0x71, 0x72, 0xc7, 0x6b, 0xba, 0x2d, 0x49, 0x77, 0x1d, 0x5a, 0x59, 0x74, 0x41, 0x02, - 0xf3, 0xab, 0x01, 0xca, 0xb3, 0xc4, 0x0e, 0xce, 0x3f, 0xc5, 0x39, 0x62, 0x5c, 0xb9, 0x73, 0x81, - 0x4c, 0x4d, 0x7e, 0x5b, 0x92, 0x37, 0xa0, 0x93, 0x45, 0xde, 0x1d, 0xd2, 0xb0, 0x23, 0x36, 0x17, - 0xc7, 0xf9, 0x9d, 0xbe, 0xa0, 0xfd, 0xda, 0x00, 0x45, 0xe5, 0x1e, 0x0b, 0x04, 0x69, 0xca, 0xb0, - 0x16, 0x08, 0xd2, 0xb4, 0x8d, 0x59, 0x9b, 0x12, 0xae, 0x06, 0xcd, 0x2c, 0x38, 0x65, 0x58, 0xad, - 0xf7, 0x8f, 0x4f, 0x4d, 0xe3, 0xc5, 0xa9, 0x69, 0xfc, 0x75, 0x6a, 0x1a, 0xdf, 0x9d, 0x99, 0x85, - 0x17, 0x67, 0x66, 0xe1, 0xf7, 0x33, 0xb3, 0xf0, 0x51, 0x23, 0xed, 0xb9, 0x7d, 0xc4, 0x58, 0xe0, - 0xed, 0xaa, 0x5a, 0x1e, 0xa1, 0xd8, 0x79, 0xd2, 0x74, 0x46, 0x49, 0x55, 0x69, 0xc1, 0xdd, 0xa2, - 0xfc, 0x31, 0xf1, 0xe6, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x68, 0xd9, 0x8a, 0xef, 0x31, 0x0d, - 0x00, 0x00, + // 1067 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x97, 0x4d, 0x6f, 0x1b, 0x45, + 0x18, 0xc7, 0xbd, 0x85, 0x3a, 0xc9, 0x38, 0x5c, 0x26, 0xa6, 0x24, 0x56, 0xb5, 0x76, 0x57, 0x6d, + 0x6a, 0xe5, 0x65, 0x37, 0x4e, 0x2b, 0x15, 0x50, 0x4f, 0x6e, 0xa1, 0x44, 0x04, 0xa9, 0xdd, 0x06, + 0x55, 0x70, 0xb1, 0xc6, 0xeb, 0xd1, 0x66, 0xc1, 0xde, 0xd9, 0xce, 0x8c, 0x5b, 0x47, 0x08, 0x0e, + 0x5c, 0x78, 0x39, 0x20, 0xa4, 0x9c, 0xb8, 0xa0, 0x8a, 0x23, 0x67, 0xb8, 0x72, 0xe2, 0xd0, 0x63, + 0x05, 0x17, 0xc4, 0x21, 0xa0, 0xa4, 0x07, 0x3e, 0x06, 0x9a, 0x97, 0xf5, 0xae, 0x13, 0xaf, 0xbd, + 0x69, 0x73, 0x4a, 0x76, 0xe6, 0x79, 0xf9, 0x3d, 0xcf, 0xcc, 0x3c, 0x7f, 0x19, 0x58, 0x1c, 0x53, + 0x8a, 0x1c, 0x4e, 0x31, 0x62, 0x7d, 0xba, 0xe7, 0x3c, 0x6a, 0xb4, 0x31, 0x47, 0x0d, 0xe7, 0x61, + 0x1f, 0xd3, 0x3d, 0x3b, 0xa2, 0x84, 0x13, 0x78, 0x41, 0xda, 0xd8, 0xb1, 0x8d, 0xad, 0x6d, 0x2a, + 0x4b, 0x1e, 0x61, 0x3d, 0xc2, 0x5a, 0xd2, 0xca, 0x51, 0x1f, 0xca, 0xa5, 0xb2, 0xa2, 0xbe, 0x9c, + 0x36, 0x62, 0x58, 0xc5, 0x1a, 0x46, 0x8e, 0x90, 0x1f, 0x84, 0x88, 0x07, 0x24, 0xd4, 0xb6, 0x66, + 0xda, 0x36, 0xb6, 0xf2, 0x48, 0x10, 0xef, 0x97, 0x7d, 0xe2, 0x13, 0x95, 0x43, 0xfc, 0xa7, 0x57, + 0x2f, 0xfa, 0x84, 0xf8, 0x5d, 0xec, 0xa0, 0x28, 0x70, 0x50, 0x18, 0x12, 0x2e, 0x43, 0xc6, 0xf9, + 0xaf, 0x64, 0x94, 0x35, 0xac, 0x41, 0x9a, 0x59, 0xaf, 0x83, 0x85, 0x7b, 0x02, 0x6e, 0x07, 0x0d, + 0x5c, 0xc4, 0xb1, 0x8b, 0x1f, 0xf6, 0x31, 0xe3, 0x16, 0x01, 0xe5, 0xd1, 0x65, 0x16, 0x91, 0x90, + 0x61, 0xf8, 0x00, 0xcc, 0x72, 0x34, 0x68, 0x51, 0xc4, 0xf1, 0xa2, 0x51, 0x33, 0xea, 0x73, 0xcd, + 0x9b, 0x4f, 0x0f, 0xaa, 0x85, 0xbf, 0x0f, 0xaa, 0xcb, 0x7e, 0xc0, 0x77, 0xfb, 0x6d, 0xdb, 0x23, + 0x3d, 0xdd, 0x08, 0xfd, 0x67, 0x9d, 0x75, 0x3e, 0x75, 0xf8, 0x5e, 0x84, 0x99, 0x7d, 0x1b, 0x7b, + 0x7f, 0xfc, 0xb2, 0x0e, 0x74, 0x9f, 0x6e, 0x63, 0xcf, 0x9d, 0xe1, 0x2a, 0x81, 0x75, 0x1d, 0xc0, + 0x38, 0xe1, 0x2d, 0x14, 0x69, 0x0c, 0x58, 0x06, 0xe7, 0x3b, 0x38, 0x24, 0x3d, 0x95, 0xcb, 0x55, + 0x1f, 0x6f, 0xcf, 0x7e, 0xfd, 0xa4, 0x5a, 0xf8, 0xef, 0x49, 0xb5, 0x60, 0x75, 0x13, 0x7a, 0xe9, + 0xa5, 0x29, 0x3f, 0x04, 0x22, 0x6e, 0xcb, 0x43, 0xd1, 0x0b, 0x40, 0x6e, 0x85, 0x3c, 0x05, 0xb9, + 0x15, 0x72, 0xb7, 0xc8, 0x65, 0x78, 0xab, 0x3a, 0x92, 0x8d, 0x69, 0xc8, 0x14, 0xce, 0x57, 0x06, + 0x58, 0x1c, 0xb5, 0x50, 0x40, 0x5b, 0x1c, 0xf7, 0xc6, 0xd7, 0x92, 0x46, 0x3d, 0x77, 0x86, 0xa8, + 0x41, 0x72, 0x7e, 0x69, 0x10, 0x78, 0x4f, 0x9d, 0x9f, 0x87, 0x22, 0xb6, 0x68, 0xd4, 0x5e, 0xa9, + 0x97, 0x36, 0x37, 0xec, 0xf1, 0x77, 0xdb, 0xce, 0x2a, 0xa4, 0xf9, 0xaa, 0x20, 0x94, 0x27, 0x27, + 0xb6, 0xac, 0x8a, 0xae, 0xd9, 0xc5, 0x8f, 0x11, 0xed, 0x3c, 0xc0, 0x81, 0xbf, 0xcb, 0xe3, 0x6b, + 0xf4, 0x05, 0x58, 0x1a, 0xb3, 0xa7, 0x59, 0x10, 0x78, 0x8d, 0xca, 0xf5, 0xd6, 0x63, 0xb9, 0x71, + 0x26, 0x17, 0x6a, 0x9e, 0xa6, 0x52, 0x59, 0x4b, 0xe0, 0x8d, 0xb8, 0x8c, 0xbb, 0x94, 0x78, 0x18, + 0x77, 0xe2, 0x53, 0xb3, 0xbe, 0x4d, 0x9d, 0x55, 0xb2, 0xa7, 0xd1, 0x42, 0x30, 0x2f, 0xda, 0x14, + 0xe9, 0x75, 0xdd, 0xaa, 0x25, 0x5b, 0x27, 0x12, 0xef, 0x74, 0xd8, 0xa7, 0x5b, 0x24, 0x08, 0x9b, + 0x1b, 0x02, 0xfa, 0xe7, 0x7f, 0xaa, 0xf5, 0x1c, 0xd0, 0xc2, 0x81, 0xb9, 0x25, 0x9e, 0xe4, 0xb5, + 0x2e, 0x81, 0xaa, 0x64, 0xb9, 0x8f, 0x03, 0x3f, 0x0c, 0x08, 0x45, 0x3e, 0x3e, 0xce, 0xbb, 0x6f, + 0x80, 0x5a, 0xb6, 0x8d, 0xe6, 0x26, 0xa0, 0xcc, 0x92, 0xed, 0x34, 0xff, 0xcb, 0x5f, 0xad, 0x05, + 0x76, 0x32, 0xb1, 0xb5, 0x08, 0x2e, 0x48, 0xa8, 0xad, 0xb0, 0x13, 0x78, 0x88, 0x13, 0x3a, 0xe4, + 0x7d, 0x6e, 0xe8, 0xde, 0xa7, 0xb7, 0x34, 0x66, 0x1b, 0xcc, 0x72, 0xda, 0x6d, 0xed, 0x61, 0x44, + 0x35, 0xda, 0x9d, 0xd3, 0x1d, 0xfa, 0xe1, 0x41, 0x75, 0x66, 0xc7, 0xdd, 0xfe, 0x08, 0x23, 0x7a, + 0x62, 0xa0, 0xd0, 0xae, 0x58, 0x86, 0x18, 0xcc, 0x89, 0x1c, 0x3d, 0x12, 0xf2, 0x5d, 0xfd, 0xb4, + 0xde, 0x3b, 0x75, 0x92, 0xd9, 0x1d, 0x77, 0xfb, 0x03, 0x11, 0xe1, 0x58, 0x16, 0x81, 0x2f, 0xd7, + 0xad, 0xb2, 0x9e, 0x5b, 0x77, 0x11, 0x45, 0xbd, 0x61, 0xf1, 0xf7, 0xf5, 0xa4, 0x88, 0x57, 0x75, + 0xdd, 0x37, 0x41, 0x31, 0x92, 0x2b, 0xb2, 0xea, 0xd2, 0xa6, 0x99, 0xf5, 0xf6, 0x94, 0x9f, 0x7e, + 0x69, 0xda, 0xc7, 0xfa, 0x44, 0x5f, 0x80, 0x66, 0x9f, 0x86, 0x3b, 0x68, 0xf0, 0xce, 0x00, 0xf7, + 0x22, 0x31, 0xf1, 0xb7, 0x03, 0x16, 0x3f, 0x38, 0xf8, 0x2e, 0x00, 0x89, 0xba, 0xc8, 0xb2, 0x4b, + 0x9b, 0xcb, 0x23, 0xd7, 0x56, 0xc9, 0x5a, 0x92, 0xc8, 0x8f, 0x67, 0xbe, 0x9b, 0xf2, 0x14, 0xaf, + 0xe3, 0xd2, 0x84, 0x64, 0xba, 0x9e, 0x8b, 0x60, 0x0e, 0x75, 0x3a, 0x14, 0x33, 0x86, 0xd5, 0x1b, + 0x99, 0x73, 0x93, 0x05, 0x78, 0x67, 0x0c, 0xcb, 0xd5, 0xa9, 0x2c, 0x2a, 0x74, 0x1a, 0x66, 0xf3, + 0xd7, 0x12, 0x38, 0x2f, 0x61, 0xe0, 0x77, 0x06, 0x98, 0xd1, 0x92, 0x04, 0x57, 0xa7, 0x0d, 0xae, + 0x94, 0x9e, 0x55, 0xd6, 0xf2, 0x19, 0xab, 0xe4, 0x56, 0xfd, 0xcb, 0x3f, 0x9f, 0xef, 0x9f, 0xb3, + 0x60, 0xcd, 0xc9, 0x12, 0x51, 0xad, 0x81, 0x70, 0xdf, 0x00, 0x45, 0x35, 0x23, 0xe1, 0x4a, 0x8e, + 0x41, 0x1a, 0xe3, 0xac, 0xe6, 0xb2, 0xd5, 0x34, 0x1b, 0x92, 0x66, 0x05, 0xd6, 0x27, 0xd1, 0x88, + 0x89, 0xee, 0x7c, 0x26, 0x35, 0xe5, 0xf3, 0xb8, 0x4d, 0x62, 0x3c, 0xc3, 0xd5, 0x7c, 0xf3, 0x3d, + 0x67, 0x9b, 0xd2, 0x62, 0x90, 0xaf, 0x4d, 0x02, 0x0c, 0xfe, 0x64, 0x80, 0xf9, 0xb4, 0x06, 0xc0, + 0xc9, 0xaa, 0x33, 0x46, 0x4a, 0x2a, 0x8d, 0x53, 0x78, 0x68, 0xbe, 0x75, 0xc9, 0x77, 0x15, 0x5e, + 0xc9, 0xe2, 0x1b, 0x91, 0x1f, 0xf8, 0x9b, 0x01, 0x16, 0xc6, 0x0c, 0x57, 0x78, 0x63, 0x62, 0xe6, + 0xec, 0x91, 0x5d, 0x79, 0xf3, 0xf4, 0x8e, 0x9a, 0xfc, 0xba, 0x24, 0xb7, 0xe1, 0x5a, 0x16, 0xf9, + 0xb8, 0x29, 0x0f, 0x7f, 0x34, 0x40, 0x29, 0xa5, 0x66, 0xd0, 0x99, 0x76, 0x9a, 0xc7, 0x81, 0x37, + 0xf2, 0x3b, 0x68, 0xd0, 0x35, 0x09, 0xba, 0x0c, 0x2f, 0x4f, 0xba, 0x02, 0x43, 0xc0, 0x1f, 0x0c, + 0x00, 0x12, 0x39, 0x80, 0xf6, 0xc4, 0x74, 0x27, 0x24, 0xa5, 0xe2, 0xe4, 0xb6, 0xd7, 0x74, 0x2b, + 0x92, 0xee, 0x32, 0xb4, 0xb2, 0xe8, 0x82, 0x04, 0xe6, 0x77, 0x03, 0x94, 0xc7, 0x0d, 0x3b, 0x38, + 0xf9, 0x14, 0x27, 0x0c, 0xe3, 0xca, 0x5b, 0x2f, 0xe0, 0xa9, 0xc9, 0x6f, 0x48, 0xf2, 0x06, 0x74, + 0xb2, 0xc8, 0xdb, 0x7d, 0x1a, 0xb6, 0x44, 0x73, 0x71, 0xec, 0xdf, 0xea, 0x0a, 0xda, 0x6f, 0x0c, + 0x50, 0x54, 0xea, 0x31, 0x65, 0x20, 0x8d, 0x08, 0xd6, 0x94, 0x81, 0x34, 0x2a, 0x63, 0xd6, 0xb2, + 0x84, 0xab, 0x41, 0x33, 0x0b, 0x4e, 0x09, 0x56, 0xf3, 0xfd, 0xa7, 0x87, 0xa6, 0xf1, 0xec, 0xd0, + 0x34, 0xfe, 0x3d, 0x34, 0x8d, 0xef, 0x8f, 0xcc, 0xc2, 0xb3, 0x23, 0xb3, 0xf0, 0xd7, 0x91, 0x59, + 0xf8, 0xb8, 0x91, 0x56, 0xe0, 0x2e, 0x62, 0x2c, 0xf0, 0xd6, 0x55, 0x2c, 0x8f, 0x50, 0xec, 0x3c, + 0xba, 0xe6, 0x0c, 0x92, 0xa8, 0x52, 0x90, 0xdb, 0x45, 0xf9, 0x7b, 0xe5, 0xda, 0xff, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xa5, 0x62, 0x9f, 0xba, 0xaf, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -1142,40 +1051,33 @@ type QueryServer interface { } // UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct{} +type UnimplementedQueryServer struct { +} func (*UnimplementedQueryServer) TaxRate(ctx context.Context, req *QueryTaxRateRequest) (*QueryTaxRateResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TaxRate not implemented") } - func (*UnimplementedQueryServer) TaxCap(ctx context.Context, req *QueryTaxCapRequest) (*QueryTaxCapResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TaxCap not implemented") } - func (*UnimplementedQueryServer) TaxCaps(ctx context.Context, req *QueryTaxCapsRequest) (*QueryTaxCapsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TaxCaps not implemented") } - func (*UnimplementedQueryServer) RewardWeight(ctx context.Context, req *QueryRewardWeightRequest) (*QueryRewardWeightResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RewardWeight not implemented") } - func (*UnimplementedQueryServer) SeigniorageProceeds(ctx context.Context, req *QuerySeigniorageProceedsRequest) (*QuerySeigniorageProceedsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SeigniorageProceeds not implemented") } - func (*UnimplementedQueryServer) TaxProceeds(ctx context.Context, req *QueryTaxProceedsRequest) (*QueryTaxProceedsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TaxProceeds not implemented") } - func (*UnimplementedQueryServer) Indicators(ctx context.Context, req *QueryIndicatorsRequest) (*QueryIndicatorsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Indicators not implemented") } - func (*UnimplementedQueryServer) BurnTaxExemptionList(ctx context.Context, req *QueryBurnTaxExemptionListRequest) (*QueryBurnTaxExemptionListResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method BurnTaxExemptionList not implemented") } - func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } @@ -1994,7 +1896,6 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *QueryTaxRateRequest) Size() (n int) { if m == nil { return 0 @@ -2219,11 +2120,9 @@ func (m *QueryBurnTaxExemptionListResponse) Size() (n int) { func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *QueryTaxRateRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2274,7 +2173,6 @@ func (m *QueryTaxRateRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTaxRateResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2359,7 +2257,6 @@ func (m *QueryTaxRateResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTaxCapRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2442,7 +2339,6 @@ func (m *QueryTaxCapRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTaxCapResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2527,7 +2423,6 @@ func (m *QueryTaxCapResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTaxCapsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2578,7 +2473,6 @@ func (m *QueryTaxCapsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTaxCapsResponseItem) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2695,7 +2589,6 @@ func (m *QueryTaxCapsResponseItem) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTaxCapsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2780,7 +2673,6 @@ func (m *QueryTaxCapsResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryRewardWeightRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2831,7 +2723,6 @@ func (m *QueryRewardWeightRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryRewardWeightResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2916,7 +2807,6 @@ func (m *QueryRewardWeightResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTaxProceedsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2967,7 +2857,6 @@ func (m *QueryTaxProceedsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryTaxProceedsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3052,7 +2941,6 @@ func (m *QueryTaxProceedsResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QuerySeigniorageProceedsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3103,7 +2991,6 @@ func (m *QuerySeigniorageProceedsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QuerySeigniorageProceedsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3188,7 +3075,6 @@ func (m *QuerySeigniorageProceedsResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryIndicatorsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3239,7 +3125,6 @@ func (m *QueryIndicatorsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryIndicatorsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3358,7 +3243,6 @@ func (m *QueryIndicatorsResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3409,7 +3293,6 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3493,7 +3376,6 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryBurnTaxExemptionListRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3580,7 +3462,6 @@ func (m *QueryBurnTaxExemptionListRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryBurnTaxExemptionListResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3699,7 +3580,6 @@ func (m *QueryBurnTaxExemptionListResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/treasury/types/query.pb.gw.go b/x/treasury/types/query.pb.gw.go index 5052b12a6..3078960c4 100644 --- a/x/treasury/types/query.pb.gw.go +++ b/x/treasury/types/query.pb.gw.go @@ -25,15 +25,13 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = runtime.String - _ = utilities.NewDoubleArray - _ = descriptor.ForMessage - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join func request_Query_TaxRate_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryTaxRateRequest @@ -41,6 +39,7 @@ func request_Query_TaxRate_0(ctx context.Context, marshaler runtime.Marshaler, c msg, err := client.TaxRate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_TaxRate_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -49,6 +48,7 @@ func local_request_Query_TaxRate_0(ctx context.Context, marshaler runtime.Marsha msg, err := server.TaxRate(ctx, &protoReq) return msg, metadata, err + } func request_Query_TaxCap_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -75,6 +75,7 @@ func request_Query_TaxCap_0(ctx context.Context, marshaler runtime.Marshaler, cl msg, err := client.TaxCap(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_TaxCap_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -101,6 +102,7 @@ func local_request_Query_TaxCap_0(ctx context.Context, marshaler runtime.Marshal msg, err := server.TaxCap(ctx, &protoReq) return msg, metadata, err + } func request_Query_TaxCaps_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -109,6 +111,7 @@ func request_Query_TaxCaps_0(ctx context.Context, marshaler runtime.Marshaler, c msg, err := client.TaxCaps(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_TaxCaps_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -117,6 +120,7 @@ func local_request_Query_TaxCaps_0(ctx context.Context, marshaler runtime.Marsha msg, err := server.TaxCaps(ctx, &protoReq) return msg, metadata, err + } func request_Query_RewardWeight_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -125,6 +129,7 @@ func request_Query_RewardWeight_0(ctx context.Context, marshaler runtime.Marshal msg, err := client.RewardWeight(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_RewardWeight_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -133,6 +138,7 @@ func local_request_Query_RewardWeight_0(ctx context.Context, marshaler runtime.M msg, err := server.RewardWeight(ctx, &protoReq) return msg, metadata, err + } func request_Query_SeigniorageProceeds_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -141,6 +147,7 @@ func request_Query_SeigniorageProceeds_0(ctx context.Context, marshaler runtime. msg, err := client.SeigniorageProceeds(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_SeigniorageProceeds_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -149,6 +156,7 @@ func local_request_Query_SeigniorageProceeds_0(ctx context.Context, marshaler ru msg, err := server.SeigniorageProceeds(ctx, &protoReq) return msg, metadata, err + } func request_Query_TaxProceeds_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -157,6 +165,7 @@ func request_Query_TaxProceeds_0(ctx context.Context, marshaler runtime.Marshale msg, err := client.TaxProceeds(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_TaxProceeds_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -165,6 +174,7 @@ func local_request_Query_TaxProceeds_0(ctx context.Context, marshaler runtime.Ma msg, err := server.TaxProceeds(ctx, &protoReq) return msg, metadata, err + } func request_Query_Indicators_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -173,6 +183,7 @@ func request_Query_Indicators_0(ctx context.Context, marshaler runtime.Marshaler msg, err := client.Indicators(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Indicators_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -181,9 +192,12 @@ func local_request_Query_Indicators_0(ctx context.Context, marshaler runtime.Mar msg, err := server.Indicators(ctx, &protoReq) return msg, metadata, err + } -var filter_Query_BurnTaxExemptionList_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +var ( + filter_Query_BurnTaxExemptionList_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) func request_Query_BurnTaxExemptionList_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryBurnTaxExemptionListRequest @@ -198,6 +212,7 @@ func request_Query_BurnTaxExemptionList_0(ctx context.Context, marshaler runtime msg, err := client.BurnTaxExemptionList(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_BurnTaxExemptionList_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -213,6 +228,7 @@ func local_request_Query_BurnTaxExemptionList_0(ctx context.Context, marshaler r msg, err := server.BurnTaxExemptionList(ctx, &protoReq) return msg, metadata, err + } func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -221,6 +237,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -229,6 +246,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal msg, err := server.Params(ctx, &protoReq) return msg, metadata, err + } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". @@ -236,6 +254,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { + mux.Handle("GET", pattern_Query_TaxRate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -256,6 +275,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TaxRate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TaxCap_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -278,6 +298,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TaxCap_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TaxCaps_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -300,6 +321,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TaxCaps_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_RewardWeight_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -322,6 +344,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_RewardWeight_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_SeigniorageProceeds_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -344,6 +367,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_SeigniorageProceeds_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TaxProceeds_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -366,6 +390,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_TaxProceeds_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Indicators_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -388,6 +413,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Indicators_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_BurnTaxExemptionList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -410,6 +436,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_BurnTaxExemptionList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -432,6 +459,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -474,6 +502,7 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { + mux.Handle("GET", pattern_Query_TaxRate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -491,6 +520,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TaxRate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TaxCap_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -510,6 +540,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TaxCap_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TaxCaps_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -529,6 +560,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TaxCaps_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_RewardWeight_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -548,6 +580,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_RewardWeight_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_SeigniorageProceeds_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -567,6 +600,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_SeigniorageProceeds_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_TaxProceeds_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -586,6 +620,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_TaxProceeds_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Indicators_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -605,6 +640,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Indicators_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_BurnTaxExemptionList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -624,6 +660,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_BurnTaxExemptionList_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -643,6 +680,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil diff --git a/x/treasury/types/treasury.pb.go b/x/treasury/types/treasury.pb.go index e76f5f094..b6e05e793 100644 --- a/x/treasury/types/treasury.pb.go +++ b/x/treasury/types/treasury.pb.go @@ -5,22 +5,20 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -46,11 +44,9 @@ func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { return fileDescriptor_353bb3a9c554268e, []int{0} } - func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Params.Marshal(b, m, deterministic) @@ -63,15 +59,12 @@ func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Params) XXX_Merge(src proto.Message) { xxx_messageInfo_Params.Merge(m, src) } - func (m *Params) XXX_Size() int { return m.Size() } - func (m *Params) XXX_DiscardUnknown() { xxx_messageInfo_Params.DiscardUnknown(m) } @@ -126,11 +119,9 @@ func (*PolicyConstraints) ProtoMessage() {} func (*PolicyConstraints) Descriptor() ([]byte, []int) { return fileDescriptor_353bb3a9c554268e, []int{1} } - func (m *PolicyConstraints) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *PolicyConstraints) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_PolicyConstraints.Marshal(b, m, deterministic) @@ -143,15 +134,12 @@ func (m *PolicyConstraints) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } - func (m *PolicyConstraints) XXX_Merge(src proto.Message) { xxx_messageInfo_PolicyConstraints.Merge(m, src) } - func (m *PolicyConstraints) XXX_Size() int { return m.Size() } - func (m *PolicyConstraints) XXX_DiscardUnknown() { xxx_messageInfo_PolicyConstraints.DiscardUnknown(m) } @@ -177,11 +165,9 @@ func (*EpochTaxProceeds) ProtoMessage() {} func (*EpochTaxProceeds) Descriptor() ([]byte, []int) { return fileDescriptor_353bb3a9c554268e, []int{2} } - func (m *EpochTaxProceeds) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *EpochTaxProceeds) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_EpochTaxProceeds.Marshal(b, m, deterministic) @@ -194,15 +180,12 @@ func (m *EpochTaxProceeds) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } - func (m *EpochTaxProceeds) XXX_Merge(src proto.Message) { xxx_messageInfo_EpochTaxProceeds.Merge(m, src) } - func (m *EpochTaxProceeds) XXX_Size() int { return m.Size() } - func (m *EpochTaxProceeds) XXX_DiscardUnknown() { xxx_messageInfo_EpochTaxProceeds.DiscardUnknown(m) } @@ -228,11 +211,9 @@ func (*EpochInitialIssuance) ProtoMessage() {} func (*EpochInitialIssuance) Descriptor() ([]byte, []int) { return fileDescriptor_353bb3a9c554268e, []int{3} } - func (m *EpochInitialIssuance) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *EpochInitialIssuance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_EpochInitialIssuance.Marshal(b, m, deterministic) @@ -245,15 +226,12 @@ func (m *EpochInitialIssuance) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } - func (m *EpochInitialIssuance) XXX_Merge(src proto.Message) { xxx_messageInfo_EpochInitialIssuance.Merge(m, src) } - func (m *EpochInitialIssuance) XXX_Size() int { return m.Size() } - func (m *EpochInitialIssuance) XXX_DiscardUnknown() { xxx_messageInfo_EpochInitialIssuance.DiscardUnknown(m) } @@ -279,56 +257,58 @@ func init() { } var fileDescriptor_353bb3a9c554268e = []byte{ - // 775 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x8f, 0x1b, 0x35, - 0x18, 0xc7, 0x33, 0x6c, 0xd9, 0xdd, 0x38, 0x29, 0xd9, 0xba, 0x4b, 0x76, 0x52, 0x50, 0x26, 0xb2, - 0x04, 0x0a, 0x87, 0xce, 0x68, 0x97, 0x03, 0xd2, 0x5e, 0x10, 0xd9, 0x42, 0x89, 0x00, 0x29, 0x72, - 0xf7, 0x84, 0x90, 0x46, 0xce, 0xc4, 0x9a, 0x58, 0x64, 0xec, 0x91, 0xed, 0x74, 0x27, 0xdc, 0xb9, - 0x01, 0x42, 0x9c, 0x10, 0xa7, 0x1e, 0x11, 0x9f, 0xa4, 0xc7, 0x1e, 0x11, 0x87, 0x80, 0x76, 0x2f, - 0x9c, 0xf3, 0x09, 0xd0, 0xd8, 0xce, 0x5b, 0xa1, 0x40, 0xd4, 0x53, 0xfc, 0xbc, 0xfd, 0x9e, 0xbf, - 0x9d, 0x79, 0x6c, 0xf0, 0x96, 0xa6, 0x52, 0x92, 0x48, 0x4b, 0x4a, 0xd4, 0x54, 0xce, 0xa2, 0xc7, - 0xa7, 0x43, 0xaa, 0xc9, 0xe9, 0xca, 0x11, 0xe6, 0x52, 0x68, 0x01, 0x9b, 0x26, 0x2d, 0x5c, 0x79, - 0x5d, 0xda, 0xbd, 0xe3, 0x54, 0xa4, 0xc2, 0xa4, 0x44, 0xe5, 0xca, 0x66, 0xdf, 0x6b, 0x27, 0x42, - 0x65, 0x42, 0x45, 0x43, 0xa2, 0xe8, 0x8a, 0x98, 0x08, 0xc6, 0x6d, 0x1c, 0xfd, 0x7c, 0x00, 0xf6, - 0x07, 0x44, 0x92, 0x4c, 0xc1, 0x04, 0x00, 0x4d, 0x8a, 0x38, 0x17, 0x13, 0x96, 0xcc, 0x7c, 0xaf, - 0xe3, 0x75, 0x6b, 0x67, 0xef, 0x84, 0xff, 0xdc, 0x2d, 0x1c, 0x98, 0xac, 0x0b, 0xc1, 0x95, 0x96, - 0x84, 0x71, 0xad, 0x7a, 0xad, 0xa7, 0xf3, 0xa0, 0xb2, 0x98, 0x07, 0x77, 0x66, 0x24, 0x9b, 0x9c, - 0xa3, 0x35, 0x0a, 0xe1, 0xaa, 0x26, 0x85, 0x2d, 0x80, 0x13, 0x70, 0x5b, 0xd2, 0x2b, 0x22, 0x47, - 0xcb, 0x3e, 0xaf, 0xec, 0xda, 0xe7, 0x4d, 0xd7, 0xe7, 0xd8, 0xf6, 0xd9, 0xa2, 0x21, 0x5c, 0xb7, - 0xb6, 0xeb, 0xf6, 0x9d, 0x07, 0x5a, 0x8a, 0xb2, 0x94, 0x33, 0x21, 0x49, 0x4a, 0xe3, 0xe1, 0x54, - 0x8e, 0x28, 0x8f, 0x35, 0x91, 0x29, 0xd5, 0xfe, 0x5e, 0xc7, 0xeb, 0x56, 0x7b, 0xb8, 0xe4, 0xfd, - 0x36, 0x0f, 0xde, 0x4e, 0x99, 0x1e, 0x4f, 0x87, 0x61, 0x22, 0xb2, 0xc8, 0x1d, 0x9a, 0xfd, 0xb9, - 0xaf, 0x46, 0x5f, 0x46, 0x7a, 0x96, 0x53, 0x15, 0x3e, 0xa0, 0xc9, 0x62, 0x1e, 0x74, 0x6c, 0xe7, - 0x17, 0x82, 0x11, 0x3e, 0xd9, 0x88, 0xf5, 0x4c, 0xe8, 0xd2, 0x44, 0xa0, 0x06, 0x47, 0x19, 0xe3, - 0x8c, 0xa7, 0x31, 0xe3, 0x89, 0xa4, 0x19, 0xe5, 0xda, 0xbf, 0x65, 0x64, 0xf4, 0x77, 0x96, 0x71, - 0x62, 0x65, 0x3c, 0xcf, 0x43, 0xb8, 0x61, 0x5d, 0xfd, 0xa5, 0x07, 0x9e, 0x83, 0xfa, 0x15, 0xe3, - 0x23, 0x71, 0x15, 0xab, 0xb1, 0x90, 0xda, 0x7f, 0xb5, 0xe3, 0x75, 0x6f, 0xf5, 0x4e, 0x16, 0xf3, - 0xe0, 0xae, 0x65, 0x6c, 0x46, 0x11, 0xae, 0x59, 0xf3, 0x51, 0x69, 0xc1, 0xf7, 0x80, 0x33, 0xe3, - 0x89, 0xe0, 0xa9, 0xbf, 0x6f, 0x4a, 0x9b, 0x8b, 0x79, 0x00, 0xb7, 0x4a, 0xcb, 0x20, 0xc2, 0xc0, - 0x5a, 0x9f, 0x0a, 0x9e, 0xc2, 0x8f, 0xc0, 0x91, 0x8b, 0xe5, 0x52, 0x0c, 0x89, 0x66, 0x82, 0xfb, - 0x07, 0xa6, 0xfa, 0x8d, 0xb5, 0xf8, 0xe7, 0x33, 0x10, 0x6e, 0x58, 0xd7, 0x60, 0xe9, 0x81, 0x19, - 0x78, 0x6d, 0x38, 0x95, 0xe5, 0xd9, 0x16, 0xb1, 0xca, 0x27, 0x4c, 0xfb, 0x87, 0xe6, 0xc0, 0x1e, - 0xee, 0x7c, 0x60, 0xaf, 0xdb, 0x9e, 0xdb, 0x34, 0x84, 0xeb, 0xa5, 0xe3, 0x92, 0x14, 0x8f, 0x4a, - 0x13, 0x7e, 0xeb, 0x81, 0x56, 0xc6, 0x78, 0xcc, 0x38, 0xd3, 0x8c, 0x4c, 0xe2, 0x11, 0xcd, 0x85, - 0x62, 0x3a, 0x96, 0xa5, 0x1a, 0xbf, 0xfa, 0x72, 0x9f, 0xcc, 0x0b, 0xc1, 0x08, 0x37, 0x33, 0xc6, - 0xfb, 0x36, 0xf4, 0xc0, 0x46, 0x70, 0x19, 0x38, 0x3f, 0xfc, 0xf1, 0x49, 0x50, 0xf9, 0xf3, 0x49, - 0xe0, 0xa1, 0x6f, 0xf6, 0xc0, 0x9d, 0xbf, 0x8d, 0x03, 0xfc, 0x02, 0x1c, 0x4a, 0xa2, 0x69, 0x9c, - 0x31, 0x6e, 0x66, 0xb6, 0xda, 0xfb, 0x60, 0x67, 0x75, 0x0d, 0x37, 0x4a, 0x8e, 0x83, 0xf0, 0x41, - 0xb9, 0xfc, 0x8c, 0xf1, 0x35, 0x9d, 0x14, 0x66, 0x52, 0x5f, 0x9a, 0x4e, 0x8a, 0x25, 0x9d, 0x14, - 0xf0, 0x7d, 0xb0, 0x97, 0x90, 0xdc, 0xcc, 0x61, 0xed, 0xac, 0x15, 0xda, 0xfa, 0xb0, 0xbc, 0xaa, - 0x56, 0xf3, 0x7f, 0x21, 0x18, 0xef, 0x41, 0x37, 0xf2, 0xc0, 0x92, 0x12, 0x92, 0x23, 0x5c, 0x56, - 0xc2, 0x1c, 0x34, 0x92, 0x31, 0xe1, 0x29, 0x8d, 0x57, 0x2a, 0xed, 0x34, 0x7d, 0xbc, 0xb3, 0xca, - 0xa6, 0x63, 0x6f, 0xe3, 0x10, 0xbe, 0x6d, 0x3d, 0xd8, 0x4a, 0xde, 0xf8, 0x3b, 0x7e, 0xf2, 0xc0, - 0xd1, 0x87, 0xb9, 0x48, 0xc6, 0x97, 0xa4, 0x18, 0x48, 0x91, 0x50, 0x3a, 0x52, 0xf0, 0x6b, 0x0f, - 0xd4, 0xcd, 0xcd, 0xe7, 0x1c, 0xbe, 0xd7, 0xd9, 0xfb, 0xf7, 0xbd, 0x3d, 0x74, 0x7b, 0xbb, 0xbb, - 0x71, 0x6d, 0xba, 0x62, 0xf4, 0xcb, 0xef, 0x41, 0xf7, 0x7f, 0x6c, 0xa0, 0xe4, 0x28, 0x5c, 0xd3, - 0x6b, 0x1d, 0xe8, 0x07, 0x0f, 0x1c, 0x1b, 0x71, 0xee, 0x93, 0xea, 0x2b, 0x35, 0x25, 0x3c, 0xa1, - 0xf0, 0x2b, 0x70, 0xc8, 0xdc, 0xfa, 0xbf, 0xb5, 0x5d, 0x38, 0x6d, 0xee, 0x1f, 0x5c, 0x16, 0xee, - 0xa6, 0x6b, 0xd5, 0xaf, 0xf7, 0xc9, 0xd3, 0xeb, 0xb6, 0xf7, 0xec, 0xba, 0xed, 0xfd, 0x71, 0xdd, - 0xf6, 0xbe, 0xbf, 0x69, 0x57, 0x9e, 0xdd, 0xb4, 0x2b, 0xbf, 0xde, 0xb4, 0x2b, 0x9f, 0x9f, 0x6e, - 0xd2, 0x26, 0x44, 0x29, 0x96, 0xdc, 0xb7, 0xaf, 0x61, 0x22, 0x24, 0x8d, 0x1e, 0x9f, 0x45, 0xc5, - 0xfa, 0x5d, 0x34, 0xf0, 0xe1, 0xbe, 0x79, 0xbf, 0xde, 0xfd, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x20, - 0x39, 0xc8, 0xee, 0x36, 0x07, 0x00, 0x00, + // 804 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbf, 0x6f, 0x23, 0x45, + 0x14, 0xf6, 0xe2, 0x23, 0xb1, 0xc7, 0x3e, 0x9c, 0x9b, 0x0b, 0xce, 0xfa, 0x40, 0x5e, 0x6b, 0x25, + 0x90, 0x29, 0x62, 0x2b, 0x77, 0x05, 0x52, 0x1a, 0x24, 0x27, 0x80, 0x22, 0x40, 0x58, 0x7b, 0x01, + 0x24, 0x9a, 0x65, 0x3c, 0x1e, 0xad, 0x07, 0xbc, 0x33, 0xab, 0x99, 0xf1, 0x65, 0x0d, 0x12, 0x05, + 0x12, 0x3d, 0xa2, 0x42, 0x40, 0x71, 0x35, 0x35, 0xe2, 0x6f, 0x48, 0x19, 0x51, 0x21, 0x0a, 0x03, + 0x49, 0x43, 0xed, 0xbf, 0x00, 0xed, 0xcc, 0xf8, 0x27, 0x09, 0x9c, 0x95, 0xca, 0x7e, 0xef, 0x7d, + 0xef, 0xfb, 0xbe, 0x79, 0xbb, 0x6f, 0x16, 0xbc, 0xa2, 0x88, 0x10, 0xa8, 0xad, 0x04, 0x41, 0x72, + 0x24, 0xc6, 0xed, 0x27, 0x07, 0x3d, 0xa2, 0xd0, 0xc1, 0x3c, 0xd1, 0x4a, 0x04, 0x57, 0x1c, 0x56, + 0x35, 0xac, 0x35, 0xcf, 0x5a, 0xd8, 0x83, 0x3a, 0xe6, 0x32, 0xe6, 0xb2, 0xdd, 0x43, 0x92, 0xcc, + 0x7b, 0x31, 0xa7, 0xcc, 0xf4, 0x3d, 0xa8, 0x99, 0x7a, 0xa8, 0xa3, 0xb6, 0x09, 0x6c, 0x69, 0x37, + 0xe2, 0x11, 0x37, 0xf9, 0xec, 0x9f, 0xc9, 0xfa, 0x7f, 0x6d, 0x83, 0xad, 0x2e, 0x12, 0x28, 0x96, + 0x10, 0x03, 0xa0, 0x50, 0x1a, 0x26, 0x7c, 0x48, 0xf1, 0xd8, 0x75, 0x1a, 0x4e, 0xb3, 0xf4, 0xf0, + 0xb5, 0xd6, 0xf5, 0x46, 0x5a, 0x5d, 0x8d, 0x3a, 0xe2, 0x4c, 0x2a, 0x81, 0x28, 0x53, 0xb2, 0x53, + 0x3b, 0x9f, 0x78, 0xb9, 0xe9, 0xc4, 0xbb, 0x37, 0x46, 0xf1, 0xf0, 0xd0, 0x5f, 0x50, 0xf9, 0x41, + 0x51, 0xa1, 0xd4, 0x34, 0xc0, 0x21, 0xb8, 0x2b, 0xc8, 0x19, 0x12, 0xfd, 0x99, 0xce, 0x73, 0x9b, + 0xea, 0xbc, 0x6c, 0x75, 0x76, 0x8d, 0xce, 0x0a, 0x9b, 0x1f, 0x94, 0x4d, 0x6c, 0xd5, 0x7e, 0x74, + 0x40, 0x4d, 0x12, 0x1a, 0x31, 0xca, 0x05, 0x8a, 0x48, 0xd8, 0x1b, 0x89, 0x3e, 0x61, 0xa1, 0x42, + 0x22, 0x22, 0xca, 0xcd, 0x37, 0x9c, 0x66, 0xb1, 0xf3, 0x49, 0xc6, 0xf7, 0xfb, 0xc4, 0x7b, 0x35, + 0xa2, 0x6a, 0x30, 0xea, 0xb5, 0x30, 0x8f, 0xed, 0xe0, 0xec, 0xcf, 0xbe, 0xec, 0x7f, 0xd6, 0x56, + 0xe3, 0x84, 0xc8, 0xd6, 0x31, 0xc1, 0xd3, 0x89, 0xd7, 0x30, 0xca, 0x37, 0x12, 0xfb, 0xbf, 0xfe, + 0xbc, 0x0f, 0xec, 0xec, 0x8f, 0x09, 0x0e, 0xf6, 0x96, 0x90, 0x1d, 0x0d, 0x3c, 0xd5, 0x38, 0xf8, + 0x95, 0x03, 0x76, 0x62, 0xca, 0x28, 0x8b, 0x42, 0xca, 0xb0, 0x20, 0x31, 0x61, 0xca, 0xbd, 0xa3, + 0x5d, 0x7d, 0xb4, 0xb1, 0xab, 0x3d, 0xe3, 0x6a, 0x9d, 0x6f, 0xdd, 0x4c, 0xc5, 0x00, 0x4e, 0x66, + 0x75, 0x78, 0x08, 0xca, 0x67, 0x94, 0xf5, 0xf9, 0x59, 0x28, 0x07, 0x5c, 0x28, 0xf7, 0xf9, 0x86, + 0xd3, 0xbc, 0xd3, 0xd9, 0x9b, 0x4e, 0xbc, 0xfb, 0x86, 0x71, 0xb9, 0xea, 0x07, 0x25, 0x13, 0x3e, + 0xce, 0x22, 0xf8, 0x3a, 0xb0, 0x61, 0x38, 0xe4, 0x2c, 0x72, 0xb7, 0x74, 0x6b, 0x75, 0x3a, 0xf1, + 0xe0, 0x4a, 0x6b, 0x56, 0xf4, 0x03, 0x60, 0xa2, 0x77, 0x39, 0x8b, 0xe0, 0x5b, 0x60, 0xc7, 0xd6, + 0x12, 0xc1, 0x7b, 0x48, 0x51, 0xce, 0xdc, 0x6d, 0xdd, 0xfd, 0xd2, 0xe2, 0x28, 0xeb, 0x08, 0x3f, + 0xa8, 0x98, 0x54, 0x77, 0x96, 0x81, 0x5f, 0x80, 0x17, 0x7a, 0x23, 0x91, 0x0d, 0x3e, 0x0d, 0x65, + 0x32, 0xa4, 0xca, 0x2d, 0xe8, 0xf1, 0x7d, 0xb0, 0xf1, 0xf8, 0x5e, 0x34, 0x9a, 0xab, 0x6c, 0xeb, + 0xc3, 0x2b, 0x67, 0xe5, 0x53, 0x94, 0x3e, 0xce, 0x8a, 0xf0, 0x07, 0x07, 0xd4, 0x62, 0xca, 0x42, + 0xca, 0xa8, 0xa2, 0x68, 0x18, 0xf6, 0x49, 0xc2, 0x25, 0x55, 0xa1, 0xc8, 0xbc, 0xb9, 0xc5, 0xdb, + 0xbd, 0x5d, 0x37, 0x12, 0xaf, 0x7b, 0xaa, 0xc6, 0x94, 0x9d, 0x18, 0xe0, 0xb1, 0xc1, 0x05, 0x19, + 0xec, 0xb0, 0xf0, 0xdd, 0x53, 0x2f, 0xf7, 0xf7, 0x53, 0xcf, 0xf1, 0x7f, 0xc9, 0x83, 0x7b, 0xff, + 0xda, 0x23, 0xf8, 0x29, 0x28, 0x08, 0xa4, 0x48, 0x18, 0x53, 0xa6, 0x97, 0xbd, 0xd8, 0x79, 0x7f, + 0x63, 0xaf, 0x15, 0xbb, 0x83, 0x96, 0x67, 0xdd, 0xda, 0x76, 0x56, 0x78, 0x8f, 0xb2, 0x85, 0x16, + 0x4a, 0xf5, 0xc2, 0xdf, 0x5a, 0x0b, 0xa5, 0xd7, 0x6b, 0xa1, 0x14, 0xbe, 0x01, 0xf2, 0x18, 0x25, + 0x7a, 0xb9, 0x4b, 0x0f, 0x6b, 0x2d, 0x0b, 0xc9, 0x2e, 0xcc, 0xf9, 0xa5, 0x72, 0xc4, 0x29, 0xeb, + 0x40, 0x7b, 0x8f, 0x00, 0xc3, 0x8b, 0x51, 0xe2, 0x07, 0x59, 0x27, 0xfc, 0x12, 0x54, 0xf0, 0x00, + 0xb1, 0x88, 0x84, 0x73, 0xcf, 0x66, 0x27, 0x3f, 0xdc, 0xd8, 0x73, 0xd5, 0x72, 0xaf, 0xd2, 0xad, + 0x5b, 0xbf, 0x6b, 0xea, 0x81, 0x39, 0xc0, 0xd2, 0x83, 0xfb, 0xde, 0x01, 0x3b, 0x6f, 0x26, 0x1c, + 0x0f, 0x4e, 0x51, 0xda, 0x15, 0x1c, 0x13, 0xd2, 0x97, 0xf0, 0x6b, 0x07, 0x94, 0xf5, 0xe5, 0x6a, + 0x13, 0xae, 0xd3, 0xc8, 0xff, 0xf7, 0x49, 0xdf, 0xb6, 0x27, 0xbd, 0xbf, 0x74, 0x33, 0xdb, 0x66, + 0xff, 0xa7, 0x3f, 0xbc, 0xe6, 0x33, 0x1c, 0x27, 0xe3, 0x91, 0x41, 0x49, 0x2d, 0x7c, 0xf8, 0xdf, + 0x3a, 0x60, 0x57, 0x9b, 0xb3, 0x2f, 0xdf, 0x89, 0x94, 0x23, 0xc4, 0x30, 0x81, 0x9f, 0x83, 0x02, + 0xb5, 0xff, 0xff, 0xdf, 0xdb, 0x91, 0xf5, 0x66, 0x9f, 0xee, 0xac, 0x71, 0x33, 0x5f, 0x73, 0xbd, + 0xce, 0x3b, 0xe7, 0x97, 0x75, 0xe7, 0xe2, 0xb2, 0xee, 0xfc, 0x79, 0x59, 0x77, 0xbe, 0xb9, 0xaa, + 0xe7, 0x2e, 0xae, 0xea, 0xb9, 0xdf, 0xae, 0xea, 0xb9, 0x8f, 0x0f, 0x96, 0xd9, 0x86, 0x48, 0x4a, + 0x8a, 0xf7, 0xcd, 0xb7, 0x18, 0x73, 0x41, 0xda, 0x4f, 0x1e, 0xb5, 0xd3, 0xc5, 0x57, 0x59, 0x93, + 0xf7, 0xb6, 0xf4, 0x27, 0xf2, 0xd1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x36, 0x0b, 0xf0, 0xae, + 0xb4, 0x07, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -379,7 +359,6 @@ func (this *Params) Equal(that interface{}) bool { } return true } - func (this *PolicyConstraints) Equal(that interface{}) bool { if that == nil { return this == nil @@ -413,7 +392,6 @@ func (this *PolicyConstraints) Equal(that interface{}) bool { } return true } - func (m *Params) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -660,7 +638,6 @@ func encodeVarintTreasury(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *Params) Size() (n int) { if m == nil { return 0 @@ -741,11 +718,9 @@ func (m *EpochInitialIssuance) Size() (n int) { func sovTreasury(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozTreasury(x uint64) (n int) { return sovTreasury(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *Params) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1055,7 +1030,6 @@ func (m *Params) Unmarshal(dAtA []byte) error { } return nil } - func (m *PolicyConstraints) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1241,7 +1215,6 @@ func (m *PolicyConstraints) Unmarshal(dAtA []byte) error { } return nil } - func (m *EpochTaxProceeds) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1326,7 +1299,6 @@ func (m *EpochTaxProceeds) Unmarshal(dAtA []byte) error { } return nil } - func (m *EpochInitialIssuance) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1411,7 +1383,6 @@ func (m *EpochInitialIssuance) Unmarshal(dAtA []byte) error { } return nil } - func skipTreasury(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/vesting/module.go b/x/vesting/module.go index 3ab86a133..13ea60a0b 100644 --- a/x/vesting/module.go +++ b/x/vesting/module.go @@ -11,7 +11,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/classic-terra/core/v2/x/vesting/types" + "github.com/classic-terra/core/v3/x/vesting/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/x/vesting/types/common_test.go b/x/vesting/types/common_test.go index 3a58325b8..8be4bf3d7 100644 --- a/x/vesting/types/common_test.go +++ b/x/vesting/types/common_test.go @@ -3,14 +3,14 @@ package types_test import ( "testing" - "github.com/classic-terra/core/v2/custom/auth" - "github.com/classic-terra/core/v2/x/vesting/types" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/secp256k1" + "github.com/classic-terra/core/v3/custom/auth" + "github.com/classic-terra/core/v3/x/vesting/types" + "github.com/cometbft/cometbft/crypto" + "github.com/cometbft/cometbft/crypto/secp256k1" + simparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - simparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/vesting/types/genesis_test.go b/x/vesting/types/genesis_test.go index e556ff7ec..3ff2b8cb0 100644 --- a/x/vesting/types/genesis_test.go +++ b/x/vesting/types/genesis_test.go @@ -3,15 +3,15 @@ package types_test import ( "testing" + "github.com/cometbft/cometbft/crypto/ed25519" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" authvesttypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/vesting/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/vesting/types" ) var ( diff --git a/x/vesting/types/vesting.pb.go b/x/vesting/types/vesting.pb.go index 29f4d9850..dd5c820cc 100644 --- a/x/vesting/types/vesting.pb.go +++ b/x/vesting/types/vesting.pb.go @@ -5,22 +5,20 @@ package types import ( fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - + _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -40,11 +38,9 @@ func (*LazyGradedVestingAccount) ProtoMessage() {} func (*LazyGradedVestingAccount) Descriptor() ([]byte, []int) { return fileDescriptor_c4a9bc06e563192a, []int{0} } - func (m *LazyGradedVestingAccount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *LazyGradedVestingAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_LazyGradedVestingAccount.Marshal(b, m, deterministic) @@ -57,15 +53,12 @@ func (m *LazyGradedVestingAccount) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } - func (m *LazyGradedVestingAccount) XXX_Merge(src proto.Message) { xxx_messageInfo_LazyGradedVestingAccount.Merge(m, src) } - func (m *LazyGradedVestingAccount) XXX_Size() int { return m.Size() } - func (m *LazyGradedVestingAccount) XXX_DiscardUnknown() { xxx_messageInfo_LazyGradedVestingAccount.DiscardUnknown(m) } @@ -85,11 +78,9 @@ func (*Schedule) ProtoMessage() {} func (*Schedule) Descriptor() ([]byte, []int) { return fileDescriptor_c4a9bc06e563192a, []int{1} } - func (m *Schedule) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_Schedule.Marshal(b, m, deterministic) @@ -102,15 +93,12 @@ func (m *Schedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } - func (m *Schedule) XXX_Merge(src proto.Message) { xxx_messageInfo_Schedule.Merge(m, src) } - func (m *Schedule) XXX_Size() int { return m.Size() } - func (m *Schedule) XXX_DiscardUnknown() { xxx_messageInfo_Schedule.DiscardUnknown(m) } @@ -129,11 +117,9 @@ func (*VestingSchedule) ProtoMessage() {} func (*VestingSchedule) Descriptor() ([]byte, []int) { return fileDescriptor_c4a9bc06e563192a, []int{2} } - func (m *VestingSchedule) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *VestingSchedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_VestingSchedule.Marshal(b, m, deterministic) @@ -146,15 +132,12 @@ func (m *VestingSchedule) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } - func (m *VestingSchedule) XXX_Merge(src proto.Message) { xxx_messageInfo_VestingSchedule.Merge(m, src) } - func (m *VestingSchedule) XXX_Size() int { return m.Size() } - func (m *VestingSchedule) XXX_DiscardUnknown() { xxx_messageInfo_VestingSchedule.DiscardUnknown(m) } @@ -172,37 +155,38 @@ func init() { } var fileDescriptor_c4a9bc06e563192a = []byte{ - // 482 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xc1, 0x6e, 0xd3, 0x30, - 0x18, 0xc7, 0xe3, 0x76, 0x83, 0xc6, 0x43, 0x5a, 0x17, 0x36, 0x29, 0xda, 0x21, 0xae, 0x02, 0x4c, - 0x15, 0x68, 0x0e, 0x2b, 0x3b, 0xf5, 0x80, 0x44, 0x84, 0x84, 0x84, 0x38, 0x85, 0x89, 0x03, 0x97, - 0xca, 0x89, 0xad, 0x2e, 0xa2, 0x89, 0xa7, 0xd8, 0xad, 0x28, 0x4f, 0x00, 0x37, 0x0e, 0x1c, 0x38, - 0xee, 0xbc, 0x27, 0xd9, 0x81, 0x43, 0x8f, 0x88, 0x43, 0x40, 0xed, 0x1b, 0xe4, 0x09, 0x50, 0xed, - 0x64, 0x1d, 0x19, 0xdd, 0xa9, 0xf5, 0xf7, 0xfd, 0xbf, 0x9f, 0xfd, 0xf7, 0xdf, 0x81, 0x0f, 0x24, - 0xcb, 0x32, 0xe2, 0x4d, 0x98, 0x90, 0x71, 0x3a, 0xf4, 0x26, 0x47, 0x21, 0x93, 0xe4, 0xa8, 0x5a, - 0xe3, 0xb3, 0x8c, 0x4b, 0x6e, 0xed, 0x29, 0x11, 0xae, 0x8a, 0xa5, 0x68, 0x7f, 0x77, 0xc8, 0x87, - 0x5c, 0x29, 0xbc, 0xe5, 0x3f, 0x2d, 0xde, 0x7f, 0x18, 0x71, 0x91, 0x70, 0x71, 0x3b, 0xd2, 0xfd, - 0xd6, 0x80, 0xf6, 0x1b, 0xf2, 0x69, 0xfa, 0x2a, 0x23, 0x94, 0xd1, 0x77, 0xba, 0xf7, 0x22, 0x8a, - 0xf8, 0x38, 0x95, 0x56, 0x08, 0x77, 0x43, 0x22, 0xd8, 0xa0, 0x1c, 0x19, 0x10, 0x5d, 0xb7, 0x41, - 0x07, 0x74, 0xb7, 0x7a, 0x8f, 0xb1, 0xde, 0xa1, 0x7e, 0x1e, 0xec, 0x13, 0xc1, 0xfe, 0x25, 0xf9, - 0x1b, 0xb3, 0x1c, 0x81, 0xc0, 0x0a, 0x6f, 0x74, 0xac, 0x2f, 0x00, 0xee, 0x54, 0x7c, 0x11, 0x9d, - 0x32, 0x3a, 0x1e, 0x31, 0x61, 0x37, 0x3a, 0xcd, 0xee, 0x56, 0xef, 0x00, 0xff, 0xd7, 0x30, 0x2e, - 0x11, 0x6f, 0x4b, 0xb9, 0x7f, 0x7c, 0x99, 0x23, 0xa3, 0xc8, 0x91, 0x3d, 0x25, 0xc9, 0xa8, 0xef, - 0xde, 0xc0, 0xb9, 0x17, 0xbf, 0x51, 0xbb, 0x36, 0x24, 0x82, 0xf6, 0xa4, 0x56, 0xe9, 0xb7, 0x3e, - 0x9f, 0x23, 0xe3, 0xfb, 0x39, 0x32, 0xdc, 0x1f, 0x00, 0xb6, 0xaa, 0xba, 0x75, 0x0c, 0xa1, 0x90, - 0x24, 0x93, 0x03, 0x19, 0x27, 0x4c, 0x99, 0x6f, 0xfa, 0x7b, 0x45, 0x8e, 0x76, 0xf4, 0x76, 0xab, - 0x9e, 0x1b, 0x98, 0x6a, 0x71, 0x12, 0x27, 0xcc, 0xc2, 0xb0, 0xc5, 0x52, 0xaa, 0x67, 0x1a, 0x6a, - 0xe6, 0x7e, 0x91, 0xa3, 0x6d, 0x3d, 0x53, 0x75, 0xdc, 0xe0, 0x2e, 0x4b, 0xa9, 0xd2, 0x9f, 0xc0, - 0xcd, 0x8c, 0xc8, 0x98, 0xdb, 0xcd, 0x0e, 0xe8, 0x9a, 0xfe, 0xf3, 0xa5, 0xa7, 0x5f, 0x39, 0x3a, - 0x18, 0xc6, 0xf2, 0x74, 0x1c, 0xe2, 0x88, 0x27, 0x5e, 0x99, 0xa8, 0xfe, 0x39, 0x14, 0xf4, 0x83, - 0x27, 0xa7, 0x67, 0x4c, 0xe0, 0x97, 0x2c, 0x2a, 0x72, 0x74, 0x4f, 0xa3, 0x15, 0xc4, 0x0d, 0x34, - 0xac, 0xbf, 0xb1, 0xb4, 0xe4, 0x5e, 0x00, 0xb8, 0x5d, 0xf3, 0x6f, 0x3d, 0x81, 0x9b, 0x94, 0xa5, - 0x3c, 0x51, 0x86, 0xcc, 0x75, 0x86, 0xb4, 0xc6, 0xa2, 0xd0, 0xac, 0x87, 0x83, 0xd6, 0x84, 0x73, - 0x95, 0xca, 0xa3, 0x32, 0x95, 0x76, 0x49, 0xbd, 0x9e, 0x86, 0xb9, 0x8a, 0x61, 0x05, 0xd6, 0x87, - 0xf5, 0x5f, 0x5f, 0xce, 0x1d, 0x30, 0x9b, 0x3b, 0xe0, 0xcf, 0xdc, 0x01, 0x5f, 0x17, 0x8e, 0x31, - 0x5b, 0x38, 0xc6, 0xcf, 0x85, 0x63, 0xbc, 0x7f, 0x7a, 0xfd, 0x2e, 0x46, 0x44, 0x88, 0x38, 0x3a, - 0xd4, 0xdf, 0x4d, 0xc4, 0x33, 0xe6, 0x4d, 0x7a, 0xde, 0xc7, 0xab, 0xe7, 0xae, 0x6e, 0x26, 0xbc, - 0xa3, 0x5e, 0xf9, 0xb3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x5c, 0x52, 0x15, 0x5f, 0x03, + // 498 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xbf, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0x7d, 0x49, 0x0b, 0xf1, 0x15, 0xa9, 0xa9, 0x69, 0x25, 0xd3, 0xc1, 0x17, 0x19, 0xa8, + 0x22, 0x50, 0x6c, 0xfa, 0x63, 0xca, 0x86, 0x55, 0x09, 0x09, 0x75, 0x32, 0x88, 0x81, 0x25, 0x3a, + 0x9f, 0x4f, 0xa9, 0x45, 0xec, 0xab, 0x7c, 0x97, 0x88, 0xf0, 0x17, 0xc0, 0xc6, 0xc0, 0xc0, 0xd8, + 0xb9, 0x33, 0x7f, 0x44, 0xc7, 0x88, 0x09, 0x75, 0x30, 0x28, 0xf9, 0x0f, 0xf2, 0x17, 0xa0, 0xdc, + 0x9d, 0x9b, 0xe2, 0x92, 0x4e, 0xc9, 0x7b, 0xef, 0xfb, 0x3e, 0x77, 0xef, 0x7d, 0x7d, 0xf0, 0xb1, + 0xa0, 0x79, 0x8e, 0xfd, 0x11, 0xe5, 0x22, 0xc9, 0xfa, 0xfe, 0x68, 0x3f, 0xa2, 0x02, 0xef, 0x97, + 0xb1, 0x77, 0x96, 0x33, 0xc1, 0xac, 0x1d, 0x29, 0xf2, 0xca, 0xa4, 0x16, 0xed, 0x3e, 0x21, 0x8c, + 0xa7, 0x8c, 0xdf, 0xdd, 0xbc, 0xfb, 0x48, 0xa9, 0x7a, 0x32, 0xf2, 0x55, 0xa0, 0x4b, 0xdb, 0x7d, + 0xd6, 0x67, 0x2a, 0xbf, 0xf8, 0xa7, 0xb2, 0xee, 0xb7, 0x1a, 0xb4, 0x4f, 0xf0, 0xa7, 0xf1, 0xab, + 0x1c, 0xc7, 0x34, 0x7e, 0xa7, 0x60, 0x2f, 0x09, 0x61, 0xc3, 0x4c, 0x58, 0x11, 0xdc, 0x8e, 0x30, + 0xa7, 0x3d, 0x7d, 0x46, 0x0f, 0xab, 0xbc, 0x0d, 0x5a, 0xa0, 0xbd, 0x71, 0xf0, 0xcc, 0xd3, 0xfc, + 0xca, 0x55, 0xbd, 0x00, 0x73, 0xfa, 0x2f, 0x29, 0x58, 0x9b, 0x14, 0x08, 0x84, 0x56, 0x74, 0xab, + 0x62, 0x7d, 0x01, 0x70, 0xab, 0xe4, 0x73, 0x72, 0x4a, 0xe3, 0xe1, 0x80, 0x72, 0xbb, 0xd6, 0xaa, + 0xb7, 0x37, 0x0e, 0xf6, 0xbc, 0xff, 0xee, 0xc2, 0xd3, 0x88, 0x37, 0x5a, 0x1e, 0x1c, 0x5d, 0x16, + 0xc8, 0x98, 0x17, 0xc8, 0x1e, 0xe3, 0x74, 0xd0, 0x75, 0x6f, 0xe1, 0xdc, 0x8b, 0xdf, 0xa8, 0x59, + 0x69, 0xe2, 0x61, 0x73, 0x54, 0xc9, 0x74, 0x1b, 0x9f, 0xcf, 0x91, 0xf1, 0xfd, 0x1c, 0x19, 0xee, + 0x15, 0x80, 0x8d, 0x32, 0x6f, 0x1d, 0x41, 0xc8, 0x05, 0xce, 0x45, 0x4f, 0x24, 0x29, 0x95, 0xc3, + 0xd7, 0x83, 0x9d, 0x79, 0x81, 0xb6, 0xd4, 0x71, 0xcb, 0x9a, 0x1b, 0x9a, 0x32, 0x78, 0x9b, 0xa4, + 0xd4, 0xf2, 0x60, 0x83, 0x66, 0xb1, 0xea, 0xa9, 0xc9, 0x9e, 0x87, 0xf3, 0x02, 0x6d, 0xaa, 0x9e, + 0xb2, 0xe2, 0x86, 0xf7, 0x69, 0x16, 0x4b, 0x7d, 0x04, 0xd7, 0x73, 0x2c, 0x12, 0x66, 0xd7, 0x5b, + 0xa0, 0x6d, 0x06, 0x27, 0x8b, 0x99, 0xae, 0x0a, 0xb4, 0xd7, 0x4f, 0xc4, 0xe9, 0x30, 0xf2, 0x08, + 0x4b, 0xb5, 0x9f, 0xfa, 0xa7, 0xc3, 0xe3, 0x0f, 0xbe, 0x18, 0x9f, 0x51, 0xee, 0x1d, 0x53, 0x32, + 0x2f, 0xd0, 0x03, 0x85, 0x96, 0x10, 0xf7, 0xe7, 0x8f, 0x0e, 0xd4, 0xf6, 0x1c, 0x53, 0x12, 0x2a, + 0x74, 0x77, 0x6d, 0x31, 0xa0, 0x7b, 0x01, 0xe0, 0x66, 0x65, 0x1b, 0xd6, 0x73, 0xb8, 0x1e, 0xd3, + 0x8c, 0xa5, 0x72, 0x3c, 0x73, 0xd5, 0x78, 0x4a, 0x63, 0xc5, 0xd0, 0xac, 0x5a, 0x85, 0x56, 0x58, + 0x75, 0xed, 0xd1, 0x53, 0xed, 0x51, 0x53, 0x53, 0x6f, 0x7a, 0x63, 0x2e, 0x4d, 0x59, 0x82, 0xd5, + 0x65, 0x83, 0xd7, 0x97, 0x53, 0x07, 0x4c, 0xa6, 0x0e, 0xf8, 0x33, 0x75, 0xc0, 0xd7, 0x99, 0x63, + 0x4c, 0x66, 0x8e, 0xf1, 0x6b, 0xe6, 0x18, 0xef, 0x5f, 0xdc, 0xdc, 0xcc, 0x00, 0x73, 0x9e, 0x90, + 0x8e, 0x7a, 0x60, 0x84, 0xe5, 0xd4, 0x1f, 0x1d, 0xfa, 0x1f, 0xaf, 0x5f, 0x8b, 0xdc, 0x53, 0x74, + 0x4f, 0x7e, 0xf3, 0x87, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x94, 0x98, 0x68, 0xcd, 0x88, 0x03, 0x00, 0x00, } @@ -353,7 +337,6 @@ func encodeVarintVesting(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *LazyGradedVestingAccount) Size() (n int) { if m == nil { return 0 @@ -412,11 +395,9 @@ func (m *VestingSchedule) Size() (n int) { func sovVesting(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozVesting(x uint64) (n int) { return sovVesting(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *LazyGradedVestingAccount) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -537,7 +518,6 @@ func (m *LazyGradedVestingAccount) Unmarshal(dAtA []byte) error { } return nil } - func (m *Schedule) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -660,7 +640,6 @@ func (m *Schedule) Unmarshal(dAtA []byte) error { } return nil } - func (m *VestingSchedule) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -777,7 +756,6 @@ func (m *VestingSchedule) Unmarshal(dAtA []byte) error { } return nil } - func skipVesting(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/vesting/types/vesting_account_test.go b/x/vesting/types/vesting_account_test.go index a645530ea..9259e1f55 100644 --- a/x/vesting/types/vesting_account_test.go +++ b/x/vesting/types/vesting_account_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + tmtime "github.com/cometbft/cometbft/types/time" "github.com/stretchr/testify/require" - tmtime "github.com/tendermint/tendermint/types/time" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" @@ -14,8 +14,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" authvestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - core "github.com/classic-terra/core/v2/types" - "github.com/classic-terra/core/v2/x/vesting/types" + core "github.com/classic-terra/core/v3/types" + "github.com/classic-terra/core/v3/x/vesting/types" ) var ( @@ -78,7 +78,7 @@ func TestGetVestingCoinsLazyVestingAcc(t *testing.T) { // require no coins vesting at the end of the vesting schedule vestingCoins = lgva.GetVestingCoins(endTime) - require.Nil(t, vestingCoins) + require.Equal(t, vestingCoins, sdk.Coins{}) // require 50% of coins vesting vestingCoins = lgva.GetVestingCoins(now.Add(12 * time.Hour)) From 383a96d8c8ee6db221f9a5abd332a110b3d58e83 Mon Sep 17 00:00:00 2001 From: Pham Anh Minh <93236465+phamminh0811@users.noreply.github.com> Date: Mon, 24 Jun 2024 10:17:09 +0700 Subject: [PATCH 2/6] v3.0.3: fix params keys table (#480) Co-authored-by: expertdicer --- app/keepers/keepers.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 3df0dbbda..406fd28c9 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -42,6 +42,7 @@ import ( feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" @@ -486,14 +487,14 @@ func initParamsKeeper( ) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - paramsKeeper.Subspace(authtypes.ModuleName) - paramsKeeper.Subspace(banktypes.ModuleName) - paramsKeeper.Subspace(stakingtypes.ModuleName) - paramsKeeper.Subspace(minttypes.ModuleName) - paramsKeeper.Subspace(distrtypes.ModuleName) - paramsKeeper.Subspace(slashingtypes.ModuleName) - paramsKeeper.Subspace(govtypes.ModuleName) - paramsKeeper.Subspace(crisistypes.ModuleName) + paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable()) + paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable()) + paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable()) + paramsKeeper.Subspace(minttypes.ModuleName).WithKeyTable(minttypes.ParamKeyTable()) + paramsKeeper.Subspace(distrtypes.ModuleName).WithKeyTable(distrtypes.ParamKeyTable()) + paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable()) + paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypesv1.ParamKeyTable()) + paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable()) paramsKeeper.Subspace(ibctransfertypes.ModuleName) paramsKeeper.Subspace(ibcexported.ModuleName) paramsKeeper.Subspace(icahosttypes.SubModuleName) @@ -501,7 +502,7 @@ func initParamsKeeper( paramsKeeper.Subspace(markettypes.ModuleName) paramsKeeper.Subspace(oracletypes.ModuleName) paramsKeeper.Subspace(treasurytypes.ModuleName) - paramsKeeper.Subspace(wasmtypes.ModuleName) + paramsKeeper.Subspace(wasmtypes.ModuleName).WithKeyTable(wasmtypes.ParamKeyTable()) paramsKeeper.Subspace(dyncommtypes.ModuleName) return paramsKeeper From 2db4512889f7a1485d31847cbb22d535209b6817 Mon Sep 17 00:00:00 2001 From: Till Ziegler Date: Wed, 10 Jul 2024 07:45:21 +0200 Subject: [PATCH 3/6] feat: oracle split as per governance (#495) Co-authored-by: expertdicer --- app/app.go | 14 +- app/legacy/pubkey_replacement.go | 2 - app/upgrades/v8_1/constants.go | 13 ++ app/upgrades/v8_1/upgrades.go | 25 ++++ contrib/updates/Dockerfile.old | 4 +- contrib/updates/docker-compose.yml | 2 +- contrib/updates/prepare_cosmovisor.sh | 2 +- contrib/updates/upgrade-test.sh | 0 custom/auth/ante/expected_keeper.go | 1 + custom/auth/ante/fee_burntax.go | 23 ++- custom/auth/ante/fee_test.go | 44 +++++- go.mod | 1 + go.sum | 2 + proto/terra/treasury/v1beta1/treasury.proto | 6 + tests/e2e/configurer/chain/commands.go | 5 +- tests/e2e/e2e_test.go | 2 +- x/treasury/keeper/params.go | 9 ++ x/treasury/types/params.go | 29 ++++ x/treasury/types/treasury.pb.go | 155 +++++++++++++------- 19 files changed, 269 insertions(+), 70 deletions(-) create mode 100644 app/upgrades/v8_1/constants.go create mode 100644 app/upgrades/v8_1/upgrades.go mode change 100644 => 100755 contrib/updates/upgrade-test.sh diff --git a/app/app.go b/app/app.go index 73a944da7..823d41c85 100644 --- a/app/app.go +++ b/app/app.go @@ -55,6 +55,7 @@ import ( v7 "github.com/classic-terra/core/v3/app/upgrades/v7" v7_1 "github.com/classic-terra/core/v3/app/upgrades/v7_1" v8 "github.com/classic-terra/core/v3/app/upgrades/v8" + v8_1 "github.com/classic-terra/core/v3/app/upgrades/v8_1" customante "github.com/classic-terra/core/v3/custom/auth/ante" custompost "github.com/classic-terra/core/v3/custom/auth/post" @@ -75,7 +76,18 @@ var ( DefaultNodeHome string // Upgrades defines upgrades to be applied to the network - Upgrades = []upgrades.Upgrade{v2.Upgrade, v3.Upgrade, v4.Upgrade, v5.Upgrade, v6.Upgrade, v6_1.Upgrade, v7.Upgrade, v7_1.Upgrade, v8.Upgrade} + Upgrades = []upgrades.Upgrade{ + v2.Upgrade, + v3.Upgrade, + v4.Upgrade, + v5.Upgrade, + v6.Upgrade, + v6_1.Upgrade, + v7.Upgrade, + v7_1.Upgrade, + v8.Upgrade, + v8_1.Upgrade, + } // Forks defines forks to be applied to the network Forks = []upgrades.Fork{} diff --git a/app/legacy/pubkey_replacement.go b/app/legacy/pubkey_replacement.go index be598d2a0..caef40dfb 100644 --- a/app/legacy/pubkey_replacement.go +++ b/app/legacy/pubkey_replacement.go @@ -46,7 +46,6 @@ func loadKeydataFromFile(clientCtx client.Context, replacementrJSON string, genD var replacementKeys replacementConfigs err = json.Unmarshal(jsonReplacementBlob, &replacementKeys) - if err != nil { log.Fatal(errors.Wrap(err, "Could not unmarshal replacement keys ")) } @@ -112,7 +111,6 @@ func loadKeydataFromFile(clientCtx client.Context, replacementrJSON string, genD state[slashing.ModuleName] = clientCtx.Codec.MustMarshalJSON(&slashingGenesis) genDoc.AppState, err = json.Marshal(state) - if err != nil { log.Fatal("Could not marshal App State") } diff --git a/app/upgrades/v8_1/constants.go b/app/upgrades/v8_1/constants.go new file mode 100644 index 000000000..f692af908 --- /dev/null +++ b/app/upgrades/v8_1/constants.go @@ -0,0 +1,13 @@ +//nolint:revive +package v8_1 + +import ( + "github.com/classic-terra/core/v3/app/upgrades" +) + +const UpgradeName = "v8_1" + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateV81UpgradeHandler, +} diff --git a/app/upgrades/v8_1/upgrades.go b/app/upgrades/v8_1/upgrades.go new file mode 100644 index 000000000..c4d6babc3 --- /dev/null +++ b/app/upgrades/v8_1/upgrades.go @@ -0,0 +1,25 @@ +//nolint:revive +package v8_1 + +import ( + "github.com/classic-terra/core/v3/app/keepers" + "github.com/classic-terra/core/v3/app/upgrades" + treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper" + treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" +) + +func CreateV81UpgradeHandler( + mm *module.Manager, + cfg module.Configurator, + _ upgrades.BaseAppParamManager, + keepers *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + // set default oracle split + mm.Modules[treasurytypes.ModuleName].(*treasurykeeper.Keeper).SetOracleSplitRate(ctx, treasurytypes.DefaultOracleSplit) + return mm.RunMigrations(ctx, cfg, fromVM) + } +} diff --git a/contrib/updates/Dockerfile.old b/contrib/updates/Dockerfile.old index 95defca46..5e4e6cd11 100644 --- a/contrib/updates/Dockerfile.old +++ b/contrib/updates/Dockerfile.old @@ -52,8 +52,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ # Cosmwasm - Download correct libwasmvm version and verify checksum RUN set -eux &&\ - WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 5) && \ - WASMVM_DOWNLOADS="https://github.com/classic-terra/wasmvm/releases/download/${WASMVM_VERSION}"; \ + WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | cut -d ' ' -f 2) && \ + WASMVM_DOWNLOADS="https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}"; \ wget ${WASMVM_DOWNLOADS}/checksums.txt -O /tmp/checksums.txt; \ if [ ${BUILDPLATFORM} = "linux/amd64" ]; then \ WASMVM_URL="${WASMVM_DOWNLOADS}/libwasmvm_muslc.x86_64.a"; \ diff --git a/contrib/updates/docker-compose.yml b/contrib/updates/docker-compose.yml index 9a8a9d5ed..57cef82af 100644 --- a/contrib/updates/docker-compose.yml +++ b/contrib/updates/docker-compose.yml @@ -139,4 +139,4 @@ networks: driver: default config: - - subnet: 192.168.10.0/16 \ No newline at end of file + subnet: 192.168.10.0/24 \ No newline at end of file diff --git a/contrib/updates/prepare_cosmovisor.sh b/contrib/updates/prepare_cosmovisor.sh index b55fad1be..703be14a9 100644 --- a/contrib/updates/prepare_cosmovisor.sh +++ b/contrib/updates/prepare_cosmovisor.sh @@ -5,7 +5,7 @@ # These fields should be fetched automatically in the future # Need to do more upgrade to see upgrade patterns -OLD_VERSION=v2.4.2 +OLD_VERSION=v3.0.3 # this command will retrieve the folder with the largest number in format v SOFTWARE_UPGRADE_NAME=$(ls -d -- ./app/upgrades/v* | sort -Vr | head -n 1 | xargs basename) BUILDDIR=$1 diff --git a/contrib/updates/upgrade-test.sh b/contrib/updates/upgrade-test.sh old mode 100644 new mode 100755 diff --git a/custom/auth/ante/expected_keeper.go b/custom/auth/ante/expected_keeper.go index 1326fb785..8367df827 100644 --- a/custom/auth/ante/expected_keeper.go +++ b/custom/auth/ante/expected_keeper.go @@ -16,6 +16,7 @@ type TreasuryKeeper interface { HasBurnTaxExemptionAddress(ctx sdk.Context, addresses ...string) bool HasBurnTaxExemptionContract(ctx sdk.Context, address string) bool GetMinInitialDepositRatio(ctx sdk.Context) sdk.Dec + GetOracleSplitRate(ctx sdk.Context) sdk.Dec } // OracleKeeper for feeder validation diff --git a/custom/auth/ante/fee_burntax.go b/custom/auth/ante/fee_burntax.go index fd76cd3ea..a28eeaaa8 100644 --- a/custom/auth/ante/fee_burntax.go +++ b/custom/auth/ante/fee_burntax.go @@ -6,15 +6,18 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/types" + oracle "github.com/classic-terra/core/v3/x/oracle/types" treasury "github.com/classic-terra/core/v3/x/treasury/types" ) // BurnTaxSplit splits func (fd FeeDecorator) BurnTaxSplit(ctx sdk.Context, taxes sdk.Coins) (err error) { burnSplitRate := fd.treasuryKeeper.GetBurnSplitRate(ctx) + oracleSplitRate := fd.treasuryKeeper.GetOracleSplitRate(ctx) + distributionDeltaCoins := sdk.NewCoins() + oracleSplitCoins := sdk.NewCoins() if burnSplitRate.IsPositive() { - distributionDeltaCoins := sdk.NewCoins() for _, taxCoin := range taxes { splitcoinAmount := burnSplitRate.MulInt(taxCoin.Amount).RoundInt() @@ -24,6 +27,24 @@ func (fd FeeDecorator) BurnTaxSplit(ctx sdk.Context, taxes sdk.Coins) (err error taxes = taxes.Sub(distributionDeltaCoins...) } + if oracleSplitRate.IsPositive() { + for _, distrCoin := range distributionDeltaCoins { + oracleCoinAmnt := oracleSplitRate.MulInt(distrCoin.Amount).RoundInt() + oracleSplitCoins = oracleSplitCoins.Add(sdk.NewCoin(distrCoin.Denom, oracleCoinAmnt)) + } + } + + if !oracleSplitCoins.IsZero() { + if err = fd.bankKeeper.SendCoinsFromModuleToModule( + ctx, + types.FeeCollectorName, + oracle.ModuleName, + oracleSplitCoins, + ); err != nil { + return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) + } + } + if !taxes.IsZero() { if err = fd.bankKeeper.SendCoinsFromModuleToModule( ctx, diff --git a/custom/auth/ante/fee_test.go b/custom/auth/ante/fee_test.go index 50dcc8c4c..21f29bff0 100644 --- a/custom/auth/ante/fee_test.go +++ b/custom/auth/ante/fee_test.go @@ -687,9 +687,12 @@ func (s *AnteTestSuite) TestTaxExemption() { ak := s.app.AccountKeeper bk := s.app.BankKeeper burnSplitRate := sdk.NewDecWithPrec(5, 1) + oracleSplitRate := sdk.ZeroDec() // Set burn split rate to 50% + // oracle split to 0% (oracle split is covered in another test) tk.SetBurnSplitRate(s.ctx, burnSplitRate) + tk.SetOracleSplitRate(s.ctx, oracleSplitRate) fmt.Printf("CASE = %s \n", c.name) s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() @@ -732,14 +735,26 @@ func (s *AnteTestSuite) TestTaxExemption() { // go test -v -run ^TestAnteTestSuite/TestBurnSplitTax$ github.com/classic-terra/core/v3/custom/auth/ante func (s *AnteTestSuite) TestBurnSplitTax() { - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0)) // 100% - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1)) // 10% - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2)) // 0.1% - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0)) // 0% burn all taxes (old burn tax behavior) - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(-1, 1)) // -10% invalid rate + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.ZeroDec()) // 100% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.ZeroDec()) // 10% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.ZeroDec()) // 0.1% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.ZeroDec()) // 0% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.NewDecWithPrec(5, 1)) // 100% distribute, 50% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.NewDecWithPrec(5, 1)) // 10% distribute, 50% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.NewDecWithPrec(5, 1)) // 0.1% distribute, 50% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.NewDecWithPrec(5, 1)) // 0% distribute, 50% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.ZeroDec()) // 100% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.ZeroDec()) // 10% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.ZeroDec()) // 0.1% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.ZeroDec()) // 0% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.OneDec()) // 100% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.OneDec()) // 10% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.OneDec()) // 0.1% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.OneDec()) // 0% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(-1, 1), sdk.ZeroDec()) // -10% distribute - invalid rate } -func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec) { +func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec, oracleSplitRate sdk.Dec) { s.SetupTest(true) // setup require := s.Require() s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() @@ -752,6 +767,7 @@ func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec) { // Set burn split tax tk.SetBurnSplitRate(s.ctx, burnSplitRate) + tk.SetOracleSplitRate(s.ctx, oracleSplitRate) // keys and addresses priv1, _, addr1 := testdata.KeyTestPubAddr() @@ -804,15 +820,27 @@ func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec) { tk.BurnCoinsFromBurnAccount(s.ctx) feeCollectorAfter := sdk.NewDecCoinsFromCoins(bk.GetAllBalances(s.ctx, ak.GetModuleAddress(authtypes.FeeCollectorName))...) + oracleAfter := sdk.NewDecCoinsFromCoins(bk.GetAllBalances(s.ctx, ak.GetModuleAddress(oracletypes.ModuleName))...) taxes := ante.FilterMsgAndComputeTax(s.ctx, tk, msg) burnTax := sdk.NewDecCoinsFromCoins(taxes...) if burnSplitRate.IsPositive() { distributionDeltaCoins := burnTax.MulDec(burnSplitRate) + expectedOracleCoins := distributionDeltaCoins.MulDec(oracleSplitRate) + expectedDistrCoins := distributionDeltaCoins.Sub(expectedOracleCoins) + + if expectedOracleCoins == nil { + expectedOracleCoins = sdk.NewDecCoins() + } + + if expectedDistrCoins == nil { + expectedDistrCoins = sdk.NewDecCoins() + } // expected: community pool 50% - fmt.Printf("BurnSplitRate %v, DistributionDeltaCoins %v\n", burnSplitRate, distributionDeltaCoins) - require.Equal(feeCollectorAfter, distributionDeltaCoins) + fmt.Printf("-- BurnSplitRate %+v, OracleSplitRate %+v, OracleCoins %+v, DistrCoins %+v\n", burnSplitRate, oracleSplitRate, expectedOracleCoins, expectedDistrCoins) + require.Equal(feeCollectorAfter, expectedDistrCoins) + require.Equal(oracleAfter, expectedOracleCoins) burnTax = burnTax.Sub(distributionDeltaCoins) } diff --git a/go.mod b/go.mod index 992398a07..fa7a9a22d 100644 --- a/go.mod +++ b/go.mod @@ -65,6 +65,7 @@ require ( github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect github.com/opencontainers/runc v1.1.12 // indirect + github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect diff --git a/go.sum b/go.sum index d5e71c43c..98228659e 100644 --- a/go.sum +++ b/go.sum @@ -1079,6 +1079,8 @@ github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Ung github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= +github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= diff --git a/proto/terra/treasury/v1beta1/treasury.proto b/proto/terra/treasury/v1beta1/treasury.proto index 1d91a9c63..a6e0b8893 100644 --- a/proto/terra/treasury/v1beta1/treasury.proto +++ b/proto/terra/treasury/v1beta1/treasury.proto @@ -41,6 +41,12 @@ message Params { (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; + string oracle_split = 10 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.moretags) = "yaml:\"oracle_split\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; } // PolicyConstraints - defines policy constraints can be applied in tax & reward policies diff --git a/tests/e2e/configurer/chain/commands.go b/tests/e2e/configurer/chain/commands.go index 954868ece..c1e96bac5 100644 --- a/tests/e2e/configurer/chain/commands.go +++ b/tests/e2e/configurer/chain/commands.go @@ -45,7 +45,7 @@ func (n *NodeConfig) InstantiateWasmContract(codeID, initMsg, amount, from strin n.LogActionF("successfully initialized") } -func (n *NodeConfig) Instantiate2WasmContract(codeID, initMsg, salt, amount, fee, from string) { +func (n *NodeConfig) Instantiate2WasmContract(codeID, initMsg, salt, amount, fee, gas, from string) { n.LogActionF("instantiating wasm contract %s with %s", codeID, initMsg) encodedSalt := make([]byte, hex.EncodedLen(len([]byte(salt)))) hex.Encode(encodedSalt, []byte(salt)) @@ -56,6 +56,9 @@ func (n *NodeConfig) Instantiate2WasmContract(codeID, initMsg, salt, amount, fee if fee != "" { cmd = append(cmd, fmt.Sprintf("--fees=%s", fee)) } + if gas != "" { + cmd = append(cmd, fmt.Sprintf("--gas=%s", gas)) + } n.LogActionF(strings.Join(cmd, " ")) _, _, err := n.containerManager.ExecTxCmd(n.t, n.chainID, n.Name, cmd) require.NoError(n.t, err) diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index d14e84dff..26872dced 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -209,7 +209,7 @@ func (s *IntegrationTestSuite) TestFeeTaxWasm() { strconv.Itoa(chain.LatestCodeID), `{"count": "0"}`, "salt", transferCoin.String(), - fmt.Sprintf("%duluna", stabilityFee), "test") + fmt.Sprintf("%duluna", stabilityFee), "300000", "test") contracts, err = node.QueryContractsFromID(chain.LatestCodeID) s.Require().NoError(err) diff --git a/x/treasury/keeper/params.go b/x/treasury/keeper/params.go index c9e101c0b..8c6e84197 100644 --- a/x/treasury/keeper/params.go +++ b/x/treasury/keeper/params.go @@ -66,6 +66,15 @@ func (k Keeper) SetMinInitialDepositRatio(ctx sdk.Context, minInitialDepositRati k.paramSpace.Set(ctx, types.KeyMinInitialDepositRatio, minInitialDepositRatio) } +func (k Keeper) GetOracleSplitRate(ctx sdk.Context) (res sdk.Dec) { + k.paramSpace.Get(ctx, types.KeyOracleSplit, &res) + return +} + +func (k Keeper) SetOracleSplitRate(ctx sdk.Context, oracleSplit sdk.Dec) { + k.paramSpace.Set(ctx, types.KeyOracleSplit, oracleSplit) +} + // GetParams returns the total set of treasury parameters. func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { k.paramSpace.GetParamSetIfExists(ctx, ¶ms) diff --git a/x/treasury/types/params.go b/x/treasury/types/params.go index 45eb7e8e1..b6684fd83 100644 --- a/x/treasury/types/params.go +++ b/x/treasury/types/params.go @@ -22,6 +22,7 @@ var ( KeyWindowProbation = []byte("WindowProbation") KeyBurnTaxSplit = []byte("BurnTaxSplit") KeyMinInitialDepositRatio = []byte("MinInitialDepositRatio") + KeyOracleSplit = []byte("OracleSplit") ) // Default parameter values @@ -47,6 +48,7 @@ var ( DefaultRewardWeight = sdk.NewDecWithPrec(5, 2) // 5% DefaultBurnTaxSplit = sdk.NewDecWithPrec(1, 1) // 10% goes to community pool, 90% burn DefaultMinInitialDepositRatio = sdk.ZeroDec() // 0% min initial deposit + DefaultOracleSplit = sdk.NewDecWithPrec(5, 1) // 50% oracle, 50% community pool ) var _ paramstypes.ParamSet = &Params{} @@ -63,6 +65,7 @@ func DefaultParams() Params { WindowProbation: DefaultWindowProbation, BurnTaxSplit: DefaultBurnTaxSplit, MinInitialDepositRatio: DefaultMinInitialDepositRatio, + OracleSplit: DefaultOracleSplit, } } @@ -90,6 +93,7 @@ func (p *Params) ParamSetPairs() paramstypes.ParamSetPairs { paramstypes.NewParamSetPair(KeyWindowProbation, &p.WindowProbation, validateWindowProbation), paramstypes.NewParamSetPair(KeyBurnTaxSplit, &p.BurnTaxSplit, validateBurnTaxSplit), paramstypes.NewParamSetPair(KeyMinInitialDepositRatio, &p.MinInitialDepositRatio, validateMinInitialDepositRatio), + paramstypes.NewParamSetPair(KeyOracleSplit, &p.OracleSplit, validateOraceSplit), } } @@ -137,6 +141,14 @@ func (p Params) Validate() error { return fmt.Errorf("treasury parameter WindowLong must be bigger than WindowShort: (%d, %d)", p.WindowLong, p.WindowShort) } + if p.OracleSplit.IsNegative() { + return fmt.Errorf("treasury parameter OracleSplit must be positive: %s", p.OracleSplit) + } + + if p.OracleSplit.GT(sdk.OneDec()) { + return fmt.Errorf("treasury parameter OracleSplit must be less than or equal to 1.0: %s", p.OracleSplit) + } + return nil } @@ -268,3 +280,20 @@ func validateMinInitialDepositRatio(i interface{}) error { return nil } + +func validateOraceSplit(i interface{}) error { + v, ok := i.(sdk.Dec) + if !ok { + return fmt.Errorf("invalid paramater type: %T", i) + } + + if v.IsNegative() { + return fmt.Errorf("oracle split must be positive: %s", v) + } + + if v.GT(sdk.OneDec()) { + return fmt.Errorf("oracle split must be less than or equal to 1.0: %s", v) + } + + return nil +} diff --git a/x/treasury/types/treasury.pb.go b/x/treasury/types/treasury.pb.go index b6e05e793..bcd8f5061 100644 --- a/x/treasury/types/treasury.pb.go +++ b/x/treasury/types/treasury.pb.go @@ -37,6 +37,7 @@ type Params struct { WindowProbation uint64 `protobuf:"varint,7,opt,name=window_probation,json=windowProbation,proto3" json:"window_probation,omitempty" yaml:"window_probation"` BurnTaxSplit github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,8,opt,name=burn_tax_split,json=burnTaxSplit,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"burn_tax_split" yaml:"burn_tax_split"` MinInitialDepositRatio github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,9,opt,name=min_initial_deposit_ratio,json=minInitialDepositRatio,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_initial_deposit_ratio" yaml:"min_initial_deposit_ratio"` + OracleSplit github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,10,opt,name=oracle_split,json=oracleSplit,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"oracle_split" yaml:"oracle_split"` } func (m *Params) Reset() { *m = Params{} } @@ -257,58 +258,59 @@ func init() { } var fileDescriptor_353bb3a9c554268e = []byte{ - // 804 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbf, 0x6f, 0x23, 0x45, - 0x14, 0xf6, 0xe2, 0x23, 0xb1, 0xc7, 0x3e, 0x9c, 0x9b, 0x0b, 0xce, 0xfa, 0x40, 0x5e, 0x6b, 0x25, - 0x90, 0x29, 0x62, 0x2b, 0x77, 0x05, 0x52, 0x1a, 0x24, 0x27, 0x80, 0x22, 0x40, 0x58, 0x7b, 0x01, - 0x24, 0x9a, 0x65, 0x3c, 0x1e, 0xad, 0x07, 0xbc, 0x33, 0xab, 0x99, 0xf1, 0x65, 0x0d, 0x12, 0x05, - 0x12, 0x3d, 0xa2, 0x42, 0x40, 0x71, 0x35, 0x35, 0xe2, 0x6f, 0x48, 0x19, 0x51, 0x21, 0x0a, 0x03, - 0x49, 0x43, 0xed, 0xbf, 0x00, 0xed, 0xcc, 0xf8, 0x27, 0x09, 0x9c, 0x95, 0xca, 0x7e, 0xef, 0x7d, - 0xef, 0xfb, 0xbe, 0x79, 0xbb, 0x6f, 0x16, 0xbc, 0xa2, 0x88, 0x10, 0xa8, 0xad, 0x04, 0x41, 0x72, - 0x24, 0xc6, 0xed, 0x27, 0x07, 0x3d, 0xa2, 0xd0, 0xc1, 0x3c, 0xd1, 0x4a, 0x04, 0x57, 0x1c, 0x56, - 0x35, 0xac, 0x35, 0xcf, 0x5a, 0xd8, 0x83, 0x3a, 0xe6, 0x32, 0xe6, 0xb2, 0xdd, 0x43, 0x92, 0xcc, - 0x7b, 0x31, 0xa7, 0xcc, 0xf4, 0x3d, 0xa8, 0x99, 0x7a, 0xa8, 0xa3, 0xb6, 0x09, 0x6c, 0x69, 0x37, - 0xe2, 0x11, 0x37, 0xf9, 0xec, 0x9f, 0xc9, 0xfa, 0x7f, 0x6d, 0x83, 0xad, 0x2e, 0x12, 0x28, 0x96, - 0x10, 0x03, 0xa0, 0x50, 0x1a, 0x26, 0x7c, 0x48, 0xf1, 0xd8, 0x75, 0x1a, 0x4e, 0xb3, 0xf4, 0xf0, - 0xb5, 0xd6, 0xf5, 0x46, 0x5a, 0x5d, 0x8d, 0x3a, 0xe2, 0x4c, 0x2a, 0x81, 0x28, 0x53, 0xb2, 0x53, - 0x3b, 0x9f, 0x78, 0xb9, 0xe9, 0xc4, 0xbb, 0x37, 0x46, 0xf1, 0xf0, 0xd0, 0x5f, 0x50, 0xf9, 0x41, - 0x51, 0xa1, 0xd4, 0x34, 0xc0, 0x21, 0xb8, 0x2b, 0xc8, 0x19, 0x12, 0xfd, 0x99, 0xce, 0x73, 0x9b, - 0xea, 0xbc, 0x6c, 0x75, 0x76, 0x8d, 0xce, 0x0a, 0x9b, 0x1f, 0x94, 0x4d, 0x6c, 0xd5, 0x7e, 0x74, - 0x40, 0x4d, 0x12, 0x1a, 0x31, 0xca, 0x05, 0x8a, 0x48, 0xd8, 0x1b, 0x89, 0x3e, 0x61, 0xa1, 0x42, - 0x22, 0x22, 0xca, 0xcd, 0x37, 0x9c, 0x66, 0xb1, 0xf3, 0x49, 0xc6, 0xf7, 0xfb, 0xc4, 0x7b, 0x35, - 0xa2, 0x6a, 0x30, 0xea, 0xb5, 0x30, 0x8f, 0xed, 0xe0, 0xec, 0xcf, 0xbe, 0xec, 0x7f, 0xd6, 0x56, - 0xe3, 0x84, 0xc8, 0xd6, 0x31, 0xc1, 0xd3, 0x89, 0xd7, 0x30, 0xca, 0x37, 0x12, 0xfb, 0xbf, 0xfe, - 0xbc, 0x0f, 0xec, 0xec, 0x8f, 0x09, 0x0e, 0xf6, 0x96, 0x90, 0x1d, 0x0d, 0x3c, 0xd5, 0x38, 0xf8, - 0x95, 0x03, 0x76, 0x62, 0xca, 0x28, 0x8b, 0x42, 0xca, 0xb0, 0x20, 0x31, 0x61, 0xca, 0xbd, 0xa3, - 0x5d, 0x7d, 0xb4, 0xb1, 0xab, 0x3d, 0xe3, 0x6a, 0x9d, 0x6f, 0xdd, 0x4c, 0xc5, 0x00, 0x4e, 0x66, - 0x75, 0x78, 0x08, 0xca, 0x67, 0x94, 0xf5, 0xf9, 0x59, 0x28, 0x07, 0x5c, 0x28, 0xf7, 0xf9, 0x86, - 0xd3, 0xbc, 0xd3, 0xd9, 0x9b, 0x4e, 0xbc, 0xfb, 0x86, 0x71, 0xb9, 0xea, 0x07, 0x25, 0x13, 0x3e, - 0xce, 0x22, 0xf8, 0x3a, 0xb0, 0x61, 0x38, 0xe4, 0x2c, 0x72, 0xb7, 0x74, 0x6b, 0x75, 0x3a, 0xf1, - 0xe0, 0x4a, 0x6b, 0x56, 0xf4, 0x03, 0x60, 0xa2, 0x77, 0x39, 0x8b, 0xe0, 0x5b, 0x60, 0xc7, 0xd6, - 0x12, 0xc1, 0x7b, 0x48, 0x51, 0xce, 0xdc, 0x6d, 0xdd, 0xfd, 0xd2, 0xe2, 0x28, 0xeb, 0x08, 0x3f, - 0xa8, 0x98, 0x54, 0x77, 0x96, 0x81, 0x5f, 0x80, 0x17, 0x7a, 0x23, 0x91, 0x0d, 0x3e, 0x0d, 0x65, - 0x32, 0xa4, 0xca, 0x2d, 0xe8, 0xf1, 0x7d, 0xb0, 0xf1, 0xf8, 0x5e, 0x34, 0x9a, 0xab, 0x6c, 0xeb, - 0xc3, 0x2b, 0x67, 0xe5, 0x53, 0x94, 0x3e, 0xce, 0x8a, 0xf0, 0x07, 0x07, 0xd4, 0x62, 0xca, 0x42, - 0xca, 0xa8, 0xa2, 0x68, 0x18, 0xf6, 0x49, 0xc2, 0x25, 0x55, 0xa1, 0xc8, 0xbc, 0xb9, 0xc5, 0xdb, - 0xbd, 0x5d, 0x37, 0x12, 0xaf, 0x7b, 0xaa, 0xc6, 0x94, 0x9d, 0x18, 0xe0, 0xb1, 0xc1, 0x05, 0x19, - 0xec, 0xb0, 0xf0, 0xdd, 0x53, 0x2f, 0xf7, 0xf7, 0x53, 0xcf, 0xf1, 0x7f, 0xc9, 0x83, 0x7b, 0xff, - 0xda, 0x23, 0xf8, 0x29, 0x28, 0x08, 0xa4, 0x48, 0x18, 0x53, 0xa6, 0x97, 0xbd, 0xd8, 0x79, 0x7f, - 0x63, 0xaf, 0x15, 0xbb, 0x83, 0x96, 0x67, 0xdd, 0xda, 0x76, 0x56, 0x78, 0x8f, 0xb2, 0x85, 0x16, - 0x4a, 0xf5, 0xc2, 0xdf, 0x5a, 0x0b, 0xa5, 0xd7, 0x6b, 0xa1, 0x14, 0xbe, 0x01, 0xf2, 0x18, 0x25, - 0x7a, 0xb9, 0x4b, 0x0f, 0x6b, 0x2d, 0x0b, 0xc9, 0x2e, 0xcc, 0xf9, 0xa5, 0x72, 0xc4, 0x29, 0xeb, - 0x40, 0x7b, 0x8f, 0x00, 0xc3, 0x8b, 0x51, 0xe2, 0x07, 0x59, 0x27, 0xfc, 0x12, 0x54, 0xf0, 0x00, - 0xb1, 0x88, 0x84, 0x73, 0xcf, 0x66, 0x27, 0x3f, 0xdc, 0xd8, 0x73, 0xd5, 0x72, 0xaf, 0xd2, 0xad, - 0x5b, 0xbf, 0x6b, 0xea, 0x81, 0x39, 0xc0, 0xd2, 0x83, 0xfb, 0xde, 0x01, 0x3b, 0x6f, 0x26, 0x1c, - 0x0f, 0x4e, 0x51, 0xda, 0x15, 0x1c, 0x13, 0xd2, 0x97, 0xf0, 0x6b, 0x07, 0x94, 0xf5, 0xe5, 0x6a, - 0x13, 0xae, 0xd3, 0xc8, 0xff, 0xf7, 0x49, 0xdf, 0xb6, 0x27, 0xbd, 0xbf, 0x74, 0x33, 0xdb, 0x66, - 0xff, 0xa7, 0x3f, 0xbc, 0xe6, 0x33, 0x1c, 0x27, 0xe3, 0x91, 0x41, 0x49, 0x2d, 0x7c, 0xf8, 0xdf, - 0x3a, 0x60, 0x57, 0x9b, 0xb3, 0x2f, 0xdf, 0x89, 0x94, 0x23, 0xc4, 0x30, 0x81, 0x9f, 0x83, 0x02, - 0xb5, 0xff, 0xff, 0xdf, 0xdb, 0x91, 0xf5, 0x66, 0x9f, 0xee, 0xac, 0x71, 0x33, 0x5f, 0x73, 0xbd, - 0xce, 0x3b, 0xe7, 0x97, 0x75, 0xe7, 0xe2, 0xb2, 0xee, 0xfc, 0x79, 0x59, 0x77, 0xbe, 0xb9, 0xaa, - 0xe7, 0x2e, 0xae, 0xea, 0xb9, 0xdf, 0xae, 0xea, 0xb9, 0x8f, 0x0f, 0x96, 0xd9, 0x86, 0x48, 0x4a, - 0x8a, 0xf7, 0xcd, 0xb7, 0x18, 0x73, 0x41, 0xda, 0x4f, 0x1e, 0xb5, 0xd3, 0xc5, 0x57, 0x59, 0x93, - 0xf7, 0xb6, 0xf4, 0x27, 0xf2, 0xd1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x36, 0x0b, 0xf0, 0xae, - 0xb4, 0x07, 0x00, 0x00, + // 832 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcf, 0x6f, 0xe3, 0x44, + 0x14, 0x8e, 0xe9, 0xd2, 0x4d, 0x27, 0x59, 0xd2, 0x9d, 0x2d, 0xa9, 0xb3, 0xa0, 0x38, 0xb2, 0x04, + 0x0a, 0x87, 0x26, 0xea, 0xee, 0x01, 0xa9, 0x17, 0xa4, 0xb4, 0x80, 0x2a, 0x40, 0x44, 0x6e, 0x01, + 0x89, 0x8b, 0x99, 0x4c, 0x46, 0xce, 0x80, 0x3d, 0x63, 0xcd, 0x4c, 0x5a, 0x07, 0x24, 0x0e, 0x48, + 0xdc, 0x11, 0x27, 0x04, 0x1c, 0xf6, 0xcc, 0x19, 0xf1, 0x37, 0xec, 0x71, 0xc5, 0x09, 0x38, 0x04, + 0xd4, 0x5e, 0x38, 0xe7, 0x2f, 0x40, 0x9e, 0x99, 0xfc, 0x32, 0xbb, 0xb0, 0xd1, 0x9e, 0x92, 0xf7, + 0xde, 0xf7, 0xbe, 0xef, 0x9b, 0x67, 0xfb, 0xd9, 0xe0, 0x15, 0x45, 0x84, 0x40, 0x5d, 0x25, 0x08, + 0x92, 0x63, 0x31, 0xe9, 0x5e, 0x1c, 0x0e, 0x88, 0x42, 0x87, 0x8b, 0x44, 0x27, 0x15, 0x5c, 0x71, + 0x58, 0xd7, 0xb0, 0xce, 0x22, 0x6b, 0x61, 0x77, 0x9b, 0x98, 0xcb, 0x84, 0xcb, 0xee, 0x00, 0x49, + 0xb2, 0xe8, 0xc5, 0x9c, 0x32, 0xd3, 0x77, 0xb7, 0x61, 0xea, 0xa1, 0x8e, 0xba, 0x26, 0xb0, 0xa5, + 0xbd, 0x88, 0x47, 0xdc, 0xe4, 0xf3, 0x7f, 0x26, 0xeb, 0xff, 0x5e, 0x06, 0xdb, 0x7d, 0x24, 0x50, + 0x22, 0x21, 0x06, 0x40, 0xa1, 0x2c, 0x4c, 0x79, 0x4c, 0xf1, 0xc4, 0x75, 0x5a, 0x4e, 0xbb, 0x72, + 0xef, 0xb5, 0xce, 0xe3, 0x8d, 0x74, 0xfa, 0x1a, 0x75, 0xcc, 0x99, 0x54, 0x02, 0x51, 0xa6, 0x64, + 0xaf, 0xf1, 0x70, 0xea, 0x95, 0x66, 0x53, 0xef, 0xf6, 0x04, 0x25, 0xf1, 0x91, 0xbf, 0xa4, 0xf2, + 0x83, 0x1d, 0x85, 0x32, 0xd3, 0x00, 0x63, 0x70, 0x4b, 0x90, 0x4b, 0x24, 0x86, 0x73, 0x9d, 0xe7, + 0x36, 0xd5, 0x79, 0xd9, 0xea, 0xec, 0x19, 0x9d, 0x35, 0x36, 0x3f, 0xa8, 0x9a, 0xd8, 0xaa, 0xfd, + 0xe8, 0x80, 0x86, 0x24, 0x34, 0x62, 0x94, 0x0b, 0x14, 0x91, 0x70, 0x30, 0x16, 0x43, 0xc2, 0x42, + 0x85, 0x44, 0x44, 0x94, 0xbb, 0xd5, 0x72, 0xda, 0x3b, 0xbd, 0x4f, 0x72, 0xbe, 0x3f, 0xa6, 0xde, + 0xab, 0x11, 0x55, 0xa3, 0xf1, 0xa0, 0x83, 0x79, 0x62, 0x07, 0x67, 0x7f, 0x0e, 0xe4, 0xf0, 0xb3, + 0xae, 0x9a, 0xa4, 0x44, 0x76, 0x4e, 0x08, 0x9e, 0x4d, 0xbd, 0x96, 0x51, 0x7e, 0x22, 0xb1, 0xff, + 0xeb, 0xcf, 0x07, 0xc0, 0xce, 0xfe, 0x84, 0xe0, 0x60, 0x7f, 0x05, 0xd9, 0xd3, 0xc0, 0x73, 0x8d, + 0x83, 0x5f, 0x39, 0x60, 0x37, 0xa1, 0x8c, 0xb2, 0x28, 0xa4, 0x0c, 0x0b, 0x92, 0x10, 0xa6, 0xdc, + 0x1b, 0xda, 0xd5, 0x47, 0x1b, 0xbb, 0xda, 0x37, 0xae, 0x8a, 0x7c, 0x45, 0x33, 0x35, 0x03, 0x38, + 0x9d, 0xd7, 0xe1, 0x11, 0xa8, 0x5e, 0x52, 0x36, 0xe4, 0x97, 0xa1, 0x1c, 0x71, 0xa1, 0xdc, 0xe7, + 0x5b, 0x4e, 0xfb, 0x46, 0x6f, 0x7f, 0x36, 0xf5, 0xee, 0x18, 0xc6, 0xd5, 0xaa, 0x1f, 0x54, 0x4c, + 0x78, 0x96, 0x47, 0xf0, 0x75, 0x60, 0xc3, 0x30, 0xe6, 0x2c, 0x72, 0xb7, 0x75, 0x6b, 0x7d, 0x36, + 0xf5, 0xe0, 0x5a, 0x6b, 0x5e, 0xf4, 0x03, 0x60, 0xa2, 0x77, 0x39, 0x8b, 0xe0, 0x5b, 0x60, 0xd7, + 0xd6, 0x52, 0xc1, 0x07, 0x48, 0x51, 0xce, 0xdc, 0x9b, 0xba, 0xfb, 0xa5, 0xe5, 0x51, 0x8a, 0x08, + 0x3f, 0xa8, 0x99, 0x54, 0x7f, 0x9e, 0x81, 0x5f, 0x80, 0x17, 0x06, 0x63, 0x91, 0x0f, 0x3e, 0x0b, + 0x65, 0x1a, 0x53, 0xe5, 0x96, 0xf5, 0xf8, 0x3e, 0xd8, 0x78, 0x7c, 0x2f, 0x1a, 0xcd, 0x75, 0xb6, + 0xe2, 0xf0, 0xaa, 0x79, 0xf9, 0x1c, 0x65, 0x67, 0x79, 0x11, 0xfe, 0xe0, 0x80, 0x46, 0x42, 0x59, + 0x48, 0x19, 0x55, 0x14, 0xc5, 0xe1, 0x90, 0xa4, 0x5c, 0x52, 0x15, 0x8a, 0xdc, 0x9b, 0xbb, 0xf3, + 0x6c, 0x77, 0xd7, 0x13, 0x89, 0x8b, 0x9e, 0xea, 0x09, 0x65, 0xa7, 0x06, 0x78, 0x62, 0x70, 0x41, + 0x0e, 0x83, 0x17, 0xa0, 0xca, 0x05, 0xc2, 0x31, 0xb1, 0x83, 0x01, 0xda, 0xcf, 0xd9, 0xc6, 0x7e, + 0xec, 0x5d, 0xb0, 0xca, 0x55, 0xb4, 0x50, 0x31, 0x45, 0x3d, 0x95, 0xa3, 0xf2, 0x77, 0x0f, 0xbc, + 0xd2, 0xdf, 0x0f, 0x3c, 0xc7, 0xff, 0x65, 0x0b, 0xdc, 0xfe, 0xd7, 0xf3, 0x0b, 0x3f, 0x05, 0x65, + 0x81, 0x14, 0x09, 0x13, 0xca, 0xf4, 0x92, 0xd9, 0xe9, 0xbd, 0xbf, 0xb1, 0xa7, 0x9a, 0x7d, 0xf6, + 0x2d, 0x4f, 0xd1, 0xcf, 0xcd, 0xbc, 0xf0, 0x1e, 0x65, 0x4b, 0x2d, 0x94, 0xe9, 0x45, 0xf3, 0xcc, + 0x5a, 0x28, 0x7b, 0xbc, 0x16, 0xca, 0xe0, 0x1b, 0x60, 0x0b, 0xa3, 0x54, 0x2f, 0x95, 0xca, 0xbd, + 0x46, 0xc7, 0x42, 0xf2, 0x45, 0xbd, 0x58, 0x66, 0xc7, 0x9c, 0xb2, 0x1e, 0xb4, 0xfb, 0x0b, 0x18, + 0x5e, 0x8c, 0x52, 0x3f, 0xc8, 0x3b, 0xe1, 0x97, 0xa0, 0x86, 0x47, 0x88, 0x45, 0x24, 0x5c, 0x78, + 0x36, 0xbb, 0xe0, 0xc3, 0x8d, 0x3d, 0xd7, 0x2d, 0xf7, 0x3a, 0x5d, 0xd1, 0xfa, 0x2d, 0x53, 0x0f, + 0xcc, 0x01, 0x56, 0x2e, 0xdc, 0xf7, 0x0e, 0xd8, 0x7d, 0x33, 0xe5, 0x78, 0x74, 0x8e, 0xb2, 0xbe, + 0xe0, 0x98, 0x90, 0xa1, 0x84, 0x5f, 0x3b, 0xa0, 0xaa, 0x97, 0xba, 0x4d, 0xb8, 0x4e, 0x6b, 0xeb, + 0xbf, 0x4f, 0xfa, 0xb6, 0x3d, 0xe9, 0x9d, 0x95, 0x37, 0x82, 0x6d, 0xf6, 0x7f, 0xfa, 0xd3, 0x6b, + 0x3f, 0xc5, 0x71, 0x72, 0x1e, 0x19, 0x54, 0xd4, 0xd2, 0x87, 0xff, 0xad, 0x03, 0xf6, 0xb4, 0x39, + 0x7b, 0xd3, 0x9f, 0x4a, 0x39, 0x46, 0x0c, 0x13, 0xf8, 0x39, 0x28, 0x53, 0xfb, 0xff, 0xff, 0xbd, + 0x1d, 0x5b, 0x6f, 0xf6, 0xea, 0xce, 0x1b, 0x37, 0xf3, 0xb5, 0xd0, 0xeb, 0xbd, 0xf3, 0xf0, 0xaa, + 0xe9, 0x3c, 0xba, 0x6a, 0x3a, 0x7f, 0x5d, 0x35, 0x9d, 0x6f, 0xae, 0x9b, 0xa5, 0x47, 0xd7, 0xcd, + 0xd2, 0x6f, 0xd7, 0xcd, 0xd2, 0xc7, 0x87, 0xab, 0x6c, 0x31, 0x92, 0x92, 0xe2, 0x03, 0xf3, 0x0d, + 0x80, 0xb9, 0x20, 0xdd, 0x8b, 0xfb, 0xdd, 0x6c, 0xf9, 0x35, 0xa0, 0xc9, 0x07, 0xdb, 0xfa, 0xd5, + 0x7c, 0xff, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x42, 0xe7, 0xc8, 0x2c, 0x08, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -357,6 +359,9 @@ func (this *Params) Equal(that interface{}) bool { if !this.MinInitialDepositRatio.Equal(that1.MinInitialDepositRatio) { return false } + if !this.OracleSplit.Equal(that1.OracleSplit) { + return false + } return true } func (this *PolicyConstraints) Equal(that interface{}) bool { @@ -412,6 +417,16 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + { + size := m.OracleSplit.Size() + i -= size + if _, err := m.OracleSplit.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTreasury(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x52 { size := m.MinInitialDepositRatio.Size() i -= size @@ -665,6 +680,8 @@ func (m *Params) Size() (n int) { n += 1 + l + sovTreasury(uint64(l)) l = m.MinInitialDepositRatio.Size() n += 1 + l + sovTreasury(uint64(l)) + l = m.OracleSplit.Size() + n += 1 + l + sovTreasury(uint64(l)) return n } @@ -1009,6 +1026,40 @@ func (m *Params) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OracleSplit", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTreasury + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTreasury + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTreasury + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.OracleSplit.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTreasury(dAtA[iNdEx:]) From 829a7d2fc0b9ec64a7d707c0bbc76259a1263a4c Mon Sep 17 00:00:00 2001 From: Till Ziegler Date: Thu, 11 Jul 2024 18:30:41 +0200 Subject: [PATCH 4/6] fix: wrong interface cast --- app/upgrades/v8_1/upgrades.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/upgrades/v8_1/upgrades.go b/app/upgrades/v8_1/upgrades.go index c4d6babc3..180c4c86f 100644 --- a/app/upgrades/v8_1/upgrades.go +++ b/app/upgrades/v8_1/upgrades.go @@ -4,7 +4,6 @@ package v8_1 import ( "github.com/classic-terra/core/v3/app/keepers" "github.com/classic-terra/core/v3/app/upgrades" - treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper" treasurytypes "github.com/classic-terra/core/v3/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -19,7 +18,7 @@ func CreateV81UpgradeHandler( ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { // set default oracle split - mm.Modules[treasurytypes.ModuleName].(*treasurykeeper.Keeper).SetOracleSplitRate(ctx, treasurytypes.DefaultOracleSplit) + keepers.TreasuryKeeper.SetOracleSplitRate(ctx, treasurytypes.DefaultOracleSplit) return mm.RunMigrations(ctx, cfg, fromVM) } } From 01932fef22b71a1dcb3e8622b4b88703f872c477 Mon Sep 17 00:00:00 2001 From: StrathCole <7449529+StrathCole@users.noreply.github.com> Date: Sun, 14 Jul 2024 13:07:31 +0200 Subject: [PATCH 5/6] Adjust oracle split logic (#496) Co-authored-by: Till Ziegler --- app/upgrades/v8_1/upgrades.go | 2 +- custom/auth/ante/ante.go | 2 +- custom/auth/ante/expected_keeper.go | 2 + custom/auth/ante/fee.go | 5 +- custom/auth/ante/fee_burntax.go | 34 ++++++++ custom/auth/ante/fee_test.go | 129 ++++++++++++++++++---------- x/treasury/types/params.go | 2 +- 7 files changed, 126 insertions(+), 50 deletions(-) diff --git a/app/upgrades/v8_1/upgrades.go b/app/upgrades/v8_1/upgrades.go index 180c4c86f..1a3abf159 100644 --- a/app/upgrades/v8_1/upgrades.go +++ b/app/upgrades/v8_1/upgrades.go @@ -18,7 +18,7 @@ func CreateV81UpgradeHandler( ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { // set default oracle split - keepers.TreasuryKeeper.SetOracleSplitRate(ctx, treasurytypes.DefaultOracleSplit) + keepers.TreasuryKeeper.SetOracleSplitRate(ctx, treasurytypes.DefaultOracleSplit) return mm.RunMigrations(ctx, cfg, fromVM) } } diff --git a/custom/auth/ante/ante.go b/custom/auth/ante/ante.go index 7dabfce5a..75400c615 100644 --- a/custom/auth/ante/ante.go +++ b/custom/auth/ante/ante.go @@ -88,7 +88,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { // MinInitialDepositDecorator prevents submitting governance proposal low initial deposit NewMinInitialDepositDecorator(options.GovKeeper, options.TreasuryKeeper), ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper), - NewFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TreasuryKeeper), + NewFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TreasuryKeeper, options.DistributionKeeper), dyncommante.NewDyncommDecorator(options.Cdc, options.DyncommKeeper, options.StakingKeeper), // Do not add any other decorators below this point unless explicitly explain. diff --git a/custom/auth/ante/expected_keeper.go b/custom/auth/ante/expected_keeper.go index 8367df827..05957c631 100644 --- a/custom/auth/ante/expected_keeper.go +++ b/custom/auth/ante/expected_keeper.go @@ -35,6 +35,8 @@ type BankKeeper interface { type DistrKeeper interface { FundCommunityPool(ctx sdk.Context, amount sdk.Coins, sender sdk.AccAddress) error GetFeePool(ctx sdk.Context) distributiontypes.FeePool + GetCommunityTax(ctx sdk.Context) math.LegacyDec + SetFeePool(ctx sdk.Context, feePool distributiontypes.FeePool) } type GovKeeper interface { diff --git a/custom/auth/ante/fee.go b/custom/auth/ante/fee.go index 44acc1f4b..cf5309918 100644 --- a/custom/auth/ante/fee.go +++ b/custom/auth/ante/fee.go @@ -5,6 +5,7 @@ import ( "math" errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -20,14 +21,16 @@ type FeeDecorator struct { bankKeeper BankKeeper feegrantKeeper ante.FeegrantKeeper treasuryKeeper TreasuryKeeper + distrKeeper DistrKeeper } -func NewFeeDecorator(ak ante.AccountKeeper, bk BankKeeper, fk ante.FeegrantKeeper, tk TreasuryKeeper) FeeDecorator { +func NewFeeDecorator(ak ante.AccountKeeper, bk BankKeeper, fk ante.FeegrantKeeper, tk TreasuryKeeper, dk DistrKeeper) FeeDecorator { return FeeDecorator{ accountKeeper: ak, bankKeeper: bk, feegrantKeeper: fk, treasuryKeeper: tk, + distrKeeper: dk, } } diff --git a/custom/auth/ante/fee_burntax.go b/custom/auth/ante/fee_burntax.go index a28eeaaa8..e69f2448b 100644 --- a/custom/auth/ante/fee_burntax.go +++ b/custom/auth/ante/fee_burntax.go @@ -8,14 +8,17 @@ import ( oracle "github.com/classic-terra/core/v3/x/oracle/types" treasury "github.com/classic-terra/core/v3/x/treasury/types" + distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" ) // BurnTaxSplit splits func (fd FeeDecorator) BurnTaxSplit(ctx sdk.Context, taxes sdk.Coins) (err error) { burnSplitRate := fd.treasuryKeeper.GetBurnSplitRate(ctx) oracleSplitRate := fd.treasuryKeeper.GetOracleSplitRate(ctx) + communityTax := fd.distrKeeper.GetCommunityTax(ctx) distributionDeltaCoins := sdk.NewCoins() oracleSplitCoins := sdk.NewCoins() + communityTaxCoins := sdk.NewCoins() if burnSplitRate.IsPositive() { @@ -27,6 +30,37 @@ func (fd FeeDecorator) BurnTaxSplit(ctx sdk.Context, taxes sdk.Coins) (err error taxes = taxes.Sub(distributionDeltaCoins...) } + if communityTax.IsPositive() { + + // we need to apply a reduced community tax here as the community tax is applied again during distribution + // in the distribution module and we don't want to calculate the tax twice + // the reduction depends on the oracle split rate as well as on the community tax itself + // the formula can be applied even with a zero oracle split rate + applyCommunityTax := communityTax.Mul(oracleSplitRate.Quo(communityTax.Mul(oracleSplitRate).Add(sdk.OneDec()).Sub(communityTax))) + + for _, distrCoin := range distributionDeltaCoins { + communityTaxAmount := applyCommunityTax.MulInt(distrCoin.Amount).RoundInt() + communityTaxCoins = communityTaxCoins.Add(sdk.NewCoin(distrCoin.Denom, communityTaxAmount)) + } + + distributionDeltaCoins = distributionDeltaCoins.Sub(communityTaxCoins...) + } + + if !communityTaxCoins.IsZero() { + if err = fd.bankKeeper.SendCoinsFromModuleToModule( + ctx, + types.FeeCollectorName, + distributiontypes.ModuleName, + communityTaxCoins, + ); err != nil { + return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error()) + } + + feePool := fd.distrKeeper.GetFeePool(ctx) + feePool.CommunityPool = feePool.CommunityPool.Add(sdk.NewDecCoinsFromCoins(communityTaxCoins...)...) + fd.distrKeeper.SetFeePool(ctx, feePool) + } + if oracleSplitRate.IsPositive() { for _, distrCoin := range distributionDeltaCoins { oracleCoinAmnt := oracleSplitRate.MulInt(distrCoin.Amount).RoundInt() diff --git a/custom/auth/ante/fee_test.go b/custom/auth/ante/fee_test.go index 21f29bff0..ecd8a634f 100644 --- a/custom/auth/ante/fee_test.go +++ b/custom/auth/ante/fee_test.go @@ -28,7 +28,7 @@ func (s *AnteTestSuite) TestDeductFeeDecorator_ZeroGas() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) // keys and addresses @@ -62,7 +62,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFees() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) // keys and addresses @@ -146,7 +146,7 @@ func (s *AnteTestSuite) TestDeductFees() { err = testutil.FundAccount(s.app.BankKeeper, s.ctx, addr1, coins) s.Require().NoError(err) - dfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + dfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(dfd) _, err = antehandler(s.ctx, tx, false) @@ -167,7 +167,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFeesSend() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) // keys and addresses @@ -221,7 +221,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFeesSwapSend() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) // keys and addresses @@ -274,7 +274,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFeesMultiSend() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) // keys and addresses @@ -341,7 +341,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFeesInstantiateContract() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) // keys and addresses @@ -400,7 +400,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFeesExecuteContract() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) // keys and addresses @@ -458,7 +458,7 @@ func (s *AnteTestSuite) TestEnsureMempoolFeesAuthzExec() { s.SetupTest(true) // setup s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) // keys and addresses @@ -700,7 +700,7 @@ func (s *AnteTestSuite) TestTaxExemption() { tk.AddBurnTaxExemptionAddress(s.ctx, addrs[0].String()) tk.AddBurnTaxExemptionAddress(s.ctx, addrs[1].String()) - mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper) + mfd := ante.NewFeeDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, s.app.DistrKeeper) antehandler := sdk.ChainAnteDecorators(mfd) for i := 0; i < 4; i++ { @@ -735,26 +735,30 @@ func (s *AnteTestSuite) TestTaxExemption() { // go test -v -run ^TestAnteTestSuite/TestBurnSplitTax$ github.com/classic-terra/core/v3/custom/auth/ante func (s *AnteTestSuite) TestBurnSplitTax() { - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.ZeroDec()) // 100% distribute, 0% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.ZeroDec()) // 10% distribute, 0% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.ZeroDec()) // 0.1% distribute, 0% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.ZeroDec()) // 0% distribute, 0% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.NewDecWithPrec(5, 1)) // 100% distribute, 50% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.NewDecWithPrec(5, 1)) // 10% distribute, 50% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.NewDecWithPrec(5, 1)) // 0.1% distribute, 50% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.NewDecWithPrec(5, 1)) // 0% distribute, 50% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.ZeroDec()) // 100% distribute, 0% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.ZeroDec()) // 10% distribute, 0% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.ZeroDec()) // 0.1% distribute, 0% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.ZeroDec()) // 0% distribute, 0% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.OneDec()) // 100% distribute, 100% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.OneDec()) // 10% distribute, 100% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.OneDec()) // 0.1% distribute, 100% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.OneDec()) // 0% distribute, 100% to oracle - s.runBurnSplitTaxTest(sdk.NewDecWithPrec(-1, 1), sdk.ZeroDec()) // -10% distribute - invalid rate + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // 100% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // 10% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // 0.1% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // 0% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.NewDecWithPrec(5, 1), sdk.NewDecWithPrec(5, 1)) // 100% distribute, 50% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.NewDecWithPrec(5, 1), sdk.NewDecWithPrec(5, 1)) // 10% distribute, 50% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.NewDecWithPrec(5, 1), sdk.NewDecWithPrec(5, 1)) // 0.1% distribute, 50% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.NewDecWithPrec(5, 1), sdk.NewDecWithPrec(5, 1)) // 0% distribute, 50% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // 100% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // 10% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // 0.1% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // 0% distribute, 0% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 0), sdk.OneDec(), sdk.NewDecWithPrec(5, 1)) // 100% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 1), sdk.OneDec(), sdk.NewDecWithPrec(5, 1)) // 10% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.OneDec(), sdk.NewDecWithPrec(5, 1)) // 0.1% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.OneDec(), sdk.NewDecWithPrec(5, 1)) // 0% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.OneDec(), sdk.NewDecWithPrec(5, 2)) // 0.1% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.OneDec(), sdk.NewDecWithPrec(5, 2)) // 0% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(1, 2), sdk.OneDec(), sdk.NewDecWithPrec(1, 1)) // 0.1% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(0, 0), sdk.OneDec(), sdk.NewDecWithPrec(1, 2)) // 0% distribute, 100% to oracle + s.runBurnSplitTaxTest(sdk.NewDecWithPrec(-1, 1), sdk.ZeroDec(), sdk.NewDecWithPrec(5, 1)) // -10% distribute - invalid rate } -func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec, oracleSplitRate sdk.Dec) { +func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec, oracleSplitRate sdk.Dec, communityTax sdk.Dec) { s.SetupTest(true) // setup require := s.Require() s.txBuilder = s.clientCtx.TxConfig.NewTxBuilder() @@ -762,12 +766,19 @@ func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec, oracleSplitRa ak := s.app.AccountKeeper bk := s.app.BankKeeper tk := s.app.TreasuryKeeper - mfd := ante.NewFeeDecorator(ak, bk, s.app.FeeGrantKeeper, tk) + dk := s.app.DistrKeeper + mfd := ante.NewFeeDecorator(ak, bk, s.app.FeeGrantKeeper, tk, dk) antehandler := sdk.ChainAnteDecorators(mfd) // Set burn split tax tk.SetBurnSplitRate(s.ctx, burnSplitRate) tk.SetOracleSplitRate(s.ctx, oracleSplitRate) + taxRate := tk.GetTaxRate(s.ctx) + + // Set community tax + dkParams := dk.GetParams(s.ctx) + dkParams.CommunityTax = communityTax + dk.SetParams(s.ctx, dkParams) // keys and addresses priv1, _, addr1 := testdata.KeyTestPubAddr() @@ -819,37 +830,61 @@ func (s *AnteTestSuite) runBurnSplitTaxTest(burnSplitRate sdk.Dec, oracleSplitRa // burn the burn account tk.BurnCoinsFromBurnAccount(s.ctx) - feeCollectorAfter := sdk.NewDecCoinsFromCoins(bk.GetAllBalances(s.ctx, ak.GetModuleAddress(authtypes.FeeCollectorName))...) - oracleAfter := sdk.NewDecCoinsFromCoins(bk.GetAllBalances(s.ctx, ak.GetModuleAddress(oracletypes.ModuleName))...) + feeCollectorAfter := bk.GetAllBalances(s.ctx, ak.GetModuleAddress(authtypes.FeeCollectorName)) + oracleAfter := bk.GetAllBalances(s.ctx, ak.GetModuleAddress(oracletypes.ModuleName)) taxes := ante.FilterMsgAndComputeTax(s.ctx, tk, msg) - burnTax := sdk.NewDecCoinsFromCoins(taxes...) + communityPoolAfter, _ := dk.GetFeePoolCommunityCoins(s.ctx).TruncateDecimal() + if communityPoolAfter.IsZero() { + communityPoolAfter = sdk.NewCoins(sdk.NewCoin(core.MicroSDRDenom, sdk.ZeroInt())) + } + + // burnTax := sdk.NewDecCoinsFromCoins(taxes...) + // in the burn tax split function, coins and not deccoins are used, which leads to rounding differences + // when comparing to the test with very small numbers, accordingly all deccoin calculations are changed to coins + burnTax := taxes if burnSplitRate.IsPositive() { - distributionDeltaCoins := burnTax.MulDec(burnSplitRate) - expectedOracleCoins := distributionDeltaCoins.MulDec(oracleSplitRate) - expectedDistrCoins := distributionDeltaCoins.Sub(expectedOracleCoins) + distributionDeltaCoins := burnSplitRate.MulInt(burnTax.AmountOf(core.MicroSDRDenom)).RoundInt() + applyCommunityTax := communityTax.Mul(oracleSplitRate.Quo(communityTax.Mul(oracleSplitRate).Sub(communityTax).Add(sdk.OneDec()))) - if expectedOracleCoins == nil { - expectedOracleCoins = sdk.NewDecCoins() - } + expectedCommunityCoins := applyCommunityTax.MulInt(distributionDeltaCoins).RoundInt() + distributionDeltaCoins = distributionDeltaCoins.Sub(expectedCommunityCoins) - if expectedDistrCoins == nil { - expectedDistrCoins = sdk.NewDecCoins() - } + expectedOracleCoins := oracleSplitRate.MulInt(distributionDeltaCoins).RoundInt() + expectedDistrCoins := distributionDeltaCoins.Sub(expectedOracleCoins) // expected: community pool 50% - fmt.Printf("-- BurnSplitRate %+v, OracleSplitRate %+v, OracleCoins %+v, DistrCoins %+v\n", burnSplitRate, oracleSplitRate, expectedOracleCoins, expectedDistrCoins) - require.Equal(feeCollectorAfter, expectedDistrCoins) - require.Equal(oracleAfter, expectedOracleCoins) - burnTax = burnTax.Sub(distributionDeltaCoins) + fmt.Printf("-- sendCoins %+v, BurnTax %+v, BurnSplitRate %+v, OracleSplitRate %+v, CommunityTax %+v, CTaxApplied %+v, OracleCoins %+v, DistrCoins %+v\n", sendCoins.AmountOf(core.MicroSDRDenom), taxRate, burnSplitRate, oracleSplitRate, communityTax, applyCommunityTax, expectedOracleCoins, expectedDistrCoins) + require.Equal(feeCollectorAfter, sdk.NewCoins(sdk.NewCoin(core.MicroSDRDenom, expectedDistrCoins))) + require.Equal(oracleAfter, sdk.NewCoins(sdk.NewCoin(core.MicroSDRDenom, expectedOracleCoins))) + require.Equal(communityPoolAfter, sdk.NewCoins(sdk.NewCoin(core.MicroSDRDenom, expectedCommunityCoins))) + burnTax = burnTax.Sub(sdk.NewCoin(core.MicroSDRDenom, distributionDeltaCoins)).Sub(sdk.NewCoin(core.MicroSDRDenom, expectedCommunityCoins)) + } + + // check tax proceeds + // as end blocker has not been run here, we need to calculate it from the fee collector + addTaxFromFees := feeCollectorAfter.AmountOf(core.MicroSDRDenom) + if communityTax.IsPositive() { + addTaxFromFees = communityTax.Mul(sdk.NewDecFromInt(addTaxFromFees)).RoundInt() + } + expectedTaxProceeds := communityPoolAfter.AmountOf(core.MicroSDRDenom).Add(addTaxFromFees) + originalDistribution := sdk.ZeroDec() + if burnSplitRate.IsPositive() { + originalDistribution = burnSplitRate.Mul(sdk.NewDecFromInt(taxes.AmountOf(core.MicroSDRDenom))) + } + originalTaxProceeds := sdk.ZeroInt() + if communityTax.IsPositive() { + originalTaxProceeds = communityTax.Mul(originalDistribution).RoundInt() } + // due to precision (roundInt) this can deviate up to 1 from the expected value + require.LessOrEqual(expectedTaxProceeds.Sub(originalTaxProceeds).Int64(), sdk.OneInt().Int64()) totalSupplyAfter, _, err := bk.GetPaginatedTotalSupply(s.ctx, &query.PageRequest{}) require.NoError(err) if !burnTax.Empty() { // expected: total supply = tax - split tax require.Equal( - sdk.NewDecCoinsFromCoins(totalSupplyBefore.Sub(totalSupplyAfter...)...), + totalSupplyBefore.Sub(totalSupplyAfter...), burnTax, ) } @@ -872,6 +907,7 @@ func (s *AnteTestSuite) TestEnsureIBCUntaxed() { s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, + s.app.DistrKeeper, ) antehandler := sdk.ChainAnteDecorators(mfd) @@ -921,6 +957,7 @@ func (s *AnteTestSuite) TestOracleZeroFee() { s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.TreasuryKeeper, + s.app.DistrKeeper, ) antehandler := sdk.ChainAnteDecorators(mfd) diff --git a/x/treasury/types/params.go b/x/treasury/types/params.go index b6684fd83..fb739730a 100644 --- a/x/treasury/types/params.go +++ b/x/treasury/types/params.go @@ -48,7 +48,7 @@ var ( DefaultRewardWeight = sdk.NewDecWithPrec(5, 2) // 5% DefaultBurnTaxSplit = sdk.NewDecWithPrec(1, 1) // 10% goes to community pool, 90% burn DefaultMinInitialDepositRatio = sdk.ZeroDec() // 0% min initial deposit - DefaultOracleSplit = sdk.NewDecWithPrec(5, 1) // 50% oracle, 50% community pool + DefaultOracleSplit = sdk.OneDec() // 100% oracle, community tax (CP) is deducted before oracle split ) var _ paramstypes.ParamSet = &Params{} From 51a080f3ba8372712a32436156dde3921d08d636 Mon Sep 17 00:00:00 2001 From: Pham Anh Minh <93236465+phamminh0811@users.noreply.github.com> Date: Wed, 17 Jul 2024 22:34:35 +0700 Subject: [PATCH 6/6] fix: use wasmvm v1.5.2 to prevent memory leak (#497) Co-authored-by: expertdicer --- go.mod | 5 ++--- go.sum | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index fa7a9a22d..c0b02b491 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( cosmossdk.io/math v1.3.0 cosmossdk.io/simapp v0.0.0-20230602123434-616841b9704d github.com/CosmWasm/wasmd v0.45.0 - github.com/CosmWasm/wasmvm v1.5.0 + github.com/CosmWasm/wasmvm v1.5.2 github.com/cometbft/cometbft v0.37.4 github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/cosmos-sdk v0.47.10 @@ -65,7 +65,6 @@ require ( github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect github.com/opencontainers/runc v1.1.12 // indirect - github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect @@ -226,7 +225,7 @@ replace ( ) replace ( - github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.45.0-terra.3 + github.com/CosmWasm/wasmd => github.com/classic-terra/wasmd v0.45.0-terra.5 // use cometbft github.com/cometbft/cometbft => github.com/classic-terra/cometbft v0.37.4-terra1 github.com/cometbft/cometbft-db => github.com/cometbft/cometbft-db v0.8.0 diff --git a/go.sum b/go.sum index 98228659e..bfc5d875b 100644 --- a/go.sum +++ b/go.sum @@ -222,8 +222,8 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg6 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= -github.com/CosmWasm/wasmvm v1.5.0 h1:3hKeT9SfwfLhxTGKH3vXaKFzBz1yuvP8SlfwfQXbQfw= -github.com/CosmWasm/wasmvm v1.5.0/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc= +github.com/CosmWasm/wasmvm v1.5.2 h1:+pKB1Mz9GZVt1vadxB+EDdD1FOz3dMNjIKq/58/lrag= +github.com/CosmWasm/wasmvm v1.5.2/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -356,8 +356,8 @@ github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121 h1:fjpWDB0 github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/classic-terra/ibc-go/v7 v7.4.0-terra h1:hawaq62XKlxyc8xLyIcc6IujDDEbqDBU+2U15SF+hj8= github.com/classic-terra/ibc-go/v7 v7.4.0-terra/go.mod h1:s0lxNkjVIqsb8AVltL0qhzxeLgOKvWZrknPuvgjlEQ8= -github.com/classic-terra/wasmd v0.45.0-terra.3 h1:Fpjrjco0ig4dLwX6KrT+z0Zjo2iJCggM2X0JppyA/ko= -github.com/classic-terra/wasmd v0.45.0-terra.3/go.mod h1:pTPOut260rZ3J0WROheOgNWDV/vk/AeRdXmM1JOtMjk= +github.com/classic-terra/wasmd v0.45.0-terra.5 h1:0fuc4lS1Z0Egci6hwK4DZqOwF2l9fGsZuPTZ1akObFY= +github.com/classic-terra/wasmd v0.45.0-terra.5/go.mod h1:r/AxjzSLyrQbrANEsV/d+qf/vmCDFiAoVwWenGs23ZY= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= @@ -1079,8 +1079,6 @@ github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Ung github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= -github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=