From ff507d3f42177f138e8a9194f3232fbc4cb8da94 Mon Sep 17 00:00:00 2001 From: kienn6034 Date: Tue, 26 Mar 2024 00:31:47 +0700 Subject: [PATCH 1/8] bump sdk version --- go.mod | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index f681c370..ad68a1be 100644 --- a/go.mod +++ b/go.mod @@ -3,39 +3,40 @@ module github.com/terra-money/alliance go 1.20 require ( - cosmossdk.io/errors v1.0.0-beta.7 - cosmossdk.io/math v1.0.1 + cosmossdk.io/errors v1.0.1 + cosmossdk.io/math v1.3.0 cosmossdk.io/tools/rosetta v0.2.1 - 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.3 - github.com/cosmos/ibc-go/v7 v7.1.0 + github.com/cometbft/cometbft v0.38.6 + github.com/cometbft/cometbft-db v0.11.0 + github.com/cosmos/cosmos-proto v1.0.0-beta.4 + github.com/cosmos/cosmos-sdk v0.50.5 + github.com/cosmos/ibc-go/v8 v8.1.1 github.com/golang/mock v1.6.0 - github.com/golang/protobuf v1.5.3 + github.com/golang/protobuf v1.5.4 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/spf13/cast v1.5.1 - github.com/spf13/cobra v1.7.0 + github.com/spf13/cast v1.6.0 + github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.16.0 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.9.0 golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 - google.golang.org/grpc v1.55.0 - google.golang.org/protobuf v1.30.0 + google.golang.org/grpc v1.62.1 + google.golang.org/protobuf v1.33.0 ) -require github.com/cosmos/gogoproto v1.4.10 +require github.com/cosmos/gogoproto v1.4.11 require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.19.0 // indirect + cloud.google.com/go v0.112.0 // indirect + cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.13.0 // indirect + cloud.google.com/go/iam v0.1.6 // indirect cloud.google.com/go/storage v1.29.0 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect cosmossdk.io/log v1.1.0 // indirect + cosmossdk.io/store v1.0.2 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 @@ -167,4 +168,7 @@ require ( ) // Golevel DB fix -replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 +replace ( + github.com/cosmos/ibc-go/v8 => github.com/cosmos/ibc-go/v8 v8.1.1 + github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 +) From 9439c79343d4d99646256d8c929f48b7909232af Mon Sep 17 00:00:00 2001 From: kienn6034 Date: Tue, 26 Mar 2024 01:35:15 +0700 Subject: [PATCH 2/8] bump: bump all version to sdk 50 with no version conflict --- app/app.go | 70 ++--- app/test_helpers.go | 2 +- custom/bank/keeper/keeper.go | 2 +- go.mod | 177 ++++++----- go.sum | 525 +++++++++++++++++++------------- testutil/network/network.go | 2 +- x/alliance/keeper/asset.go | 2 +- x/alliance/keeper/grpc_query.go | 2 +- x/alliance/keeper/keeper.go | 2 +- 9 files changed, 463 insertions(+), 321 deletions(-) diff --git a/app/app.go b/app/app.go index bffac4bf..337274e0 100644 --- a/app/app.go +++ b/app/app.go @@ -8,6 +8,16 @@ import ( "os" "path/filepath" + storetypes "cosmossdk.io/store/types" + "cosmossdk.io/x/evidence" + evidencekeeper "cosmossdk.io/x/evidence/keeper" + evidencetypes "cosmossdk.io/x/evidence/types" + "cosmossdk.io/x/feegrant" + feegrantkeeper "cosmossdk.io/x/feegrant/keeper" + feegrantmodule "cosmossdk.io/x/feegrant/module" + "cosmossdk.io/x/upgrade" + upgradekeeper "cosmossdk.io/x/upgrade/keeper" + upgradetypes "cosmossdk.io/x/upgrade/types" dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" @@ -15,15 +25,14 @@ import ( tmos "github.com/cometbft/cometbft/libs/os" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/grpc/cmtservice" nodeservice "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/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" - 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" @@ -40,9 +49,6 @@ import ( authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module" "github.com/cosmos/cosmos-sdk/x/bank" 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" consensus "github.com/cosmos/cosmos-sdk/x/consensus" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" @@ -52,12 +58,6 @@ import ( distr "github.com/cosmos/cosmos-sdk/x/distribution" 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" - feegrantmodule "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" @@ -83,27 +83,25 @@ import ( "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/v7/modules/apps/27-interchain-accounts" - 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" - icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - "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" - ibc "github.com/cosmos/ibc-go/v7/modules/core" - ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" - ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" - 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" - solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" - ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + "github.com/cosmos/ibc-go/modules/capability" + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts" + icahost "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host" + icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper" + icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" + "github.com/cosmos/ibc-go/v8/modules/apps/transfer" + ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v8/modules/core" + ibcclient "github.com/cosmos/ibc-go/v8/modules/core/02-client" + ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + ibcporttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" + ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" + solomachine "github.com/cosmos/ibc-go/v8/modules/light-clients/06-solomachine" + ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" "github.com/spf13/cast" appparams "github.com/terra-money/alliance/app/params" @@ -134,10 +132,6 @@ func getGovProposalHandlers() []govclient.ProposalHandler { govProposalHandlers = append(govProposalHandlers, paramsclient.ProposalHandler, - upgradeclient.LegacyProposalHandler, - upgradeclient.LegacyCancelProposalHandler, - ibcclientclient.UpdateClientProposalHandler, - ibcclientclient.UpgradeProposalHandler, alliancemoduleclient.CreateAllianceProposalHandler, alliancemoduleclient.UpdateAllianceProposalHandler, alliancemoduleclient.DeleteAllianceProposalHandler, @@ -842,7 +836,7 @@ func (app *App) RegisterAPIRoutes(apiSvr *api.Server, _ config.APIConfig) { // Register new tx routes from grpc-gateway. authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) // Register new tendermint queries routes from grpc-gateway. - tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) + cmtservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) // Register grpc-gateway routes for all modules. ModuleBasics.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) @@ -859,7 +853,7 @@ func (app *App) RegisterTxService(clientCtx client.Context) { // RegisterTendermintService implements the Application.RegisterTendermintService method. func (app *App) RegisterTendermintService(clientCtx client.Context) { - tmservice.RegisterTendermintService( + cmtservice.RegisterTendermintService( clientCtx, app.BaseApp.GRPCQueryRouter(), app.interfaceRegistry, diff --git a/app/test_helpers.go b/app/test_helpers.go index c35cd53c..cf07581d 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -11,6 +11,7 @@ import ( "time" cosmoserrors "cosmossdk.io/errors" + pruningtypes "cosmossdk.io/store/pruning/types" bam "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -19,7 +20,6 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/std" - pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/testutil/mock" "github.com/cosmos/cosmos-sdk/testutil/network" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" diff --git a/custom/bank/keeper/keeper.go b/custom/bank/keeper/keeper.go index 58c48e68..e76b6637 100644 --- a/custom/bank/keeper/keeper.go +++ b/custom/bank/keeper/keeper.go @@ -3,8 +3,8 @@ package keeper import ( "context" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" accountkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" diff --git a/go.mod b/go.mod index ad68a1be..48a04ab9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/terra-money/alliance -go 1.20 +go 1.21 + +toolchain go1.21.6 require ( cosmossdk.io/errors v1.0.1 @@ -16,33 +18,80 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 - github.com/spf13/viper v1.16.0 + github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 - golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 + google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 ) -require github.com/cosmos/gogoproto v1.4.11 +require ( + github.com/cosmos/gogoproto v1.4.11 + github.com/cosmos/ibc-go/modules/capability v1.0.0 + google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 +) + +require ( + cosmossdk.io/collections v0.4.0 // indirect + cosmossdk.io/x/tx v0.13.1 // indirect + github.com/DataDog/datadog-go v3.2.0+incompatible // indirect + github.com/DataDog/zstd v1.5.5 // indirect + github.com/bits-and-blooms/bitset v1.8.0 // indirect + github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/pebble v1.1.0 // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/cosmos/cosmos-db v1.0.2 // indirect + github.com/emicklei/dot v1.6.1 // indirect + github.com/fatih/color v1.15.0 // indirect + github.com/getsentry/sentry-go v0.27.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-metrics v0.5.2 // indirect + github.com/hashicorp/go-plugin v1.5.2 // indirect + github.com/hashicorp/yamux v0.1.1 // indirect + github.com/iancoleman/strcase v0.3.0 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect + github.com/oklog/run v1.1.0 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect + go.opentelemetry.io/otel v1.22.0 // indirect + go.opentelemetry.io/otel/metric v1.22.0 // indirect + go.opentelemetry.io/otel/trace v1.22.0 // indirect + go.uber.org/multierr v1.10.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/time v0.5.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect + gotest.tools/v3 v3.5.1 // indirect +) require ( cloud.google.com/go v0.112.0 // indirect cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.1.6 // indirect - cloud.google.com/go/storage v1.29.0 // indirect - cosmossdk.io/api v0.3.1 // indirect - cosmossdk.io/core v0.5.1 // indirect - cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - cosmossdk.io/log v1.1.0 // indirect + cloud.google.com/go/iam v1.1.6 // indirect + cloud.google.com/go/storage v1.36.0 // indirect + cosmossdk.io/api v0.7.3 // indirect + cosmossdk.io/core v0.11.0 // indirect + cosmossdk.io/depinject v1.0.0-alpha.4 // indirect + cosmossdk.io/log v1.3.1 // indirect cosmossdk.io/store v1.0.2 + cosmossdk.io/x/evidence v0.1.0 + cosmossdk.io/x/feegrant v0.1.0 + cosmossdk.io/x/upgrade v0.1.1 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/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect - github.com/armon/go-metrics v0.4.1 // indirect - github.com/aws/aws-sdk-go v1.44.203 // indirect + github.com/aws/aws-sdk-go v1.44.224 // 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 @@ -53,56 +102,51 @@ require ( github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go/types v1.0.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/gogogateway v1.2.0 // indirect - github.com/cosmos/iavl v0.20.0 // indirect + github.com/cosmos/iavl v1.0.1 // indirect github.com/cosmos/ics23/go v0.10.0 // indirect - github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect + github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect - github.com/creachadair/taskgroup v0.4.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/dvsekhvalnov/jose2go v1.5.0 // indirect - github.com/felixge/httpsnoop v1.0.2 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/dvsekhvalnov/jose2go v1.6.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.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.6.0 // indirect - github.com/go-playground/locales v0.14.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v1.2.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/orderedcode v0.0.1 // indirect - github.com/google/s2a-go v0.1.3 // 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.8.0 // indirect - github.com/gorilla/handlers v1.5.1 // indirect - github.com/gorilla/mux v1.8.0 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect + github.com/gorilla/handlers v1.5.2 // indirect + github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect - github.com/gtank/merlin v0.1.1 // indirect - github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.1 // indirect + github.com/hashicorp/go-getter v1.7.3 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect - github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hdevalence/ed25519consensus v0.1.0 // indirect github.com/huandu/skiplist v1.2.0 // indirect @@ -110,61 +154,56 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.16.3 // indirect + github.com/klauspost/compress v1.17.7 // 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/linxGnu/grocksdb v1.8.12 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect - github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect + github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect - github.com/rakyll/statik v0.1.7 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.18.0 // indirect + github.com/prometheus/client_model v0.6.0 // indirect + github.com/prometheus/common v0.47.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.3 // indirect - github.com/rs/zerolog v1.29.1 // indirect + github.com/rs/zerolog v1.32.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/spf13/afero v1.9.5 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/afero v1.11.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tidwall/btree v1.6.0 // indirect + github.com/tidwall/btree v1.7.0 // indirect github.com/ulikunitz/xz v0.5.11 // indirect - github.com/zondax/hid v0.9.1 // indirect - github.com/zondax/ledger-go v0.14.1 // indirect - go.etcd.io/bbolt v1.3.7 // indirect + github.com/zondax/hid v0.9.2 // indirect + github.com/zondax/ledger-go v0.14.3 // indirect + go.etcd.io/bbolt v1.3.8 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.9.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/term v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.122.0 // indirect - google.golang.org/appengine v1.6.7 // indirect + golang.org/x/crypto v0.19.0 // indirect + golang.org/x/net v0.21.0 // indirect + golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/term v0.17.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/api v0.162.0 // indirect + google.golang.org/appengine v1.6.8 // 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 nhooyr.io/websocket v1.8.6 // indirect - pgregory.net/rapid v0.5.5 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + pgregory.net/rapid v1.1.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) // Golevel DB fix diff --git a/go.sum b/go.sum index 5061ccb1..5ce00855 100644 --- a/go.sum +++ b/go.sum @@ -3,7 +3,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -16,7 +15,6 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= 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.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= @@ -32,8 +30,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= +cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -70,8 +68,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= -cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= +cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= +cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -111,13 +109,12 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= -cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= +cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -171,12 +168,11 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo 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.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.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= -cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= +cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8= +cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= @@ -188,20 +184,36 @@ cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xX cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= -cosmossdk.io/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.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= -cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= -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/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= -cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= -cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= -cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/api v0.7.3 h1:V815i8YOwOAQa1rLCsSMjVG5Gnzs02JLq+l7ks8s1jk= +cosmossdk.io/api v0.7.3/go.mod h1:IcxpYS5fMemZGqyYtErK7OqvdM0C8kdW3dq8Q/XIG38= +cosmossdk.io/client/v2 v2.0.0-beta.1 h1:XkHh1lhrLYIT9zKl7cIOXUXg2hdhtjTPBUfqERNA1/Q= +cosmossdk.io/client/v2 v2.0.0-beta.1/go.mod h1:JEUSu9moNZQ4kU3ir1DKD5eU4bllmAexrGWjmb9k8qU= +cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s= +cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0= +cosmossdk.io/core v0.11.0 h1:vtIafqUi+1ZNAE/oxLOQQ7Oek2n4S48SWLG8h/+wdbo= +cosmossdk.io/core v0.11.0/go.mod h1:LaTtayWBSoacF5xNzoF8tmLhehqlA9z1SWiPuNC6X1w= +cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98okJopc= +cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= +cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= +cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= +cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= +cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= +cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= +cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= +cosmossdk.io/store v1.0.2 h1:lSg5BTvJBHUDwswNNyeh4K/CbqiHER73VU4nDNb8uk0= +cosmossdk.io/store v1.0.2/go.mod h1:EFtENTqVTuWwitGW1VwaBct+yDagk7oG/axBMPH+FXs= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= +cosmossdk.io/x/circuit v0.1.0 h1:IAej8aRYeuOMritczqTlljbUVHq1E85CpBqaCTwYgXs= +cosmossdk.io/x/circuit v0.1.0/go.mod h1:YDzblVE8+E+urPYQq5kq5foRY/IzhXovSYXb4nwd39w= +cosmossdk.io/x/evidence v0.1.0 h1:J6OEyDl1rbykksdGynzPKG5R/zm6TacwW2fbLTW4nCk= +cosmossdk.io/x/evidence v0.1.0/go.mod h1:hTaiiXsoiJ3InMz1uptgF0BnGqROllAN8mwisOMMsfw= +cosmossdk.io/x/feegrant v0.1.0 h1:c7s3oAq/8/UO0EiN1H5BIjwVntujVTkYs35YPvvrdQk= +cosmossdk.io/x/feegrant v0.1.0/go.mod h1:4r+FsViJRpcZif/yhTn+E0E6OFfg4n0Lx+6cCtnZElU= +cosmossdk.io/x/tx v0.13.1 h1:Mg+EMp67Pz+NukbJqYxuo8uRp7N/a9uR+oVS9pONtj8= +cosmossdk.io/x/tx v0.13.1/go.mod h1:CBCU6fsRVz23QGFIQBb1DNX2DztJCf3jWyEkHY2nJQ0= +cosmossdk.io/x/upgrade v0.1.1 h1:aoPe2gNvH+Gwt/Pgq3dOxxQVU3j5P6Xf+DaUJTDZATc= +cosmossdk.io/x/upgrade v0.1.1/go.mod h1:MNLptLPcIFK9CWt7Ra//8WUZAxweyRDNcbs5nkOcQy0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= @@ -209,15 +221,19 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMb github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o= github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/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/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= +github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -225,8 +241,8 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx 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/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= +github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -238,16 +254,15 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= -github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/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 v1.44.224 h1:09CiaaF35nRmxrzWZ2uRq5v6Ghg/d2RiPjZnSgtt+RQ= +github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -257,11 +272,16 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5MS5JVb4c= +github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= -github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= +github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ= +github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= -github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= +github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -297,20 +317,32 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH 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/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= +github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= +github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/pebble v1.1.0 h1:pcFh8CdCIt2kmEpK0OIatq67Ln9uGDYY3d5XnE0LJG4= +github.com/cockroachdb/pebble v1.1.0/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E= +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/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= -github.com/cometbft/cometbft 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/cometbft/cometbft v0.38.6 h1:QSgpCzrGWJ2KUq1qpw+FCfASRpE27T6LQbfEHscdyOk= +github.com/cometbft/cometbft v0.38.6/go.mod h1:8rSPxzUJYquCN8uuBgbUHOMg2KAwvr7CyUw+6ukO4nw= +github.com/cometbft/cometbft-db v0.11.0 h1:M3Lscmpogx5NTbb1EGyGDaFRdsoLWrUWimFEyf7jej8= +github.com/cometbft/cometbft-db v0.11.0/go.mod h1:GDPJAC/iFHNjmZZPN8V8C1yr/eyityhi2W1hz2MGKSc= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= +github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -319,44 +351,46 @@ 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-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= -github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= -github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= -github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= +github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAKs= +github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA= +github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48OdY7lIWTLG7oU= +github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co= +github.com/cosmos/cosmos-sdk v0.50.5 h1:MOEi+DKYgW67YaPgB+Pf+nHbD3V9S/ayitRKJYLfGIA= +github.com/cosmos/cosmos-sdk v0.50.5/go.mod h1:oV/k6GJgXV9QPoM2fsYDPPsyPBgQbdotv532O6Mz1OQ= 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/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= -github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= -github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= -github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go/v7 v7.1.0 h1:SCLgs7tqVnzdIDO5MRLgovAnc696vTTKl+8qsTu8IMM= -github.com/cosmos/ibc-go/v7 v7.1.0/go.mod h1:7MptlWeIyqmDiuJeRAFqBvXKY8Hybd+rF8vMSmGd2zg= +github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g= +github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y= +github.com/cosmos/iavl v1.0.1 h1:D+mYbcRO2wptYzOM1Hxl9cpmmHU1ZEt9T2Wv5nZTeUw= +github.com/cosmos/iavl v1.0.1/go.mod h1:8xIUkgVvwvVrBu81scdPty+/Dx9GqwHnAvXz4cwF7RY= +github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE= +github.com/cosmos/ibc-go/modules/capability v1.0.0/go.mod h1:D81ZxzjZAe0ZO5ambnvn1qedsFQ8lOwtqicG6liLBco= +github.com/cosmos/ibc-go/v8 v8.1.1 h1:N2+GA86yACcXnKWCKtqdbCwP0/Eo8pH79+6e7TicULU= +github.com/cosmos/ibc-go/v8 v8.1.1/go.mod h1:o1ipS95xpdjqNcB8Drq0eI3Sn4FRLigjll42ec1ECuU= 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/ledger-cosmos-go v0.13.3 h1:7ehuBGuyIytsXbd4MP43mLeoN2LTOEnk5nvue4rK+yM= +github.com/cosmos/ledger-cosmos-go v0.13.3/go.mod h1:HENcEP+VtahZFw38HZ3+LS3Iv5XV6svsnkk9vdJtLr8= 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.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= -github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= -github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= @@ -369,17 +403,21 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= -github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= +github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY= +github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/emicklei/dot v1.6.1 h1:ujpDlBkkwgWUY+qPId5IwapRW/xEoligRSYjioR6DFI= +github.com/emicklei/dot v1.6.1/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -391,23 +429,34 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= +github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -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/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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps= +github.com/getsentry/sentry-go v0.27.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 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= +github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= 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= @@ -416,6 +465,7 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -423,14 +473,21 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= 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 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= +github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= @@ -439,10 +496,11 @@ 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/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= 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/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= 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= @@ -454,8 +512,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= +github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= 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= @@ -490,8 +548,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw 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= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -514,17 +572,20 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= 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/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -536,24 +597,24 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= 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.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= -github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= -github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -563,37 +624,31 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= -github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= -github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= +github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= +github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= -github.com/grpc-ecosystem/go-grpc-middleware v1.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-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= -github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= -github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= -github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= -github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= -github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -601,13 +656,19 @@ 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.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= -github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.3 h1:bN2+Fw9XPFvOCjB0UOevFIMICZ7G2XSQHzfvLUyOM5E= +github.com/hashicorp/go-getter v1.7.3/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= +github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-metrics v0.5.2 h1:ErEYO2f//CjKsUDw4SmLzelsK6L3ZmOAR/4P9iS7ruY= +github.com/hashicorp/go-metrics v0.5.2/go.mod h1:KEjodfebIOuBYSAe/bHTm+HChmKSxAOXPBieMLYozDE= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-plugin v1.5.2 h1:aWv8eimFqWlsEiMrYZdPYl+FdHaBJSN4AWwGWfT1G2Y= +github.com/hashicorp/go-plugin v1.5.2/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= @@ -615,22 +676,25 @@ github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoD github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= -github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= +github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -639,6 +703,8 @@ github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0Jr 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/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= +github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= @@ -647,7 +713,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFonzls= +github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k= 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= @@ -663,6 +730,7 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= @@ -676,27 +744,29 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= -github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/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/linxGnu/grocksdb v1.8.12 h1:1/pCztQUOa3BX/1gR3jSZDoaKFpeHFvQ1XrqZpSvZVo= +github.com/linxGnu/grocksdb v1.8.12/go.mod h1:xZCIb5Muw+nhbDK4Y5UJuOrin5MceOuiXkVUR7vp4WY= 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.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= @@ -704,6 +774,7 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= @@ -712,17 +783,13 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx 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/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= -github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -744,6 +811,7 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -760,22 +828,32 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dlRvE5fWabOchtH7znfiFCcOvmIYgOeAS5ifBXBlh9Q= +github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= 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/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= +github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= +github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= +github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= +github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -785,28 +863,32 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= +github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml/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/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= +github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= -github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc h1:8bQZVK1X6BJR/6nYUPxQEP+ReTsceJTKizeuwjWOPUA= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= @@ -814,52 +896,55 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= +github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/common v0.47.0 h1:p5Cz0FNHo7SnWOmWmoRozVcjEp0bIVU8cV7OShpjL1k= +github.com/prometheus/common v0.47.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= -github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= -github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= 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/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGnWA97M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xid v1.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/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= @@ -870,41 +955,43 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -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/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= 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.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= -github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= +github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -912,26 +999,28 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.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/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -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/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI= +github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/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/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= +github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= +github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= 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= @@ -945,13 +1034,13 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= -github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= -github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= +github.com/zondax/hid v0.9.2 h1:WCJFnEDMiqGF64nlZz28E9qLVZ0KSJ7xpc5DLEyma2U= +github.com/zondax/hid v0.9.2/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= +github.com/zondax/ledger-go v0.14.3 h1:wEpJt2CEcBJ428md/5MgSLsXLBos98sBOyxNmCjfUCw= +github.com/zondax/ledger-go v0.14.3/go.mod h1:IKKaoxupuB43g4NxeQmbLXv7T9AlQyie1UpHb342ycI= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= -go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= +go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= +go.etcd.io/bbolt v1.3.8/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= @@ -964,15 +1053,33 @@ 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/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= +go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= +go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= 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= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -981,15 +1088,11 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-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.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1001,8 +1104,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-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1029,7 +1132,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1071,14 +1175,12 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/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-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1091,8 +1193,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= 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= @@ -1118,8 +1220,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= +golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -1134,7 +1236,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= 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= @@ -1191,13 +1294,11 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w 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-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-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/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-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1210,6 +1311,7 @@ golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBc 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-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1229,17 +1331,17 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= 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= @@ -1251,12 +1353,14 @@ 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.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1278,6 +1382,7 @@ golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1311,7 +1416,6 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -1319,7 +1423,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1378,8 +1483,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es= -google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= +google.golang.org/api v0.162.0 h1:Vhs54HkaEpkMBdgGdOT2P6F0csGG/vxDS0hWHJzmmps= +google.golang.org/api v0.162.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYlAHs0= 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= @@ -1387,8 +1492,9 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1427,10 +1533,8 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= 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= @@ -1497,8 +1601,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= +google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 h1:x9PwdEgd11LgK+orcck69WVRo7DezSO4VUMPI4xpc8A= +google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go.mod h1:rbHMSEDyoYX62nRVLOCc4Qt1HbsdytAYoVwgjiOhF3I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= 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.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1540,8 +1648,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= -google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1558,14 +1666,15 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -1591,8 +1700,8 @@ 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/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= 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= @@ -1603,12 +1712,12 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= -pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= +pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= +pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/testutil/network/network.go b/testutil/network/network.go index 1ee6af36..c7b8d27d 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -5,13 +5,13 @@ import ( "testing" "time" + pruningtypes "cosmossdk.io/store/pruning/types" tmdb "github.com/cometbft/cometbft-db" tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" servertypes "github.com/cosmos/cosmos-sdk/server/types" - pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/testutil/network" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/alliance/keeper/asset.go b/x/alliance/keeper/asset.go index 308630cf..ad905cdf 100644 --- a/x/alliance/keeper/asset.go +++ b/x/alliance/keeper/asset.go @@ -5,7 +5,7 @@ import ( "math" "time" - "github.com/cosmos/cosmos-sdk/store" + "cosmossdk.io/store" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/alliance/keeper/grpc_query.go b/x/alliance/keeper/grpc_query.go index a2b49757..b8da7bef 100644 --- a/x/alliance/keeper/grpc_query.go +++ b/x/alliance/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( "github.com/terra-money/alliance/x/alliance/types" - "github.com/cosmos/cosmos-sdk/store/prefix" + "cosmossdk.io/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/alliance/keeper/keeper.go b/x/alliance/keeper/keeper.go index cbdf36af..a39fdf06 100644 --- a/x/alliance/keeper/keeper.go +++ b/x/alliance/keeper/keeper.go @@ -7,8 +7,8 @@ import ( "github.com/cometbft/cometbft/libs/log" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) From cdd985ef946c8bc4678cd81db2bf47adbdbfec68 Mon Sep 17 00:00:00 2001 From: kienn6034 Date: Tue, 26 Mar 2024 15:33:49 +0700 Subject: [PATCH 3/8] refactor: use sdkmath in keeper --- x/alliance/invariants.go | 7 ++++--- x/alliance/keeper/asset.go | 5 +++-- x/alliance/migrations/v4/migrations.go | 5 +++-- x/alliance/types/asset.go | 28 +++++++++++++------------- x/alliance/types/delegations.go | 3 ++- x/alliance/types/gov.go | 17 ++++++++-------- x/alliance/types/msg.go | 7 ++++--- x/alliance/types/validator.go | 18 ++++++++--------- 8 files changed, 48 insertions(+), 42 deletions(-) diff --git a/x/alliance/invariants.go b/x/alliance/invariants.go index 90a173dd..0b4f5a8b 100644 --- a/x/alliance/invariants.go +++ b/x/alliance/invariants.go @@ -3,6 +3,7 @@ package alliance import ( "fmt" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/terra-money/alliance/x/alliance/keeper" @@ -31,7 +32,7 @@ func ValidatorSharesInvariant(k keeper.Keeper) sdk.Invariant { ) assets := k.GetAllAssets(ctx) infos := k.GetAllAllianceValidatorInfo(ctx) - validatorShares := map[string]sdk.Dec{} // {denom: shares} + validatorShares := map[string]sdkmath.LegacyDec{} // {denom: shares} for _, info := range infos { for _, share := range info.ValidatorShares { if share.IsNegative() { @@ -64,7 +65,7 @@ func DelegatorSharesInvariant(k keeper.Keeper) sdk.Invariant { msg string broken bool ) - delegatorShares := map[string]map[string]sdk.Dec{} // {validator: {asset: share}} + delegatorShares := map[string]map[string]sdkmath.LegacyDec{} // {validator: {asset: share}} var hasNegativeShares bool k.IterateDelegations(ctx, func(delegation types.Delegation) bool { if delegation.Shares.IsNegative() { @@ -72,7 +73,7 @@ func DelegatorSharesInvariant(k keeper.Keeper) sdk.Invariant { return true } if delegatorShares[delegation.ValidatorAddress] == nil { - delegatorShares[delegation.ValidatorAddress] = map[string]sdk.Dec{ + delegatorShares[delegation.ValidatorAddress] = map[string]sdkmath.LegacyDec{ delegation.Denom: delegation.Shares, } } else { diff --git a/x/alliance/keeper/asset.go b/x/alliance/keeper/asset.go index ad905cdf..00ddda35 100644 --- a/x/alliance/keeper/asset.go +++ b/x/alliance/keeper/asset.go @@ -5,6 +5,7 @@ import ( "math" "time" + sdkmath "cosmossdk.io/math" "cosmossdk.io/store" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -236,7 +237,7 @@ func (k Keeper) GetAssetByDenom(ctx sdk.Context, denom string) (asset types.Alli } func (k Keeper) DeleteAsset(ctx sdk.Context, asset types.AllianceAsset) error { - if asset.TotalTokens.GT(sdk.ZeroInt()) { + if asset.TotalTokens.GT(sdkmath.ZeroInt()) { return fmt.Errorf("cannot delete alliance assets that still have tokens") } k.deleteAsset(ctx, asset.Denom) @@ -375,7 +376,7 @@ func (k Keeper) IterateAllWeightChangeSnapshot(ctx sdk.Context, cb func(denom st func (k Keeper) RewardWeightChangeHook(ctx sdk.Context, assets []*types.AllianceAsset) error { for _, asset := range assets { // If no reward changes are required, skip - if asset.RewardChangeInterval == 0 || asset.RewardChangeRate.Equal(sdk.OneDec()) { + if asset.RewardChangeInterval == 0 || asset.RewardChangeRate.Equal(sdkmath.LegacyOneDec()) { continue } // If it is not scheduled for change, skip diff --git a/x/alliance/migrations/v4/migrations.go b/x/alliance/migrations/v4/migrations.go index bc11755d..4998f48b 100644 --- a/x/alliance/migrations/v4/migrations.go +++ b/x/alliance/migrations/v4/migrations.go @@ -3,6 +3,7 @@ package v4 import ( "math" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" alliancekeeper "github.com/terra-money/alliance/x/alliance/keeper" @@ -23,8 +24,8 @@ func migrateAssetsWithDefaultRewardWeightRange(ctx sdk.Context, k alliancekeeper assets := k.GetAllAssets(ctx) for _, asset := range assets { asset.RewardWeightRange = types.RewardWeightRange{ - Min: sdk.ZeroDec(), - Max: sdk.NewDec(math.MaxInt), + Min: sdkmath.LegacyZeroDec(), + Max: sdkmath.LegacyNewDec(math.MaxInt), } if asset.RewardsStarted(ctx.BlockTime()) { asset.IsInitialized = true diff --git a/x/alliance/types/asset.go b/x/alliance/types/asset.go index a8fe8f3b..fccda03a 100644 --- a/x/alliance/types/asset.go +++ b/x/alliance/types/asset.go @@ -3,11 +3,11 @@ package types import ( "time" - cosmosmath "cosmossdk.io/math" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" ) -func NewAllianceAsset(denom string, rewardWeight sdk.Dec, minRewardWeight sdk.Dec, maxRewardWeight sdk.Dec, takeRate sdk.Dec, rewardStartTime time.Time) AllianceAsset { +func NewAllianceAsset(denom string, rewardWeight sdkmath.LegacyDec, minRewardWeight sdkmath.LegacyDec, maxRewardWeight sdkmath.LegacyDec, takeRate sdkmath.LegacyDec, rewardStartTime time.Time) AllianceAsset { return AllianceAsset{ Denom: denom, RewardWeight: rewardWeight, @@ -16,24 +16,24 @@ func NewAllianceAsset(denom string, rewardWeight sdk.Dec, minRewardWeight sdk.De Max: maxRewardWeight, }, TakeRate: takeRate, - TotalTokens: sdk.ZeroInt(), - TotalValidatorShares: sdk.ZeroDec(), + TotalTokens: sdkmath.ZeroInt(), + TotalValidatorShares: sdkmath.LegacyZeroDec(), RewardStartTime: rewardStartTime, - RewardChangeRate: sdk.OneDec(), + RewardChangeRate: sdkmath.LegacyOneDec(), RewardChangeInterval: time.Duration(0), LastRewardChangeTime: rewardStartTime, IsInitialized: false, } } -func ConvertNewTokenToShares(totalTokens sdk.Dec, totalShares sdk.Dec, newTokens cosmosmath.Int) (shares sdk.Dec) { +func ConvertNewTokenToShares(totalTokens sdkmath.LegacyDec, totalShares sdkmath.LegacyDec, newTokens sdkmath.Int) (shares sdkmath.LegacyDec) { if totalShares.IsZero() { - return sdk.NewDecFromInt(newTokens) + return sdkmath.LegacyNewDecFromInt(newTokens) } return totalShares.Quo(totalTokens).MulInt(newTokens) } -func ConvertNewShareToDecToken(totalTokens sdk.Dec, totalShares sdk.Dec, shares sdk.Dec) (token sdk.Dec) { +func ConvertNewShareToDecToken(totalTokens sdkmath.LegacyDec, totalShares sdkmath.LegacyDec, shares sdkmath.LegacyDec) (token sdkmath.LegacyDec) { if totalShares.IsZero() { return totalTokens } @@ -47,26 +47,26 @@ func GetDelegationTokens(del Delegation, val AllianceValidator, asset AllianceAs // We add a small epsilon before rounding down to make sure cases like // 9.999999 get round to 10 - delTokens = delTokens.Add(sdk.NewDecWithPrec(1, 6)) + delTokens = delTokens.Add(sdkmath.LegacyNewDecWithPrec(1, 6)) return sdk.NewCoin(asset.Denom, delTokens.TruncateInt()) } -func GetDelegationTokensWithShares(delegatorShares sdk.Dec, val AllianceValidator, asset AllianceAsset) sdk.Coin { +func GetDelegationTokensWithShares(delegatorShares sdkmath.LegacyDec, val AllianceValidator, asset AllianceAsset) sdk.Coin { valTokens := val.TotalTokensWithAsset(asset) totalDelegationShares := val.TotalDelegationSharesWithDenom(asset.Denom) delTokens := ConvertNewShareToDecToken(valTokens, totalDelegationShares, delegatorShares) // We add a small epsilon before rounding down to make sure cases like // 9.999999 get round to 10 - delTokens = delTokens.Add(sdk.NewDecWithPrec(1, 6)) + delTokens = delTokens.Add(sdkmath.LegacyNewDecWithPrec(1, 6)) return sdk.NewCoin(asset.Denom, delTokens.TruncateInt()) } -func GetDelegationSharesFromTokens(val AllianceValidator, asset AllianceAsset, token cosmosmath.Int) sdk.Dec { +func GetDelegationSharesFromTokens(val AllianceValidator, asset AllianceAsset, token sdkmath.Int) sdkmath.LegacyDec { valTokens := val.TotalTokensWithAsset(asset) totalDelegationShares := val.TotalDelegationSharesWithDenom(asset.Denom) - if totalDelegationShares.TruncateInt().Equal(sdk.ZeroInt()) { - return sdk.NewDecFromInt(token) + if totalDelegationShares.TruncateInt().Equal(sdkmath.ZeroInt()) { + return sdkmath.LegacyNewDecFromInt(token) } return ConvertNewTokenToShares(valTokens, totalDelegationShares, token) } diff --git a/x/alliance/types/delegations.go b/x/alliance/types/delegations.go index 3c5968ed..fb98aab1 100644 --- a/x/alliance/types/delegations.go +++ b/x/alliance/types/delegations.go @@ -1,10 +1,11 @@ package types import ( + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" ) -func NewDelegation(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress, denom string, shares sdk.Dec, rewardHistory []RewardHistory) Delegation { +func NewDelegation(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress, denom string, shares sdkmath.LegacyDec, rewardHistory []RewardHistory) Delegation { return Delegation{ DelegatorAddress: delAddr.String(), ValidatorAddress: valAddr.String(), diff --git a/x/alliance/types/gov.go b/x/alliance/types/gov.go index 1f87dc94..67345070 100644 --- a/x/alliance/types/gov.go +++ b/x/alliance/types/gov.go @@ -3,6 +3,7 @@ package types import ( "time" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "google.golang.org/grpc/codes" @@ -27,7 +28,7 @@ func init() { govtypes.RegisterProposalType(ProposalTypeDeleteAlliance) } -func NewMsgCreateAllianceProposal(title, description, denom string, rewardWeight sdk.Dec, rewardWeightRange RewardWeightRange, takeRate sdk.Dec, rewardChangeRate sdk.Dec, rewardChangeInterval time.Duration) govtypes.Content { +func NewMsgCreateAllianceProposal(title, description, denom string, rewardWeight sdkmath.LegacyDec, rewardWeightRange RewardWeightRange, takeRate sdkmath.LegacyDec, rewardChangeRate sdkmath.LegacyDec, rewardChangeInterval time.Duration) govtypes.Content { return &MsgCreateAllianceProposal{ Title: title, Description: description, @@ -53,12 +54,12 @@ func (m *MsgCreateAllianceProposal) ValidateBasic() error { return err } - if m.RewardWeight.IsNil() || m.RewardWeight.LT(sdk.ZeroDec()) { + if m.RewardWeight.IsNil() || m.RewardWeight.LT(sdkmath.LegacyZeroDec()) { return status.Errorf(codes.InvalidArgument, "Alliance rewardWeight must be zero or a positive number") } - if m.RewardWeightRange.Min.IsNil() || m.RewardWeightRange.Min.LT(sdk.ZeroDec()) || - m.RewardWeightRange.Max.IsNil() || m.RewardWeightRange.Max.LT(sdk.ZeroDec()) { + if m.RewardWeightRange.Min.IsNil() || m.RewardWeightRange.Min.LT(sdkmath.LegacyZeroDec()) || + m.RewardWeightRange.Max.IsNil() || m.RewardWeightRange.Max.LT(sdkmath.LegacyZeroDec()) { return status.Errorf(codes.InvalidArgument, "Alliance rewardWeight min and max must be zero or a positive number") } @@ -70,7 +71,7 @@ func (m *MsgCreateAllianceProposal) ValidateBasic() error { return status.Errorf(codes.InvalidArgument, "Alliance rewardWeight must be bounded in RewardWeightRange") } - if m.TakeRate.IsNil() || m.TakeRate.IsNegative() || m.TakeRate.GTE(sdk.OneDec()) { + if m.TakeRate.IsNil() || m.TakeRate.IsNegative() || m.TakeRate.GTE(sdkmath.LegacyOneDec()) { return status.Errorf(codes.InvalidArgument, "Alliance takeRate must be more or equals to 0 but strictly less than 1") } @@ -85,7 +86,7 @@ func (m *MsgCreateAllianceProposal) ValidateBasic() error { return nil } -func NewMsgUpdateAllianceProposal(title, description, denom string, rewardWeight, takeRate sdk.Dec, rewardChangeRate sdk.Dec, rewardChangeInterval time.Duration) govtypes.Content { +func NewMsgUpdateAllianceProposal(title, description, denom string, rewardWeight, takeRate sdkmath.LegacyDec, rewardChangeRate sdkmath.LegacyDec, rewardChangeInterval time.Duration) govtypes.Content { return &MsgUpdateAllianceProposal{ Title: title, Description: description, @@ -106,11 +107,11 @@ func (m *MsgUpdateAllianceProposal) ValidateBasic() error { return status.Errorf(codes.InvalidArgument, "Alliance denom must have a value") } - if m.RewardWeight.IsNil() || m.RewardWeight.LT(sdk.ZeroDec()) { + if m.RewardWeight.IsNil() || m.RewardWeight.LT(sdkmath.LegacyZeroDec()) { return status.Errorf(codes.InvalidArgument, "Alliance rewardWeight must be zero or a positive number") } - if m.TakeRate.IsNil() || m.TakeRate.IsNegative() || m.TakeRate.GTE(sdk.OneDec()) { + if m.TakeRate.IsNil() || m.TakeRate.IsNegative() || m.TakeRate.GTE(sdkmath.LegacyOneDec()) { return status.Errorf(codes.InvalidArgument, "Alliance takeRate must be more or equals to 0 but strictly less than 1") } diff --git a/x/alliance/types/msg.go b/x/alliance/types/msg.go index 585883b3..0f62c6c3 100644 --- a/x/alliance/types/msg.go +++ b/x/alliance/types/msg.go @@ -1,6 +1,7 @@ package types import ( + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" "google.golang.org/grpc/codes" @@ -43,7 +44,7 @@ func (msg MsgDelegate) Route() string { } func (msg MsgDelegate) ValidateBasic() error { - if !msg.Amount.Amount.GT(sdk.ZeroInt()) { + if !msg.Amount.Amount.GT(sdkmath.ZeroInt()) { return status.Errorf(codes.InvalidArgument, "Alliance delegation amount must be more than zero") } return nil @@ -77,7 +78,7 @@ func (msg MsgRedelegate) Route() string { } func (msg MsgRedelegate) ValidateBasic() error { - if msg.Amount.Amount.LTE(sdk.ZeroInt()) { + if msg.Amount.Amount.LTE(sdkmath.ZeroInt()) { return status.Errorf(codes.InvalidArgument, "Alliance redelegation amount must be more than zero") } return nil @@ -110,7 +111,7 @@ func (msg MsgUndelegate) Route() string { } func (msg MsgUndelegate) ValidateBasic() error { - if msg.Amount.Amount.LTE(sdk.ZeroInt()) { + if msg.Amount.Amount.LTE(sdkmath.ZeroInt()) { return status.Errorf(codes.InvalidArgument, "Alliance undelegate amount must be more than zero") } return nil diff --git a/x/alliance/types/validator.go b/x/alliance/types/validator.go index 0ff5d0d1..a086c9ed 100644 --- a/x/alliance/types/validator.go +++ b/x/alliance/types/validator.go @@ -1,7 +1,7 @@ package types import ( - cosmosmath "cosmossdk.io/math" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) @@ -37,7 +37,7 @@ func SubtractDecCoinsWithRounding(d1s sdk.DecCoins, d2s sdk.DecCoins) sdk.DecCoi for _, d2 := range d2s { a1 := d1s.AmountOf(d2.Denom) a2 := d2.Amount - if a2.GT(a1) && a2.Sub(a1).LT(sdk.OneDec()) { + if a2.GT(a1) && a2.Sub(a1).LT(sdkmath.LegacyOneDec()) { d1Copy = d1Copy.Sub(sdk.NewDecCoins(sdk.NewDecCoinFromDec(d2.Denom, a1))) } else { d1Copy = d1Copy.Sub(sdk.NewDecCoins(d2)) @@ -46,26 +46,26 @@ func SubtractDecCoinsWithRounding(d1s sdk.DecCoins, d2s sdk.DecCoins) sdk.DecCoi return d1Copy } -func (v AllianceValidator) ValidatorSharesWithDenom(denom string) sdk.Dec { +func (v AllianceValidator) ValidatorSharesWithDenom(denom string) sdkmath.LegacyDec { // This is used instead of coins.AmountOf to reduce the need for regex matching to speed up the query for _, c := range v.ValidatorShares { if c.Denom == denom { return c.Amount } } - return sdk.ZeroDec() + return sdkmath.LegacyZeroDec() } -func (v AllianceValidator) TotalDelegationSharesWithDenom(denom string) sdk.Dec { +func (v AllianceValidator) TotalDelegationSharesWithDenom(denom string) sdkmath.LegacyDec { return sdk.DecCoins(v.TotalDelegatorShares).AmountOf(denom) } -func (v AllianceValidator) TotalTokensWithAsset(asset AllianceAsset) sdk.Dec { +func (v AllianceValidator) TotalTokensWithAsset(asset AllianceAsset) sdkmath.LegacyDec { shares := v.ValidatorSharesWithDenom(asset.Denom) - dec := ConvertNewShareToDecToken(sdk.NewDecFromInt(asset.TotalTokens), asset.TotalValidatorShares, shares) + dec := ConvertNewShareToDecToken(sdkmath.LegacyNewDecFromInt(asset.TotalTokens), asset.TotalValidatorShares, shares) return dec } -func GetValidatorShares(asset AllianceAsset, token cosmosmath.Int) sdk.Dec { - return ConvertNewTokenToShares(sdk.NewDecFromInt(asset.TotalTokens), asset.TotalValidatorShares, token) +func GetValidatorShares(asset AllianceAsset, token sdkmath.Int) sdkmath.LegacyDec { + return ConvertNewTokenToShares(sdkmath.LegacyNewDecFromInt(asset.TotalTokens), asset.TotalValidatorShares, token) } From 557cdc12908a78725e84390277eae17957587227 Mon Sep 17 00:00:00 2001 From: kienn6034 Date: Tue, 26 Mar 2024 15:42:16 +0700 Subject: [PATCH 4/8] refactor: sdk math in other test file --- app/test_helpers.go | 3 +- .../tests/e2e/delegate_undelegate_test.go | 145 +++++++++--------- x/alliance/tests/e2e/test_helper.go | 7 +- x/alliance/tests/simulation/genesis.go | 9 +- x/alliance/tests/simulation/operations.go | 5 +- x/alliance/types/tests/types_test.go | 19 +-- x/alliance/types/tests/validator_test.go | 49 +++--- 7 files changed, 122 insertions(+), 115 deletions(-) diff --git a/app/test_helpers.go b/app/test_helpers.go index cf07581d..9da58363 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -11,6 +11,7 @@ import ( "time" cosmoserrors "cosmossdk.io/errors" + sdkmath "cosmossdk.io/math" pruningtypes "cosmossdk.io/store/pruning/types" bam "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" @@ -59,7 +60,7 @@ func Setup(t *testing.T) *App { acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0) balance := banktypes.Balance{ Address: acc.GetAddress().String(), - Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000000000000))), + Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(100000000000000))), } app := SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, balance) diff --git a/x/alliance/tests/e2e/delegate_undelegate_test.go b/x/alliance/tests/e2e/delegate_undelegate_test.go index 93000519..d4fa2145 100644 --- a/x/alliance/tests/e2e/delegate_undelegate_test.go +++ b/x/alliance/tests/e2e/delegate_undelegate_test.go @@ -8,6 +8,7 @@ import ( "github.com/terra-money/alliance/x/alliance/keeper" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -23,15 +24,15 @@ var ( // This test makes sure that full undelegation after some take rate has been // applied will not cause a division by zero error. func TestDelegateThenTakeRateThenUndelegate(t *testing.T) { - app, ctx, vals, dels := setupApp(t, 5, 2, sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1000000000000000000)))) + app, ctx, vals, dels := setupApp(t, 5, 2, sdk.NewCoins(sdk.NewCoin("test", sdkmath.NewInt(1000000000000000000)))) err := app.AllianceKeeper.CreateAlliance(ctx, &types.MsgCreateAllianceProposal{ Title: "", Description: "", Denom: "test", - RewardWeight: sdk.MustNewDecFromStr("0.03"), - RewardWeightRange: types.RewardWeightRange{Min: sdk.ZeroDec(), Max: sdk.MustNewDecFromStr("0.1")}, - TakeRate: sdk.MustNewDecFromStr("0.02"), - RewardChangeRate: sdk.MustNewDecFromStr("0.01"), + RewardWeight: sdkmath.LegacyMustNewDecFromStr("0.03"), + RewardWeightRange: types.RewardWeightRange{Min: sdkmath.LegacyZeroDec(), Max: sdkmath.LegacyMustNewDecFromStr("0.1")}, + TakeRate: sdkmath.LegacyMustNewDecFromStr("0.02"), + RewardChangeRate: sdkmath.LegacyMustNewDecFromStr("0.01"), RewardChangeInterval: time.Second * 60, }) require.NoError(t, err) @@ -39,12 +40,12 @@ func TestDelegateThenTakeRateThenUndelegate(t *testing.T) { val0, err := app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, dels[0], val0, sdk.NewCoin("test", sdk.NewInt(100033333333333333))) + _, err = app.AllianceKeeper.Delegate(ctx, dels[0], val0, sdk.NewCoin("test", sdkmath.NewInt(100033333333333333))) require.NoError(t, err) val0, err = app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) require.NoError(t, err) - require.Equal(t, sdk.NewDec(100033333333333333), sdk.DecCoins(val0.TotalDelegatorShares).AmountOf("test")) + require.Equal(t, sdkmath.LegacyNewDec(100033333333333333), sdk.DecCoins(val0.TotalDelegatorShares).AmountOf("test")) lastClaim := ctx.BlockTime() ctx = ctx.WithBlockTime(ctx.BlockTime().Add(time.Hour)) @@ -66,9 +67,9 @@ func TestDelegateThenTakeRateThenUndelegate(t *testing.T) { val0, err = app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) require.NoError(t, err) - require.Equal(t, sdk.ZeroDec(), sdk.DecCoins(val0.ValidatorShares).AmountOf("test")) + require.Equal(t, sdkmath.LegacyZeroDec(), sdk.DecCoins(val0.ValidatorShares).AmountOf("test")) - _, err = app.AllianceKeeper.Delegate(ctx, dels[0], val0, sdk.NewCoin("test", sdk.NewInt(33333))) + _, err = app.AllianceKeeper.Delegate(ctx, dels[0], val0, sdk.NewCoin("test", sdkmath.NewInt(33333))) require.NoError(t, err) _, stop := alliance.RunAllInvariants(ctx, app.AllianceKeeper) @@ -79,15 +80,15 @@ func TestDelegateThenTakeRateThenUndelegate(t *testing.T) { // This test makes sure that full redelegation after some take rate has been // applied will not cause a division by zero error. Also ensure that dust delegations are not kept around func TestDelegateThenTakeRateThenRedelegate(t *testing.T) { - app, ctx, vals, dels := setupApp(t, 5, 2, sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1000000000000000000)))) + app, ctx, vals, dels := setupApp(t, 5, 2, sdk.NewCoins(sdk.NewCoin("test", sdkmath.NewInt(1000000000000000000)))) err := app.AllianceKeeper.CreateAlliance(ctx, &types.MsgCreateAllianceProposal{ Title: "", Description: "", Denom: "test", - RewardWeight: sdk.MustNewDecFromStr("0.03"), - RewardWeightRange: types.RewardWeightRange{Min: sdk.ZeroDec(), Max: sdk.MustNewDecFromStr("0.1")}, - TakeRate: sdk.MustNewDecFromStr("0.02"), - RewardChangeRate: sdk.MustNewDecFromStr("0.01"), + RewardWeight: sdkmath.LegacyMustNewDecFromStr("0.03"), + RewardWeightRange: types.RewardWeightRange{Min: sdkmath.LegacyZeroDec(), Max: sdkmath.LegacyMustNewDecFromStr("0.1")}, + TakeRate: sdkmath.LegacyMustNewDecFromStr("0.02"), + RewardChangeRate: sdkmath.LegacyMustNewDecFromStr("0.01"), RewardChangeInterval: time.Second * 60, }) require.NoError(t, err) @@ -97,12 +98,12 @@ func TestDelegateThenTakeRateThenRedelegate(t *testing.T) { val1, err := app.AllianceKeeper.GetAllianceValidator(ctx, vals[1]) require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, dels[0], val0, sdk.NewCoin("test", sdk.NewInt(100033333333333333))) + _, err = app.AllianceKeeper.Delegate(ctx, dels[0], val0, sdk.NewCoin("test", sdkmath.NewInt(100033333333333333))) require.NoError(t, err) val0, err = app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) require.NoError(t, err) - require.Equal(t, sdk.NewDec(100033333333333333), sdk.DecCoins(val0.TotalDelegatorShares).AmountOf("test")) + require.Equal(t, sdkmath.LegacyNewDec(100033333333333333), sdk.DecCoins(val0.TotalDelegatorShares).AmountOf("test")) lastClaim := ctx.BlockTime() ctx = ctx.WithBlockTime(ctx.BlockTime().Add(time.Hour)) @@ -124,9 +125,9 @@ func TestDelegateThenTakeRateThenRedelegate(t *testing.T) { val0, err = app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) require.NoError(t, err) - require.Equal(t, sdk.ZeroDec(), sdk.DecCoins(val0.ValidatorShares).AmountOf("test")) + require.Equal(t, sdkmath.LegacyZeroDec(), sdk.DecCoins(val0.ValidatorShares).AmountOf("test")) - _, err = app.AllianceKeeper.Delegate(ctx, dels[0], val0, sdk.NewCoin("test", sdk.NewInt(33333))) + _, err = app.AllianceKeeper.Delegate(ctx, dels[0], val0, sdk.NewCoin("test", sdkmath.NewInt(33333))) require.NoError(t, err) _, stop := alliance.RunAllInvariants(ctx, app.AllianceKeeper) @@ -137,8 +138,8 @@ func TestDelegateThenTakeRateThenRedelegate(t *testing.T) { // Re-balancing event should ignore small delegations < 1 utoken since it rounds down to 0. func TestDelegatingASmallAmount(t *testing.T) { app, ctx, vals, dels := setupApp(t, 2, 3, sdk.NewCoins( - sdk.NewCoin(allianceAsset1, sdk.NewInt(1000000000000000000)), - sdk.NewCoin(allianceAsset2, sdk.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset1, sdkmath.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000000000000000000)), )) startTime := time.Now() ctx = ctx.WithBlockTime(startTime).WithBlockHeight(1) @@ -147,15 +148,15 @@ func TestDelegatingASmallAmount(t *testing.T) { app.AllianceKeeper.InitGenesis(ctx, &types.GenesisState{ Params: params, Assets: []types.AllianceAsset{ - types.NewAllianceAsset(allianceAsset1, sdk.NewDec(2), sdk.NewDec(0), sdk.NewDec(5), sdk.NewDec(0), ctx.BlockTime()), - types.NewAllianceAsset(allianceAsset2, sdk.NewDec(10), sdk.NewDec(2), sdk.NewDec(12), sdk.MustNewDecFromStr("0.1"), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset1, sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(0), sdkmath.LegacyNewDec(5), sdkmath.LegacyNewDec(0), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset2, sdkmath.LegacyNewDec(10), sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(12), sdkmath.LegacyMustNewDecFromStr("0.1"), ctx.BlockTime()), }, }) queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation distParams := app.DistrKeeper.GetParams(ctx) - distParams.CommunityTax = sdk.ZeroDec() + distParams.CommunityTax = sdkmath.LegacyZeroDec() err := app.DistrKeeper.SetParams(ctx, distParams) require.NoError(t, err) @@ -168,9 +169,9 @@ func TestDelegatingASmallAmount(t *testing.T) { require.NoError(t, err) // Delegate token with non-zero take_rate - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(100))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(100))) require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000_000_000))) + _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000_000_000))) require.NoError(t, err) assets := app.AllianceKeeper.GetAllAssets(ctx) @@ -189,7 +190,7 @@ func TestDelegatingASmallAmount(t *testing.T) { require.NoError(t, err) del := res.GetDelegation() - _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000_000_000))) + _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000_000_000))) require.Error(t, err) // Undelegate token with current amount should pass @@ -201,12 +202,12 @@ func TestDelegatingASmallAmount(t *testing.T) { require.False(t, found) // Delegate again - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(500_000_000))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(500_000_000))) require.NoError(t, err) ctx = ctx.WithBlockTime(ctx.BlockTime().Add(time.Minute * 1)).WithBlockHeight(2) - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(400_000_000))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(400_000_000))) require.NoError(t, err) ctx = ctx.WithBlockTime(ctx.BlockTime().Add(time.Minute * 5)).WithBlockHeight(3) @@ -222,7 +223,7 @@ func TestDelegatingASmallAmount(t *testing.T) { }) require.NoError(t, err) del = res.GetDelegation() - require.True(t, del.GetBalance().Amount.LT(sdk.NewInt(900_000_000)), "%s should be less than %s", del.GetBalance().Amount, sdk.NewInt(1000_000_000)) + require.True(t, del.GetBalance().Amount.LT(sdkmath.NewInt(900_000_000)), "%s should be less than %s", del.GetBalance().Amount, sdkmath.NewInt(1000_000_000)) // Undelegate token with current amount should pass _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, del.Balance.Amount)) @@ -247,14 +248,14 @@ func TestDelegatingASmallAmount(t *testing.T) { require.NoError(t, err) require.True(t, len(unbondings) == 1) require.Equal(t, val1.GetOperator().String(), unbondings[0].ValidatorAddress) - require.Equal(t, sdk.NewInt(100), unbondings[0].Amount) + require.Equal(t, sdkmath.NewInt(100), unbondings[0].Amount) // Query the unbondings in progress unbondings, err = app.AllianceKeeper.GetUnbondings(ctx, allianceAsset2, user1, val1.GetOperator()) require.NoError(t, err) require.True(t, len(unbondings) == 1) require.Equal(t, val1.GetOperator().String(), unbondings[0].ValidatorAddress) - require.Equal(t, sdk.NewInt(100), unbondings[0].Amount) + require.Equal(t, sdkmath.NewInt(100), unbondings[0].Amount) } // This test replicates this issue where there are large amounts of tokens delegated, @@ -262,8 +263,8 @@ func TestDelegatingASmallAmount(t *testing.T) { // E.g. When user delegated 200 tokens, there was an issue such that it showed 199 tokens instead func TestDelegateAndUndelegateWithSmallAmounts(t *testing.T) { app, ctx, vals, dels := setupApp(t, 5, 2, sdk.NewCoins( - sdk.NewCoin(allianceAsset1, sdk.NewInt(2000_000_000_000_000_000)), - sdk.NewCoin(allianceAsset2, sdk.NewInt(2000_000_000_000_000_000)), + sdk.NewCoin(allianceAsset1, sdkmath.NewInt(2000_000_000_000_000_000)), + sdk.NewCoin(allianceAsset2, sdkmath.NewInt(2000_000_000_000_000_000)), )) startTime := time.Now() ctx = ctx.WithBlockTime(startTime).WithBlockHeight(1) @@ -272,15 +273,15 @@ func TestDelegateAndUndelegateWithSmallAmounts(t *testing.T) { app.AllianceKeeper.InitGenesis(ctx, &types.GenesisState{ Params: params, Assets: []types.AllianceAsset{ - types.NewAllianceAsset(allianceAsset1, sdk.NewDec(2), sdk.NewDec(0), sdk.NewDec(5), sdk.NewDec(0), ctx.BlockTime()), - types.NewAllianceAsset(allianceAsset2, sdk.NewDec(10), sdk.NewDec(2), sdk.NewDec(12), sdk.MustNewDecFromStr("0.1"), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset1, sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(0), sdkmath.LegacyNewDec(5), sdkmath.LegacyNewDec(0), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset2, sdkmath.LegacyNewDec(10), sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(12), sdkmath.LegacyMustNewDecFromStr("0.1"), ctx.BlockTime()), }, }) queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation distParams := app.DistrKeeper.GetParams(ctx) - distParams.CommunityTax = sdk.ZeroDec() + distParams.CommunityTax = sdkmath.LegacyZeroDec() err := app.DistrKeeper.SetParams(ctx, distParams) require.NoError(t, err) @@ -294,9 +295,9 @@ func TestDelegateAndUndelegateWithSmallAmounts(t *testing.T) { user2 := dels[1] // Delegate token with non-zero take_rate - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(200))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(200))) require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000_000_000_000_000_000))) + _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000_000_000_000_000_000))) require.NoError(t, err) assets := app.AllianceKeeper.GetAllAssets(ctx) @@ -315,9 +316,9 @@ func TestDelegateAndUndelegateWithSmallAmounts(t *testing.T) { del := res.GetDelegation() // Undelegate token with initial amount should fail - _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000_000_000_000_000_000))) + _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000_000_000_000_000_000))) require.Error(t, err) - require.Equal(t, del.Balance.Amount, sdk.NewInt(200)) + require.Equal(t, del.Balance.Amount, sdkmath.NewInt(200)) // Undelegate token with more than current amount still pass _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, del.Balance) @@ -329,8 +330,8 @@ func TestDelegateAndUndelegateWithSmallAmounts(t *testing.T) { // the delegation. func TestUnDelegatingSlightlyMoreCoin(t *testing.T) { app, ctx, vals, dels := setupApp(t, 5, 2, sdk.NewCoins( - sdk.NewCoin(allianceAsset1, sdk.NewInt(1000000000000000000)), - sdk.NewCoin(allianceAsset2, sdk.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset1, sdkmath.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000000000000000000)), )) startTime := time.Now() ctx = ctx.WithBlockTime(startTime).WithBlockHeight(1) @@ -339,15 +340,15 @@ func TestUnDelegatingSlightlyMoreCoin(t *testing.T) { app.AllianceKeeper.InitGenesis(ctx, &types.GenesisState{ Params: params, Assets: []types.AllianceAsset{ - types.NewAllianceAsset(allianceAsset1, sdk.NewDec(2), sdk.NewDec(0), sdk.NewDec(5), sdk.NewDec(0), ctx.BlockTime()), - types.NewAllianceAsset(allianceAsset2, sdk.NewDec(10), sdk.NewDec(2), sdk.NewDec(12), sdk.MustNewDecFromStr("0.1"), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset1, sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(0), sdkmath.LegacyNewDec(5), sdkmath.LegacyNewDec(0), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset2, sdkmath.LegacyNewDec(10), sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(12), sdkmath.LegacyMustNewDecFromStr("0.1"), ctx.BlockTime()), }, }) queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation distParams := app.DistrKeeper.GetParams(ctx) - distParams.CommunityTax = sdk.ZeroDec() + distParams.CommunityTax = sdkmath.LegacyZeroDec() err := app.DistrKeeper.SetParams(ctx, distParams) require.NoError(t, err) @@ -361,9 +362,9 @@ func TestUnDelegatingSlightlyMoreCoin(t *testing.T) { user2 := dels[1] // Delegate token with non-zero take_rate - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(5000))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(5000))) require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000_000_000))) + _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000_000_000))) require.NoError(t, err) assets := app.AllianceKeeper.GetAllAssets(ctx) @@ -381,7 +382,7 @@ func TestUnDelegatingSlightlyMoreCoin(t *testing.T) { del := res.GetDelegation() // Undelegate token with initial amount should fail - _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000_000_000))) + _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000_000_000))) require.Error(t, err) // Undelegate token with more than current amount should fail @@ -394,8 +395,8 @@ func TestUnDelegatingSlightlyMoreCoin(t *testing.T) { // the delegation. func TestReDelegatingSlightlyMoreCoin(t *testing.T) { app, ctx, vals, dels := setupApp(t, 5, 2, sdk.NewCoins( - sdk.NewCoin(allianceAsset1, sdk.NewInt(1000000000000000000)), - sdk.NewCoin(allianceAsset2, sdk.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset1, sdkmath.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000000000000000000)), )) startTime := time.Now() ctx = ctx.WithBlockTime(startTime).WithBlockHeight(1) @@ -404,15 +405,15 @@ func TestReDelegatingSlightlyMoreCoin(t *testing.T) { app.AllianceKeeper.InitGenesis(ctx, &types.GenesisState{ Params: params, Assets: []types.AllianceAsset{ - types.NewAllianceAsset(allianceAsset1, sdk.NewDec(2), sdk.NewDec(0), sdk.NewDec(5), sdk.NewDec(0), ctx.BlockTime()), - types.NewAllianceAsset(allianceAsset2, sdk.NewDec(10), sdk.NewDec(2), sdk.NewDec(12), sdk.MustNewDecFromStr("0.1"), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset1, sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(0), sdkmath.LegacyNewDec(5), sdkmath.LegacyNewDec(0), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset2, sdkmath.LegacyNewDec(10), sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(12), sdkmath.LegacyMustNewDecFromStr("0.1"), ctx.BlockTime()), }, }) queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation distParams := app.DistrKeeper.GetParams(ctx) - distParams.CommunityTax = sdk.ZeroDec() + distParams.CommunityTax = sdkmath.LegacyZeroDec() err := app.DistrKeeper.SetParams(ctx, distParams) require.NoError(t, err) @@ -426,9 +427,9 @@ func TestReDelegatingSlightlyMoreCoin(t *testing.T) { user2 := dels[1] // Delegate token with non-zero take_rate - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(5000))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(5000))) require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000_000_000))) + _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000_000_000))) require.NoError(t, err) assets := app.AllianceKeeper.GetAllAssets(ctx) @@ -446,7 +447,7 @@ func TestReDelegatingSlightlyMoreCoin(t *testing.T) { del := res.GetDelegation() // Undelegate token with initial amount should fail - _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000_000_000))) + _, err = app.AllianceKeeper.Undelegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000_000_000))) require.Error(t, err) // Undelegate token with more than current amount should fail @@ -456,23 +457,23 @@ func TestReDelegatingSlightlyMoreCoin(t *testing.T) { func TestDustValidatorSharesAfterUndelegationError(t *testing.T) { app, ctx, vals, addrs := setupApp(t, 5, 2, sdk.NewCoins( - sdk.NewCoin(allianceAsset1, sdk.NewInt(1000000000000000000)), - sdk.NewCoin(allianceAsset2, sdk.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset1, sdkmath.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000000000000000000)), )) startTime := time.Now() ctx = ctx.WithBlockTime(startTime).WithBlockHeight(1) app.AllianceKeeper.InitGenesis(ctx, &types.GenesisState{ Params: types.DefaultParams(), Assets: []types.AllianceAsset{ - types.NewAllianceAsset(allianceAsset1, sdk.NewDec(2), sdk.NewDec(0), sdk.NewDec(5), sdk.NewDec(0), ctx.BlockTime()), - types.NewAllianceAsset(allianceAsset2, sdk.MustNewDecFromStr("10"), sdk.NewDec(5), sdk.NewDec(0), sdk.MustNewDecFromStr("0.1"), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset1, sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(0), sdkmath.LegacyNewDec(5), sdkmath.LegacyNewDec(0), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset2, sdkmath.LegacyMustNewDecFromStr("10"), sdkmath.LegacyNewDec(5), sdkmath.LegacyNewDec(0), sdkmath.LegacyMustNewDecFromStr("0.1"), ctx.BlockTime()), }, }) queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation distParams := app.DistrKeeper.GetParams(ctx) - distParams.CommunityTax = sdk.ZeroDec() + distParams.CommunityTax = sdkmath.LegacyZeroDec() err := app.DistrKeeper.SetParams(ctx, distParams) require.NoError(t, err) @@ -486,9 +487,9 @@ func TestDustValidatorSharesAfterUndelegationError(t *testing.T) { user2 := addrs[1] // Delegate token with non-zero take_rate - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000))) require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdk.NewInt(0))) + _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(0))) require.NoError(t, err) assets := app.AllianceKeeper.GetAllAssets(ctx) @@ -519,29 +520,29 @@ func TestDustValidatorSharesAfterUndelegationError(t *testing.T) { require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(200))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(200))) require.NoError(t, err) } func TestDustValidatorSharesAfterRedelegationError(t *testing.T) { app, ctx, vals, addrs := setupApp(t, 5, 2, sdk.NewCoins( - sdk.NewCoin(allianceAsset1, sdk.NewInt(1000000000000000000)), - sdk.NewCoin(allianceAsset2, sdk.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset1, sdkmath.NewInt(1000000000000000000)), + sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000000000000000000)), )) startTime := time.Now() ctx = ctx.WithBlockTime(startTime).WithBlockHeight(1) app.AllianceKeeper.InitGenesis(ctx, &types.GenesisState{ Params: types.DefaultParams(), Assets: []types.AllianceAsset{ - types.NewAllianceAsset(allianceAsset1, sdk.NewDec(2), sdk.NewDec(0), sdk.NewDec(5), sdk.NewDec(0), ctx.BlockTime()), - types.NewAllianceAsset(allianceAsset2, sdk.MustNewDecFromStr("10"), sdk.NewDec(5), sdk.NewDec(0), sdk.MustNewDecFromStr("0.1"), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset1, sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(0), sdkmath.LegacyNewDec(5), sdkmath.LegacyNewDec(0), ctx.BlockTime()), + types.NewAllianceAsset(allianceAsset2, sdkmath.LegacyMustNewDecFromStr("10"), sdkmath.LegacyNewDec(5), sdkmath.LegacyNewDec(0), sdkmath.LegacyMustNewDecFromStr("0.1"), ctx.BlockTime()), }, }) queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation distParams := app.DistrKeeper.GetParams(ctx) - distParams.CommunityTax = sdk.ZeroDec() + distParams.CommunityTax = sdkmath.LegacyZeroDec() err := app.DistrKeeper.SetParams(ctx, distParams) require.NoError(t, err) @@ -555,9 +556,9 @@ func TestDustValidatorSharesAfterRedelegationError(t *testing.T) { user2 := addrs[1] // Delegate token with non-zero take_rate - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(1000))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(1000))) require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdk.NewInt(0))) + _, err = app.AllianceKeeper.Delegate(ctx, user2, val2, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(0))) require.NoError(t, err) assets := app.AllianceKeeper.GetAllAssets(ctx) @@ -588,6 +589,6 @@ func TestDustValidatorSharesAfterRedelegationError(t *testing.T) { require.NoError(t, err) - _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdk.NewInt(200))) + _, err = app.AllianceKeeper.Delegate(ctx, user1, val1, sdk.NewCoin(allianceAsset2, sdkmath.NewInt(200))) require.NoError(t, err) } diff --git a/x/alliance/tests/e2e/test_helper.go b/x/alliance/tests/e2e/test_helper.go index 34c724cd..4b1d6c0d 100644 --- a/x/alliance/tests/e2e/test_helper.go +++ b/x/alliance/tests/e2e/test_helper.go @@ -9,6 +9,7 @@ import ( teststaking "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + sdkmath "cosmossdk.io/math" test_helpers "github.com/terra-money/alliance/app" ) @@ -28,9 +29,9 @@ func setupApp(t *testing.T, numValidators int, numDelegators int, initBalance sd _val := teststaking.NewValidator(t, valAddr, pks[i]) _val.Commission = stakingtypes.Commission{ CommissionRates: stakingtypes.CommissionRates{ - Rate: sdk.NewDec(0), - MaxRate: sdk.NewDec(0), - MaxChangeRate: sdk.NewDec(0), + Rate: sdkmath.LegacyNewDec(0), + MaxRate: sdkmath.LegacyNewDec(0), + MaxChangeRate: sdkmath.LegacyNewDec(0), }, UpdateTime: time.Now(), } diff --git a/x/alliance/tests/simulation/genesis.go b/x/alliance/tests/simulation/genesis.go index a3d49418..95800034 100644 --- a/x/alliance/tests/simulation/genesis.go +++ b/x/alliance/tests/simulation/genesis.go @@ -5,8 +5,9 @@ import ( "math/rand" "time" + sdkmath "cosmossdk.io/math" + "github.com/cometbft/cometbft/libs/json" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/types/simulation" @@ -39,10 +40,10 @@ func RandomizedGenesisState(simState *module.SimulationState) { var allianceAssets []types.AllianceAsset for i := 0; i < numOfAllianceAssets; i++ { - rewardRate := simulation.RandomDecAmount(r, sdk.NewDec(5)) - takeRate := simulation.RandomDecAmount(r, sdk.MustNewDecFromStr("0.0005")) + rewardRate := simulation.RandomDecAmount(r, sdkmath.LegacyNewDec(5)) + takeRate := simulation.RandomDecAmount(r, sdkmath.LegacyMustNewDecFromStr("0.0005")) startTime := time.Now().Add(time.Duration(simulation.RandIntBetween(r, 60, 60*60*24*3*2)) * time.Second) - allianceAssets = append(allianceAssets, types.NewAllianceAsset(fmt.Sprintf("ASSET%d", i), rewardRate, sdk.NewDec(0), sdk.NewDec(15), takeRate, startTime)) + allianceAssets = append(allianceAssets, types.NewAllianceAsset(fmt.Sprintf("ASSET%d", i), rewardRate, sdkmath.LegacyNewDec(0), sdkmath.LegacyNewDec(15), takeRate, startTime)) } allianceGenesis := types.GenesisState{ diff --git a/x/alliance/tests/simulation/operations.go b/x/alliance/tests/simulation/operations.go index fda903c5..da87c5ef 100644 --- a/x/alliance/tests/simulation/operations.go +++ b/x/alliance/tests/simulation/operations.go @@ -5,6 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/tx" + sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -62,7 +63,7 @@ func SimulateMsgDelegate(cdc *codec.ProtoCodec, ak types.AccountKeeper, bk types } idx := simtypes.RandIntBetween(r, 0, len(assets)-1) assetToDelegate := assets[idx] - amountToDelegate := simtypes.RandomAmount(r, sdk.NewInt(1000_000_000)) + amountToDelegate := simtypes.RandomAmount(r, sdkmath.NewInt(1000_000_000)) if amountToDelegate.IsZero() { return simtypes.NoOpMsg(types.ModuleName, types.MsgRedelegateType, "0 delegate amount"), nil, nil } @@ -205,7 +206,7 @@ func SimulateMsgUndelegate(cdc *codec.ProtoCodec, ak types.AccountKeeper, bk typ asset, _ := k.GetAssetByDenom(ctx, delegation.Denom) bondedTokens := types.GetDelegationTokens(delegation, validator, asset) - amountToUndelegate := simtypes.RandomAmount(r, bondedTokens.Amount.Sub(sdk.NewInt(1))).Add(sdk.NewInt(1)) + amountToUndelegate := simtypes.RandomAmount(r, bondedTokens.Amount.Sub(sdkmath.NewInt(1))).Add(sdkmath.NewInt(1)) if amountToUndelegate.IsZero() { return simtypes.NoOpMsg(types.ModuleName, types.MsgRedelegateType, "0 undelegate amount"), nil, nil } diff --git a/x/alliance/types/tests/types_test.go b/x/alliance/types/tests/types_test.go index 03281623..0e31c164 100644 --- a/x/alliance/types/tests/types_test.go +++ b/x/alliance/types/tests/types_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" @@ -29,7 +30,7 @@ func TestMarshalJSONMsgs(t *testing.T) { }{ { "Msg Delegate", - types.NewMsgDelegate("delegator", "validator", sdk.NewCoin("Alliance", sdk.NewInt(1000000000000000000))), + types.NewMsgDelegate("delegator", "validator", sdk.NewCoin("Alliance", sdkmath.NewInt(1000000000000000000))), `{"delegator_address":"delegator","validator_address":"validator","amount":{"denom":"Alliance","amount":"1000000000000000000"}}`, }, } @@ -55,14 +56,14 @@ func TestProposalsContent(t *testing.T) { str string }{ "msg_create_alliance_proposal": { - p: types.NewMsgCreateAllianceProposal("Alliance1", "Alliance with 1", "ibc/denom1", sdk.NewDec(1), types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, sdk.NewDec(1), sdk.NewDec(1), time.Second), + p: types.NewMsgCreateAllianceProposal("Alliance1", "Alliance with 1", "ibc/denom1", sdkmath.LegacyNewDec(1), types.RewardWeightRange{Min: sdkmath.LegacyNewDec(0), Max: sdkmath.LegacyNewDec(5)}, sdkmath.LegacyNewDec(1), sdkmath.LegacyNewDec(1), time.Second), title: "Alliance1", desc: "Alliance with 1", typ: "msg_create_alliance_proposal", str: "title:\"Alliance1\" description:\"Alliance with 1\" denom:\"ibc/denom1\" reward_weight:\"1000000000000000000\" take_rate:\"1000000000000000000\" reward_change_rate:\"1000000000000000000\" reward_change_interval: reward_weight_range: ", }, "msg_update_alliance_proposal": { - p: types.NewMsgUpdateAllianceProposal("Alliance2", "Alliance with 2", "ibc/denom2", sdk.NewDec(2), sdk.NewDec(2), sdk.NewDec(2), time.Hour), + p: types.NewMsgUpdateAllianceProposal("Alliance2", "Alliance with 2", "ibc/denom2", sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(2), time.Hour), title: "Alliance2", desc: "Alliance with 2", typ: "msg_update_alliance_proposal", @@ -118,19 +119,19 @@ func TestInvalidProposalsContent(t *testing.T) { str string }{ "msg_create_alliance_proposal": { - p: types.NewMsgCreateAllianceProposal("Alliance1", "Alliance with 1", "ibc/denom1", sdk.NewDec(1), types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, sdk.NewDec(1), sdk.NewDec(1), -time.Second), + p: types.NewMsgCreateAllianceProposal("Alliance1", "Alliance with 1", "ibc/denom1", sdkmath.LegacyNewDec(1), types.RewardWeightRange{Min: sdkmath.LegacyNewDec(0), Max: sdkmath.LegacyNewDec(5)}, sdkmath.LegacyNewDec(1), sdkmath.LegacyNewDec(1), -time.Second), title: "Alliance1", desc: "Alliance with 1", typ: "msg_create_alliance_proposal", }, "msg_create_alliance_proposal_invalid_denom": { - p: types.NewMsgCreateAllianceProposal("Alliance1", "Alliance with 1", invalidDenom, sdk.NewDec(1), types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, sdk.NewDec(1), sdk.NewDec(1), time.Second), + p: types.NewMsgCreateAllianceProposal("Alliance1", "Alliance with 1", invalidDenom, sdkmath.LegacyNewDec(1), types.RewardWeightRange{Min: sdkmath.LegacyNewDec(0), Max: sdkmath.LegacyNewDec(5)}, sdkmath.LegacyNewDec(1), sdkmath.LegacyNewDec(1), time.Second), title: "Alliance1", desc: "Alliance with 1", typ: "msg_create_alliance_proposal", }, "msg_update_alliance_proposal": { - p: types.NewMsgUpdateAllianceProposal("Alliance2", "Alliance with 2", "ibc/denom2", sdk.NewDec(2), sdk.NewDec(2), sdk.NewDec(2), -time.Hour), + p: types.NewMsgUpdateAllianceProposal("Alliance2", "Alliance with 2", "ibc/denom2", sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(2), sdkmath.LegacyNewDec(2), -time.Hour), title: "Alliance2", desc: "Alliance with 2", typ: "msg_update_alliance_proposal", @@ -150,19 +151,19 @@ func TestInvalidProposalsContent(t *testing.T) { } func TestAminoJSON(t *testing.T) { - msgDelegate := types.NewMsgDelegate("delegator", "validator", sdk.NewCoin("Alliance", sdk.NewInt(1000000000000000000))) + msgDelegate := types.NewMsgDelegate("delegator", "validator", sdk.NewCoin("Alliance", sdkmath.NewInt(1000000000000000000))) require.Equal(t, `{"account_number":"1","chain_id":"foo","fee":{"amount":[],"gas":"0"},"memo":"memo","msgs":[{"type":"alliance/MsgDelegate","value":{"amount":{"amount":"1000000000000000000","denom":"Alliance"},"delegator_address":"delegator","validator_address":"validator"}}],"sequence":"1","timeout_height":"1"}`, string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgDelegate}, "memo", nil)), ) - msgUndelegate := types.NewMsgUndelegate("delegator", "validator", sdk.NewCoin("Alliance", sdk.NewInt(1000000000000000000))) + msgUndelegate := types.NewMsgUndelegate("delegator", "validator", sdk.NewCoin("Alliance", sdkmath.NewInt(1000000000000000000))) require.Equal(t, `{"account_number":"1","chain_id":"foo","fee":{"amount":[],"gas":"0"},"memo":"memo","msgs":[{"type":"alliance/MsgUndelegate","value":{"amount":{"amount":"1000000000000000000","denom":"Alliance"},"delegator_address":"delegator","validator_address":"validator"}}],"sequence":"1","timeout_height":"1"}`, string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgUndelegate}, "memo", nil)), ) - msgRedelegate := types.NewMsgRedelegate("delegator", "validator", "validator1", sdk.NewCoin("Alliance", sdk.NewInt(1000000000000000000))) + msgRedelegate := types.NewMsgRedelegate("delegator", "validator", "validator1", sdk.NewCoin("Alliance", sdkmath.NewInt(1000000000000000000))) require.Equal(t, `{"account_number":"1","chain_id":"foo","fee":{"amount":[],"gas":"0"},"memo":"memo","msgs":[{"type":"alliance/MsgRedelegate","value":{"amount":{"amount":"1000000000000000000","denom":"Alliance"},"delegator_address":"delegator","validator_dst_address":"validator1","validator_src_address":"validator"}}],"sequence":"1","timeout_height":"1"}`, string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgRedelegate}, "memo", nil)), diff --git a/x/alliance/types/tests/validator_test.go b/x/alliance/types/tests/validator_test.go index 539b5368..4ac37610 100644 --- a/x/alliance/types/tests/validator_test.go +++ b/x/alliance/types/tests/validator_test.go @@ -3,6 +3,7 @@ package tests_test import ( "testing" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -12,39 +13,39 @@ import ( func TestSubtractDecCoinsWithRounding(t *testing.T) { // Normal case a := sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("1000.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("1000.00")), - sdk.NewDecCoinFromDec("ccc", sdk.MustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("ccc", sdkmath.LegacyMustNewDecFromStr("1000.00")), ) b := sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("400.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("400.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("1000.00")), ) c := types.SubtractDecCoinsWithRounding(a, b) require.Equal(t, sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("600.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("0")), - sdk.NewDecCoinFromDec("ccc", sdk.MustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("600.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("0")), + sdk.NewDecCoinFromDec("ccc", sdkmath.LegacyMustNewDecFromStr("1000.00")), ), c) } func TestSubtractDecCoinsWithRoundingWithSmallErrors(t *testing.T) { a := sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("1000.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("1000.00")), - sdk.NewDecCoinFromDec("ccc", sdk.MustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("ccc", sdkmath.LegacyMustNewDecFromStr("1000.00")), ) b := sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("400.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("1000.90")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("400.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("1000.90")), ) c := types.SubtractDecCoinsWithRounding(a, b) require.Equal(t, sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("600.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("0")), - sdk.NewDecCoinFromDec("ccc", sdk.MustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("600.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("0")), + sdk.NewDecCoinFromDec("ccc", sdkmath.LegacyMustNewDecFromStr("1000.00")), ), c) } @@ -54,19 +55,19 @@ func TestSubtractDecCoinsWithRoundingWithBigErrors(t *testing.T) { require.NotNil(t, err) }() a := sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("1000.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("1000.00")), - sdk.NewDecCoinFromDec("ccc", sdk.MustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("ccc", sdkmath.LegacyMustNewDecFromStr("1000.00")), ) b := sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("400.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("1010.10")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("400.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("1010.10")), ) c := types.SubtractDecCoinsWithRounding(a, b) require.Equal(t, sdk.NewDecCoins( - sdk.NewDecCoinFromDec("aaa", sdk.MustNewDecFromStr("600.00")), - sdk.NewDecCoinFromDec("bbb", sdk.MustNewDecFromStr("0")), - sdk.NewDecCoinFromDec("ccc", sdk.MustNewDecFromStr("1000.00")), + sdk.NewDecCoinFromDec("aaa", sdkmath.LegacyMustNewDecFromStr("600.00")), + sdk.NewDecCoinFromDec("bbb", sdkmath.LegacyMustNewDecFromStr("0")), + sdk.NewDecCoinFromDec("ccc", sdkmath.LegacyMustNewDecFromStr("1000.00")), ), c) } From 8b3f1892c51ae0292ae9adbbc328381d443f8d67 Mon Sep 17 00:00:00 2001 From: kienn6034 Date: Tue, 26 Mar 2024 16:04:57 +0700 Subject: [PATCH 5/8] fix protogen --- proto/alliance/alliance.proto | 16 ++-- proto/alliance/delegations.proto | 2 +- proto/alliance/events.proto | 2 +- proto/alliance/gov.proto | 12 +-- proto/alliance/params.proto | 2 +- proto/alliance/unbonding.proto | 2 +- proto/buf.gen.gogo.yml | 2 +- x/alliance/types/alliance.pb.go | 114 ++++++++++++++--------------- x/alliance/types/delegations.pb.go | 78 ++++++++++---------- x/alliance/types/events.pb.go | 72 +++++++++--------- x/alliance/types/gov.pb.go | 78 ++++++++++---------- x/alliance/types/params.pb.go | 58 +++++++-------- x/alliance/types/unbonding.pb.go | 49 ++++++------- 13 files changed, 244 insertions(+), 243 deletions(-) diff --git a/proto/alliance/alliance.proto b/proto/alliance/alliance.proto index bbdfea07..64bf409d 100644 --- a/proto/alliance/alliance.proto +++ b/proto/alliance/alliance.proto @@ -14,11 +14,11 @@ message RewardWeightRange { option (gogoproto.goproto_getters) = false; string min = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string max = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -33,22 +33,22 @@ message AllianceAsset { // It does not need to sum to 1. rate = weight / total_weight // Native asset is always assumed to have a weight of 1.s string reward_weight = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; // A positive take rate is used for liquid staking derivatives. It defines an rate that is applied per take_rate_interval // that will be redirected to the distribution rewards pool string take_rate = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string total_tokens = 4 [ (cosmos_proto.scalar) = "cosmos.Int", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; string total_validator_shares = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; google.protobuf.Timestamp reward_start_time = 6 [ @@ -56,7 +56,7 @@ message AllianceAsset { (gogoproto.nullable) = false ]; string reward_change_rate = 7 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; google.protobuf.Duration reward_change_interval = 8 [ @@ -78,7 +78,7 @@ message RewardWeightChangeSnapshot { option (gogoproto.goproto_getters) = false; string prev_reward_weight = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; repeated RewardHistory reward_histories = 2 [ diff --git a/proto/alliance/delegations.proto b/proto/alliance/delegations.proto index 377506b3..72c7b84d 100644 --- a/proto/alliance/delegations.proto +++ b/proto/alliance/delegations.proto @@ -21,7 +21,7 @@ message Delegation { // shares define the delegation shares received. string shares = 4 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; repeated RewardHistory reward_history = 5 [ diff --git a/proto/alliance/events.proto b/proto/alliance/events.proto index 8cd51ed1..12d19092 100644 --- a/proto/alliance/events.proto +++ b/proto/alliance/events.proto @@ -17,7 +17,7 @@ message DelegateAllianceEvent { ]; string newShares = 4 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/proto/alliance/gov.proto b/proto/alliance/gov.proto index 3e756ebf..f2f2685b 100644 --- a/proto/alliance/gov.proto +++ b/proto/alliance/gov.proto @@ -21,18 +21,18 @@ message MsgCreateAllianceProposal { // It does not need to sum to 1. rate = weight / total_weight // Native asset is always assumed to have a weight of 1. string reward_weight = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; // A positive take rate is used for liquid staking derivatives. It defines an annualized reward rate that // will be redirected to the distribution rewards pool string take_rate = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string reward_change_rate = 6 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; @@ -61,17 +61,17 @@ message MsgUpdateAllianceProposal { // It does not need to sum to 1. rate = weight / total_weight // Native asset is always assumed to have a weight of 1. string reward_weight = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string take_rate = 5 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; string reward_change_rate = 6 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; diff --git a/proto/alliance/params.proto b/proto/alliance/params.proto index aab1ab09..f103fb91 100644 --- a/proto/alliance/params.proto +++ b/proto/alliance/params.proto @@ -31,7 +31,7 @@ message RewardHistory { string denom = 1; string index = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } \ No newline at end of file diff --git a/proto/alliance/unbonding.proto b/proto/alliance/unbonding.proto index a469ec9e..f14c7b85 100644 --- a/proto/alliance/unbonding.proto +++ b/proto/alliance/unbonding.proto @@ -19,7 +19,7 @@ message UnbondingDelegation { // amount defines the tokens to receive at completion. string amount = 3 [ (cosmos_proto.scalar) = "cosmos.Int", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } \ No newline at end of file diff --git a/proto/buf.gen.gogo.yml b/proto/buf.gen.gogo.yml index ecdd483f..c2b8cae8 100644 --- a/proto/buf.gen.gogo.yml +++ b/proto/buf.gen.gogo.yml @@ -5,4 +5,4 @@ plugins: opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types, - name: grpc-gateway out: .. - opt: logtostderr=true,allow_colon_final_segments=true \ No newline at end of file + opt: logtostderr=true,allow_colon_final_segments=true diff --git a/x/alliance/types/alliance.pb.go b/x/alliance/types/alliance.pb.go index 4a5c08ba..6d191283 100644 --- a/x/alliance/types/alliance.pb.go +++ b/x/alliance/types/alliance.pb.go @@ -4,9 +4,9 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" @@ -31,8 +31,8 @@ var _ = time.Kitchen const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type RewardWeightRange struct { - Min github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=min,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min"` - Max github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=max,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max"` + Min cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=min,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"min"` + Max cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=max,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"max"` } func (m *RewardWeightRange) Reset() { *m = RewardWeightRange{} } @@ -75,16 +75,16 @@ type AllianceAsset struct { // The reward weight specifies the ratio of rewards that will be given to each alliance asset // It does not need to sum to 1. rate = weight / total_weight // Native asset is always assumed to have a weight of 1.s - RewardWeight github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=reward_weight,json=rewardWeight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reward_weight"` + RewardWeight cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=reward_weight,json=rewardWeight,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"reward_weight"` // A positive take rate is used for liquid staking derivatives. It defines an rate that is applied per take_rate_interval // that will be redirected to the distribution rewards pool - TakeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=take_rate,json=takeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"take_rate"` - TotalTokens github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=total_tokens,json=totalTokens,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_tokens"` - TotalValidatorShares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=total_validator_shares,json=totalValidatorShares,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"total_validator_shares"` - RewardStartTime time.Time `protobuf:"bytes,6,opt,name=reward_start_time,json=rewardStartTime,proto3,stdtime" json:"reward_start_time"` - RewardChangeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,7,opt,name=reward_change_rate,json=rewardChangeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reward_change_rate"` - RewardChangeInterval time.Duration `protobuf:"bytes,8,opt,name=reward_change_interval,json=rewardChangeInterval,proto3,stdduration" json:"reward_change_interval"` - LastRewardChangeTime time.Time `protobuf:"bytes,9,opt,name=last_reward_change_time,json=lastRewardChangeTime,proto3,stdtime" json:"last_reward_change_time"` + TakeRate cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=take_rate,json=takeRate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"take_rate"` + TotalTokens cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=total_tokens,json=totalTokens,proto3,customtype=cosmossdk.io/math.Int" json:"total_tokens"` + TotalValidatorShares cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=total_validator_shares,json=totalValidatorShares,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"total_validator_shares"` + RewardStartTime time.Time `protobuf:"bytes,6,opt,name=reward_start_time,json=rewardStartTime,proto3,stdtime" json:"reward_start_time"` + RewardChangeRate cosmossdk_io_math.LegacyDec `protobuf:"bytes,7,opt,name=reward_change_rate,json=rewardChangeRate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"reward_change_rate"` + RewardChangeInterval time.Duration `protobuf:"bytes,8,opt,name=reward_change_interval,json=rewardChangeInterval,proto3,stdduration" json:"reward_change_interval"` + LastRewardChangeTime time.Time `protobuf:"bytes,9,opt,name=last_reward_change_time,json=lastRewardChangeTime,proto3,stdtime" json:"last_reward_change_time"` // set a bound of weight range to limit how much reward weights can scale. RewardWeightRange RewardWeightRange `protobuf:"bytes,10,opt,name=reward_weight_range,json=rewardWeightRange,proto3" json:"reward_weight_range"` // flag to check if an asset has completed the initialization process after the reward delay @@ -125,8 +125,8 @@ func (m *AllianceAsset) XXX_DiscardUnknown() { var xxx_messageInfo_AllianceAsset proto.InternalMessageInfo type RewardWeightChangeSnapshot struct { - PrevRewardWeight github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=prev_reward_weight,json=prevRewardWeight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"prev_reward_weight"` - RewardHistories []RewardHistory `protobuf:"bytes,2,rep,name=reward_histories,json=rewardHistories,proto3" json:"reward_histories"` + PrevRewardWeight cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=prev_reward_weight,json=prevRewardWeight,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"prev_reward_weight"` + RewardHistories []RewardHistory `protobuf:"bytes,2,rep,name=reward_histories,json=rewardHistories,proto3" json:"reward_histories"` } func (m *RewardWeightChangeSnapshot) Reset() { *m = RewardWeightChangeSnapshot{} } @@ -171,50 +171,50 @@ func init() { func init() { proto.RegisterFile("alliance/alliance.proto", fileDescriptor_f7dbf17f28cd0f90) } var fileDescriptor_f7dbf17f28cd0f90 = []byte{ - // 674 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xbb, 0x6e, 0xdb, 0x3c, - 0x14, 0xc7, 0xad, 0x5c, 0x1d, 0x3a, 0xf9, 0xbe, 0x44, 0x75, 0x13, 0xc5, 0x05, 0x24, 0xc3, 0x40, - 0x03, 0x2f, 0x91, 0x8b, 0x74, 0x0b, 0x3a, 0x34, 0x6e, 0x86, 0xb8, 0x5d, 0x5a, 0x39, 0x68, 0xd1, - 0x0b, 0x20, 0x30, 0x16, 0x2b, 0x13, 0x91, 0x44, 0x83, 0x3c, 0xb9, 0xb8, 0x4f, 0xd0, 0xa1, 0x43, - 0xc6, 0x8e, 0xe9, 0x3b, 0xf4, 0x21, 0x32, 0x15, 0x41, 0xa7, 0xa2, 0x43, 0x5a, 0x24, 0x4b, 0xe7, - 0x3e, 0x41, 0x41, 0x8a, 0x4a, 0xe4, 0x64, 0x8a, 0x26, 0x91, 0x3c, 0xe2, 0x8f, 0xff, 0x73, 0xf8, - 0x3f, 0x44, 0x4b, 0x38, 0x8a, 0x28, 0x4e, 0x7a, 0xa4, 0x95, 0x0d, 0xdc, 0x01, 0x67, 0xc0, 0xcc, - 0x72, 0x36, 0xaf, 0x55, 0x43, 0x16, 0x32, 0xb5, 0xd8, 0x92, 0xa3, 0x34, 0x5e, 0x5b, 0xee, 0x31, - 0x11, 0x33, 0xe1, 0xa7, 0x81, 0x74, 0xa2, 0x43, 0x77, 0x2f, 0x99, 0x03, 0xcc, 0x71, 0x9c, 0x2d, - 0xdb, 0x21, 0x63, 0x61, 0x44, 0x5a, 0x6a, 0xb6, 0xb3, 0xf7, 0xbe, 0x15, 0xec, 0x71, 0x0c, 0x94, - 0x25, 0x3a, 0xee, 0x5c, 0x8f, 0x03, 0x8d, 0x89, 0x00, 0x1c, 0x0f, 0xd2, 0x1f, 0x1a, 0x5f, 0x0c, - 0xb4, 0xe0, 0x91, 0x03, 0xcc, 0x83, 0x57, 0x84, 0x86, 0x7d, 0xf0, 0x70, 0x12, 0x12, 0xf3, 0x31, - 0x1a, 0x8f, 0x69, 0x62, 0x19, 0x75, 0xa3, 0x39, 0xd3, 0x76, 0x4f, 0xce, 0x9c, 0xd2, 0xcf, 0x33, - 0x67, 0x25, 0xa4, 0xd0, 0xdf, 0xdb, 0x71, 0x7b, 0x2c, 0xd6, 0xda, 0xf4, 0x67, 0x55, 0x04, 0xbb, - 0x2d, 0x18, 0x0e, 0x88, 0x70, 0x37, 0x49, 0xcf, 0x93, 0x5b, 0x15, 0x01, 0x1f, 0x5a, 0x63, 0x05, - 0x09, 0xf8, 0x70, 0xbd, 0xfc, 0xf1, 0xd8, 0x29, 0xfd, 0x39, 0x76, 0x4a, 0x8d, 0x4f, 0xd3, 0x68, - 0x6e, 0x43, 0xa7, 0xbf, 0x21, 0x04, 0x01, 0x73, 0x05, 0x4d, 0x06, 0x24, 0x61, 0xb1, 0x56, 0x38, - 0xff, 0xf7, 0xcc, 0x99, 0x1d, 0xe2, 0x38, 0x5a, 0x6f, 0xa8, 0xe5, 0x86, 0x97, 0x86, 0xcd, 0x2e, - 0x9a, 0xe3, 0x2a, 0x39, 0xff, 0x40, 0x65, 0x57, 0x50, 0xcf, 0x2c, 0xcf, 0x55, 0xc8, 0x7c, 0x86, - 0x66, 0x00, 0xef, 0x12, 0x9f, 0x63, 0x20, 0xd6, 0x78, 0x21, 0x60, 0x59, 0x02, 0x3c, 0x0c, 0xc4, - 0xf4, 0xd1, 0x2c, 0x30, 0xc0, 0x91, 0x0f, 0x6c, 0x97, 0x24, 0xc2, 0x9a, 0x50, 0xbc, 0x47, 0xb7, - 0xe0, 0x75, 0x12, 0xf8, 0xfe, 0x75, 0x15, 0x69, 0xb7, 0x74, 0x12, 0xf0, 0x2a, 0x8a, 0xb8, 0xad, - 0x80, 0x66, 0x80, 0x16, 0xd3, 0x03, 0xf6, 0x71, 0x44, 0x03, 0x0c, 0x8c, 0xfb, 0xa2, 0x8f, 0x39, - 0x11, 0xd6, 0x64, 0x21, 0xe9, 0x55, 0x45, 0x7b, 0x99, 0xc1, 0xba, 0x8a, 0x65, 0x3e, 0x47, 0x0b, - 0xba, 0xd0, 0x02, 0x30, 0x07, 0x5f, 0xda, 0xcc, 0x9a, 0xaa, 0x1b, 0xcd, 0xca, 0x5a, 0xcd, 0x4d, - 0x3d, 0xe8, 0x66, 0x1e, 0x74, 0xb7, 0x33, 0x0f, 0xb6, 0xcb, 0xf2, 0xf0, 0xa3, 0x5f, 0x8e, 0xe1, - 0xfd, 0x9f, 0x6e, 0xef, 0xca, 0xdd, 0x32, 0x6e, 0xbe, 0x43, 0xa6, 0x26, 0xf6, 0xfa, 0xd2, 0x93, - 0x69, 0xb9, 0xa7, 0x0b, 0x69, 0x9e, 0x4f, 0x49, 0x4f, 0x14, 0x48, 0x95, 0xfd, 0x35, 0x5a, 0x1c, - 0xa5, 0xd3, 0x04, 0x08, 0xdf, 0xc7, 0x91, 0x55, 0x56, 0xa2, 0x97, 0x6f, 0x88, 0xde, 0xd4, 0x8d, - 0x95, 0x6a, 0xfe, 0x2c, 0x35, 0x57, 0xf3, 0xd8, 0x8e, 0x06, 0x98, 0x6f, 0xd1, 0x52, 0x84, 0x05, - 0xf8, 0xa3, 0x7c, 0x55, 0x90, 0x99, 0x5b, 0x14, 0xa4, 0x2a, 0x21, 0x5e, 0xee, 0x00, 0x55, 0x95, - 0x17, 0xe8, 0xce, 0x88, 0xa1, 0x7d, 0x2e, 0x43, 0x16, 0x52, 0xe0, 0x7b, 0xee, 0xe5, 0x7b, 0x73, - 0xa3, 0xa5, 0xdb, 0x13, 0x92, 0xec, 0x2d, 0xf0, 0x1b, 0xbd, 0x7e, 0x1f, 0xfd, 0x47, 0x85, 0x4f, - 0x13, 0x0a, 0x14, 0x47, 0xf4, 0x03, 0x09, 0xac, 0x4a, 0xdd, 0x68, 0x96, 0xbd, 0x39, 0x2a, 0x3a, - 0x57, 0x8b, 0xb9, 0x76, 0xfc, 0x66, 0xa0, 0x5a, 0x9e, 0x9f, 0xca, 0xeb, 0x26, 0x78, 0x20, 0xfa, - 0x0c, 0xe4, 0xc5, 0x0d, 0x38, 0xd9, 0xf7, 0x47, 0x1b, 0xaf, 0xd8, 0x53, 0x32, 0x2f, 0x49, 0xf9, - 0xb3, 0xcc, 0x2d, 0xa4, 0x2f, 0xd3, 0xef, 0x53, 0x01, 0x8c, 0x53, 0x22, 0xac, 0xb1, 0xfa, 0x78, - 0xb3, 0xb2, 0xb6, 0x74, 0x3d, 0xfb, 0x2d, 0xf5, 0xc3, 0x50, 0x67, 0xae, 0x0d, 0xb6, 0x95, 0xed, - 0xba, 0x4a, 0xa8, 0xfd, 0xf4, 0xe4, 0xdc, 0x36, 0x4e, 0xcf, 0x6d, 0xe3, 0xf7, 0xb9, 0x6d, 0x1c, - 0x5d, 0xd8, 0xa5, 0xd3, 0x0b, 0xbb, 0xf4, 0xe3, 0xc2, 0x2e, 0xbd, 0x79, 0x90, 0xd3, 0x09, 0x84, - 0x73, 0xbc, 0x1a, 0xb3, 0x84, 0x0c, 0x2f, 0xdf, 0xf5, 0xd6, 0xe1, 0xd5, 0x50, 0xa9, 0xde, 0x99, - 0x52, 0x97, 0xfa, 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0x2e, 0x21, 0x10, 0x04, 0x06, - 0x00, 0x00, + // 682 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcd, 0x6e, 0xd3, 0x4a, + 0x14, 0xc7, 0xe3, 0x7e, 0xdd, 0x74, 0xd2, 0xde, 0xdb, 0xfa, 0xa6, 0xad, 0x9b, 0x4a, 0x76, 0x14, + 0x04, 0x8a, 0x84, 0x6a, 0xa3, 0x22, 0x36, 0x5d, 0xd1, 0xd0, 0x45, 0x82, 0x10, 0x02, 0xb7, 0x02, + 0x15, 0x16, 0xd6, 0x34, 0x19, 0xec, 0x51, 0x6d, 0x4f, 0x34, 0x73, 0xfa, 0x11, 0x9e, 0x00, 0x89, + 0x4d, 0x97, 0x2c, 0xfb, 0x10, 0xbc, 0x01, 0x9b, 0xee, 0xa8, 0x58, 0x21, 0x16, 0x05, 0xb5, 0x1b, + 0xd6, 0x3c, 0x01, 0x9a, 0xf1, 0xb8, 0x4d, 0x9a, 0x4d, 0xb3, 0xf3, 0xcc, 0x99, 0xff, 0x6f, 0xfe, + 0xe7, 0xcc, 0x39, 0x46, 0x4b, 0x38, 0x8e, 0x29, 0x4e, 0xdb, 0xc4, 0xcb, 0x3f, 0xdc, 0x2e, 0x67, + 0xc0, 0xcc, 0x62, 0xbe, 0xae, 0x94, 0x43, 0x16, 0x32, 0xb5, 0xe9, 0xc9, 0xaf, 0x2c, 0x5e, 0x59, + 0x6e, 0x33, 0x91, 0x30, 0x11, 0x64, 0x81, 0x6c, 0xa1, 0x43, 0x0b, 0x57, 0xcc, 0x2e, 0xe6, 0x38, + 0xc9, 0xb7, 0xed, 0x90, 0xb1, 0x30, 0x26, 0x9e, 0x5a, 0xed, 0xee, 0xbf, 0xf3, 0x3a, 0xfb, 0x1c, + 0x03, 0x65, 0xa9, 0x8e, 0x3b, 0x37, 0xe3, 0x40, 0x13, 0x22, 0x00, 0x27, 0xdd, 0xec, 0x40, 0xed, + 0xa3, 0x81, 0xe6, 0x7d, 0x72, 0x88, 0x79, 0xe7, 0x35, 0xa1, 0x61, 0x04, 0x3e, 0x4e, 0x43, 0x62, + 0x3e, 0x42, 0xe3, 0x09, 0x4d, 0x2d, 0xa3, 0x6a, 0xd4, 0xa7, 0x1b, 0x77, 0x4e, 0xcf, 0x9d, 0xc2, + 0x8f, 0x73, 0x67, 0x25, 0x33, 0x24, 0x3a, 0x7b, 0x2e, 0x65, 0x5e, 0x82, 0x21, 0x72, 0x9f, 0x91, + 0x10, 0xb7, 0x7b, 0x9b, 0xa4, 0xed, 0xcb, 0xf3, 0x4a, 0x86, 0x8f, 0xac, 0xb1, 0x51, 0x64, 0xf8, + 0x68, 0xbd, 0xf8, 0xe1, 0xc4, 0x29, 0xfc, 0x3e, 0x71, 0x0a, 0xb5, 0xaf, 0x53, 0x68, 0x76, 0x43, + 0x27, 0xba, 0x21, 0x04, 0x01, 0xf3, 0x1e, 0x9a, 0xec, 0x90, 0x94, 0x25, 0xda, 0xcb, 0xdc, 0x9f, + 0x73, 0x67, 0xa6, 0x87, 0x93, 0x78, 0xbd, 0xa6, 0xb6, 0x6b, 0x7e, 0x16, 0x36, 0x9b, 0x68, 0x96, + 0xab, 0x34, 0x82, 0x43, 0x95, 0xc7, 0x28, 0x26, 0x66, 0x78, 0x5f, 0x01, 0xcc, 0xc7, 0x68, 0x1a, + 0xf0, 0x1e, 0x09, 0x38, 0x06, 0x62, 0x8d, 0xdf, 0x9e, 0x52, 0x94, 0x2a, 0x1f, 0x03, 0x31, 0x9f, + 0xa3, 0x19, 0x60, 0x80, 0xe3, 0x00, 0xd8, 0x1e, 0x49, 0x85, 0x35, 0xa1, 0x20, 0xf7, 0x35, 0x64, + 0x61, 0x18, 0xd2, 0x4a, 0xe1, 0xdb, 0xe7, 0x55, 0xa4, 0x1f, 0xbc, 0x95, 0x82, 0x5f, 0x52, 0x80, + 0x6d, 0xa5, 0x37, 0x77, 0xd0, 0x62, 0xc6, 0x3b, 0xc0, 0x31, 0xed, 0x60, 0x60, 0x3c, 0x10, 0x11, + 0xe6, 0x44, 0x58, 0x93, 0xb7, 0xb7, 0x57, 0x56, 0x88, 0x57, 0x39, 0x61, 0x4b, 0x01, 0xcc, 0x17, + 0x68, 0x5e, 0x97, 0x4d, 0x00, 0xe6, 0x10, 0xc8, 0xf6, 0xb0, 0xa6, 0xaa, 0x46, 0xbd, 0xb4, 0x56, + 0x71, 0xb3, 0xde, 0x71, 0xf3, 0xde, 0x71, 0xb7, 0xf3, 0xde, 0x69, 0x14, 0xe5, 0x8d, 0xc7, 0x3f, + 0x1d, 0xc3, 0xff, 0x2f, 0x93, 0x6f, 0x49, 0xb5, 0x8c, 0x9b, 0x2f, 0x91, 0xa9, 0x89, 0xed, 0x48, + 0xf6, 0x52, 0x56, 0xc7, 0x7f, 0x6e, 0x6f, 0x74, 0x2e, 0x93, 0x3f, 0x51, 0x6a, 0x55, 0xcf, 0x1d, + 0xb4, 0x38, 0x88, 0xa4, 0x29, 0x10, 0x7e, 0x80, 0x63, 0xab, 0xa8, 0x9c, 0x2e, 0x0f, 0x39, 0xdd, + 0xd4, 0x53, 0x90, 0x19, 0xfd, 0x24, 0x8d, 0x96, 0xfb, 0xb1, 0x2d, 0x0d, 0x30, 0xdf, 0xa2, 0xa5, + 0x18, 0x0b, 0x08, 0x06, 0xf9, 0xaa, 0x0a, 0xd3, 0x23, 0x54, 0xa1, 0x2c, 0x21, 0x7e, 0xdf, 0x05, + 0xba, 0x14, 0xff, 0x0f, 0xf4, 0x64, 0xc0, 0x65, 0xc8, 0x42, 0x0a, 0xbc, 0xe2, 0x5e, 0xfd, 0x1c, + 0x86, 0xe6, 0xaf, 0x31, 0x21, 0xc9, 0xfe, 0x3c, 0x1f, 0x1a, 0xcc, 0xbb, 0xe8, 0x5f, 0x2a, 0x02, + 0x9a, 0x52, 0xa0, 0x38, 0xa6, 0xef, 0x49, 0xc7, 0x2a, 0x55, 0x8d, 0x7a, 0xd1, 0x9f, 0xa5, 0xa2, + 0x75, 0xbd, 0xd9, 0x37, 0x51, 0x5f, 0x0c, 0x54, 0xe9, 0xe7, 0x67, 0xf6, 0xb6, 0x52, 0xdc, 0x15, + 0x11, 0x03, 0xf9, 0x5a, 0x5d, 0x4e, 0x0e, 0x82, 0xc1, 0xd9, 0x19, 0x61, 0xee, 0xe7, 0xa4, 0xbc, + 0xff, 0x02, 0xb3, 0x89, 0xf4, 0x0b, 0x06, 0x11, 0x15, 0xc0, 0x38, 0x25, 0xc2, 0x1a, 0xab, 0x8e, + 0xd7, 0x4b, 0x6b, 0x4b, 0x37, 0x53, 0x6e, 0xaa, 0x03, 0x3d, 0x9d, 0xae, 0x6e, 0xa5, 0x66, 0xae, + 0xba, 0xce, 0xa2, 0xf1, 0xf4, 0xf4, 0xc2, 0x36, 0xce, 0x2e, 0x6c, 0xe3, 0xd7, 0x85, 0x6d, 0x1c, + 0x5f, 0xda, 0x85, 0xb3, 0x4b, 0xbb, 0xf0, 0xfd, 0xd2, 0x2e, 0xbc, 0x79, 0x10, 0x52, 0x88, 0xf6, + 0x77, 0xdd, 0x36, 0x4b, 0x3c, 0x20, 0x9c, 0xe3, 0xd5, 0x84, 0xa5, 0xa4, 0x77, 0xf5, 0xe7, 0xf5, + 0x8e, 0xae, 0x3f, 0xa1, 0xd7, 0x25, 0x62, 0x77, 0x4a, 0xbd, 0xe4, 0xc3, 0xbf, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x83, 0xfb, 0x94, 0x6d, 0xa6, 0x05, 0x00, 0x00, } func (m *RewardWeightRange) Marshal() (dAtA []byte, err error) { diff --git a/x/alliance/types/delegations.pb.go b/x/alliance/types/delegations.pb.go index 14c67b32..3d65c7d5 100644 --- a/x/alliance/types/delegations.pb.go +++ b/x/alliance/types/delegations.pb.go @@ -4,9 +4,9 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" @@ -34,9 +34,9 @@ type Delegation struct { // denom of token staked Denom string `protobuf:"bytes,3,opt,name=denom,proto3" json:"denom,omitempty"` // shares define the delegation shares received. - Shares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=shares,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"shares"` - RewardHistory []RewardHistory `protobuf:"bytes,5,rep,name=reward_history,json=rewardHistory,proto3" json:"reward_history"` - LastRewardClaimHeight uint64 `protobuf:"varint,6,opt,name=last_reward_claim_height,json=lastRewardClaimHeight,proto3" json:"last_reward_claim_height,omitempty"` + Shares cosmossdk_io_math.LegacyDec `protobuf:"bytes,4,opt,name=shares,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"shares"` + RewardHistory []RewardHistory `protobuf:"bytes,5,rep,name=reward_history,json=rewardHistory,proto3" json:"reward_history"` + LastRewardClaimHeight uint64 `protobuf:"varint,6,opt,name=last_reward_claim_height,json=lastRewardClaimHeight,proto3" json:"last_reward_claim_height,omitempty"` } func (m *Delegation) Reset() { *m = Delegation{} } @@ -199,41 +199,41 @@ func init() { proto.RegisterFile("alliance/delegations.proto", fileDescriptor_83 var fileDescriptor_8303368cab785f76 = []byte{ // 569 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x4f, 0x6f, 0xd3, 0x30, - 0x18, 0xc6, 0x93, 0xb5, 0xeb, 0x86, 0xc7, 0xdf, 0xd0, 0x8e, 0xac, 0x42, 0x69, 0xb5, 0x03, 0xea, - 0xa5, 0xc9, 0x36, 0x0e, 0x08, 0xc4, 0x65, 0x5d, 0x90, 0x06, 0x12, 0x12, 0xcb, 0x00, 0x21, 0x2e, - 0x91, 0x93, 0x98, 0xd4, 0x22, 0x89, 0x2b, 0xdb, 0x1d, 0xf4, 0x1b, 0x70, 0x83, 0x2f, 0x80, 0xb4, - 0x0f, 0xb1, 0x0f, 0xb1, 0xe3, 0xb4, 0x13, 0xe2, 0x30, 0x41, 0x7b, 0xe1, 0x63, 0x20, 0xc7, 0x4e, - 0x9a, 0x22, 0x24, 0x76, 0xe4, 0x94, 0xc4, 0xcf, 0xfb, 0xfe, 0xec, 0xf7, 0x79, 0xdf, 0x18, 0xb4, - 0x61, 0x92, 0x60, 0x98, 0x85, 0xc8, 0x89, 0x50, 0x82, 0x62, 0xc8, 0x31, 0xc9, 0x98, 0x3d, 0xa2, - 0x84, 0x13, 0x63, 0xb5, 0xd0, 0xda, 0xcd, 0x98, 0xc4, 0x24, 0x5f, 0x74, 0xc4, 0x9b, 0xd4, 0xdb, - 0x56, 0x48, 0x58, 0x4a, 0x98, 0x13, 0x40, 0x86, 0x9c, 0xa3, 0xed, 0x00, 0x71, 0xb8, 0xed, 0x84, - 0x04, 0x67, 0x4a, 0xdf, 0x90, 0xba, 0x2f, 0x13, 0xe5, 0x87, 0x92, 0x5a, 0xe5, 0xb6, 0x23, 0x48, - 0x61, 0xaa, 0x96, 0x37, 0x3f, 0xd7, 0x00, 0x70, 0xcb, 0x73, 0x18, 0x4f, 0xc0, 0x2d, 0x75, 0x2a, - 0x42, 0x7d, 0x18, 0x45, 0x14, 0x31, 0x66, 0xea, 0x5d, 0xbd, 0x77, 0x65, 0x60, 0x9e, 0x9f, 0xf4, - 0x9b, 0x0a, 0xb9, 0x2b, 0x95, 0x43, 0x4e, 0x71, 0x16, 0x7b, 0x37, 0xcb, 0x14, 0xb5, 0x2e, 0x30, - 0x47, 0x30, 0xc1, 0xd1, 0x02, 0x66, 0xe9, 0x5f, 0x98, 0x32, 0xa5, 0xc0, 0x34, 0xc1, 0x72, 0x84, - 0x32, 0x92, 0x9a, 0x35, 0x91, 0xea, 0xc9, 0x0f, 0xe3, 0x25, 0x68, 0xb0, 0x21, 0xa4, 0x88, 0x99, - 0xf5, 0x9c, 0xf8, 0xf8, 0xf4, 0xa2, 0xa3, 0x7d, 0xbf, 0xe8, 0xdc, 0x8b, 0x31, 0x1f, 0x8e, 0x03, - 0x3b, 0x24, 0xa9, 0x2a, 0x5d, 0x3d, 0xfa, 0x2c, 0x7a, 0xef, 0xf0, 0xc9, 0x08, 0x31, 0xdb, 0x45, - 0xe1, 0xf9, 0x49, 0x1f, 0xa8, 0xfd, 0x5d, 0x14, 0x7a, 0x8a, 0x65, 0xb8, 0xe0, 0x3a, 0x45, 0x1f, - 0x20, 0x8d, 0xfc, 0x21, 0x66, 0x9c, 0xd0, 0x89, 0xb9, 0xdc, 0xad, 0xf5, 0xd6, 0x76, 0xee, 0xd8, - 0x85, 0x71, 0xb6, 0x97, 0xeb, 0xfb, 0x52, 0x1e, 0xd4, 0xc5, 0xb6, 0xde, 0x35, 0x5a, 0x5d, 0x34, - 0x1e, 0x00, 0x33, 0x81, 0x8c, 0xfb, 0x0a, 0x15, 0x26, 0x10, 0xa7, 0xfe, 0x10, 0xe1, 0x78, 0xc8, - 0xcd, 0x46, 0x57, 0xef, 0xd5, 0xbd, 0x96, 0xd0, 0x25, 0x69, 0x4f, 0xa8, 0xfb, 0xb9, 0xf8, 0x68, - 0xf5, 0xd3, 0x71, 0x47, 0xfb, 0x75, 0xdc, 0xd1, 0x36, 0x7f, 0xea, 0xe0, 0xea, 0xab, 0x2c, 0xfa, - 0x5f, 0x7b, 0xf2, 0x10, 0xac, 0x04, 0x30, 0x11, 0x7e, 0xe4, 0x5d, 0x59, 0xdb, 0xd9, 0xb0, 0x55, - 0xa6, 0x18, 0x4a, 0x5b, 0x0d, 0xa5, 0xbd, 0x47, 0x70, 0xa6, 0x2c, 0x2a, 0xe2, 0x2b, 0x35, 0xbe, - 0x00, 0xc6, 0xc1, 0x18, 0x8d, 0x51, 0xb4, 0x50, 0xe8, 0x16, 0x58, 0x41, 0x19, 0xa7, 0x18, 0x89, - 0xf2, 0x84, 0xf7, 0xeb, 0x73, 0xef, 0xab, 0x81, 0x5e, 0x11, 0x56, 0x21, 0x7e, 0x5d, 0x02, 0xad, - 0x5d, 0x15, 0xfc, 0xba, 0x38, 0xf3, 0xd3, 0xec, 0x1d, 0x31, 0x0e, 0x40, 0x2b, 0x4e, 0x48, 0x00, - 0x13, 0xff, 0x8f, 0xfe, 0xea, 0x97, 0xe9, 0xef, 0x6d, 0x99, 0xbb, 0x20, 0x19, 0x6f, 0xc0, 0x3a, - 0x27, 0x1c, 0x26, 0xfe, 0xbc, 0x2f, 0x6a, 0x22, 0x97, 0x72, 0xe6, 0xdd, 0xbf, 0x5a, 0xe2, 0xa2, - 0xb0, 0xe2, 0x4a, 0x33, 0x27, 0xb8, 0x05, 0xe0, 0x50, 0x4e, 0xe1, 0x73, 0x30, 0x77, 0xbc, 0x60, - 0xd6, 0x2e, 0xcd, 0xbc, 0x51, 0xe6, 0x4a, 0xdc, 0xdc, 0x9f, 0xc1, 0xb3, 0xd3, 0xa9, 0xa5, 0x9f, - 0x4d, 0x2d, 0xfd, 0xc7, 0xd4, 0xd2, 0xbf, 0xcc, 0x2c, 0xed, 0x6c, 0x66, 0x69, 0xdf, 0x66, 0x96, - 0xf6, 0x76, 0xab, 0xf2, 0xdb, 0x70, 0x44, 0x29, 0xec, 0xa7, 0x24, 0x43, 0x13, 0xa7, 0xbc, 0x2f, - 0x3e, 0xce, 0x5f, 0xf3, 0x9f, 0x28, 0x68, 0xe4, 0x57, 0xc7, 0xfd, 0xdf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x2a, 0xa3, 0x58, 0x1b, 0xca, 0x04, 0x00, 0x00, + 0x18, 0xc6, 0x93, 0xb6, 0xeb, 0x86, 0xc7, 0xdf, 0xd0, 0x8e, 0xac, 0xa0, 0xb4, 0xda, 0xa9, 0x97, + 0x26, 0xeb, 0x38, 0x20, 0xb8, 0xad, 0x0b, 0xd2, 0x86, 0x40, 0x62, 0x99, 0x40, 0x88, 0x4b, 0xe4, + 0x24, 0x26, 0xb1, 0x48, 0xe2, 0xca, 0x76, 0x07, 0xbd, 0x73, 0xe0, 0xc8, 0x17, 0x40, 0xda, 0x87, + 0xd8, 0x87, 0xd8, 0x71, 0xda, 0x09, 0x71, 0x98, 0xa0, 0xbd, 0xf0, 0x31, 0x50, 0x62, 0x27, 0x4d, + 0x11, 0x12, 0x3b, 0x72, 0xb3, 0xdf, 0xe7, 0x7d, 0x7f, 0xb6, 0x9f, 0xf7, 0x95, 0x41, 0x07, 0xc6, + 0x31, 0x86, 0xa9, 0x8f, 0xac, 0x00, 0xc5, 0x28, 0x84, 0x1c, 0x93, 0x94, 0x99, 0x63, 0x4a, 0x38, + 0xd1, 0xd6, 0x0a, 0xad, 0xd3, 0x0a, 0x49, 0x48, 0xf2, 0xa0, 0x95, 0xad, 0x84, 0xde, 0x31, 0x7c, + 0xc2, 0x12, 0xc2, 0x2c, 0x0f, 0x32, 0x64, 0x1d, 0x0f, 0x3d, 0xc4, 0xe1, 0xd0, 0xf2, 0x09, 0x4e, + 0xa5, 0xbe, 0x29, 0x74, 0x57, 0x14, 0x8a, 0x8d, 0x94, 0xda, 0xe5, 0xb1, 0x63, 0x48, 0x61, 0x22, + 0xc3, 0x5b, 0x9f, 0xea, 0x00, 0xd8, 0xe5, 0x3d, 0xb4, 0xa7, 0xe0, 0x8e, 0xbc, 0x15, 0xa1, 0x2e, + 0x0c, 0x02, 0x8a, 0x18, 0xd3, 0xd5, 0x9e, 0xda, 0xbf, 0x36, 0xd2, 0x2f, 0x4e, 0x07, 0x2d, 0x89, + 0xdc, 0x15, 0xca, 0x11, 0xa7, 0x38, 0x0d, 0x9d, 0xdb, 0x65, 0x89, 0x8c, 0x67, 0x98, 0x63, 0x18, + 0xe3, 0x60, 0x09, 0x53, 0xfb, 0x17, 0xa6, 0x2c, 0x29, 0x30, 0x2d, 0xb0, 0x12, 0xa0, 0x94, 0x24, + 0x7a, 0x3d, 0x2b, 0x75, 0xc4, 0x46, 0x3b, 0x00, 0x4d, 0x16, 0x41, 0x8a, 0x98, 0xde, 0xc8, 0x89, + 0xc3, 0xb3, 0xcb, 0xae, 0xf2, 0xfd, 0xb2, 0x7b, 0x5f, 0x50, 0x59, 0xf0, 0xde, 0xc4, 0xc4, 0x4a, + 0x20, 0x8f, 0xcc, 0xe7, 0x28, 0x84, 0xfe, 0xd4, 0x46, 0xfe, 0xc5, 0xe9, 0x00, 0xc8, 0x43, 0x6d, + 0xe4, 0x3b, 0x12, 0xa0, 0xd9, 0xe0, 0x26, 0x45, 0x1f, 0x20, 0x0d, 0xdc, 0x08, 0x33, 0x4e, 0xe8, + 0x54, 0x5f, 0xe9, 0xd5, 0xfb, 0xeb, 0x3b, 0xf7, 0xcc, 0xc2, 0x2d, 0xd3, 0xc9, 0xf5, 0x7d, 0x21, + 0x8f, 0x1a, 0xd9, 0x59, 0xce, 0x0d, 0x5a, 0x0d, 0x6a, 0x8f, 0x80, 0x1e, 0x43, 0xc6, 0x5d, 0x89, + 0xf2, 0x63, 0x88, 0x13, 0x37, 0x42, 0x38, 0x8c, 0xb8, 0xde, 0xec, 0xa9, 0xfd, 0x86, 0xd3, 0xce, + 0x74, 0x41, 0xda, 0xcb, 0xd4, 0xfd, 0x5c, 0x7c, 0xb2, 0xf6, 0xf9, 0xa4, 0xab, 0xfc, 0x3a, 0xe9, + 0x2a, 0x5b, 0x3f, 0x55, 0x70, 0xfd, 0x55, 0x1a, 0xfc, 0xaf, 0x8d, 0x78, 0x0c, 0x56, 0x3d, 0x18, + 0x67, 0x7e, 0xe4, 0xad, 0x58, 0xdf, 0xd9, 0x34, 0x65, 0x65, 0x36, 0x89, 0xa6, 0x9c, 0x44, 0x73, + 0x8f, 0xe0, 0x54, 0x5a, 0x54, 0xe4, 0x57, 0xde, 0xf8, 0x12, 0x68, 0x87, 0x13, 0x34, 0x41, 0xc1, + 0xd2, 0x43, 0xb7, 0xc1, 0x2a, 0x4a, 0x39, 0xc5, 0x28, 0x7b, 0x5e, 0xe6, 0xfd, 0xc6, 0xc2, 0xfb, + 0x6a, 0xa2, 0x53, 0xa4, 0x55, 0x88, 0x5f, 0x6b, 0xa0, 0xbd, 0x2b, 0x93, 0x5f, 0x17, 0x77, 0x3e, + 0x48, 0xdf, 0x11, 0xed, 0x10, 0xb4, 0xc3, 0x98, 0x78, 0x30, 0x76, 0xff, 0xe8, 0xaf, 0x7a, 0x95, + 0xfe, 0xde, 0x15, 0xb5, 0x4b, 0x92, 0xf6, 0x06, 0x6c, 0x70, 0xc2, 0x61, 0xec, 0x2e, 0xfa, 0x22, + 0xc7, 0xb0, 0x96, 0x33, 0x1f, 0xfc, 0xd5, 0x12, 0x1b, 0xf9, 0x15, 0x57, 0x5a, 0x39, 0xc1, 0x2e, + 0x00, 0x47, 0x62, 0x0a, 0x5f, 0x80, 0x85, 0xe3, 0x05, 0xb3, 0x7e, 0x65, 0xe6, 0xad, 0xb2, 0x56, + 0xe0, 0x16, 0xfe, 0x8c, 0x9e, 0x9d, 0xcd, 0x0c, 0xf5, 0x7c, 0x66, 0xa8, 0x3f, 0x66, 0x86, 0xfa, + 0x65, 0x6e, 0x28, 0xe7, 0x73, 0x43, 0xf9, 0x36, 0x37, 0x94, 0xb7, 0xdb, 0x21, 0xe6, 0xd1, 0xc4, + 0x33, 0x7d, 0x92, 0x58, 0x1c, 0x51, 0x0a, 0x07, 0x09, 0x49, 0xd1, 0xd4, 0x2a, 0x3f, 0x89, 0x8f, + 0x8b, 0x25, 0x9f, 0x8e, 0x11, 0xf3, 0x9a, 0xf9, 0x7f, 0xf1, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x72, 0x2b, 0x4d, 0xe5, 0xbf, 0x04, 0x00, 0x00, } func (m *Delegation) Marshal() (dAtA []byte, err error) { diff --git a/x/alliance/types/events.pb.go b/x/alliance/types/events.pb.go index 4ba7dcc3..7607204b 100644 --- a/x/alliance/types/events.pb.go +++ b/x/alliance/types/events.pb.go @@ -4,6 +4,7 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" @@ -34,7 +35,7 @@ type DelegateAllianceEvent struct { AllianceSender string `protobuf:"bytes,1,opt,name=allianceSender,proto3" json:"allianceSender,omitempty"` Validator string `protobuf:"bytes,2,opt,name=validator,proto3" json:"validator,omitempty"` Coin github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=coin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coin"` - NewShares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=newShares,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"newShares"` + NewShares cosmossdk_io_math.LegacyDec `protobuf:"bytes,4,opt,name=newShares,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"newShares"` } func (m *DelegateAllianceEvent) Reset() { *m = DelegateAllianceEvent{} } @@ -322,41 +323,42 @@ func init() { func init() { proto.RegisterFile("alliance/events.proto", fileDescriptor_15eecd10e5e40bd4) } var fileDescriptor_15eecd10e5e40bd4 = []byte{ - // 538 bytes of a gzipped FileDescriptorProto + // 552 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x55, 0x3f, 0x6f, 0xd3, 0x40, - 0x14, 0x8f, 0x93, 0x14, 0x35, 0x57, 0xa9, 0x48, 0x56, 0xaa, 0x3a, 0x19, 0x9c, 0x28, 0x03, 0x64, - 0x89, 0xaf, 0x2d, 0x12, 0x13, 0x03, 0x71, 0xc3, 0x82, 0x3a, 0x39, 0x85, 0xa1, 0x03, 0x70, 0xb6, - 0x1f, 0xee, 0x09, 0xfb, 0x2e, 0xba, 0xbb, 0xa4, 0x74, 0xe1, 0x33, 0x74, 0xe7, 0x1b, 0x30, 0xf7, - 0x0b, 0xb0, 0x75, 0x41, 0xaa, 0x3a, 0x21, 0x86, 0x16, 0x25, 0x1f, 0x82, 0x15, 0xd9, 0x3e, 0x37, - 0x28, 0x42, 0x4a, 0x24, 0xfe, 0x0d, 0x4c, 0xbe, 0xbb, 0xf7, 0xde, 0xef, 0xcf, 0x7b, 0x4f, 0x32, - 0xda, 0x22, 0x71, 0x4c, 0x09, 0x0b, 0x00, 0xc3, 0x04, 0x98, 0x92, 0xce, 0x48, 0x70, 0xc5, 0xcd, - 0xf5, 0xe2, 0xb9, 0x59, 0x8f, 0x78, 0xc4, 0xb3, 0x47, 0x9c, 0x9e, 0xf2, 0x78, 0xd3, 0x0e, 0xb8, - 0x4c, 0xb8, 0xc4, 0x3e, 0x91, 0x80, 0x27, 0xbb, 0x3e, 0x28, 0xb2, 0x8b, 0x03, 0x4e, 0x99, 0x8e, - 0x37, 0xf2, 0xf8, 0xcb, 0xbc, 0x30, 0xbf, 0xe8, 0x50, 0x2b, 0xe2, 0x3c, 0x8a, 0x01, 0x67, 0x37, - 0x7f, 0xfc, 0x1a, 0x2b, 0x9a, 0x80, 0x54, 0x24, 0x19, 0xe5, 0x09, 0x9d, 0x4f, 0x65, 0xb4, 0x35, - 0x80, 0x18, 0x22, 0xa2, 0xa0, 0xaf, 0x65, 0x3c, 0x49, 0xc5, 0x99, 0x8f, 0xd1, 0x66, 0xa1, 0x6b, - 0x08, 0x2c, 0x04, 0x61, 0x19, 0x6d, 0xa3, 0x5b, 0x73, 0xad, 0xab, 0xf3, 0x5e, 0x5d, 0x93, 0xf4, - 0xc3, 0x50, 0x80, 0x94, 0x43, 0x25, 0x28, 0x8b, 0xbc, 0x85, 0x7c, 0xf3, 0x21, 0xaa, 0x4d, 0x48, - 0x4c, 0x43, 0xa2, 0xb8, 0xb0, 0xca, 0x4b, 0x8a, 0xe7, 0xa9, 0xe6, 0x0b, 0x54, 0x4d, 0xdd, 0x59, - 0x95, 0xb6, 0xd1, 0xdd, 0xd8, 0x6b, 0x38, 0x3a, 0x3f, 0xb5, 0xef, 0x68, 0xfb, 0xce, 0x3e, 0xa7, - 0xcc, 0xc5, 0x17, 0xd7, 0xad, 0xd2, 0x97, 0xeb, 0xd6, 0xfd, 0x88, 0xaa, 0xe3, 0xb1, 0xef, 0x04, - 0x3c, 0xd1, 0xf6, 0xf5, 0xa7, 0x27, 0xc3, 0x37, 0x58, 0x9d, 0x8e, 0x40, 0x66, 0x05, 0x5e, 0x86, - 0x6b, 0x1e, 0xa1, 0x1a, 0x83, 0x93, 0xe1, 0x31, 0x11, 0x20, 0xad, 0x6a, 0xa6, 0xeb, 0x91, 0x46, - 0xba, 0xb7, 0x02, 0xd2, 0x00, 0x82, 0xab, 0xf3, 0x1e, 0xd2, 0xaa, 0x06, 0x10, 0x78, 0x73, 0xb8, - 0xce, 0xc7, 0x32, 0xda, 0x7e, 0xc6, 0xc2, 0xff, 0xac, 0xa3, 0x07, 0x68, 0x33, 0xe0, 0xc9, 0x28, - 0x06, 0x45, 0x39, 0x3b, 0xa4, 0x09, 0x64, 0x6d, 0xdd, 0xd8, 0x6b, 0x3a, 0xf9, 0xfe, 0x39, 0xc5, - 0xfe, 0x39, 0x87, 0xc5, 0xfe, 0xb9, 0xeb, 0x29, 0xd5, 0xd9, 0x4d, 0xcb, 0xf0, 0x16, 0x6a, 0x3b, - 0xef, 0x2b, 0x68, 0xdb, 0x83, 0x3f, 0xd5, 0x43, 0x17, 0xdd, 0x95, 0x7c, 0x2c, 0x02, 0x78, 0xbe, - 0x72, 0x27, 0x17, 0x0b, 0xcc, 0x03, 0x54, 0x0f, 0x41, 0x2a, 0xca, 0x48, 0x2a, 0x7a, 0x0e, 0x54, - 0x59, 0x02, 0xf4, 0xd3, 0xaa, 0xdb, 0xe9, 0x54, 0xff, 0xda, 0x74, 0xd6, 0x7e, 0x61, 0x3a, 0xdf, - 0x0c, 0xd4, 0xd8, 0x8f, 0x09, 0x4d, 0x8a, 0xc1, 0x78, 0x70, 0x42, 0x44, 0x28, 0xff, 0xf5, 0x8e, - 0xbf, 0x42, 0x6b, 0xa9, 0x5b, 0x69, 0x55, 0xda, 0x95, 0xdf, 0xdc, 0xc6, 0x1c, 0xb8, 0xf3, 0x0e, - 0x35, 0x06, 0x10, 0x8e, 0x03, 0x55, 0x38, 0xef, 0x4b, 0x09, 0x4a, 0x1b, 0x27, 0x05, 0xbd, 0xb1, - 0x8c, 0x7e, 0x27, 0xa5, 0xff, 0x70, 0xd3, 0xea, 0xae, 0x48, 0x2f, 0x35, 0xbf, 0xfb, 0xf4, 0x62, - 0x6a, 0x1b, 0x97, 0x53, 0xdb, 0xf8, 0x3a, 0xb5, 0x8d, 0xb3, 0x99, 0x5d, 0xba, 0x9c, 0xd9, 0xa5, - 0xcf, 0x33, 0xbb, 0x74, 0xb4, 0xf3, 0x03, 0x94, 0x02, 0x21, 0x48, 0x2f, 0xe1, 0x0c, 0x4e, 0xf1, - 0xed, 0xff, 0xe6, 0xed, 0xfc, 0x98, 0x01, 0xfb, 0x77, 0xb2, 0x99, 0x3f, 0xf8, 0x1e, 0x00, 0x00, - 0xff, 0xff, 0xe3, 0x7f, 0x13, 0xde, 0x93, 0x06, 0x00, 0x00, + 0x14, 0x8f, 0x9b, 0x14, 0x35, 0x57, 0xa9, 0x48, 0x56, 0xaa, 0x3a, 0x41, 0x72, 0xa2, 0x2c, 0x64, + 0x89, 0xaf, 0x29, 0x12, 0x33, 0x49, 0xc3, 0x82, 0x22, 0x21, 0x39, 0x85, 0x81, 0x01, 0x38, 0xdb, + 0x0f, 0xe7, 0x54, 0xfb, 0x2e, 0xba, 0xbb, 0xa4, 0x64, 0xe1, 0x33, 0x74, 0xe7, 0x1b, 0x30, 0xf7, + 0x0b, 0xc0, 0xd4, 0xb1, 0xea, 0x84, 0x18, 0x5a, 0x94, 0x7c, 0x08, 0x56, 0x64, 0xfb, 0xdc, 0xa0, + 0x08, 0x29, 0x95, 0xf8, 0x37, 0x30, 0xf9, 0xee, 0xde, 0xfb, 0xfd, 0x7e, 0xef, 0xf7, 0xde, 0x93, + 0x8c, 0x76, 0x49, 0x14, 0x51, 0xc2, 0x7c, 0xc0, 0x30, 0x05, 0xa6, 0xa4, 0x33, 0x16, 0x5c, 0x71, + 0x73, 0x2b, 0x7f, 0xae, 0x55, 0x42, 0x1e, 0xf2, 0xf4, 0x11, 0x27, 0xa7, 0x2c, 0x5e, 0xb3, 0x7d, + 0x2e, 0x63, 0x2e, 0xb1, 0x47, 0x24, 0xe0, 0x69, 0xc7, 0x03, 0x45, 0x3a, 0xd8, 0xe7, 0x94, 0xe9, + 0x78, 0x35, 0x8b, 0xbf, 0xca, 0x80, 0xd9, 0x45, 0x87, 0xea, 0x21, 0xe7, 0x61, 0x04, 0x38, 0xbd, + 0x79, 0x93, 0x37, 0x58, 0xd1, 0x18, 0xa4, 0x22, 0xf1, 0x38, 0x4b, 0x68, 0x7e, 0xda, 0x40, 0xbb, + 0x7d, 0x88, 0x20, 0x24, 0x0a, 0xba, 0xba, 0x8c, 0xc7, 0x49, 0x71, 0xe6, 0x23, 0xb4, 0x93, 0xd7, + 0x35, 0x04, 0x16, 0x80, 0xb0, 0x8c, 0x86, 0xd1, 0x2a, 0xf7, 0xac, 0xcb, 0xb3, 0x76, 0x45, 0x8b, + 0x74, 0x83, 0x40, 0x80, 0x94, 0x43, 0x25, 0x28, 0x0b, 0xdd, 0x95, 0x7c, 0xf3, 0x21, 0x2a, 0x4f, + 0x49, 0x44, 0x03, 0xa2, 0xb8, 0xb0, 0x36, 0xd6, 0x80, 0x97, 0xa9, 0xe6, 0x4b, 0x54, 0x4a, 0xdc, + 0x59, 0xc5, 0x86, 0xd1, 0xda, 0x3e, 0xa8, 0x3a, 0x3a, 0x3f, 0xb1, 0xef, 0x68, 0xfb, 0xce, 0x21, + 0xa7, 0xac, 0x87, 0xcf, 0xaf, 0xea, 0x85, 0x2f, 0x57, 0xf5, 0xfb, 0x21, 0x55, 0xa3, 0x89, 0xe7, + 0xf8, 0x3c, 0xd6, 0xf6, 0xf5, 0xa7, 0x2d, 0x83, 0x63, 0xac, 0x66, 0x63, 0x90, 0x29, 0xc0, 0x4d, + 0x79, 0xcd, 0xa7, 0xa8, 0xcc, 0xe0, 0x64, 0x38, 0x22, 0x02, 0xa4, 0x55, 0x4a, 0xeb, 0xea, 0x68, + 0xa6, 0x7b, 0x19, 0x4e, 0x06, 0xc7, 0x0e, 0xe5, 0x38, 0x26, 0x6a, 0xe4, 0x0c, 0x20, 0x24, 0xfe, + 0xac, 0x0f, 0xfe, 0xe5, 0x59, 0x1b, 0xe9, 0x52, 0xfa, 0xe0, 0xbb, 0x4b, 0x8e, 0xe6, 0xc7, 0x0d, + 0xb4, 0xf7, 0x8c, 0x05, 0xff, 0x59, 0x1b, 0x07, 0x68, 0xc7, 0xe7, 0xf1, 0x38, 0x02, 0x45, 0x39, + 0x3b, 0xa2, 0x31, 0xa4, 0xbd, 0xdc, 0x3e, 0xa8, 0x39, 0xd9, 0xd2, 0x39, 0xf9, 0xd2, 0x39, 0x47, + 0xf9, 0xd2, 0xf5, 0xb6, 0x12, 0xa9, 0xd3, 0xeb, 0xba, 0xe1, 0xae, 0x60, 0x9b, 0xef, 0x8b, 0x68, + 0xcf, 0x85, 0x3f, 0xd5, 0xc3, 0x1e, 0xba, 0x2b, 0xf9, 0x44, 0xf8, 0xf0, 0xfc, 0xd6, 0x9d, 0x5c, + 0x05, 0x98, 0x03, 0x54, 0x09, 0x40, 0x2a, 0xca, 0x48, 0x52, 0xf4, 0x92, 0xa8, 0xb8, 0x86, 0xe8, + 0xa7, 0xa8, 0x9b, 0xe9, 0x94, 0xfe, 0xda, 0x74, 0x36, 0x7f, 0x61, 0x3a, 0xdf, 0x0c, 0x54, 0x3d, + 0x8c, 0x08, 0x8d, 0xf3, 0xc1, 0xb8, 0x70, 0x42, 0x44, 0x20, 0xff, 0xf5, 0x8e, 0xbf, 0x46, 0x9b, + 0x89, 0x5b, 0x69, 0x15, 0x1b, 0xc5, 0xdf, 0xdc, 0xc6, 0x8c, 0xb8, 0xf9, 0x0e, 0x55, 0xfb, 0x10, + 0x4c, 0x7c, 0x95, 0x3b, 0xef, 0x4a, 0x09, 0x4a, 0x1b, 0x27, 0xb9, 0xbc, 0xb1, 0x4e, 0x7e, 0x3f, + 0x91, 0xff, 0x70, 0x5d, 0x6f, 0xdd, 0x52, 0x5e, 0x6a, 0xfd, 0xde, 0x93, 0xf3, 0xb9, 0x6d, 0x5c, + 0xcc, 0x6d, 0xe3, 0xeb, 0xdc, 0x36, 0x4e, 0x17, 0x76, 0xe1, 0x62, 0x61, 0x17, 0x3e, 0x2f, 0xec, + 0xc2, 0x8b, 0xfd, 0x1f, 0xa8, 0x14, 0x08, 0x41, 0xda, 0x31, 0x67, 0x30, 0xc3, 0x37, 0x3f, 0x99, + 0xb7, 0xcb, 0x63, 0x4a, 0xec, 0xdd, 0x49, 0x67, 0xfe, 0xe0, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x44, 0xc6, 0x72, 0x1e, 0x88, 0x06, 0x00, 0x00, } func (m *DelegateAllianceEvent) Marshal() (dAtA []byte, err error) { diff --git a/x/alliance/types/gov.pb.go b/x/alliance/types/gov.pb.go index bbdea001..7c171949 100644 --- a/x/alliance/types/gov.pb.go +++ b/x/alliance/types/gov.pb.go @@ -4,8 +4,8 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" @@ -38,12 +38,12 @@ type MsgCreateAllianceProposal struct { // The reward weight specifies the ratio of rewards that will be given to each alliance asset // It does not need to sum to 1. rate = weight / total_weight // Native asset is always assumed to have a weight of 1. - RewardWeight github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=reward_weight,json=rewardWeight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reward_weight"` + RewardWeight cosmossdk_io_math.LegacyDec `protobuf:"bytes,4,opt,name=reward_weight,json=rewardWeight,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"reward_weight"` // A positive take rate is used for liquid staking derivatives. It defines an annualized reward rate that // will be redirected to the distribution rewards pool - TakeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=take_rate,json=takeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"take_rate"` - RewardChangeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=reward_change_rate,json=rewardChangeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reward_change_rate"` - RewardChangeInterval time.Duration `protobuf:"bytes,7,opt,name=reward_change_interval,json=rewardChangeInterval,proto3,stdduration" json:"reward_change_interval"` + TakeRate cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=take_rate,json=takeRate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"take_rate"` + RewardChangeRate cosmossdk_io_math.LegacyDec `protobuf:"bytes,6,opt,name=reward_change_rate,json=rewardChangeRate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"reward_change_rate"` + RewardChangeInterval time.Duration `protobuf:"bytes,7,opt,name=reward_change_interval,json=rewardChangeInterval,proto3,stdduration" json:"reward_change_interval"` // set a bound of weight range to limit how much reward weights can scale. RewardWeightRange RewardWeightRange `protobuf:"bytes,8,opt,name=reward_weight_range,json=rewardWeightRange,proto3" json:"reward_weight_range"` } @@ -91,10 +91,10 @@ type MsgUpdateAllianceProposal struct { // The reward weight specifies the ratio of rewards that will be given to each alliance asset // It does not need to sum to 1. rate = weight / total_weight // Native asset is always assumed to have a weight of 1. - RewardWeight github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=reward_weight,json=rewardWeight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reward_weight"` - TakeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=take_rate,json=takeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"take_rate"` - RewardChangeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=reward_change_rate,json=rewardChangeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reward_change_rate"` - RewardChangeInterval time.Duration `protobuf:"bytes,7,opt,name=reward_change_interval,json=rewardChangeInterval,proto3,stdduration" json:"reward_change_interval"` + RewardWeight cosmossdk_io_math.LegacyDec `protobuf:"bytes,4,opt,name=reward_weight,json=rewardWeight,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"reward_weight"` + TakeRate cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=take_rate,json=takeRate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"take_rate"` + RewardChangeRate cosmossdk_io_math.LegacyDec `protobuf:"bytes,6,opt,name=reward_change_rate,json=rewardChangeRate,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"reward_change_rate"` + RewardChangeInterval time.Duration `protobuf:"bytes,7,opt,name=reward_change_interval,json=rewardChangeInterval,proto3,stdduration" json:"reward_change_interval"` } func (m *MsgUpdateAllianceProposal) Reset() { *m = MsgUpdateAllianceProposal{} } @@ -180,37 +180,37 @@ func init() { func init() { proto.RegisterFile("alliance/gov.proto", fileDescriptor_5518a6f5c90c8452) } var fileDescriptor_5518a6f5c90c8452 = []byte{ - // 476 bytes of a gzipped FileDescriptorProto + // 480 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x94, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0x6d, 0x9a, 0x14, 0xf7, 0x5a, 0xa4, 0x72, 0x44, 0xe0, 0x16, 0xc9, 0x8e, 0x32, 0x54, - 0x5d, 0x6a, 0x23, 0xd8, 0xba, 0xe1, 0x66, 0x01, 0x84, 0x04, 0x87, 0x10, 0x02, 0x21, 0x45, 0x17, - 0xfb, 0x71, 0xb1, 0x7a, 0xf6, 0x59, 0xe7, 0x4b, 0x4b, 0x3e, 0x00, 0x12, 0x23, 0x23, 0x63, 0xbf, - 0x03, 0x5f, 0xa2, 0x63, 0x47, 0xc4, 0x10, 0xaa, 0x64, 0x61, 0xe6, 0x13, 0xa0, 0x3b, 0x3b, 0xa9, - 0xcb, 0xd8, 0x81, 0x01, 0x75, 0xf2, 0xbb, 0xf7, 0x7f, 0xfa, 0xf9, 0xf4, 0xff, 0x3f, 0x1d, 0xc2, - 0x94, 0xf3, 0x94, 0xe6, 0x31, 0x84, 0x4c, 0x1c, 0x05, 0x85, 0x14, 0x4a, 0x60, 0x67, 0xd1, 0xdb, - 0xbe, 0xb7, 0x54, 0x17, 0x45, 0x35, 0xb2, 0xdd, 0x61, 0x82, 0x09, 0x53, 0x86, 0xba, 0xaa, 0xbb, - 0x1e, 0x13, 0x82, 0x71, 0x08, 0xcd, 0x69, 0x38, 0xfe, 0x10, 0x26, 0x63, 0x49, 0x55, 0x2a, 0xf2, - 0x4a, 0xef, 0x7d, 0x6b, 0xa1, 0xad, 0xe7, 0x25, 0x3b, 0x90, 0x40, 0x15, 0x3c, 0xae, 0x89, 0x2f, - 0xa4, 0x28, 0x44, 0x49, 0x39, 0xee, 0xa0, 0xb6, 0x4a, 0x15, 0x07, 0xd7, 0xee, 0xda, 0xbb, 0x6b, - 0xa4, 0x3a, 0xe0, 0x2e, 0x5a, 0x4f, 0xa0, 0x8c, 0x65, 0x5a, 0x68, 0x90, 0x7b, 0xc3, 0x68, 0xcd, - 0x16, 0xde, 0x41, 0xed, 0x04, 0x72, 0x91, 0xb9, 0x2b, 0x5a, 0x8b, 0x36, 0x7f, 0x4f, 0xfd, 0x8d, - 0x09, 0xcd, 0xf8, 0x7e, 0xcf, 0xb4, 0x7b, 0xa4, 0x92, 0xf1, 0x2b, 0x74, 0x4b, 0xc2, 0x31, 0x95, - 0xc9, 0xe0, 0x18, 0x52, 0x36, 0x52, 0x6e, 0xcb, 0xcc, 0x07, 0xa7, 0x53, 0xdf, 0xfa, 0x31, 0xf5, - 0x77, 0x58, 0xaa, 0x46, 0xe3, 0x61, 0x10, 0x8b, 0x2c, 0x8c, 0x45, 0x99, 0x89, 0xb2, 0xfe, 0xec, - 0x95, 0xc9, 0x61, 0xa8, 0x26, 0x05, 0x94, 0x41, 0x1f, 0x62, 0xb2, 0x51, 0x41, 0xde, 0x18, 0x06, - 0x7e, 0x86, 0xd6, 0x14, 0x3d, 0x84, 0x81, 0xa4, 0x0a, 0xdc, 0xf6, 0x95, 0x80, 0x8e, 0x06, 0x10, - 0xaa, 0x00, 0xbf, 0x47, 0xb8, 0xbe, 0x61, 0x3c, 0xa2, 0x39, 0xab, 0xa9, 0xab, 0x57, 0xa2, 0x6e, - 0x56, 0xa4, 0x03, 0x03, 0x32, 0xf4, 0xb7, 0xe8, 0xee, 0x65, 0x7a, 0x9a, 0x2b, 0x90, 0x47, 0x94, - 0xbb, 0x37, 0xbb, 0xf6, 0xee, 0xfa, 0xc3, 0xad, 0xa0, 0x8a, 0x2f, 0x58, 0xc4, 0x17, 0xf4, 0xeb, - 0xf8, 0x22, 0x47, 0xff, 0xfc, 0xeb, 0x4f, 0xdf, 0x26, 0x9d, 0x26, 0xf6, 0x49, 0x0d, 0xc0, 0x2f, - 0xd1, 0x9d, 0x4b, 0xd6, 0x0e, 0xa4, 0x96, 0x5d, 0xc7, 0x70, 0xef, 0x07, 0xcb, 0xe5, 0x21, 0x0d, - 0xeb, 0x88, 0x1e, 0x89, 0x5a, 0x9a, 0x4c, 0x6e, 0xcb, 0xbf, 0x85, 0x7d, 0xe7, 0xf3, 0x89, 0x6f, - 0xfd, 0x3a, 0xf1, 0xad, 0xde, 0xf9, 0x8a, 0xd9, 0x9a, 0xd7, 0x45, 0x72, 0xbd, 0x35, 0xff, 0xd3, - 0xd6, 0x34, 0x22, 0xfe, 0x64, 0x9b, 0x88, 0xfb, 0xc0, 0xe1, 0xdf, 0x47, 0x7c, 0x71, 0x8f, 0xe8, - 0xe9, 0xe9, 0xcc, 0xb3, 0xcf, 0x66, 0x9e, 0x7d, 0x3e, 0xf3, 0xec, 0x2f, 0x73, 0xcf, 0x3a, 0x9b, - 0x7b, 0xd6, 0xf7, 0xb9, 0x67, 0xbd, 0x7b, 0xd0, 0x30, 0x50, 0x81, 0x94, 0x74, 0x2f, 0x13, 0x39, - 0x4c, 0x96, 0xef, 0x62, 0xf8, 0xf1, 0xa2, 0x34, 0x76, 0x0e, 0x57, 0x8d, 0x21, 0x8f, 0xfe, 0x04, - 0x00, 0x00, 0xff, 0xff, 0x0d, 0xf5, 0xa0, 0xaf, 0x62, 0x05, 0x00, 0x00, + 0x14, 0xc7, 0x6d, 0x9a, 0x14, 0xf7, 0x5a, 0xa4, 0x72, 0x44, 0xe0, 0xb6, 0x92, 0x1d, 0x05, 0x09, + 0x75, 0xc1, 0x46, 0xb0, 0x75, 0x82, 0x34, 0x03, 0x20, 0x90, 0xa8, 0x25, 0x84, 0x60, 0x89, 0x2e, + 0xf6, 0xe3, 0x62, 0xf5, 0xec, 0x67, 0x9d, 0x2f, 0x2d, 0xf9, 0x00, 0x48, 0x8c, 0x88, 0x89, 0xb1, + 0xdf, 0x84, 0xb5, 0x63, 0x47, 0xc4, 0x10, 0x50, 0xb2, 0x30, 0xf3, 0x09, 0xd0, 0x9d, 0x9d, 0x34, + 0x65, 0xea, 0x84, 0x84, 0xc4, 0xf6, 0xee, 0xfd, 0xef, 0xff, 0xf3, 0xe9, 0xfd, 0x9f, 0x4c, 0x28, + 0x13, 0x22, 0x65, 0x79, 0x0c, 0x21, 0xc7, 0xa3, 0xa0, 0x90, 0xa8, 0x90, 0x3a, 0xf3, 0xde, 0xf6, + 0xad, 0x85, 0x3a, 0x2f, 0xaa, 0x2b, 0xdb, 0x2d, 0x8e, 0x1c, 0x4d, 0x19, 0xea, 0xaa, 0xee, 0x7a, + 0x1c, 0x91, 0x0b, 0x08, 0xcd, 0x69, 0x30, 0x7a, 0x1b, 0x26, 0x23, 0xc9, 0x54, 0x8a, 0x79, 0xa5, + 0x77, 0x3e, 0x35, 0xc8, 0xd6, 0xf3, 0x92, 0xef, 0x4b, 0x60, 0x0a, 0x1e, 0xd5, 0xc4, 0x17, 0x12, + 0x0b, 0x2c, 0x99, 0xa0, 0x2d, 0xd2, 0x54, 0xa9, 0x12, 0xe0, 0xda, 0x6d, 0x7b, 0x77, 0x2d, 0xaa, + 0x0e, 0xb4, 0x4d, 0xd6, 0x13, 0x28, 0x63, 0x99, 0x16, 0x1a, 0xe4, 0x5e, 0x31, 0xda, 0x72, 0x8b, + 0xde, 0x21, 0xcd, 0x04, 0x72, 0xcc, 0xdc, 0x15, 0xad, 0x75, 0x37, 0x7f, 0x4d, 0xfc, 0x8d, 0x31, + 0xcb, 0xc4, 0x5e, 0xc7, 0xb4, 0x3b, 0x51, 0x25, 0xd3, 0xc7, 0xe4, 0x9a, 0x84, 0x63, 0x26, 0x93, + 0xfe, 0x31, 0xa4, 0x7c, 0xa8, 0xdc, 0x86, 0xb9, 0x7f, 0xfb, 0x74, 0xe2, 0x5b, 0xdf, 0x26, 0xfe, + 0x4e, 0x8c, 0x65, 0x86, 0x65, 0x99, 0x1c, 0x06, 0x29, 0x86, 0x19, 0x53, 0xc3, 0xe0, 0x19, 0x70, + 0x16, 0x8f, 0x7b, 0x10, 0x47, 0x1b, 0x95, 0xf3, 0x95, 0x31, 0xd2, 0x87, 0x64, 0x4d, 0xb1, 0x43, + 0xe8, 0x4b, 0xa6, 0xc0, 0x6d, 0x5e, 0x9e, 0xe2, 0x68, 0x57, 0xc4, 0x14, 0xd0, 0x03, 0x42, 0xeb, + 0xb7, 0xc4, 0x43, 0x96, 0xf3, 0x1a, 0xb5, 0x7a, 0x79, 0xd4, 0x66, 0x65, 0xdf, 0x37, 0x6e, 0x83, + 0x7c, 0x4d, 0x6e, 0x5e, 0x44, 0xa6, 0xb9, 0x02, 0x79, 0xc4, 0x84, 0x7b, 0xb5, 0x6d, 0xef, 0xae, + 0xdf, 0xdf, 0x0a, 0xaa, 0x74, 0x82, 0x79, 0x3a, 0x41, 0xaf, 0x4e, 0xa7, 0xeb, 0xe8, 0x2f, 0x7e, + 0xfe, 0xee, 0xdb, 0x51, 0x6b, 0x19, 0xfb, 0xa4, 0x06, 0xd0, 0x03, 0x72, 0xe3, 0xc2, 0xe4, 0xfa, + 0x52, 0xcb, 0xae, 0x63, 0xb8, 0x3b, 0xc1, 0x62, 0x37, 0xa2, 0xa5, 0x21, 0x45, 0xfa, 0x4a, 0xb7, + 0xa1, 0xc9, 0xd1, 0x75, 0xf9, 0xa7, 0xb0, 0xe7, 0x7c, 0x38, 0xf1, 0xad, 0x9f, 0x27, 0xbe, 0xd5, + 0xf9, 0xb2, 0x62, 0x96, 0xe2, 0x65, 0x91, 0xfc, 0x5f, 0x8a, 0x7f, 0x68, 0x29, 0x96, 0x12, 0x7c, + 0x6f, 0x9b, 0x04, 0x7b, 0x20, 0xe0, 0xef, 0x27, 0x78, 0xfe, 0x8e, 0xee, 0xd3, 0xd3, 0xa9, 0x67, + 0x9f, 0x4d, 0x3d, 0xfb, 0xc7, 0xd4, 0xb3, 0x3f, 0xce, 0x3c, 0xeb, 0x6c, 0xe6, 0x59, 0x5f, 0x67, + 0x9e, 0xf5, 0xe6, 0x1e, 0x4f, 0xd5, 0x70, 0x34, 0x08, 0x62, 0xcc, 0x42, 0x05, 0x52, 0xb2, 0xbb, + 0x19, 0xe6, 0x30, 0x5e, 0xfc, 0xd5, 0xc2, 0x77, 0xe7, 0xa5, 0x1a, 0x17, 0x50, 0x0e, 0x56, 0xcd, + 0x40, 0x1e, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xb0, 0xa1, 0x95, 0x20, 0x05, 0x00, 0x00, } func (m *MsgCreateAllianceProposal) Marshal() (dAtA []byte, err error) { diff --git a/x/alliance/types/params.pb.go b/x/alliance/types/params.pb.go index b80b4716..1e805dd9 100644 --- a/x/alliance/types/params.pb.go +++ b/x/alliance/types/params.pb.go @@ -4,9 +4,9 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" @@ -93,8 +93,8 @@ func (m *Params) GetLastTakeRateClaimTime() time.Time { } type RewardHistory struct { - Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` - Index github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=index,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"index"` + Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` + Index cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=index,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"index"` } func (m *RewardHistory) Reset() { *m = RewardHistory{} } @@ -146,32 +146,32 @@ func init() { proto.RegisterFile("alliance/params.proto", fileDescriptor_3dc4a5b var fileDescriptor_3dc4a5b6d277cc53 = []byte{ // 412 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x3f, 0x8f, 0xd3, 0x30, - 0x18, 0xc6, 0x93, 0x42, 0xab, 0xd6, 0x08, 0x21, 0xa2, 0x56, 0x6a, 0x3b, 0x24, 0xa8, 0x03, 0x62, - 0x69, 0x82, 0x60, 0x43, 0x4c, 0x25, 0x03, 0xb0, 0x80, 0xa2, 0x4e, 0x08, 0x11, 0xb9, 0xc9, 0x4b, - 0xb0, 0x1a, 0xc7, 0x91, 0xed, 0x42, 0x33, 0xf1, 0x15, 0x3a, 0xb2, 0x20, 0xf1, 0x21, 0xf8, 0x10, - 0x1d, 0x2b, 0x26, 0x74, 0x43, 0xef, 0xd4, 0x2e, 0xf7, 0x31, 0x4e, 0xb6, 0xd3, 0xbb, 0xaa, 0xb7, - 0xdc, 0x14, 0xbf, 0x7e, 0x5e, 0xff, 0x9e, 0xf7, 0x4f, 0x50, 0x0f, 0xe7, 0x39, 0xc1, 0x45, 0x02, - 0x41, 0x89, 0x39, 0xa6, 0xc2, 0x2f, 0x39, 0x93, 0xcc, 0x69, 0x1f, 0xae, 0x87, 0xdd, 0x8c, 0x65, - 0x4c, 0x5f, 0x06, 0xea, 0x64, 0xf4, 0xe1, 0x20, 0x61, 0x82, 0x32, 0x11, 0x1b, 0xc1, 0x04, 0xb5, - 0xe4, 0x66, 0x8c, 0x65, 0x39, 0x04, 0x3a, 0x9a, 0x2d, 0xbe, 0x06, 0xe9, 0x82, 0x63, 0x49, 0x58, - 0x51, 0xeb, 0xde, 0xa9, 0x2e, 0x09, 0x05, 0x21, 0x31, 0x2d, 0x4d, 0xc2, 0xe8, 0x77, 0x03, 0xb5, - 0x3e, 0xea, 0x62, 0x9c, 0x0f, 0xe8, 0x31, 0x87, 0x1f, 0x98, 0xa7, 0x71, 0x0a, 0x39, 0xae, 0x62, - 0x95, 0xda, 0xb7, 0x9f, 0xd8, 0xcf, 0x1e, 0xbc, 0x18, 0xf8, 0x86, 0xe3, 0x1f, 0x38, 0x7e, 0x58, - 0xfb, 0x4c, 0xda, 0xeb, 0xad, 0x67, 0xfd, 0x3a, 0xf7, 0xec, 0xe8, 0x91, 0x79, 0x1d, 0xaa, 0xc7, - 0x53, 0x42, 0xc1, 0xf9, 0x8c, 0xfa, 0x12, 0xcf, 0x21, 0xe6, 0x58, 0x42, 0x9c, 0xe4, 0x98, 0xd0, - 0x98, 0x14, 0x12, 0xf8, 0x77, 0x9c, 0xf7, 0x1b, 0x77, 0xe7, 0xf6, 0x14, 0x24, 0xc2, 0x12, 0xde, - 0x28, 0xc4, 0xbb, 0x9a, 0xe0, 0x7c, 0x41, 0x83, 0x1c, 0x0b, 0x19, 0x9f, 0x5a, 0xe8, 0xb2, 0xef, - 0x69, 0xfc, 0xf0, 0x16, 0x7e, 0x7a, 0x68, 0xdf, 0xf0, 0x57, 0x9a, 0xaf, 0x30, 0xd3, 0x63, 0x0f, - 0x95, 0xf5, 0xea, 0xfe, 0xe5, 0x1f, 0xcf, 0x1e, 0xfd, 0x44, 0x0f, 0x23, 0xdd, 0xd6, 0x5b, 0x22, - 0x24, 0xe3, 0x95, 0xd3, 0x45, 0xcd, 0x14, 0x0a, 0x46, 0xf5, 0x64, 0x3a, 0x91, 0x09, 0x9c, 0x08, - 0x35, 0x49, 0x91, 0xc2, 0x52, 0xf7, 0xd5, 0x99, 0xbc, 0x56, 0xf0, 0xb3, 0xad, 0xf7, 0x34, 0x23, - 0xf2, 0xdb, 0x62, 0xe6, 0x27, 0x8c, 0xd6, 0x7b, 0xab, 0x3f, 0x63, 0x91, 0xce, 0x03, 0x59, 0x95, - 0x20, 0xfc, 0x10, 0x92, 0x7f, 0x7f, 0xc7, 0xa8, 0x5e, 0x6b, 0x08, 0x49, 0x64, 0x50, 0xa6, 0x80, - 0xc9, 0xfb, 0xf5, 0xce, 0xb5, 0x37, 0x3b, 0xd7, 0xbe, 0xd8, 0xb9, 0xf6, 0x6a, 0xef, 0x5a, 0x9b, - 0xbd, 0x6b, 0xfd, 0xdf, 0xbb, 0xd6, 0xa7, 0xe7, 0x47, 0x70, 0x09, 0x9c, 0xe3, 0x31, 0x65, 0x05, - 0x54, 0xc1, 0xf5, 0x4f, 0xb6, 0xbc, 0x39, 0x6a, 0xab, 0x59, 0x4b, 0xcf, 0xe1, 0xe5, 0x55, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xfe, 0x86, 0x08, 0x32, 0x88, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0xaa, 0xd3, 0x40, + 0x14, 0xc6, 0x93, 0xab, 0xf7, 0x72, 0x3b, 0x22, 0x62, 0x68, 0xa1, 0xad, 0x90, 0x48, 0x57, 0x6e, + 0x9a, 0xf8, 0x67, 0xe7, 0xb2, 0x06, 0xfc, 0x83, 0xa0, 0x84, 0xae, 0x44, 0x0c, 0xa7, 0xc9, 0x31, + 0x1d, 0x9a, 0xc9, 0x84, 0x99, 0xa9, 0x36, 0x6f, 0xd1, 0xa5, 0x1b, 0xc1, 0x87, 0xf0, 0x21, 0xba, + 0x2c, 0xae, 0xc4, 0x45, 0x95, 0x76, 0xe3, 0x63, 0xc8, 0xcc, 0xa4, 0x2a, 0x75, 0xe3, 0x6e, 0xce, + 0x7c, 0xe7, 0xfc, 0xbe, 0xf9, 0x72, 0x42, 0x7a, 0x50, 0x96, 0x14, 0xaa, 0x0c, 0xa3, 0x1a, 0x04, + 0x30, 0x19, 0xd6, 0x82, 0x2b, 0xee, 0x5d, 0x1e, 0xaf, 0x87, 0xdd, 0x82, 0x17, 0xdc, 0x5c, 0x46, + 0xfa, 0x64, 0xf5, 0xe1, 0x20, 0xe3, 0x92, 0x71, 0x99, 0x5a, 0xc1, 0x16, 0xad, 0xe4, 0x17, 0x9c, + 0x17, 0x25, 0x46, 0xa6, 0x9a, 0x2d, 0xdf, 0x46, 0xf9, 0x52, 0x80, 0xa2, 0xbc, 0x6a, 0xf5, 0xe0, + 0x54, 0x57, 0x94, 0xa1, 0x54, 0xc0, 0x6a, 0xdb, 0x30, 0xfa, 0x78, 0x46, 0x2e, 0x5e, 0x9a, 0xc7, + 0x78, 0x2f, 0xc8, 0x4d, 0x81, 0xef, 0x41, 0xe4, 0x69, 0x8e, 0x25, 0x34, 0xa9, 0x6e, 0xed, 0xbb, + 0xb7, 0xdd, 0x3b, 0xd7, 0xee, 0x0f, 0x42, 0xcb, 0x09, 0x8f, 0x9c, 0x30, 0x6e, 0x7d, 0x26, 0x97, + 0x9b, 0x5d, 0xe0, 0x7c, 0xf8, 0x1e, 0xb8, 0xc9, 0x0d, 0x3b, 0x1d, 0xeb, 0xe1, 0x29, 0x65, 0xe8, + 0xbd, 0x26, 0x7d, 0x05, 0x0b, 0x4c, 0x05, 0x28, 0x4c, 0xb3, 0x12, 0x28, 0x4b, 0x69, 0xa5, 0x50, + 0xbc, 0x83, 0xb2, 0x7f, 0xf6, 0xff, 0xdc, 0x9e, 0x86, 0x24, 0xa0, 0xf0, 0x91, 0x46, 0x3c, 0x6d, + 0x09, 0xde, 0x1b, 0x32, 0x28, 0x41, 0xaa, 0xf4, 0xd4, 0xc2, 0x3c, 0xfb, 0x8a, 0xc1, 0x0f, 0xff, + 0xc1, 0x4f, 0x8f, 0xf1, 0x2d, 0x7f, 0x6d, 0xf8, 0x1a, 0x33, 0xfd, 0xdb, 0x43, 0x77, 0x3d, 0xbc, + 0xfa, 0xf3, 0x53, 0xe0, 0x8e, 0x14, 0xb9, 0x9e, 0x98, 0x58, 0x4f, 0xa8, 0x54, 0x5c, 0x34, 0x5e, + 0x97, 0x9c, 0xe7, 0x58, 0x71, 0x66, 0xbe, 0x4c, 0x27, 0xb1, 0x85, 0xf7, 0x98, 0x9c, 0xd3, 0x2a, + 0xc7, 0x95, 0xc9, 0xd5, 0x99, 0xdc, 0xd3, 0xf0, 0x6f, 0xbb, 0xe0, 0x96, 0x5d, 0x96, 0xcc, 0x17, + 0x21, 0xe5, 0x11, 0x03, 0x35, 0x0f, 0x9f, 0x63, 0x01, 0x59, 0x13, 0x63, 0xf6, 0xe5, 0xf3, 0x98, + 0xb4, 0xbb, 0x8c, 0x31, 0x4b, 0xec, 0xbc, 0x75, 0x9d, 0x3c, 0xdb, 0xec, 0x7d, 0x77, 0xbb, 0xf7, + 0xdd, 0x1f, 0x7b, 0xdf, 0x5d, 0x1f, 0x7c, 0x67, 0x7b, 0xf0, 0x9d, 0xaf, 0x07, 0xdf, 0x79, 0x75, + 0xb7, 0xa0, 0x6a, 0xbe, 0x9c, 0x85, 0x19, 0x67, 0x91, 0x42, 0x21, 0x60, 0xcc, 0x78, 0x85, 0x4d, + 0xf4, 0xfb, 0xcf, 0x5a, 0xfd, 0x39, 0xaa, 0xa6, 0x46, 0x39, 0xbb, 0x30, 0xe1, 0x1f, 0xfc, 0x0a, + 0x00, 0x00, 0xff, 0xff, 0xb6, 0xc4, 0x5a, 0x5d, 0x7d, 0x02, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { diff --git a/x/alliance/types/unbonding.pb.go b/x/alliance/types/unbonding.pb.go index ad24eeea..8fc20aa1 100644 --- a/x/alliance/types/unbonding.pb.go +++ b/x/alliance/types/unbonding.pb.go @@ -4,9 +4,9 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" @@ -37,7 +37,7 @@ type UnbondingDelegation struct { // validator_address is the bech32-encoded address of the validator. ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // amount defines the tokens to receive at completion. - Amount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount"` + Amount cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=amount,proto3,customtype=cosmossdk.io/math.Int" json:"amount"` } func (m *UnbondingDelegation) Reset() { *m = UnbondingDelegation{} } @@ -94,30 +94,29 @@ func init() { func init() { proto.RegisterFile("alliance/unbonding.proto", fileDescriptor_3f534c4187c9dadc) } var fileDescriptor_3f534c4187c9dadc = []byte{ - // 356 bytes of a gzipped FileDescriptorProto + // 352 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xbf, 0x4e, 0xeb, 0x30, - 0x14, 0xc6, 0xe3, 0xde, 0xab, 0xaa, 0x37, 0x57, 0xe2, 0x4f, 0xe8, 0x10, 0x3a, 0x24, 0x15, 0x03, - 0xea, 0x92, 0x04, 0xc1, 0x86, 0x58, 0xa8, 0x60, 0x28, 0x12, 0x4b, 0x29, 0x0b, 0x4b, 0xe5, 0x24, - 0xc6, 0x44, 0x24, 0x3e, 0x91, 0xed, 0x20, 0xfa, 0x04, 0xac, 0x7d, 0x04, 0x1e, 0xa2, 0x0f, 0xd1, - 0xb1, 0xea, 0x84, 0x18, 0x0a, 0x6a, 0x17, 0x1e, 0x03, 0x25, 0x71, 0x5a, 0xc4, 0x94, 0x73, 0xce, - 0x2f, 0xdf, 0xf7, 0xd9, 0xc7, 0xba, 0x89, 0xe3, 0x38, 0xc2, 0x2c, 0x20, 0x5e, 0xc6, 0x7c, 0x60, - 0x61, 0xc4, 0xa8, 0x9b, 0x72, 0x90, 0x60, 0x34, 0x2a, 0xd2, 0x6a, 0x52, 0xa0, 0x50, 0x0c, 0xbd, - 0xbc, 0x2a, 0x79, 0x6b, 0x3f, 0x00, 0x91, 0x80, 0x18, 0x96, 0xa0, 0x6c, 0x14, 0xb2, 0x28, 0x00, - 0x8d, 0x89, 0x57, 0x74, 0x7e, 0x76, 0xef, 0x85, 0x19, 0xc7, 0x32, 0x02, 0xa6, 0xb8, 0xfd, 0x9b, - 0xcb, 0x28, 0x21, 0x42, 0xe2, 0x24, 0x2d, 0x7f, 0x38, 0x78, 0xa9, 0xe9, 0x7b, 0xb7, 0xd5, 0x79, - 0x2e, 0x48, 0x4c, 0x68, 0x21, 0x37, 0xae, 0xf5, 0xed, 0x00, 0x92, 0x34, 0x26, 0x79, 0x37, 0xcc, - 0x55, 0x26, 0x6a, 0xa3, 0xce, 0xff, 0xe3, 0x96, 0x5b, 0x5a, 0xba, 0x95, 0xa5, 0x3b, 0xa8, 0x2c, - 0xbb, 0x8d, 0xe9, 0xc2, 0xd6, 0xc6, 0x1f, 0x36, 0xea, 0x6f, 0x6d, 0xc4, 0x39, 0x36, 0x2e, 0xf5, - 0xdd, 0x27, 0x1c, 0x47, 0x21, 0x96, 0xc0, 0x87, 0x38, 0x0c, 0x39, 0x11, 0xc2, 0xac, 0xb5, 0x51, - 0xe7, 0x5f, 0xd7, 0x9c, 0x4f, 0x9c, 0xa6, 0xba, 0xd4, 0x79, 0x49, 0x6e, 0x24, 0x8f, 0x18, 0xed, - 0xef, 0xac, 0x25, 0x6a, 0x6e, 0x0c, 0xf4, 0x3a, 0x4e, 0x20, 0x63, 0xd2, 0xfc, 0x53, 0x68, 0xcf, - 0xf2, 0xc0, 0xf7, 0x85, 0x7d, 0x48, 0x23, 0xf9, 0x90, 0xf9, 0x6e, 0x00, 0x89, 0xda, 0x8f, 0xfa, - 0x38, 0x22, 0x7c, 0xf4, 0xe4, 0x28, 0x25, 0xc2, 0xed, 0x31, 0x39, 0x9f, 0x38, 0xba, 0x4a, 0xea, - 0x31, 0xd9, 0x57, 0x5e, 0xa7, 0x7f, 0xbf, 0x5e, 0x6d, 0xd4, 0xbd, 0x9a, 0x2e, 0x2d, 0x34, 0x5b, - 0x5a, 0xe8, 0x73, 0x69, 0xa1, 0xf1, 0xca, 0xd2, 0x66, 0x2b, 0x4b, 0x7b, 0x5b, 0x59, 0xda, 0xdd, - 0xd1, 0x0f, 0x77, 0x49, 0x38, 0xc7, 0x4e, 0x02, 0x8c, 0x8c, 0xbc, 0xf5, 0x83, 0x3e, 0x6f, 0xca, - 0x22, 0xcb, 0xaf, 0x17, 0xcb, 0x39, 0xf9, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xd2, 0x77, 0x65, - 0xf4, 0x01, 0x00, 0x00, + 0x14, 0x87, 0xe3, 0x7b, 0xaf, 0xaa, 0xde, 0x5c, 0xe9, 0x02, 0xa1, 0x48, 0xa1, 0x43, 0x52, 0x31, + 0x55, 0x42, 0x4d, 0x10, 0x6c, 0x6c, 0x14, 0x18, 0x8a, 0xc4, 0x52, 0x60, 0x61, 0xa9, 0x9c, 0xc4, + 0xb8, 0x16, 0xb1, 0x4f, 0x14, 0x3b, 0x88, 0xbe, 0x45, 0x1f, 0x81, 0x87, 0xe8, 0x43, 0x74, 0xac, + 0x3a, 0x21, 0x86, 0x82, 0xda, 0x85, 0x27, 0x60, 0x46, 0x89, 0x93, 0x56, 0x62, 0x3b, 0xe7, 0x7c, + 0xfe, 0x7e, 0xfe, 0x67, 0xda, 0x38, 0x8e, 0x19, 0x16, 0x21, 0xf1, 0x33, 0x11, 0x80, 0x88, 0x98, + 0xa0, 0x5e, 0x92, 0x82, 0x02, 0xab, 0x5e, 0x91, 0x66, 0x83, 0x02, 0x85, 0x62, 0xe8, 0xe7, 0x95, + 0xe6, 0xcd, 0xfd, 0x10, 0x24, 0x07, 0x39, 0xd0, 0x40, 0x37, 0x25, 0x72, 0x28, 0x00, 0x8d, 0x89, + 0x5f, 0x74, 0x41, 0xf6, 0xe0, 0x47, 0x59, 0x8a, 0x15, 0x03, 0x51, 0x72, 0xf7, 0x27, 0x57, 0x8c, + 0x13, 0xa9, 0x30, 0x4f, 0xf4, 0x82, 0x83, 0x2f, 0x64, 0xee, 0xde, 0x55, 0xe7, 0xb9, 0x20, 0x31, + 0xa1, 0x85, 0x6e, 0x5d, 0x9b, 0x5b, 0x21, 0xf0, 0x24, 0x26, 0x79, 0x37, 0xc8, 0x2d, 0x1b, 0xb5, + 0x50, 0xfb, 0xdf, 0x71, 0xd3, 0xd3, 0x91, 0x5e, 0x15, 0xe9, 0xdd, 0x56, 0x91, 0xdd, 0xfa, 0x74, + 0xe1, 0x1a, 0xe3, 0x77, 0x17, 0xf5, 0xff, 0x6f, 0xe4, 0x1c, 0x5b, 0x97, 0xe6, 0xce, 0x13, 0x8e, + 0x59, 0x84, 0x15, 0xa4, 0x03, 0x1c, 0x45, 0x29, 0x91, 0xd2, 0xfe, 0xd5, 0x42, 0xed, 0xbf, 0x5d, + 0x7b, 0x3e, 0xe9, 0x34, 0xca, 0x4b, 0x9d, 0x69, 0x72, 0xa3, 0x52, 0x26, 0x68, 0x7f, 0x7b, 0xad, + 0x94, 0x73, 0xeb, 0xdc, 0xac, 0x61, 0x0e, 0x99, 0x50, 0xf6, 0xef, 0xc2, 0x3d, 0xcc, 0x37, 0x7c, + 0x5b, 0xb8, 0x7b, 0xda, 0x97, 0xd1, 0xa3, 0xc7, 0xc0, 0xe7, 0x58, 0x0d, 0xbd, 0x9e, 0x50, 0xf3, + 0x49, 0xc7, 0x2c, 0x83, 0x7b, 0x42, 0xf5, 0x4b, 0xf5, 0xf4, 0xcf, 0xe7, 0x8b, 0x8b, 0xba, 0x57, + 0xd3, 0xa5, 0x83, 0x66, 0x4b, 0x07, 0x7d, 0x2c, 0x1d, 0x34, 0x5e, 0x39, 0xc6, 0x6c, 0xe5, 0x18, + 0xaf, 0x2b, 0xc7, 0xb8, 0x3f, 0xa2, 0x4c, 0x0d, 0xb3, 0xc0, 0x0b, 0x81, 0xfb, 0x8a, 0xa4, 0x29, + 0xee, 0x70, 0x10, 0x64, 0xe4, 0xaf, 0xff, 0xef, 0x79, 0x53, 0xaa, 0x51, 0x42, 0x64, 0x50, 0x2b, + 0xde, 0xe2, 0xe4, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xc8, 0xf1, 0xaf, 0x43, 0xe3, 0x01, 0x00, 0x00, } func (this *UnbondingDelegation) Equal(that interface{}) bool { From 5227cfd238d4bd15c3cc7e2aac704b41a36240b1 Mon Sep 17 00:00:00 2001 From: kienn6034 Date: Tue, 26 Mar 2024 17:11:02 +0700 Subject: [PATCH 6/8] refactor: update expected cosmos sdk keeper --- x/alliance/module.go | 12 ++-- x/alliance/tests/benchmark/benchmark_test.go | 3 +- x/alliance/tests/simulation/operations.go | 10 +--- x/alliance/types/codec.go | 6 +- x/alliance/types/keeper_interfaces.go | 60 ++++++++++---------- x/alliance/types/tests/types_test.go | 8 +-- 6 files changed, 50 insertions(+), 49 deletions(-) diff --git a/x/alliance/module.go b/x/alliance/module.go index 31dddf48..49950904 100644 --- a/x/alliance/module.go +++ b/x/alliance/module.go @@ -24,6 +24,7 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/cosmos/cosmos-sdk/types/simulation" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" ) @@ -31,7 +32,6 @@ var ( _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModule = AppModule{} _ module.AppModuleSimulation = AppModule{} - _ module.EndBlockAppModule = AppModule{} ) type AppModuleBasic struct { @@ -98,9 +98,11 @@ type AppModule struct { accountKeeper types.AccountKeeper } -func (a AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return EndBlocker(ctx, a.keeper) -} +// IsAppModule implements module.AppModule. +func (AppModule) IsAppModule() {} + +// IsOnePerModuleType implements module.AppModule. +func (AppModule) IsOnePerModuleType() {} func (a AppModule) InitGenesis(ctx sdk.Context, jsonCodec codec.JSONCodec, message json.RawMessage) []abci.ValidatorUpdate { var genesis types.GenesisState @@ -139,7 +141,7 @@ func (a AppModule) ProposalContents(_ module.SimulationState) []simtypes.Weighte return nil } -func (a AppModule) RegisterStoreDecoder(registry sdk.StoreDecoderRegistry) { +func (a AppModule) RegisterStoreDecoder(registry simulation.StoreDecoderRegistry) { registry[types.StoreKey] = simulation2.NewDecodeStore(a.cdc) } diff --git a/x/alliance/tests/benchmark/benchmark_test.go b/x/alliance/tests/benchmark/benchmark_test.go index 72b373a5..b8f231e0 100644 --- a/x/alliance/tests/benchmark/benchmark_test.go +++ b/x/alliance/tests/benchmark/benchmark_test.go @@ -8,6 +8,7 @@ import ( "github.com/terra-money/alliance/x/alliance/tests/benchmark" + sdkmath "cosmossdk.io/math" abcitypes "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/simulation" @@ -40,7 +41,7 @@ var createdDelegations = []types.Delegation{} func TestRunBenchmarks(t *testing.T) { r := rand.New(rand.NewSource(SEED)) app, ctx, assets, vals, dels := benchmark.SetupApp(t, r, NumOfAssets, NumOfValidators, NumOfDelegators) - powerReduction := sdk.OneInt() + powerReduction := sdkmath.OneInt() operations := make(map[string]int) for b := 0; b < NumOfBlocks; b++ { diff --git a/x/alliance/tests/simulation/operations.go b/x/alliance/tests/simulation/operations.go index da87c5ef..ae2460f7 100644 --- a/x/alliance/tests/simulation/operations.go +++ b/x/alliance/tests/simulation/operations.go @@ -77,7 +77,7 @@ func SimulateMsgDelegate(cdc *codec.ProtoCodec, ak types.AccountKeeper, bk types msg := &types.MsgDelegate{ DelegatorAddress: simAccount.Address.String(), - ValidatorAddress: validatorToDelegateTo.GetOperator().String(), + ValidatorAddress: validatorToDelegateTo.GetOperator(), Amount: coinToDelegate, } @@ -87,7 +87,6 @@ func SimulateMsgDelegate(cdc *codec.ProtoCodec, ak types.AccountKeeper, bk types TxGen: tx.NewTxConfig(cdc, tx.DefaultSignModes), Cdc: cdc, Msg: msg, - MsgType: msg.Type(), Context: ctx, SimAccount: simAccount, AccountKeeper: ak, @@ -145,14 +144,14 @@ func SimulateMsgRedelegate(cdc *codec.ProtoCodec, ak types.AccountKeeper, bk typ idx = simtypes.RandIntBetween(r, 0, len(validators)-1) validatorToDelegateTo := validators[idx] - if delegation.ValidatorAddress == validatorToDelegateTo.GetOperator().String() { + if delegation.ValidatorAddress == validatorToDelegateTo.GetOperator() { return simtypes.NoOpMsg(types.ModuleName, types.MsgRedelegateType, "redelegation to the same validator"), nil, nil } msg := &types.MsgRedelegate{ DelegatorAddress: delegation.DelegatorAddress, ValidatorSrcAddress: delegation.ValidatorAddress, - ValidatorDstAddress: validatorToDelegateTo.GetOperator().String(), + ValidatorDstAddress: validatorToDelegateTo.GetOperator(), Amount: sdk.NewCoin(asset.Denom, amountToRedelegate), } @@ -162,7 +161,6 @@ func SimulateMsgRedelegate(cdc *codec.ProtoCodec, ak types.AccountKeeper, bk typ TxGen: tx.NewTxConfig(cdc, tx.DefaultSignModes), Cdc: cdc, Msg: msg, - MsgType: msg.Type(), Context: ctx, SimAccount: simAccount, AccountKeeper: ak, @@ -223,7 +221,6 @@ func SimulateMsgUndelegate(cdc *codec.ProtoCodec, ak types.AccountKeeper, bk typ TxGen: tx.NewTxConfig(cdc, tx.DefaultSignModes), Cdc: cdc, Msg: msg, - MsgType: msg.Type(), Context: ctx, SimAccount: simAccount, AccountKeeper: ak, @@ -271,7 +268,6 @@ func SimulateMsgClaimRewards(cdc *codec.ProtoCodec, ak types.AccountKeeper, bk t TxGen: tx.NewTxConfig(cdc, tx.DefaultSignModes), Cdc: cdc, Msg: msg, - MsgType: msg.Type(), Context: ctx, SimAccount: simAccount, AccountKeeper: ak, diff --git a/x/alliance/types/codec.go b/x/alliance/types/codec.go index 87fb4475..365a1135 100644 --- a/x/alliance/types/codec.go +++ b/x/alliance/types/codec.go @@ -2,11 +2,11 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/codec/legacy" "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" ) @@ -49,5 +49,7 @@ func init() { // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) + RegisterLegacyAminoCodec(legacy.Cdc) + + amino.Seal() } diff --git a/x/alliance/types/keeper_interfaces.go b/x/alliance/types/keeper_interfaces.go index 38edf61b..b3b3c67f 100644 --- a/x/alliance/types/keeper_interfaces.go +++ b/x/alliance/types/keeper_interfaces.go @@ -1,61 +1,61 @@ package types import ( + context "context" "time" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/staking/types" ) type StakingKeeper interface { - UnbondingTime(ctx sdk.Context) (res time.Duration) - Delegate(ctx sdk.Context, delAddr sdk.AccAddress, bondAmt math.Int, tokenSrc types.BondStatus, - validator types.Validator, subtractAccount bool) (newShares sdk.Dec, err error) + UnbondingTime(ctx context.Context) (res time.Duration) + Delegate(ctx context.Context, delAddr sdk.AccAddress, bondAmt math.Int, tokenSrc types.BondStatus, + validator types.Validator, subtractAccount bool) (newShares math.LegacyDec, err error) BeginRedelegation( - ctx sdk.Context, delAddr sdk.AccAddress, valSrcAddr, valDstAddr sdk.ValAddress, sharesAmount sdk.Dec, + ctx context.Context, delAddr sdk.AccAddress, valSrcAddr, valDstAddr sdk.ValAddress, sharesAmount math.LegacyDec, ) (completionTime time.Time, err error) - GetValidator(ctx sdk.Context, addr sdk.ValAddress) (validator types.Validator, found bool) - BondDenom(ctx sdk.Context) (res string) + GetValidator(ctx context.Context, addr sdk.ValAddress) (validator types.Validator, found bool) + BondDenom(ctx context.Context) (res string) ValidateUnbondAmount( - ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress, amt math.Int, - ) (shares sdk.Dec, err error) - RemoveRedelegation(ctx sdk.Context, red types.Redelegation) + ctx context.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress, amt math.Int, + ) (shares math.LegacyDec, err error) + RemoveRedelegation(ctx context.Context, red types.Redelegation) Unbond( - ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress, shares sdk.Dec, + ctx context.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress, shares math.LegacyDec, ) (amount math.Int, err error) - GetDelegation(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) (delegation types.Delegation, found bool) - TotalBondedTokens(ctx sdk.Context) math.Int - GetDelegatorBonded(ctx sdk.Context, delegator sdk.AccAddress) math.Int - RemoveValidatorTokensAndShares(ctx sdk.Context, validator types.Validator, - sharesToRemove sdk.Dec, + GetDelegation(ctx context.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) (delegation types.Delegation, found bool) + TotalBondedTokens(ctx context.Context) math.Int + GetDelegatorBonded(ctx context.Context, delegator sdk.AccAddress) math.Int + RemoveValidatorTokensAndShares(ctx context.Context, validator types.Validator, + sharesToRemove math.LegacyDec, ) (valOut types.Validator, removedTokens math.Int) - RemoveValidatorTokens(ctx sdk.Context, + RemoveValidatorTokens(ctx context.Context, validator types.Validator, tokensToRemove math.Int, ) types.Validator - IterateDelegatorDelegations(ctx sdk.Context, delegator sdk.AccAddress, cb func(delegation types.Delegation) (stop bool)) - GetAllValidators(ctx sdk.Context) (validators []types.Validator) + IterateDelegatorDelegations(ctx context.Context, delegator sdk.AccAddress, cb func(delegation types.Delegation) (stop bool)) + GetAllValidators(ctx context.Context) (validators []types.Validator) } type BankKeeper interface { - MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error - BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error - SendCoinsFromModuleToModule(ctx sdk.Context, senderModule, recipientModule string, amt sdk.Coins) error - SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error - SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error - GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins - GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin - SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins + MintCoins(ctx context.Context, moduleName string, amt sdk.Coins) error + BurnCoins(ctx context.Context, moduleName string, amt sdk.Coins) error + SendCoinsFromModuleToModule(ctx context.Context, senderModule, recipientModule string, amt sdk.Coins) error + SendCoinsFromAccountToModule(ctx context.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error + SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error + GetAllBalances(ctx context.Context, addr sdk.AccAddress) sdk.Coins + GetBalance(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin + SpendableCoins(ctx context.Context, addr sdk.AccAddress) sdk.Coins } // AccountKeeper defines the expected account keeper used for simulations (noalias) type AccountKeeper interface { - GetAccount(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI + GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI GetModuleAddress(name string) sdk.AccAddress - GetModuleAccount(ctx sdk.Context, name string) authtypes.ModuleAccountI + GetModuleAccount(ctx context.Context, name string) sdk.ModuleAccountI } type DistributionKeeper interface { - WithdrawDelegationRewards(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) (sdk.Coins, error) + WithdrawDelegationRewards(ctx context.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) (sdk.Coins, error) } diff --git a/x/alliance/types/tests/types_test.go b/x/alliance/types/tests/types_test.go index 0e31c164..6aca03f0 100644 --- a/x/alliance/types/tests/types_test.go +++ b/x/alliance/types/tests/types_test.go @@ -154,24 +154,24 @@ func TestAminoJSON(t *testing.T) { msgDelegate := types.NewMsgDelegate("delegator", "validator", sdk.NewCoin("Alliance", sdkmath.NewInt(1000000000000000000))) require.Equal(t, `{"account_number":"1","chain_id":"foo","fee":{"amount":[],"gas":"0"},"memo":"memo","msgs":[{"type":"alliance/MsgDelegate","value":{"amount":{"amount":"1000000000000000000","denom":"Alliance"},"delegator_address":"delegator","validator_address":"validator"}}],"sequence":"1","timeout_height":"1"}`, - string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgDelegate}, "memo", nil)), + string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgDelegate}, "memo")), ) msgUndelegate := types.NewMsgUndelegate("delegator", "validator", sdk.NewCoin("Alliance", sdkmath.NewInt(1000000000000000000))) require.Equal(t, `{"account_number":"1","chain_id":"foo","fee":{"amount":[],"gas":"0"},"memo":"memo","msgs":[{"type":"alliance/MsgUndelegate","value":{"amount":{"amount":"1000000000000000000","denom":"Alliance"},"delegator_address":"delegator","validator_address":"validator"}}],"sequence":"1","timeout_height":"1"}`, - string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgUndelegate}, "memo", nil)), + string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgUndelegate}, "memo")), ) msgRedelegate := types.NewMsgRedelegate("delegator", "validator", "validator1", sdk.NewCoin("Alliance", sdkmath.NewInt(1000000000000000000))) require.Equal(t, `{"account_number":"1","chain_id":"foo","fee":{"amount":[],"gas":"0"},"memo":"memo","msgs":[{"type":"alliance/MsgRedelegate","value":{"amount":{"amount":"1000000000000000000","denom":"Alliance"},"delegator_address":"delegator","validator_dst_address":"validator1","validator_src_address":"validator"}}],"sequence":"1","timeout_height":"1"}`, - string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgRedelegate}, "memo", nil)), + string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgRedelegate}, "memo")), ) msgClaimDelegationRewards := types.NewMsgClaimDelegationRewards("delegator", "validator", "Alliance") require.Equal(t, `{"account_number":"1","chain_id":"foo","fee":{"amount":[],"gas":"0"},"memo":"memo","msgs":[{"type":"alliance/MsgClaimDelegationRewards","value":{"delegator_address":"delegator","denom":"Alliance","validator_address":"validator"}}],"sequence":"1","timeout_height":"1"}`, - string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgClaimDelegationRewards}, "memo", nil)), + string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{msgClaimDelegationRewards}, "memo")), ) } From 34f25bf020377a5e4893789d58e4eead60eebc84 Mon Sep 17 00:00:00 2001 From: kienn6034 Date: Tue, 26 Mar 2024 17:42:08 +0700 Subject: [PATCH 7/8] refactor: fix test benchmark --- x/alliance/tests/benchmark/benchmark_test.go | 36 ++++++--- x/alliance/tests/benchmark/test_helper.go | 18 ++--- .../tests/e2e/delegate_undelegate_test.go | 81 ++++++++++++------- x/alliance/tests/e2e/test_helper.go | 3 +- 4 files changed, 88 insertions(+), 50 deletions(-) diff --git a/x/alliance/tests/benchmark/benchmark_test.go b/x/alliance/tests/benchmark/benchmark_test.go index b8f231e0..45acced8 100644 --- a/x/alliance/tests/benchmark/benchmark_test.go +++ b/x/alliance/tests/benchmark/benchmark_test.go @@ -61,7 +61,6 @@ func TestRunBenchmarks(t *testing.T) { Address: cons, Power: votingPower, }, - SignedLastBlock: r.Float64() < VoteRate, }) } @@ -132,7 +131,7 @@ func delegateOperation(ctx sdk.Context, app *test_helpers.App, r *rand.Rand, ass valAddr := sdk.ValAddress(vals[r.Intn(len(vals)-1)]) delAddr := dels[r.Intn(len(dels)-1)] - amountToDelegate := simulation.RandomAmount(r, sdk.NewInt(1000_000_000)) + amountToDelegate := simulation.RandomAmount(r, sdkmath.NewInt(1000_000_000)) if amountToDelegate.IsZero() { return } @@ -143,7 +142,7 @@ func delegateOperation(ctx sdk.Context, app *test_helpers.App, r *rand.Rand, ass val, _ := app.AllianceKeeper.GetAllianceValidator(ctx, valAddr) app.AllianceKeeper.Delegate(ctx, delAddr, val, coins) //nolint:errcheck - createdDelegations = append(createdDelegations, types.NewDelegation(ctx, delAddr, valAddr, asset.Denom, sdk.ZeroDec(), []types.RewardHistory{})) + createdDelegations = append(createdDelegations, types.NewDelegation(ctx, delAddr, valAddr, asset.Denom, sdkmath.LegacyZeroDec(), []types.RewardHistory{})) } func redelegateOperation(ctx sdk.Context, app *test_helpers.App, r *rand.Rand, vals []sdk.AccAddress) { @@ -169,15 +168,21 @@ func redelegateOperation(ctx sdk.Context, app *test_helpers.App, r *rand.Rand, v dstValAddr := getRandomValAddress(r, vals, srcValAddr) dstValidator, _ := app.AllianceKeeper.GetAllianceValidator(ctx, dstValAddr) - delegation, found := app.AllianceKeeper.GetDelegation(ctx, delAddr, srcValidator.GetOperator(), asset.Denom) + srcValidatorAddress, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) + if err != nil { + panic(err) + } + + delegation, found := app.AllianceKeeper.GetDelegation(ctx, delAddr, srcValidatorAddress, asset.Denom) if !found { return } amountToRedelegate := simulation.RandomAmount(r, types.GetDelegationTokens(delegation, srcValidator, asset).Amount) - if amountToRedelegate.LTE(sdk.OneInt()) { + if amountToRedelegate.LTE(sdkmath.OneInt()) { return } - _, err := app.AllianceKeeper.Redelegate(ctx, delAddr, srcValidator, dstValidator, sdk.NewCoin(delegation.Denom, amountToRedelegate)) + + _, err = app.AllianceKeeper.Redelegate(ctx, delAddr, srcValidator, dstValidator, sdk.NewCoin(delegation.Denom, amountToRedelegate)) if err != nil { panic(err) } @@ -216,7 +221,12 @@ func undelegateOperation(ctx sdk.Context, app *test_helpers.App, r *rand.Rand) { validator, _ := app.AllianceKeeper.GetAllianceValidator(ctx, valAddr) asset, _ := app.AllianceKeeper.GetAssetByDenom(ctx, delegation.Denom) - delegation, found := app.AllianceKeeper.GetDelegation(ctx, delAddr, validator.GetOperator(), asset.Denom) + validatorAddress, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) + if err != nil { + panic(err) + } + + delegation, found := app.AllianceKeeper.GetDelegation(ctx, delAddr, validatorAddress, asset.Denom) if !found { return } @@ -224,7 +234,8 @@ func undelegateOperation(ctx sdk.Context, app *test_helpers.App, r *rand.Rand) { if amountToUndelegate.IsZero() { return } - _, err := app.AllianceKeeper.Undelegate(ctx, delAddr, validator, sdk.NewCoin(asset.Denom, amountToUndelegate)) + + _, err = app.AllianceKeeper.Undelegate(ctx, delAddr, validator, sdk.NewCoin(asset.Denom, amountToUndelegate)) if err != nil { panic(err) } @@ -244,12 +255,17 @@ func claimRewardsOperation(ctx sdk.Context, app *test_helpers.App, r *rand.Rand) valAddr, _ := sdk.ValAddressFromBech32(delegation.ValidatorAddress) validator, _ := app.AllianceKeeper.GetAllianceValidator(ctx, valAddr) - delegation, found := app.AllianceKeeper.GetDelegation(ctx, delAddr, validator.GetOperator(), delegation.Denom) + validatorAddress, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) + if err != nil { + panic(err) + } + + delegation, found := app.AllianceKeeper.GetDelegation(ctx, delAddr, validatorAddress, delegation.Denom) if !found { return } - _, err := app.AllianceKeeper.ClaimDelegationRewards(ctx, delAddr, validator, delegation.Denom) + _, err = app.AllianceKeeper.ClaimDelegationRewards(ctx, delAddr, validator, delegation.Denom) if err != nil { panic(err) } diff --git a/x/alliance/tests/benchmark/test_helper.go b/x/alliance/tests/benchmark/test_helper.go index 74ec8582..f4e67282 100644 --- a/x/alliance/tests/benchmark/test_helper.go +++ b/x/alliance/tests/benchmark/test_helper.go @@ -6,7 +6,7 @@ import ( "testing" "time" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/simulation" teststaking "github.com/cosmos/cosmos-sdk/x/staking/testutil" @@ -18,14 +18,14 @@ import ( func SetupApp(t *testing.T, r *rand.Rand, numAssets int, numValidators int, numDelegators int) (app *test_helpers.App, ctx sdk.Context, assets []types.AllianceAsset, valAddrs []sdk.AccAddress, delAddrs []sdk.AccAddress) { app = test_helpers.Setup(t) - ctx = app.BaseApp.NewContext(false, tmproto.Header{}) + ctx = app.BaseApp.NewContext(false) startTime := time.Now() ctx = ctx.WithBlockTime(startTime) for i := 0; i < numAssets; i++ { - rewardWeight := simulation.RandomDecAmount(r, sdk.NewDec(1)) - takeRate := simulation.RandomDecAmount(r, sdk.MustNewDecFromStr("0.0001")) - asset := types.NewAllianceAsset(fmt.Sprintf("ASSET%d", i), rewardWeight, sdk.ZeroDec(), sdk.NewDec(5), takeRate, startTime) - asset.RewardChangeRate = sdk.OneDec().Sub(simulation.RandomDecAmount(r, sdk.MustNewDecFromStr("0.00001"))) + rewardWeight := simulation.RandomDecAmount(r, sdkmath.LegacyNewDec(1)) + takeRate := simulation.RandomDecAmount(r, sdkmath.LegacyMustNewDecFromStr("0.0001")) + asset := types.NewAllianceAsset(fmt.Sprintf("ASSET%d", i), rewardWeight, sdkmath.LegacyZeroDec(), sdkmath.LegacyNewDec(5), takeRate, startTime) + asset.RewardChangeRate = sdkmath.LegacyOneDec().Sub(simulation.RandomDecAmount(r, sdkmath.LegacyMustNewDecFromStr("0.00001"))) asset.RewardChangeInterval = time.Minute * 5 assets = append(assets, asset) } @@ -45,9 +45,9 @@ func SetupApp(t *testing.T, r *rand.Rand, numAssets int, numValidators int, numD _val := teststaking.NewValidator(t, valAddr, pks[i]) _val.Commission = stakingtypes.Commission{ CommissionRates: stakingtypes.CommissionRates{ - Rate: sdk.NewDec(0), - MaxRate: sdk.NewDec(0), - MaxChangeRate: sdk.NewDec(0), + Rate: sdkmath.LegacyNewDec(0), + MaxRate: sdkmath.LegacyNewDec(0), + MaxChangeRate: sdkmath.LegacyNewDec(0), }, UpdateTime: time.Now(), } diff --git a/x/alliance/tests/e2e/delegate_undelegate_test.go b/x/alliance/tests/e2e/delegate_undelegate_test.go index d4fa2145..14e321ac 100644 --- a/x/alliance/tests/e2e/delegate_undelegate_test.go +++ b/x/alliance/tests/e2e/delegate_undelegate_test.go @@ -55,13 +55,18 @@ func TestDelegateThenTakeRateThenUndelegate(t *testing.T) { asset, _ := app.AllianceKeeper.GetAssetByDenom(ctx, "test") - del0, found := app.AllianceKeeper.GetDelegation(ctx, dels[0], val0.GetOperator(), "test") + val0Address, err := sdk.ValAddressFromBech32(val0.GetOperator()) + require.NoError(t, err) + + del0, found := app.AllianceKeeper.GetDelegation(ctx, dels[0], val0Address, "test") require.True(t, found) tokens := types.GetDelegationTokens(del0, val0, asset) _, err = app.AllianceKeeper.Undelegate(ctx, dels[0], val0, tokens) require.NoError(t, err) - _, found = app.AllianceKeeper.GetDelegation(ctx, dels[0], val0.GetOperator(), "test") + val0Address, err = sdk.ValAddressFromBech32(val0.GetOperator()) + require.NoError(t, err) + _, found = app.AllianceKeeper.GetDelegation(ctx, dels[0], val0Address, "test") require.False(t, found) val0, err = app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) @@ -113,13 +118,18 @@ func TestDelegateThenTakeRateThenRedelegate(t *testing.T) { asset, _ := app.AllianceKeeper.GetAssetByDenom(ctx, "test") - del0, found := app.AllianceKeeper.GetDelegation(ctx, dels[0], val0.GetOperator(), "test") + val0Address, err := sdk.ValAddressFromBech32(val0.GetOperator()) + require.NoError(t, err) + + del0, found := app.AllianceKeeper.GetDelegation(ctx, dels[0], val0Address, "test") require.True(t, found) tokens := types.GetDelegationTokens(del0, val0, asset) _, err = app.AllianceKeeper.Redelegate(ctx, dels[0], val0, val1, tokens) require.NoError(t, err) - _, found = app.AllianceKeeper.GetDelegation(ctx, dels[0], val0.GetOperator(), "test") + val0Address, err = sdk.ValAddressFromBech32(val0.GetOperator()) + require.NoError(t, err) + _, found = app.AllianceKeeper.GetDelegation(ctx, dels[0], val0Address, "test") require.False(t, found) val0, err = app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) @@ -155,9 +165,10 @@ func TestDelegatingASmallAmount(t *testing.T) { queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation - distParams := app.DistrKeeper.GetParams(ctx) + distParams, err := app.DistrKeeper.Params.Get(ctx) + require.NoError(t, err) distParams.CommunityTax = sdkmath.LegacyZeroDec() - err := app.DistrKeeper.SetParams(ctx, distParams) + err = app.DistrKeeper.Params.Set(ctx, distParams) require.NoError(t, err) user1 := dels[0] @@ -183,7 +194,7 @@ func TestDelegatingASmallAmount(t *testing.T) { res, err := queryServer.AllianceDelegation(ctx, &types.QueryAllianceDelegationRequest{ DelegatorAddr: user1.String(), - ValidatorAddr: val1.GetOperator().String(), + ValidatorAddr: val1.GetOperator(), Denom: allianceAsset2, Pagination: nil, }) @@ -198,7 +209,9 @@ func TestDelegatingASmallAmount(t *testing.T) { require.NoError(t, err) // User should have everything withdrawn - _, found := app.AllianceKeeper.GetDelegation(ctx, user1, val1.GetOperator(), allianceAsset2) + val1Address, err := sdk.ValAddressFromBech32(val1.GetOperator()) + require.NoError(t, err) + _, found := app.AllianceKeeper.GetDelegation(ctx, user1, val1Address, allianceAsset2) require.False(t, found) // Delegate again @@ -217,7 +230,7 @@ func TestDelegatingASmallAmount(t *testing.T) { res, err = queryServer.AllianceDelegation(ctx, &types.QueryAllianceDelegationRequest{ DelegatorAddr: user1.String(), - ValidatorAddr: val1.GetOperator().String(), + ValidatorAddr: val1.GetOperator(), Denom: allianceAsset2, Pagination: nil, }) @@ -230,12 +243,14 @@ func TestDelegatingASmallAmount(t *testing.T) { require.NoError(t, err) // User should have everything withdrawn - _, found = app.AllianceKeeper.GetDelegation(ctx, user1, val1.GetOperator(), allianceAsset2) + valAddress, err := sdk.ValAddressFromBech32(val1.GetOperator()) + require.NoError(t, err) + _, found = app.AllianceKeeper.GetDelegation(ctx, user1, valAddress, allianceAsset2) require.False(t, found) res, err = queryServer.AllianceDelegation(ctx, &types.QueryAllianceDelegationRequest{ DelegatorAddr: user1.String(), - ValidatorAddr: val1.GetOperator().String(), + ValidatorAddr: val1.GetOperator(), Denom: allianceAsset2, Pagination: nil, }) @@ -247,14 +262,17 @@ func TestDelegatingASmallAmount(t *testing.T) { unbondings, err := app.AllianceKeeper.GetUnbondingsByDenomAndDelegator(ctx, allianceAsset2, user1) require.NoError(t, err) require.True(t, len(unbondings) == 1) - require.Equal(t, val1.GetOperator().String(), unbondings[0].ValidatorAddress) + require.Equal(t, val1.GetOperator(), unbondings[0].ValidatorAddress) require.Equal(t, sdkmath.NewInt(100), unbondings[0].Amount) // Query the unbondings in progress - unbondings, err = app.AllianceKeeper.GetUnbondings(ctx, allianceAsset2, user1, val1.GetOperator()) + valAddress, err = sdk.ValAddressFromBech32(val1.GetOperator()) + require.NoError(t, err) + + unbondings, err = app.AllianceKeeper.GetUnbondings(ctx, allianceAsset2, user1, valAddress) require.NoError(t, err) require.True(t, len(unbondings) == 1) - require.Equal(t, val1.GetOperator().String(), unbondings[0].ValidatorAddress) + require.Equal(t, val1.GetOperator(), unbondings[0].ValidatorAddress) require.Equal(t, sdkmath.NewInt(100), unbondings[0].Amount) } @@ -280,10 +298,11 @@ func TestDelegateAndUndelegateWithSmallAmounts(t *testing.T) { queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation - distParams := app.DistrKeeper.GetParams(ctx) + distParams, err := app.DistrKeeper.Params.Get(ctx) + require.NoError(t, err) distParams.CommunityTax = sdkmath.LegacyZeroDec() - err := app.DistrKeeper.SetParams(ctx, distParams) + err = app.DistrKeeper.Params.Set(ctx, distParams) require.NoError(t, err) val1, err := app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) @@ -308,7 +327,7 @@ func TestDelegateAndUndelegateWithSmallAmounts(t *testing.T) { res, err := queryServer.AllianceDelegation(ctx, &types.QueryAllianceDelegationRequest{ DelegatorAddr: user1.String(), - ValidatorAddr: val1.GetOperator().String(), + ValidatorAddr: val1.GetOperator(), Denom: allianceAsset2, Pagination: nil, }) @@ -347,10 +366,11 @@ func TestUnDelegatingSlightlyMoreCoin(t *testing.T) { queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation - distParams := app.DistrKeeper.GetParams(ctx) + distParams, err := app.DistrKeeper.Params.Get(ctx) + require.NoError(t, err) distParams.CommunityTax = sdkmath.LegacyZeroDec() - err := app.DistrKeeper.SetParams(ctx, distParams) + err = app.DistrKeeper.Params.Set(ctx, distParams) require.NoError(t, err) val1, err := app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) @@ -374,7 +394,7 @@ func TestUnDelegatingSlightlyMoreCoin(t *testing.T) { ctx = ctx.WithBlockTime(startTime.Add(time.Minute * 6)).WithBlockHeight(2) res, err := queryServer.AllianceDelegation(ctx, &types.QueryAllianceDelegationRequest{ DelegatorAddr: user1.String(), - ValidatorAddr: val1.GetOperator().String(), + ValidatorAddr: val1.GetOperator(), Denom: allianceAsset2, Pagination: nil, }) @@ -412,10 +432,11 @@ func TestReDelegatingSlightlyMoreCoin(t *testing.T) { queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation - distParams := app.DistrKeeper.GetParams(ctx) + distParams, err := app.DistrKeeper.Params.Get(ctx) + require.NoError(t, err) distParams.CommunityTax = sdkmath.LegacyZeroDec() - err := app.DistrKeeper.SetParams(ctx, distParams) + err = app.DistrKeeper.Params.Set(ctx, distParams) require.NoError(t, err) val1, err := app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) @@ -439,7 +460,7 @@ func TestReDelegatingSlightlyMoreCoin(t *testing.T) { ctx = ctx.WithBlockTime(startTime.Add(time.Minute * 6)).WithBlockHeight(2) res, err := queryServer.AllianceDelegation(ctx, &types.QueryAllianceDelegationRequest{ DelegatorAddr: user1.String(), - ValidatorAddr: val1.GetOperator().String(), + ValidatorAddr: val1.GetOperator(), Denom: allianceAsset2, Pagination: nil, }) @@ -472,10 +493,11 @@ func TestDustValidatorSharesAfterUndelegationError(t *testing.T) { queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation - distParams := app.DistrKeeper.GetParams(ctx) + distParams, err := app.DistrKeeper.Params.Get(ctx) + require.NoError(t, err) distParams.CommunityTax = sdkmath.LegacyZeroDec() - err := app.DistrKeeper.SetParams(ctx, distParams) + err = app.DistrKeeper.Params.Set(ctx, distParams) require.NoError(t, err) val1, err := app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) @@ -504,7 +526,7 @@ func TestDustValidatorSharesAfterUndelegationError(t *testing.T) { res, err := queryServer.AllianceDelegation(ctx, &types.QueryAllianceDelegationRequest{ DelegatorAddr: user1.String(), - ValidatorAddr: val1.GetOperator().String(), + ValidatorAddr: val1.GetOperator(), Denom: allianceAsset2, Pagination: nil, }) @@ -541,10 +563,11 @@ func TestDustValidatorSharesAfterRedelegationError(t *testing.T) { queryServer := keeper.NewQueryServerImpl(app.AllianceKeeper) // Set tax and rewards to be zero for easier calculation - distParams := app.DistrKeeper.GetParams(ctx) + distParams, err := app.DistrKeeper.Params.Get(ctx) + require.NoError(t, err) distParams.CommunityTax = sdkmath.LegacyZeroDec() - err := app.DistrKeeper.SetParams(ctx, distParams) + err = app.DistrKeeper.Params.Set(ctx, distParams) require.NoError(t, err) val1, err := app.AllianceKeeper.GetAllianceValidator(ctx, vals[0]) @@ -573,7 +596,7 @@ func TestDustValidatorSharesAfterRedelegationError(t *testing.T) { res, err := queryServer.AllianceDelegation(ctx, &types.QueryAllianceDelegationRequest{ DelegatorAddr: user1.String(), - ValidatorAddr: val1.GetOperator().String(), + ValidatorAddr: val1.GetOperator(), Denom: allianceAsset2, Pagination: nil, }) diff --git a/x/alliance/tests/e2e/test_helper.go b/x/alliance/tests/e2e/test_helper.go index 4b1d6c0d..bf3db15e 100644 --- a/x/alliance/tests/e2e/test_helper.go +++ b/x/alliance/tests/e2e/test_helper.go @@ -4,7 +4,6 @@ import ( "testing" "time" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" teststaking "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -15,7 +14,7 @@ import ( func setupApp(t *testing.T, numValidators int, numDelegators int, initBalance sdk.Coins) (app *test_helpers.App, ctx sdk.Context, valAddrs []sdk.ValAddress, delAddrs []sdk.AccAddress) { app = test_helpers.Setup(t) - ctx = app.BaseApp.NewContext(false, tmproto.Header{}) + ctx = app.BaseApp.NewContext(false) startTime := time.Now() ctx = ctx.WithBlockTime(startTime) From fa5228240bdc6982449f0fddf897108b5ba5e9a3 Mon Sep 17 00:00:00 2001 From: kienn6034 Date: Tue, 26 Mar 2024 18:27:57 +0700 Subject: [PATCH 8/8] refactor: delegation --- x/alliance/keeper/asset.go | 48 ++++++++--- x/alliance/keeper/delegation.go | 139 +++++++++++++++++++++++--------- 2 files changed, 135 insertions(+), 52 deletions(-) diff --git a/x/alliance/keeper/asset.go b/x/alliance/keeper/asset.go index 00ddda35..44a1888e 100644 --- a/x/alliance/keeper/asset.go +++ b/x/alliance/keeper/asset.go @@ -7,6 +7,7 @@ import ( sdkmath "cosmossdk.io/math" "cosmossdk.io/store" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -69,7 +70,7 @@ func (k Keeper) UpdateAllianceAsset(ctx sdk.Context, newAsset types.AllianceAsse // If there was a change in reward decay rate or reward decay time if !newAsset.RewardChangeRate.Equal(asset.RewardChangeRate) || newAsset.RewardChangeInterval != asset.RewardChangeInterval { // And if there were no reward changes scheduled previously, start the counter from now - if asset.RewardChangeRate.Equal(sdk.OneDec()) || asset.RewardChangeInterval == 0 { + if asset.RewardChangeRate.Equal(sdkmath.LegacyOneDec()) || asset.RewardChangeInterval == 0 { newAsset.LastRewardChangeTime = ctx.BlockTime() } // Else do nothing since there is already a change that was scheduled. @@ -129,13 +130,19 @@ func (k Keeper) RebalanceBondTokenWeights(ctx sdk.Context, assets []*types.Allia } for _, validator := range bondedValidators { - currentBondedAmount := sdk.NewDec(0) - delegation, found := k.stakingKeeper.GetDelegation(ctx, moduleAddr, validator.GetOperator()) + currentBondedAmount := sdkmath.LegacyNewDec(0) + + validatorAddress, err := sdk.ValAddressFromBech32(validator.GetOperator()) + if err != nil { + return err + } + + delegation, found := k.stakingKeeper.GetDelegation(ctx, moduleAddr, validatorAddress) if found { currentBondedAmount = validator.TokensFromShares(delegation.GetShares()) } - expectedBondAmount := sdk.ZeroDec() + expectedBondAmount := sdkmath.LegacyZeroDec() for _, asset := range assets { // Ignores assets that were recently added to prevent a small set of stakers from owning too much of the // voting power at the start. Uses the asset.RewardStartTime to determine when an asset is activated @@ -180,7 +187,13 @@ func (k Keeper) RebalanceBondTokenWeights(ctx sdk.Context, assets []*types.Allia if unbondAmount.IsZero() { continue } - sharesToUnbond, err := k.stakingKeeper.ValidateUnbondAmount(ctx, moduleAddr, validator.GetOperator(), unbondAmount) + + validatorAddress, err := sdk.ValAddressFromBech32(validator.GetOperator()) + if err != nil { + return err + } + + sharesToUnbond, err := k.stakingKeeper.ValidateUnbondAmount(ctx, moduleAddr, validatorAddress, unbondAmount) if err != nil { return err } @@ -188,7 +201,13 @@ func (k Keeper) RebalanceBondTokenWeights(ctx sdk.Context, assets []*types.Allia if err != nil { return err } - tokensToBurn, err := k.stakingKeeper.Unbond(ctx, moduleAddr, validator.GetOperator(), sharesToUnbond) + + valAddr, err := sdk.ValAddressFromBech32(validator.GetOperator()) + if err != nil { + return err + } + + tokensToBurn, err := k.stakingKeeper.Unbond(ctx, moduleAddr, valAddr, sharesToUnbond) if err != nil { return err } @@ -210,7 +229,7 @@ func (k Keeper) SetAsset(ctx sdk.Context, asset types.AllianceAsset) { func (k Keeper) GetAllAssets(ctx sdk.Context) (assets []*types.AllianceAsset) { store := ctx.KVStore(k.storeKey) - iter := sdk.KVStorePrefixIterator(store, types.AssetKey) + iter := storetypes.KVStorePrefixIterator(store, types.AssetKey) defer iter.Close() for iter.Valid() { @@ -300,10 +319,10 @@ func (k Keeper) DeductAssetsWithTakeRate(ctx sdk.Context, lastClaim time.Time, a if asset.TotalTokens.IsPositive() && asset.TakeRate.IsPositive() && asset.RewardsStarted(ctx.BlockTime()) { assetsWithPositiveTakeRate++ // take rate must be < 1 so multiple is also < 1 - multiplier := sdk.OneDec().Sub(asset.TakeRate).Power(intervalsSinceLastClaim) + multiplier := sdkmath.LegacyOneDec().Sub(asset.TakeRate).Power(intervalsSinceLastClaim) oldAmount := asset.TotalTokens newAmount := multiplier.MulInt(asset.TotalTokens) - if newAmount.LTE(sdk.OneDec()) { + if newAmount.LTE(sdkmath.LegacyOneDec()) { // If the next update reduces the amount of tokens to less than or equal to 1, stop reducing continue } @@ -334,12 +353,17 @@ func (k Keeper) DeductAssetsWithTakeRate(ctx sdk.Context, lastClaim time.Time, a func (k Keeper) SetRewardWeightChangeSnapshot(ctx sdk.Context, asset types.AllianceAsset, val types.AllianceValidator) { snapshot := types.NewRewardWeightChangeSnapshot(asset, val) - k.setRewardWeightChangeSnapshot(ctx, asset.Denom, val.GetOperator(), uint64(ctx.BlockHeight()), snapshot) + valAddr, err := sdk.ValAddressFromBech32(val.GetOperator()) + + if err != nil { + panic(err) // TODO: double check, old version do panic, but should we? + } + k.setRewardWeightChangeSnapshot(ctx, asset.Denom, valAddr, uint64(ctx.BlockHeight()), snapshot) } func (k Keeper) CreateInitialRewardWeightChangeSnapshot(ctx sdk.Context, denom string, valAddr sdk.ValAddress, info types.AllianceValidatorInfo) { snapshot := types.RewardWeightChangeSnapshot{ - PrevRewardWeight: sdk.ZeroDec(), + PrevRewardWeight: sdkmath.LegacyZeroDec(), RewardHistories: info.GlobalRewardHistory, } k.setRewardWeightChangeSnapshot(ctx, denom, valAddr, uint64(ctx.BlockHeight()), snapshot) @@ -361,7 +385,7 @@ func (k Keeper) IterateWeightChangeSnapshot(ctx sdk.Context, denom string, valAd func (k Keeper) IterateAllWeightChangeSnapshot(ctx sdk.Context, cb func(denom string, valAddr sdk.ValAddress, lastClaimHeight uint64, snapshot types.RewardWeightChangeSnapshot) (stop bool)) { store := ctx.KVStore(k.storeKey) - iter := sdk.KVStorePrefixIterator(store, types.RewardWeightChangeSnapshotKey) + iter := storetypes.KVStorePrefixIterator(store, types.RewardWeightChangeSnapshotKey) defer iter.Close() for ; iter.Valid(); iter.Next() { var snapshot types.RewardWeightChangeSnapshot diff --git a/x/alliance/keeper/delegation.go b/x/alliance/keeper/delegation.go index a563ace7..ce0e526b 100644 --- a/x/alliance/keeper/delegation.go +++ b/x/alliance/keeper/delegation.go @@ -6,7 +6,9 @@ import ( "github.com/terra-money/alliance/x/alliance/types" "cosmossdk.io/math" + sdkmath "cosmossdk.io/math" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "google.golang.org/grpc/codes" @@ -17,7 +19,7 @@ import ( // Voting power is not immediately accured to the delegators in this method and a flag is set to rebalance voting power // at the end of the block. This improves performance since rebalancing only needs to happen once regardless of how many // delegations are made in a single block -func (k Keeper) Delegate(ctx sdk.Context, delAddr sdk.AccAddress, validator types.AllianceValidator, coin sdk.Coin) (*sdk.Dec, error) { +func (k Keeper) Delegate(ctx sdk.Context, delAddr sdk.AccAddress, validator types.AllianceValidator, coin sdk.Coin) (*math.LegacyDec, error) { // Check if asset is whitelisted as an alliance asset asset, found := k.GetAssetByDenom(ctx, coin.Denom) if !found { @@ -32,7 +34,12 @@ func (k Keeper) Delegate(ctx sdk.Context, delAddr sdk.AccAddress, validator type } // Claim rewards before adding more to a previous delegation - _, found = k.GetDelegation(ctx, delAddr, validator.GetOperator(), coin.Denom) + valAddr, err := sdk.ValAddressFromBech32(validator.OperatorAddress) + if err != nil { + return nil, err + } + + _, found = k.GetDelegation(ctx, delAddr, valAddr, coin.Denom) if found { _, err = k.ClaimDelegationRewards(ctx, delAddr, validator, coin.Denom) if err != nil { @@ -73,23 +80,34 @@ func (k Keeper) Redelegate(ctx sdk.Context, delAddr sdk.AccAddress, srcVal types return nil, status.Errorf(codes.InvalidArgument, "Cannot redelegate to the same validator") } + srcValAddr, err := sdk.ValAddressFromBech32(srcVal.OperatorAddress) + if err != nil { + return nil, err + } + + dstValAddr, err := sdk.ValAddressFromBech32(dstVal.OperatorAddress) + if err != nil { + return nil, err + } + asset, found := k.GetAssetByDenom(ctx, coin.Denom) if !found { return nil, status.Errorf(codes.NotFound, "Asset with denom: %s does not exist", coin.Denom) } - _, found = k.GetDelegation(ctx, delAddr, srcVal.GetOperator(), coin.Denom) + _, found = k.GetDelegation(ctx, delAddr, srcValAddr, coin.Denom) if !found { return nil, stakingtypes.ErrNoDelegatorForAddress } - _, err := k.ClaimDelegationRewards(ctx, delAddr, srcVal, coin.Denom) + + _, err = k.ClaimDelegationRewards(ctx, delAddr, srcVal, coin.Denom) if err != nil { return nil, err } // re-query delegation since it was updated in `ClaimDelegationRewards` - srcDelegation, _ := k.GetDelegation(ctx, delAddr, srcVal.GetOperator(), coin.Denom) + srcDelegation, _ := k.GetDelegation(ctx, delAddr, srcValAddr, coin.Denom) - _, found = k.GetDelegation(ctx, delAddr, dstVal.GetOperator(), coin.Denom) + _, found = k.GetDelegation(ctx, delAddr, dstValAddr, coin.Denom) if found { _, err = k.ClaimDelegationRewards(ctx, delAddr, dstVal, coin.Denom) if err != nil { @@ -112,7 +130,12 @@ func (k Keeper) Redelegate(ctx sdk.Context, delAddr sdk.AccAddress, srcVal types // Prevents transitive re-delegations // e.g. if a redelegation from A -> B is made before another request from B -> C // the latter is blocked until the first redelegation is mature (time > unbonding time) - if k.HasRedelegation(ctx, delAddr, srcVal.GetOperator(), coin.Denom) { + srcValAddr, err = sdk.ValAddressFromBech32(srcVal.OperatorAddress) + if err != nil { + return nil, err + } + + if k.HasRedelegation(ctx, delAddr, srcValAddr, coin.Denom) { return nil, stakingtypes.ErrTransitiveRedelegation } @@ -141,7 +164,17 @@ func (k Keeper) Redelegate(ctx sdk.Context, delAddr sdk.AccAddress, srcVal types true, ) - k.addRedelegation(ctx, delAddr, srcVal.GetOperator(), dstVal.GetOperator(), coin, completionTime) + srcValAddr, err = sdk.ValAddressFromBech32(srcVal.OperatorAddress) + if err != nil { + return nil, err + } + + dstValAddr, err = sdk.ValAddressFromBech32(dstVal.OperatorAddress) + if err != nil { + return nil, err + } + + k.addRedelegation(ctx, delAddr, srcValAddr, dstValAddr, coin, completionTime) k.QueueAssetRebalanceEvent(ctx) @@ -166,18 +199,23 @@ func (k Keeper) Undelegate(ctx sdk.Context, delAddr sdk.AccAddress, validator ty return nil, status.Errorf(codes.NotFound, "Asset with denom: %s does not exist", coin.Denom) } - _, ok := k.GetDelegation(ctx, delAddr, validator.GetOperator(), coin.Denom) + valAddr, err := sdk.ValAddressFromBech32(validator.OperatorAddress) + if err != nil { + return nil, err + } + + _, ok := k.GetDelegation(ctx, delAddr, valAddr, coin.Denom) if !ok { return nil, stakingtypes.ErrNoDelegatorForAddress } // Claim delegation rewards first - _, err := k.ClaimDelegationRewards(ctx, delAddr, validator, coin.Denom) + _, err = k.ClaimDelegationRewards(ctx, delAddr, validator, coin.Denom) if err != nil { return nil, err } // Delegation is queried again since it might have been modified when claiming delegation rewards - delegation, _ := k.GetDelegation(ctx, delAddr, validator.GetOperator(), coin.Denom) + delegation, _ := k.GetDelegation(ctx, delAddr, valAddr, coin.Denom) // Calculate how much delegation shares to be undelegated taking into account rounding issues delegationSharesToUndelegate, err := k.ValidateDelegatedAmount(delegation, coin, validator, asset) @@ -213,7 +251,7 @@ func (k Keeper) Undelegate(ctx sdk.Context, delAddr sdk.AccAddress, validator ty k.ClearDustDelegation(ctx, delAddr, validator, asset) // Queue undelegation messages to distribute tokens after undelegation completes in the future - completionTime := k.queueUndelegation(ctx, delAddr, validator.GetOperator(), coin) + completionTime := k.queueUndelegation(ctx, delAddr, valAddr, coin) k.QueueAssetRebalanceEvent(ctx) _ = ctx.EventManager().EmitTypedEvent( @@ -290,7 +328,7 @@ func (k Keeper) DeleteRedelegation(ctx sdk.Context, redel types.Redelegation, co func (k Keeper) IterateDelegations(ctx sdk.Context, cb func(d types.Delegation) (stop bool)) { store := ctx.KVStore(k.storeKey) - iter := sdk.KVStorePrefixIterator(store, types.DelegationKey) + iter := storetypes.KVStorePrefixIterator(store, types.DelegationKey) defer iter.Close() for ; iter.Valid(); iter.Next() { var delegation types.Delegation @@ -304,14 +342,14 @@ func (k Keeper) IterateDelegations(ctx sdk.Context, cb func(d types.Delegation) func (k Keeper) HasRedelegation(ctx sdk.Context, delAddr sdk.AccAddress, dstVal sdk.ValAddress, denom string) bool { store := ctx.KVStore(k.storeKey) key := types.GetRedelegationsKey(delAddr, denom, dstVal) - iter := sdk.KVStorePrefixIterator(store, key) + iter := storetypes.KVStorePrefixIterator(store, key) defer iter.Close() return iter.Valid() } func (k Keeper) IterateRedelegations(ctx sdk.Context, cb func(redelegation types.Redelegation, completionTime time.Time) (stop bool)) { store := ctx.KVStore(k.storeKey) - iter := sdk.KVStorePrefixIterator(store, types.RedelegationKey) + iter := storetypes.KVStorePrefixIterator(store, types.RedelegationKey) defer iter.Close() for ; iter.Valid(); iter.Next() { var redelegation types.Redelegation @@ -324,32 +362,32 @@ func (k Keeper) IterateRedelegations(ctx sdk.Context, cb func(redelegation types } } -func (k Keeper) IterateRedelegationsByDelegator(ctx sdk.Context, delAddr sdk.AccAddress) sdk.Iterator { +func (k Keeper) IterateRedelegationsByDelegator(ctx sdk.Context, delAddr sdk.AccAddress) storetypes.Iterator { store := ctx.KVStore(k.storeKey) key := types.GetRedelegationsKeyByDelegator(delAddr) - return sdk.KVStorePrefixIterator(store, key) + return storetypes.KVStorePrefixIterator(store, key) } -func (k Keeper) IterateRedelegationsBySrcValidator(ctx sdk.Context, srcValAddr sdk.ValAddress) sdk.Iterator { +func (k Keeper) IterateRedelegationsBySrcValidator(ctx sdk.Context, srcValAddr sdk.ValAddress) storetypes.Iterator { store := ctx.KVStore(k.storeKey) prefix := types.GetRedelegationsIndexOrderedByValidatorKey(srcValAddr) - return sdk.KVStorePrefixIterator(store, prefix) + return storetypes.KVStorePrefixIterator(store, prefix) } -func (k Keeper) IterateUndelegationsBySrcValidator(ctx sdk.Context, valAddr sdk.ValAddress) sdk.Iterator { +func (k Keeper) IterateUndelegationsBySrcValidator(ctx sdk.Context, valAddr sdk.ValAddress) storetypes.Iterator { store := ctx.KVStore(k.storeKey) prefix := types.GetUndelegationsIndexOrderedByValidatorKey(valAddr) - return sdk.KVStorePrefixIterator(store, prefix) + return storetypes.KVStorePrefixIterator(store, prefix) } -func (k Keeper) IterateUndelegationsByCompletionTime(ctx sdk.Context, completionTime time.Time) sdk.Iterator { +func (k Keeper) IterateUndelegationsByCompletionTime(ctx sdk.Context, completionTime time.Time) storetypes.Iterator { store := ctx.KVStore(k.storeKey) return store.Iterator(types.UndelegationQueueKey, types.GetUndelegationQueueKeyByTime(completionTime)) } func (k Keeper) IterateUndelegations(ctx sdk.Context, cb func(undelegation types.QueuedUndelegation, completionTime time.Time) (stop bool)) { store := ctx.KVStore(k.storeKey) - iter := sdk.KVStorePrefixIterator(store, types.UndelegationQueueKey) + iter := storetypes.KVStorePrefixIterator(store, types.UndelegationQueueKey) defer iter.Close() for ; iter.Valid(); iter.Next() { var undelegation types.QueuedUndelegation @@ -364,7 +402,13 @@ func (k Keeper) IterateUndelegations(ctx sdk.Context, cb func(undelegation types func (k Keeper) SetValidator(ctx sdk.Context, val types.AllianceValidator) { store := ctx.KVStore(k.storeKey) - key := types.GetAllianceValidatorInfoKey(val.GetOperator()) + + valAddr, err := sdk.ValAddressFromBech32(val.OperatorAddress) + if err != nil { + panic(err) + } + + key := types.GetAllianceValidatorInfoKey(valAddr) vb := k.cdc.MustMarshal(val.AllianceValidatorInfo) store.Set(key, vb) } @@ -378,17 +422,17 @@ func (k Keeper) SetValidatorInfo(ctx sdk.Context, valAddr sdk.ValAddress, val ty // ValidateDelegatedAmount returns the amount of shares for a given coin that is staked // Returns the number of shares that represents the amount of staked tokens that was requested -func (k Keeper) ValidateDelegatedAmount(delegation types.Delegation, coin sdk.Coin, val types.AllianceValidator, asset types.AllianceAsset) (shares sdk.Dec, err error) { +func (k Keeper) ValidateDelegatedAmount(delegation types.Delegation, coin sdk.Coin, val types.AllianceValidator, asset types.AllianceAsset) (shares math.LegacyDec, err error) { delegationSharesToUpdate := types.GetDelegationSharesFromTokens(val, asset, coin.Amount) // Account for rounding in which shares for a full withdraw is slightly more or less than the number of shares recorded // Withdraw all in that case // 1e6 of margin should be enough to handle realistic rounding issues caused by using the fix-point math. - if delegation.Shares.Sub(delegationSharesToUpdate).Abs().LT(sdk.NewDecWithPrec(1, 6)) { + if delegation.Shares.Sub(delegationSharesToUpdate).Abs().LT(sdkmath.LegacyNewDecWithPrec(1, 6)) { return delegation.Shares, nil } if delegation.Shares.LT(delegationSharesToUpdate.TruncateDec()) { - return sdk.Dec{}, stakingtypes.ErrInsufficientShares + return math.LegacyDec{}, stakingtypes.ErrInsufficientShares } // Cap the shares at the delegation's shares. Shares being greater could occur // due to rounding, however we don't want to truncate the shares or take the @@ -504,28 +548,38 @@ func (k Keeper) setUnbondingIndexByVal(ctx sdk.Context, valAddr sdk.ValAddress, store.Set(indexKey, []byte{}) } -func (k Keeper) upsertDelegationWithNewTokens(ctx sdk.Context, delAddr sdk.AccAddress, validator types.AllianceValidator, coin sdk.Coin, asset types.AllianceAsset) (types.Delegation, sdk.Dec) { //nolint:unparam // may wish to investigate +func (k Keeper) upsertDelegationWithNewTokens(ctx sdk.Context, delAddr sdk.AccAddress, validator types.AllianceValidator, coin sdk.Coin, asset types.AllianceAsset) (types.Delegation, math.LegacyDec) { //nolint:unparam // may wish to investigat + valAddr, err := sdk.ValAddressFromBech32(validator.OperatorAddress) + if err != nil { + panic(err) + } + newShares := types.GetDelegationSharesFromTokens(validator, asset, coin.Amount) - delegation, found := k.GetDelegation(ctx, delAddr, validator.GetOperator(), coin.Denom) + delegation, found := k.GetDelegation(ctx, delAddr, valAddr, coin.Denom) if !found { - delegation = types.NewDelegation(ctx, delAddr, validator.GetOperator(), coin.Denom, newShares, validator.GlobalRewardHistory) + delegation = types.NewDelegation(ctx, delAddr, valAddr, coin.Denom, newShares, validator.GlobalRewardHistory) } else { delegation.Shares = delegation.Shares.Add(newShares) } - k.SetDelegation(ctx, delAddr, validator.GetOperator(), coin.Denom, delegation) + k.SetDelegation(ctx, delAddr, valAddr, coin.Denom, delegation) return delegation, newShares } // reduceDelegationShares // If shares after reduction = 0, delegation will be deleted -func (k Keeper) reduceDelegationShares(ctx sdk.Context, delAddr sdk.AccAddress, validator types.AllianceValidator, coin sdk.Coin, shares sdk.Dec, delegation types.Delegation) { +func (k Keeper) reduceDelegationShares(ctx sdk.Context, delAddr sdk.AccAddress, validator types.AllianceValidator, coin sdk.Coin, shares math.LegacyDec, delegation types.Delegation) { + valAddr, err := sdk.ValAddressFromBech32(validator.OperatorAddress) + if err != nil { + panic(err) + } + delegation.Shares = delegation.Shares.Sub(shares) if delegation.Shares.IsZero() { store := ctx.KVStore(k.storeKey) - key := types.GetDelegationKey(delAddr, validator.GetOperator(), coin.Denom) + key := types.GetDelegationKey(delAddr, valAddr, coin.Denom) store.Delete(key) } else { - k.SetDelegation(ctx, delAddr, validator.GetOperator(), coin.Denom, delegation) + k.SetDelegation(ctx, delAddr, valAddr, coin.Denom, delegation) } } @@ -541,7 +595,7 @@ func (k Keeper) updateValidatorShares(ctx sdk.Context, validator types.AllianceV // GetAllianceBondedAmount returns the total amount of bonded native tokens that are not in the // unbonding pool func (k Keeper) GetAllianceBondedAmount(ctx sdk.Context, delegator sdk.AccAddress) math.Int { - bonded := sdk.ZeroDec() + bonded := sdkmath.LegacyZeroDec() k.stakingKeeper.IterateDelegatorDelegations(ctx, delegator, func(delegation stakingtypes.Delegation) bool { validatorAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) if err != nil { @@ -578,15 +632,20 @@ func (k Keeper) ResetAssetAndValidators(ctx sdk.Context, asset types.AllianceAss k.SetValidatorInfo(ctx, valAddr, info) return false }) - asset.TotalValidatorShares = sdk.ZeroDec() + asset.TotalValidatorShares = sdkmath.LegacyZeroDec() k.SetAsset(ctx, asset) } func (k Keeper) ClearDustDelegation(ctx sdk.Context, delAddr sdk.AccAddress, validator types.AllianceValidator, asset types.AllianceAsset) { - delegatorSharesToRemove := sdk.NewDecCoinFromDec(asset.Denom, sdk.ZeroDec()) - validatorSharesToRemove := sdk.NewDecCoinFromDec(asset.Denom, sdk.ZeroDec()) + delegatorSharesToRemove := sdk.NewDecCoinFromDec(asset.Denom, sdkmath.LegacyZeroDec()) + validatorSharesToRemove := sdk.NewDecCoinFromDec(asset.Denom, sdkmath.LegacyZeroDec()) + + valAddr, err := sdk.ValAddressFromBech32(validator.OperatorAddress) + if err != nil { + panic(err) + } - delegation, found := k.GetDelegation(ctx, delAddr, validator.GetOperator(), asset.Denom) + delegation, found := k.GetDelegation(ctx, delAddr, valAddr, asset.Denom) // If not found then the delegation has already been deleted, do nothing else if found { tokensLeft := types.GetDelegationTokensWithShares(delegation.Shares, validator, asset) @@ -594,7 +653,7 @@ func (k Keeper) ClearDustDelegation(ctx sdk.Context, delAddr sdk.AccAddress, val if tokensLeft.IsZero() { store := ctx.KVStore(k.storeKey) delAddr := sdk.MustAccAddressFromBech32(delegation.DelegatorAddress) // acc address should always be valid here - key := types.GetDelegationKey(delAddr, validator.GetOperator(), asset.Denom) + key := types.GetDelegationKey(delAddr, valAddr, asset.Denom) store.Delete(key) delegatorSharesToRemove = sdk.NewDecCoinFromDec(asset.Denom, delegation.Shares)