From f1b72f07d5417cdc79b7c5b9cb333f89325276e8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 26 Sep 2023 14:10:37 +0200 Subject: [PATCH] feat: upgrade to Cosmos SDK Twilight (backport #33) (#127) Co-authored-by: John Letey --- .github/README.md | 2 +- CHANGELOG.md | 6 + Makefile | 2 +- app/ante.go | 20 +- app/app.go | 728 ++++++++++-------- app/export.go | 85 +- app/keepers.go | 42 +- app/modules.go | 40 +- app/test_helpers.go | 94 +-- app/upgrades/v1_4/constants.go | 16 + app/upgrades/v1_4/store.go | 9 +- app/upgrades/v1_4/upgrade.go | 102 ++- cmd/kyved/app_creator.go | 93 +-- cmd/kyved/config.go | 2 +- cmd/kyved/root.go | 13 +- docs/swagger.yml | 110 +-- go.mod | 152 ++-- go.sum | 694 +++++++++++++---- proto/Dockerfile | 12 +- proto/buf.lock | 4 +- proto/buf.yaml | 3 +- proto/kyve/global/v1beta1/global.proto | 1 + proto/kyve/query/v1beta1/params.proto | 4 +- testutil/integration/integration.go | 22 +- testutil/keeper/bundles.go | 6 +- testutil/keeper/pool.go | 6 +- testutil/keeper/query.go | 6 +- testutil/keeper/stakers.go | 6 +- x/bundles/keeper/keeper.go | 2 +- .../keeper/msg_server_update_params_test.go | 28 +- x/bundles/module.go | 10 +- x/bundles/types/bundles.pb.go | 2 +- x/bundles/types/events.pb.go | 2 +- x/bundles/types/genesis.pb.go | 2 +- x/bundles/types/params.pb.go | 2 +- x/bundles/types/query.pb.go | 4 +- x/bundles/types/tx.pb.go | 4 +- x/delegation/keeper/keeper.go | 2 +- .../keeper/msg_server_update_params_test.go | 36 +- x/delegation/module.go | 10 +- x/delegation/types/delegation.pb.go | 2 +- x/delegation/types/events.pb.go | 2 +- x/delegation/types/genesis.pb.go | 2 +- x/delegation/types/params.pb.go | 2 +- x/delegation/types/query.pb.go | 4 +- x/delegation/types/tx.pb.go | 4 +- x/global/abci_test.go | 14 +- x/global/ante.go | 67 -- x/global/ante_test.go | 258 +------ x/global/ante_utils_test.go | 13 +- x/global/keeper/keeper.go | 2 +- .../keeper/msg_server_update_params_test.go | 32 +- x/global/module.go | 10 +- x/global/post.go | 8 +- x/global/post_test.go | 28 +- x/global/types/events.pb.go | 2 +- x/global/types/genesis.pb.go | 2 +- x/global/types/global.pb.go | 58 +- x/global/types/query.pb.go | 4 +- x/global/types/tx.pb.go | 4 +- x/pool/keeper/keeper.go | 2 +- x/pool/keeper/keeper_utils_test.go | 4 +- .../msg_server_cancel_runtime_upgrade_test.go | 2 +- x/pool/keeper/msg_server_create_pool_test.go | 2 +- x/pool/keeper/msg_server_disable_pool_test.go | 2 +- x/pool/keeper/msg_server_enable_pool_test.go | 2 +- ...sg_server_schedule_runtime_upgrade_test.go | 2 +- .../keeper/msg_server_update_params_test.go | 20 +- x/pool/keeper/msg_server_update_pool_test.go | 2 +- x/pool/module.go | 11 +- x/pool/types/events.pb.go | 2 +- x/pool/types/genesis.pb.go | 2 +- x/pool/types/params.pb.go | 2 +- x/pool/types/pool.pb.go | 2 +- x/pool/types/query.pb.go | 4 +- x/pool/types/tx.pb.go | 4 +- x/query/keeper/grpc_params.go | 18 +- x/query/keeper/keeper.go | 2 +- x/query/module.go | 10 +- x/query/types/account.pb.go | 4 +- x/query/types/bundles.pb.go | 4 +- x/query/types/delegation.pb.go | 4 +- x/query/types/params.pb.go | 70 +- x/query/types/pools.pb.go | 4 +- x/query/types/query.pb.go | 2 +- x/query/types/stakers.pb.go | 4 +- x/stakers/keeper/exported_functions_test.go | 4 +- x/stakers/keeper/keeper.go | 2 +- .../keeper/msg_server_update_params_test.go | 20 +- x/stakers/module.go | 10 +- x/stakers/types/events.pb.go | 2 +- x/stakers/types/genesis.pb.go | 2 +- x/stakers/types/params.pb.go | 2 +- x/stakers/types/query.pb.go | 4 +- x/stakers/types/stakers.pb.go | 2 +- x/stakers/types/tx.pb.go | 4 +- x/team/keeper/keeper.go | 2 +- x/team/module.go | 10 +- x/team/types/events.pb.go | 2 +- x/team/types/genesis.pb.go | 2 +- x/team/types/query.pb.go | 4 +- x/team/types/team.pb.go | 2 +- x/team/types/tx.pb.go | 4 +- x/team/types/types.go | 4 +- 104 files changed, 1723 insertions(+), 1448 deletions(-) diff --git a/.github/README.md b/.github/README.md index 801e8b28..bd63dfcf 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,6 +1,6 @@ # The KYVE Network -###### v1.3.1 +###### v1.4.0 The KYVE consensus layer is the backbone of the KYVE ecosystem. This layer is a sovereign Delegated Proof of Stake network built using the diff --git a/CHANGELOG.md b/CHANGELOG.md index 87563bfc..5606ef3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,12 @@ An '!' indicates a state machine breaking change. +## [Unreleased] + +### Improvements + +- (deps) [#33](https://github.com/KYVENetwork/chain/pull/33) Upgrade Cosmos SDK to [v0.47.5](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.5) ([`v0.47.5-kyve`](https://github.com/KYVENetwork/cosmos-sdk/releases/tag/v0.47.5-kyve-rc0)). + ## [v1.3.1](https://github.com/KYVENetwork/chain/releases/tag/v1.3.1) - 2023-08-02 ### Bug Fixes diff --git a/Makefile b/Makefile index ad3ee575..054d00b6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ COMMIT := $(shell git log -1 --format='%H') GO_VERSION := $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1,2) -VERSION := v1.3.1 # $(shell echo $(shell git describe --tags) | sed 's/^v//') +VERSION := v1.4.0 # $(shell echo $(shell git describe --tags) | sed 's/^v//') TEAM_ALLOCATION := 165000000000000 ifeq ($(ENV),kaon) diff --git a/app/ante.go b/app/ante.go index 3317a707..31e11ab1 100644 --- a/app/ante.go +++ b/app/ante.go @@ -14,23 +14,20 @@ import ( // Global "github.com/KYVENetwork/chain/x/global" globalKeeper "github.com/KYVENetwork/chain/x/global/keeper" - // Gov - govKeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" - // IBC - ibcAnte "github.com/cosmos/ibc-go/v6/modules/core/ante" - ibcKeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" + // IBC Core + ibcAnte "github.com/cosmos/ibc-go/v7/modules/core/ante" + ibcKeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" // Staking stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" ) -// https://github.com/cosmos/cosmos-sdk/blob/release/v0.46.x/x/auth/ante/ante.go#L25 +// https://github.com/cosmos/cosmos-sdk/blob/release/v0.47.x/x/auth/ante/ante.go#L25 func NewAnteHandler( accountKeeper authKeeper.AccountKeeper, bankKeeper bankKeeper.Keeper, feeGrantKeeper feeGrantKeeper.Keeper, globalKeeper globalKeeper.Keeper, - govKeeper govKeeper.Keeper, ibcKeeper *ibcKeeper.Keeper, stakingKeeper stakingKeeper.Keeper, sigGasConsumer ante.SignatureVerificationGasConsumer, @@ -40,8 +37,6 @@ func NewAnteHandler( gasAdjustmentDecorator := global.NewGasAdjustmentDecorator(globalKeeper) - initialDepositDecorator := global.NewInitialDepositDecorator(globalKeeper, govKeeper) - anteDecorators := []sdk.AnteDecorator{ ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first gasAdjustmentDecorator, @@ -57,7 +52,6 @@ func NewAnteHandler( ante.NewSigVerificationDecorator(accountKeeper, signModeHandler), ante.NewIncrementSequenceDecorator(accountKeeper), ibcAnte.NewRedundantRelayDecorator(ibcKeeper), - initialDepositDecorator, } return sdk.ChainAnteDecorators(anteDecorators...), nil @@ -69,12 +63,12 @@ func NewPostHandler( bankKeeper bankKeeper.Keeper, feeGrantKeeper feeGrantKeeper.Keeper, globalKeeper globalKeeper.Keeper, -) (sdk.AnteHandler, error) { +) (sdk.PostHandler, error) { refundFeeDecorator := global.NewRefundFeeDecorator(bankKeeper, feeGrantKeeper, globalKeeper) - postDecorators := []sdk.AnteDecorator{ + postDecorators := []sdk.PostDecorator{ refundFeeDecorator, } - return sdk.ChainAnteDecorators(postDecorators...), nil + return sdk.ChainPostDecorators(postDecorators...), nil } diff --git a/app/app.go b/app/app.go index 5b6a32f9..2e9027f5 100644 --- a/app/app.go +++ b/app/app.go @@ -1,145 +1,167 @@ package app import ( + "encoding/json" "fmt" "io" - "net/http" "os" "path/filepath" v1p4 "github.com/KYVENetwork/chain/app/upgrades/v1_4" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + cmtOs "github.com/cometbft/cometbft/libs/os" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/grpc/node" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" "github.com/cosmos/cosmos-sdk/codec" "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" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + serverTypes "github.com/cosmos/cosmos-sdk/server/types" + "github.com/cosmos/cosmos-sdk/store/streaming" + storeTypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/version" + "github.com/spf13/cast" + + // Auth "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/ante" - authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + authKeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" + authTx "github.com/cosmos/cosmos-sdk/x/auth/tx" + authTypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting" - vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" + vestingTypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" + // Authz authzTypes "github.com/cosmos/cosmos-sdk/x/authz" - authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" + authzKeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" authz "github.com/cosmos/cosmos-sdk/x/authz/module" + // Bank "github.com/cosmos/cosmos-sdk/x/bank" - bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/capability" - capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - "github.com/cosmos/cosmos-sdk/x/crisis" - crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper" - crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" - "github.com/cosmos/cosmos-sdk/x/distribution" - distrclient "github.com/cosmos/cosmos-sdk/x/distribution/client" - distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" - distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/cosmos/cosmos-sdk/x/evidence" - evidencekeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper" - evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" - feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" - feeGrant "github.com/cosmos/cosmos-sdk/x/feegrant/module" - "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" - govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - groupTypes "github.com/cosmos/cosmos-sdk/x/group" - groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" - group "github.com/cosmos/cosmos-sdk/x/group/module" - "github.com/cosmos/cosmos-sdk/x/mint" - mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" - minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/cosmos/cosmos-sdk/x/params" - paramsclient "github.com/cosmos/cosmos-sdk/x/params/client" - paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - "github.com/cosmos/cosmos-sdk/x/slashing" - slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" - slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/cosmos/cosmos-sdk/x/staking" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/cosmos-sdk/x/upgrade" - upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" - upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" - icaController "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller" - 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" - icaHost "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host" - 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" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ibcFee "github.com/cosmos/ibc-go/v6/modules/apps/29-fee" - 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" - ibc "github.com/cosmos/ibc-go/v6/modules/core" - ibcclient "github.com/cosmos/ibc-go/v6/modules/core/02-client" - ibcclientclient "github.com/cosmos/ibc-go/v6/modules/core/02-client/client" - ibcclienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - ibcPortTypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" - ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" - "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" - dbm "github.com/tendermint/tm-db" - - kyveDocs "github.com/KYVENetwork/chain/docs" - // this line is used by starport scaffolding # stargate/app/moduleImport - + bankKeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" // Bundles "github.com/KYVENetwork/chain/x/bundles" bundlesKeeper "github.com/KYVENetwork/chain/x/bundles/keeper" bundlesTypes "github.com/KYVENetwork/chain/x/bundles/types" + // Capability + "github.com/cosmos/cosmos-sdk/x/capability" + capabilityKeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" + capabilityTypes "github.com/cosmos/cosmos-sdk/x/capability/types" + // Consensus + "github.com/cosmos/cosmos-sdk/x/consensus" + consensusKeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" + consensusTypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + // Crisis + "github.com/cosmos/cosmos-sdk/x/crisis" + crisisKeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper" + crisisTypes "github.com/cosmos/cosmos-sdk/x/crisis/types" // Delegation "github.com/KYVENetwork/chain/x/delegation" delegationKeeper "github.com/KYVENetwork/chain/x/delegation/keeper" delegationTypes "github.com/KYVENetwork/chain/x/delegation/types" + // Distribution + "github.com/cosmos/cosmos-sdk/x/distribution" + distributionKeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" + distributionTypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + // Evidence + "github.com/cosmos/cosmos-sdk/x/evidence" + evidenceKeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper" + evidenceTypes "github.com/cosmos/cosmos-sdk/x/evidence/types" + // FeeGrant + feeGrantTypes "github.com/cosmos/cosmos-sdk/x/feegrant" + feeGrantKeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" + feeGrant "github.com/cosmos/cosmos-sdk/x/feegrant/module" + // GenUtil + "github.com/cosmos/cosmos-sdk/x/genutil" + genUtilTypes "github.com/cosmos/cosmos-sdk/x/genutil/types" // Global "github.com/KYVENetwork/chain/x/global" globalKeeper "github.com/KYVENetwork/chain/x/global/keeper" globalTypes "github.com/KYVENetwork/chain/x/global/types" - // PFM - pfm "github.com/strangelove-ventures/packet-forward-middleware/v6/router" - pfmKeeper "github.com/strangelove-ventures/packet-forward-middleware/v6/router/keeper" - pfmTypes "github.com/strangelove-ventures/packet-forward-middleware/v6/router/types" + // Gov + "github.com/cosmos/cosmos-sdk/x/gov" + govKeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" + govTypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + // Group + groupTypes "github.com/cosmos/cosmos-sdk/x/group" + groupKeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" + group "github.com/cosmos/cosmos-sdk/x/group/module" + // IBC Core + ibc "github.com/cosmos/ibc-go/v7/modules/core" + ibcClientHandler "github.com/cosmos/ibc-go/v7/modules/core/02-client" // TODO + ibcClientTypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcPortTypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcExported "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibcKeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + // IBC Fee + ibcFee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" + ibcFeeKeeper "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper" + ibcFeeTypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" + // IBC Transfer + 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" + // ICA + 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" + // ICA Controller + icaController "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller" + 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" + // ICA Host + icaHost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host" + 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" + // Mint + "github.com/cosmos/cosmos-sdk/x/mint" + mintKeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" + mintTypes "github.com/cosmos/cosmos-sdk/x/mint/types" + // Params + "github.com/cosmos/cosmos-sdk/x/params" + paramsTypes "github.com/cosmos/cosmos-sdk/x/params/types" + paramsProposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal" // Pool "github.com/KYVENetwork/chain/x/pool" poolKeeper "github.com/KYVENetwork/chain/x/pool/keeper" poolTypes "github.com/KYVENetwork/chain/x/pool/types" + // PFM + pfm "github.com/strangelove-ventures/packet-forward-middleware/v7/router" + pfmKeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper" + pfmTypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" // Query "github.com/KYVENetwork/chain/x/query" queryKeeper "github.com/KYVENetwork/chain/x/query/keeper" queryTypes "github.com/KYVENetwork/chain/x/query/types" + // Slashing + "github.com/cosmos/cosmos-sdk/x/slashing" + slashingKeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" + slashingTypes "github.com/cosmos/cosmos-sdk/x/slashing/types" // Stakers "github.com/KYVENetwork/chain/x/stakers" stakersKeeper "github.com/KYVENetwork/chain/x/stakers/keeper" stakersTypes "github.com/KYVENetwork/chain/x/stakers/types" + // Staking + "github.com/cosmos/cosmos-sdk/x/staking" + stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" + stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" // Team "github.com/KYVENetwork/chain/x/team" teamKeeper "github.com/KYVENetwork/chain/x/team/keeper" teamTypes "github.com/KYVENetwork/chain/x/team/types" + // Upgrade + "github.com/cosmos/cosmos-sdk/x/upgrade" + upgradeKeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" + upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) const ( @@ -147,21 +169,6 @@ const ( Name = "kyve" ) -func getGovProposalHandlers() []govclient.ProposalHandler { - var govProposalHandlers []govclient.ProposalHandler - - govProposalHandlers = append(govProposalHandlers, - paramsclient.ProposalHandler, - distrclient.ProposalHandler, - upgradeclient.LegacyProposalHandler, - upgradeclient.LegacyCancelProposalHandler, - ibcclientclient.UpdateClientProposalHandler, - ibcclientclient.UpgradeProposalHandler, - ) - - return govProposalHandlers -} - var ( // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string @@ -170,12 +177,13 @@ var ( // non-dependant module elements, such as codec registration // and genesis verification. ModuleBasics = module.NewBasicManager(appModuleBasics...) - - // module account permissions - maccPerms = moduleAccountPermissions ) -var _ servertypes.Application = (*App)(nil) +var ( + // TODO(@john): Ask if this is needed for a "v1" app. + _ runtime.AppI = (*App)(nil) + _ serverTypes.Application = (*App)(nil) +) func init() { userHomeDir, err := os.UserHomeDir() @@ -191,23 +199,17 @@ func init() { // capabilities aren't needed for testing. type App struct { *baseapp.BaseApp - - Keepers - - cdc *codec.LegacyAmino + legacyAmino *codec.LegacyAmino appCodec codec.Codec + txConfig client.TxConfig interfaceRegistry types.InterfaceRegistry - invCheckPeriod uint - - // keys to access the substores - keys map[string]*storetypes.KVStoreKey - tkeys map[string]*storetypes.TransientStoreKey - memKeys map[string]*storetypes.MemoryStoreKey - - // mm is the module manager - mm *module.Manager + keys map[string]*storeTypes.KVStoreKey + tkeys map[string]*storeTypes.TransientStoreKey + memKeys map[string]*storeTypes.MemoryStoreKey + Keepers + mm *module.Manager configurator module.Configurator } @@ -217,31 +219,71 @@ func NewKYVEApp( db dbm.DB, traceStore io.Writer, loadLatest bool, - skipUpgradeHeights map[int64]bool, - homePath string, - invCheckPeriod uint, - encodingConfig EncodingConfig, - appOpts servertypes.AppOptions, + appOpts serverTypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp), ) *App { + encodingConfig := MakeEncodingConfig() + appCodec := encodingConfig.Marshaler - cdc := encodingConfig.Amino + legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry - - bApp := baseapp.NewBaseApp(Name, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) + txConfig := encodingConfig.TxConfig + + // Below we could construct and set an application specific mempool and + // ABCI 1.0 PrepareProposal and ProcessProposal handlers. These defaults are + // already set in the SDK's BaseApp, this shows an example of how to override + // them. + // + // Example: + // + // bApp := baseapp.NewBaseApp(...) + // nonceMempool := mempool.NewSenderNonceMempool() + // abciPropHandler := NewDefaultProposalHandler(nonceMempool, bApp) + // + // bApp.SetMempool(nonceMempool) + // bApp.SetPrepareProposal(abciPropHandler.PrepareProposalHandler()) + // bApp.SetProcessProposal(abciPropHandler.ProcessProposalHandler()) + // + // Alternatively, you can construct BaseApp options, append those to + // baseAppOptions and pass them to NewBaseApp. + // + // Example: + // + // prepareOpt = func(app *baseapp.BaseApp) { + // abciPropHandler := baseapp.NewDefaultProposalHandler(nonceMempool, app) + // app.SetPrepareProposal(abciPropHandler.PrepareProposalHandler()) + // } + // baseAppOptions = append(baseAppOptions, prepareOpt) + + bApp := baseapp.NewBaseApp(Name, logger, db, txConfig.TxDecoder(), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version) bApp.SetInterfaceRegistry(interfaceRegistry) + bApp.SetTxEncoder(txConfig.TxEncoder()) keys := sdk.NewKVStoreKeys( - authtypes.StoreKey, authzTypes.ModuleName, banktypes.StoreKey, - capabilitytypes.StoreKey, distrtypes.StoreKey, evidencetypes.StoreKey, - feegrant.StoreKey, govtypes.StoreKey, groupTypes.StoreKey, - minttypes.StoreKey, paramstypes.StoreKey, slashingtypes.StoreKey, - stakingtypes.StoreKey, upgradetypes.StoreKey, - - ibchost.StoreKey, ibcFeeTypes.StoreKey, ibcTransferTypes.StoreKey, - icaControllerTypes.StoreKey, icaHostTypes.StoreKey, + authTypes.StoreKey, + authzTypes.ModuleName, + bankTypes.StoreKey, + capabilityTypes.StoreKey, + consensusTypes.StoreKey, + crisisTypes.StoreKey, + distributionTypes.StoreKey, + evidenceTypes.StoreKey, + feeGrantTypes.StoreKey, + govTypes.StoreKey, + groupTypes.StoreKey, + mintTypes.StoreKey, + paramsTypes.StoreKey, + slashingTypes.StoreKey, + stakingTypes.StoreKey, + upgradeTypes.StoreKey, + + ibcExported.StoreKey, + ibcFeeTypes.StoreKey, + ibcTransferTypes.StoreKey, + icaControllerTypes.StoreKey, + icaHostTypes.StoreKey, pfmTypes.StoreKey, bundlesTypes.StoreKey, @@ -252,15 +294,25 @@ func NewKYVEApp( stakersTypes.StoreKey, teamTypes.StoreKey, ) - tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, bundlesTypes.MemStoreKey, delegationTypes.MemStoreKey) + tkeys := sdk.NewTransientStoreKeys(paramsTypes.TStoreKey) + memKeys := sdk.NewMemoryStoreKeys( + capabilityTypes.MemStoreKey, + + bundlesTypes.MemStoreKey, delegationTypes.MemStoreKey, + ) + + // load state streaming if enabled + if _, _, err := streaming.LoadStreamingServices(bApp, appOpts, appCodec, logger, keys); err != nil { + logger.Error("failed to load state streaming", "err", err) + os.Exit(1) + } app := &App{ BaseApp: bApp, - cdc: cdc, + legacyAmino: legacyAmino, appCodec: appCodec, + txConfig: txConfig, interfaceRegistry: interfaceRegistry, - invCheckPeriod: invCheckPeriod, keys: keys, tkeys: tkeys, memKeys: memKeys, @@ -268,141 +320,152 @@ func NewKYVEApp( app.ParamsKeeper = initParamsKeeper( appCodec, - cdc, - keys[paramstypes.StoreKey], - tkeys[paramstypes.TStoreKey], + legacyAmino, + keys[paramsTypes.StoreKey], + tkeys[paramsTypes.TStoreKey], ) // set the BaseApp's parameter store - bApp.SetParamStore(app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())) + app.ConsensusKeeper = consensusKeeper.NewKeeper( + appCodec, + keys[consensusTypes.StoreKey], + authTypes.NewModuleAddress(govTypes.ModuleName).String(), + ) + bApp.SetParamStore(&app.ConsensusKeeper) // add capability keeper and ScopeToModule for ibc module - app.CapabilityKeeper = capabilitykeeper.NewKeeper( + app.CapabilityKeeper = capabilityKeeper.NewKeeper( appCodec, - keys[capabilitytypes.StoreKey], - memKeys[capabilitytypes.MemStoreKey], + keys[capabilityTypes.StoreKey], + memKeys[capabilityTypes.MemStoreKey], ) - // grant capabilities for the ibc and ibc-transfer modules - scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) + scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcExported.ModuleName) scopedIBCTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibcTransferTypes.ModuleName) scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icaControllerTypes.SubModuleName) scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icaHostTypes.SubModuleName) - // this line is used by starport scaffolding # stargate/app/scopedKeeper + + // TODO(@john): Seal x/capability keeper. // add keepers - app.AccountKeeper = authkeeper.NewAccountKeeper( + app.AccountKeeper = authKeeper.NewAccountKeeper( appCodec, - keys[authtypes.StoreKey], - app.GetSubspace(authtypes.ModuleName), - authtypes.ProtoBaseAccount, - maccPerms, - sdk.Bech32PrefixAccAddr, + keys[authTypes.StoreKey], + authTypes.ProtoBaseAccount, + moduleAccountPermissions, + sdk.Bech32MainPrefix, + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) - app.AuthzKeeper = authzkeeper.NewKeeper( + app.AuthzKeeper = authzKeeper.NewKeeper( keys[authzTypes.ModuleName], appCodec, app.MsgServiceRouter(), app.AccountKeeper, ) - app.BankKeeper = bankkeeper.NewBaseKeeper( + app.BankKeeper = bankKeeper.NewBaseKeeper( appCodec, - keys[banktypes.StoreKey], + keys[bankTypes.StoreKey], app.AccountKeeper, - app.GetSubspace(banktypes.ModuleName), app.BlockedModuleAccountAddrs(), + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) - stakingKeeper := stakingkeeper.NewKeeper( + app.StakingKeeper = stakingKeeper.NewKeeper( appCodec, - keys[stakingtypes.StoreKey], + keys[stakingTypes.StoreKey], app.AccountKeeper, app.BankKeeper, - app.GetSubspace(stakingtypes.ModuleName), + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) - app.MintKeeper = mintkeeper.NewKeeper( + app.MintKeeper = mintKeeper.NewKeeper( appCodec, - keys[minttypes.StoreKey], - app.GetSubspace(minttypes.ModuleName), - &stakingKeeper, - &app.StakersKeeper, + keys[mintTypes.StoreKey], + app.StakingKeeper, + &app.StakersKeeper, // TODO(@john) app.AccountKeeper, app.BankKeeper, - authtypes.FeeCollectorName, + authTypes.FeeCollectorName, + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) - app.DistributionKeeper = distrkeeper.NewKeeper( + app.DistributionKeeper = distributionKeeper.NewKeeper( appCodec, - keys[distrtypes.StoreKey], - app.GetSubspace(distrtypes.ModuleName), + keys[distributionTypes.StoreKey], app.AccountKeeper, app.BankKeeper, - &stakingKeeper, - authtypes.FeeCollectorName, + app.StakingKeeper, + authTypes.FeeCollectorName, + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) - app.SlashingKeeper = slashingkeeper.NewKeeper( + app.SlashingKeeper = slashingKeeper.NewKeeper( appCodec, - keys[slashingtypes.StoreKey], - &stakingKeeper, - app.GetSubspace(slashingtypes.ModuleName), + legacyAmino, + keys[slashingTypes.StoreKey], + app.StakingKeeper, + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) - app.CrisisKeeper = crisiskeeper.NewKeeper( - app.GetSubspace(crisistypes.ModuleName), + invCheckPeriod := cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)) + app.CrisisKeeper = crisisKeeper.NewKeeper( + appCodec, + keys[crisisTypes.StoreKey], invCheckPeriod, app.BankKeeper, - authtypes.FeeCollectorName, + authTypes.FeeCollectorName, + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) - groupConfig := groupTypes.DefaultConfig() - /* - Example of setting group params: - groupConfig.MaxMetadataLen = 1000 - */ - app.GroupKeeper = groupkeeper.NewKeeper( - keys[groupTypes.StoreKey], + app.FeeGrantKeeper = feeGrantKeeper.NewKeeper( appCodec, - app.MsgServiceRouter(), + keys[feeGrantTypes.StoreKey], app.AccountKeeper, - groupConfig, ) - app.FeeGrantKeeper = feegrantkeeper.NewKeeper( + app.GroupKeeper = groupKeeper.NewKeeper( + keys[groupTypes.StoreKey], appCodec, - keys[feegrant.StoreKey], + app.MsgServiceRouter(), app.AccountKeeper, + groupTypes.DefaultConfig(), ) - app.UpgradeKeeper = upgradekeeper.NewKeeper( + // get skipUpgradeHeights from the app options + skipUpgradeHeights := map[int64]bool{} + for _, h := range cast.ToIntSlice(appOpts.Get(server.FlagUnsafeSkipUpgrades)) { + skipUpgradeHeights[int64(h)] = true + } + homePath := cast.ToString(appOpts.Get(flags.FlagHome)) + // set the governance module account as the authority for conducting upgrades + app.UpgradeKeeper = upgradeKeeper.NewKeeper( skipUpgradeHeights, - keys[upgradetypes.StoreKey], + keys[upgradeTypes.StoreKey], appCodec, homePath, app.BaseApp, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) // register the staking hooks // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks - app.StakingKeeper = *stakingKeeper.SetHooks( - stakingtypes.NewMultiStakingHooks(app.DistributionKeeper.Hooks(), app.SlashingKeeper.Hooks()), + app.StakingKeeper.SetHooks( + stakingTypes.NewMultiStakingHooks(app.DistributionKeeper.Hooks(), app.SlashingKeeper.Hooks()), ) // ... other modules keepers - app.GlobalKeeper = *globalKeeper.NewKeeper(appCodec, keys[globalTypes.StoreKey], authtypes.NewModuleAddress(govtypes.ModuleName).String()) + app.GlobalKeeper = *globalKeeper.NewKeeper(appCodec, keys[globalTypes.StoreKey], authTypes.NewModuleAddress(govTypes.ModuleName).String()) - app.TeamKeeper = *teamKeeper.NewKeeper(appCodec, keys[teamTypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.UpgradeKeeper) + app.TeamKeeper = *teamKeeper.NewKeeper(appCodec, keys[teamTypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.MintKeeper, *app.UpgradeKeeper) app.PoolKeeper = *poolKeeper.NewKeeper( appCodec, keys[poolTypes.StoreKey], memKeys[poolTypes.MemStoreKey], - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authTypes.NewModuleAddress(govTypes.ModuleName).String(), app.AccountKeeper, app.BankKeeper, @@ -417,7 +480,7 @@ func NewKYVEApp( keys[stakersTypes.StoreKey], memKeys[stakersTypes.MemStoreKey], - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authTypes.NewModuleAddress(govTypes.ModuleName).String(), app.AccountKeeper, app.BankKeeper, @@ -431,7 +494,7 @@ func NewKYVEApp( keys[delegationTypes.StoreKey], memKeys[delegationTypes.MemStoreKey], - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authTypes.NewModuleAddress(govTypes.ModuleName).String(), app.AccountKeeper, app.BankKeeper, @@ -449,7 +512,7 @@ func NewKYVEApp( keys[bundlesTypes.StoreKey], memKeys[bundlesTypes.MemStoreKey], - authtypes.NewModuleAddress(govtypes.ModuleName).String(), + authTypes.NewModuleAddress(govTypes.ModuleName).String(), app.AccountKeeper, app.BankKeeper, @@ -459,17 +522,18 @@ func NewKYVEApp( app.DelegationKeeper, ) - // Create IBC Keepers - app.IBCKeeper = ibckeeper.NewKeeper( - appCodec, keys[ibchost.StoreKey], - app.GetSubspace(ibchost.ModuleName), + app.IBCKeeper = ibcKeeper.NewKeeper( + appCodec, + keys[ibcExported.StoreKey], + app.GetSubspace(ibcExported.ModuleName), app.StakingKeeper, app.UpgradeKeeper, scopedIBCKeeper, ) app.IBCFeeKeeper = ibcFeeKeeper.NewKeeper( - appCodec, keys[ibcFeeTypes.StoreKey], + appCodec, + keys[ibcFeeTypes.StoreKey], app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, @@ -477,8 +541,9 @@ func NewKYVEApp( app.BankKeeper, ) - app.IBCTransferKeeper = ibctransferkeeper.NewKeeper( - appCodec, keys[ibcTransferTypes.StoreKey], + app.IBCTransferKeeper = ibcTransferKeeper.NewKeeper( + appCodec, + keys[ibcTransferTypes.StoreKey], app.GetSubspace(ibcTransferTypes.ModuleName), app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, @@ -489,7 +554,8 @@ func NewKYVEApp( ) app.ICAControllerKeeper = icaControllerKeeper.NewKeeper( - appCodec, keys[icaControllerTypes.StoreKey], + appCodec, + keys[icaControllerTypes.StoreKey], app.GetSubspace(icaControllerTypes.SubModuleName), app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, @@ -498,8 +564,9 @@ func NewKYVEApp( app.MsgServiceRouter(), ) - app.ICAHostKeeper = icahostkeeper.NewKeeper( - appCodec, keys[icaHostTypes.StoreKey], + app.ICAHostKeeper = icaHostKeeper.NewKeeper( + appCodec, + keys[icaHostTypes.StoreKey], app.GetSubspace(icaHostTypes.SubModuleName), app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, @@ -520,35 +587,35 @@ func NewKYVEApp( ) // Create evidence Keeper for to register the IBC light client misbehaviour evidence route - evidenceKeeper := evidencekeeper.NewKeeper( + app.EvidenceKeeper = evidenceKeeper.NewKeeper( appCodec, - keys[evidencetypes.StoreKey], - &app.StakingKeeper, + keys[evidenceTypes.StoreKey], + app.StakingKeeper, app.SlashingKeeper, ) // If evidence needs to be handled for the app, set routes in router here and seal - app.EvidenceKeeper = *evidenceKeeper + // app.EvidenceKeeper = *evidenceKeeper - govRouter := govv1beta1.NewRouter() + govRouter := v1beta1.NewRouter() govRouter. - AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). - AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). - AddRoute(distrtypes.RouterKey, distribution.NewCommunityPoolSpendProposalHandler(app.DistributionKeeper)). - AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). - AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) - govConfig := govtypes.DefaultConfig() - app.GovKeeper = govkeeper.NewKeeper( + AddRoute(govTypes.RouterKey, v1beta1.ProposalHandler). + AddRoute(paramsProposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). + // AddRoute(distrtypes.RouterKey, distribution.NewCommunityPoolSpendProposalHandler(app.DistributionKeeper)). + AddRoute(upgradeTypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). + AddRoute(ibcClientTypes.RouterKey, ibcClientHandler.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) + govConfig := govTypes.DefaultConfig() + app.GovKeeper = govKeeper.NewKeeper( appCodec, - keys[govtypes.StoreKey], - app.GetSubspace(govtypes.ModuleName), + keys[govTypes.StoreKey], app.AccountKeeper, app.BankKeeper, - &stakingKeeper, - &app.StakersKeeper, - govRouter, + app.StakingKeeper, + app.StakersKeeper, app.MsgServiceRouter(), govConfig, + authTypes.NewModuleAddress(govTypes.ModuleName).String(), ) + app.GovKeeper.SetLegacyRouter(govRouter) app.QueryKeeper = *queryKeeper.NewKeeper( appCodec, @@ -564,7 +631,7 @@ func NewKYVEApp( app.DelegationKeeper, app.BundlesKeeper, app.GlobalKeeper, - app.GovKeeper, + *app.GovKeeper, app.TeamKeeper, ) // this line is used by starport scaffolding # stargate/app/keeperDefinition @@ -606,24 +673,25 @@ func NewKYVEApp( app.mm = module.NewManager( // Cosmos SDK - auth.NewAppModule(appCodec, app.AccountKeeper, nil), + auth.NewAppModule(appCodec, app.AccountKeeper, nil, app.GetSubspace(authTypes.ModuleName)), authz.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), - crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), - distribution.NewAppModule(appCodec, app.DistributionKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - evidence.NewAppModule(app.EvidenceKeeper), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(bankTypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), + consensus.NewAppModule(appCodec, app.ConsensusKeeper), + crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisisTypes.ModuleName)), + distribution.NewAppModule(appCodec, app.DistributionKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distributionTypes.ModuleName)), + evidence.NewAppModule(*app.EvidenceKeeper), feeGrant.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), genutil.NewAppModule( app.AccountKeeper, app.StakingKeeper, app.BaseApp.DeliverTx, encodingConfig.TxConfig, ), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), + gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govTypes.ModuleName)), group.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, minttypes.DefaultInflationCalculationFn), + mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, mintTypes.DefaultInflationCalculationFn, app.GetSubspace(mintTypes.ModuleName)), params.NewAppModule(app.ParamsKeeper), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingTypes.ModuleName)), + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingTypes.ModuleName)), upgrade.NewAppModule(app.UpgradeKeeper), vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), @@ -634,13 +702,13 @@ func NewKYVEApp( ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper), // KYVE - bundles.NewAppModule(appCodec, app.BundlesKeeper, app.AccountKeeper, app.BankKeeper, app.DistributionKeeper, app.MintKeeper, app.UpgradeKeeper, app.PoolKeeper, app.TeamKeeper), + bundles.NewAppModule(appCodec, app.BundlesKeeper, app.AccountKeeper, app.BankKeeper, app.DistributionKeeper, app.MintKeeper, *app.UpgradeKeeper, app.PoolKeeper, app.TeamKeeper), delegation.NewAppModule(appCodec, app.DelegationKeeper, app.AccountKeeper, app.BankKeeper), - global.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.GlobalKeeper, app.UpgradeKeeper), - pool.NewAppModule(appCodec, app.PoolKeeper, app.AccountKeeper, app.BankKeeper, app.UpgradeKeeper), + global.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.GlobalKeeper, *app.UpgradeKeeper), + pool.NewAppModule(appCodec, app.PoolKeeper, app.AccountKeeper, app.BankKeeper, *app.UpgradeKeeper), query.NewAppModule(appCodec, app.QueryKeeper, app.AccountKeeper, app.BankKeeper), stakers.NewAppModule(appCodec, app.StakersKeeper, app.AccountKeeper, app.BankKeeper), - team.NewAppModule(appCodec, app.BankKeeper, app.MintKeeper, app.TeamKeeper, app.UpgradeKeeper), + team.NewAppModule(appCodec, app.BankKeeper, app.MintKeeper, app.TeamKeeper, *app.UpgradeKeeper), ) // During begin block slashing happens after distr.BeginBlocker so that @@ -649,31 +717,32 @@ func NewKYVEApp( // NOTE: staking module is required if HistoricalEntries param > 0 app.mm.SetOrderBeginBlockers( // upgrades should be run first - upgradetypes.ModuleName, - capabilitytypes.ModuleName, - minttypes.ModuleName, + upgradeTypes.ModuleName, + capabilityTypes.ModuleName, + mintTypes.ModuleName, // NOTE: x/team must be run before x/distribution and after x/mint. teamTypes.ModuleName, // NOTE: x/bundles must be run before x/distribution and after x/team. bundlesTypes.ModuleName, - distrtypes.ModuleName, - slashingtypes.ModuleName, - evidencetypes.ModuleName, - stakingtypes.ModuleName, - authtypes.ModuleName, - banktypes.ModuleName, - govtypes.ModuleName, - crisistypes.ModuleName, + distributionTypes.ModuleName, + slashingTypes.ModuleName, + evidenceTypes.ModuleName, + stakingTypes.ModuleName, + authTypes.ModuleName, + bankTypes.ModuleName, + govTypes.ModuleName, + crisisTypes.ModuleName, ibcFeeTypes.ModuleName, ibcTransferTypes.ModuleName, - ibchost.ModuleName, - icatypes.ModuleName, - genutiltypes.ModuleName, + ibcExported.ModuleName, + icaTypes.ModuleName, + genUtilTypes.ModuleName, authzTypes.ModuleName, - feegrant.ModuleName, + feeGrantTypes.ModuleName, groupTypes.ModuleName, - paramstypes.ModuleName, - vestingtypes.ModuleName, + paramsTypes.ModuleName, + vestingTypes.ModuleName, + consensusTypes.ModuleName, // this line is used by starport scaffolding # stargate/app/beginBlockers poolTypes.ModuleName, @@ -684,27 +753,28 @@ func NewKYVEApp( ) app.mm.SetOrderEndBlockers( - crisistypes.ModuleName, - govtypes.ModuleName, - stakingtypes.ModuleName, + crisisTypes.ModuleName, + govTypes.ModuleName, + stakingTypes.ModuleName, ibcFeeTypes.ModuleName, ibcTransferTypes.ModuleName, - ibchost.ModuleName, - icatypes.ModuleName, - capabilitytypes.ModuleName, - authtypes.ModuleName, - banktypes.ModuleName, - distrtypes.ModuleName, - slashingtypes.ModuleName, - minttypes.ModuleName, - genutiltypes.ModuleName, - evidencetypes.ModuleName, + ibcExported.ModuleName, + icaTypes.ModuleName, + capabilityTypes.ModuleName, + authTypes.ModuleName, + bankTypes.ModuleName, + distributionTypes.ModuleName, + slashingTypes.ModuleName, + mintTypes.ModuleName, + genUtilTypes.ModuleName, + evidenceTypes.ModuleName, authzTypes.ModuleName, - feegrant.ModuleName, + feeGrantTypes.ModuleName, groupTypes.ModuleName, - paramstypes.ModuleName, - upgradetypes.ModuleName, - vestingtypes.ModuleName, + paramsTypes.ModuleName, + upgradeTypes.ModuleName, + vestingTypes.ModuleName, + consensusTypes.ModuleName, // this line is used by starport scaffolding # stargate/app/endBlockers poolTypes.ModuleName, @@ -722,27 +792,28 @@ func NewKYVEApp( // so that other modules that want to create or claim capabilities afterwards in InitChain // can do so safely. app.mm.SetOrderInitGenesis( - capabilitytypes.ModuleName, - authtypes.ModuleName, - banktypes.ModuleName, - distrtypes.ModuleName, - stakingtypes.ModuleName, - slashingtypes.ModuleName, - govtypes.ModuleName, - minttypes.ModuleName, - crisistypes.ModuleName, - genutiltypes.ModuleName, + capabilityTypes.ModuleName, + authTypes.ModuleName, + bankTypes.ModuleName, + distributionTypes.ModuleName, + stakingTypes.ModuleName, + slashingTypes.ModuleName, + govTypes.ModuleName, + mintTypes.ModuleName, + crisisTypes.ModuleName, + genUtilTypes.ModuleName, ibcFeeTypes.ModuleName, ibcTransferTypes.ModuleName, - ibchost.ModuleName, - icatypes.ModuleName, - evidencetypes.ModuleName, + ibcExported.ModuleName, + icaTypes.ModuleName, + evidenceTypes.ModuleName, authzTypes.ModuleName, - feegrant.ModuleName, + feeGrantTypes.ModuleName, groupTypes.ModuleName, - paramstypes.ModuleName, - upgradetypes.ModuleName, - vestingtypes.ModuleName, + paramsTypes.ModuleName, + upgradeTypes.ModuleName, + vestingTypes.ModuleName, + consensusTypes.ModuleName, // this line is used by starport scaffolding # stargate/app/initGenesis poolTypes.ModuleName, @@ -757,9 +828,7 @@ func NewKYVEApp( // Uncomment if you want to set a custom migration order here. // app.mm.SetOrderMigrations(custom order) - 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) @@ -776,9 +845,8 @@ func NewKYVEApp( app.BankKeeper, app.FeeGrantKeeper, app.GlobalKeeper, - app.GovKeeper, app.IBCKeeper, - app.StakingKeeper, + *app.StakingKeeper, ante.DefaultSigVerificationGasConsumer, encodingConfig.TxConfig.SignModeHandler(), ) @@ -806,6 +874,12 @@ func NewKYVEApp( v1p4.CreateUpgradeHandler( app.mm, app.configurator, + appCodec, + app.ConsensusKeeper, + app.GlobalKeeper, + *app.GovKeeper, + *app.IBCKeeper, + app.ParamsKeeper, ), ) @@ -820,7 +894,7 @@ func NewKYVEApp( if loadLatest { if err := app.LoadLatestVersion(); err != nil { - tmos.Exit(err.Error()) + cmtOs.Exit(err.Error()) } } @@ -835,9 +909,6 @@ func NewKYVEApp( // Name returns the name of the App func (app *App) Name() string { return app.BaseApp.Name() } -// GetBaseApp returns the base app of the application -func (app App) GetBaseApp() *baseapp.BaseApp { return app.BaseApp } - // BeginBlocker application updates every begin block func (app *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { return app.mm.BeginBlock(ctx, req) @@ -848,10 +919,14 @@ func (app *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.Respo return app.mm.EndBlock(ctx, req) } +func (app *App) Configurator() module.Configurator { + return app.configurator +} + // InitChainer application update at chain initialization func (app *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { var genesisState GenesisState - if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil { + if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil { panic(err) } app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) @@ -868,7 +943,7 @@ func (app *App) LoadHeight(height int64) error { // NOTE: This is solely to be used for testing purposes as it may be desirable // for modules to register their own custom testing types. func (app *App) LegacyAmino() *codec.LegacyAmino { - return app.cdc + return app.legacyAmino } // AppCodec returns an app codec. @@ -884,55 +959,70 @@ func (app *App) InterfaceRegistry() types.InterfaceRegistry { return app.interfaceRegistry } +// TxConfig returns a TxConfig +func (app *App) TxConfig() client.TxConfig { + return app.txConfig +} + +// DefaultGenesis returns a default genesis from the registered AppModuleBasic's. +func (app *App) DefaultGenesis() map[string]json.RawMessage { + return ModuleBasics.DefaultGenesis(app.appCodec) +} + // GetKey returns the KVStoreKey for the provided store key. // // NOTE: This is solely to be used for testing purposes. -func (app *App) GetKey(storeKey string) *storetypes.KVStoreKey { +func (app *App) GetKey(storeKey string) *storeTypes.KVStoreKey { return app.keys[storeKey] } // GetTKey returns the TransientStoreKey for the provided store key. // // NOTE: This is solely to be used for testing purposes. -func (app *App) GetTKey(storeKey string) *storetypes.TransientStoreKey { +func (app *App) GetTKey(storeKey string) *storeTypes.TransientStoreKey { return app.tkeys[storeKey] } // GetMemKey returns the MemStoreKey for the provided mem key. // // NOTE: This is solely used for testing purposes. -func (app *App) GetMemKey(storeKey string) *storetypes.MemoryStoreKey { +func (app *App) GetMemKey(storeKey string) *storeTypes.MemoryStoreKey { return app.memKeys[storeKey] } // GetSubspace returns a param subspace for a given module name. // // NOTE: This is solely to be used for testing purposes. -func (app *App) GetSubspace(moduleName string) paramstypes.Subspace { +func (app *App) GetSubspace(moduleName string) paramsTypes.Subspace { subspace, _ := app.ParamsKeeper.GetSubspace(moduleName) return subspace } // RegisterAPIRoutes registers all application module routes with the provided // API server. -func (app *App) RegisterAPIRoutes(apiSvr *api.Server, _ config.APIConfig) { +func (app *App) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig) { clientCtx := apiSvr.ClientCtx // Register new tx routes from grpc-gateway. - authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) + authTx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) + // Register new tendermint queries routes from grpc-gateway. tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) + // Register node gRPC service for grpc-gateway. + node.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) + // Register grpc-gateway routes for all modules. ModuleBasics.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) - // register swagger API - apiSvr.Router.Handle("/swagger.yml", http.FileServer(http.FS(kyveDocs.Swagger))) - apiSvr.Router.HandleFunc("/", kyveDocs.Handler(Name, "/swagger.yml")) + // register swagger API from root so that other applications can override easily + if err := server.RegisterSwaggerAPI(apiSvr.ClientCtx, apiSvr.Router, apiConfig.Swagger); err != nil { + panic(err) + } } // RegisterTxService implements the Application.RegisterTxService method. func (app *App) RegisterTxService(clientCtx client.Context) { - authtx.RegisterTxService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.BaseApp.Simulate, app.interfaceRegistry) + authTx.RegisterTxService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.BaseApp.Simulate, app.interfaceRegistry) } // RegisterTendermintService implements the Application.RegisterTendermintService method. @@ -945,6 +1035,10 @@ func (app *App) RegisterTendermintService(clientCtx client.Context) { ) } +func (app *App) RegisterNodeService(clientCtx client.Context) { + node.RegisterNodeService(clientCtx, app.GRPCQueryRouter()) +} + // SimulationManager implements the SimulationApp interface. // NOTE: We simply return nil as we don't use the simulation manager anywhere. func (app *App) SimulationManager() *module.SimulationManager { return nil } diff --git a/app/export.go b/app/export.go index da4565e6..43dbad49 100644 --- a/app/export.go +++ b/app/export.go @@ -2,24 +2,25 @@ package app import ( "encoding/json" + "fmt" "log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - - servertypes "github.com/cosmos/cosmos-sdk/server/types" + cmtProto "github.com/cometbft/cometbft/proto/tendermint/types" + serverTypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" - slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + + // Slashing + slashingTypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + // Staking "github.com/cosmos/cosmos-sdk/x/staking" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) // ExportAppStateAndValidators exports the state of the application for a genesis // file. -func (app *App) ExportAppStateAndValidators( - forZeroHeight bool, jailAllowedAddrs []string, -) (servertypes.ExportedApp, error) { +func (app *App) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAddrs []string, 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()}) + ctx := app.NewContext(true, cmtProto.Header{Height: app.LastBlockHeight()}) // We export at last height + 1, because that's the height at which // Tendermint will start InitChain. @@ -29,22 +30,19 @@ func (app *App) 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 + return serverTypes.ExportedApp{}, err } validators, err := staking.WriteValidators(ctx, app.StakingKeeper) - if err != nil { - return servertypes.ExportedApp{}, err - } - return servertypes.ExportedApp{ + return serverTypes.ExportedApp{ AppState: appState, Validators: validators, Height: height, ConsensusParams: app.BaseApp.GetConsensusParams(ctx), - }, nil + }, err } // prepare for fresh start at zero height @@ -75,21 +73,22 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str /* Handle fee distribution state. */ // withdraw all validator commission - app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { - _, err := app.DistributionKeeper.WithdrawValidatorCommission(ctx, val.GetOperator()) - if err != nil { - panic(err) - } + app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingTypes.ValidatorI) (stop bool) { + _, _ = app.DistributionKeeper.WithdrawValidatorCommission(ctx, val.GetOperator()) return false }) // withdraw all delegator rewards dels := app.StakingKeeper.GetAllDelegations(ctx) for _, delegation := range dels { - _, err := app.DistributionKeeper.WithdrawDelegationRewards(ctx, delegation.GetDelegatorAddr(), delegation.GetValidatorAddr()) + valAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) if err != nil { panic(err) } + + delAddr := sdk.MustAccAddressFromBech32(delegation.DelegatorAddress) + + _, _ = app.DistributionKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr) } // clear validator slash events @@ -103,15 +102,14 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str ctx = ctx.WithBlockHeight(0) // reinitialize all validators - app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { + app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingTypes.ValidatorI) (stop bool) { // donate any unwithdrawn outstanding reward fraction tokens to the community pool scraps := app.DistributionKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator()) feePool := app.DistributionKeeper.GetFeePool(ctx) feePool.CommunityPool = feePool.CommunityPool.Add(scraps...) app.DistributionKeeper.SetFeePool(ctx, feePool) - err := app.DistributionKeeper.Hooks().AfterValidatorCreated(ctx, val.GetOperator()) - if err != nil { + if err := app.DistributionKeeper.Hooks().AfterValidatorCreated(ctx, val.GetOperator()); err != nil { panic(err) } return false @@ -119,13 +117,20 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str // reinitialize all delegations for _, del := range dels { - err := app.DistributionKeeper.Hooks().BeforeDelegationCreated(ctx, del.GetDelegatorAddr(), del.GetValidatorAddr()) + valAddr, err := sdk.ValAddressFromBech32(del.ValidatorAddress) if err != nil { panic(err) } - err = app.DistributionKeeper.Hooks().AfterDelegationModified(ctx, del.GetDelegatorAddr(), del.GetValidatorAddr()) - if err != nil { - panic(err) + delAddr := sdk.MustAccAddressFromBech32(del.DelegatorAddress) + + if err := app.DistributionKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr); err != nil { + // never called as BeforeDelegationCreated always returns nil + panic(fmt.Errorf("error while incrementing period: %w", err)) + } + + if err := app.DistributionKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr); err != nil { + // never called as AfterDelegationModified always returns nil + panic(fmt.Errorf("error while creating a new delegation period record: %w", err)) } } @@ -135,7 +140,7 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str /* Handle staking state. */ // iterate through redelegations, reset creation height - app.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) { + app.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingTypes.Redelegation) (stop bool) { for i := range red.Entries { red.Entries[i].CreationHeight = 0 } @@ -144,7 +149,7 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str }) // iterate through unbonding delegations, reset creation height - app.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) { + app.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingTypes.UnbondingDelegation) (stop bool) { for i := range ubd.Entries { ubd.Entries[i].CreationHeight = 0 } @@ -154,12 +159,12 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str // Iterate through validators by power descending, reset bond heights, and // update bond intra-tx counters. - store := ctx.KVStore(app.keys[stakingtypes.StoreKey]) - iter := sdk.KVStoreReversePrefixIterator(store, stakingtypes.ValidatorsKey) + store := ctx.KVStore(app.GetKey(stakingTypes.StoreKey)) + iter := sdk.KVStoreReversePrefixIterator(store, stakingTypes.ValidatorsKey) counter := int16(0) for ; iter.Valid(); iter.Next() { - addr := sdk.ValAddress(iter.Key()[1:]) + addr := sdk.ValAddress(stakingTypes.AddressFromValidatorsKey(iter.Key())) validator, found := app.StakingKeeper.GetValidator(ctx, addr) if !found { panic("expected validator, not found") @@ -174,10 +179,14 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str counter++ } - iter.Close() + if err := iter.Close(); err != nil { + app.Logger().Error("error while closing the key-value store reverse prefix iterator: ", err) + return + } - if _, err := app.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx); err != nil { - panic(err) + _, err := app.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) + if err != nil { + log.Fatal(err) } /* Handle slashing state. */ @@ -185,7 +194,7 @@ func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []str // reset start height on signing infos app.SlashingKeeper.IterateValidatorSigningInfos( ctx, - func(addr sdk.ConsAddress, info slashingtypes.ValidatorSigningInfo) (stop bool) { + func(addr sdk.ConsAddress, info slashingTypes.ValidatorSigningInfo) (stop bool) { info.StartHeight = 0 app.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info) return false diff --git a/app/keepers.go b/app/keepers.go index 0f397ee8..3959e0bb 100644 --- a/app/keepers.go +++ b/app/keepers.go @@ -16,6 +16,8 @@ import ( bundlesKeeper "github.com/KYVENetwork/chain/x/bundles/keeper" // Capability capabilityKeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" + // Consensus + consensusKeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" // Crisis crisisKeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper" crisisTypes "github.com/cosmos/cosmos-sdk/x/crisis/types" @@ -33,31 +35,30 @@ import ( // Governance 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" // Group groupKeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" - // IBC - ibcHost "github.com/cosmos/ibc-go/v6/modules/core/24-host" - ibcKeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" + // IBC Core + ibcExported "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibcKeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" // IBC Fee - ibcFeeKeeper "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/keeper" + ibcFeeKeeper "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper" // IBC Transfer - ibcTransferKeeper "github.com/cosmos/ibc-go/v6/modules/apps/transfer/keeper" - ibcTransferTypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + ibcTransferKeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + ibcTransferTypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" // ICA Controller - 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" + 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" // ICA Host - 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" + 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" // Mint mintKeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" mintTypes "github.com/cosmos/cosmos-sdk/x/mint/types" // Parameters paramsKeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" // PFM - pfmKeeper "github.com/strangelove-ventures/packet-forward-middleware/v6/router/keeper" - pfmTypes "github.com/strangelove-ventures/packet-forward-middleware/v6/router/types" + pfmKeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper" + pfmTypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" // Pool poolKeeper "github.com/KYVENetwork/chain/x/pool/keeper" // Query @@ -82,17 +83,18 @@ type Keepers struct { AuthzKeeper authzKeeper.Keeper BankKeeper bankKeeper.Keeper CapabilityKeeper *capabilityKeeper.Keeper - CrisisKeeper crisisKeeper.Keeper + ConsensusKeeper consensusKeeper.Keeper + CrisisKeeper *crisisKeeper.Keeper DistributionKeeper distributionKeeper.Keeper - EvidenceKeeper evidenceKeeper.Keeper + EvidenceKeeper *evidenceKeeper.Keeper FeeGrantKeeper feeGrantKeeper.Keeper - GovKeeper govKeeper.Keeper + GovKeeper *govKeeper.Keeper GroupKeeper groupKeeper.Keeper MintKeeper mintKeeper.Keeper ParamsKeeper paramsKeeper.Keeper SlashingKeeper slashingKeeper.Keeper - StakingKeeper stakingKeeper.Keeper - UpgradeKeeper upgradeKeeper.Keeper + StakingKeeper *stakingKeeper.Keeper + UpgradeKeeper *upgradeKeeper.Keeper // IBC IBCKeeper *ibcKeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly @@ -127,12 +129,12 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino keeper.Subspace(bankTypes.ModuleName) keeper.Subspace(crisisTypes.ModuleName) keeper.Subspace(distributionTypes.ModuleName) - keeper.Subspace(govTypes.ModuleName).WithKeyTable(govV1.ParamKeyTable()) + keeper.Subspace(govTypes.ModuleName) keeper.Subspace(mintTypes.ModuleName) keeper.Subspace(slashingTypes.ModuleName) keeper.Subspace(stakingTypes.ModuleName) - keeper.Subspace(ibcHost.ModuleName) + keeper.Subspace(ibcExported.ModuleName) keeper.Subspace(ibcTransferTypes.ModuleName) keeper.Subspace(icaControllerTypes.SubModuleName) keeper.Subspace(icaHostTypes.SubModuleName) diff --git a/app/modules.go b/app/modules.go index 334c0819..a94366f3 100644 --- a/app/modules.go +++ b/app/modules.go @@ -16,6 +16,8 @@ import ( bundlesTypes "github.com/KYVENetwork/chain/x/bundles/types" // Capability "github.com/cosmos/cosmos-sdk/x/capability" + // Consensus + "github.com/cosmos/cosmos-sdk/x/consensus" // Crisis "github.com/cosmos/cosmos-sdk/x/crisis" // Delegation @@ -34,27 +36,33 @@ import ( "github.com/KYVENetwork/chain/x/global" // Governance "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" // Group group "github.com/cosmos/cosmos-sdk/x/group/module" - // IBC - ibc "github.com/cosmos/ibc-go/v6/modules/core" + // IBC Core + ibc "github.com/cosmos/ibc-go/v7/modules/core" + ibcClient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" + // IBC Light Clients + ibcSm "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" + ibcTm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" // IBC Fee - ibcFee "github.com/cosmos/ibc-go/v6/modules/apps/29-fee" - ibcFeeTypes "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/types" + ibcFee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" + ibcFeeTypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" // IBC Transfer - ibcTransfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer" - ibcTransferTypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + ibcTransfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + ibcTransferTypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" // ICA - 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" + 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" // Mint "github.com/cosmos/cosmos-sdk/x/mint" mintTypes "github.com/cosmos/cosmos-sdk/x/mint/types" // Parameters "github.com/cosmos/cosmos-sdk/x/params" + paramsClient "github.com/cosmos/cosmos-sdk/x/params/client" // PFM - pfm "github.com/strangelove-ventures/packet-forward-middleware/v6/router" + pfm "github.com/strangelove-ventures/packet-forward-middleware/v7/router" // Pool "github.com/KYVENetwork/chain/x/pool" poolTypes "github.com/KYVENetwork/chain/x/pool/types" @@ -73,6 +81,7 @@ import ( teamTypes "github.com/KYVENetwork/chain/x/team/types" // Upgrade "github.com/cosmos/cosmos-sdk/x/upgrade" + upgradeClient "github.com/cosmos/cosmos-sdk/x/upgrade/client" ) // appModuleBasics returns ModuleBasics for the module BasicManager. @@ -82,12 +91,19 @@ var appModuleBasics = []module.AppModuleBasic{ authz.AppModuleBasic{}, bank.AppModuleBasic{}, capability.AppModuleBasic{}, + consensus.AppModuleBasic{}, crisis.AppModuleBasic{}, distribution.AppModuleBasic{}, evidence.AppModuleBasic{}, feeGrant.AppModuleBasic{}, genutil.AppModuleBasic{}, - gov.NewAppModuleBasic(getGovProposalHandlers()), + gov.NewAppModuleBasic([]govClient.ProposalHandler{ + paramsClient.ProposalHandler, + upgradeClient.LegacyProposalHandler, + upgradeClient.LegacyCancelProposalHandler, + ibcClient.UpdateClientProposalHandler, + ibcClient.UpgradeProposalHandler, + }), group.AppModuleBasic{}, mint.AppModuleBasic{}, params.AppModuleBasic{}, @@ -98,6 +114,8 @@ var appModuleBasics = []module.AppModuleBasic{ // IBC ibc.AppModuleBasic{}, + ibcSm.AppModuleBasic{}, + ibcTm.AppModuleBasic{}, ibcFee.AppModuleBasic{}, ibcTransfer.AppModuleBasic{}, ica.AppModuleBasic{}, @@ -147,7 +165,7 @@ func (app *App) BlockedModuleAccountAddrs() map[string]bool { // ModuleAccountAddrs returns all the app's module account addresses. func (app *App) ModuleAccountAddrs() map[string]bool { modAccAddrs := make(map[string]bool) - for acc := range maccPerms { + for acc := range moduleAccountPermissions { modAccAddrs[authTypes.NewModuleAddress(acc).String()] = true } diff --git a/app/test_helpers.go b/app/test_helpers.go index e5e9a097..b5197829 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -4,81 +4,88 @@ import ( "encoding/json" "time" - globalTypes "github.com/KYVENetwork/chain/x/global/types" - - teamTypes "github.com/KYVENetwork/chain/x/team/types" - "cosmossdk.io/math" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + cmtProto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtTypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - codectypes "github.com/cosmos/cosmos-sdk/codec/types" - cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" + codecTypes "github.com/cosmos/cosmos-sdk/codec/types" + cryptoCodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" - "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/mock" 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" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" - - tmtypes "github.com/tendermint/tendermint/types" + + // Auth + authTypes "github.com/cosmos/cosmos-sdk/x/auth/types" + // Bank + bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" + // Global + globalTypes "github.com/KYVENetwork/chain/x/global/types" + // Staking + stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" + // Team + teamTypes "github.com/KYVENetwork/chain/x/team/types" ) // DefaultConsensusParams ... -var DefaultConsensusParams = &abci.ConsensusParams{ - Block: &abci.BlockParams{ +var DefaultConsensusParams = &cmtProto.ConsensusParams{ + Block: &cmtProto.BlockParams{ MaxBytes: 200000, MaxGas: -1, // no limit }, - Evidence: &tmproto.EvidenceParams{ + Evidence: &cmtProto.EvidenceParams{ MaxAgeNumBlocks: 302400, MaxAgeDuration: 504 * time.Hour, // 3 weeks is the max duration MaxBytes: 10000, }, - Validator: &tmproto.ValidatorParams{ + Validator: &cmtProto.ValidatorParams{ PubKeyTypes: []string{ - tmtypes.ABCIPubKeyTypeEd25519, + cmtTypes.ABCIPubKeyTypeEd25519, }, }, } +type EmptyAppOptions struct{} + +func (ao EmptyAppOptions) Get(_ string) interface{} { return nil } + func DefaultGenesisWithValSet(codec codec.Codec) map[string]json.RawMessage { bondingDenom := globalTypes.Denom // Generate a new validator. key, _ := mock.NewPV().GetPubKey() - validator := tmtypes.NewValidator(key, 1) + validator := cmtTypes.NewValidator(key, 1) - publicKey, _ := cryptocodec.FromTmPubKeyInterface(validator.PubKey) - publicKeyAny, _ := codectypes.NewAnyWithValue(publicKey) + publicKey, _ := cryptoCodec.FromTmPubKeyInterface(validator.PubKey) + publicKeyAny, _ := codecTypes.NewAnyWithValue(publicKey) - validators := []stakingtypes.Validator{ + validators := []stakingTypes.Validator{ { OperatorAddress: sdk.ValAddress(validator.Address).String(), ConsensusPubkey: publicKeyAny, Jailed: false, - Status: stakingtypes.Bonded, + Status: stakingTypes.Bonded, Tokens: sdk.DefaultPowerReduction, DelegatorShares: sdk.OneDec(), - Description: stakingtypes.Description{}, + Description: stakingTypes.Description{}, UnbondingHeight: 0, UnbondingTime: time.Unix(0, 0).UTC(), - Commission: stakingtypes.NewCommission(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()), + Commission: stakingTypes.NewCommission(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()), MinSelfDelegation: math.ZeroInt(), }, } // Generate a new delegator. delegatorKey := secp256k1.GenPrivKey() - delegator := authtypes.NewBaseAccount( + delegator := authTypes.NewBaseAccount( delegatorKey.PubKey().Address().Bytes(), delegatorKey.PubKey(), 0, 0, ) - delegations := []stakingtypes.Delegation{ - stakingtypes.NewDelegation(delegator.GetAddress(), validator.Address.Bytes(), sdk.OneDec()), + delegations := []stakingTypes.Delegation{ + stakingTypes.NewDelegation(delegator.GetAddress(), validator.Address.Bytes(), sdk.OneDec()), } // Default genesis state. @@ -86,32 +93,32 @@ func DefaultGenesisWithValSet(codec codec.Codec) map[string]json.RawMessage { genesisState := ModuleBasics.DefaultGenesis(config.Marshaler) // Update x/auth state. - authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), []authtypes.GenesisAccount{delegator}) - genesisState[authtypes.ModuleName] = codec.MustMarshalJSON(authGenesis) + authGenesis := authTypes.NewGenesisState(authTypes.DefaultParams(), []authTypes.GenesisAccount{delegator}) + genesisState[authTypes.ModuleName] = codec.MustMarshalJSON(authGenesis) // Update x/bank state. bondedCoins := sdk.NewCoins(sdk.NewCoin(bondingDenom, sdk.DefaultPowerReduction)) teamCoins := sdk.NewCoins(sdk.NewInt64Coin(globalTypes.Denom, int64(teamTypes.TEAM_ALLOCATION))) - bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, []banktypes.Balance{ + bankGenesis := bankTypes.NewGenesisState(bankTypes.DefaultGenesisState().Params, []bankTypes.Balance{ { - Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(), + Address: authTypes.NewModuleAddress(stakingTypes.BondedPoolName).String(), Coins: bondedCoins, }, { - Address: authtypes.NewModuleAddress(teamTypes.ModuleName).String(), + Address: authTypes.NewModuleAddress(teamTypes.ModuleName).String(), Coins: teamCoins, }, - }, bondedCoins.Add(sdk.NewInt64Coin(globalTypes.Denom, int64(teamTypes.TEAM_ALLOCATION))), []banktypes.Metadata{}) - genesisState[banktypes.ModuleName] = codec.MustMarshalJSON(bankGenesis) + }, bondedCoins.Add(sdk.NewInt64Coin(globalTypes.Denom, int64(teamTypes.TEAM_ALLOCATION))), []bankTypes.Metadata{}, []bankTypes.SendEnabled{}) + genesisState[bankTypes.ModuleName] = codec.MustMarshalJSON(bankGenesis) // Update x/staking state. - stakingParams := stakingtypes.DefaultParams() + stakingParams := stakingTypes.DefaultParams() stakingParams.BondDenom = bondingDenom - stakingGenesis := stakingtypes.NewGenesisState(stakingParams, validators, delegations) - genesisState[stakingtypes.ModuleName] = codec.MustMarshalJSON(stakingGenesis) + stakingGenesis := stakingTypes.NewGenesisState(stakingParams, validators, delegations) + genesisState[stakingTypes.ModuleName] = codec.MustMarshalJSON(stakingGenesis) // Return. return genesisState @@ -121,11 +128,12 @@ func DefaultGenesisWithValSet(codec codec.Codec) map[string]json.RawMessage { func Setup() *App { db := dbm.NewMemDB() - config := MakeEncodingConfig() + // config := MakeEncodingConfig() setPrefixes("kyve") - app := NewKYVEApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, config, simapp.EmptyAppOptions{}) + // app := NewKYVEApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, config, EmptyAppOptions{}) + app := NewKYVEApp(log.NewNopLogger(), db, nil, true, EmptyAppOptions{}, baseapp.SetChainID("kyve-test")) // init chain must be called to stop deliverState from being nil genesisState := DefaultGenesisWithValSet(app.AppCodec()) diff --git a/app/upgrades/v1_4/constants.go b/app/upgrades/v1_4/constants.go index 4f8b6010..a5a0e6e8 100644 --- a/app/upgrades/v1_4/constants.go +++ b/app/upgrades/v1_4/constants.go @@ -8,3 +8,19 @@ const TestnetChainID = "kaon-1" // MainnetChainID is the Chain ID of the KYVE mainnet. const MainnetChainID = "kyve-1" + +// TestnetProposers is a mapping between Proposal ID and Proposer Address for +// the KYVE testnet (Kaon). +var TestnetProposers = map[uint64]string{ + 1: "kyve1qfnu3k5vwgfyzsaqe0w4ssqp99delgtg2qz0jc", + 2: "kyve1qfnu3k5vwgfyzsaqe0w4ssqp99delgtg2qz0jc", + 3: "kyve1qfnu3k5vwgfyzsaqe0w4ssqp99delgtg2qz0jc", + 4: "kyve1qfnu3k5vwgfyzsaqe0w4ssqp99delgtg2qz0jc", +} + +// MainnetProposers is a mapping between Proposal ID and Proposer Address for +// the KYVE mainnet. +var MainnetProposers = map[uint64]string{ + 1: "kyve1afu42029ujjcja4yry3rx6x43k33k88ep5wvjz", + 2: "kyve1afu42029ujjcja4yry3rx6x43k33k88ep5wvjz", +} diff --git a/app/upgrades/v1_4/store.go b/app/upgrades/v1_4/store.go index a52d207f..95ef9d11 100644 --- a/app/upgrades/v1_4/store.go +++ b/app/upgrades/v1_4/store.go @@ -4,13 +4,20 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" storeTypes "github.com/cosmos/cosmos-sdk/store/types" + // Consensus + consensusTypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + // Crisis + crisisTypes "github.com/cosmos/cosmos-sdk/x/crisis/types" + // Upgrade upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader { storeUpgrades := storeTypes.StoreUpgrades{ - Added: []string{}, + Added: []string{ + consensusTypes.StoreKey, crisisTypes.StoreKey, + }, } return upgradeTypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades) diff --git a/app/upgrades/v1_4/upgrade.go b/app/upgrades/v1_4/upgrade.go index 193c9393..25014a7d 100644 --- a/app/upgrades/v1_4/upgrade.go +++ b/app/upgrades/v1_4/upgrade.go @@ -1,9 +1,33 @@ package v1_4 import ( + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" 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" + distributionTypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govTypes "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" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibcTmMigrations "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint/migrations" + // Consensus + consensusKeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" + // Global + globalKeeper "github.com/KYVENetwork/chain/x/global/keeper" + // Governance + govKeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" + // IBC Core + ibcKeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + + // Params + paramsKeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" // Upgrade upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) @@ -11,11 +35,87 @@ import ( func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, + cdc codec.BinaryCodec, + consensusKeeper consensusKeeper.Keeper, + globalKeeper globalKeeper.Keeper, + govKeeper govKeeper.Keeper, + ibcKeeper ibcKeeper.Keeper, + paramsKeeper paramsKeeper.Keeper, ) upgradeTypes.UpgradeHandler { return func(ctx sdk.Context, _ upgradeTypes.Plan, vm module.VersionMap) (module.VersionMap, error) { logger := ctx.Logger().With("upgrade", UpgradeName) logger.Info("Run v1.4 upgrade") - return mm.RunMigrations(ctx, configurator, vm) + distributionSpace, _ := paramsKeeper.GetSubspace("distribution") + distributionSpace.WithKeyTable(distributionTypes.ParamKeyTable()) + + stakingSpace, _ := paramsKeeper.GetSubspace("staking") + stakingSpace.WithKeyTable(stakingTypes.ParamKeyTable()) + + authSpace, _ := paramsKeeper.GetSubspace("auth") + authSpace.WithKeyTable(authTypes.ParamKeyTable()) + + bankSpace, _ := paramsKeeper.GetSubspace("bank") + bankSpace.WithKeyTable(bankTypes.ParamKeyTable()) + + crisisSpace, _ := paramsKeeper.GetSubspace("crisis") + crisisSpace.WithKeyTable(crisisTypes.ParamKeyTable()) + + govSpace, _ := paramsKeeper.GetSubspace("gov") + govSpace.WithKeyTable(govTypes.ParamKeyTable()) + + mintSpace, _ := paramsKeeper.GetSubspace("mint") + mintSpace.WithKeyTable(mintTypes.ParamKeyTable()) + + slashingSpace, _ := paramsKeeper.GetSubspace("slashing") + slashingSpace.WithKeyTable(slashingTypes.ParamKeyTable()) + + // Migrate consensus parameters from x/params to dedicated x/consensus module. + baseAppSubspace := paramsKeeper.Subspace(baseapp.Paramspace). + WithKeyTable(paramsTypes.ConsensusParamsKeyTable()) + baseapp.MigrateParams(ctx, baseAppSubspace, &consensusKeeper) + + var err error + + // ibc-go v7.0 to v7.1 upgrade + // explicitly update the IBC 02-client params, adding the localhost client type + params := ibcKeeper.ClientKeeper.GetParams(ctx) + params.AllowedClients = append(params.AllowedClients, exported.Localhost) + ibcKeeper.ClientKeeper.SetParams(ctx, params) + + // Run module migrations. + vm, err = mm.RunMigrations(ctx, configurator, vm) + if err != nil { + return vm, err + } + + // Prune expired Tendermint consensus states. + _, err = ibcTmMigrations.PruneExpiredConsensusStates(ctx, cdc, ibcKeeper.ClientKeeper) + if err != nil { + return vm, err + } + + // Migrate initial deposit ratio. + err = migrateInitialDepositRatio(ctx, globalKeeper, govKeeper) + if err != nil { + return vm, err + } + + return vm, nil } } + +// migrateInitialDepositRatio migrates the MinInitialDepositRatio parameter from +// our custom x/global module to the x/gov module. +func migrateInitialDepositRatio( + ctx sdk.Context, + globalKeeper globalKeeper.Keeper, + govKeeper govKeeper.Keeper, +) error { + minInitialDepositRatio := globalKeeper.GetMinInitialDepositRatio(ctx) + + params := govKeeper.GetParams(ctx) + params.MinInitialDepositRatio = minInitialDepositRatio.String() + + return govKeeper.SetParams(ctx, params) +} diff --git a/cmd/kyved/app_creator.go b/cmd/kyved/app_creator.go index e8820c0c..06cd887d 100644 --- a/cmd/kyved/app_creator.go +++ b/cmd/kyved/app_creator.go @@ -3,20 +3,14 @@ package main import ( "errors" "io" - "path/filepath" kyveApp "github.com/KYVENetwork/chain/app" - "github.com/cosmos/cosmos-sdk/baseapp" + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server" serverTypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/snapshots" - snapshotsTypes "github.com/cosmos/cosmos-sdk/snapshots/types" - "github.com/cosmos/cosmos-sdk/store" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/spf13/cast" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" + "github.com/spf13/viper" ) // appCreator is a wrapper for EncodingConfig. @@ -29,55 +23,10 @@ func (ac appCreator) createApp( traceStore io.Writer, appOpts serverTypes.AppOptions, ) serverTypes.Application { - var cache sdk.MultiStorePersistentCache - - if cast.ToBool(appOpts.Get(server.FlagInterBlockCache)) { - cache = store.NewCommitKVStoreCacheManager() - } - - skipUpgradeHeights := make(map[int64]bool) - for _, h := range cast.ToIntSlice(appOpts.Get(server.FlagUnsafeSkipUpgrades)) { - skipUpgradeHeights[int64(h)] = true - } - - pruningOpts, err := server.GetPruningOptionsFromFlags(appOpts) - if err != nil { - panic(err) - } - - snapshotDir := filepath.Join(cast.ToString(appOpts.Get(flags.FlagHome)), "data", "snapshots") - snapshotDB, err := dbm.NewDB("metadata", dbm.GoLevelDBBackend, snapshotDir) - if err != nil { - panic(err) - } - snapshotStore, err := snapshots.NewStore(snapshotDB, snapshotDir) - if err != nil { - panic(err) - } - - snapshotOptions := snapshotsTypes.NewSnapshotOptions( - cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval)), - cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent)), - ) - return kyveApp.NewKYVEApp( - logger, db, traceStore, true, skipUpgradeHeights, - cast.ToString(appOpts.Get(flags.FlagHome)), - cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), - ac.encodingConfig, + logger, db, traceStore, true, appOpts, - baseapp.SetPruning(pruningOpts), - baseapp.SetMinGasPrices(cast.ToString(appOpts.Get(server.FlagMinGasPrices))), - baseapp.SetMinRetainBlocks(cast.ToUint64(appOpts.Get(server.FlagMinRetainBlocks))), - baseapp.SetHaltHeight(cast.ToUint64(appOpts.Get(server.FlagHaltHeight))), - baseapp.SetHaltTime(cast.ToUint64(appOpts.Get(server.FlagHaltTime))), - baseapp.SetMinRetainBlocks(cast.ToUint64(appOpts.Get(server.FlagMinRetainBlocks))), - baseapp.SetInterBlockCache(cache), - baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))), - baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))), - baseapp.SetSnapshot(snapshotStore, snapshotOptions), - baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))), - baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode))), + server.DefaultBaseappOptions(appOpts)..., ) } @@ -87,31 +36,37 @@ func (ac appCreator) exportApp( traceStore io.Writer, height int64, forZeroHeight bool, - jailWhiteList []string, + jailAllowedAddrs []string, appOpts serverTypes.AppOptions, + modulesToExport []string, ) (serverTypes.ExportedApp, error) { + var app *kyveApp.App + + // this check is necessary as we use the flag in x/upgrade. + // we can exit more gracefully by checking the flag here. homePath, ok := appOpts.Get(flags.FlagHome).(string) if !ok || homePath == "" { return serverTypes.ExportedApp{}, errors.New("application home not set") } - app := kyveApp.NewKYVEApp( - logger, - db, - traceStore, - height == -1, // -1 means no height is provided - map[int64]bool{}, - homePath, - uint(1), - ac.encodingConfig, - appOpts, - ) + viperAppOpts, ok := appOpts.(*viper.Viper) + if !ok { + return serverTypes.ExportedApp{}, errors.New("appOpts is not viper.Viper") + } + + // overwrite the FlagInvCheckPeriod + viperAppOpts.Set(server.FlagInvCheckPeriod, 1) + appOpts = viperAppOpts if height != -1 { + app = kyveApp.NewKYVEApp(logger, db, traceStore, false, appOpts) + if err := app.LoadHeight(height); err != nil { return serverTypes.ExportedApp{}, err } + } else { + app = kyveApp.NewKYVEApp(logger, db, traceStore, true, appOpts) } - return app.ExportAppStateAndValidators(forZeroHeight, jailWhiteList) + return app.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) } diff --git a/cmd/kyved/config.go b/cmd/kyved/config.go index 35df4c1d..032dded0 100644 --- a/cmd/kyved/config.go +++ b/cmd/kyved/config.go @@ -4,9 +4,9 @@ import ( "fmt" globalTypes "github.com/KYVENetwork/chain/x/global/types" + tmCfg "github.com/cometbft/cometbft/config" serverCfg "github.com/cosmos/cosmos-sdk/server/config" sdk "github.com/cosmos/cosmos-sdk/types" - tmCfg "github.com/tendermint/tendermint/config" ) func initAppConfig() (string, *serverCfg.Config) { diff --git a/cmd/kyved/root.go b/cmd/kyved/root.go index 2b1c84f8..57d3c0d5 100644 --- a/cmd/kyved/root.go +++ b/cmd/kyved/root.go @@ -7,8 +7,7 @@ import ( "time" kyveApp "github.com/KYVENetwork/chain/app" - globalTypes "github.com/KYVENetwork/chain/x/global/types" - teamTypes "github.com/KYVENetwork/chain/x/team/types" + tmCli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" "github.com/cosmos/cosmos-sdk/client/debug" @@ -19,7 +18,6 @@ import ( "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - tmCli "github.com/tendermint/tendermint/libs/cli" // Auth authCli "github.com/cosmos/cosmos-sdk/x/auth/client/cli" @@ -30,6 +28,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" // GenUtil genUtilCli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" + genUtilTypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + // Global + globalTypes "github.com/KYVENetwork/chain/x/global/types" + // Team + teamTypes "github.com/KYVENetwork/chain/x/team/types" ) // NewRootCmd creates a new root command for the KYVE chain daemon. @@ -41,7 +44,6 @@ func NewRootCmd(encodingConfig kyveApp.EncodingConfig) *cobra.Command { WithLegacyAmino(encodingConfig.Amino). WithInput(os.Stdin). WithAccountRetriever(authTypes.AccountRetriever{}). - WithBroadcastMode(flags.BroadcastBlock). WithHomeDir(kyveApp.DefaultNodeHome). WithViper("KYVE") @@ -86,7 +88,8 @@ func NewRootCmd(encodingConfig kyveApp.EncodingConfig) *cobra.Command { rootCmd.AddCommand( genUtilCli.InitCmd(kyveApp.ModuleBasics, kyveApp.DefaultNodeHome), - genUtilCli.CollectGenTxsCmd(bankTypes.GenesisBalancesIterator{}, kyveApp.DefaultNodeHome), + // TODO(@john): Investigate why the one directly from the module is nil. + genUtilCli.CollectGenTxsCmd(bankTypes.GenesisBalancesIterator{}, kyveApp.DefaultNodeHome, genUtilTypes.DefaultMessageValidator), genUtilCli.MigrateGenesisCmd(), genUtilCli.GenTxCmd( kyveApp.ModuleBasics, diff --git a/docs/swagger.yml b/docs/swagger.yml index 73cef6ff..ad6f0ddf 100644 --- a/docs/swagger.yml +++ b/docs/swagger.yml @@ -4425,63 +4425,65 @@ paths: description: gov_params ... type: object properties: - voting_params: - description: voting_params defines the parameters related to voting. - type: object - properties: - voting_period: - type: string - description: Length of the voting period. - deposit_params: - description: deposit_params defines the parameters related to deposit. - type: object - properties: - min_deposit: - type: array - items: - type: object - properties: - denom: - type: string - amount: - type: string - description: >- - Coin defines a token with a denomination and an - amount. + min_deposit: + type: array + items: + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + Coin defines a token with a denomination and an amount. - NOTE: The amount field is an Int which implements - the custom method + NOTE: The amount field is an Int which implements the + custom method - signatures required by gogoproto. - description: Minimum deposit for a proposal to enter voting period. - max_deposit_period: - type: string - description: >- - Maximum period for Atom holders to deposit on a - proposal. Initial value: 2 - months. - tally_params: - description: tally_params defines the parameters related to tally. - type: object - properties: - quorum: - type: string - description: >- - Minimum percentage of total stake needed to vote for a - result to be - considered valid. - threshold: - type: string - description: >- - Minimum proportion of Yes votes for proposal to pass. - Default value: 0.5. - veto_threshold: - type: string - description: >- - Minimum value of Veto votes to Total votes ratio for - proposal to be - vetoed. Default value: 1/3. + signatures required by gogoproto. + description: Minimum deposit for a proposal to enter voting period. + max_deposit_period: + type: string + description: >- + Maximum period for Atom holders to deposit on a proposal. + Initial value: 2 + + months. + voting_period: + type: string + description: Duration of the voting period. + quorum: + type: string + description: >- + Minimum percentage of total stake needed to vote for a + result to be + considered valid. + threshold: + type: string + description: >- + Minimum proportion of Yes votes for proposal to pass. + Default value: 0.5. + veto_threshold: + type: string + description: >- + Minimum value of Veto votes to Total votes ratio for + proposal to be + vetoed. Default value: 1/3. + min_initial_deposit_ratio: + type: string + description: >- + The ratio representing the proportion of the deposit value + that must be paid at proposal submission. + burn_vote_quorum: + type: boolean + title: burn deposits if a proposal does not meet quorum + burn_proposal_deposit_prevote: + type: boolean + title: burn deposits if the proposal does not enter voting period + burn_vote_veto: + type: boolean + title: burn deposits if quorum with vote type no_veto is met stakers_params: description: stakers_params ... type: object diff --git a/go.mod b/go.mod index fecfc2b0..5c5bc07b 100644 --- a/go.mod +++ b/go.mod @@ -3,57 +3,61 @@ module github.com/KYVENetwork/chain go 1.20 require ( - cosmossdk.io/errors v1.0.0-beta.7 - cosmossdk.io/math v1.0.0-rc.0 - github.com/cosmos/cosmos-proto v1.0.0-alpha8 - github.com/cosmos/cosmos-sdk v0.46.13 - github.com/cosmos/gogoproto v1.4.2 - github.com/cosmos/ibc-go/v6 v6.1.1 + cosmossdk.io/errors v1.0.0 + cosmossdk.io/math v1.1.2 + github.com/cometbft/cometbft v0.37.2 + github.com/cometbft/cometbft-db v0.8.0 + github.com/cosmos/cosmos-proto v1.0.0-beta.2 + github.com/cosmos/cosmos-sdk v0.47.5 + github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-go/v7 v7.3.0 github.com/ethereum/go-ethereum v1.10.22 - github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.3 github.com/golangci/golangci-lint v1.52.2 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/onsi/ginkgo/v2 v2.8.0 github.com/onsi/gomega v1.26.0 - github.com/spf13/cast v1.5.0 - github.com/spf13/cobra v1.6.1 - github.com/strangelove-ventures/packet-forward-middleware/v6 v6.0.3 - github.com/stretchr/testify v1.8.2 - github.com/tendermint/tendermint v0.34.28 - github.com/tendermint/tm-db v0.6.7 - google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 - google.golang.org/grpc v1.54.0 + github.com/spf13/cast v1.5.1 + github.com/spf13/cobra v1.7.0 + github.com/spf13/viper v1.16.0 + github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f + github.com/stretchr/testify v1.8.4 + google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 + google.golang.org/grpc v1.56.2 mvdan.cc/gofumpt v0.5.0 ) require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect 4d63.com/gochecknoglobals v0.2.1 // indirect - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.18.0 // indirect + cloud.google.com/go v0.110.4 // indirect + cloud.google.com/go/compute v1.20.1 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.12.0 // indirect - cloud.google.com/go/storage v1.28.1 // indirect - filippo.io/edwards25519 v1.0.0-rc.1 // indirect + cloud.google.com/go/iam v1.1.0 // indirect + cloud.google.com/go/storage v1.30.1 // indirect + cosmossdk.io/api v0.3.1 // indirect + cosmossdk.io/core v0.5.1 // indirect + cosmossdk.io/depinject v1.0.0-alpha.4 // indirect + cosmossdk.io/log v1.2.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.1 // indirect github.com/Abirdcfly/dupword v0.0.11 // indirect github.com/Antonboom/errname v0.1.9 // indirect github.com/Antonboom/nilnil v0.1.3 // indirect github.com/BurntSushi/toml v1.2.1 // indirect - github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect + github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/OpenPeeDeeP/depguard v1.1.1 // indirect - github.com/Workiva/go-datastructures v1.0.53 // indirect github.com/alexkohler/prealloc v1.0.0 // indirect github.com/alingse/asasalint v0.0.11 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/ashanbrown/forbidigo v1.5.1 // indirect github.com/ashanbrown/makezero v1.1.1 // indirect - github.com/aws/aws-sdk-go v1.40.45 // 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 @@ -69,17 +73,21 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/charithe/durationcheck v0.0.10 // indirect github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // 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/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/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/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.6 // indirect + github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/iavl v0.20.0 // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect - github.com/creachadair/taskgroup v0.3.2 // indirect + github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect + github.com/creachadair/taskgroup v0.4.2 // indirect github.com/curioswitch/go-reassign v0.2.0 // indirect github.com/daixiang0/gci v0.10.1 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -88,24 +96,24 @@ require ( github.com/denis-tingaikin/go-header v0.4.3 // 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/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/esimonov/ifshort v1.0.4 // indirect github.com/ettle/strcase v0.1.1 // indirect github.com/fatih/color v1.15.0 // indirect github.com/fatih/structtag v1.2.0 // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect github.com/firefart/nonamedreturns v1.0.4 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect + github.com/getsentry/sentry-go v0.23.0 // indirect github.com/go-critic/go-critic v0.7.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.3 // indirect - github.com/go-playground/validator/v10 v10.4.1 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect github.com/go-toolsmith/astequal v1.1.0 // indirect @@ -117,9 +125,11 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gofrs/flock v0.8.1 // indirect - github.com/gogo/gateway v1.1.0 // indirect - github.com/golang/glog v1.0.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/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect @@ -133,9 +143,10 @@ require ( github.com/google/btree v1.1.2 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/orderedcode v0.0.1 // indirect + github.com/google/s2a-go v0.1.4 // 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.0 // indirect + github.com/googleapis/gax-go/v2 v2.11.0 // indirect github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect @@ -150,18 +161,19 @@ require ( github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.6.1 // indirect + github.com/hashicorp/go-getter v1.7.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-multierror v1.1.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/hdevalence/ed25519consensus v0.1.0 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect + github.com/huandu/skiplist v1.2.0 // indirect github.com/iancoleman/orderedmap v0.2.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jgautheron/goconst v1.5.1 // indirect github.com/jingyugao/rowserrcheck v1.1.1 // indirect github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect @@ -172,7 +184,9 @@ require ( github.com/kisielk/errcheck v1.6.3 // indirect github.com/kisielk/gotool v1.0.0 // indirect github.com/kkHAIKE/contextcheck v1.1.4 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.16.3 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/kulti/thelper v0.6.3 // indirect github.com/kunwardeep/paralleltest v1.0.6 // indirect github.com/kyoh86/exportloopref v0.1.11 // indirect @@ -181,14 +195,15 @@ require ( github.com/leonklingele/grouper v1.1.1 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/linxGnu/grocksdb v1.7.16 // indirect github.com/lufeee/execinquery v1.2.1 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/maratori/testableexamples v1.0.0 // indirect github.com/maratori/testpackage v1.1.1 // indirect github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // 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.19 // indirect github.com/mattn/go-runewidth v0.0.10 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mbilski/exhaustivestruct v1.2.0 // indirect @@ -207,8 +222,7 @@ require ( github.com/nunnatsa/ginkgolinter v0.9.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/otiai10/copy v1.6.0 // indirect - github.com/pelletier/go-toml v1.9.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/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -223,10 +237,10 @@ require ( github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // 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/rivo/uniseg v0.2.0 // indirect - github.com/rs/cors v1.8.2 // indirect - github.com/rs/zerolog v1.29.1 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/rs/cors v1.8.3 // indirect + github.com/rs/zerolog v1.30.0 // indirect github.com/ryancurrah/gomodguard v1.3.0 // indirect github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect @@ -241,26 +255,24 @@ require ( github.com/sivchari/tenv v1.7.1 // indirect github.com/sonatard/noctx v0.0.2 // indirect github.com/sourcegraph/go-diff v0.7.0 // indirect - github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/afero v1.9.5 // 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/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect github.com/tdakkota/asciicheck v0.2.0 // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tetafro/godot v1.4.11 // indirect - github.com/tidwall/btree v1.5.0 // indirect + github.com/tidwall/btree v1.6.0 // indirect github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e // indirect github.com/timonwong/loggercheck v0.9.4 // indirect github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect - github.com/ulikunitz/xz v0.5.8 // indirect + github.com/ulikunitz/xz v0.5.11 // indirect github.com/ultraware/funlen v0.0.3 // indirect github.com/ultraware/whitespace v0.0.5 // indirect github.com/uudashr/gocognit v1.0.6 // indirect @@ -269,27 +281,29 @@ require ( github.com/zondax/hid v0.9.1 // indirect github.com/zondax/ledger-go v0.14.1 // indirect gitlab.com/bosi/decorder v0.2.3 // indirect - go.etcd.io/bbolt v1.3.6 // 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.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.7.0 // indirect - golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect + golang.org/x/crypto v0.11.0 // indirect + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect - golang.org/x/mod v0.10.0 // indirect - golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/term v0.7.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/mod v0.11.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sync v0.2.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/term v0.10.0 // indirect + golang.org/x/text v0.12.0 // indirect golang.org/x/tools v0.8.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.110.0 // indirect + google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -298,20 +312,18 @@ require ( mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect nhooyr.io/websocket v1.8.6 // indirect + pgregory.net/rapid v0.5.5 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) replace ( // use kyve flavored cosmos/cosmos-sdk - github.com/cosmos/cosmos-sdk => github.com/KYVENetwork/cosmos-sdk v0.46.13-kyve + github.com/cosmos/cosmos-sdk => github.com/KYVENetwork/cosmos-sdk v0.47.5-kyve-rc0 // use cosmos flavored gogo/protobuf // https://github.com/cosmos/cosmos-sdk/issues/8469 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - // replace broken goleveldb + // downgrade goleveldb github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - - // use cometbft - github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.28 ) diff --git a/go.sum b/go.sum index 040b0e55..855e70e7 100644 --- a/go.sum +++ b/go.sum @@ -23,44 +23,196 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -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.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= +cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +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.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk= +cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +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= +cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4= +cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= +cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0= +cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= +cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk= +cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= +cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s= +cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0= +cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= +cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= +cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= +cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= +cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA= cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= -cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY= -cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= +cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= +cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= +cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= +cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI= +cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= +cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI= +cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= +cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= +cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +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.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= +cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= 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= +cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= +cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= +cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= +cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc= +cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= +cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ= +cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= +cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE= +cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= +cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ= +cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= +cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE= -cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= +cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= +cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ= +cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= +cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0= +cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= +cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= +cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU= +cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= +cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= +cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= +cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= +cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= +cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= +cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= +cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA= +cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= +cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A= +cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= +cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0= +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 v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94= +cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= +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/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= +cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= +cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= +cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= +cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= +cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= +cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= +cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU= +cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= +cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34= +cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= +cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg= +cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= +cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU= +cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= +cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA= +cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= +cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= +cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= +cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk= +cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo= +cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= +cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4= +cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= +cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c= +cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= +cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A= +cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= +cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY= +cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= +cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI= +cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= +cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= +cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= +cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU= +cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= +cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= +cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= +cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg= +cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= +cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -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.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.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= +cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= +cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= +cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= +cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo= +cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= +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= 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/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.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= +cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= +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.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= +cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= +cosmossdk.io/log v1.2.1 h1:Xc1GgTCicniwmMiKwDxUjO4eLhPxoVdI9vtMW8Ti/uk= +cosmossdk.io/log v1.2.1/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= +cosmossdk.io/math v1.1.2 h1:ORZetZCTyWkI5GlZ6CZS28fMHi83ZYf+A2vVnHNzZBM= +cosmossdk.io/math v1.1.2/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= +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= 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= @@ -81,8 +233,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= 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/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= +github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= 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= @@ -90,8 +242,8 @@ github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rW github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts= github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0= -github.com/KYVENetwork/cosmos-sdk v0.46.13-kyve h1:wrDvXH467WihgZMQuRUc3wMotvhijvX2J78yp/UqW3I= -github.com/KYVENetwork/cosmos-sdk v0.46.13-kyve/go.mod h1:EfY521ATNEla8eJ6oJuZBdgP5+p360s7InnRqX+TWdM= +github.com/KYVENetwork/cosmos-sdk v0.47.5-kyve-rc0 h1:FmlzQ31pUpd+PgDnUPR9cxNL0GdBCAOLlevhnrvS05Y= +github.com/KYVENetwork/cosmos-sdk v0.47.5-kyve-rc0/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= @@ -107,8 +259,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= @@ -141,10 +291,10 @@ github.com/ashanbrown/forbidigo v1.5.1/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1 github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s= github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.40.45 h1:QN1nsY27ssD/JmW4s83qmSb+uL6DG4GmCDzjmJB4xUI= -github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +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= @@ -201,7 +351,7 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku 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.1.0 h1:HjgJBI85hY/qmW5tw/66sNDZ7z0UDdVSi/5r40WHw4s= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY= github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= @@ -225,12 +375,15 @@ github.com/charithe/durationcheck v0.0.10/go.mod h1:bCWXb7gYRysD1CU3C+u4ceO49LoG github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 h1:W9o46d2kbNL06lq7UNDPV0zYLzkrde/bjIqO02eoll0= github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8/go.mod h1:gakxgyXaaPkxvLw1XQxNGK4I37ys9iBRzNUx/B7pUCo= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= -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/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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= @@ -239,17 +392,29 @@ github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3h 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= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +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/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 v0.34.28 h1:gwryf55P1SWMUP4nOXpRVI2D0yPoYEzN+IBqmRBOsDc= -github.com/cometbft/cometbft v0.34.28/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= -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 v0.37.2 h1:XB0yyHGT0lwmJlFmM4+rsRnczPlHoAKFX6K8Zgc2/Jc= +github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= +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= @@ -265,26 +430,31 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV 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.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= +github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= 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.2 h1:UeGRcmFW41l0G0MiefWhkPEVEwvu78SZsHBvI78dAYw= +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/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.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU= -github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v6 v6.1.1 h1:oqqMNyjj6SLQF8rvgCaDGwfdITEIsbhs8F77/8xvRIo= -github.com/cosmos/ibc-go/v6 v6.1.1/go.mod h1:NL17FpFAaWjRFVb1T7LUKuOoMSsATPpu+Icc4zL5/Ik= +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.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= +github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw= +github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ= +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/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= +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.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/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= @@ -316,8 +486,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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= 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= @@ -334,8 +504,8 @@ github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRP 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.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -349,6 +519,10 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +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/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStBA= github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= @@ -357,17 +531,15 @@ github.com/ethereum/go-ethereum v1.10.22 h1:HbEgsDo1YTGIf4KB/NNpn+XH+PiNJXUZ9ksR github.com/ethereum/go-ethereum v1.10.22/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= -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/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -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/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -385,16 +557,19 @@ github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlya 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= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU= +github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= 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-critic/go-critic v0.7.0 h1:tqbKzB8pqi0NsRZ+1pyU4aweAF7A7QN0Pi4Q02+rYnQ= github.com/go-critic/go-critic v0.7.0/go.mod h1:moYzd7GdVXE2C2hYTwd7h0CPcqlUeclsyBRwMa38v64= +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= @@ -409,21 +584,20 @@ 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.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +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.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -455,21 +629,23 @@ 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 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/goccy/go-json v0.9.11 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/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= 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/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= 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= @@ -483,7 +659,9 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -500,6 +678,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= 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= @@ -545,6 +724,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +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= @@ -556,6 +736,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg 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= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +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= @@ -569,19 +750,37 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/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.2.0/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/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/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.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= +github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +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.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= +github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= +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/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 h1:9alfqbrhuD+9fLZ4iaAVwhlp5PEhmnBt7yvK2Oy5C1U= @@ -615,7 +814,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= @@ -636,8 +834,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng 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.6.1 h1:NASsgP4q6tL94WH6nJxKWj8As2H/2kop/bB1d8JMyRY= -github.com/hashicorp/go-getter v1.6.1/go.mod h1:IZCrswsZPeWv9IkVnLElzRU/gz/QPi6pZHn4tv6vbwA= +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= @@ -654,7 +852,6 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -670,13 +867,17 @@ 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/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= 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= @@ -687,8 +888,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: 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/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= @@ -712,7 +913,6 @@ github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjz github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= 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= @@ -754,11 +954,11 @@ github.com/kkHAIKE/contextcheck v1.1.4/go.mod h1:1+i/gWqokIa+dm31mqGLZhZJ7Uh44DJ github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.2/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.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= +github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -769,6 +969,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= 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= @@ -787,8 +988,8 @@ github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdB github.com/ldez/tagliatelle v0.4.0 h1:sylp7d9kh6AdXN2DpVGHBRb5guTVAgOxqNGhbqc4b1c= github.com/ldez/tagliatelle v0.4.0/go.mod h1:mNtTfrHy2haaBAw+VT7IBV6VXBThS7TCreYWbBcJ87I= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= -github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= 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/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU= github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -798,13 +999,15 @@ 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/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= 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/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= @@ -833,8 +1036,8 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= 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.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 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/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= @@ -910,8 +1113,8 @@ github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nunnatsa/ginkgolinter v0.9.0 h1:Sm0zX5QfjJzkeCjEp+t6d3Ha0jwvoDjleP9XCsrEzOA= github.com/nunnatsa/ginkgolinter v0.9.0/go.mod h1:FHaMLURXP7qImeH6bvxWJUpyH+2tuqe5j4rW1gxJRmI= -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= @@ -921,8 +1124,8 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6 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 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -960,10 +1163,8 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= 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.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= @@ -971,9 +1172,10 @@ 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= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1040,8 +1242,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= @@ -1052,13 +1252,15 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr 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.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +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.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c= +github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w= 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= @@ -1113,15 +1315,15 @@ 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.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= @@ -1130,15 +1332,15 @@ 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.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/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= -github.com/strangelove-ventures/packet-forward-middleware/v6 v6.0.3 h1:HOBZ9m5vl5L6BP/oLtZ3xygmj1KmqgJjbWuvlsD52YA= -github.com/strangelove-ventures/packet-forward-middleware/v6 v6.0.3/go.mod h1:LB5oxowvdkiieyb6NZj4bAbvc8fE9wn1iFeTV4uXF/A= +github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f h1:NJdZ+YJ9Vf2t286L20IjFK0SxGpobF1xIp5ZQlxWetk= +github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f/go.mod h1:DJNSVK8NCYHM+aZHCFkcAqPwjzwHYAjhjSMlhAGtJ3c= 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= @@ -1158,30 +1360,28 @@ 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 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -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/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +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.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8= github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c/go.mod h1:SbErYREK7xXdsRiigaQiQkI9McGRzYMvlKYaP3Nimdk= github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM= github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg= -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/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/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= -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= @@ -1192,7 +1392,6 @@ github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e/go.mod h1:27bSVN github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGeMXEVi4= github.com/timonwong/loggercheck v0.9.4/go.mod h1:caz4zlPcgvpEkXgVnAJGowHAMW2NwHaNlpS8xDbVhTg= 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= @@ -1200,17 +1399,17 @@ github.com/tomarrell/wrapcheck/v2 v2.8.1 h1:HxSqDSN0sAt0yJYsrcYVoEeyM4aI9yAm3KQp github.com/tomarrell/wrapcheck/v2 v2.8.1/go.mod h1:/n2Q3NZ4XFT50ho6Hbxg+RV1uyo2Uow/Vdm9NQcl5SE= github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -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/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= 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/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= -github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +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/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= @@ -1248,8 +1447,8 @@ github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2f gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0= gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= 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= @@ -1259,8 +1458,10 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/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.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -1301,10 +1502,11 @@ 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-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +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.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= 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= @@ -1319,8 +1521,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 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-20230310171629-522b1b587ee0 h1:LGJsf5LRplCck6jUCH3dBL2dmycNruWNF5xugkSlfXw= -golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +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/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 h1:J74nGeMgeFnYQJN59eFwh06jX/V8g0lB7LWpjSLxtgU= @@ -1339,6 +1541,7 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= 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= @@ -1356,8 +1559,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +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= 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= @@ -1405,20 +1608,32 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +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-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/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= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +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.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= 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= @@ -1428,9 +1643,24 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +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.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= 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= @@ -1442,9 +1672,12 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +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.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= @@ -1499,46 +1732,71 @@ 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= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +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-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-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-20211105183446-c75c47738b0c/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-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/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= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.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.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= @@ -1547,8 +1805,8 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= 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= @@ -1558,12 +1816,13 @@ 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.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= 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= @@ -1628,7 +1887,6 @@ golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc 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-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/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= @@ -1640,6 +1898,9 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +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.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= @@ -1656,6 +1917,9 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +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= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= @@ -1684,8 +1948,37 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.110.0 h1:l+rh0KYUooe9JGbGVx71tbFo4SMbMTXK3I3ia2QSEeU= -google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= +google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= +google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= +google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= +google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= +google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= +google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= +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.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= +google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= 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= @@ -1738,12 +2031,82 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D 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-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +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= +google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= +google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= +google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= +google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw= +google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= +google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= +google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= +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-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 h1:s5YSX+ZH5b5vS9rnpGymvIyMpLRJizowqDlOuyjXnTk= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= 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= @@ -1765,8 +2128,27 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp 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= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +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.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= +google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +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= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1779,8 +2161,11 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -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.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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= @@ -1816,7 +2201,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C 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 v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= 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= @@ -1838,7 +2225,8 @@ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d h1:3rvTIIM22r9pvXk+q3swxUQAQ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RFiZMMsLVL+A96Nvptar8Fj71is= 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.3 h1:163N50IHFqr1phZens4FQOdPgfJscR7a562mjQqeo4M= +pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= +pgregory.net/rapid v0.5.5/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/proto/Dockerfile b/proto/Dockerfile index 8c398454..ea2150dc 100644 --- a/proto/Dockerfile +++ b/proto/Dockerfile @@ -10,16 +10,10 @@ RUN apk add --no-cache \ RUN go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@latest RUN go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@latest -RUN git clone https://github.com/regen-network/protobuf.git; \ - cd protobuf; \ +RUN git clone https://github.com/cosmos/gogoproto.git; \ + cd gogoproto; \ go mod download; \ - make install; \ - cd .. - -RUN git clone https://github.com/regen-network/cosmos-proto.git; \ - cd cosmos-proto/protoc-gen-gocosmos; \ - go install .; \ - cd .. + make install RUN npm install -g swagger-combine diff --git a/proto/buf.lock b/proto/buf.lock index f4282d8a..9b57607f 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -9,8 +9,8 @@ deps: - remote: buf.build owner: cosmos repository: cosmos-sdk - commit: 8cb30a2c4de74dc9bd8d260b1e75e176 - digest: shake256:fc1fa1650a3fa2177b95f2f47d3b6b3673a1d42bfecf7407cc5f9cad176e1ba27877a73f1448a66a38b00292ce70b42171ff9632211014f34f13fb32f6f5e76f + commit: 954f7b05f38440fc8250134b15adec47 + digest: shake256:2ab4404fd04a7d1d52df0e2d0f2d477a3d83ffd88d876957bf3fedfd702c8e52833d65b3ce1d89a3c5adf2aab512616b0e4f51d8463f07eda9a8a3317ee3ac54 - remote: buf.build owner: cosmos repository: gogo-proto diff --git a/proto/buf.yaml b/proto/buf.yaml index 279619d2..b79ce7fc 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -2,8 +2,7 @@ version: v1 name: buf.build/kyve/chain deps: - buf.build/cosmos/cosmos-proto - # Cosmos SDK v0.46 (https://github.com/cosmos/cosmos-sdk/tree/main/proto#sdk-x-buf) - - buf.build/cosmos/cosmos-sdk:8cb30a2c4de74dc9bd8d260b1e75e176 + - buf.build/cosmos/cosmos-sdk:v0.47.0 - buf.build/cosmos/gogo-proto - buf.build/googleapis/googleapis breaking: diff --git a/proto/kyve/global/v1beta1/global.proto b/proto/kyve/global/v1beta1/global.proto index 91b567ab..a6ffbe4d 100644 --- a/proto/kyve/global/v1beta1/global.proto +++ b/proto/kyve/global/v1beta1/global.proto @@ -34,6 +34,7 @@ message Params { // governance proposal. This is used to avoid spamming of proposals and // polluting the proposals page. string min_initial_deposit_ratio = 5 [ + deprecated = true, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; diff --git a/proto/kyve/query/v1beta1/params.proto b/proto/kyve/query/v1beta1/params.proto index 923d569e..7d9381fe 100644 --- a/proto/kyve/query/v1beta1/params.proto +++ b/proto/kyve/query/v1beta1/params.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package kyve.query.v1beta1; -import "cosmos/gov/v1/query.proto"; +import "cosmos/gov/v1/gov.proto"; import "google/api/annotations.proto"; import "kyve/bundles/v1beta1/params.proto"; import "kyve/delegation/v1beta1/params.proto"; @@ -36,7 +36,7 @@ message QueryParamsResponse { // global_params ... kyve.global.v1beta1.Params global_params = 3; // gov_params ... - cosmos.gov.v1.QueryParamsResponse gov_params = 4; + cosmos.gov.v1.Params gov_params = 4; // stakers_params ... kyve.stakers.v1beta1.Params stakers_params = 5; // pool_params ... diff --git a/testutil/integration/integration.go b/testutil/integration/integration.go index 1ee553e5..2464188d 100644 --- a/testutil/integration/integration.go +++ b/testutil/integration/integration.go @@ -8,6 +8,11 @@ import ( "github.com/KYVENetwork/chain/app" stakerstypes "github.com/KYVENetwork/chain/x/stakers/types" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/crypto/tmhash" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmversion "github.com/cometbft/cometbft/proto/tendermint/version" + "github.com/cometbft/cometbft/version" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" @@ -16,11 +21,6 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/tmhash" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/version" ) const ( @@ -201,21 +201,21 @@ func (suite *KeeperTestSuite) SetupApp(startTime int64) { mintParams := suite.app.MintKeeper.GetParams(suite.ctx) mintParams.MintDenom = suite.denom - suite.app.MintKeeper.SetParams(suite.ctx, mintParams) + _ = suite.app.MintKeeper.SetParams(suite.ctx, mintParams) stakingParams := suite.app.StakingKeeper.GetParams(suite.ctx) stakingParams.BondDenom = suite.denom - suite.app.StakingKeeper.SetParams(suite.ctx, stakingParams) + _ = suite.app.StakingKeeper.SetParams(suite.ctx, stakingParams) - depositParams := suite.app.GovKeeper.GetDepositParams(suite.ctx) - depositParams.MinDeposit = sdk.NewCoins(sdk.NewInt64Coin(KYVE_DENOM, int64(100_000_000_000))) // set min deposit to 100 KYVE - suite.app.GovKeeper.SetDepositParams(suite.ctx, depositParams) + govParams := suite.app.GovKeeper.GetParams(suite.ctx) + govParams.MinDeposit = sdk.NewCoins(sdk.NewInt64Coin(KYVE_DENOM, int64(100_000_000_000))) // set min deposit to 100 KYVE + _ = suite.app.GovKeeper.SetParams(suite.ctx, govParams) // Set Validator valAddr := sdk.ValAddress(suite.address.Bytes()) validator, _ := stakingtypes.NewValidator(valAddr, ePriv.PubKey(), stakingtypes.Description{}) validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) - _ = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) + //_ = suite.app.StakingKeeper.AfterValidatorCreated(suite.ctx, validator.GetOperator()) _ = suite.app.StakingKeeper.SetValidatorByConsAddr(suite.ctx, validator) validators := suite.app.StakingKeeper.GetValidators(suite.ctx, 1) suite.validator = validators[0] diff --git a/testutil/keeper/bundles.go b/testutil/keeper/bundles.go index adf1c556..cef79495 100644 --- a/testutil/keeper/bundles.go +++ b/testutil/keeper/bundles.go @@ -5,6 +5,9 @@ import ( "github.com/KYVENetwork/chain/x/bundles/keeper" "github.com/KYVENetwork/chain/x/bundles/types" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -12,9 +15,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" ) func BundlesKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/keeper/pool.go b/testutil/keeper/pool.go index 75efcdd8..07fab988 100644 --- a/testutil/keeper/pool.go +++ b/testutil/keeper/pool.go @@ -5,6 +5,9 @@ import ( "github.com/KYVENetwork/chain/x/pool/keeper" "github.com/KYVENetwork/chain/x/pool/types" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -12,9 +15,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" ) func PoolKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/keeper/query.go b/testutil/keeper/query.go index 8322af24..59ec7936 100644 --- a/testutil/keeper/query.go +++ b/testutil/keeper/query.go @@ -5,6 +5,9 @@ import ( "github.com/KYVENetwork/chain/x/query/keeper" "github.com/KYVENetwork/chain/x/query/types" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -12,9 +15,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" ) func QueryKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/keeper/stakers.go b/testutil/keeper/stakers.go index b2f8e263..d6eb5403 100644 --- a/testutil/keeper/stakers.go +++ b/testutil/keeper/stakers.go @@ -5,6 +5,9 @@ import ( "github.com/KYVENetwork/chain/x/stakers/keeper" "github.com/KYVENetwork/chain/x/stakers/types" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/store" @@ -12,9 +15,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" typesparams "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmdb "github.com/tendermint/tm-db" ) func StakersKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/x/bundles/keeper/keeper.go b/x/bundles/keeper/keeper.go index 69d0b6cb..35811cd4 100644 --- a/x/bundles/keeper/keeper.go +++ b/x/bundles/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" "github.com/KYVENetwork/chain/x/bundles/types" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/bundles/keeper/msg_server_update_params_test.go b/x/bundles/keeper/msg_server_update_params_test.go index 9940ebf8..077820d4 100644 --- a/x/bundles/keeper/msg_server_update_params_test.go +++ b/x/bundles/keeper/msg_server_update_params_test.go @@ -43,8 +43,8 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - minDeposit := s.App().GovKeeper.GetDepositParams(s.Ctx()).MinDeposit - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + minDeposit := s.App().GovKeeper.GetParams(s.Ctx()).MinDeposit + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod delegations := s.App().StakingKeeper.GetAllDelegations(s.Ctx()) voter := sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress) @@ -92,7 +92,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -117,7 +117,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -153,7 +153,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -191,7 +191,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -223,7 +223,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -261,7 +261,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -293,7 +293,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -331,7 +331,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -363,7 +363,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -401,7 +401,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -433,7 +433,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -471,7 +471,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT diff --git a/x/bundles/module.go b/x/bundles/module.go index 85d6e1be..451a8dde 100644 --- a/x/bundles/module.go +++ b/x/bundles/module.go @@ -17,7 +17,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/KYVENetwork/chain/x/bundles/client/cli" "github.com/KYVENetwork/chain/x/bundles/keeper" @@ -133,17 +133,9 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } - // Deprecated: use RegisterServices func (AppModule) QuerierRoute() string { return types.RouterKey } -// Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a gRPC query service to respond to the module-specific gRPC queries func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) diff --git a/x/bundles/types/bundles.pb.go b/x/bundles/types/bundles.pb.go index ef21ee89..1557b5ff 100644 --- a/x/bundles/types/bundles.pb.go +++ b/x/bundles/types/bundles.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/bundles/types/events.pb.go b/x/bundles/types/events.pb.go index 689b44e5..ffbbf676 100644 --- a/x/bundles/types/events.pb.go +++ b/x/bundles/types/events.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/bundles/types/genesis.pb.go b/x/bundles/types/genesis.pb.go index 699c1a92..6695dcb2 100644 --- a/x/bundles/types/genesis.pb.go +++ b/x/bundles/types/genesis.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/bundles/types/params.pb.go b/x/bundles/types/params.pb.go index 7cff9951..a82120cc 100644 --- a/x/bundles/types/params.pb.go +++ b/x/bundles/types/params.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_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" diff --git a/x/bundles/types/query.pb.go b/x/bundles/types/query.pb.go index f0dcd232..900e380e 100644 --- a/x/bundles/types/query.pb.go +++ b/x/bundles/types/query.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "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" diff --git a/x/bundles/types/tx.pb.go b/x/bundles/types/tx.pb.go index 65e519aa..2a855598 100644 --- a/x/bundles/types/tx.pb.go +++ b/x/bundles/types/tx.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" _ "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" diff --git a/x/delegation/keeper/keeper.go b/x/delegation/keeper/keeper.go index 8e2e3d4b..20412225 100644 --- a/x/delegation/keeper/keeper.go +++ b/x/delegation/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" "github.com/KYVENetwork/chain/x/delegation/types" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/delegation/keeper/msg_server_update_params_test.go b/x/delegation/keeper/msg_server_update_params_test.go index f6a2f702..eed576c7 100644 --- a/x/delegation/keeper/msg_server_update_params_test.go +++ b/x/delegation/keeper/msg_server_update_params_test.go @@ -51,8 +51,8 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - minDeposit := s.App().GovKeeper.GetDepositParams(s.Ctx()).MinDeposit - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + minDeposit := s.App().GovKeeper.GetParams(s.Ctx()).MinDeposit + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod delegations := s.App().StakingKeeper.GetAllDelegations(s.Ctx()) voter := sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress) @@ -102,7 +102,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -129,7 +129,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -167,7 +167,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -207,7 +207,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -241,7 +241,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -281,7 +281,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -315,7 +315,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -355,7 +355,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -389,7 +389,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -429,7 +429,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -463,7 +463,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -503,7 +503,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -538,7 +538,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -578,7 +578,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -612,7 +612,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -652,7 +652,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT diff --git a/x/delegation/module.go b/x/delegation/module.go index b4873b48..8f8b9de0 100644 --- a/x/delegation/module.go +++ b/x/delegation/module.go @@ -8,7 +8,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/KYVENetwork/chain/x/delegation/client/cli" "github.com/KYVENetwork/chain/x/delegation/keeper" @@ -109,17 +109,9 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } - // Deprecated: use RegisterServices func (AppModule) QuerierRoute() string { return types.RouterKey } -// Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a gRPC query service to respond to the module-specific gRPC queries func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) diff --git a/x/delegation/types/delegation.pb.go b/x/delegation/types/delegation.pb.go index 610bbb00..c9186e46 100644 --- a/x/delegation/types/delegation.pb.go +++ b/x/delegation/types/delegation.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_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" diff --git a/x/delegation/types/events.pb.go b/x/delegation/types/events.pb.go index 5f45f54a..b2763a80 100644 --- a/x/delegation/types/events.pb.go +++ b/x/delegation/types/events.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/delegation/types/genesis.pb.go b/x/delegation/types/genesis.pb.go index 7951a355..ba1deb97 100644 --- a/x/delegation/types/genesis.pb.go +++ b/x/delegation/types/genesis.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/delegation/types/params.pb.go b/x/delegation/types/params.pb.go index fffc1de2..2ba07360 100644 --- a/x/delegation/types/params.pb.go +++ b/x/delegation/types/params.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_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" diff --git a/x/delegation/types/query.pb.go b/x/delegation/types/query.pb.go index 986184c6..f7f53b58 100644 --- a/x/delegation/types/query.pb.go +++ b/x/delegation/types/query.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "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" diff --git a/x/delegation/types/tx.pb.go b/x/delegation/types/tx.pb.go index a72c1c79..a2d81473 100644 --- a/x/delegation/types/tx.pb.go +++ b/x/delegation/types/tx.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - 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" diff --git a/x/global/abci_test.go b/x/global/abci_test.go index 0985b930..54725ae9 100644 --- a/x/global/abci_test.go +++ b/x/global/abci_test.go @@ -28,7 +28,7 @@ TEST CASES - DeductFeeDecorator var _ = Describe("AbciEndBlocker", Ordered, func() { s := i.NewCleanChain() encodingConfig := BuildEncodingConfig() - dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) accountBalanceBefore := s.GetBalanceFromAddress(i.DUMMY[0]) totalSupplyBefore := s.App().BankKeeper.GetSupply(s.Ctx(), types.Denom).Amount.Uint64() @@ -39,11 +39,11 @@ var _ = Describe("AbciEndBlocker", Ordered, func() { mintParams := s.App().MintKeeper.GetParams(s.Ctx()) mintParams.InflationMax = sdk.ZeroDec() mintParams.InflationMin = sdk.ZeroDec() - s.App().MintKeeper.SetParams(s.Ctx(), mintParams) + _ = s.App().MintKeeper.SetParams(s.Ctx(), mintParams) accountBalanceBefore = s.GetBalanceFromAddress(i.DUMMY[0]) totalSupplyBefore = s.App().BankKeeper.GetSupply(s.Ctx(), types.Denom).Amount.Uint64() - dfd = global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd = global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) }) AfterEach(func() { @@ -57,7 +57,7 @@ var _ = Describe("AbciEndBlocker", Ordered, func() { tx := BuildTestTx(math.NewInt(1), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) s.CommitAfterSeconds(1) // ASSERT @@ -84,7 +84,7 @@ var _ = Describe("AbciEndBlocker", Ordered, func() { tx := BuildTestTx(math.NewInt(1), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) s.CommitAfterSeconds(1) // ASSERT @@ -111,7 +111,7 @@ var _ = Describe("AbciEndBlocker", Ordered, func() { tx := BuildTestTx(math.NewInt(1), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) s.CommitAfterSeconds(1) // ASSERT @@ -137,7 +137,7 @@ var _ = Describe("AbciEndBlocker", Ordered, func() { tx := BuildTestTx(math.NewInt(1), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) s.CommitAfterSeconds(1) // ASSERT diff --git a/x/global/ante.go b/x/global/ante.go index e7618d8d..8097a7cf 100644 --- a/x/global/ante.go +++ b/x/global/ante.go @@ -1,9 +1,7 @@ package global import ( - "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - errorsTypes "github.com/cosmos/cosmos-sdk/types/errors" // Auth "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -14,10 +12,6 @@ import ( feeGrantKeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" // Global "github.com/KYVENetwork/chain/x/global/keeper" - // Gov - govKeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" - govTypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - legacyGovTypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" // Staking stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" ) @@ -86,64 +80,3 @@ func (gad GasAdjustmentDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulat return next(ctx, tx, simulate) } - -// InitialDepositDecorator - -// The InitialDepositDecorator is responsible for checking -// if the submit-proposal message also provides the required -// minimum deposit. Otherwise, the message is rejected. -type InitialDepositDecorator struct { - globalKeeper keeper.Keeper - govKeeper govKeeper.Keeper -} - -func NewInitialDepositDecorator(globalKeeper keeper.Keeper, govKeeper govKeeper.Keeper) InitialDepositDecorator { - return InitialDepositDecorator{ - globalKeeper: globalKeeper, - govKeeper: govKeeper, - } -} - -func (idd InitialDepositDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) { - // NOTE: This is Tendermint specific. - if ctx.BlockHeight() <= 1 { - return next(ctx, tx, simulate) - } - - minInitialDepositRatio := idd.globalKeeper.GetMinInitialDepositRatio(ctx) - depositParams := idd.govKeeper.GetDepositParams(ctx) - - requiredDeposit := sdk.NewCoins() - for _, coin := range depositParams.MinDeposit { - amount := sdk.NewDecFromInt(coin.Amount).Mul(minInitialDepositRatio).TruncateInt() - requiredDeposit = requiredDeposit.Add(sdk.NewCoin(coin.Denom, amount)) - } - - for _, rawMsg := range tx.GetMsgs() { - initialDeposit := sdk.NewCoins() - throwError := false - - if sdk.MsgTypeURL(rawMsg) == sdk.MsgTypeURL(&legacyGovTypes.MsgSubmitProposal{}) { - // cosmos.gov.v1beta1.MsgSubmitProposal - if legacyMsg, ok := rawMsg.(*legacyGovTypes.MsgSubmitProposal); ok { - initialDeposit = legacyMsg.GetInitialDeposit() - throwError = !initialDeposit.IsAllGTE(requiredDeposit) - } - } else if sdk.MsgTypeURL(rawMsg) == sdk.MsgTypeURL(&govTypes.MsgSubmitProposal{}) { - // cosmos.gov.v1.MsgSubmitProposal - if msg, ok := rawMsg.(*govTypes.MsgSubmitProposal); ok { - initialDeposit = msg.GetInitialDeposit() - throwError = !initialDeposit.IsAllGTE(requiredDeposit) - } - } - - if throwError { - return ctx, errors.Wrapf( - errorsTypes.ErrLogic, "minimum deposit is too small - was (%s), need (%s)", - initialDeposit, requiredDeposit, - ) - } - } - - return next(ctx, tx, simulate) -} diff --git a/x/global/ante_test.go b/x/global/ante_test.go index 7a7247f6..785407e7 100644 --- a/x/global/ante_test.go +++ b/x/global/ante_test.go @@ -3,23 +3,22 @@ package global_test import ( "cosmossdk.io/math" i "github.com/KYVENetwork/chain/testutil/integration" - stakersTypes "github.com/KYVENetwork/chain/x/stakers/types" sdk "github.com/cosmos/cosmos-sdk/types" - bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" - stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" // Auth authTypes "github.com/cosmos/cosmos-sdk/x/auth/types" - + // Bank + bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" // Global "github.com/KYVENetwork/chain/x/global" "github.com/KYVENetwork/chain/x/global/types" - - govV1Types "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - govLegacyTypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + // Stakers + stakersTypes "github.com/KYVENetwork/chain/x/stakers/types" + // Staking + stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) /* @@ -43,7 +42,7 @@ TEST CASES - DeductFeeDecorator var _ = Describe("DeductFeeDecorator", Ordered, func() { s := i.NewCleanChain() encodingConfig := BuildEncodingConfig() - dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) denom := s.App().StakingKeeper.BondDenom(s.Ctx()) accountBalanceBefore := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -53,7 +52,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { s = i.NewCleanChain() encodingConfig = BuildEncodingConfig() denom = s.App().StakingKeeper.BondDenom(s.Ctx()) - dfd = global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd = global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) }) AfterEach(func() { @@ -62,10 +61,10 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { It("Invalid transaction.", func() { // ARRANGE - dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) // ACT - _, err := dfd.AnteHandle(s.Ctx(), &InvalidTx{}, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx(), &InvalidTx{}, false, AnteNextFn) // ASSERT Expect(err).Should(HaveOccurred()) @@ -73,13 +72,13 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { It("consensusGasPrice = 0.0; validatorGasPrice = 0.0 - deliverTX", func() { // ARRANGE - dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) denom := s.App().StakingKeeper.BondDenom(s.Ctx()) tx := BuildTestTx(math.ZeroInt(), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(false), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(false), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -92,13 +91,13 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { It("consensusGasPrice = 0.0; validatorGasPrice = 0.0 - checkTX", func() { // ARRANGE - dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) denom := s.App().StakingKeeper.BondDenom(s.Ctx()) tx := BuildTestTx(math.ZeroInt(), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(true), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(true), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -117,7 +116,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { tx := BuildTestTx(math.ZeroInt(), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(false), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(false), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -136,7 +135,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { tx := BuildTestTx(math.NewInt(1), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(false), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(false), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -155,7 +154,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { tx := BuildTestTx(math.ZeroInt(), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(true), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(true), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -174,7 +173,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { tx := BuildTestTx(math.NewInt(1), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(true), tx, false, NextFn) + _, err := dfd.AnteHandle(s.Ctx().WithIsCheckTx(true), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -196,7 +195,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { tx := BuildTestTx(math.ZeroInt(), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(ctx.WithIsCheckTx(false), tx, false, NextFn) + _, err := dfd.AnteHandle(ctx.WithIsCheckTx(false), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -218,7 +217,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { tx := BuildTestTx(math.NewInt(1), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(ctx.WithIsCheckTx(false), tx, false, NextFn) + _, err := dfd.AnteHandle(ctx.WithIsCheckTx(false), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -240,7 +239,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { tx := BuildTestTx(math.ZeroInt(), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(ctx.WithIsCheckTx(true), tx, false, NextFn) + _, err := dfd.AnteHandle(ctx.WithIsCheckTx(true), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -262,7 +261,7 @@ var _ = Describe("DeductFeeDecorator", Ordered, func() { tx := BuildTestTx(math.NewInt(1), denom, i.DUMMY[0], encodingConfig) // ACT - _, err := dfd.AnteHandle(ctx.WithIsCheckTx(true), tx, false, NextFn) + _, err := dfd.AnteHandle(ctx.WithIsCheckTx(true), tx, false, AnteNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -322,7 +321,7 @@ var _ = Describe("GasAdjustmentDecorator", Ordered, func() { gad := global.NewGasAdjustmentDecorator(s.App().GlobalKeeper) // ACT - _, err := gad.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := gad.AnteHandle(s.Ctx(), tx, false, AnteNextFn) // ASSERT Expect(err).ToNot(HaveOccurred()) @@ -340,7 +339,7 @@ var _ = Describe("GasAdjustmentDecorator", Ordered, func() { gad := global.NewGasAdjustmentDecorator(s.App().GlobalKeeper) // ACT - _, err := gad.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := gad.AnteHandle(s.Ctx(), tx, false, AnteNextFn) // ASSERT Expect(err).ToNot(HaveOccurred()) @@ -358,7 +357,7 @@ var _ = Describe("GasAdjustmentDecorator", Ordered, func() { gad := global.NewGasAdjustmentDecorator(s.App().GlobalKeeper) // ACT - _, err := gad.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := gad.AnteHandle(s.Ctx(), tx, false, AnteNextFn) // ASSERT Expect(err).ToNot(HaveOccurred()) @@ -377,7 +376,7 @@ var _ = Describe("GasAdjustmentDecorator", Ordered, func() { gad := global.NewGasAdjustmentDecorator(s.App().GlobalKeeper) // ACT - _, err := gad.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := gad.AnteHandle(s.Ctx(), tx, false, AnteNextFn) // ASSERT Expect(err).ToNot(HaveOccurred()) @@ -397,213 +396,10 @@ var _ = Describe("GasAdjustmentDecorator", Ordered, func() { gad := global.NewGasAdjustmentDecorator(s.App().GlobalKeeper) // ACT - _, err := gad.AnteHandle(s.Ctx(), tx, false, NextFn) + _, err := gad.AnteHandle(s.Ctx(), tx, false, AnteNextFn) // ASSERT Expect(err).ToNot(HaveOccurred()) Expect(s.Ctx().GasMeter().GasConsumed()).To(BeEquivalentTo(BaseCost + 3000)) }) }) - -/* -TEST CASES - InitialDepositDecorator - -* No Deposit, no min-deposit - v1 -* No Deposit, no min-deposit - legacy -* Deposit, no min-deposit - v1 -* Deposit, no min-deposit - legacy -* No Deposit, min-deposit - v1 -* No Deposit, min-deposit - legacy -* Deposit, min-deposit - v1 -* Deposit, min-deposit - legacy -*/ -var _ = Describe("InitialDepositDecorator", Ordered, func() { - s := i.NewCleanChain() - encodingConfig := BuildEncodingConfig() - zeroCoins := sdk.NewCoins(sdk.NewCoin(types.Denom, math.ZeroInt())) - var emptyMsg []sdk.Msg - - BeforeEach(func() { - s = i.NewCleanChain() - }) - - AfterEach(func() { - s.PerformValidityChecks() - }) - - It("No Deposit, no min-deposit - v1", func() { - // ARRANGE - txBuilder := encodingConfig.TxConfig.NewTxBuilder() - submitMsg, govErr := govV1Types.NewMsgSubmitProposal(emptyMsg, zeroCoins, i.ALICE, "metadata") - Expect(govErr).ToNot(HaveOccurred()) - _ = txBuilder.SetMsgs(submitMsg) - tx := txBuilder.GetTx() - - gid := global.NewInitialDepositDecorator(s.App().GlobalKeeper, s.App().GovKeeper) - - // ACT - _, err := gid.AnteHandle(s.Ctx(), tx, false, NextFn) - - // ASSERT - Expect(err).ToNot(HaveOccurred()) - }) - - It("No Deposit, no min-deposit - legacy", func() { - // ARRANGE - txBuilder := encodingConfig.TxConfig.NewTxBuilder() - - content, created := govLegacyTypes.ContentFromProposalType("Text-test", "Descirption", "Text") - Expect(created).To(BeTrue()) - - submitMsg, govErr := govLegacyTypes.NewMsgSubmitProposal(content, zeroCoins, sdk.MustAccAddressFromBech32(i.ALICE)) - Expect(govErr).ToNot(HaveOccurred()) - _ = txBuilder.SetMsgs(submitMsg) - tx := txBuilder.GetTx() - - gid := global.NewInitialDepositDecorator(s.App().GlobalKeeper, s.App().GovKeeper) - - // ACT - _, err := gid.AnteHandle(s.Ctx(), tx, false, NextFn) - - // ASSERT - Expect(err).ToNot(HaveOccurred()) - }) - - It("Deposit, no min-deposit - v1", func() { - // ARRANGE - txBuilder := encodingConfig.TxConfig.NewTxBuilder() - hundredKyveCoins := sdk.NewCoins(sdk.NewCoin(types.Denom, math.NewInt(100_000_000_000))) - submitMsg, govErr := govV1Types.NewMsgSubmitProposal(emptyMsg, hundredKyveCoins, i.ALICE, "metadata") - Expect(govErr).ToNot(HaveOccurred()) - _ = txBuilder.SetMsgs(submitMsg) - tx := txBuilder.GetTx() - - gid := global.NewInitialDepositDecorator(s.App().GlobalKeeper, s.App().GovKeeper) - - // ACT - _, err := gid.AnteHandle(s.Ctx(), tx, false, NextFn) - - // ASSERT - Expect(err).ToNot(HaveOccurred()) - }) - - It("Deposit, no min-deposit - legacy", func() { - // ARRANGE - txBuilder := encodingConfig.TxConfig.NewTxBuilder() - - content, created := govLegacyTypes.ContentFromProposalType("Text-test", "Descirption", "Text") - Expect(created).To(BeTrue()) - - hundredKyveCoins := sdk.NewCoins(sdk.NewCoin(types.Denom, math.NewInt(100_000_000_000))) - submitMsg, govErr := govLegacyTypes.NewMsgSubmitProposal(content, hundredKyveCoins, sdk.MustAccAddressFromBech32(i.ALICE)) - Expect(govErr).ToNot(HaveOccurred()) - - _ = txBuilder.SetMsgs(submitMsg) - tx := txBuilder.GetTx() - - gid := global.NewInitialDepositDecorator(s.App().GlobalKeeper, s.App().GovKeeper) - - // ACT - _, err := gid.AnteHandle(s.Ctx(), tx, false, NextFn) - - // ASSERT - Expect(err).ToNot(HaveOccurred()) - }) - - It("No Deposit, min-deposit - v1", func() { - // ARRANGE - params := types.DefaultParams() - params.MinInitialDepositRatio = sdk.NewDec(1).QuoInt64(4) - s.App().GlobalKeeper.SetParams(s.Ctx(), params) - - txBuilder := encodingConfig.TxConfig.NewTxBuilder() - submitMsg, govErr := govV1Types.NewMsgSubmitProposal(emptyMsg, zeroCoins, i.ALICE, "metadata") - Expect(govErr).ToNot(HaveOccurred()) - _ = txBuilder.SetMsgs(submitMsg) - tx := txBuilder.GetTx() - - gid := global.NewInitialDepositDecorator(s.App().GlobalKeeper, s.App().GovKeeper) - - // ACT - _, err := gid.AnteHandle(s.Ctx(), tx, false, NextFn) - - // ASSERT - Expect(err).To(HaveOccurred()) - }) - - It("No Deposit, min-deposit - legacy", func() { - // ARRANGE - params := types.DefaultParams() - params.MinInitialDepositRatio = sdk.NewDec(1).QuoInt64(4) - s.App().GlobalKeeper.SetParams(s.Ctx(), params) - - txBuilder := encodingConfig.TxConfig.NewTxBuilder() - - content, created := govLegacyTypes.ContentFromProposalType("Text-test", "Descirption", "Text") - Expect(created).To(BeTrue()) - - submitMsg, govErr := govLegacyTypes.NewMsgSubmitProposal(content, zeroCoins, sdk.MustAccAddressFromBech32(i.ALICE)) - Expect(govErr).ToNot(HaveOccurred()) - - _ = txBuilder.SetMsgs(submitMsg) - tx := txBuilder.GetTx() - - gid := global.NewInitialDepositDecorator(s.App().GlobalKeeper, s.App().GovKeeper) - - // ACT - _, err := gid.AnteHandle(s.Ctx(), tx, false, NextFn) - - // ASSERT - Expect(err).To(HaveOccurred()) - }) - - It("Deposit, min-deposit - v1", func() { - // ARRANGE - params := types.DefaultParams() - params.MinInitialDepositRatio = sdk.NewDec(1).QuoInt64(4) - s.App().GlobalKeeper.SetParams(s.Ctx(), params) - - txBuilder := encodingConfig.TxConfig.NewTxBuilder() - twentyFiveKyveCoins := sdk.NewCoins(sdk.NewCoin(types.Denom, math.NewInt(25_000_000_000))) - - submitMsg, govErr := govV1Types.NewMsgSubmitProposal(emptyMsg, twentyFiveKyveCoins, i.ALICE, "metadata") - Expect(govErr).ToNot(HaveOccurred()) - _ = txBuilder.SetMsgs(submitMsg) - tx := txBuilder.GetTx() - - gid := global.NewInitialDepositDecorator(s.App().GlobalKeeper, s.App().GovKeeper) - - // ACT - _, err := gid.AnteHandle(s.Ctx(), tx, false, NextFn) - - // ASSERT - Expect(err).ToNot(HaveOccurred()) - }) - - It("Deposit, min-deposit - legacy", func() { - // ARRANGE - params := types.DefaultParams() - params.MinInitialDepositRatio = sdk.NewDec(1).QuoInt64(4) - s.App().GlobalKeeper.SetParams(s.Ctx(), params) - - txBuilder := encodingConfig.TxConfig.NewTxBuilder() - - content, created := govLegacyTypes.ContentFromProposalType("Text-test", "Descirption", "Text") - Expect(created).To(BeTrue()) - - twentyFiveKyveCoins := sdk.NewCoins(sdk.NewCoin(types.Denom, math.NewInt(25_000_000_000))) - submitMsg, govErr := govLegacyTypes.NewMsgSubmitProposal(content, twentyFiveKyveCoins, sdk.MustAccAddressFromBech32(i.ALICE)) - Expect(govErr).ToNot(HaveOccurred()) - - _ = txBuilder.SetMsgs(submitMsg) - tx := txBuilder.GetTx() - - gid := global.NewInitialDepositDecorator(s.App().GlobalKeeper, s.App().GovKeeper) - - // ACT - _, err := gid.AnteHandle(s.Ctx(), tx, false, NextFn) - - // ASSERT - Expect(err).ToNot(HaveOccurred()) - }) -}) diff --git a/x/global/ante_utils_test.go b/x/global/ante_utils_test.go index 3f562d1d..677c0324 100644 --- a/x/global/ante_utils_test.go +++ b/x/global/ante_utils_test.go @@ -4,9 +4,9 @@ import ( "cosmossdk.io/math" amino "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/tx" + "github.com/cosmos/ibc-go/v7/testing/simapp/params" ) // BuildEncodingConfig ... @@ -17,7 +17,7 @@ func BuildEncodingConfig() params.EncodingConfig { encodingConfig := params.EncodingConfig{ InterfaceRegistry: interfaceRegistry, - Codec: codec, + Marshaler: codec, TxConfig: tx.NewTxConfig(codec, tx.DefaultSignModes), Amino: cdc, } @@ -49,8 +49,13 @@ type InvalidTx struct{} func (InvalidTx) GetMsgs() []sdk.Msg { return []sdk.Msg{nil} } func (InvalidTx) ValidateBasic() error { return nil } -// NextFn ... -func NextFn(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.Context, error) { +// AnteNextFn ... +func AnteNextFn(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.Context, error) { + return ctx, nil +} + +// PostNextFn ... +func PostNextFn(ctx sdk.Context, _ sdk.Tx, _ bool, _ bool) (sdk.Context, error) { return ctx, nil } diff --git a/x/global/keeper/keeper.go b/x/global/keeper/keeper.go index 31427bba..3db2f6cd 100644 --- a/x/global/keeper/keeper.go +++ b/x/global/keeper/keeper.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/KYVENetwork/chain/x/global/types" + "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" - "github.com/tendermint/tendermint/libs/log" ) type ( diff --git a/x/global/keeper/msg_server_update_params_test.go b/x/global/keeper/msg_server_update_params_test.go index c007c60e..5bc3e1b0 100644 --- a/x/global/keeper/msg_server_update_params_test.go +++ b/x/global/keeper/msg_server_update_params_test.go @@ -48,8 +48,8 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - minDeposit := s.App().GovKeeper.GetDepositParams(s.Ctx()).MinDeposit - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + minDeposit := s.App().GovKeeper.GetParams(s.Ctx()).MinDeposit + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod delegations := s.App().StakingKeeper.GetAllDelegations(s.Ctx()) voter := sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress) @@ -104,7 +104,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -138,7 +138,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -185,7 +185,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -224,7 +224,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -257,7 +257,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -296,7 +296,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -329,7 +329,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -368,7 +368,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -404,7 +404,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -451,7 +451,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -487,7 +487,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -534,7 +534,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -567,7 +567,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -606,7 +606,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT diff --git a/x/global/module.go b/x/global/module.go index 0e633ec3..2c06fd37 100644 --- a/x/global/module.go +++ b/x/global/module.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -12,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" // Auth authKeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" @@ -118,17 +118,9 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } - // Deprecated: use RegisterServices func (AppModule) QuerierRoute() string { return types.RouterKey } -// Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a gRPC query service to respond to the module-specific gRPC queries func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) diff --git a/x/global/post.go b/x/global/post.go index efc83027..3754caa5 100644 --- a/x/global/post.go +++ b/x/global/post.go @@ -31,7 +31,7 @@ func NewRefundFeeDecorator(bk bankKeeper.Keeper, fk feeGrantKeeper.Keeper, gk ke } } -func (rfd RefundFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) { +func (rfd RefundFeeDecorator) PostHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, success bool, next sdk.PostHandler) (newCtx sdk.Context, err error) { // Ensure that this is a fee transaction. feeTx, ok := tx.(sdk.FeeTx) if !ok { @@ -43,7 +43,7 @@ func (rfd RefundFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo fee := feeTx.GetFee() msgs := feeTx.GetMsgs() if fee.IsZero() || len(msgs) != 1 { - return next(ctx, tx, simulate) + return next(ctx, tx, simulate, success) } // Find the refund percentage based on the transaction message type. @@ -58,7 +58,7 @@ func (rfd RefundFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo // Return early if the refund percentage is zero. if refundPercentage.IsZero() { - return next(ctx, tx, simulate) + return next(ctx, tx, simulate, success) } // Calculate the refund amount. @@ -78,5 +78,5 @@ func (rfd RefundFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo return ctx, err } - return next(ctx, tx, simulate) + return next(ctx, tx, simulate, success) } diff --git a/x/global/post_test.go b/x/global/post_test.go index 59932b93..09c51ab8 100644 --- a/x/global/post_test.go +++ b/x/global/post_test.go @@ -32,7 +32,7 @@ var _ = Describe("RefundFeeDecorator", Ordered, func() { s := i.NewCleanChain() encodingConfig := BuildEncodingConfig() rfd := global.NewRefundFeeDecorator(s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper) - dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd := global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) denom := s.App().StakingKeeper.BondDenom(s.Ctx()) accountBalanceBefore := s.GetBalanceFromAddress(i.DUMMY[0]) @@ -42,7 +42,7 @@ var _ = Describe("RefundFeeDecorator", Ordered, func() { accountBalanceBefore = s.GetBalanceFromAddress(i.DUMMY[0]) rfd = global.NewRefundFeeDecorator(s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper) - dfd = global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, s.App().StakingKeeper) + dfd = global.NewDeductFeeDecorator(s.App().AccountKeeper, s.App().BankKeeper, s.App().FeeGrantKeeper, s.App().GlobalKeeper, *s.App().StakingKeeper) denom = s.App().StakingKeeper.BondDenom(s.Ctx()) @@ -84,8 +84,8 @@ var _ = Describe("RefundFeeDecorator", Ordered, func() { tx := txBuilder.GetTx() // ACT - _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) - _, errPost := rfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) + _, errPost := rfd.PostHandle(s.Ctx(), tx, false, true, PostNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.ALICE) @@ -109,8 +109,8 @@ var _ = Describe("RefundFeeDecorator", Ordered, func() { tx := txBuilder.GetTx() // ACT - _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) - _, errPost := rfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) + _, errPost := rfd.PostHandle(s.Ctx(), tx, false, true, PostNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.ALICE) @@ -134,8 +134,8 @@ var _ = Describe("RefundFeeDecorator", Ordered, func() { tx := txBuilder.GetTx() // ACT - _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) - _, errPost := rfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) + _, errPost := rfd.PostHandle(s.Ctx(), tx, false, true, PostNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.ALICE) @@ -159,8 +159,8 @@ var _ = Describe("RefundFeeDecorator", Ordered, func() { tx := txBuilder.GetTx() // ACT - _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) - _, errPost := rfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) + _, errPost := rfd.PostHandle(s.Ctx(), tx, false, true, PostNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.ALICE) @@ -184,8 +184,8 @@ var _ = Describe("RefundFeeDecorator", Ordered, func() { tx := txBuilder.GetTx() // ACT - _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) - _, errPost := rfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) + _, errPost := rfd.PostHandle(s.Ctx(), tx, false, true, PostNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.ALICE) @@ -211,8 +211,8 @@ var _ = Describe("RefundFeeDecorator", Ordered, func() { tx := txBuilder.GetTx() // ACT - _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, NextFn) - _, errPost := rfd.AnteHandle(s.Ctx(), tx, false, NextFn) + _, errAnte := dfd.AnteHandle(s.Ctx(), tx, false, AnteNextFn) + _, errPost := rfd.PostHandle(s.Ctx(), tx, false, true, PostNextFn) // ASSERT accountBalanceAfter := s.GetBalanceFromAddress(i.ALICE) diff --git a/x/global/types/events.pb.go b/x/global/types/events.pb.go index 3c6b587a..d2fe1d4a 100644 --- a/x/global/types/events.pb.go +++ b/x/global/types/events.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/global/types/genesis.pb.go b/x/global/types/genesis.pb.go index dbb03001..c18eaff3 100644 --- a/x/global/types/genesis.pb.go +++ b/x/global/types/genesis.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/global/types/global.pb.go b/x/global/types/global.pb.go index 7d68e674..3813b121 100644 --- a/x/global/types/global.pb.go +++ b/x/global/types/global.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_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" @@ -42,7 +42,7 @@ type Params struct { // min_initial_deposit_ratio sets a minimum fraction of initial deposit for a // governance proposal. This is used to avoid spamming of proposals and // polluting the proposals page. - MinInitialDepositRatio github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=min_initial_deposit_ratio,json=minInitialDepositRatio,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_initial_deposit_ratio"` + MinInitialDepositRatio github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=min_initial_deposit_ratio,json=minInitialDepositRatio,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_initial_deposit_ratio"` // Deprecated: Do not use. } func (m *Params) Reset() { *m = Params{} } @@ -207,33 +207,33 @@ func init() { func init() { proto.RegisterFile("kyve/global/v1beta1/global.proto", fileDescriptor_d1b5d4c0bbdf8bfb) } var fileDescriptor_d1b5d4c0bbdf8bfb = []byte{ - // 408 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0xce, 0xd2, 0x40, - 0x10, 0xc7, 0x5b, 0xa9, 0x44, 0x96, 0x7c, 0x9a, 0xac, 0xe6, 0x4b, 0xf5, 0x50, 0x48, 0x0f, 0x86, - 0xc4, 0xd8, 0x06, 0x3d, 0x7a, 0x92, 0x40, 0x88, 0x1a, 0x0d, 0xf6, 0x60, 0xa2, 0x97, 0x66, 0xdb, - 0x2e, 0x65, 0x2d, 0xbb, 0xdb, 0xec, 0x6e, 0x51, 0xde, 0xc2, 0x47, 0xf1, 0x31, 0x38, 0x72, 0x34, - 0x1e, 0x88, 0x81, 0x17, 0x31, 0xbb, 0x2d, 0x04, 0x13, 0xbc, 0x70, 0xea, 0xcc, 0xf4, 0x3f, 0xbf, - 0xf6, 0x3f, 0x33, 0xa0, 0x5f, 0xac, 0x57, 0x38, 0xcc, 0x97, 0x3c, 0x41, 0xcb, 0x70, 0x35, 0x4c, - 0xb0, 0x42, 0xc3, 0x26, 0x0d, 0x4a, 0xc1, 0x15, 0x87, 0x0f, 0xb5, 0x22, 0x68, 0x4a, 0x8d, 0xe2, - 0xc9, 0xa3, 0x9c, 0xe7, 0xdc, 0xbc, 0x0f, 0x75, 0x54, 0x4b, 0xfd, 0x9f, 0x2d, 0xd0, 0x9e, 0x21, - 0x81, 0xa8, 0x84, 0x11, 0xb8, 0xa1, 0x84, 0xc5, 0x39, 0x92, 0x71, 0x29, 0x48, 0x8a, 0x5d, 0xbb, - 0x6f, 0x0f, 0x3a, 0xa3, 0x60, 0xb3, 0xeb, 0x59, 0xbf, 0x77, 0xbd, 0xa7, 0x39, 0x51, 0x8b, 0x2a, - 0x09, 0x52, 0x4e, 0xc3, 0x94, 0x4b, 0xca, 0x65, 0xf3, 0x78, 0x2e, 0xb3, 0x22, 0x54, 0xeb, 0x12, - 0xcb, 0x60, 0x8c, 0xd3, 0xa8, 0x4b, 0x09, 0x9b, 0x22, 0x39, 0xd3, 0x08, 0xf8, 0x1e, 0x80, 0xa4, - 0x12, 0x2c, 0x16, 0x48, 0x11, 0xee, 0xde, 0xb9, 0x0a, 0xd8, 0xd1, 0x84, 0x48, 0x03, 0xe0, 0x47, - 0xf0, 0x40, 0xff, 0x1e, 0xca, 0xbe, 0x56, 0x52, 0x51, 0xcc, 0x94, 0x74, 0x5b, 0xfd, 0xd6, 0xa0, - 0xfb, 0xc2, 0x0f, 0x2e, 0x58, 0x0e, 0xa6, 0x48, 0xbe, 0x3e, 0x49, 0x47, 0x8e, 0xfe, 0x6e, 0x74, - 0x3f, 0x3f, 0x2f, 0x4a, 0x38, 0x01, 0x5d, 0x8d, 0x14, 0x78, 0x5e, 0xb1, 0x4c, 0xba, 0x8e, 0xc1, - 0x79, 0xff, 0xc3, 0x45, 0x46, 0xd6, 0xa0, 0x40, 0x7e, 0x2c, 0x48, 0x48, 0xc0, 0x63, 0x3d, 0x3c, - 0xc2, 0x88, 0x22, 0x68, 0x19, 0x67, 0xb8, 0xe4, 0x92, 0xa8, 0xc6, 0xf7, 0xdd, 0xab, 0x7c, 0xdf, - 0x52, 0xc2, 0xde, 0xd4, 0xbc, 0x71, 0x8d, 0x33, 0x43, 0xf0, 0x5f, 0x81, 0x9b, 0x7f, 0x8c, 0x41, - 0x08, 0x1c, 0xdd, 0x55, 0xef, 0x2b, 0x32, 0x31, 0xbc, 0x05, 0x6d, 0x44, 0x79, 0xc5, 0x94, 0x19, - 0xba, 0x13, 0x35, 0x99, 0x5f, 0x80, 0xce, 0xc9, 0xc6, 0xc5, 0xc6, 0xb7, 0xe0, 0xde, 0x5c, 0xa0, - 0x54, 0x11, 0xce, 0xae, 0xdc, 0xd7, 0xa9, 0x7f, 0x34, 0xd9, 0xec, 0x3d, 0x7b, 0xbb, 0xf7, 0xec, - 0x3f, 0x7b, 0xcf, 0xfe, 0x71, 0xf0, 0xac, 0xed, 0xc1, 0xb3, 0x7e, 0x1d, 0x3c, 0xeb, 0xcb, 0xb3, - 0x33, 0xd6, 0xbb, 0xcf, 0x9f, 0x26, 0x1f, 0xb0, 0xfa, 0xc6, 0x45, 0x11, 0xa6, 0x0b, 0x44, 0x58, - 0xf8, 0xfd, 0x78, 0xdd, 0x06, 0x9a, 0xb4, 0xcd, 0xa9, 0xbe, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, - 0x49, 0xa4, 0x7a, 0xa9, 0xf9, 0x02, 0x00, 0x00, + // 416 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x8e, 0xd3, 0x30, + 0x10, 0x86, 0x13, 0x1a, 0x2a, 0xea, 0x6a, 0x41, 0x32, 0x68, 0x15, 0x38, 0x64, 0xab, 0x1c, 0xd0, + 0x4a, 0x88, 0x84, 0x85, 0x23, 0x27, 0xaa, 0xad, 0x56, 0x80, 0x40, 0xc5, 0x07, 0x24, 0xb8, 0x44, + 0x4e, 0xe2, 0xa6, 0x26, 0xb5, 0x1d, 0xd9, 0x4e, 0xa1, 0x6f, 0xc1, 0xb3, 0xf0, 0x14, 0x3d, 0xf6, + 0x88, 0x38, 0x54, 0xa8, 0x7d, 0x11, 0x64, 0x27, 0xad, 0x8a, 0x54, 0x0e, 0xf4, 0x94, 0x99, 0xc9, + 0x3f, 0x5f, 0xf2, 0xcf, 0x0c, 0x18, 0x94, 0x8b, 0x39, 0x89, 0x8b, 0x99, 0x48, 0xf1, 0x2c, 0x9e, + 0x5f, 0xa5, 0x44, 0xe3, 0xab, 0x36, 0x8d, 0x2a, 0x29, 0xb4, 0x80, 0xf7, 0x8d, 0x22, 0x6a, 0x4b, + 0xad, 0xe2, 0xd1, 0x83, 0x42, 0x14, 0xc2, 0xbe, 0x8f, 0x4d, 0xd4, 0x48, 0xc3, 0x1f, 0x1d, 0xd0, + 0x1d, 0x63, 0x89, 0x99, 0x82, 0x08, 0x9c, 0x31, 0xca, 0x93, 0x02, 0xab, 0xa4, 0x92, 0x34, 0x23, + 0xbe, 0x3b, 0x70, 0x2f, 0x7b, 0xc3, 0x68, 0xb9, 0xbe, 0x70, 0x7e, 0xad, 0x2f, 0x1e, 0x17, 0x54, + 0x4f, 0xeb, 0x34, 0xca, 0x04, 0x8b, 0x33, 0xa1, 0x98, 0x50, 0xed, 0xe3, 0xa9, 0xca, 0xcb, 0x58, + 0x2f, 0x2a, 0xa2, 0xa2, 0x6b, 0x92, 0xa1, 0x3e, 0xa3, 0xfc, 0x06, 0xab, 0xb1, 0x41, 0xc0, 0x77, + 0x00, 0xa4, 0xb5, 0xe4, 0x89, 0xc4, 0x9a, 0x0a, 0xff, 0xd6, 0x49, 0xc0, 0x9e, 0x21, 0x20, 0x03, + 0x80, 0x1f, 0xc0, 0x3d, 0xf3, 0x7b, 0x38, 0xff, 0x52, 0x2b, 0xcd, 0x08, 0xd7, 0xca, 0xef, 0x0c, + 0x3a, 0x97, 0xfd, 0xe7, 0x61, 0x74, 0xc4, 0x72, 0x74, 0x83, 0xd5, 0xab, 0xbd, 0x74, 0xe8, 0x99, + 0xef, 0xa2, 0xbb, 0xc5, 0x61, 0x51, 0xc1, 0x11, 0xe8, 0x1b, 0xa4, 0x24, 0x93, 0x9a, 0xe7, 0xca, + 0xf7, 0x2c, 0x2e, 0xf8, 0x17, 0x0e, 0x59, 0x59, 0x8b, 0x02, 0xc5, 0xae, 0xa0, 0x60, 0x09, 0x1e, + 0x9a, 0xe1, 0x51, 0x4e, 0x35, 0xc5, 0xb3, 0x24, 0x27, 0x95, 0x50, 0x54, 0xb7, 0xbe, 0x6f, 0x5b, + 0xdf, 0xcf, 0xfe, 0xcf, 0xb7, 0xef, 0xa2, 0x73, 0x46, 0xf9, 0xeb, 0x86, 0x78, 0xdd, 0x00, 0xed, + 0x18, 0xc2, 0x97, 0xe0, 0xec, 0x2f, 0x6b, 0x10, 0x02, 0xcf, 0xf4, 0x35, 0x1b, 0x43, 0x36, 0x86, + 0xe7, 0xa0, 0x8b, 0x99, 0xa8, 0xb9, 0xb6, 0x63, 0xf7, 0x50, 0x9b, 0x85, 0x25, 0xe8, 0xed, 0x8d, + 0x1c, 0x6d, 0x7c, 0x03, 0xee, 0x4c, 0x24, 0xce, 0x34, 0x15, 0xfc, 0xc4, 0x8d, 0xed, 0xfb, 0x87, + 0xa3, 0xe5, 0x26, 0x70, 0x57, 0x9b, 0xc0, 0xfd, 0xbd, 0x09, 0xdc, 0xef, 0xdb, 0xc0, 0x59, 0x6d, + 0x03, 0xe7, 0xe7, 0x36, 0x70, 0x3e, 0x3f, 0x39, 0x60, 0xbd, 0xfd, 0xf4, 0x71, 0xf4, 0x9e, 0xe8, + 0xaf, 0x42, 0x96, 0x71, 0x36, 0xc5, 0x94, 0xc7, 0xdf, 0x76, 0xf7, 0x6d, 0xa1, 0x69, 0xd7, 0x1e, + 0xeb, 0x8b, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x19, 0x16, 0xca, 0xfb, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/global/types/query.pb.go b/x/global/types/query.pb.go index 145c8c8a..98d63b63 100644 --- a/x/global/types/query.pb.go +++ b/x/global/types/query.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "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" diff --git a/x/global/types/tx.pb.go b/x/global/types/tx.pb.go index f7f9c33b..6b2fe20f 100644 --- a/x/global/types/tx.pb.go +++ b/x/global/types/tx.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - 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" diff --git a/x/pool/keeper/keeper.go b/x/pool/keeper/keeper.go index 1b3e9c51..bf73b53f 100644 --- a/x/pool/keeper/keeper.go +++ b/x/pool/keeper/keeper.go @@ -3,10 +3,10 @@ package keeper import ( "fmt" + "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" - "github.com/tendermint/tendermint/libs/log" // Auth authKeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" diff --git a/x/pool/keeper/keeper_utils_test.go b/x/pool/keeper/keeper_utils_test.go index a053ca10..f13f8866 100644 --- a/x/pool/keeper/keeper_utils_test.go +++ b/x/pool/keeper/keeper_utils_test.go @@ -7,12 +7,12 @@ import ( ) func BuildGovernanceTxs(s *i.KeeperTestSuite, msgs []sdk.Msg) (govV1Types.MsgSubmitProposal, govV1Types.MsgVote) { - minDeposit := s.App().GovKeeper.GetDepositParams(s.Ctx()).MinDeposit + minDeposit := s.App().GovKeeper.GetParams(s.Ctx()).MinDeposit delegations := s.App().StakingKeeper.GetAllDelegations(s.Ctx()) voter := sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress) proposal, _ := govV1Types.NewMsgSubmitProposal( - msgs, minDeposit, i.DUMMY[0], "", + msgs, minDeposit, i.DUMMY[0], "", "title", "summary", ) proposalId, _ := s.App().GovKeeper.GetProposalID(s.Ctx()) diff --git a/x/pool/keeper/msg_server_cancel_runtime_upgrade_test.go b/x/pool/keeper/msg_server_cancel_runtime_upgrade_test.go index 71d566fa..2924ccfe 100644 --- a/x/pool/keeper/msg_server_cancel_runtime_upgrade_test.go +++ b/x/pool/keeper/msg_server_cancel_runtime_upgrade_test.go @@ -28,7 +28,7 @@ var _ = Describe("msg_server_cancel_runtime_upgrade.go", Ordered, func() { s := i.NewCleanChain() gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod BeforeEach(func() { s = i.NewCleanChain() diff --git a/x/pool/keeper/msg_server_create_pool_test.go b/x/pool/keeper/msg_server_create_pool_test.go index 48ca0692..ae9230aa 100644 --- a/x/pool/keeper/msg_server_create_pool_test.go +++ b/x/pool/keeper/msg_server_create_pool_test.go @@ -27,7 +27,7 @@ var _ = Describe("msg_server_create_pool.go", Ordered, func() { s := i.NewCleanChain() gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod BeforeEach(func() { s = i.NewCleanChain() diff --git a/x/pool/keeper/msg_server_disable_pool_test.go b/x/pool/keeper/msg_server_disable_pool_test.go index c2215bc8..25251059 100644 --- a/x/pool/keeper/msg_server_disable_pool_test.go +++ b/x/pool/keeper/msg_server_disable_pool_test.go @@ -37,7 +37,7 @@ var _ = Describe("msg_server_disable_pool.go", Ordered, func() { s := i.NewCleanChain() gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod BeforeEach(func() { s = i.NewCleanChain() diff --git a/x/pool/keeper/msg_server_enable_pool_test.go b/x/pool/keeper/msg_server_enable_pool_test.go index ab0fbc73..27dffc78 100644 --- a/x/pool/keeper/msg_server_enable_pool_test.go +++ b/x/pool/keeper/msg_server_enable_pool_test.go @@ -30,7 +30,7 @@ var _ = Describe("msg_server_enable_pool.go", Ordered, func() { s := i.NewCleanChain() gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod BeforeEach(func() { s = i.NewCleanChain() diff --git a/x/pool/keeper/msg_server_schedule_runtime_upgrade_test.go b/x/pool/keeper/msg_server_schedule_runtime_upgrade_test.go index cd3f0386..32caece2 100644 --- a/x/pool/keeper/msg_server_schedule_runtime_upgrade_test.go +++ b/x/pool/keeper/msg_server_schedule_runtime_upgrade_test.go @@ -31,7 +31,7 @@ var _ = Describe("msg_server_schedule_runtime_upgrade.go", Ordered, func() { s := i.NewCleanChain() gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod BeforeEach(func() { s = i.NewCleanChain() diff --git a/x/pool/keeper/msg_server_update_params_test.go b/x/pool/keeper/msg_server_update_params_test.go index b7f90d6a..b4703cc9 100644 --- a/x/pool/keeper/msg_server_update_params_test.go +++ b/x/pool/keeper/msg_server_update_params_test.go @@ -37,8 +37,8 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - minDeposit := s.App().GovKeeper.GetDepositParams(s.Ctx()).MinDeposit - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + minDeposit := s.App().GovKeeper.GetParams(s.Ctx()).MinDeposit + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod delegations := s.App().StakingKeeper.GetAllDelegations(s.Ctx()) voter := sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress) @@ -84,7 +84,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -107,7 +107,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -141,7 +141,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -177,7 +177,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -207,7 +207,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -243,7 +243,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -273,7 +273,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -309,7 +309,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT diff --git a/x/pool/keeper/msg_server_update_pool_test.go b/x/pool/keeper/msg_server_update_pool_test.go index f6cb2d7e..8468e995 100644 --- a/x/pool/keeper/msg_server_update_pool_test.go +++ b/x/pool/keeper/msg_server_update_pool_test.go @@ -28,7 +28,7 @@ var _ = Describe("msg_server_update_pool.go", Ordered, func() { s := i.NewCleanChain() gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod BeforeEach(func() { s = i.NewCleanChain() diff --git a/x/pool/module.go b/x/pool/module.go index 49443c59..08e4df6b 100644 --- a/x/pool/module.go +++ b/x/pool/module.go @@ -12,7 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "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" // Bank bankKeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -118,17 +119,9 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } - // Deprecated: use RegisterServices func (AppModule) QuerierRoute() string { return types.RouterKey } -// Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a gRPC query service to respond to the module-specific gRPC queries func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) diff --git a/x/pool/types/events.pb.go b/x/pool/types/events.pb.go index e0938306..e2718420 100644 --- a/x/pool/types/events.pb.go +++ b/x/pool/types/events.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/pool/types/genesis.pb.go b/x/pool/types/genesis.pb.go index 509edd76..d0546861 100644 --- a/x/pool/types/genesis.pb.go +++ b/x/pool/types/genesis.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/pool/types/params.pb.go b/x/pool/types/params.pb.go index bce3587c..f66b98eb 100644 --- a/x/pool/types/params.pb.go +++ b/x/pool/types/params.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_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" diff --git a/x/pool/types/pool.pb.go b/x/pool/types/pool.pb.go index d4bda31d..27ae02e5 100644 --- a/x/pool/types/pool.pb.go +++ b/x/pool/types/pool.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/pool/types/query.pb.go b/x/pool/types/query.pb.go index ccc9afc6..7d9c678c 100644 --- a/x/pool/types/query.pb.go +++ b/x/pool/types/query.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "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" diff --git a/x/pool/types/tx.pb.go b/x/pool/types/tx.pb.go index 32d1573d..9b045244 100644 --- a/x/pool/types/tx.pb.go +++ b/x/pool/types/tx.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - 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" diff --git a/x/query/keeper/grpc_params.go b/x/query/keeper/grpc_params.go index d857d43a..00a20994 100644 --- a/x/query/keeper/grpc_params.go +++ b/x/query/keeper/grpc_params.go @@ -3,14 +3,10 @@ package keeper import ( "context" + "github.com/KYVENetwork/chain/x/query/types" sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - // Gov - govTypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - // Query - "github.com/KYVENetwork/chain/x/query/types" ) func (k Keeper) Params(goCtx context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { @@ -22,16 +18,8 @@ func (k Keeper) Params(goCtx context.Context, req *types.QueryParamsRequest) (*t bp := k.bundleKeeper.GetParams(ctx) dp := k.delegationKeeper.GetParams(ctx) globalParams := k.globalKeeper.GetParams(ctx) - govParams := govTypes.QueryParamsResponse{} + govParams := k.govKeeper.GetParams(ctx) sp := k.stakerKeeper.GetParams(ctx) - pp := k.poolKeeper.GetParams(ctx) - - govVotingParams := k.govKeeper.GetVotingParams(ctx) - govParams.VotingParams = &govVotingParams - govDepositParams := k.govKeeper.GetDepositParams(ctx) - govParams.DepositParams = &govDepositParams - govTallyParams := k.govKeeper.GetTallyParams(ctx) - govParams.TallyParams = &govTallyParams - return &types.QueryParamsResponse{BundlesParams: &bp, DelegationParams: &dp, GlobalParams: &globalParams, GovParams: &govParams, StakersParams: &sp, PoolParams: &pp}, nil + return &types.QueryParamsResponse{BundlesParams: &bp, DelegationParams: &dp, GlobalParams: &globalParams, GovParams: &govParams, StakersParams: &sp}, nil } diff --git a/x/query/keeper/keeper.go b/x/query/keeper/keeper.go index 3facf8f2..570911f4 100644 --- a/x/query/keeper/keeper.go +++ b/x/query/keeper/keeper.go @@ -15,7 +15,7 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" "github.com/KYVENetwork/chain/x/query/types" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/query/module.go b/x/query/module.go index df0d0bd5..6997f108 100644 --- a/x/query/module.go +++ b/x/query/module.go @@ -8,7 +8,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/KYVENetwork/chain/x/query/client/cli" "github.com/KYVENetwork/chain/x/query/keeper" @@ -106,17 +106,9 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } - // Deprecated: use RegisterServices func (AppModule) QuerierRoute() string { return types.RouterKey } -// Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a gRPC query service to respond to the module-specific gRPC queries func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterQueryAccountServer(cfg.QueryServer(), am.keeper) diff --git a/x/query/types/account.pb.go b/x/query/types/account.pb.go index 369268b8..89fcd5d2 100644 --- a/x/query/types/account.pb.go +++ b/x/query/types/account.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" 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" diff --git a/x/query/types/bundles.pb.go b/x/query/types/bundles.pb.go index b87eb9d3..c3a54e30 100644 --- a/x/query/types/bundles.pb.go +++ b/x/query/types/bundles.pb.go @@ -9,8 +9,8 @@ import ( fmt "fmt" 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" diff --git a/x/query/types/delegation.pb.go b/x/query/types/delegation.pb.go index 8873c1b4..0a35418a 100644 --- a/x/query/types/delegation.pb.go +++ b/x/query/types/delegation.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" 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" diff --git a/x/query/types/params.pb.go b/x/query/types/params.pb.go index 62befeff..43458762 100644 --- a/x/query/types/params.pb.go +++ b/x/query/types/params.pb.go @@ -12,8 +12,8 @@ import ( types4 "github.com/KYVENetwork/chain/x/pool/types" types3 "github.com/KYVENetwork/chain/x/stakers/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - 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" @@ -80,7 +80,7 @@ type QueryParamsResponse struct { // global_params ... GlobalParams *types2.Params `protobuf:"bytes,3,opt,name=global_params,json=globalParams,proto3" json:"global_params,omitempty"` // gov_params ... - GovParams *v1.QueryParamsResponse `protobuf:"bytes,4,opt,name=gov_params,json=govParams,proto3" json:"gov_params,omitempty"` + GovParams *v1.Params `protobuf:"bytes,4,opt,name=gov_params,json=govParams,proto3" json:"gov_params,omitempty"` // stakers_params ... StakersParams *types3.Params `protobuf:"bytes,5,opt,name=stakers_params,json=stakersParams,proto3" json:"stakers_params,omitempty"` // pool_params ... @@ -141,7 +141,7 @@ func (m *QueryParamsResponse) GetGlobalParams() *types2.Params { return nil } -func (m *QueryParamsResponse) GetGovParams() *v1.QueryParamsResponse { +func (m *QueryParamsResponse) GetGovParams() *v1.Params { if m != nil { return m.GovParams } @@ -170,36 +170,36 @@ func init() { func init() { proto.RegisterFile("kyve/query/v1beta1/params.proto", fileDescriptor_b5269c0a69f1d3d4) } var fileDescriptor_b5269c0a69f1d3d4 = []byte{ - // 455 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x31, 0x8f, 0xd3, 0x30, - 0x14, 0xc7, 0x9b, 0x3b, 0xa8, 0x84, 0xcb, 0x9d, 0x20, 0x30, 0x70, 0xa1, 0xca, 0x1d, 0x11, 0x02, - 0xc4, 0x60, 0x2b, 0xc7, 0xc6, 0x04, 0x1c, 0x4c, 0x20, 0x04, 0x1d, 0x90, 0x60, 0x41, 0x4e, 0x6b, - 0xb9, 0x51, 0xd3, 0xbc, 0x34, 0x76, 0x0c, 0x1d, 0x58, 0x98, 0x19, 0x90, 0xf8, 0x1e, 0x7c, 0x0e, - 0xc6, 0x4a, 0x2c, 0x8c, 0xa8, 0xe5, 0x83, 0xa0, 0xd8, 0x2f, 0xb4, 0xb4, 0x41, 0x6c, 0xf1, 0x7b, - 0xff, 0xff, 0xcf, 0x7e, 0x7f, 0x3b, 0xe4, 0x78, 0x32, 0x37, 0x82, 0xcd, 0x2a, 0x51, 0xce, 0x99, - 0x89, 0x13, 0xa1, 0x79, 0xcc, 0x0a, 0x5e, 0xf2, 0xa9, 0xa2, 0x45, 0x09, 0x1a, 0x7c, 0xbf, 0x16, - 0x50, 0x2b, 0xa0, 0x28, 0x08, 0x8e, 0x86, 0xa0, 0xa6, 0xa0, 0x98, 0x04, 0xc3, 0x4c, 0xec, 0xdc, - 0x4e, 0x1e, 0xf4, 0x25, 0x80, 0xcc, 0x04, 0xe3, 0x45, 0xca, 0x78, 0x9e, 0x83, 0xe6, 0x3a, 0x85, - 0x1c, 0x61, 0xc1, 0x0d, 0xbb, 0x5b, 0x52, 0xe5, 0xa3, 0x4c, 0xa8, 0xd6, 0xfd, 0x82, 0x9b, 0x56, - 0x32, 0x12, 0x99, 0x90, 0xd6, 0xda, 0xae, 0x3a, 0xb1, 0x2a, 0x99, 0x41, 0xc2, 0xb3, 0x3f, 0x0a, - 0xb7, 0x44, 0x45, 0x68, 0x15, 0x05, 0x40, 0xd6, 0x4e, 0x70, 0x47, 0x51, 0x9a, 0x4f, 0x44, 0xd9, - 0x7e, 0x94, 0xe8, 0x2a, 0xf1, 0x5f, 0xd6, 0xa3, 0xbd, 0xb0, 0xc5, 0x81, 0x98, 0x55, 0x42, 0xe9, - 0xe8, 0xeb, 0x3e, 0xb9, 0xf2, 0x57, 0x59, 0x15, 0x90, 0x2b, 0xe1, 0x9f, 0x91, 0x43, 0x1c, 0xec, - 0xad, 0xa3, 0x5c, 0xf3, 0x4e, 0xbc, 0x3b, 0xbd, 0xd3, 0x3e, 0xb5, 0x09, 0x62, 0xaf, 0xc9, 0x90, - 0xa2, 0xfb, 0x00, 0xeb, 0x6e, 0xe9, 0x3f, 0x23, 0x97, 0xd7, 0xa3, 0x37, 0x9c, 0x3d, 0xcb, 0x39, - 0x76, 0x9c, 0x75, 0x7b, 0x1b, 0x75, 0x69, 0xdd, 0x42, 0xda, 0x03, 0x72, 0xe0, 0x32, 0x69, 0x48, - 0xfb, 0x96, 0x74, 0xdd, 0x91, 0x30, 0xae, 0x2d, 0xca, 0x45, 0x57, 0x46, 0xc2, 0x43, 0x42, 0x24, - 0x98, 0xc6, 0x7e, 0xce, 0xda, 0x23, 0xea, 0xae, 0x9f, 0x4a, 0x30, 0xd4, 0xc4, 0xb4, 0x25, 0x8c, - 0xc1, 0x05, 0x09, 0x06, 0x11, 0x67, 0xe4, 0x10, 0x53, 0x6e, 0x30, 0xe7, 0x37, 0x73, 0xc1, 0xde, - 0x4e, 0x2e, 0x58, 0x47, 0xc8, 0x7d, 0xd2, 0xab, 0xaf, 0xb2, 0x21, 0x74, 0x2d, 0xe1, 0xc8, 0x11, - 0xea, 0xc6, 0xb6, 0x9d, 0xd4, 0x45, 0xf7, 0x7d, 0xfa, 0xc9, 0x23, 0xbd, 0x8d, 0x33, 0xfa, 0x1f, - 0x48, 0x17, 0xbf, 0x6e, 0xd1, 0xdd, 0xc7, 0x4d, 0x77, 0xaf, 0x3c, 0xb8, 0xfd, 0x5f, 0x9d, 0x1b, - 0x3b, 0x8a, 0x3e, 0x7e, 0xff, 0xf5, 0x65, 0xaf, 0xef, 0x07, 0xec, 0x9f, 0xbf, 0xd5, 0xa3, 0xc7, - 0xdf, 0x96, 0xa1, 0xb7, 0x58, 0x86, 0xde, 0xcf, 0x65, 0xe8, 0x7d, 0x5e, 0x85, 0x9d, 0xc5, 0x2a, - 0xec, 0xfc, 0x58, 0x85, 0x9d, 0x37, 0x77, 0x65, 0xaa, 0xc7, 0x55, 0x42, 0x87, 0x30, 0x65, 0x4f, - 0x5f, 0xbf, 0x7a, 0xf2, 0x5c, 0xe8, 0x77, 0x50, 0x4e, 0xd8, 0x70, 0xcc, 0xd3, 0x9c, 0xbd, 0x47, - 0x9c, 0x9e, 0x17, 0x42, 0x25, 0x5d, 0xfb, 0x44, 0xef, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xc8, - 0x33, 0x96, 0x09, 0xc0, 0x03, 0x00, 0x00, + // 453 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xb1, 0xae, 0xd3, 0x30, + 0x14, 0x86, 0x9b, 0x7b, 0xa1, 0x12, 0x2e, 0xb7, 0x82, 0x00, 0x02, 0x42, 0x95, 0x96, 0x08, 0x01, + 0x62, 0xb0, 0xd5, 0xc2, 0xc4, 0x84, 0x28, 0x4c, 0x20, 0x04, 0x0c, 0x48, 0xb0, 0x20, 0xa7, 0xb5, + 0xdc, 0xa8, 0x69, 0x4e, 0x1a, 0x3b, 0x81, 0x0e, 0x2c, 0xcc, 0x0c, 0x48, 0x3c, 0x01, 0x6f, 0xc3, + 0x58, 0x89, 0x85, 0x11, 0xb5, 0x3c, 0x08, 0x8a, 0x7d, 0xd2, 0x96, 0x36, 0xe8, 0x4e, 0x8d, 0xcf, + 0xf9, 0xff, 0xcf, 0xf6, 0x7f, 0x5c, 0xd2, 0x9d, 0x2e, 0x0a, 0xc1, 0xe6, 0xb9, 0xc8, 0x16, 0xac, + 0xe8, 0x87, 0x42, 0xf3, 0x3e, 0x4b, 0x79, 0xc6, 0x67, 0x8a, 0xa6, 0x19, 0x68, 0x70, 0xdd, 0x52, + 0x40, 0x8d, 0x80, 0xa2, 0xc0, 0xbb, 0x3a, 0x02, 0x35, 0x03, 0xc5, 0x24, 0x14, 0xac, 0xe8, 0x97, + 0x3f, 0x56, 0xec, 0x75, 0x24, 0x80, 0x8c, 0x05, 0xe3, 0x69, 0xc4, 0x78, 0x92, 0x80, 0xe6, 0x3a, + 0x82, 0x04, 0x51, 0xde, 0x4d, 0xb3, 0x57, 0x98, 0x27, 0xe3, 0x58, 0xa8, 0xda, 0xdd, 0xbc, 0x5b, + 0x46, 0x32, 0x16, 0xb1, 0x90, 0xc6, 0x5a, 0xaf, 0xea, 0x19, 0x95, 0x8c, 0x21, 0xe4, 0xf1, 0x46, + 0x61, 0x97, 0xa8, 0xf0, 0x8d, 0x22, 0x05, 0x88, 0xeb, 0x09, 0xf6, 0x28, 0x4a, 0xf3, 0xa9, 0xc8, + 0xea, 0x8f, 0x12, 0x5c, 0x26, 0xee, 0xab, 0xf2, 0xd6, 0x2f, 0x4d, 0xf1, 0xb5, 0x98, 0xe7, 0x42, + 0xe9, 0xe0, 0xfb, 0x31, 0xb9, 0xf4, 0x4f, 0x59, 0xa5, 0x90, 0x28, 0xe1, 0x0e, 0x49, 0x1b, 0x2f, + 0xf6, 0xde, 0x52, 0xae, 0x39, 0x3d, 0xe7, 0x6e, 0x6b, 0xd0, 0xa1, 0x26, 0x3f, 0xec, 0x55, 0x09, + 0x52, 0x74, 0x9f, 0x60, 0xdd, 0x2e, 0xdd, 0xe7, 0xe4, 0xe2, 0xf6, 0xea, 0x15, 0xe7, 0xc8, 0x70, + 0xba, 0x96, 0xb3, 0x6d, 0xef, 0xa3, 0x2e, 0x6c, 0x5b, 0x48, 0x7b, 0x44, 0x4e, 0x6c, 0x26, 0x15, + 0xe9, 0xd8, 0x90, 0x6e, 0x58, 0x12, 0xc6, 0xb5, 0x47, 0x39, 0x6f, 0xcb, 0x48, 0x78, 0x40, 0x88, + 0x84, 0xa2, 0xb2, 0x9f, 0x31, 0xf6, 0x2b, 0xd4, 0x0e, 0x9f, 0x96, 0x53, 0x2f, 0x36, 0xc6, 0x73, + 0x12, 0x0a, 0x74, 0x0d, 0x49, 0x1b, 0x83, 0xad, 0x9c, 0x67, 0x77, 0xa3, 0xc0, 0xde, 0x41, 0x14, + 0x58, 0x47, 0xc8, 0x43, 0xd2, 0x2a, 0xa7, 0x57, 0x11, 0x9a, 0x86, 0x70, 0xdd, 0x12, 0xca, 0xc6, + 0xbe, 0x9d, 0x94, 0x45, 0xfb, 0x3d, 0xf8, 0xe2, 0x90, 0xd6, 0xce, 0x8c, 0xdc, 0x4f, 0xa4, 0x89, + 0x5f, 0xb7, 0xe9, 0xe1, 0x6b, 0xa6, 0x87, 0x53, 0xf6, 0xee, 0x9c, 0xaa, 0xb3, 0x63, 0x0f, 0x82, + 0xcf, 0x3f, 0xff, 0x7c, 0x3b, 0xea, 0xb8, 0x1e, 0xfb, 0xef, 0xff, 0xe8, 0xf1, 0x93, 0x1f, 0x2b, + 0xdf, 0x59, 0xae, 0x7c, 0xe7, 0xf7, 0xca, 0x77, 0xbe, 0xae, 0xfd, 0xc6, 0x72, 0xed, 0x37, 0x7e, + 0xad, 0xfd, 0xc6, 0xbb, 0x7b, 0x32, 0xd2, 0x93, 0x3c, 0xa4, 0x23, 0x98, 0xb1, 0x67, 0x6f, 0xdf, + 0x3c, 0x7d, 0x21, 0xf4, 0x07, 0xc8, 0xa6, 0x6c, 0x34, 0xe1, 0x51, 0xc2, 0x3e, 0x22, 0x4e, 0x2f, + 0x52, 0xa1, 0xc2, 0xa6, 0x79, 0x95, 0xf7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x81, 0x22, 0x17, + 0x0f, 0xb1, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -678,7 +678,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.GovParams == nil { - m.GovParams = &v1.QueryParamsResponse{} + m.GovParams = &v1.Params{} } if err := m.GovParams.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/query/types/pools.pb.go b/x/query/types/pools.pb.go index 53a336b2..6cdad894 100644 --- a/x/query/types/pools.pb.go +++ b/x/query/types/pools.pb.go @@ -10,8 +10,8 @@ import ( types "github.com/KYVENetwork/chain/x/pool/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" diff --git a/x/query/types/query.pb.go b/x/query/types/query.pb.go index d88244e5..24b741e6 100644 --- a/x/query/types/query.pb.go +++ b/x/query/types/query.pb.go @@ -8,7 +8,7 @@ import ( types "github.com/KYVENetwork/chain/x/pool/types" github_com_cosmos_cosmos_sdk_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" diff --git a/x/query/types/stakers.pb.go b/x/query/types/stakers.pb.go index 19a91220..b3fe0f79 100644 --- a/x/query/types/stakers.pb.go +++ b/x/query/types/stakers.pb.go @@ -9,8 +9,8 @@ import ( types "github.com/KYVENetwork/chain/x/stakers/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" diff --git a/x/stakers/keeper/exported_functions_test.go b/x/stakers/keeper/exported_functions_test.go index 62e97845..3bb9fa44 100644 --- a/x/stakers/keeper/exported_functions_test.go +++ b/x/stakers/keeper/exported_functions_test.go @@ -166,10 +166,10 @@ var _ = Describe("Protocol Governance Voting", Ordered, func() { }) func CreateTestProposal(ctx sdk.Context, keepers kyveApp.Keepers) sdk.Msg { - minDeposit := keepers.GovKeeper.GetDepositParams(ctx).MinDeposit + minDeposit := keepers.GovKeeper.GetParams(ctx).MinDeposit proposal, _ := govTypes.NewMsgSubmitProposal( - []sdk.Msg{}, minDeposit, i.DUMMY[0], "ipfs://CID", + []sdk.Msg{}, minDeposit, i.DUMMY[0], "metadata", "title", "summary", ) return proposal diff --git a/x/stakers/keeper/keeper.go b/x/stakers/keeper/keeper.go index 7e8dabe9..48d46728 100644 --- a/x/stakers/keeper/keeper.go +++ b/x/stakers/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" delegationKeeper "github.com/KYVENetwork/chain/x/delegation/keeper" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" "github.com/KYVENetwork/chain/x/stakers/types" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/stakers/keeper/msg_server_update_params_test.go b/x/stakers/keeper/msg_server_update_params_test.go index c4ee172f..7108b2af 100644 --- a/x/stakers/keeper/msg_server_update_params_test.go +++ b/x/stakers/keeper/msg_server_update_params_test.go @@ -40,8 +40,8 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { gov := s.App().GovKeeper.GetGovernanceAccount(s.Ctx()).GetAddress().String() - minDeposit := s.App().GovKeeper.GetDepositParams(s.Ctx()).MinDeposit - votingPeriod := s.App().GovKeeper.GetVotingParams(s.Ctx()).VotingPeriod + minDeposit := s.App().GovKeeper.GetParams(s.Ctx()).MinDeposit + votingPeriod := s.App().GovKeeper.GetParams(s.Ctx()).VotingPeriod delegations := s.App().StakingKeeper.GetAllDelegations(s.Ctx()) voter := sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress) @@ -87,7 +87,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -111,7 +111,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -145,7 +145,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -181,7 +181,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -211,7 +211,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -247,7 +247,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT @@ -277,7 +277,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) vote := govV1Types.NewMsgVote( @@ -313,7 +313,7 @@ var _ = Describe("msg_server_update_params.go", Ordered, func() { } proposal, _ := govV1Types.NewMsgSubmitProposal( - []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", + []sdk.Msg{msg}, minDeposit, i.DUMMY[0], "", "title", "summary", ) // ACT diff --git a/x/stakers/module.go b/x/stakers/module.go index 31a89053..7141634f 100644 --- a/x/stakers/module.go +++ b/x/stakers/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/KYVENetwork/chain/x/stakers/client/cli" "github.com/KYVENetwork/chain/x/stakers/keeper" @@ -110,17 +110,9 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } - // Deprecated: use RegisterServices func (AppModule) QuerierRoute() string { return types.RouterKey } -// Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a gRPC query service to respond to the module-specific gRPC queries func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) diff --git a/x/stakers/types/events.pb.go b/x/stakers/types/events.pb.go index f0b4756a..a80b8d38 100644 --- a/x/stakers/types/events.pb.go +++ b/x/stakers/types/events.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_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" diff --git a/x/stakers/types/genesis.pb.go b/x/stakers/types/genesis.pb.go index 4b6b0473..4786bc8f 100644 --- a/x/stakers/types/genesis.pb.go +++ b/x/stakers/types/genesis.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/stakers/types/params.pb.go b/x/stakers/types/params.pb.go index d765da61..44ba4821 100644 --- a/x/stakers/types/params.pb.go +++ b/x/stakers/types/params.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/stakers/types/query.pb.go b/x/stakers/types/query.pb.go index f7b98254..68540d38 100644 --- a/x/stakers/types/query.pb.go +++ b/x/stakers/types/query.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "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" diff --git a/x/stakers/types/stakers.pb.go b/x/stakers/types/stakers.pb.go index 04573d96..71f00978 100644 --- a/x/stakers/types/stakers.pb.go +++ b/x/stakers/types/stakers.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_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" diff --git a/x/stakers/types/tx.pb.go b/x/stakers/types/tx.pb.go index 5aec6821..91e885db 100644 --- a/x/stakers/types/tx.pb.go +++ b/x/stakers/types/tx.pb.go @@ -9,8 +9,8 @@ import ( _ "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" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/x/team/keeper/keeper.go b/x/team/keeper/keeper.go index d454901a..7db97665 100644 --- a/x/team/keeper/keeper.go +++ b/x/team/keeper/keeper.go @@ -6,10 +6,10 @@ import ( mintKeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" upgradeKeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" + "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" - "github.com/tendermint/tendermint/libs/log" // Auth authKeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" diff --git a/x/team/module.go b/x/team/module.go index c0988157..1606f61d 100644 --- a/x/team/module.go +++ b/x/team/module.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -12,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" // Bank bankKeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -118,17 +118,9 @@ func NewAppModule( } } -// Deprecated: use RegisterServices -func (am AppModule) Route() sdk.Route { return sdk.Route{} } - // Deprecated: use RegisterServices func (AppModule) QuerierRoute() string { return types.RouterKey } -// Deprecated: use RegisterServices -func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a gRPC query service to respond to the module-specific gRPC queries func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) diff --git a/x/team/types/events.pb.go b/x/team/types/events.pb.go index 75c5b521..94664cc4 100644 --- a/x/team/types/events.pb.go +++ b/x/team/types/events.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/team/types/genesis.pb.go b/x/team/types/genesis.pb.go index 0fcb0f15..2f99c3c7 100644 --- a/x/team/types/genesis.pb.go +++ b/x/team/types/genesis.pb.go @@ -6,7 +6,7 @@ package types import ( fmt "fmt" _ "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" diff --git a/x/team/types/query.pb.go b/x/team/types/query.pb.go index 3a078003..69ad0984 100644 --- a/x/team/types/query.pb.go +++ b/x/team/types/query.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "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" diff --git a/x/team/types/team.pb.go b/x/team/types/team.pb.go index e2b7a217..c2493a0b 100644 --- a/x/team/types/team.pb.go +++ b/x/team/types/team.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/team/types/tx.pb.go b/x/team/types/tx.pb.go index ff1e7f87..56835c0b 100644 --- a/x/team/types/tx.pb.go +++ b/x/team/types/tx.pb.go @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - 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" diff --git a/x/team/types/types.go b/x/team/types/types.go index 62ad3767..2ff5a778 100644 --- a/x/team/types/types.go +++ b/x/team/types/types.go @@ -43,8 +43,8 @@ type VestingStatus struct { var ( TEAM_FOUNDATION_STRING = "kyve1u7ukf2nv6v5j5y2yqprm8yqruue2rlmrkx4xgq" TEAM_BCP_STRING = "kyve1ruxaec07ca3dh0amkzxjap7av3xjt5vjgnd424" - TEAM_ALLOCATION_STRING = "165000000000000000" - TGE_STRING = "2023-02-01T10:34:15" + TEAM_ALLOCATION_STRING = "165000000000000" + TGE_STRING = "2023-03-14T14:03:14" ) // Convert passed build variables (string) to the corresponding int values