diff --git a/.github/workflows/release-umee.yml b/.github/workflows/release-umee.yml index 0c9b6da2a5..696533057a 100644 --- a/.github/workflows/release-umee.yml +++ b/.github/workflows/release-umee.yml @@ -26,7 +26,7 @@ jobs: cache: true - name: Set Env - run: echo "TM_VERSION=$(go list -m github.com/tendermint/tendermint | sed 's:.* ::')" >> $GITHUB_ENV + run: echo "TM_VERSION=$(go list -m github.com/cometbft/cometbft | sed 's:.* ::')" >> $GITHUB_ENV # useful to test builds. However will require to add "push" rule to the "on" section - name: generate and update swagger docs diff --git a/.goreleaser.yml b/.goreleaser.yml index 4e8be39239..0dc2fe6e66 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -17,7 +17,7 @@ builds: - -tags=badgerdb ledger netgo - -trimpath ldflags: - - -s -w -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X github.com/cosmos/cosmos-sdk/version.Name=umee -X github.com/cosmos/cosmos-sdk/version.AppName=umeed -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }} -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger -X github.com/tendermint/tendermint/version.TMCoreSemVer={{ .Env.TM_VERSION }} + - -s -w -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X github.com/cosmos/cosmos-sdk/version.Name=umee -X github.com/cosmos/cosmos-sdk/version.AppName=umeed -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }} -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger -X github.com/cometbft/cometbft/version.TMCoreSemVer={{ .Env.TM_VERSION }} goos: - linux goarch: diff --git a/Makefile b/Makefile index 9716ed19b7..74657742ba 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PACKAGES_NOSIMULATION=$(shell go list ./... | grep -v '/simulation') PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation') export VERSION := $(shell echo $(shell git describe --tags --always --match "v*") | sed 's/^v//') -export TMVERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::') +export TMVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::') export COMMIT := $(shell git log -1 --format='%H') LEDGER_ENABLED ?= true BINDIR ?= $(GOPATH)/bin @@ -68,7 +68,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=umee \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \ - -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TMVERSION) + -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TMVERSION) ifeq ($(ENABLE_ROCKSDB),true) BUILD_TAGS += rocksdb @@ -320,8 +320,8 @@ lint-fix: DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.8.0 -protoVer=v0.7 -protoImageName=tendermintdev/sdk-proto-gen:$(protoVer) +protoVer=0.13.0 +protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer) containerProtoGenSwagger=$(PROJECT_NAME)-proto-gen-swagger-$(protoVer) containerProtoFmt=$(PROJECT_NAME)-proto-fmt-$(protoVer) diff --git a/ante/ante.go b/ante/ante.go index feac1b79b6..c5758c96ce 100644 --- a/ante/ante.go +++ b/ante/ante.go @@ -9,8 +9,8 @@ import ( cosmosante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/cosmos/cosmos-sdk/x/auth/signing" "github.com/cosmos/cosmos-sdk/x/auth/types" - ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante" - ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" + ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" ) type HandlerOptions struct { diff --git a/ante/ante_test.go b/ante/ante_test.go index 2bbee7e989..3824c51cc9 100644 --- a/ante/ante_test.go +++ b/ante/ante_test.go @@ -4,17 +4,17 @@ import ( "fmt" "testing" + tmrand "github.com/cometbft/cometbft/libs/rand" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/cosmos/cosmos-sdk/types/tx/signing" xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" "github.com/stretchr/testify/suite" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" umeeapp "github.com/umee-network/umee/v6/app" ) @@ -37,7 +37,7 @@ func (s *IntegrationTestSuite) SetupTest() { s.app = app s.ctx = ctx - encodingConfig := simapp.MakeTestEncodingConfig() + encodingConfig := testutil.MakeTestEncodingConfig() encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil) testdata.RegisterInterfaces(encodingConfig.InterfaceRegistry) s.clientCtx = client.Context{}. diff --git a/app/app.go b/app/app.go index dbcb0799be..4d962a159f 100644 --- a/app/app.go +++ b/app/app.go @@ -7,12 +7,19 @@ import ( "os" "path/filepath" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmos "github.com/cometbft/cometbft/libs/os" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/spf13/cast" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmos "github.com/tendermint/tendermint/libs/os" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + + appparams "github.com/umee-network/umee/v6/app/params" + + autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" + reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" + + runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" @@ -23,7 +30,6 @@ import ( "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" - sdkparams "github.com/cosmos/cosmos-sdk/simapp/params" storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" @@ -47,11 +53,12 @@ import ( "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" + consensusparamskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" + consensusparamstypes "github.com/cosmos/cosmos-sdk/x/consensus/types" "github.com/cosmos/cosmos-sdk/x/crisis" crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distr "github.com/cosmos/cosmos-sdk/x/distribution" - distrclient "github.com/cosmos/cosmos-sdk/x/distribution/client" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/cosmos/cosmos-sdk/x/evidence" @@ -93,35 +100,31 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" - icahost "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host" - icahostkeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/keeper" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ibctransfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer" - ibctransferkeeper "github.com/cosmos/ibc-go/v6/modules/apps/transfer/keeper" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - ibc "github.com/cosmos/ibc-go/v6/modules/core" - ibcclient "github.com/cosmos/ibc-go/v6/modules/core/02-client" - ibcclientclient "github.com/cosmos/ibc-go/v6/modules/core/02-client/client" - ibcclienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - ibcporttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" - ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" - ibctesting "github.com/cosmos/ibc-go/v6/testing/types" - "github.com/osmosis-labs/bech32-ibc/x/bech32ibc" - bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper" - bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/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" + ibctransfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + 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" + ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + ibctesting "github.com/cosmos/ibc-go/v7/testing/types" // cosmwasm "github.com/CosmWasm/wasmd/x/wasm" - wasmclient "github.com/CosmWasm/wasmd/x/wasm/client" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" customante "github.com/umee-network/umee/v6/ante" "github.com/umee-network/umee/v6/app/inflation" - appparams "github.com/umee-network/umee/v6/app/params" "github.com/umee-network/umee/v6/swagger" "github.com/umee-network/umee/v6/util/genmap" "github.com/umee-network/umee/v6/x/incentive" @@ -187,13 +190,13 @@ func init() { vesting.AppModuleBasic{}, nftmodule.AppModuleBasic{}, ibc.AppModuleBasic{}, + ibctm.AppModuleBasic{}, ibctransfer.AppModuleBasic{}, ica.AppModuleBasic{}, // intertx.AppModuleBasic{}, // ibcfee.AppModuleBasic{}, leverage.AppModuleBasic{}, oracle.AppModuleBasic{}, - bech32ibc.AppModuleBasic{}, uibcmodule.AppModuleBasic{}, ugovmodule.AppModuleBasic{}, wasm.AppModuleBasic{}, @@ -246,23 +249,24 @@ type UmeeApp struct { memKeys map[string]*storetypes.MemoryStoreKey // keepers - AccountKeeper authkeeper.AccountKeeper - BankKeeper bankkeeper.BaseKeeper - CapabilityKeeper *capabilitykeeper.Keeper - StakingKeeper *stakingkeeper.Keeper - SlashingKeeper slashingkeeper.Keeper - MintKeeper mintkeeper.Keeper - DistrKeeper distrkeeper.Keeper - GovKeeper govkeeper.Keeper - CrisisKeeper crisiskeeper.Keeper - UpgradeKeeper upgradekeeper.Keeper - ParamsKeeper paramskeeper.Keeper - AuthzKeeper authzkeeper.Keeper - EvidenceKeeper evidencekeeper.Keeper - FeeGrantKeeper feegrantkeeper.Keeper - GroupKeeper groupkeeper.Keeper - NFTKeeper nftkeeper.Keeper - WasmKeeper wasm.Keeper + AccountKeeper authkeeper.AccountKeeper + BankKeeper bankkeeper.BaseKeeper + CapabilityKeeper *capabilitykeeper.Keeper + ConsensusParamsKeeper consensusparamskeeper.Keeper + StakingKeeper *stakingkeeper.Keeper + SlashingKeeper slashingkeeper.Keeper + MintKeeper mintkeeper.Keeper + DistrKeeper distrkeeper.Keeper + GovKeeper *govkeeper.Keeper + CrisisKeeper *crisiskeeper.Keeper + UpgradeKeeper *upgradekeeper.Keeper + ParamsKeeper paramskeeper.Keeper + AuthzKeeper authzkeeper.Keeper + EvidenceKeeper evidencekeeper.Keeper + FeeGrantKeeper feegrantkeeper.Keeper + GroupKeeper groupkeeper.Keeper + NFTKeeper nftkeeper.Keeper + WasmKeeper wasm.Keeper IBCTransferKeeper ibctransferkeeper.Keeper IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly @@ -270,7 +274,6 @@ type UmeeApp struct { LeverageKeeper leveragekeeper.Keeper IncentiveKeeper incentivekeeper.Keeper OracleKeeper oraclekeeper.Keeper - bech32IbcKeeper bech32ibckeeper.Keeper UIbcQuotaKeeperB uibcquotakeeper.Builder UGovKeeperB ugovkeeper.Builder MetokenKeeperB metokenkeeper.Builder @@ -312,17 +315,18 @@ func New( skipUpgradeHeights map[int64]bool, homePath string, invCheckPeriod uint, - encodingConfig sdkparams.EncodingConfig, appOpts servertypes.AppOptions, wasmEnabledProposals []wasm.ProposalType, wasmOpts []wasm.Option, baseAppOptions ...func(*baseapp.BaseApp), ) *UmeeApp { - appCodec := encodingConfig.Codec - legacyAmino := encodingConfig.Amino - interfaceRegistry := encodingConfig.InterfaceRegistry + encCfg := MakeEncodingConfig() + interfaceRegistry := encCfg.InterfaceRegistry + appCodec := encCfg.Codec + legacyAmino := encCfg.Amino + txConfig := encCfg.TxConfig - bApp := baseapp.NewBaseApp(appparams.Name, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) + bApp := baseapp.NewBaseApp(appparams.Name, logger, db, txConfig.TxDecoder(), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version) bApp.SetInterfaceRegistry(interfaceRegistry) @@ -333,12 +337,13 @@ func New( govtypes.StoreKey, paramstypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, capabilitytypes.StoreKey, authzkeeper.StoreKey, nftkeeper.StoreKey, group.StoreKey, - ibchost.StoreKey, ibctransfertypes.StoreKey, icahosttypes.StoreKey, + ibcexported.StoreKey, ibctransfertypes.StoreKey, icahosttypes.StoreKey, leveragetypes.StoreKey, oracletypes.StoreKey, - bech32ibctypes.StoreKey, uibc.StoreKey, ugov.StoreKey, + uibc.StoreKey, ugov.StoreKey, wasm.StoreKey, incentive.StoreKey, metoken.StoreKey, + consensusparamstypes.StoreKey, crisistypes.StoreKey, } // if Experimental {} @@ -347,18 +352,12 @@ func New( memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) govModuleAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String() - // configure state listening capabilities using AppOptions - // we are doing nothing with the returned streamingServices and waitGroup in this case - // if _, _, err := streaming.LoadStreamingServices(bApp, appOpts, appCodec, keys); err != nil { - // tmos.Exit(err.Error()) - // } - app := &UmeeApp{ BaseApp: bApp, legacyAmino: legacyAmino, appCodec: appCodec, interfaceRegistry: interfaceRegistry, - txConfig: encodingConfig.TxConfig, + txConfig: txConfig, invCheckPeriod: invCheckPeriod, keys: keys, tkeys: tkeys, @@ -373,7 +372,12 @@ func New( ) // set the BaseApp's parameter store - bApp.SetParamStore(app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())) + app.ConsensusParamsKeeper = consensusparamskeeper.NewKeeper( + appCodec, + keys[consensusparamstypes.StoreKey], + govModuleAddr, + ) + bApp.SetParamStore(&app.ConsensusParamsKeeper) app.CapabilityKeeper = capabilitykeeper.NewKeeper( appCodec, @@ -382,7 +386,7 @@ func New( ) // grant capabilities for the ibc and ibc-transfer modules - app.ScopedIBCKeeper = app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) + app.ScopedIBCKeeper = app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName) app.ScopedTransferKeeper = app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) app.ScopedWasmKeeper = app.CapabilityKeeper.ScopeToModule(wasm.ModuleName) @@ -394,39 +398,46 @@ func New( app.AccountKeeper = authkeeper.NewAccountKeeper( appCodec, keys[authtypes.StoreKey], - app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, appparams.AccountAddressPrefix, + govModuleAddr, ) + app.BankKeeper = bankkeeper.NewBaseKeeper( appCodec, keys[banktypes.StoreKey], app.AccountKeeper, - app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(), + govModuleAddr, ) - _stakingKeeper := stakingkeeper.NewKeeper( + + app.StakingKeeper = stakingkeeper.NewKeeper( appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, - app.GetSubspace(stakingtypes.ModuleName), + govModuleAddr, ) - app.StakingKeeper = &_stakingKeeper + app.MintKeeper = mintkeeper.NewKeeper( - appCodec, keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), app.StakingKeeper, + appCodec, keys[minttypes.StoreKey], app.StakingKeeper, app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName, + govModuleAddr, ) app.DistrKeeper = distrkeeper.NewKeeper( - appCodec, keys[distrtypes.StoreKey], app.GetSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper, + appCodec, keys[distrtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.StakingKeeper, authtypes.FeeCollectorName, + govModuleAddr, ) app.SlashingKeeper = slashingkeeper.NewKeeper( - appCodec, keys[slashingtypes.StoreKey], app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName), + appCodec, app.legacyAmino, keys[slashingtypes.StoreKey], + app.StakingKeeper, govModuleAddr, ) + app.CrisisKeeper = crisiskeeper.NewKeeper( - app.GetSubspace(crisistypes.ModuleName), invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName, + appCodec, keys[crisistypes.StoreKey], invCheckPeriod, app.BankKeeper, + authtypes.FeeCollectorName, govModuleAddr, ) app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper) @@ -524,9 +535,9 @@ func New( app.IBCKeeper = ibckeeper.NewKeeper( appCodec, - keys[ibchost.StoreKey], - app.GetSubspace(ibchost.ModuleName), - *app.StakingKeeper, + keys[ibcexported.StoreKey], + app.GetSubspace(ibcexported.ModuleName), + app.StakingKeeper, app.UpgradeKeeper, app.ScopedIBCKeeper, ) @@ -601,11 +612,6 @@ func New( */ app.IBCKeeper.SetRouter(ibcRouter) - app.bech32IbcKeeper = *bech32ibckeeper.NewKeeper( - app.IBCKeeper.ChannelKeeper, appCodec, keys[bech32ibctypes.StoreKey], - app.IBCTransferKeeper, - ) - // Register the proposal types // Deprecated: Avoid adding new handlers, instead use the new proposal flow // by granting the governance module the right to execute the message. @@ -614,10 +620,8 @@ func New( govRouter. AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). - AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)). AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). - AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)). - AddRoute(bech32ibctypes.RouterKey, bech32ibc.NewBech32IBCProposalHandler(app.bech32IbcKeeper)) + AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) // The wasm gov proposal types can be individually enabled if len(wasmEnabledProposals) != 0 { @@ -626,16 +630,14 @@ func New( govConfig := govtypes.DefaultConfig() govConfig.MaxMetadataLen = 800 - govKeeper := govkeeper.NewKeeper( - appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper, - app.StakingKeeper, govRouter, app.MsgServiceRouter(), govConfig, - ) - app.GovKeeper = *govKeeper.SetHooks( - govtypes.NewMultiGovHooks( - // register the governance hooks - ), + app.GovKeeper = govkeeper.NewKeeper( + appCodec, keys[govtypes.StoreKey], app.AccountKeeper, app.BankKeeper, + app.StakingKeeper, app.MsgServiceRouter(), govConfig, + govModuleAddr, ) + app.GovKeeper.SetLegacyRouter(govRouter) + var err error wasmDir := filepath.Join(homePath, "wasm") app.wasmCfg, err = wasm.ReadWasmConfig(appOpts) @@ -657,19 +659,21 @@ func New( app.WasmKeeper = wasm.NewKeeper( appCodec, keys[wasm.StoreKey], - app.GetSubspace(wasm.ModuleName), app.AccountKeeper, app.BankKeeper, app.StakingKeeper, - app.DistrKeeper, + distrkeeper.NewQuerier(app.DistrKeeper), + app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, app.ScopedWasmKeeper, // capabilities &app.IBCTransferKeeper, // ICS20TransferPortSource app.MsgServiceRouter(), + nil, wasmDir, app.wasmCfg, availableCapabilities, + govModuleAddr, wasmOpts..., ) @@ -691,27 +695,19 @@ func New( app.AccountKeeper, app.StakingKeeper, app.DeliverTx, - encodingConfig.TxConfig, + txConfig, ), - auth.NewAppModule(appCodec, app.AccountKeeper, nil), + auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)), vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), - crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), - feegrantmodule.NewAppModule( - appCodec, - app.AccountKeeper, - app.BankKeeper, - app.FeeGrantKeeper, - app.interfaceRegistry, - ), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, inflationCalculator.InflationRate), - // need to dereference StakingKeeper because x/distribution uses interface casting :( - // TODO: in the next SDK version we can remove the dereference - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, *app.StakingKeeper), - distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, *app.StakingKeeper), - staking.NewAppModule(appCodec, *app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, true), + crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), + feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), + gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)), + mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, inflationCalculator.InflationRate, app.GetSubspace(minttypes.ModuleName)), //nolint: lll + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)), //nolint: lll + distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), //nolint: lll + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), //nolint: lll upgrade.NewAppModule(app.UpgradeKeeper), evidence.NewAppModule(app.EvidenceKeeper), ibc.NewAppModule(app.IBCKeeper), @@ -719,16 +715,13 @@ func New( authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), nftmodule.NewAppModule(appCodec, app.NFTKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - ibctransfer.NewAppModule(app.IBCTransferKeeper), - // ibcfee.NewAppModule(app.IBCFeeKeeper), ica.NewAppModule(nil, &app.ICAHostKeeper), leverage.NewAppModule(appCodec, app.LeverageKeeper, app.AccountKeeper, app.BankKeeper), oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper), - bech32ibc.NewAppModule(appCodec, app.bech32IbcKeeper), uibcmodule.NewAppModule(appCodec, app.UIbcQuotaKeeperB), ugovmodule.NewAppModule(appCodec, app.UGovKeeperB), - wasm.NewAppModule(app.appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + wasm.NewAppModule(app.appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), //nolint: lll incentivemodule.NewAppModule(appCodec, app.IncentiveKeeper, app.BankKeeper, app.LeverageKeeper), metokenmodule.NewAppModule(appCodec, app.MetokenKeeperB), } @@ -749,7 +742,7 @@ func New( slashingtypes.ModuleName, evidencetypes.ModuleName, stakingtypes.ModuleName, - ibchost.ModuleName, + ibcexported.ModuleName, ibctransfertypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, @@ -765,7 +758,6 @@ func New( icatypes.ModuleName, // ibcfeetypes.ModuleName, leveragetypes.ModuleName, oracletypes.ModuleName, - bech32ibctypes.ModuleName, uibc.ModuleName, ugov.ModuleName, wasm.ModuleName, @@ -776,7 +768,7 @@ func New( crisistypes.ModuleName, oracletypes.ModuleName, // must be before gov and staking govtypes.ModuleName, stakingtypes.ModuleName, - ibchost.ModuleName, ibctransfertypes.ModuleName, + ibcexported.ModuleName, ibctransfertypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName, minttypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, @@ -784,7 +776,6 @@ func New( paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, icatypes.ModuleName, // ibcfeetypes.ModuleName, leveragetypes.ModuleName, - bech32ibctypes.ModuleName, uibc.ModuleName, ugov.ModuleName, wasm.ModuleName, @@ -801,7 +792,7 @@ func New( initGenesis := []string{ capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, stakingtypes.ModuleName, slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, - crisistypes.ModuleName, ibchost.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, + crisistypes.ModuleName, ibcexported.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, ibctransfertypes.ModuleName, icatypes.ModuleName, // ibcfeetypes.ModuleName feegrant.ModuleName, nft.ModuleName, group.ModuleName, @@ -809,7 +800,6 @@ func New( oracletypes.ModuleName, leveragetypes.ModuleName, - bech32ibctypes.ModuleName, uibc.ModuleName, ugov.ModuleName, wasm.ModuleName, @@ -819,14 +809,13 @@ func New( orderMigrations := []string{ capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, stakingtypes.ModuleName, slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, - crisistypes.ModuleName, ibchost.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, + crisistypes.ModuleName, ibcexported.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, ibctransfertypes.ModuleName, icatypes.ModuleName, // ibcfeetypes.ModuleName feegrant.ModuleName, nft.ModuleName, group.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, oracletypes.ModuleName, leveragetypes.ModuleName, - bech32ibctypes.ModuleName, uibc.ModuleName, ugov.ModuleName, wasm.ModuleName, @@ -840,8 +829,7 @@ func New( app.mm.SetOrderInitGenesis(initGenesis...) app.mm.SetOrderMigrations(orderMigrations...) - app.mm.RegisterInvariants(&app.CrisisKeeper) - app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino) + app.mm.RegisterInvariants(app.CrisisKeeper) app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter()) app.mm.RegisterServices(app.configurator) @@ -849,25 +837,36 @@ func New( // Make sure it's called after `app.mm` and `app.configurator` are set. app.RegisterUpgradeHandlers() + autocliv1.RegisterQueryServer(app.GRPCQueryRouter(), runtimeservices.NewAutoCLIQueryService(app.mm.Modules)) + + reflectionSvc, err := runtimeservices.NewReflectionService() + if err != nil { + panic(err) + } + reflectionv1.RegisterReflectionServiceServer(app.GRPCQueryRouter(), reflectionSvc) + // add test gRPC service for testing gRPC queries in isolation testdata.RegisterQueryServer(app.GRPCQueryRouter(), testdata.QueryImpl{}) // create the simulation manager and define the order of the modules for deterministic simulations overrideModules := map[string]module.AppModuleSimulation{ - authtypes.ModuleName: auth.NewAppModule(app.appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), + authtypes.ModuleName: auth.NewAppModule( + app.appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts, + app.GetSubspace(authtypes.ModuleName), + ), } simStateModules := genmap.Pick( app.mm.Modules, []string{ stakingtypes.ModuleName, authtypes.ModuleName, oracletypes.ModuleName, - ibchost.ModuleName, + ibcexported.ModuleName, }, ) // TODO: Ensure x/leverage, x/incentive implement simulator and add it here: simTestModules := genmap.Pick( simStateModules, - []string{oracletypes.ModuleName, ibchost.ModuleName}, + []string{oracletypes.ModuleName, ibcexported.ModuleName}, ) app.StateSimulationManager = module.NewSimulationManagerFromAppModules(simStateModules, overrideModules) @@ -884,7 +883,7 @@ func New( app.SetInitChainer(app.InitChainer) app.SetBeginBlocker(app.BeginBlocker) app.SetEndBlocker(app.EndBlocker) - app.setAnteHandler(encodingConfig.TxConfig, &app.wasmCfg, keys[wasm.StoreKey]) + app.setAnteHandler(txConfig, &app.wasmCfg, keys[wasm.StoreKey]) // In v0.46, the SDK introduces _postHandlers_. PostHandlers are like // antehandlers, but are run _after_ the `runMsgs` execution. They are also // defined as a chain, and have the same signature as antehandlers. @@ -1100,7 +1099,7 @@ func (app *UmeeApp) GetBaseApp() *baseapp.BaseApp { // GetStakingKeeper is used solely for testing purposes. func (app *UmeeApp) GetStakingKeeper() ibctesting.StakingKeeper { - return *app.StakingKeeper + return app.StakingKeeper } // GetIBCKeeper is used solely for testing purposes. @@ -1142,11 +1141,10 @@ func initParamsKeeper( paramsKeeper.Subspace(minttypes.ModuleName) paramsKeeper.Subspace(distrtypes.ModuleName) paramsKeeper.Subspace(slashingtypes.ModuleName) - paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) + paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) //nolint: staticcheck paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) - paramsKeeper.Subspace(ibchost.ModuleName) - // paramsKeeper.Subspace(icacontrollertypes.SubModuleName) + paramsKeeper.Subspace(ibcexported.ModuleName) paramsKeeper.Subspace(icahosttypes.SubModuleName) paramsKeeper.Subspace(leveragetypes.ModuleName) paramsKeeper.Subspace(oracletypes.ModuleName) @@ -1158,13 +1156,11 @@ func initParamsKeeper( func getGovProposalHandlers() []govclient.ProposalHandler { handlers := []govclient.ProposalHandler{ paramsclient.ProposalHandler, - distrclient.ProposalHandler, upgradeclient.LegacyProposalHandler, upgradeclient.LegacyCancelProposalHandler, ibcclientclient.UpdateClientProposalHandler, ibcclientclient.UpgradeProposalHandler, } - handlers = append(handlers, wasmclient.ProposalHandlers...) return handlers } diff --git a/app/encoding.go b/app/encoding.go index 1079e5c7ef..bc589352a6 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -1,16 +1,16 @@ package app import ( - sdkparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/std" + "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/umee-network/umee/v6/app/params" ) // MakeEncodingConfig returns the application's encoding configuration with all // types and interfaces registered. -func MakeEncodingConfig() sdkparams.EncodingConfig { +func MakeEncodingConfig() testutil.TestEncodingConfig { encodingConfig := params.MakeEncodingConfig() - std.RegisterLegacyAminoCodec(encodingConfig.Amino) + // std.RegisterLegacyAminoCodec(encodingConfig.Amino) // removed because it gets called on init of codec/legacy std.RegisterInterfaces(encodingConfig.InterfaceRegistry) ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino) ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry) diff --git a/app/export.go b/app/export.go index 1c37b45a9f..4bcdfff2b4 100644 --- a/app/export.go +++ b/app/export.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -18,6 +18,7 @@ import ( func (app *UmeeApp) ExportAppStateAndValidators( forZeroHeight bool, jailAllowedAddrs []string, + modulesToExport []string, ) (servertypes.ExportedApp, error) { // as if they could withdraw from the start of the next block ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) @@ -30,13 +31,13 @@ func (app *UmeeApp) ExportAppStateAndValidators( app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs) } - genState := app.mm.ExportGenesis(ctx, app.appCodec) + genState := app.mm.ExportGenesisForModules(ctx, app.appCodec, modulesToExport) appState, err := json.MarshalIndent(genState, "", " ") if err != nil { return servertypes.ExportedApp{}, err } - validators, err := staking.WriteValidators(ctx, *app.StakingKeeper) + validators, err := staking.WriteValidators(ctx, app.StakingKeeper) return servertypes.ExportedApp{ AppState: appState, Validators: validators, diff --git a/app/inflation/expected_keepers.go b/app/inflation/expected_keepers.go index 1ef525092e..c7c020e38f 100644 --- a/app/inflation/expected_keepers.go +++ b/app/inflation/expected_keepers.go @@ -8,5 +8,5 @@ import ( type MintKeeper interface { StakingTokenSupply(ctx sdk.Context) math.Int - SetParams(ctx sdk.Context, params minttypes.Params) + SetParams(ctx sdk.Context, params minttypes.Params) error } diff --git a/app/inflation/inflation.go b/app/inflation/inflation.go index b7f0d93886..92fcec8c9b 100644 --- a/app/inflation/inflation.go +++ b/app/inflation/inflation.go @@ -16,8 +16,8 @@ type Calculator struct { } func (c Calculator) InflationRate(ctx sdk.Context, minter minttypes.Minter, mintParams minttypes.Params, - bondedRatio sdk.Dec) sdk.Dec { - + bondedRatio sdk.Dec, +) sdk.Dec { ugovKeeper := c.UgovKeeperB(&ctx) inflationParams := ugovKeeper.InflationParams() maxSupplyAmount := inflationParams.MaxSupply.Amount @@ -35,9 +35,10 @@ func (c Calculator) InflationRate(ctx sdk.Context, minter minttypes.Minter, mint mintParams.InflationMax = factor.MulDec(mintParams.InflationMax) mintParams.InflationMin = factor.MulDec(mintParams.InflationMin) mintParams.InflationRateChange = fastInflationRateChange(mintParams) - c.MintKeeper.SetParams(ctx, mintParams) + err := c.MintKeeper.SetParams(ctx, mintParams) + util.Panic(err) - err := ugovKeeper.SetInflationCycleEnd(ctx.BlockTime().Add(inflationParams.InflationCycle)) + err = ugovKeeper.SetInflationCycleEnd(ctx.BlockTime().Add(inflationParams.InflationCycle)) util.Panic(err) ctx.Logger().Info("inflation min and max rates are updated", "inflation_max", mintParams.InflationMax, "inflation_min", mintParams.InflationMin, @@ -59,7 +60,8 @@ func fastInflationRateChange(p minttypes.Params) sdk.Dec { // AdjustInflation checks if newly minting coins will execeed the MaxSupply then it will adjust the inflation with // respect to MaxSupply func (c Calculator) AdjustInflation(stakingTokenSupply, maxSupply math.Int, minter minttypes.Minter, - params minttypes.Params) sdk.Dec { + params minttypes.Params, +) sdk.Dec { minter.AnnualProvisions = minter.NextAnnualProvisions(params, stakingTokenSupply) newMintingAmount := minter.BlockProvision(params).Amount newTotalSupply := stakingTokenSupply.Add(newMintingAmount) diff --git a/app/inflation/inflation_test.go b/app/inflation/inflation_test.go index 12cb217037..2d08de0f36 100644 --- a/app/inflation/inflation_test.go +++ b/app/inflation/inflation_test.go @@ -78,7 +78,6 @@ func TestAdjustInflation(t *testing.T) { } func TestInflationRate(t *testing.T) { - mintParams := minttypes.DefaultParams() mockMinter := minttypes.NewMinter(sdk.MustNewDecFromStr("0.15"), sdk.NewDec(0)) mockInflationParams := ugov.InflationParams{ diff --git a/app/inflation/mocks/keepers.go b/app/inflation/mocks/keepers.go index 60041b1305..ac5049d225 100644 --- a/app/inflation/mocks/keepers.go +++ b/app/inflation/mocks/keepers.go @@ -37,9 +37,11 @@ func (m *MockMintKeeper) EXPECT() *MockMintKeeperMockRecorder { } // SetParams mocks base method. -func (m *MockMintKeeper) SetParams(ctx types.Context, params types0.Params) { +func (m *MockMintKeeper) SetParams(ctx types.Context, params types0.Params) error { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetParams", ctx, params) + ret := m.ctrl.Call(m, "SetParams", ctx, params) + ret0, _ := ret[0].(error) + return ret0 } // SetParams indicates an expected call of SetParams. diff --git a/app/modules.go b/app/modules.go index 9a3724d36e..71dc2eef5a 100644 --- a/app/modules.go +++ b/app/modules.go @@ -113,7 +113,7 @@ type GovModule struct { func (GovModule) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { minDeposit := sdk.NewCoins(sdk.NewCoin(appparams.BondDenom, govv1.DefaultMinDepositTokens)) genState := govv1.DefaultGenesisState() - genState.DepositParams.MinDeposit = minDeposit + genState.Params.MinDeposit = minDeposit return cdc.MustMarshalJSON(genState) } diff --git a/app/params/proto.go b/app/params/proto.go index 070b39ef70..c499108e9e 100644 --- a/app/params/proto.go +++ b/app/params/proto.go @@ -1,10 +1,11 @@ package params import ( - "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/types/module" + "github.com/cosmos/cosmos-sdk/types/module/testutil" ) // MakeEncodingConfig creates an EncodingConfig for Amino-based tests. -func MakeEncodingConfig() params.EncodingConfig { - return params.MakeTestEncodingConfig() +func MakeEncodingConfig(modules ...module.AppModuleBasic) testutil.TestEncodingConfig { + return testutil.MakeTestEncodingConfig(modules...) } diff --git a/app/test_helpers.go b/app/test_helpers.go index 7c54acdb9f..94088f1548 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -4,33 +4,37 @@ import ( "bytes" "encoding/json" "fmt" + "os" "strconv" "testing" "time" "cosmossdk.io/math" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmttypes "github.com/cometbft/cometbft/types" + "gotest.tools/v3/assert" + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/testutil/mock" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" - "gotest.tools/v3/assert" "github.com/umee-network/umee/v6/app/params" "github.com/umee-network/umee/v6/x/leverage/fixtures" @@ -40,10 +44,10 @@ import ( // DefaultConsensusParams defines the default Tendermint consensus params used // in UmeeApp testing. -var DefaultConsensusParams = &abci.ConsensusParams{ - Block: &abci.BlockParams{ +var DefaultConsensusParams = &tmproto.ConsensusParams{ + Block: &tmproto.BlockParams{ MaxBytes: 200000, - MaxGas: 2000000, + MaxGas: 10000000, }, Evidence: &tmproto.EvidenceParams{ MaxAgeNumBlocks: 302400, @@ -52,7 +56,7 @@ var DefaultConsensusParams = &abci.ConsensusParams{ }, Validator: &tmproto.ValidatorParams{ PubKeyTypes: []string{ - tmtypes.ABCIPubKeyTypeEd25519, + cmttypes.ABCIPubKeyTypeEd25519, }, }, } @@ -69,8 +73,8 @@ func Setup(t *testing.T) *UmeeApp { assert.NilError(t, err) // create validator set with single validator - validator := tmtypes.NewValidator(pubKey, 1) - valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator}) + validator := cmttypes.NewValidator(pubKey, 1) + valSet := cmttypes.NewValidatorSet([]*cmttypes.Validator{validator}) // generate genesis account senderPrivKey := secp256k1.GenPrivKey() @@ -90,7 +94,7 @@ func Setup(t *testing.T) *UmeeApp { // account. A Nop logger is set in app. func SetupWithGenesisValSet( t *testing.T, - valSet *tmtypes.ValidatorSet, + valSet *cmttypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance, ) *UmeeApp { @@ -125,7 +129,7 @@ func SetupWithGenesisValSet( // GenesisStateWithValSet returns a new genesis state with the validator set func GenesisStateWithValSet(codec codec.Codec, genesisState map[string]json.RawMessage, - valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, + valSet *cmttypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance, ) (map[string]json.RawMessage, error) { // set genesis accounts @@ -203,6 +207,7 @@ func GenesisStateWithValSet(codec codec.Codec, genesisState map[string]json.RawM balances, totalSupply, []banktypes.Metadata{}, + []banktypes.SendEnabled{}, ) genesisState[banktypes.ModuleName] = codec.MustMarshalJSON(bankGenesis) @@ -211,7 +216,6 @@ func GenesisStateWithValSet(codec codec.Codec, genesisState map[string]json.RawM func setup(withGenesis bool, invCheckPeriod uint) (*UmeeApp, GenesisState) { db := dbm.NewMemDB() - encCdc := MakeEncodingConfig() app := New( log.NewNopLogger(), db, @@ -220,13 +224,12 @@ func setup(withGenesis bool, invCheckPeriod uint) (*UmeeApp, GenesisState) { map[int64]bool{}, DefaultNodeHome, invCheckPeriod, - encCdc, EmptyAppOptions{}, GetWasmEnabledProposals(), EmptyWasmOpts, ) if withGenesis { - return app, NewDefaultGenesisState(encCdc.Codec) + return app, NewDefaultGenesisState(app.appCodec) } return app, GenesisState{} @@ -235,7 +238,7 @@ func setup(withGenesis bool, invCheckPeriod uint) (*UmeeApp, GenesisState) { // IntegrationTestNetworkConfig returns a networking configuration used for // integration tests using the SDK's in-process network test suite. func IntegrationTestNetworkConfig() network.Config { - cfg := network.DefaultConfig() + cfg := network.DefaultConfig(NewTestNetworkFixture) encCfg := MakeEncodingConfig() cdc := encCfg.Codec @@ -292,7 +295,7 @@ func IntegrationTestNetworkConfig() network.Config { } votingPeriod := time.Minute - govGenState.VotingParams.VotingPeriod = &votingPeriod + govGenState.Params.VotingPeriod = &votingPeriod bz, err = cdc.MarshalJSON(&govGenState) if err != nil { @@ -307,23 +310,6 @@ func IntegrationTestNetworkConfig() network.Config { cfg.GenesisState = appGenState cfg.BondDenom = params.BondDenom cfg.MinGasPrices = params.ProtocolMinGasPrice.String() - cfg.AppConstructor = func(val network.Validator) servertypes.Application { - return New( - val.Ctx.Logger, - dbm.NewMemDB(), - nil, - true, - make(map[int64]bool), - val.Ctx.Config.RootDir, - 0, - encCfg, - EmptyAppOptions{}, - GetWasmEnabledProposals(), - EmptyWasmOpts, - baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.AppConfig.Pruning)), - baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices), - ) - } return cfg } @@ -405,3 +391,42 @@ func initAccountWithCoins(app *UmeeApp, ctx sdk.Context, addr sdk.AccAddress, co panic(err) } } + +func NewTestNetworkFixture() network.TestFixture { + dir, err := os.MkdirTemp("", "simapp") + if err != nil { + panic(fmt.Sprintf("failed creating temporary directory: %v", err)) + } + defer os.RemoveAll(dir) + + app, genState := setup(true, 100) + + appCtr := func(val network.ValidatorI) servertypes.Application { + return New( + val.GetCtx().Logger, + dbm.NewMemDB(), + nil, + true, + make(map[int64]bool), + val.GetCtx().Config.RootDir, + 0, + EmptyAppOptions{}, + GetWasmEnabledProposals(), + EmptyWasmOpts, + baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), + baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices), + baseapp.SetChainID(val.GetCtx().Viper.GetString(flags.FlagChainID)), + ) + } + + return network.TestFixture{ + AppConstructor: appCtr, + GenesisState: genState, + EncodingConfig: testutil.TestEncodingConfig{ + InterfaceRegistry: app.InterfaceRegistry(), + Codec: app.AppCodec(), + TxConfig: app.txConfig, + Amino: app.LegacyAmino(), + }, + } +} diff --git a/app/types.go b/app/types.go index 794dc73f62..ca3eabaf19 100644 --- a/app/types.go +++ b/app/types.go @@ -1,7 +1,7 @@ package app import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server/types" @@ -32,7 +32,11 @@ type CosmosApp interface { LoadHeight(height int64) error // Exports the state of the application for a genesis file. - ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAddrs []string) (types.ExportedApp, error) + ExportAppStateAndValidators( + forZeroHeight bool, + jailAllowedAddrs []string, + modulesToExport []string, + ) (types.ExportedApp, error) // All the registered module account addresses. ModuleAccountAddrs() map[string]bool diff --git a/app/upgrades.go b/app/upgrades.go index 4b63e254dd..82c0083439 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -1,30 +1,38 @@ package app import ( - "cosmossdk.io/errors" "github.com/CosmWasm/wasmd/x/wasm" - ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts" - icagenesis "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/genesis/types" - icahosttypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" + ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" + icagenesis "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/genesis/types" + 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" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + + "github.com/cosmos/cosmos-sdk/baseapp" + + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/group" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/nft" + paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/umee-network/umee/v6/app/upgradev3" "github.com/umee-network/umee/v6/app/upgradev3x3" "github.com/umee-network/umee/v6/util" "github.com/umee-network/umee/v6/x/incentive" @@ -60,6 +68,68 @@ func (app UmeeApp) RegisterUpgradeHandlers() { app.registerUpgrade("v5.2", upgradeInfo) // v5.2 migration is not compatible with v6, so leaving default here. app.registerUpgrade6(upgradeInfo) app.registerUpgrade6_1("v6.1", upgradeInfo) + app.registerUpgrade6_2(upgradeInfo) +} + +func (app *UmeeApp) registerUpgrade6_2(upgradeInfo upgradetypes.Plan) { + planName := "v6.2" + + // Set param key table for params module migration + for _, subspace := range app.ParamsKeeper.GetSubspaces() { + subspace := subspace + found := true + var keyTable paramstypes.KeyTable + switch subspace.Name() { + case authtypes.ModuleName: + keyTable = authtypes.ParamKeyTable() //nolint: staticcheck // deprecated but required for upgrade + case banktypes.ModuleName: + keyTable = banktypes.ParamKeyTable() //nolint: staticcheck // deprecated but required for upgrade + case stakingtypes.ModuleName: + keyTable = stakingtypes.ParamKeyTable() + case minttypes.ModuleName: + keyTable = minttypes.ParamKeyTable() //nolint: staticcheck // deprecated but required for upgrade + case distrtypes.ModuleName: + keyTable = distrtypes.ParamKeyTable() //nolint: staticcheck // deprecated but required for upgrade + case slashingtypes.ModuleName: + keyTable = slashingtypes.ParamKeyTable() //nolint: staticcheck // deprecated but required for upgrade + case govtypes.ModuleName: + keyTable = govv1.ParamKeyTable() //nolint: staticcheck // deprecated but required for upgrade + case crisistypes.ModuleName: + keyTable = crisistypes.ParamKeyTable() //nolint: staticcheck // deprecated but required for upgrade + case wasm.ModuleName: + keyTable = wasmtypes.ParamKeyTable() //nolint: staticcheck // deprecated but required for upgrade + default: + // subspace not handled + found = false + } + if found && !subspace.HasKeyTable() { + subspace.WithKeyTable(keyTable) + } + } + + baseAppLegacySS := app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable()) + + app.UpgradeKeeper.SetUpgradeHandler(planName, + func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + // Migrate CometBFT consensus parameters from x/params module to a dedicated x/consensus module. + baseapp.MigrateParams(ctx, baseAppLegacySS, &app.ConsensusParamsKeeper) + + // explicitly update the IBC 02-client params, adding the localhost client type + params := app.IBCKeeper.ClientKeeper.GetParams(ctx) + params.AllowedClients = append(params.AllowedClients, ibcexported.Localhost) + app.IBCKeeper.ClientKeeper.SetParams(ctx, params) + + return app.mm.RunMigrations(ctx, app.configurator, fromVM) + }, + ) + + app.storeUpgrade(planName, upgradeInfo, storetypes.StoreUpgrades{ + Added: []string{ + consensustypes.ModuleName, + crisistypes.ModuleName, + }, + }) + // app.registerNewTokenEmissionUpgrade(upgradeInfo) } func (app *UmeeApp) registerUpgrade6_1(planName string, upgradeInfo upgradetypes.Plan) { @@ -145,7 +215,6 @@ func (app *UmeeApp) registerUpgrade4_3(upgradeInfo upgradetypes.Plan) { // set the ICS27 consensus version so InitGenesis is not run oldIcaVersion := fromVM[icatypes.ModuleName] - fromVM[icatypes.ModuleName] = app.mm.Modules[icatypes.ModuleName].ConsensusVersion() g := icagenesis.GenesisState{HostGenesisState: icagenesis.DefaultHostGenesis()} g.HostGenesisState.Params.AllowMessages = []string{ sdk.MsgTypeURL(&banktypes.MsgSend{}), @@ -233,12 +302,12 @@ func (app *UmeeApp) registerUpgrade3_1to3_3(_ upgradetypes.Plan) { func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Upgrade handler execution", "name", planName) ctx.Logger().Info("Run v3.3 migrator") - err := upgradev3x3.Migrator(app.GovKeeper, app.interfaceRegistry)(ctx) + err := upgradev3x3.Migrator(*app.GovKeeper, app.interfaceRegistry)(ctx) if err != nil { return fromVM, err } ctx.Logger().Info("Run x/bank v0.46.5 migration") - err = bankkeeper.NewMigrator(app.BankKeeper).Migrate3_V046_4_To_V046_5(ctx) + // err = bankkeeper.NewMigrator(app.BankKeeper, app.GetSubspace(banktypes.ModuleName)).Migrate3_V046_4_To_V046_5(ctx) if err != nil { return fromVM, err } @@ -255,7 +324,7 @@ func (app *UmeeApp) registerUpgrade3_2to3_3(_ upgradetypes.Plan) { func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Upgrade handler execution", "name", planName) ctx.Logger().Info("Run v3.3 migrator") - err := upgradev3x3.Migrator(app.GovKeeper, app.interfaceRegistry)(ctx) + err := upgradev3x3.Migrator(*app.GovKeeper, app.interfaceRegistry)(ctx) if err != nil { return fromVM, err } @@ -271,12 +340,12 @@ func (app *UmeeApp) registerUpgrade3_0(upgradeInfo upgradetypes.Plan) { planName, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { ctx.Logger().Info("Upgrade handler execution", "name", planName) - ctx.Logger().Info("Running setupBech32ibcKeeper") - err := upgradev3.SetupBech32ibcKeeper(&app.bech32IbcKeeper, ctx) - if err != nil { - return nil, errors.Wrapf( - err, "%q Upgrade: Unable to upgrade, bech32ibc module not initialized", planName) - } + // ctx.Logger().Info("Running setupBech32ibcKeeper") + // err := upgradev3.SetupBech32ibcKeeper(&app.bech32IbcKeeper, ctx) + // if err != nil { + // return nil, errors.Wrapf( + // err, "%q Upgrade: Unable to upgrade, bech32ibc module not initialized", planName) + // } ctx.Logger().Info("Running module migrations") vm, err := app.mm.RunMigrations(ctx, app.configurator, fromVM) @@ -284,22 +353,22 @@ func (app *UmeeApp) registerUpgrade3_0(upgradeInfo upgradetypes.Plan) { return vm, err } - ctx.Logger().Info("Updating validator minimum commission rate param of staking module") - minCommissionRate, err := upgradev3.UpdateMinimumCommissionRateParam(ctx, app.StakingKeeper) - if err != nil { - return vm, errors.Wrapf( - err, "%q Upgrade: failed to update minimum commission rate param of staking module", - planName) - } + // ctx.Logger().Info("Updating validator minimum commission rate param of staking module") + // minCommissionRate, err := upgradev3.UpdateMinimumCommissionRateParam(ctx, app.StakingKeeper) + // if err != nil { + // return vm, errors.Wrapf( + // err, "%q Upgrade: failed to update minimum commission rate param of staking module", + // planName) + // } - ctx.Logger().Info("Upgrade handler execution finished, updating minimum commission rate of all validators", - "name", planName) - err = upgradev3.SetMinimumCommissionRateToValidators(ctx, app.StakingKeeper, minCommissionRate) - if err != nil { - return vm, errors.Wrapf( - err, "%q Upgrade: failed to update minimum commission rate for validators", - planName) - } + // ctx.Logger().Info("Upgrade handler execution finished, updating minimum commission rate of all validators", + // "name", planName) + // err = upgradev3.SetMinimumCommissionRateToValidators(ctx, app.StakingKeeper, minCommissionRate) + // if err != nil { + // return vm, errors.Wrapf( + // err, "%q Upgrade: failed to update minimum commission rate for validators", + // planName) + // } return vm, err }) @@ -308,7 +377,7 @@ func (app *UmeeApp) registerUpgrade3_0(upgradeInfo upgradetypes.Plan) { Added: []string{ group.ModuleName, nft.ModuleName, - bech32ibctypes.ModuleName, + // bech32ibctypes.ModuleName, // removed dependency oracletypes.ModuleName, leveragetypes.ModuleName, }, diff --git a/app/upgradev3/migrations.go b/app/upgradev3/migrations.go index a61cd208d9..d3ab5015ef 100644 --- a/app/upgradev3/migrations.go +++ b/app/upgradev3/migrations.go @@ -2,7 +2,6 @@ package upgradev3 import ( sdk "github.com/cosmos/cosmos-sdk/types" - bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper" ) var minCommissionRate = sdk.MustNewDecFromStr("0.05") @@ -38,10 +37,3 @@ func SetMinimumCommissionRateToValidators(ctx sdk.Context, keeper StakingKeeper, return nil } - -// SetupBech32ibcKeeper updates keeper by setting the native account prefix to "umee". -// Failing to set the native prefix will cause a chain halt on init genesis or -// in the firstBeginBlocker assertions. -func SetupBech32ibcKeeper(bech32IbcKeeper *bech32ibckeeper.Keeper, ctx sdk.Context) error { - return bech32IbcKeeper.SetNativeHrp(ctx, sdk.GetConfig().GetBech32AccountAddrPrefix()) -} diff --git a/app/upgradev3/min_commission_test.go b/app/upgradev3/min_commission_test.go index a7002232a0..853c2a48e3 100644 --- a/app/upgradev3/min_commission_test.go +++ b/app/upgradev3/min_commission_test.go @@ -3,9 +3,9 @@ package upgradev3 import ( "testing" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "gotest.tools/v3/assert" ) diff --git a/app/wasm/msg/handler_leverage.go b/app/wasm/msg/handler_leverage.go index 7818ec2a63..5ccea90275 100644 --- a/app/wasm/msg/handler_leverage.go +++ b/app/wasm/msg/handler_leverage.go @@ -3,7 +3,7 @@ package msg import ( "context" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" lvtypes "github.com/umee-network/umee/v6/x/leverage/types" ) diff --git a/app/wasm/query/handle_incentive.go b/app/wasm/query/handle_incentive.go index dc9ae95b1a..e02b10c050 100644 --- a/app/wasm/query/handle_incentive.go +++ b/app/wasm/query/handle_incentive.go @@ -3,7 +3,7 @@ package query import ( "context" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" "github.com/umee-network/umee/v6/x/incentive" ) diff --git a/app/wasm/query/handle_leverage.go b/app/wasm/query/handle_leverage.go index aa65966628..c196bca16e 100644 --- a/app/wasm/query/handle_leverage.go +++ b/app/wasm/query/handle_leverage.go @@ -3,7 +3,7 @@ package query import ( "context" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" lvtypes "github.com/umee-network/umee/v6/x/leverage/types" ) diff --git a/app/wasm/query/handle_metoken.go b/app/wasm/query/handle_metoken.go index 68f1a80597..d664f43332 100644 --- a/app/wasm/query/handle_metoken.go +++ b/app/wasm/query/handle_metoken.go @@ -3,7 +3,7 @@ package query import ( "context" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" "github.com/umee-network/umee/v6/x/metoken" ) diff --git a/app/wasm/query/handle_oracle.go b/app/wasm/query/handle_oracle.go index 58611d7b99..ef3353ecf6 100644 --- a/app/wasm/query/handle_oracle.go +++ b/app/wasm/query/handle_oracle.go @@ -2,7 +2,7 @@ package query import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" octypes "github.com/umee-network/umee/v6/x/oracle/types" ) diff --git a/app/wasm/query/plugin.go b/app/wasm/query/plugin.go index f96fc80779..50b8da4d53 100644 --- a/app/wasm/query/plugin.go +++ b/app/wasm/query/plugin.go @@ -7,7 +7,7 @@ import ( sdkerrors "cosmossdk.io/errors" wasmvmtypes "github.com/CosmWasm/wasmvm/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" "github.com/umee-network/umee/v6/x/incentive" inckeeper "github.com/umee-network/umee/v6/x/incentive/keeper" diff --git a/app/wasm/query/querier.go b/app/wasm/query/querier.go index c9a3ac1021..a02420158e 100644 --- a/app/wasm/query/querier.go +++ b/app/wasm/query/querier.go @@ -4,10 +4,10 @@ import ( "fmt" wasmvmtypes "github.com/CosmWasm/wasmvm/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - abci "github.com/tendermint/tendermint/abci/types" // stargate client "github.com/umee-network/umee/v6/client" diff --git a/app/wasm/query/whitelist.go b/app/wasm/query/whitelist.go index 4f32723cca..710808291f 100644 --- a/app/wasm/query/whitelist.go +++ b/app/wasm/query/whitelist.go @@ -12,7 +12,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/umee-network/umee/v6/x/incentive" ltypes "github.com/umee-network/umee/v6/x/leverage/types" @@ -45,6 +45,8 @@ const ( uibcBaseQueryPath = "/umee.uibc.v1.Query/" incentiveBaseQueryPath = "/umee.incentive.v1.Query/" metokenBaseQueryPath = "/umee.metoken.v1.Query/" // #nosec G101 + + params = "Params" ) func init() { @@ -55,16 +57,16 @@ func init() { // auth setWhitelistedQuery(authBaseQueryPath+"Account", &authtypes.QueryAccountResponse{}) - setWhitelistedQuery(authBaseQueryPath+"Params", &authtypes.QueryParamsResponse{}) + setWhitelistedQuery(authBaseQueryPath+params, &authtypes.QueryParamsResponse{}) // bank setWhitelistedQuery(bankBaseQueryPath+"Balance", &banktypes.QueryBalanceResponse{}) setWhitelistedQuery(bankBaseQueryPath+"DenomMetadata", &banktypes.QueryDenomsMetadataResponse{}) - setWhitelistedQuery(bankBaseQueryPath+"Params", &banktypes.QueryParamsResponse{}) + setWhitelistedQuery(bankBaseQueryPath+params, &banktypes.QueryParamsResponse{}) setWhitelistedQuery(bankBaseQueryPath+"SupplyOf", &banktypes.QuerySupplyOfResponse{}) // distribution - setWhitelistedQuery(distrBaseQueryPath+"Params", &distributiontypes.QueryParamsResponse{}) + setWhitelistedQuery(distrBaseQueryPath+params, &distributiontypes.QueryParamsResponse{}) setWhitelistedQuery(distrBaseQueryPath+"DelegatorWithdrawAddress", &distributiontypes.QueryDelegatorWithdrawAddressResponse{}) setWhitelistedQuery(distrBaseQueryPath+"ValidatorCommission", @@ -72,16 +74,16 @@ func init() { // gov setWhitelistedQuery(govBaseQueryPath+"Deposit", &govtypes.QueryDepositResponse{}) - setWhitelistedQuery(govBaseQueryPath+"Params", &govtypes.QueryParamsResponse{}) + setWhitelistedQuery(govBaseQueryPath+params, &govtypes.QueryParamsResponse{}) setWhitelistedQuery(govBaseQueryPath+"Vote", &govtypes.QueryVoteResponse{}) // slashing - setWhitelistedQuery(slashingBaseQueryPath+"Params", &slashingtypes.QueryParamsResponse{}) + setWhitelistedQuery(slashingBaseQueryPath+params, &slashingtypes.QueryParamsResponse{}) setWhitelistedQuery(slashingBaseQueryPath+"SigningInfo", &slashingtypes.QuerySigningInfoResponse{}) // staking setWhitelistedQuery(stakingQueryPath+"Delegation", &stakingtypes.QueryDelegationResponse{}) - setWhitelistedQuery(stakingQueryPath+"Params", &stakingtypes.QueryParamsResponse{}) + setWhitelistedQuery(stakingQueryPath+params, &stakingtypes.QueryParamsResponse{}) setWhitelistedQuery(stakingQueryPath+"Validator", &stakingtypes.QueryValidatorResponse{}) // umee native module queries @@ -90,7 +92,7 @@ func init() { setWhitelistedQuery(ugovBaseQueryPath+"MinGasPrice", &ugovtypes.QueryMinGasPriceResponse{}) // leverage - setWhitelistedQuery(leverageBaseQueryPath+"Params", <ypes.QueryParamsResponse{}) + setWhitelistedQuery(leverageBaseQueryPath+params, <ypes.QueryParamsResponse{}) setWhitelistedQuery(leverageBaseQueryPath+"RegisteredTokens", <ypes.QueryRegisteredTokensResponse{}) setWhitelistedQuery(leverageBaseQueryPath+"MarketSummary", <ypes.QueryMarketSummaryResponse{}) setWhitelistedQuery(leverageBaseQueryPath+"AccountBalances", <ypes.QueryAccountBalancesResponse{}) @@ -110,18 +112,18 @@ func init() { setWhitelistedQuery(oracleBaseQueryPath+"AggregatePrevotes", &otypes.QueryAggregatePrevotesResponse{}) setWhitelistedQuery(oracleBaseQueryPath+"AggregateVote", &otypes.QueryAggregateVoteResponse{}) setWhitelistedQuery(oracleBaseQueryPath+"AggregateVotes", &otypes.QueryAggregateVotesResponse{}) - setWhitelistedQuery(oracleBaseQueryPath+"Params", &otypes.QueryParamsResponse{}) + setWhitelistedQuery(oracleBaseQueryPath+params, &otypes.QueryParamsResponse{}) setWhitelistedQuery(oracleBaseQueryPath+"Medians", &otypes.QueryMediansResponse{}) setWhitelistedQuery(oracleBaseQueryPath+"MedianDeviations", &otypes.QueryMedianDeviationsResponse{}) setWhitelistedQuery(oracleBaseQueryPath+"AvgPrice", &otypes.QueryAvgPriceResponse{}) // uibc - setWhitelistedQuery(uibcBaseQueryPath+"Params", &uibctypes.QueryParamsResponse{}) + setWhitelistedQuery(uibcBaseQueryPath+params, &uibctypes.QueryParamsResponse{}) setWhitelistedQuery(uibcBaseQueryPath+"Outflows", &uibctypes.QueryOutflowsResponse{}) setWhitelistedQuery(uibcBaseQueryPath+"AllOutflows", &uibctypes.QueryAllOutflowsResponse{}) // incentive - setWhitelistedQuery(incentiveBaseQueryPath+"Params", &incentive.QueryParamsResponse{}) + setWhitelistedQuery(incentiveBaseQueryPath+params, &incentive.QueryParamsResponse{}) setWhitelistedQuery(incentiveBaseQueryPath+"TotalBonded", &incentive.QueryTotalBondedResponse{}) setWhitelistedQuery(incentiveBaseQueryPath+"TotalUnbonding", &incentive.QueryTotalUnbondingResponse{}) setWhitelistedQuery(incentiveBaseQueryPath+"AccountBonds", &incentive.QueryAccountBondsResponse{}) @@ -138,7 +140,7 @@ func init() { setWhitelistedQuery(incentiveBaseQueryPath+"LastRewardTime", &incentive.QueryLastRewardTimeResponse{}) // metoken - setWhitelistedQuery(metokenBaseQueryPath+"Params", &metoken.QueryParamsResponse{}) + setWhitelistedQuery(metokenBaseQueryPath+params, &metoken.QueryParamsResponse{}) setWhitelistedQuery(metokenBaseQueryPath+"Indexes", &metoken.QueryIndexesResponse{}) setWhitelistedQuery(metokenBaseQueryPath+"SwapFee", &metoken.QuerySwapFeeResponse{}) setWhitelistedQuery(metokenBaseQueryPath+"RedeemFee", &metoken.QueryRedeemFeeResponse{}) diff --git a/app/wasm/test/cw20_base_test.go b/app/wasm/test/cw20_base_test.go index 2ae1c6cc8f..4cd6e6a137 100644 --- a/app/wasm/test/cw20_base_test.go +++ b/app/wasm/test/cw20_base_test.go @@ -12,17 +12,17 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" wasmvmtypes "github.com/CosmWasm/wasmvm/types" + tmrand "github.com/cometbft/cometbft/libs/rand" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp" - "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "gotest.tools/v3/assert" umeeapp "github.com/umee-network/umee/v6/app" @@ -41,7 +41,7 @@ const ( // Test addresses var ( - valPubKeys = simapp.CreateTestPubKeys(2) + valPubKeys = simtestutil.CreateTestPubKeys(2) valPubKey = valPubKeys[0] pubKey = secp256k1.GenPrivKey().PubKey() @@ -135,7 +135,7 @@ type IntegrationTestSuite struct { codeID uint64 contractAddr string - encfg params.EncodingConfig + encfg testutil.TestEncodingConfig } func (s *IntegrationTestSuite) SetupTest(t *testing.T) { @@ -154,7 +154,7 @@ func (s *IntegrationTestSuite) SetupTest(t *testing.T) { s.T = t s.app = app s.ctx = ctx - s.wasmMsgServer = wasmkeeper.NewMsgServerImpl(wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper)) + s.wasmMsgServer = wasmkeeper.NewMsgServerImpl(&app.WasmKeeper) querier := app.GRPCQueryRouter() wasmtypes.RegisterMsgServer(querier, s.wasmMsgServer) diff --git a/client/auth.go b/client/auth.go index 674bada036..f1325903ee 100644 --- a/client/auth.go +++ b/client/auth.go @@ -1,6 +1,8 @@ package client import ( + sdk "github.com/cosmos/cosmos-sdk/types" + authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) @@ -27,3 +29,7 @@ func (c Client) QueryAuthSeq(accAddr string) (uint64, error) { accSeq := baseAccount.GetSequence() return accSeq, nil } + +func (c Client) QueryTxHash(hash string) (*sdk.TxResponse, error) { + return authtx.QueryTx(*c.Tx.ClientContext, hash) +} diff --git a/client/client.go b/client/client.go index d94e44aaff..d3e8914b67 100644 --- a/client/client.go +++ b/client/client.go @@ -4,7 +4,7 @@ import ( "context" "github.com/cosmos/cosmos-sdk/codec" - sdkparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/umee-network/umee/v6/sdkclient" ) @@ -24,7 +24,7 @@ func NewClient( grpcEndpoint string, mnemonics map[string]string, gasAdjustment float64, - encCfg sdkparams.EncodingConfig, + encCfg testutil.TestEncodingConfig, ) (Client, error) { c, err := sdkclient.NewClient(chainDataDir, chainID, tmrpcEndpoint, grpcEndpoint, mnemonics, gasAdjustment, encCfg) if err != nil { diff --git a/cmd/ibc_denom/ibc_denom.go b/cmd/ibc_denom/ibc_denom.go index 4a03402ee6..46b20bb47a 100644 --- a/cmd/ibc_denom/ibc_denom.go +++ b/cmd/ibc_denom/ibc_denom.go @@ -3,7 +3,7 @@ package main import ( "fmt" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/spf13/cobra" ) @@ -18,7 +18,6 @@ func ibcDenomCmd() *cobra.Command { Example: $ ibc-denom uumee channel-22`, RunE: func(cmd *cobra.Command, args []string) error { - ibcDenom, err := ibcDenom(args[0], args[1]) if err != nil { return err diff --git a/cmd/ibc_denom/ibc_denom_test.go b/cmd/ibc_denom/ibc_denom_test.go index a539b29c94..5eef006b1a 100644 --- a/cmd/ibc_denom/ibc_denom_test.go +++ b/cmd/ibc_denom/ibc_denom_test.go @@ -7,7 +7,6 @@ import ( ) func TestIBCDenom(t *testing.T) { - tests := []struct { name string baseDenom string diff --git a/cmd/umeed/cmd/app_creator.go b/cmd/umeed/cmd/app_creator.go index 14152648c6..a4de5799dc 100644 --- a/cmd/umeed/cmd/app_creator.go +++ b/cmd/umeed/cmd/app_creator.go @@ -9,20 +9,21 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + cmttypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" - sdkparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/snapshots" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" "github.com/umee-network/umee/v6/ante" umeeapp "github.com/umee-network/umee/v6/app" @@ -30,7 +31,7 @@ import ( ) type appCreator struct { - encCfg sdkparams.EncodingConfig + encCfg testutil.TestEncodingConfig moduleManager module.BasicManager } @@ -79,11 +80,22 @@ func (a appCreator) newApp( wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer)) } + homeDir := cast.ToString(appOpts.Get(flags.FlagHome)) + chainID := cast.ToString(appOpts.Get(flags.FlagChainID)) + if chainID == "" { + // fallback to genesis chain-id + appGenesis, err := cmttypes.GenesisDocFromFile(filepath.Join(homeDir, "config", "genesis.json")) + if err != nil { + panic(err) + } + + chainID = appGenesis.ChainID + } + return umeeapp.New( logger, db, traceStore, true, skipUpgradeHeights, cast.ToString(appOpts.Get(flags.FlagHome)), cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), - a.encCfg, appOpts, umeeapp.GetWasmEnabledProposals(), wasmOpts, @@ -96,6 +108,7 @@ func (a appCreator) newApp( baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))), baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))), baseapp.SetSnapshot(snapshotStore, snapshotOptions), + baseapp.SetChainID(chainID), ) } @@ -119,6 +132,7 @@ func (a appCreator) appExport( forZeroHeight bool, jailAllowedAddrs []string, appOpts servertypes.AppOptions, + modulesToExport []string, ) (servertypes.ExportedApp, error) { homePath, ok := appOpts.Get(flags.FlagHome).(string) if !ok || homePath == "" { @@ -138,7 +152,6 @@ func (a appCreator) appExport( map[int64]bool{}, homePath, uint(1), - a.encCfg, appOpts, umeeapp.GetWasmEnabledProposals(), umeeapp.EmptyWasmOpts, @@ -150,5 +163,5 @@ func (a appCreator) appExport( } } - return app.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs) + return app.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) } diff --git a/cmd/umeed/cmd/root.go b/cmd/umeed/cmd/root.go index 0d5fa60c4a..085f0432e1 100644 --- a/cmd/umeed/cmd/root.go +++ b/cmd/umeed/cmd/root.go @@ -3,6 +3,9 @@ package cmd import ( "os" + rosettacmd "cosmossdk.io/tools/rosetta/cmd" + tmcfg "github.com/cometbft/cometbft/config" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" "github.com/cosmos/cosmos-sdk/client/flags" @@ -10,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/client/rpc" "github.com/cosmos/cosmos-sdk/server" serverconfig "github.com/cosmos/cosmos-sdk/server/config" - sdkparams "github.com/cosmos/cosmos-sdk/simapp/params" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -19,8 +21,6 @@ import ( genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" "github.com/spf13/cobra" - tmcfg "github.com/tendermint/tendermint/config" - tmcli "github.com/tendermint/tendermint/libs/cli" umeeapp "github.com/umee-network/umee/v6/app" appparams "github.com/umee-network/umee/v6/app/params" @@ -28,7 +28,7 @@ import ( ) // NewRootCmd returns the root command handler for the Umee daemon. -func NewRootCmd() (*cobra.Command, sdkparams.EncodingConfig) { +func NewRootCmd() *cobra.Command { encodingConfig := umeeapp.MakeEncodingConfig() moduleManager := umeeapp.ModuleBasics @@ -39,7 +39,7 @@ func NewRootCmd() (*cobra.Command, sdkparams.EncodingConfig) { WithLegacyAmino(encodingConfig.Amino). WithInput(os.Stdin). WithAccountRetriever(types.AccountRetriever{}). - WithBroadcastMode(flags.BroadcastBlock). + WithBroadcastMode(flags.BroadcastSync). WithHomeDir(umeeapp.DefaultNodeHome). WithViper(appparams.Name) @@ -80,7 +80,7 @@ towards borrowing assets on another blockchain.`, initRootCmd(rootCmd, ac) - return rootCmd, encodingConfig + return rootCmd } // initTendermintConfig helps to override default Tendermint Config values. @@ -172,7 +172,7 @@ func initRootCmd(rootCmd *cobra.Command, a appCreator) { ) // add rosetta - rootCmd.AddCommand(server.RosettaCommand(a.encCfg.InterfaceRegistry, a.encCfg.Codec)) + rootCmd.AddCommand(rosettacmd.RosettaCommand(a.encCfg.InterfaceRegistry, a.encCfg.Codec)) } func addModuleInitFlags(startCmd *cobra.Command) { diff --git a/cmd/umeed/main.go b/cmd/umeed/main.go index 218a7e7cfa..0f6cbda8d9 100644 --- a/cmd/umeed/main.go +++ b/cmd/umeed/main.go @@ -12,7 +12,7 @@ import ( ) func main() { - rootCmd, _ := cmd.NewRootCmd() + rootCmd := cmd.NewRootCmd() if err := svrcmd.Execute(rootCmd, strings.ToUpper(appparams.Name), umeeapp.DefaultNodeHome); err != nil { os.Exit(1) } diff --git a/go.mod b/go.mod index 81fc9e0b19..20215d0175 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,20 @@ module github.com/umee-network/umee/v6 go 1.21 require ( + cosmossdk.io/api v0.3.1 cosmossdk.io/errors v1.0.0 cosmossdk.io/math v1.1.2 - github.com/CosmWasm/wasmd v0.31.0 + cosmossdk.io/tools/rosetta v0.2.1 + github.com/CosmWasm/wasmd v0.40.2 github.com/CosmWasm/wasmvm v1.3.0 - github.com/cosmos/cosmos-proto v1.0.0-beta.3 - github.com/cosmos/cosmos-sdk v0.46.15 + github.com/cometbft/cometbft v0.37.2 + github.com/cometbft/cometbft-db v0.8.0 + github.com/cosmos/cosmos-proto v1.0.0-beta.2 + github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/ibc-go/v6 v6.2.1 - github.com/gogo/protobuf v1.3.3 + github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-go/v7 v7.2.0 + github.com/gogo/protobuf v1.3.2 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.3 github.com/golangci/golangci-lint v1.55.1 @@ -19,7 +24,6 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/mgechev/revive v1.3.4 github.com/ory/dockertest/v3 v3.10.0 - github.com/osmosis-labs/bech32-ibc v0.3.1 github.com/prometheus/client_golang v1.17.0 github.com/rakyll/statik v0.1.7 github.com/rs/zerolog v1.31.0 @@ -27,11 +31,9 @@ require ( github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - github.com/tendermint/tendermint v0.34.29 - github.com/tendermint/tm-db v0.6.7 - golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea - google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d - google.golang.org/grpc v1.59.0 + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb + google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 + google.golang.org/grpc v1.58.2 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.5.1 @@ -46,7 +48,10 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.1 // indirect cloud.google.com/go/storage v1.30.1 // indirect - filippo.io/edwards25519 v1.0.0-rc.1 // indirect + cosmossdk.io/core v0.5.1 // indirect + cosmossdk.io/depinject v1.0.0-alpha.4 // indirect + cosmossdk.io/log v1.2.1 // indirect + filippo.io/edwards25519 v1.0.0 // indirect github.com/4meepo/tagalign v1.3.3 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect @@ -63,7 +68,6 @@ require ( github.com/Microsoft/go-winio v0.6.0 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect - github.com/Workiva/go-datastructures v1.0.53 // indirect github.com/alecthomas/go-check-sumtype v0.1.3 // indirect github.com/alexkohler/nakedret/v2 v2.0.2 // indirect github.com/alexkohler/prealloc v1.0.0 // indirect @@ -71,7 +75,7 @@ require ( github.com/armon/go-metrics v0.4.1 // indirect github.com/ashanbrown/forbidigo v1.6.0 // indirect github.com/ashanbrown/makezero v1.1.1 // indirect - github.com/aws/aws-sdk-go v1.44.122 // indirect + github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect @@ -90,18 +94,21 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/charithe/durationcheck v0.0.10 // indirect github.com/chavacava/garif v0.1.0 // indirect - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect + github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect + github.com/cockroachdb/errors v1.10.0 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/redact v1.1.5 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect - github.com/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/containerd/continuity v0.3.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect - github.com/cosmos/gogoproto v1.4.8 // indirect - github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.6 // indirect + github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/iavl v0.20.0 // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect - github.com/creachadair/taskgroup v0.3.2 // indirect + github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect + github.com/creachadair/taskgroup v0.4.2 // indirect github.com/curioswitch/go-reassign v0.2.0 // indirect github.com/daixiang0/gci v0.11.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -110,29 +117,30 @@ require ( github.com/denis-tingaikin/go-header v0.4.3 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect + github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/docker/cli v20.10.17+incompatible // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker v20.10.24+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect - github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/esimonov/ifshort v1.0.4 // indirect github.com/ettle/strcase v0.1.1 // indirect github.com/fatih/color v1.15.0 // indirect github.com/fatih/structtag v1.2.0 // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect github.com/firefart/nonamedreturns v1.0.4 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect + github.com/getsentry/sentry-go v0.23.0 // indirect github.com/ghostiam/protogetter v0.2.3 // indirect github.com/gin-gonic/gin v1.9.1 // indirect github.com/go-critic/go-critic v0.9.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect github.com/go-toolsmith/astequal v1.1.0 // indirect @@ -144,8 +152,8 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gofrs/flock v0.8.1 // indirect - github.com/gogo/gateway v1.1.0 // indirect - github.com/golang/glog v1.1.2 // indirect + github.com/gogo/googleapis v1.4.1 // indirect + github.com/golang/glog v1.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect @@ -179,15 +187,16 @@ require ( github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.0 // indirect + github.com/hashicorp/go-getter v1.7.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect + github.com/hdevalence/ed25519consensus v0.1.0 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect + github.com/huandu/skiplist v1.2.0 // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -200,7 +209,9 @@ require ( github.com/kisielk/errcheck v1.6.3 // indirect github.com/kisielk/gotool v1.0.0 // indirect github.com/kkHAIKE/contextcheck v1.1.4 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.16.5 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/kulti/thelper v0.6.3 // indirect github.com/kunwardeep/paralleltest v1.0.8 // indirect github.com/kyoh86/exportloopref v0.1.11 // indirect @@ -209,6 +220,7 @@ require ( github.com/leonklingele/grouper v1.1.1 // indirect github.com/lib/pq v1.10.9 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/linxGnu/grocksdb v1.7.16 // indirect github.com/lufeee/execinquery v1.2.1 // indirect github.com/macabu/inamedparam v0.1.2 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -251,9 +263,9 @@ require ( github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/rivo/uniseg v0.4.2 // indirect - github.com/rs/cors v1.8.2 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/rs/cors v1.8.3 // indirect github.com/ryancurrah/gomodguard v1.3.0 // indirect github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect @@ -278,15 +290,14 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect github.com/tdakkota/asciicheck v0.2.0 // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tetafro/godot v1.4.15 // indirect - github.com/tidwall/btree v1.5.0 // indirect + github.com/tidwall/btree v1.6.0 // indirect github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect github.com/timonwong/loggercheck v0.9.4 // indirect github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect - github.com/ulikunitz/xz v0.5.10 // indirect + github.com/ulikunitz/xz v0.5.11 // indirect github.com/ultraware/funlen v0.1.0 // indirect github.com/ultraware/whitespace v0.0.5 // indirect github.com/uudashr/gocognit v1.1.2 // indirect @@ -301,7 +312,7 @@ require ( github.com/zondax/ledger-go v0.14.1 // indirect gitlab.com/bosi/decorder v0.4.1 // indirect go-simpler.org/sloglint v0.1.2 // indirect - go.etcd.io/bbolt v1.3.6 // indirect + go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect go.tmz.dev/musttag v0.7.2 // indirect go.uber.org/atomic v1.10.0 // indirect @@ -330,16 +341,15 @@ require ( mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect nhooyr.io/websocket v1.8.6 // indirect + pgregory.net/rapid v1.0.0 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) replace ( - github.com/CosmWasm/wasmd => github.com/notional-labs/wasmd v0.31.0-umee.46 - github.com/cosmos/cosmos-sdk => github.com/umee-network/cosmos-sdk v0.46.15-umee // dgrijalva/jwt-go is deprecated and doesn't receive security updates. + github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d + // github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/osmosis-labs/bech32-ibc => github.com/umee-network/bech32-ibc v0.3.3 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.29 ) diff --git a/go.sum b/go.sum index 94127da1f9..e0bf295013 100644 --- a/go.sum +++ b/go.sum @@ -195,13 +195,24 @@ cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuW cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= +cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= +cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= +cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= +cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= +cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98okJopc= +cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= +cosmossdk.io/log v1.2.1 h1:Xc1GgTCicniwmMiKwDxUjO4eLhPxoVdI9vtMW8Ti/uk= +cosmossdk.io/log v1.2.1/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= cosmossdk.io/math v1.1.2 h1:ORZetZCTyWkI5GlZ6CZS28fMHi83ZYf+A2vVnHNzZBM= cosmossdk.io/math v1.1.2/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= +cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= +cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= +filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/4meepo/tagalign v1.3.3 h1:ZsOxcwGD/jP4U/aw7qeWu58i7dwYemfy5Y+IF1ACoNw= @@ -227,8 +238,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= -github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= +github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= +github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= +github.com/CosmWasm/wasmd v0.40.2 h1:GSDHIaeJI7fcDF5mkzSXQI5IZLtvpNq5t3TjJ9bDpPw= +github.com/CosmWasm/wasmd v0.40.2/go.mod h1:vqI238yb4D6aNuigS8mCqTyyCV9HN5eBEZARKRoK3ts= github.com/CosmWasm/wasmvm v1.3.0 h1:x12X4bKlUPS7TT9QQP45+fJo2sp30GEbiSSgb9jsec8= github.com/CosmWasm/wasmvm v1.3.0/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= @@ -255,8 +268,6 @@ github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrU github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig= -github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= @@ -299,8 +310,9 @@ github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5Fc github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.44.122 h1:p6mw01WBaNpbdP2xrisz5tIkcNwzj/HysobNoaAHjgo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= +github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= @@ -359,8 +371,8 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/bufbuild/protocompile v0.1.0 h1:HjgJBI85hY/qmW5tw/66sNDZ7z0UDdVSi/5r40WHw4s= -github.com/bufbuild/protocompile v0.1.0/go.mod h1:ix/MMMdsT3fzxfw91dvbfzKW3fRRnuPCP47kpAm5m/4= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= github.com/butuzov/ireturn v0.2.1 h1:w5Ks4tnfeFDZskGJ2x1GAkx5gaQV+kdU3NKNr3NEBzY= github.com/butuzov/ireturn v0.2.1/go.mod h1:RfGHUvvAuFFxoHKf4Z8Yxuh6OjlCw1KvR2zM1NFHeBk= github.com/butuzov/mirror v1.1.0 h1:ZqX54gBVMXu78QLoiqdwpl2mgmoOJTk7s4p4o+0avZI= @@ -395,12 +407,15 @@ github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAc github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= +github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= +github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= @@ -419,14 +434,20 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E= github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU= +github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= -github.com/cometbft/cometbft v0.34.29 h1:Q4FqMevP9du2pOgryZJHpDV2eA6jg/kMYxBj9ZTY6VQ= -github.com/cometbft/cometbft v0.34.29/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= -github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= -github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= +github.com/cometbft/cometbft v0.37.2 h1:XB0yyHGT0lwmJlFmM4+rsRnczPlHoAKFX6K8Zgc2/Jc= +github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= +github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= +github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= @@ -445,28 +466,33 @@ 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.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o= -github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I= +github.com/cosmos/cosmos-proto v1.0.0-beta.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.5 h1:n1+WjP/VM/gAEOx3TqU2/Ny734rj/MX1kpUnn7zVJP8= +github.com/cosmos/cosmos-sdk v0.47.5/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= -github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= -github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU= -github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v6 v6.2.1 h1:NiaDXTRhKwf3n9kELD4VRIe5zby1yk1jBvaz9tXTQ6k= -github.com/cosmos/ibc-go/v6 v6.2.1/go.mod h1:XLsARy4Y7+GtAqzMcxNdlQf6lx+ti1e8KcMGv5NIK7A= -github.com/cosmos/interchain-accounts v0.4.3 h1:WedxEa/Hj/2GY7AF6CafkEPJ/Z9rhl3rT1mRwNHsdts= -github.com/cosmos/interchain-accounts v0.4.3/go.mod h1:qibHB6y/R2YsuuZdamI2BcIUBPMyhyELDWAr8Nk8x4g= +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.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= +github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= +github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= +github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= +github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= +github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM= -github.com/creachadair/taskgroup v0.3.2/go.mod h1:wieWwecHVzsidg2CsUnFinW1faVN4+kq+TDlRJQ0Wbk= +github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= +github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= @@ -501,8 +527,8 @@ github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdw github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= +github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= +github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= @@ -527,8 +553,8 @@ github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRP github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac h1:opbrjaN/L8gg6Xh5D04Tem+8xVcz6ajZlGCs49mQgyg= -github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -552,20 +578,15 @@ github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcH github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= -github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= -github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= +github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -588,6 +609,8 @@ github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= +github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghostiam/protogetter v0.2.3 h1:qdv2pzo3BpLqezwqfGDLZ+nHEYmc5bUpIdsMbBVwMjw= github.com/ghostiam/protogetter v0.2.3/go.mod h1:KmNLOsy1v04hKbvZs8EfGI1fk39AgTdRDxWNYPfXVc4= @@ -601,6 +624,8 @@ github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1T github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= github.com/go-critic/go-critic v0.9.0 h1:Pmys9qvU3pSML/3GEQ2Xd9RZ/ip+aXHKILuxczKGV/U= github.com/go-critic/go-critic v0.9.0/go.mod h1:5P8tdXL7m/6qnyG6oRAlYLORvoXH0WDypYgAEmagT40= +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= @@ -615,8 +640,8 @@ github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBj github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= +github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= @@ -677,16 +702,17 @@ github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= -github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= +github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= -github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -864,7 +890,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaD github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= @@ -885,8 +910,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.7.0 h1:bzrYP+qu/gMrL1au7/aDvkoOVGUJpeKBgbqRHACAFDY= -github.com/hashicorp/go-getter v1.7.0/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= +github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -918,13 +943,17 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 h1:aSVUgRRRtOrZOC1fYmY9gV0e9z/Iu+xNVSASWjsuyGU= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3/go.mod h1:5PC6ZNPde8bBqU/ewGZig35+UIZtw9Ytxez8/q5ZyFE= +github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= +github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= +github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= +github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= +github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= @@ -1003,8 +1032,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI= +github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= @@ -1049,6 +1078,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/linxGnu/grocksdb v1.7.16 h1:Q2co1xrpdkr5Hx3Fp+f+f7fRGhQFQhvi/+226dtLmA8= +github.com/linxGnu/grocksdb v1.7.16/go.mod h1:JkS7pl5qWpGpuVb3bPqTz8nC12X3YtPZT+Xq7+QfQo4= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= @@ -1164,12 +1195,11 @@ github.com/nishanths/exhaustive v0.11.0 h1:T3I8nUGhl/Cwu5Z2hfc92l0e04D2GEW6e0l8p github.com/nishanths/exhaustive v0.11.0/go.mod h1:RqwDsZ1xY0dNdqHho2z6X+bgzizwbLYOWnZbbl2wLB4= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= -github.com/notional-labs/wasmd v0.31.0-umee.46 h1:wsEWfXhsTw39gtIhLdMNRKVe023LZz0gO0UQS0b1t7E= -github.com/notional-labs/wasmd v0.31.0-umee.46/go.mod h1:S5TjKrcwxj/h4cnAiX4z2yxYox0JgUzzADo28W52uK8= github.com/nunnatsa/ginkgolinter v0.14.0 h1:XQPNmw+kZz5cC/HbFK3mQutpjzAQv1dHregRA+4CGGg= github.com/nunnatsa/ginkgolinter v0.14.0/go.mod h1:cm2xaqCUCRd7qcP4DqbVvpcyEMkuLM9CF0wY6VASohk= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -1179,8 +1209,9 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -1234,9 +1265,11 @@ github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCr github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/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= @@ -1303,8 +1336,6 @@ github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Ung github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= -github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= @@ -1315,11 +1346,12 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= +github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= @@ -1433,20 +1465,16 @@ github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplB github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c/go.mod h1:SbErYREK7xXdsRiigaQiQkI9McGRzYMvlKYaP3Nimdk= github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM= github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= -github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tetafro/godot v1.4.15 h1:QzdIs+XB8q+U1WmQEWKHQbKmCw06QuQM7gLx/dky2RM= github.com/tetafro/godot v1.4.15/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio= -github.com/tidwall/btree v1.5.0 h1:iV0yVY/frd7r6qGBXfEYs7DH0gTDgrKTrDjS7xt/IyQ= -github.com/tidwall/btree v1.5.0/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= +github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= +github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= @@ -1457,7 +1485,6 @@ github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVN github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGeMXEVi4= github.com/timonwong/loggercheck v0.9.4/go.mod h1:caz4zlPcgvpEkXgVnAJGowHAMW2NwHaNlpS8xDbVhTg= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1465,7 +1492,6 @@ github.com/tomarrell/wrapcheck/v2 v2.8.1 h1:HxSqDSN0sAt0yJYsrcYVoEeyM4aI9yAm3KQp github.com/tomarrell/wrapcheck/v2 v2.8.1/go.mod h1:/n2Q3NZ4XFT50ho6Hbxg+RV1uyo2Uow/Vdm9NQcl5SE= github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= @@ -1477,16 +1503,13 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljT github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= 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 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= +github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI= github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4= github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/umee-network/bech32-ibc v0.3.3 h1:wUX5uSYZl8yiFdttOvunfRihsE4miYmzl7pK2FEUs+U= -github.com/umee-network/bech32-ibc v0.3.3/go.mod h1:UbhzCKN+Z7RoUdCkAanmIy+wufwQ/aQJrDEoVORhC2Y= -github.com/umee-network/cosmos-sdk v0.46.15-umee h1:H6vyySJQhRL2Ojy9olkGsyiSqhRl+dNUbt4uatmfl4o= -github.com/umee-network/cosmos-sdk v0.46.15-umee/go.mod h1:9MRixWsgoJ2UmVsCRRePtENFPP3cM+gTC5azEpxgllo= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= @@ -1537,8 +1560,8 @@ go-simpler.org/assert v0.6.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr go-simpler.org/sloglint v0.1.2 h1:IjdhF8NPxyn0Ckn2+fuIof7ntSnVUAqBFcQRrnG9AiM= go-simpler.org/sloglint v0.1.2/go.mod h1:2LL+QImPfTslD5muNPydAEYmpXIj6o/WYcqnJjLi4o4= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -1615,8 +1638,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-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4= -golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 h1:jWGQJV4niP+CCmFW9ekjA9Zx8vYORzOUH2/Nl5WPuLQ= @@ -1827,7 +1850,6 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1870,6 +1892,8 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1884,6 +1908,7 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1981,7 +2006,6 @@ golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -2158,6 +2182,7 @@ google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= @@ -2194,13 +2219,12 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= +google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -2240,8 +2264,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.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= 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= @@ -2321,8 +2345,8 @@ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d h1:3rvTIIM22r9pvXk+q3swxUQAQ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RFiZMMsLVL+A96Nvptar8Fj71is= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= -pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= +pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4= +pgregory.net/rapid v1.0.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/proto/buf.lock b/proto/buf.lock index 0563220f54..880f045008 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -5,15 +5,19 @@ deps: owner: cosmos repository: cosmos-proto commit: 1935555c206d4afb9e94615dfd0fad31 + digest: shake256:c74d91a3ac7ae07d579e90eee33abf9b29664047ac8816500cf22c081fec0d72d62c89ce0bebafc1f6fec7aa5315be72606717740ca95007248425102c365377 - remote: buf.build owner: cosmos repository: cosmos-sdk - commit: 8cb30a2c4de74dc9bd8d260b1e75e176 + commit: 954f7b05f38440fc8250134b15adec47 + digest: shake256:2ab4404fd04a7d1d52df0e2d0f2d477a3d83ffd88d876957bf3fedfd702c8e52833d65b3ce1d89a3c5adf2aab512616b0e4f51d8463f07eda9a8a3317ee3ac54 - remote: buf.build owner: cosmos repository: gogo-proto - commit: bee5511075b7499da6178d9e4aaa628b + commit: 5e5b9fdd01804356895f8f79a6f1ddc1 + digest: shake256:0b85da49e2e5f9ebc4806eae058e2f56096ff3b1c59d1fb7c190413dd15f45dd456f0b69ced9059341c80795d2b6c943de15b120a9e0308b499e43e4b5fc2952 - remote: buf.build owner: googleapis repository: googleapis - commit: 8d7204855ec14631a499bd7393ce1970 + commit: 62f35d8aed1149c291d606d958a7ce32 + digest: shake256:c5f5c2401cf70b7c9719834954f31000a978397fdfebda861419bb4ab90fa8efae92710fddab0820533908a1e25ed692a8e119432b7b260c895087a4975b32f3 diff --git a/proto/buf.yaml b/proto/buf.yaml index 18a30541d6..6f30a1ab88 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,9 +1,9 @@ version: v1 name: buf.build/umee-network/umee deps: - - buf.build/cosmos/cosmos-sdk:8cb30a2c4de74dc9bd8d260b1e75e176 + - buf.build/cosmos/cosmos-sdk:954f7b05f38440fc8250134b15adec47 - buf.build/cosmos/cosmos-proto:1935555c206d4afb9e94615dfd0fad31 - - buf.build/cosmos/gogo-proto:bee5511075b7499da6178d9e4aaa628b + - buf.build/cosmos/gogo-proto:5e5b9fdd01804356895f8f79a6f1ddc1 - buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32 breaking: use: diff --git a/sdkclient/chain_height.go b/sdkclient/chain_height.go index 20ec11b9e5..fba24bf7e6 100644 --- a/sdkclient/chain_height.go +++ b/sdkclient/chain_height.go @@ -5,15 +5,15 @@ import ( "errors" "sync" + tmrpcclient "github.com/cometbft/cometbft/rpc/client" + tmctypes "github.com/cometbft/cometbft/rpc/core/types" + cmttypes "github.com/cometbft/cometbft/types" "github.com/rs/zerolog" - tmrpcclient "github.com/tendermint/tendermint/rpc/client" - tmctypes "github.com/tendermint/tendermint/rpc/core/types" - tmtypes "github.com/tendermint/tendermint/types" ) var ( errParseEventDataNewBlockHeader = errors.New("error parsing EventDataNewBlockHeader") - queryEventNewBlockHeader = tmtypes.QueryForEvent(tmtypes.EventNewBlockHeader) + queryEventNewBlockHeader = cmttypes.QueryForEvent(cmttypes.EventNewBlockHeader) ) // ChainHeightListener is used to cache the chain height of the @@ -43,7 +43,7 @@ func NewChainHeightListener( } newBlockHeaderSubscription, err := rpcClient.Subscribe( - ctx, tmtypes.EventNewBlockHeader, queryEventNewBlockHeader.String()) + ctx, cmttypes.EventNewBlockHeader, queryEventNewBlockHeader.String()) if err != nil { return nil, err } @@ -82,7 +82,7 @@ func (chainHeight *ChainHeightListener) subscribe( for { select { case <-ctx.Done(): - err := eventsClient.Unsubscribe(ctx, tmtypes.EventNewBlockHeader, queryEventNewBlockHeader.String()) + err := eventsClient.Unsubscribe(ctx, cmttypes.EventNewBlockHeader, queryEventNewBlockHeader.String()) if err != nil { chainHeight.Logger.Err(err) chainHeight.setChainHeight(chainHeight.lastChainHeight, err) @@ -91,7 +91,7 @@ func (chainHeight *ChainHeightListener) subscribe( return case resultEvent := <-newBlockHeaderSubscription: - eventDataNewBlockHeader, ok := resultEvent.Data.(tmtypes.EventDataNewBlockHeader) + eventDataNewBlockHeader, ok := resultEvent.Data.(cmttypes.EventDataNewBlockHeader) if !ok { chainHeight.Logger.Err(errParseEventDataNewBlockHeader) chainHeight.setChainHeight(chainHeight.lastChainHeight, errParseEventDataNewBlockHeader) diff --git a/sdkclient/client.go b/sdkclient/client.go index 907c54f17c..f829caddc1 100644 --- a/sdkclient/client.go +++ b/sdkclient/client.go @@ -6,9 +6,10 @@ import ( "os" "time" - sdkparams "github.com/cosmos/cosmos-sdk/simapp/params" + rpcclient "github.com/cometbft/cometbft/rpc/client" + rpchttp "github.com/cometbft/cometbft/rpc/client/http" + "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/rs/zerolog" - rpcclient "github.com/tendermint/tendermint/rpc/client" "github.com/umee-network/umee/v6/sdkclient/query" "github.com/umee-network/umee/v6/sdkclient/tx" ) @@ -31,7 +32,7 @@ func NewClient( grpcEndpoint string, mnemonics map[string]string, gasAdjustment float64, - encCfg sdkparams.EncodingConfig, + encCfg testutil.TestEncodingConfig, ) (uc Client, err error) { uc = Client{} logger := log.New(os.Stderr, "chain-client", log.LstdFlags) @@ -44,7 +45,7 @@ func NewClient( } func (c Client) NewChainHeightListener(ctx context.Context, logger zerolog.Logger) (*ChainHeightListener, error) { - return NewChainHeightListener(ctx, c.Tx.ClientContext.Client, logger) + return NewChainHeightListener(ctx, c.TmClient(), logger) } func (c Client) QueryTimeout() time.Duration { @@ -52,5 +53,5 @@ func (c Client) QueryTimeout() time.Duration { } func (c Client) TmClient() rpcclient.Client { - return c.Tx.ClientContext.Client + return c.Tx.ClientContext.Client.(*rpchttp.HTTP) } diff --git a/sdkclient/tx/client.go b/sdkclient/tx/client.go index 64d673da6b..fa72167fc3 100644 --- a/sdkclient/tx/client.go +++ b/sdkclient/tx/client.go @@ -4,16 +4,16 @@ import ( "log" "os" + rpchttp "github.com/cometbft/cometbft/rpc/client/http" + tmjsonclient "github.com/cometbft/cometbft/rpc/jsonrpc/client" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/crypto/keyring" - sdkparams "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/cosmos/cosmos-sdk/types/tx/signing" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - tmjsonclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" ) type Client struct { @@ -26,7 +26,7 @@ type Client struct { keyringKeyring keyring.Keyring keyringRecord []*keyring.Record txFactory *tx.Factory - encCfg sdkparams.EncodingConfig + encCfg testutil.TestEncodingConfig logger *log.Logger } @@ -41,7 +41,7 @@ func NewClient( tmrpcEndpoint string, mnemonics map[string]string, gasAdjustment float64, - encCfg sdkparams.EncodingConfig, + encCfg testutil.TestEncodingConfig, ) (c *Client, err error) { c = &Client{ ChainID: chainID, @@ -89,7 +89,7 @@ func (c *Client) initClientCtx() error { ChainID: c.ChainID, InterfaceRegistry: c.encCfg.InterfaceRegistry, Output: os.Stderr, - BroadcastMode: flags.BroadcastBlock, + BroadcastMode: flags.BroadcastSync, TxConfig: c.encCfg.TxConfig, AccountRetriever: authtypes.AccountRetriever{}, Codec: c.encCfg.Codec, diff --git a/sdkclient/tx/gov.go b/sdkclient/tx/gov.go index 890e831982..f627e40885 100644 --- a/sdkclient/tx/gov.go +++ b/sdkclient/tx/gov.go @@ -54,7 +54,14 @@ func (c *Client) GovSubmitProposal(msgs []sdk.Msg) (*sdk.TxResponse, error) { return nil, err } - submitProposal, err := v1.NewMsgSubmitProposal(msgs, deposit, fromAddr.String(), "") + submitProposal, err := v1.NewMsgSubmitProposal( + msgs, + deposit, + fromAddr.String(), + "metadata", + "sometitle", + "somesummary", + ) if err != nil { return nil, err } diff --git a/tests/accs/accounts.go b/tests/accs/accounts.go index d662d7136c..c5942c734e 100644 --- a/tests/accs/accounts.go +++ b/tests/accs/accounts.go @@ -2,9 +2,9 @@ package accs import ( + "github.com/cometbft/cometbft/crypto" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/tendermint/tendermint/crypto" ) // Test user accounts diff --git a/tests/cli/suite.go b/tests/cli/suite.go index 50e7d44101..42e1972437 100644 --- a/tests/cli/suite.go +++ b/tests/cli/suite.go @@ -4,11 +4,12 @@ import ( "fmt" "testing" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/testutil" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" - tmcli "github.com/tendermint/tendermint/libs/cli" "gotest.tools/v3/assert" ) @@ -85,21 +86,34 @@ func (s *E2ESuite) RunTransaction(tx TestTransaction) { fmt.Sprintf("--%s=%s", flags.FlagFrom, s.Network.Validators[0].Address), fmt.Sprintf("--%s=json", tmcli.OutputFlag), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), - fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), + fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf("--%s=%s", flags.FlagGas, "10000000"), fmt.Sprintf("--%s=%s", flags.FlagFees, "1000000uumee"), } - out, err := clitestutil.ExecTestCLICmd(clientCtx, tx.Command, append(tx.Args, txFlags...)) - assert.NilError(s.T, err, tx.Name) + var ( + out testutil.BufferWriter + err error + ) - resp := &sdk.TxResponse{} - err = clientCtx.Codec.UnmarshalJSON(out.Bytes(), resp) - assert.NilError(s.T, err, tx.Name) + err = s.Network.RetryForBlocks(func() error { + out, err = clitestutil.ExecTestCLICmd(clientCtx, tx.Command, append(tx.Args, txFlags...)) + if err != nil { + return err + } - if tx.ExpectedErr == nil { - assert.Equal(s.T, 0, int(resp.Code), "msg: %s\nresp: %s", tx.Name, resp) - } else { - assert.Equal(s.T, int(tx.ExpectedErr.ABCICode()), int(resp.Code), tx.Name) - } + resp := &sdk.TxResponse{} + if err = clientCtx.Codec.UnmarshalJSON(out.Bytes(), resp); err != nil { + return err + } + + expectedCode := uint32(0) + if tx.ExpectedErr != nil { + expectedCode = tx.ExpectedErr.ABCICode() + } + + return clitestutil.CheckTxCode(s.Network, clientCtx, resp.TxHash, expectedCode) + }, 2) + + assert.NilError(s.T, err, tx.Name) } diff --git a/tests/cli/types.go b/tests/cli/types.go index f90e3479f3..476b8fa6a0 100644 --- a/tests/cli/types.go +++ b/tests/cli/types.go @@ -2,7 +2,7 @@ package itest import ( "cosmossdk.io/errors" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" "github.com/spf13/cobra" ) diff --git a/tests/e2e/e2e_ibc_test.go b/tests/e2e/e2e_ibc_test.go index 4133bfbd9c..b307f31545 100644 --- a/tests/e2e/e2e_ibc_test.go +++ b/tests/e2e/e2e_ibc_test.go @@ -64,20 +64,21 @@ func (s *E2ETest) checkOutflows(umeeAPIEndpoint, denom string, checkWithExcRate } func (s *E2ETest) checkSupply(endpoint, ibcDenom string, amount math.Int) { + actualSupply := math.ZeroInt() + var err error s.Require().Eventually( func() bool { - supply, err := s.QueryTotalSupply(endpoint) + var supply sdk.Coins + supply, err = s.QueryTotalSupply(endpoint) if err != nil { return false } - if supply.AmountOf(ibcDenom).Equal(amount) { - return true - } - return false + actualSupply = supply.AmountOf(ibcDenom) + return actualSupply.Equal(amount) }, - 10*time.Minute, - 2*time.Second, - fmt.Sprintf("check supply: %s (expected %s)", ibcDenom, amount), + 2*time.Minute, + 1*time.Second, + "check supply: %s (expected %s, actual %s) err: %v", ibcDenom, amount, actualSupply, err, ) } @@ -102,11 +103,21 @@ func (s *E2ETest) TestIBCTokenTransfer() { // totalQuota := math.NewInt(120) tokenQuota := math.NewInt(100) + var atomPrice math.LegacyDec // compute the amount of ATOM sent from umee to gaia which would meet atom's token quota - atomPrice, err := s.QueryHistAvgPrice(umeeAPIEndpoint, atomSymbol) - s.Require().NoError(err) - s.Require().True(atomPrice.GT(sdk.OneDec()), - "atom price should be non zero, and expecting higher than 1, got: %s", atomPrice) + s.Require().Eventually(func() bool { + var err error + atomPrice, err = s.QueryHistAvgPrice(umeeAPIEndpoint, atomSymbol) + if err != nil { + return false + } + return atomPrice.GT(sdk.OneDec()) + }, + 2*time.Minute, + 1*time.Second, + "price of atom should be greater than 1", + ) + atomQuota := sdk.NewCoin(uatomIBCHash, sdk.NewDecFromInt(tokenQuota).Quo(atomPrice).Mul(powerReduction).RoundInt(), ) @@ -151,7 +162,7 @@ func (s *E2ETest) TestIBCTokenTransfer() { s.checkOutflows(umeeAPIEndpoint, appparams.BondDenom, true, sdk.NewDecFromInt(sendUmee.Amount), appparams.Name) s.checkSupply(gaiaAPIEndpoint, umeeIBCHash, sendUmee.Amount) - // << BELOW TOKEN QUTOA 40$ but ATOM_QUOTA (40$)+ UMEE_QUOTA(90$) >= TOTAL QUOTA (120$) >> + // << BELOW TOKEN QUOTA 40$ but ATOM_QUOTA (40$)+ UMEE_QUOTA(90$) >= TOTAL QUOTA (120$) >> // send $40 ATOM from umee to gaia atom40 := mulCoin(atomQuota, "0.4") s.SendIBC(s.Chain.ID, setup.GaiaChainID, "", atom40, true, "below token quota but not total quota") @@ -169,11 +180,14 @@ func (s *E2ETest) TestIBCTokenTransfer() { // send $45 UMEE from gaia to umee returnUmee := mulCoin(sendUmee, "0.5") returnUmee.Denom = umeeIBCHash + coins, err := s.QueryTotalSupply(gaiaAPIEndpoint) // before sending back + remainingTokens := coins.AmountOf(umeeIBCHash).Sub(returnUmee.Amount) + s.Require().NoError(err) s.SendIBC(setup.GaiaChainID, s.Chain.ID, "", returnUmee, false, "send back some umee") - s.checkSupply(gaiaAPIEndpoint, umeeIBCHash, returnUmee.Amount) // half was returned, so half remains + s.checkSupply(gaiaAPIEndpoint, umeeIBCHash, remainingTokens) // sending back remaining amount - s.SendIBC(setup.GaiaChainID, s.Chain.ID, "", returnUmee, false, "send back remaining umee") + s.SendIBC(setup.GaiaChainID, s.Chain.ID, "", sdk.NewCoin(umeeIBCHash, remainingTokens), false, "send back remaining umee") s.checkSupply(gaiaAPIEndpoint, umeeIBCHash, math.ZeroInt()) // reset the outflows @@ -200,10 +214,19 @@ func (s *E2ETest) TestIBCTokenTransfer() { ***/ // Make gov proposal to disable the quota check on ibc-transfer - err = grpc.UIBCIBCTransferStatusUpdate( - s.AccountClient(0), - uibc.IBCTransferStatus_IBC_TRANSFER_STATUS_QUOTA_DISABLED, - ) + for i := 0; i < 10; i++ { + err = grpc.UIBCIBCTransferStatusUpdate( + s.AccountClient(0), + uibc.IBCTransferStatus_IBC_TRANSFER_STATUS_QUOTA_DISABLED, + ) + + if err == nil { + break + } + + time.Sleep(time.Duration(i+1) * time.Second) + } + s.Require().NoError(err) // Get the uibc params for quota checking uibcParams, err := s.AccountClient(0).QueryUIBCParams() diff --git a/tests/e2e/e2e_leverage_test.go b/tests/e2e/e2e_leverage_test.go index e73a1545f0..26b38229f3 100644 --- a/tests/e2e/e2e_leverage_test.go +++ b/tests/e2e/e2e_leverage_test.go @@ -102,8 +102,8 @@ func (s *E2ETest) TestLeverageBasics() { }, ) - valAddr, err := s.Chain.Validators[0].KeyInfo.GetAddress() - s.Require().NoError(err) + // valAddr, err := s.Chain.Validators[0].KeyInfo.GetAddress() + // s.Require().NoError(err) s.Run( "initial leverage supply", func() { @@ -159,13 +159,13 @@ func (s *E2ETest) TestLeverageBasics() { ) }, ) - s.Run( - "special pair leverage borrow", func() { - asset := sdk.NewCoin( - appparams.BondDenom, - sdk.NewIntFromUint64(30_000_000), - ) - s.mustSucceedTx(leveragetypes.NewMsgBorrow(valAddr, asset), s.AccountClient(0)) - }, - ) + // s.Run( + // "special pair leverage borrow", func() { + // asset := sdk.NewCoin( + // appparams.BondDenom, + // sdk.NewIntFromUint64(30_000_000), + // ) + // s.mustSucceedTx(leveragetypes.NewMsgBorrow(valAddr, asset), s.AccountClient(0)) + // }, + // ) } diff --git a/tests/e2e/e2e_oracle_test.go b/tests/e2e/e2e_oracle_test.go index b4fed8d9bd..12283fc727 100644 --- a/tests/e2e/e2e_oracle_test.go +++ b/tests/e2e/e2e_oracle_test.go @@ -19,7 +19,7 @@ func (s *E2ETest) TestAllPrices() { } return true }, - time.Minute, time.Second, "get registered tokens", + 3*time.Minute, time.Second, "get registered tokens", ) s.Require().Eventually( func() bool { @@ -34,7 +34,7 @@ func (s *E2ETest) TestAllPrices() { } return true }, - time.Minute, time.Second, "ensure all tokens have prices", + 2*time.Minute, time.Second, "ensure all tokens have prices", ) } diff --git a/tests/e2e/scripts/hermes_bootstrap.sh b/tests/e2e/scripts/hermes_bootstrap.sh index 98264f5a82..9df87295d8 100755 --- a/tests/e2e/scripts/hermes_bootstrap.sh +++ b/tests/e2e/scripts/hermes_bootstrap.sh @@ -53,7 +53,7 @@ store_prefix = 'ibc' default_gas = 100000 max_gas = 3000000 gas_price = { price = 0.05, denom = 'uumee' } -gas_multiplier = 1.1 +gas_multiplier = 1.2 max_msg_num = 30 trusted_node = false max_tx_size = 2097152 @@ -76,7 +76,7 @@ default_gas = 100000 trusted_node = false max_gas = 3000000 gas_price = { price = 0.001, denom = 'stake' } -gas_multiplier = 1.1 +gas_multiplier = 1.2 max_msg_num = 30 max_tx_size = 2097152 clock_drift = '5s' @@ -85,6 +85,9 @@ trusting_period = '14days' trust_threshold = { numerator = '1', denominator = '3' } EOF +echo $UMEE_E2E_GAIA_VAL_MNEMONIC > gaia_val_mnemonic.txt +echo $UMEE_E2E_UMEE_VAL_MNEMONIC > umee_val_mnemonic.txt + # import gaia and umee keys echo ${UMEE_E2E_GAIA_VAL_MNEMONIC} > /root/.hermes/val01-gaia echo ${UMEE_E2E_UMEE_VAL_MNEMONIC} > /root/.hermes/val01-umee @@ -98,10 +101,11 @@ hermes keys add --chain ${UMEE_E2E_UMEE_CHAIN_ID} --key-name "val01-umee" --mnem ### Configure the clients and connection echo "Initiating connection handshake..." +sleep 3 hermes create connection --a-chain $UMEE_E2E_UMEE_CHAIN_ID --b-chain $UMEE_E2E_GAIA_CHAIN_ID sleep 2 echo "Creating the channels..." hermes create channel --order unordered --a-chain $UMEE_E2E_UMEE_CHAIN_ID --a-connection connection-0 --a-port transfer --b-port transfer # start Hermes relayer -hermes start \ No newline at end of file +hermes start \ No newline at end of file diff --git a/tests/e2e/setup/chain.go b/tests/e2e/setup/chain.go index aa147b5434..d6b04b03eb 100644 --- a/tests/e2e/setup/chain.go +++ b/tests/e2e/setup/chain.go @@ -4,16 +4,10 @@ import ( "fmt" "os" - "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" - "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" - cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - sdkparams "github.com/cosmos/cosmos-sdk/simapp/params" - sdk "github.com/cosmos/cosmos-sdk/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tmrand "github.com/tendermint/tendermint/libs/rand" + tmrand "github.com/cometbft/cometbft/libs/rand" - umeeapp "github.com/umee-network/umee/v6/app" + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/types/module/testutil" ) const ( @@ -21,21 +15,7 @@ const ( keyringAppName = "testnet" ) -var encodingConfig sdkparams.EncodingConfig - -func init() { - encodingConfig = umeeapp.MakeEncodingConfig() - - encodingConfig.InterfaceRegistry.RegisterImplementations( - (*sdk.Msg)(nil), - &stakingtypes.MsgCreateValidator{}, - ) - encodingConfig.InterfaceRegistry.RegisterImplementations( - (*cryptotypes.PubKey)(nil), - &secp256k1.PubKey{}, - &ed25519.PubKey{}, - ) -} +var encodingConfig testutil.TestEncodingConfig type chain struct { dataDir string diff --git a/tests/e2e/setup/gaia.go b/tests/e2e/setup/gaia.go index fe0ae1a1a1..595e0c8e03 100644 --- a/tests/e2e/setup/gaia.go +++ b/tests/e2e/setup/gaia.go @@ -8,9 +8,9 @@ import ( "path/filepath" "time" + rpchttp "github.com/cometbft/cometbft/rpc/client/http" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keyring" diff --git a/tests/e2e/setup/genesis.go b/tests/e2e/setup/genesis.go index 34b99e2efc..a3711a25b7 100644 --- a/tests/e2e/setup/genesis.go +++ b/tests/e2e/setup/genesis.go @@ -5,6 +5,7 @@ import ( "fmt" "os" + cmttypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" sdk "github.com/cosmos/cosmos-sdk/types" @@ -12,18 +13,17 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - tmtypes "github.com/tendermint/tendermint/types" ) // getGenDoc loads a genesis file from a given configDir path, or returns // empty if file does not exist -func getGenDoc(path string) (*tmtypes.GenesisDoc, error) { +func getGenDoc(path string) (*cmttypes.GenesisDoc, error) { serverCtx := server.NewDefaultContext() config := serverCtx.Config config.SetRoot(path) genFile := config.GenesisFile() - doc := &tmtypes.GenesisDoc{} + doc := &cmttypes.GenesisDoc{} if _, err := os.Stat(genFile); err != nil { if !os.IsNotExist(err) { @@ -32,7 +32,7 @@ func getGenDoc(path string) (*tmtypes.GenesisDoc, error) { } else { var err error - doc, err = tmtypes.GenesisDocFromFile(genFile) + doc, err = cmttypes.GenesisDocFromFile(genFile) if err != nil { return nil, fmt.Errorf("failed to read genesis doc from file: %w", err) } diff --git a/tests/e2e/setup/price-feeder.go b/tests/e2e/setup/price-feeder.go index f8c9be258e..8bfd8a7a04 100644 --- a/tests/e2e/setup/price-feeder.go +++ b/tests/e2e/setup/price-feeder.go @@ -15,7 +15,7 @@ import ( ) const ( - PriceFeederContainerRepo = "ghcr.io/umee-network/price-feeder-umee" + PriceFeederContainerRepo = "ghcr.io/ojo-network/price-feeder-umee-47" PriceFeederServerPort = "7171/tcp" PriceFeederMaxStartupTime = 20 // seconds ) @@ -102,6 +102,7 @@ func (s *E2ETestSuite) runPriceFeeder(valIndex int) { } if !isHealthy { + err := s.DkrPool.Client.Logs(docker.LogsOptions{ Container: s.priceFeederResource.Container.ID, OutputStream: os.Stdout, diff --git a/tests/e2e/setup/setup.go b/tests/e2e/setup/setup.go index 9797ff67ea..d4a49df11e 100644 --- a/tests/e2e/setup/setup.go +++ b/tests/e2e/setup/setup.go @@ -10,23 +10,23 @@ import ( "strings" "time" + dbm "github.com/cometbft/cometbft-db" + tmconfig "github.com/cometbft/cometbft/config" + tmjson "github.com/cometbft/cometbft/libs/json" + rpchttp "github.com/cometbft/cometbft/rpc/client/http" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" srvconfig "github.com/cosmos/cosmos-sdk/server/config" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" - bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" "github.com/spf13/viper" "github.com/stretchr/testify/suite" - tmconfig "github.com/tendermint/tendermint/config" - tmjson "github.com/tendermint/tendermint/libs/json" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/umee-network/umee/v6/app" appparams "github.com/umee-network/umee/v6/app/params" @@ -75,6 +75,26 @@ func (s *E2ETestSuite) SetupSuite() { var err error s.T().Log("setting up e2e integration test suite...") + db := dbm.NewMemDB() + app := app.New( + nil, + db, + nil, + true, + map[int64]bool{}, + "", + 0, + app.EmptyAppOptions{}, + nil, + nil, + ) + encodingConfig = testutil.TestEncodingConfig{ + InterfaceRegistry: app.InterfaceRegistry(), + Codec: app.AppCodec(), + TxConfig: app.GetTxConfig(), + Amino: app.LegacyAmino(), + } + // codec s.cdc = encodingConfig.Codec @@ -93,6 +113,14 @@ func (s *E2ETestSuite) SetupSuite() { s.initGenesis() // modify genesis file, add gentxs, and save to each validator s.initValidatorConfigs() // modify config.toml and app.toml for each validator s.runValidators() + + // Delegate to validators so that test account 0 has majority voting power on the network, + // allowing gov actions without validator votes. + s.T().Log("Delegating from test account 0 to validators") + s.Require().NoError(s.Delegate(0, 0, 10_000000)) + s.Require().NoError(s.Delegate(0, 1, 10_000000)) + s.Require().NoError(s.Delegate(0, 2, 50_000000)) // majority to validator 2, as it votes on prices + if !s.MinNetwork { s.runPriceFeeder(2) // index of the validator voting on prices s.runGaiaNetwork() @@ -101,13 +129,6 @@ func (s *E2ETestSuite) SetupSuite() { } else { s.T().Log("running minimum network withut gaia,price-feeder and ibc-relayer") } - - // Delegate to validators so that test account 0 has majority voting power on the network, - // allowing gov actions without validator votes. - s.T().Log("Delegating from test account 0 to validators") - s.Require().NoError(s.Delegate(0, 0, 10_000000)) - s.Require().NoError(s.Delegate(0, 1, 10_000000)) - s.Require().NoError(s.Delegate(0, 2, 50_000000)) // majority to validator 2, as it votes on prices s.T().Log("Setup Complete") } @@ -190,16 +211,6 @@ func (s *E2ETestSuite) initGenesis() { appGenState, genDoc, err := genutiltypes.GenesisStateFromGenFile(genFilePath) s.Require().NoError(err) - var bech32GenState bech32ibctypes.GenesisState - s.Require().NoError(s.cdc.UnmarshalJSON(appGenState[bech32ibctypes.ModuleName], &bech32GenState)) - - // bech32 - bech32GenState.NativeHRP = sdk.GetConfig().GetBech32AccountAddrPrefix() - - bz, err := s.cdc.MarshalJSON(&bech32GenState) - s.Require().NoError(err) - appGenState[bech32ibctypes.ModuleName] = bz - // Leverage var leverageGenState leveragetypes.GenesisState s.Require().NoError(s.cdc.UnmarshalJSON(appGenState[leveragetypes.ModuleName], &leverageGenState)) @@ -209,7 +220,7 @@ func (s *E2ETestSuite) initGenesis() { fixtures.Token(ATOMBaseDenom, ATOM, uint32(ATOMExponent)), ) - bz, err = s.cdc.MarshalJSON(&leverageGenState) + bz, err := s.cdc.MarshalJSON(&leverageGenState) s.Require().NoError(err) appGenState[leveragetypes.ModuleName] = bz @@ -237,8 +248,8 @@ func (s *E2ETestSuite) initGenesis() { s.Require().NoError(s.cdc.UnmarshalJSON(appGenState[govtypes.ModuleName], &govGenState)) votingPeriod := 5 * time.Second - govGenState.VotingParams.VotingPeriod = &votingPeriod - govGenState.DepositParams.MinDeposit = sdk.NewCoins(sdk.NewCoin(appparams.BondDenom, sdk.NewInt(100))) + govGenState.Params.VotingPeriod = &votingPeriod + govGenState.Params.MinDeposit = sdk.NewCoins(sdk.NewCoin(appparams.BondDenom, sdk.NewInt(100))) bz, err = s.cdc.MarshalJSON(&govGenState) s.Require().NoError(err) @@ -362,7 +373,9 @@ func (s *E2ETestSuite) initValidatorConfigs() { appConfig := srvconfig.DefaultConfig() appConfig.API.Enable = true + appConfig.API.Address = "tcp://0.0.0.0:1317" appConfig.MinGasPrices = minGasPrice + appConfig.GRPC.Address = "0.0.0.0:9090" appConfig.Pruning = "nothing" srvconfig.WriteConfigFile(appCfgPath, appConfig) diff --git a/tests/e2e/setup/utils.go b/tests/e2e/setup/utils.go index 2729727922..1ede526653 100644 --- a/tests/e2e/setup/utils.go +++ b/tests/e2e/setup/utils.go @@ -18,10 +18,10 @@ import ( sdktx "github.com/cosmos/cosmos-sdk/types/tx" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" "github.com/ory/dockertest/v3/docker" - channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" appparams "github.com/umee-network/umee/v6/app/params" "github.com/umee-network/umee/v6/client" leveragetypes "github.com/umee-network/umee/v6/x/leverage/types" @@ -52,7 +52,6 @@ func (s *E2ETestSuite) Delegate(testAccount, valIndex int, amount uint64) error asset := sdk.NewCoin(appparams.BondDenom, sdk.NewIntFromUint64(amount)) msg := stakingtypes.NewMsgDelegate(addr, valOperAddr, asset) - return s.BroadcastTxWithRetry(msg, s.AccountClient(testAccount)) } @@ -113,6 +112,7 @@ func (s *E2ETestSuite) SendIBC(srcChainID, dstChainID, recipient string, token s // retry if we got an error if err != nil && i < 4 { + time.Sleep(1 * time.Second) continue } @@ -125,18 +125,18 @@ func (s *E2ETestSuite) SendIBC(srcChainID, dstChainID, recipient string, token s // some times relayer can't send the packets to another chain // // don't check for the tx hash if we expect this to fail due to quota - // if strings.Contains(errBuf.String(), "quota transfer exceeded") { - // s.Require().True(failDueToQuota) - // return - // } - - // re := regexp.MustCompile(`[0-9A-Fa-f]{64}`) - // txHash := re.FindString(errBuf.String() + outBuf.String()) + if strings.Contains(errBuf.String(), "quota transfer exceeded") { + s.Require().True(failDueToQuota) + return + } - // // retry if we didn't get a txHash - // if len(txHash) == 0 && i < 4 { - // continue - // } + // retry if we didn't succeed + if !strings.Contains(outBuf.String(), "SUCCESS") { + if i < 4 { + continue + } + s.Require().Failf("failed to find transaction hash in output outBuf: %s errBuf: %s", outBuf.String(), errBuf.String()) + } // s.Require().NotEmptyf(txHash, "failed to find transaction hash in output outBuf: %s errBuf: %s", outBuf.String(), errBuf.String()) // endpoint := s.UmeeREST() @@ -293,7 +293,8 @@ func (s *E2ETestSuite) QueryIBCChannels(endpoint string) (bool, error) { func (s *E2ETestSuite) BroadcastTxWithRetry(msg sdk.Msg, cli client.Client) error { var err error - for retry := 0; retry < 3; retry++ { + // TODO: decrease it when possible + for retry := 0; retry < 10; retry++ { // retry if txs fails, because sometimes account sequence mismatch occurs due to txs pending _, err = cli.Tx.BroadcastTx(0, msg) if err == nil { @@ -305,11 +306,10 @@ func (s *E2ETestSuite) BroadcastTxWithRetry(msg sdk.Msg, cli client.Client) erro } // if we were told an expected account sequence, we should use it next time - s := err.Error() - re := regexp.MustCompile("expected [\\d]+") - n, err := strconv.Atoi(strings.TrimPrefix(re.FindString(s), "expected ")) - if err == nil { - return nil + re := regexp.MustCompile(`expected [\d]+`) + n, err := strconv.Atoi(strings.TrimPrefix(re.FindString(err.Error()), "expected ")) + if err != nil { + return err } cli.WithAccSeq(uint64(n)) diff --git a/tests/e2e/setup/validator.go b/tests/e2e/setup/validator.go index d0007dee35..577d9777f6 100644 --- a/tests/e2e/setup/validator.go +++ b/tests/e2e/setup/validator.go @@ -7,6 +7,10 @@ import ( "path" "path/filepath" + tmcfg "github.com/cometbft/cometbft/config" + tmos "github.com/cometbft/cometbft/libs/os" + p2p "github.com/cometbft/cometbft/p2p" + "github.com/cometbft/cometbft/privval" "github.com/cosmos/cosmos-sdk/codec" sdkcrypto "github.com/cosmos/cosmos-sdk/crypto" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" @@ -20,10 +24,6 @@ import ( authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tmcfg "github.com/tendermint/tendermint/config" - tmos "github.com/tendermint/tendermint/libs/os" - p2p "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" umeeapp "github.com/umee-network/umee/v6/app" appparams "github.com/umee-network/umee/v6/app/params" diff --git a/tests/grpc/gov.go b/tests/grpc/gov.go index 2e44f8de6d..0af17089f1 100644 --- a/tests/grpc/gov.go +++ b/tests/grpc/gov.go @@ -31,6 +31,11 @@ func SubmitAndPassProposal(umee client.Client, changes []proposal.ParamChange) e return err } + resp, err = GetTxResponse(umee, resp.TxHash) + if err != nil { + return err + } + return MakeVoteAndCheckProposal(umee, *resp) } @@ -70,8 +75,13 @@ func UIBCIBCTransferStatusUpdate(umeeClient client.Client, status uibc.IBCTransf return err } - if len(resp.Logs) == 0 { - return fmt.Errorf("no logs in response") + resp, err = GetTxResponse(umeeClient, resp.TxHash) + if err != nil { + return err + } + + if len(resp.Events) == 0 { + return fmt.Errorf("no events in response") } return MakeVoteAndCheckProposal(umeeClient, *resp) @@ -91,11 +101,12 @@ func LeverageRegistryUpdate(umeeClient client.Client, addTokens, updateTokens [] return err } - if len(resp.Logs) == 0 { - return fmt.Errorf("no logs in response") + fullResp, err := GetTxResponseAndCheckLogs(umeeClient, resp.TxHash) + if err != nil { + return err } - return MakeVoteAndCheckProposal(umeeClient, *resp) + return MakeVoteAndCheckProposal(umeeClient, *fullResp) } // LeverageSpecialPairsUpdate submits a gov transaction to update leverage special assets, @@ -117,11 +128,12 @@ func LeverageSpecialPairsUpdate( return err } - if len(resp.Logs) == 0 { - return fmt.Errorf("no logs in response") + fullResp, err := GetTxResponseAndCheckLogs(umeeClient, resp.TxHash) + if err != nil { + return err } - return MakeVoteAndCheckProposal(umeeClient, *resp) + return MakeVoteAndCheckProposal(umeeClient, *fullResp) } // MetokenRegistryUpdate submits a gov transaction to update metoken registry, votes, and waits for proposal to pass. @@ -137,16 +149,17 @@ func MetokenRegistryUpdate(umeeClient client.Client, addIndexes, updateIndexes [ return err } - if len(resp.Logs) == 0 { - return fmt.Errorf("no logs in response") + fullResp, err := GetTxResponseAndCheckLogs(umeeClient, resp.TxHash) + if err != nil { + return err } - return MakeVoteAndCheckProposal(umeeClient, *resp) + return MakeVoteAndCheckProposal(umeeClient, *fullResp) } func MakeVoteAndCheckProposal(umeeClient client.Client, resp sdk.TxResponse) error { var proposalID string - for _, event := range resp.Logs[0].Events { + for _, event := range resp.Events { if event.Type == "submit_proposal" { for _, attribute := range event.Attributes { if attribute.Key == "proposal_id" { @@ -196,3 +209,29 @@ func MakeVoteAndCheckProposal(umeeClient client.Client, resp sdk.TxResponse) err return fmt.Errorf("proposal %d failed to pass with status: %s", proposalIDInt, propStatus) } + +func GetTxResponse(umeeClient client.Client, txHash string) (resp *sdk.TxResponse, err error) { + for i := 0; i < 5; i++ { + resp, err = umeeClient.QueryTxHash(txHash) + if err == nil { + break + } + + time.Sleep(1 * time.Second) + } + + return resp, err +} + +func GetTxResponseAndCheckLogs(umeeClient client.Client, txHash string) (*sdk.TxResponse, error) { + fullResp, err := GetTxResponse(umeeClient, txHash) + if err != nil { + return nil, err + } + + if len(fullResp.Logs) == 0 { + return nil, fmt.Errorf("no logs in response") + } + + return fullResp, nil +} diff --git a/tests/simulation/sim_test.go b/tests/simulation/sim_test.go index 8b2f9c061b..d219d045d6 100644 --- a/tests/simulation/sim_test.go +++ b/tests/simulation/sim_test.go @@ -9,8 +9,13 @@ import ( "strings" "testing" - "github.com/cosmos/cosmos-sdk/server" - "github.com/cosmos/cosmos-sdk/simapp" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/libs/log" + tmrand "github.com/cometbft/cometbft/libs/rand" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/baseapp" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -23,16 +28,11 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/cosmos-sdk/x/simulation" + simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host" - "github.com/rs/zerolog" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "gotest.tools/v3/assert" umeeapp "github.com/umee-network/umee/v6/app" @@ -42,12 +42,13 @@ import ( ) func init() { - simapp.GetSimulatorFlags() + simcli.GetSimulatorFlags() } // TestFullAppSimulation tests application fuzzing given a random seed as input. func TestFullAppSimulation(t *testing.T) { - config, db, dir, logger, skip, err := simapp.SetupSimulation("leveldb-app-sim", "Simulation") + config := simcli.NewConfigFromFlags() + db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim", "Simulation", false, true) if skip { t.Skip("skipping application simulation") } @@ -66,8 +67,7 @@ func TestFullAppSimulation(t *testing.T) { true, map[int64]bool{}, umeeapp.DefaultNodeHome, - simapp.FlagPeriodValue, - umeeapp.MakeEncodingConfig(), + simcli.FlagPeriodValue, umeeapp.EmptyAppOptions{}, umeeapp.GetWasmEnabledProposals(), umeeapp.EmptyWasmOpts, @@ -82,30 +82,30 @@ func TestFullAppSimulation(t *testing.T) { app.BaseApp, appStateFn(app.AppCodec(), app.StateSimulationManager), simtypes.RandomAccounts, - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) + err = simtestutil.CheckExportSimulation(app, config, simParams) assert.NilError(t, err) assert.NilError(t, simErr) if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } } // TestAppStateDeterminism tests for application non-determinism using a PRNG // as an input for the simulator's seed. func TestAppStateDeterminism(t *testing.T) { - if !simapp.FlagEnabledValue { + if !simcli.FlagEnabledValue { t.Skip("skipping application simulation") } - config := simapp.NewConfigFromFlags() + config := simcli.NewConfigFromFlags() config.InitialBlockHeight = 1 config.ExportParamsPath = "" config.OnOperation = false @@ -121,14 +121,10 @@ func TestAppStateDeterminism(t *testing.T) { for j := 0; j < numTimesToRunPerSeed; j++ { var logger log.Logger - if simapp.FlagVerboseValue { - logger = server.ZeroLogWrapper{ - Logger: zerolog.New(os.Stderr).Level(zerolog.InfoLevel).With().Timestamp().Logger(), - } + if simcli.FlagVerboseValue { + logger = log.TestingLogger() } else { - logger = server.ZeroLogWrapper{ - Logger: zerolog.Nop(), - } + logger = log.NewNopLogger() } db := dbm.NewMemDB() @@ -139,12 +135,12 @@ func TestAppStateDeterminism(t *testing.T) { true, map[int64]bool{}, umeeapp.DefaultNodeHome, - simapp.FlagPeriodValue, - umeeapp.MakeEncodingConfig(), + simcli.FlagPeriodValue, umeeapp.EmptyAppOptions{}, umeeapp.GetWasmEnabledProposals(), umeeapp.EmptyWasmOpts, interBlockCacheOpt(), + baseapp.SetChainID(config.ChainID), ) fmt.Printf( @@ -158,7 +154,7 @@ func TestAppStateDeterminism(t *testing.T) { app.BaseApp, appStateFn(app.AppCodec(), app.StateSimulationManager), simtypes.RandomAccounts, - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), @@ -166,7 +162,7 @@ func TestAppStateDeterminism(t *testing.T) { assert.NilError(t, err) if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } appHash := app.LastCommitID().Hash @@ -186,7 +182,8 @@ func TestAppStateDeterminism(t *testing.T) { } func BenchmarkFullAppSimulation(b *testing.B) { - config, db, dir, logger, skip, err := simapp.SetupSimulation("leveldb-app-bench-sim", "Simulation") + config := simcli.NewConfigFromFlags() + db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-bench-sim", "Simulation", false, true) if skip { b.Skip("skipping application simulation") } @@ -205,8 +202,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { true, map[int64]bool{}, umeeapp.DefaultNodeHome, - simapp.FlagPeriodValue, - umeeapp.MakeEncodingConfig(), + simcli.FlagPeriodValue, umeeapp.EmptyAppOptions{}, umeeapp.GetWasmEnabledProposals(), umeeapp.EmptyWasmOpts, @@ -220,19 +216,19 @@ func BenchmarkFullAppSimulation(b *testing.B) { app.BaseApp, appStateFn(app.AppCodec(), app.StateSimulationManager), simtypes.RandomAccounts, - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) + err = simtestutil.CheckExportSimulation(app, config, simParams) assert.NilError(b, err) assert.NilError(b, simErr) if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } } @@ -283,7 +279,7 @@ func TestAppImportExport(t *testing.T) { app.GetKey(stakingtypes.StoreKey), newApp.GetKey(stakingtypes.StoreKey), [][]byte{ stakingtypes.UnbondingQueueKey, stakingtypes.RedelegationQueueKey, stakingtypes.ValidatorQueueKey, - stakingtypes.HistoricalInfoKey, + stakingtypes.HistoricalInfoKey, stakingtypes.UnbondingIDKey, stakingtypes.UnbondingIndexKey, stakingtypes.UnbondingTypeKey, stakingtypes.ValidatorUpdatesKey, }, }, // ordering may change but it doesn't matter {app.GetKey(slashingtypes.StoreKey), newApp.GetKey(slashingtypes.StoreKey), [][]byte{}}, @@ -296,7 +292,7 @@ func TestAppImportExport(t *testing.T) { {app.GetKey(capabilitytypes.StoreKey), newApp.GetKey(capabilitytypes.StoreKey), [][]byte{}}, {app.GetKey(authzkeeper.StoreKey), newApp.GetKey(authzkeeper.StoreKey), [][]byte{authzkeeper.GrantKey, authzkeeper.GrantQueuePrefix}}, - {app.GetKey(ibchost.StoreKey), newApp.GetKey(ibchost.StoreKey), [][]byte{}}, + {app.GetKey(ibcexported.StoreKey), newApp.GetKey(ibcexported.StoreKey), [][]byte{}}, {app.GetKey(ibctransfertypes.StoreKey), newApp.GetKey(ibctransfertypes.StoreKey), [][]byte{}}, // Umee module @@ -313,7 +309,7 @@ func TestAppImportExport(t *testing.T) { fmt.Printf("compared %d different key/value pairs between %s and %s\n", len(failedKVAs), skp.A, skp.B) - assert.Equal(t, 0, len(failedKVAs), simapp.GetSimulationLog(skp.A.Name(), app.SimulationManager().StoreDecoders, failedKVAs, failedKVBs)) + assert.Equal(t, 0, len(failedKVAs), simtestutil.GetSimulationLog(skp.A.Name(), app.SimulationManager().StoreDecoders, failedKVAs, failedKVBs)) } } @@ -359,7 +355,7 @@ func TestAppSimulationAfterImport(t *testing.T) { newApp.BaseApp, appStateFn(newApp.AppCodec(), newApp.StateSimulationManager), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simapp.SimulationOperations(newApp, newApp.AppCodec(), config), + simtestutil.SimulationOperations(newApp, newApp.AppCodec(), config), newApp.ModuleAccountAddrs(), config, newApp.AppCodec(), diff --git a/tests/simulation/state.go b/tests/simulation/state.go index 6afab3e180..18cc88789f 100644 --- a/tests/simulation/state.go +++ b/tests/simulation/state.go @@ -11,29 +11,30 @@ import ( "time" sdkmath "cosmossdk.io/math" + dbm "github.com/cometbft/cometbft-db" + tmjson "github.com/cometbft/cometbft/libs/json" + "github.com/cometbft/cometbft/libs/log" + cmttypes "github.com/cometbft/cometbft/types" + appparams "github.com/umee-network/umee/v6/app/params" + "gotest.tools/v3/assert" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" servertypes "github.com/cosmos/cosmos-sdk/server/types" - "github.com/cosmos/cosmos-sdk/simapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/store" storetypes "github.com/cosmos/cosmos-sdk/store/types" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/simulation" + simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" - "gotest.tools/v3/assert" umeeapp "github.com/umee-network/umee/v6/app" - appparams "github.com/umee-network/umee/v6/app/params" ) // GenesisState of the blockchain is represented here as a map of raw json @@ -73,10 +74,10 @@ func appStateFn(cdc codec.JSONCodec, simManager *module.SimulationManager) simty accs []simtypes.Account, config simtypes.Config, ) (appState json.RawMessage, simAccs []simtypes.Account, chainID string, genesisTimestamp time.Time) { - if simapp.FlagGenesisTimeValue == 0 { + if simcli.FlagGenesisTimeValue == 0 { genesisTimestamp = simtypes.RandTimestamp(r) } else { - genesisTimestamp = time.Unix(simapp.FlagGenesisTimeValue, 0) + genesisTimestamp = time.Unix(simcli.FlagGenesisTimeValue, 0) } chainID = config.ChainID @@ -88,7 +89,7 @@ func appStateFn(cdc codec.JSONCodec, simManager *module.SimulationManager) simty // override the default chain-id from simapp to set it later to the config genesisDoc, accounts := appStateFromGenesisFileFn(r, cdc, config.GenesisFile) - if simapp.FlagGenesisTimeValue == 0 { + if simcli.FlagGenesisTimeValue == 0 { // use genesis timestamp if no custom timestamp is provided (i.e no random timestamp) genesisTimestamp = genesisDoc.GenesisTime } @@ -201,14 +202,14 @@ func appStateRandomizedFn( var initialStake sdkmath.Int appParams.GetOrGenerate( cdc, - simappparams.StakePerAccount, + simtestutil.StakePerAccount, &initialStake, r, func(r *rand.Rand) { initialStake = sdkmath.NewIntFromUint64(uint64(r.Int63n(1e12))) }, ) appParams.GetOrGenerate( cdc, - simappparams.InitiallyBondedValidators, + simtestutil.InitiallyBondedValidators, &numInitiallyBonded, r, func(r *rand.Rand) { numInitiallyBonded = int64(r.Intn(300)) }, @@ -253,14 +254,14 @@ func appStateFromGenesisFileFn( r io.Reader, cdc codec.JSONCodec, genesisFile string, -) (tmtypes.GenesisDoc, []simtypes.Account) { +) (cmttypes.GenesisDoc, []simtypes.Account) { bytes, err := ioutil.ReadFile(genesisFile) if err != nil { panic(err) } // NOTE: Tendermint uses a custom JSON decoder for GenesisDoc - var genesis tmtypes.GenesisDoc + var genesis cmttypes.GenesisDoc if err := tmjson.Unmarshal(bytes, &genesis); err != nil { panic(err) } @@ -304,7 +305,8 @@ func appExportAndImport(t *testing.T) ( dbm.DB, string, *umeeapp.UmeeApp, log.Logger, servertypes.ExportedApp, bool, dbm.DB, string, *umeeapp.UmeeApp, simtypes.Config, ) { - config, db, dir, logger, skip, err := simapp.SetupSimulation("leveldb-app-sim", "Simulation") + config := simcli.NewConfigFromFlags() + db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim", "Simulation", false, true) if skip { t.Skip("skipping application simulation") } @@ -318,8 +320,7 @@ func appExportAndImport(t *testing.T) ( true, map[int64]bool{}, dir, - simapp.FlagPeriodValue, - umeeapp.MakeEncodingConfig(), + simcli.FlagPeriodValue, umeeapp.EmptyAppOptions{}, umeeapp.GetWasmEnabledProposals(), umeeapp.EmptyWasmOpts, @@ -334,29 +335,29 @@ func appExportAndImport(t *testing.T) ( app.BaseApp, appStateFn(app.AppCodec(), app.StateSimulationManager), simtypes.RandomAccounts, - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) + err = simtestutil.CheckExportSimulation(app, config, simParams) assert.NilError(t, err) assert.NilError(t, simErr) if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } fmt.Printf("exporting genesis...\n") - exported, err := app.ExportAppStateAndValidators(false, []string{}) + exported, err := app.ExportAppStateAndValidators(false, []string{}, []string{}) assert.NilError(t, err) fmt.Printf("importing genesis...\n") - config, newDB, newDir, _, _, err := simapp.SetupSimulation("leveldb-app-sim-2", "Simulation-2") + newDB, newDir, _, _, err := simtestutil.SetupSimulation(config, "leveldb-app-sim-2", "Simulation-2", false, true) assert.NilError(t, err, "simulation setup failed") newApp := umeeapp.New( @@ -366,8 +367,7 @@ func appExportAndImport(t *testing.T) ( true, map[int64]bool{}, newDir, - simapp.FlagPeriodValue, - umeeapp.MakeEncodingConfig(), + simcli.FlagPeriodValue, umeeapp.EmptyAppOptions{}, umeeapp.GetWasmEnabledProposals(), umeeapp.EmptyWasmOpts, diff --git a/tests/tsdk/store.go b/tests/tsdk/store.go index 3f270906cc..e807d9bd39 100644 --- a/tests/tsdk/store.go +++ b/tests/tsdk/store.go @@ -4,13 +4,13 @@ import ( "io" "testing" + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/store" types "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/assert" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" ) // NewCtx creates new context with store and mounted store keys and transient store keys. diff --git a/util/bpmath/types.go b/util/bpmath/types.go index 783ec534a3..0b3a64b91e 100644 --- a/util/bpmath/types.go +++ b/util/bpmath/types.go @@ -18,5 +18,7 @@ const ( Zero = 0 ) -var oneBigInt = math.NewIntFromUint64(One) -var oneDec = sdk.NewDec(One) +var ( + oneBigInt = math.NewIntFromUint64(One) + oneDec = sdk.NewDec(One) +) diff --git a/util/cli/print.go b/util/cli/print.go index c39a34332c..3259843abd 100644 --- a/util/cli/print.go +++ b/util/cli/print.go @@ -1,8 +1,9 @@ package cli import ( + "github.com/cosmos/gogoproto/proto" + "github.com/cosmos/cosmos-sdk/client" - "github.com/gogo/protobuf/proto" ) // PrintOrErr formats and print proto message to the standard output, unless the error diff --git a/util/ibc/ibc.go b/util/ibc/ibc.go index 5a7ea090d6..496dce0fde 100644 --- a/util/ibc/ibc.go +++ b/util/ibc/ibc.go @@ -5,8 +5,9 @@ import ( "strings" sdkmath "cosmossdk.io/math" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" ) // GetFundsFromPacket returns transfer amount and denom diff --git a/util/ibc/ibc_test.go b/util/ibc/ibc_test.go index a06c3ea33e..31575de31e 100644 --- a/util/ibc/ibc_test.go +++ b/util/ibc/ibc_test.go @@ -5,10 +5,11 @@ import ( "strings" "testing" - sdk "github.com/cosmos/cosmos-sdk/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - "github.com/tendermint/tendermint/crypto" + "github.com/cometbft/cometbft/crypto" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "gotest.tools/v3/assert" + + sdk "github.com/cosmos/cosmos-sdk/types" ) func TestGetFundsFromPacket(t *testing.T) { diff --git a/util/sdkutil/events.go b/util/sdkutil/events.go index b1d31c1cdf..029f2d91c7 100644 --- a/util/sdkutil/events.go +++ b/util/sdkutil/events.go @@ -1,8 +1,9 @@ package sdkutil import ( + "github.com/cosmos/gogoproto/proto" + sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/gogo/protobuf/proto" ) // Emit proto event and log on error diff --git a/util/sdkutil/msg.go b/util/sdkutil/msg.go index e08b95f11d..b2e52cca7f 100644 --- a/util/sdkutil/msg.go +++ b/util/sdkutil/msg.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/gogo/protobuf/proto" + "github.com/cosmos/gogoproto/proto" ) // StartMsg unpacks sdk.Context and validates msg. diff --git a/util/store/iter.go b/util/store/iter.go index d158450f3d..db789a001d 100644 --- a/util/store/iter.go +++ b/util/store/iter.go @@ -3,9 +3,9 @@ package store import ( "github.com/umee-network/umee/v6/util" + db "github.com/cometbft/cometbft-db" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - db "github.com/tendermint/tm-db" ) // Iterate through all keys in a kvStore that start with a given prefix diff --git a/x/incentive/genesis.pb.go b/x/incentive/genesis.pb.go index e538be822b..3fc0b83301 100644 --- a/x/incentive/genesis.pb.go +++ b/x/incentive/genesis.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/incentive/incentive.pb.go b/x/incentive/incentive.pb.go index 89ecf9452f..4890b237be 100644 --- a/x/incentive/incentive.pb.go +++ b/x/incentive/incentive.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/incentive/keeper/keeper.go b/x/incentive/keeper/keeper.go index 44588ee7cf..c3c2a65e49 100644 --- a/x/incentive/keeper/keeper.go +++ b/x/incentive/keeper/keeper.go @@ -1,12 +1,12 @@ package keeper import ( + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" prefixstore "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/tendermint/tendermint/libs/log" "github.com/umee-network/umee/v6/util/store" "github.com/umee-network/umee/v6/x/incentive" diff --git a/x/incentive/module/abci.go b/x/incentive/module/abci.go index 6e5bdc9736..02fd59f075 100644 --- a/x/incentive/module/abci.go +++ b/x/incentive/module/abci.go @@ -1,8 +1,8 @@ package module import ( + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - abci "github.com/tendermint/tendermint/abci/types" "github.com/umee-network/umee/v6/util" "github.com/umee-network/umee/v6/x/incentive/keeper" diff --git a/x/incentive/module/module.go b/x/incentive/module/module.go index 1f30c5cd92..c972446992 100644 --- a/x/incentive/module/module.go +++ b/x/incentive/module/module.go @@ -5,15 +5,16 @@ import ( "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/gorilla/mux" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/gorilla/mux" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/umee-network/umee/v6/x/incentive" "github.com/umee-network/umee/v6/x/incentive/client/cli" @@ -158,9 +159,3 @@ func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { return EndBlocker(ctx, am.keeper) } - -// DEPRECATED - -func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil } -func (AppModule) QuerierRoute() string { return "" } -func (AppModule) Route() sdk.Route { return sdk.Route{} } diff --git a/x/incentive/query.pb.go b/x/incentive/query.pb.go index 1a985354bf..37200bacf6 100644 --- a/x/incentive/query.pb.go +++ b/x/incentive/query.pb.go @@ -8,9 +8,9 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/incentive/tx.pb.go b/x/incentive/tx.pb.go index 55656e4d3b..609aee7ef7 100644 --- a/x/incentive/tx.pb.go +++ b/x/incentive/tx.pb.go @@ -10,9 +10,9 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/x/leverage/abci.go b/x/leverage/abci.go index 1912ec6b51..f026d47e74 100644 --- a/x/leverage/abci.go +++ b/x/leverage/abci.go @@ -1,8 +1,8 @@ package leverage import ( + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - abci "github.com/tendermint/tendermint/abci/types" "github.com/umee-network/umee/v6/util" "github.com/umee-network/umee/v6/x/leverage/keeper" diff --git a/x/leverage/keeper/keeper.go b/x/leverage/keeper/keeper.go index 360097c22a..fe7e0feceb 100644 --- a/x/leverage/keeper/keeper.go +++ b/x/leverage/keeper/keeper.go @@ -3,11 +3,11 @@ package keeper import ( "fmt" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/tendermint/tendermint/libs/log" "github.com/umee-network/umee/v6/util/coin" "github.com/umee-network/umee/v6/x/leverage/types" diff --git a/x/leverage/keeper/store.go b/x/leverage/keeper/store.go index e9bc8c8f2e..3d328380d4 100644 --- a/x/leverage/keeper/store.go +++ b/x/leverage/keeper/store.go @@ -2,8 +2,9 @@ package keeper import ( sdkmath "cosmossdk.io/math" + gogotypes "github.com/cosmos/gogoproto/types" + sdk "github.com/cosmos/cosmos-sdk/types" - gogotypes "github.com/gogo/protobuf/types" "github.com/umee-network/umee/v6/util" "github.com/umee-network/umee/v6/util/store" diff --git a/x/leverage/keeper/suite_test.go b/x/leverage/keeper/suite_test.go index cd34c9bf40..1101b000fa 100644 --- a/x/leverage/keeper/suite_test.go +++ b/x/leverage/keeper/suite_test.go @@ -6,12 +6,12 @@ import ( "time" sdkmath "cosmossdk.io/math" + tmrand "github.com/cometbft/cometbft/libs/rand" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/stretchr/testify/suite" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" umeeapp "github.com/umee-network/umee/v6/app" appparams "github.com/umee-network/umee/v6/app/params" diff --git a/x/leverage/module.go b/x/leverage/module.go index f7fefe6fe8..d84a8fd274 100644 --- a/x/leverage/module.go +++ b/x/leverage/module.go @@ -5,6 +5,10 @@ import ( "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -12,9 +16,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/umee-network/umee/v6/x/leverage/client/cli" "github.com/umee-network/umee/v6/x/leverage/keeper" @@ -168,9 +169,3 @@ func (am AppModule) WeightedOperations(simState module.SimulationState) []simtyp func AddModuleInitFlags(startCmd *cobra.Command) { startCmd.Flags().BoolP(types.FlagEnableLiquidatorQuery, "l", false, "enable liquidator query") } - -// DEPRECATED - -func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil } -func (AppModule) QuerierRoute() string { return "" } -func (AppModule) Route() sdk.Route { return sdk.Route{} } diff --git a/x/leverage/simulation/decoder.go b/x/leverage/simulation/decoder.go index 2ac51a3d63..b0d25bd51e 100644 --- a/x/leverage/simulation/decoder.go +++ b/x/leverage/simulation/decoder.go @@ -5,10 +5,11 @@ import ( "fmt" sdkmath "cosmossdk.io/math" + gogotypes "github.com/cosmos/gogoproto/types" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - gogotypes "github.com/gogo/protobuf/types" "github.com/umee-network/umee/v6/x/leverage/types" ) diff --git a/x/leverage/simulation/operations.go b/x/leverage/simulation/operations.go index 5884add337..0c02ad6d95 100644 --- a/x/leverage/simulation/operations.go +++ b/x/leverage/simulation/operations.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/simulation" @@ -402,7 +402,7 @@ func randomLiquidateFields( func deliver(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, ak simulation.AccountKeeper, bk bankkeeper.Keeper, from simtypes.Account, msg sdk.Msg, coins sdk.Coins, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { - cfg := simappparams.MakeTestEncodingConfig() + cfg := testutil.MakeTestEncodingConfig() o := simulation.OperationInput{ R: r, App: app, diff --git a/x/leverage/simulation/operations_test.go b/x/leverage/simulation/operations_test.go index 6d9b0254e4..9793a1bcf7 100644 --- a/x/leverage/simulation/operations_test.go +++ b/x/leverage/simulation/operations_test.go @@ -5,13 +5,14 @@ import ( "testing" "time" + abci "github.com/cometbft/cometbft/abci/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/gogoproto/proto" + "github.com/stretchr/testify/suite" + sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/gogo/protobuf/proto" - "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" umeeapp "github.com/umee-network/umee/v6/app" appparams "github.com/umee-network/umee/v6/app/params" diff --git a/x/leverage/simulation/params.go b/x/leverage/simulation/params.go index 3338513e9b..2a785d9003 100644 --- a/x/leverage/simulation/params.go +++ b/x/leverage/simulation/params.go @@ -8,8 +8,8 @@ import ( // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(*rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{ +func ParamChanges(*rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ // empty: leverage params are in regular state } } diff --git a/x/leverage/types/events.pb.go b/x/leverage/types/events.pb.go index 526455f723..03065ec232 100644 --- a/x/leverage/types/events.pb.go +++ b/x/leverage/types/events.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/leverage/types/genesis.pb.go b/x/leverage/types/genesis.pb.go index 7f87ace729..8158d1d2db 100644 --- a/x/leverage/types/genesis.pb.go +++ b/x/leverage/types/genesis.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/leverage/types/leverage.pb.go b/x/leverage/types/leverage.pb.go index a232f3c0ea..738df899a4 100644 --- a/x/leverage/types/leverage.pb.go +++ b/x/leverage/types/leverage.pb.go @@ -6,8 +6,8 @@ package types import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -41,14 +41,15 @@ type Params struct { // reaching its maximum when borrowed value passes // complete_liquidation_threshold. We can put it into the picture: // - // borrowed CV := collateral - // value value - // --- | ------- | ----- | -------- | -------> - // LV CL + // borrowed CV := collateral + // value value + // --- | ------- | ----- | -------- | -------> + // LV CL // // LV = liquidation value = liquidation_threshold * CV // CL = LV + (CV-LV) * complete_liquidation_threshold - // is the borrowed value above which close factor will be 1. + // + // is the borrowed value above which close factor will be 1. // // Valid values: 0-1. MinimumCloseFactor github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=minimum_close_factor,json=minimumCloseFactor,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"minimum_close_factor" yaml:"minimum_close_factor"` @@ -176,11 +177,15 @@ type Token struct { // Max Supply Utilization specifies the maximum supply utilization a token is // allowed to reach as a direct result of user borrowing. New borrows are not allowed when // the supply utilization is above `max_supply_utilization`. - // supply_utilization(token) = total_borrowed(token) / total_supply(token) + // + // supply_utilization(token) = total_borrowed(token) / total_supply(token) + // // Valid values: 0-1. MaxSupplyUtilization github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,16,opt,name=max_supply_utilization,json=maxSupplyUtilization,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_supply_utilization" yaml:"max_supply_utilization"` // Min Collateral Liquidity specifies min limit for the following function: - // collateral_liquidity(token) = available(token) / total_collateral(token) + // + // collateral_liquidity(token) = available(token) / total_collateral(token) + // // Borrowing, collateralizing, or withdrawing assets is not allowed when the // result of such action invalidates min_collateral_liquidity. // Liquidity can only drop below this value due to interest or liquidations. @@ -201,7 +206,8 @@ type Token struct { // zero for this field causes current price to be used in those calculations // for the affected Token. // The time span covered by the historic median will be: - // oracle.Params.median_stamp_period * oracle.Params.historic_stamp_period * historic_medians. + // + // oracle.Params.median_stamp_period * oracle.Params.historic_stamp_period * historic_medians. HistoricMedians uint32 `protobuf:"varint,19,opt,name=historic_medians,json=historicMedians,proto3" json:"historic_medians,omitempty" yaml:"historic_medians"` } diff --git a/x/leverage/types/query.pb.go b/x/leverage/types/query.pb.go index 27e9f5ed8f..a0d48f61a5 100644 --- a/x/leverage/types/query.pb.go +++ b/x/leverage/types/query.pb.go @@ -9,9 +9,9 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/leverage/types/tx.pb.go b/x/leverage/types/tx.pb.go index 2d5c6ba55d..d34f777a23 100644 --- a/x/leverage/types/tx.pb.go +++ b/x/leverage/types/tx.pb.go @@ -10,9 +10,9 @@ import ( github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/x/metoken/README.md b/x/metoken/README.md index 14d4735b83..ff9eadb7d3 100644 --- a/x/metoken/README.md +++ b/x/metoken/README.md @@ -407,7 +407,7 @@ where `proposal.json` contains: { "messages": [ { - "@type": "/umeenetwork.umee.metoken.v1.MsgGovUpdateRegistry", + "@type": "/umee.metoken.v1.MsgGovUpdateRegistry", "authority": "umee10d07y265gmmuvt4z0w9aw880jnsr700jg5w6jp", "title": "Update the meToken Index Registry", "description": "Add me/USD Index, Update me/EUR Index", diff --git a/x/metoken/client/cli/query.go b/x/metoken/client/cli/query.go index b21869850e..e6f3f15e89 100644 --- a/x/metoken/client/cli/query.go +++ b/x/metoken/client/cli/query.go @@ -59,10 +59,9 @@ func QueryParams() *cobra.Command { // metoken_denom is optional, if it isn't provided then all the indexes will be returned. func Indexes() *cobra.Command { cmd := &cobra.Command{ - Use: "indexes [metoken_denom]", - Args: cobra.MaximumNArgs(1), - Short: "Get all the registered indexes in the x/metoken module or search for a specific index with" + - " metoken_denom.", + Use: "indexes [metoken_denom]", + Args: cobra.MaximumNArgs(1), + Short: "Get all the registered indexes in the x/metoken module or search for a specific index with metoken_denom.", RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientQueryContext(cmd) if err != nil { @@ -146,10 +145,9 @@ func RedeemFee() *cobra.Command { // metoken_denom is optional, if it isn't provided then all the balances will be returned. func IndexBalances() *cobra.Command { cmd := &cobra.Command{ - Use: "index-balance [metoken_denom]", - Args: cobra.MaximumNArgs(1), - Short: "Get all the indexes' balances in the x/metoken module or search for a specific index with" + - " metoken_denom.", + Use: "index-balance [metoken_denom]", + Args: cobra.MaximumNArgs(1), + Short: "Get all the indexes' balances in the x/metoken module or search for a specific index with metoken_denom.", RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientQueryContext(cmd) if err != nil { @@ -174,10 +172,9 @@ func IndexBalances() *cobra.Command { // metoken_denom is optional, if it isn't provided then prices for all the registered indexes will be returned. func IndexPrice() *cobra.Command { cmd := &cobra.Command{ - Use: "index-price [metoken_denom]", - Args: cobra.MaximumNArgs(1), - Short: "Get price of all registered indexes in the x/metoken module or search for a specific price with" + - " metoken_denom.", + Use: "index-price [metoken_denom]", + Args: cobra.MaximumNArgs(1), + Short: "Get price of all registered indexes in the x/metoken module or search for a specific price with metoken_denom.", //nolint: lll RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientQueryContext(cmd) if err != nil { diff --git a/x/metoken/client/tests/cli_test.go b/x/metoken/client/tests/cli_test.go index f33f3e4bdb..141450cbaf 100644 --- a/x/metoken/client/tests/cli_test.go +++ b/x/metoken/client/tests/cli_test.go @@ -44,6 +44,6 @@ func TestIntegrationSuite(t *testing.T) { s.TestInvalidQueries() s.TestValidQueries() - //test cli transactions + // test cli transactions s.TestTransactions() } diff --git a/x/metoken/client/tests/tests.go b/x/metoken/client/tests/tests.go index a58b1dc503..2bf970d8ce 100644 --- a/x/metoken/client/tests/tests.go +++ b/x/metoken/client/tests/tests.go @@ -16,7 +16,6 @@ import ( func (s *IntegrationTests) TestInvalidQueries() { invalidQueries := []itestsuite.TestQuery{ { - Name: "query swap fee - invalid asset for swap", Command: cli.SwapFee(), Args: []string{ diff --git a/x/metoken/events.pb.go b/x/metoken/events.pb.go index 3d869458ae..2b30d30913 100644 --- a/x/metoken/events.pb.go +++ b/x/metoken/events.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/metoken/genesis.pb.go b/x/metoken/genesis.pb.go index 1224ed027c..34b19e12f5 100644 --- a/x/metoken/genesis.pb.go +++ b/x/metoken/genesis.pb.go @@ -7,9 +7,9 @@ import ( cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -275,7 +275,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.NextInterestClaimTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.NextInterestClaimTime):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.NextInterestClaimTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.NextInterestClaimTime):]) if err1 != nil { return 0, err1 } @@ -283,7 +283,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(n1)) i-- dAtA[i] = 0x2a - n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.NextRebalancingTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.NextRebalancingTime):]) + n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.NextRebalancingTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.NextRebalancingTime):]) if err2 != nil { return 0, err2 } @@ -480,9 +480,9 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) } } - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.NextRebalancingTime) + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.NextRebalancingTime) n += 1 + l + sovGenesis(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.NextInterestClaimTime) + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.NextInterestClaimTime) n += 1 + l + sovGenesis(uint64(l)) return n } @@ -690,7 +690,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.NextRebalancingTime, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.NextRebalancingTime, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -723,7 +723,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.NextInterestClaimTime, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.NextInterestClaimTime, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/metoken/keeper/intest/keeper_test.go b/x/metoken/keeper/intest/keeper_test.go index ffa40e3266..7096180e60 100644 --- a/x/metoken/keeper/intest/keeper_test.go +++ b/x/metoken/keeper/intest/keeper_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" + tmrand "github.com/cometbft/cometbft/libs/rand" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" umeeapp "github.com/umee-network/umee/v6/app" "github.com/umee-network/umee/v6/x/metoken" diff --git a/x/metoken/keeper/keeper.go b/x/metoken/keeper/keeper.go index 95ef1c0843..2d4fc57b14 100644 --- a/x/metoken/keeper/keeper.go +++ b/x/metoken/keeper/keeper.go @@ -1,10 +1,10 @@ package keeper import ( + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tendermint/tendermint/libs/log" "github.com/umee-network/umee/v6/x/ugov" "github.com/umee-network/umee/v6/x/metoken" diff --git a/x/metoken/metoken.pb.go b/x/metoken/metoken.pb.go index dca3494f5f..c0ed1dea21 100644 --- a/x/metoken/metoken.pb.go +++ b/x/metoken/metoken.pb.go @@ -7,8 +7,8 @@ import ( cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/metoken/module/abci.go b/x/metoken/module/abci.go index 52cd7be6c5..cb76993ccf 100644 --- a/x/metoken/module/abci.go +++ b/x/metoken/module/abci.go @@ -1,7 +1,7 @@ package module import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/umee-network/umee/v6/util" "github.com/umee-network/umee/v6/x/metoken/keeper" diff --git a/x/metoken/module/module.go b/x/metoken/module/module.go index aadb627025..8072b79d2d 100644 --- a/x/metoken/module/module.go +++ b/x/metoken/module/module.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - abci "github.com/tendermint/tendermint/abci/types" "github.com/umee-network/umee/v6/x/metoken/client/cli" "github.com/umee-network/umee/v6/util" @@ -131,9 +131,3 @@ func NewAppModule(cdc codec.Codec, kb keeper.Builder) AppModule { kb: kb, } } - -// DEPRECATED - -func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil } -func (AppModule) QuerierRoute() string { return "" } -func (AppModule) Route() sdk.Route { return sdk.Route{} } diff --git a/x/metoken/price.go b/x/metoken/price.go index 3c4003b9e9..86e9e53f6e 100644 --- a/x/metoken/price.go +++ b/x/metoken/price.go @@ -40,7 +40,6 @@ func (ip *IndexPrices) SetPrice(price AssetPrice) { } ip.Assets = append(ip.Assets, price) - } // SwapRate converts an asset to meToken applying exchange_rate and normalizing the exponent. diff --git a/x/metoken/query.pb.go b/x/metoken/query.pb.go index 887a1d30bf..1c2f8fc3ae 100644 --- a/x/metoken/query.pb.go +++ b/x/metoken/query.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/metoken/tx.pb.go b/x/metoken/tx.pb.go index bfe30fe671..bbdfae6c9f 100644 --- a/x/metoken/tx.pb.go +++ b/x/metoken/tx.pb.go @@ -9,9 +9,9 @@ import ( _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/x/oracle/abci_test.go b/x/oracle/abci_test.go index c1fcc8d954..d9b07fcc84 100644 --- a/x/oracle/abci_test.go +++ b/x/oracle/abci_test.go @@ -5,15 +5,16 @@ import ( "testing" "time" - "github.com/cosmos/cosmos-sdk/simapp" + "github.com/cometbft/cometbft/crypto/secp256k1" + tmrand "github.com/cometbft/cometbft/libs/rand" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/stretchr/testify/suite" + + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/cosmos-sdk/x/staking/teststaking" - "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/crypto/secp256k1" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/x/staking/testutil" umeeapp "github.com/umee-network/umee/v6/app" appparams "github.com/umee-network/umee/v6/app/params" @@ -54,7 +55,7 @@ func (s *IntegrationTestSuite) SetupTest() { s.Require().Len(setupVals, 1) s.Require().Equal(int64(1), setupVals[0].GetConsensusPower(app.StakingKeeper.PowerReduction(ctx))) - sh := teststaking.NewHelper(s.T(), ctx, *app.StakingKeeper) + sh := testutil.NewHelper(s.T(), ctx, app.StakingKeeper) sh.Denom = bondDenom // mint and send coins to validators @@ -68,7 +69,7 @@ func (s *IntegrationTestSuite) SetupTest() { sh.CreateValidatorWithValPower(valAddr2, valPubKey2, 398, true) sh.CreateValidatorWithValPower(valAddr3, valPubKey3, 2, true) - staking.EndBlocker(ctx, *app.StakingKeeper) + staking.EndBlocker(ctx, app.StakingKeeper) err := app.OracleKeeper.SetVoteThreshold(ctx, sdk.MustNewDecFromStr("0.4")) s.Require().NoError(err) @@ -79,7 +80,7 @@ func (s *IntegrationTestSuite) SetupTest() { // Test addresses var ( - valPubKeys = simapp.CreateTestPubKeys(3) + valPubKeys = simtestutil.CreateTestPubKeys(3) valPubKey1 = valPubKeys[0] pubKey1 = secp256k1.GenPrivKey().PubKey() diff --git a/x/oracle/client/tests/suite.go b/x/oracle/client/tests/suite.go index b3b66834ab..949f389804 100644 --- a/x/oracle/client/tests/suite.go +++ b/x/oracle/client/tests/suite.go @@ -3,14 +3,15 @@ package tests import ( "fmt" + "github.com/cometbft/cometbft/crypto/secp256k1" + tmcli "github.com/cometbft/cometbft/libs/cli" + "github.com/cosmos/gogoproto/proto" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/gogo/protobuf/proto" - "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/crypto/secp256k1" - tmcli "github.com/tendermint/tendermint/libs/cli" appparams "github.com/umee-network/umee/v6/app/params" "github.com/umee-network/umee/v6/x/oracle/client/cli" @@ -80,7 +81,7 @@ func (s *IntegrationTestSuite) TestDelegateFeedConsent() { val.Address.String(), s.network.Validators[1].Address.String(), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), - fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), + fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf("--%s=%s", flags.FlagGasPrices, appparams.ProtocolMinGasPrice), }, expectErr: false, diff --git a/x/oracle/keeper/grpc_query_test.go b/x/oracle/keeper/grpc_query_test.go index db4714e8f2..88672b8ef0 100644 --- a/x/oracle/keeper/grpc_query_test.go +++ b/x/oracle/keeper/grpc_query_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "time" + "github.com/cometbft/cometbft/crypto/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tendermint/tendermint/crypto/secp256k1" appparams "github.com/umee-network/umee/v6/app/params" "github.com/umee-network/umee/v6/x/oracle/keeper" diff --git a/x/oracle/keeper/historic_price.go b/x/oracle/keeper/historic_price.go index 4ed471bab3..0ddde0db2e 100644 --- a/x/oracle/keeper/historic_price.go +++ b/x/oracle/keeper/historic_price.go @@ -10,7 +10,6 @@ import ( ) // HistoricMedians returns a list of a given denom's last numStamps medians. - func (k Keeper) HistoricMedians( ctx sdk.Context, denom string, @@ -46,7 +45,7 @@ func (k Keeper) CalcAndSetHistoricMedian( median, err := decmath.Median(historicPrices) if err != nil { - return errors.Wrap(err, "denom: "+denom) + return errors.Wrap(err, "denom: "+denom) //nolint: goconst } block := uint64(ctx.BlockHeight()) diff --git a/x/oracle/keeper/keeper.go b/x/oracle/keeper/keeper.go index b65ec81258..0c4b30cb5a 100644 --- a/x/oracle/keeper/keeper.go +++ b/x/oracle/keeper/keeper.go @@ -4,13 +4,14 @@ import ( "fmt" "time" + "github.com/cometbft/cometbft/libs/log" + gogotypes "github.com/cosmos/gogoproto/types" + "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gogotypes "github.com/gogo/protobuf/types" - "github.com/tendermint/tendermint/libs/log" "github.com/umee-network/umee/v6/util" "github.com/umee-network/umee/v6/util/sdkutil" diff --git a/x/oracle/keeper/keeper_test.go b/x/oracle/keeper/keeper_test.go index b764d7acdc..b788657c78 100644 --- a/x/oracle/keeper/keeper_test.go +++ b/x/oracle/keeper/keeper_test.go @@ -7,18 +7,19 @@ import ( "testing" "time" + "github.com/cometbft/cometbft/crypto/secp256k1" + tmrand "github.com/cometbft/cometbft/libs/rand" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/stretchr/testify/suite" + "github.com/cosmos/cosmos-sdk/baseapp" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/cosmos-sdk/x/staking/teststaking" + "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/crypto/secp256k1" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" umeeapp "github.com/umee-network/umee/v6/app" appparams "github.com/umee-network/umee/v6/app/params" @@ -34,7 +35,7 @@ const ( // Test addresses var ( - valPubKeys = simapp.CreateTestPubKeys(2) + valPubKeys = simtestutil.CreateTestPubKeys(2) valPubKey = valPubKeys[0] pubKey = secp256k1.GenPrivKey().PubKey() @@ -71,7 +72,7 @@ func (s *IntegrationTestSuite) SetupTest() { queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) types.RegisterQueryServer(queryHelper, keeper.NewQuerier(app.OracleKeeper)) - sh := teststaking.NewHelper(s.T(), ctx, *app.StakingKeeper) + sh := testutil.NewHelper(s.T(), ctx, app.StakingKeeper) sh.Denom = bondDenom amt := sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction) @@ -84,7 +85,7 @@ func (s *IntegrationTestSuite) SetupTest() { sh.CreateValidator(valAddr, valPubKey, amt, true) sh.CreateValidator(valAddr2, valPubKey2, amt, true) - staking.EndBlocker(ctx, *app.StakingKeeper) + staking.EndBlocker(ctx, app.StakingKeeper) s.app = app s.ctx = ctx.WithBlockTime(time.Now()) diff --git a/x/oracle/keeper/slash_test.go b/x/oracle/keeper/slash_test.go index e2988132bc..67c0ac3e22 100644 --- a/x/oracle/keeper/slash_test.go +++ b/x/oracle/keeper/slash_test.go @@ -20,7 +20,7 @@ func (s *IntegrationTestSuite) TestSlashAndResetMissCounters() { // Case 1, no slash s.app.OracleKeeper.SetMissCounter(s.ctx, valAddr, uint64(votePeriodsPerWindow-minValidVotes)) s.app.OracleKeeper.SlashAndResetMissCounters(s.ctx) - staking.EndBlocker(s.ctx, *s.app.StakingKeeper) + staking.EndBlocker(s.ctx, s.app.StakingKeeper) validator, _ := s.app.StakingKeeper.GetValidator(s.ctx, valAddr) s.Require().Equal(amt, validator.GetBondedTokens()) diff --git a/x/oracle/module.go b/x/oracle/module.go index dcef81b38b..ec9df165dd 100644 --- a/x/oracle/module.go +++ b/x/oracle/module.go @@ -6,15 +6,16 @@ import ( "fmt" "math/rand" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/spf13/cobra" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/umee-network/umee/v6/util" @@ -181,12 +182,12 @@ func (am AppModule) WeightedOperations(simState module.SimulationState) []simtyp // ProposalContents returns all the oracle content functions used to // simulate governance proposals. -func (am AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { +func (am AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg { return nil } // RandomizedParams creates randomized oracle param changes for the simulator. -func (AppModule) RandomizedParams(*rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(*rand.Rand) []simtypes.LegacyParamChange { return simulation.ParamChanges() } @@ -194,9 +195,3 @@ func (AppModule) RandomizedParams(*rand.Rand) []simtypes.ParamChange { func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { sdr[types.StoreKey] = simulation.NewDecodeStore(am.cdc) } - -// DEPRECATED - -func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil } -func (AppModule) QuerierRoute() string { return "" } -func (AppModule) Route() sdk.Route { return sdk.Route{} } diff --git a/x/oracle/simulations/decoder.go b/x/oracle/simulations/decoder.go index a8fe285462..a701c46318 100644 --- a/x/oracle/simulations/decoder.go +++ b/x/oracle/simulations/decoder.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - gogotypes "github.com/gogo/protobuf/types" + gogotypes "github.com/cosmos/gogoproto/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/oracle/simulations/operations.go b/x/oracle/simulations/operations.go index b259cc0230..64c832aee2 100644 --- a/x/oracle/simulations/operations.go +++ b/x/oracle/simulations/operations.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module/testutil" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/simulation" @@ -18,6 +18,9 @@ import ( umeesim "github.com/umee-network/umee/v6/util/sim" "github.com/umee-network/umee/v6/x/oracle/keeper" "github.com/umee-network/umee/v6/x/oracle/types" + + banksim "github.com/cosmos/cosmos-sdk/x/bank/simulation" + distrsim "github.com/cosmos/cosmos-sdk/x/distribution/simulation" ) // Simulation operation weights constants @@ -26,7 +29,7 @@ const ( OpWeightMsgAggregateExchangeRateVote = "op_weight_msg_exchange_rate_aggregate_vote" //nolint: gosec OpWeightMsgDelegateFeedConsent = "op_weight_msg_exchange_feed_consent" //nolint: gosec - salt = "89b8164ca0b4b8703ae9ab25962f3dd6d1de5d656f5442971a93b2ca7893f654" //nolint: gosec + salt = "89b8164ca0b4b8703ae9ab25962f3dd6d1de5d656f5442971a93b2ca7893f654" ) var ( @@ -68,19 +71,19 @@ func WeightedOperations( appParams.GetOrGenerate(cdc, OpWeightMsgAggregateExchangeRatePrevote, &weightMsgAggregateExchangeRatePrevote, nil, func(*rand.Rand) { - weightMsgAggregateExchangeRatePrevote = simappparams.DefaultWeightMsgSend * 2 + weightMsgAggregateExchangeRatePrevote = banksim.DefaultWeightMsgSend * 2 }, ) appParams.GetOrGenerate(cdc, OpWeightMsgAggregateExchangeRateVote, &weightMsgAggregateExchangeRateVote, nil, func(*rand.Rand) { - weightMsgAggregateExchangeRateVote = simappparams.DefaultWeightMsgSend * 2 + weightMsgAggregateExchangeRateVote = banksim.DefaultWeightMsgSend * 2 }, ) appParams.GetOrGenerate(cdc, OpWeightMsgDelegateFeedConsent, &weightMsgDelegateFeedConsent, nil, func(*rand.Rand) { - weightMsgDelegateFeedConsent = simappparams.DefaultWeightMsgSetWithdrawAddress + weightMsgDelegateFeedConsent = distrsim.DefaultWeightMsgSetWithdrawAddress }, ) @@ -224,7 +227,7 @@ func SimulateMsgDelegateFeedConsent(ak types.AccountKeeper, bk bankkeeper.Keeper func deliver(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, ak simulation.AccountKeeper, bk bankkeeper.Keeper, from simtypes.Account, msg sdk.Msg, coins sdk.Coins, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { - cfg := simappparams.MakeTestEncodingConfig() + cfg := testutil.MakeTestEncodingConfig() o := simulation.OperationInput{ R: r, App: app, diff --git a/x/oracle/simulations/params.go b/x/oracle/simulations/params.go index 139e919f50..0e7edfece9 100644 --- a/x/oracle/simulations/params.go +++ b/x/oracle/simulations/params.go @@ -12,34 +12,34 @@ import ( // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges() []simtypes.ParamChange { - return []simtypes.ParamChange{ - simulation.NewSimParamChange(types.ModuleName, string(types.KeyVotePeriod), +func ParamChanges() []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyVotePeriod), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenVotePeriod(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyVoteThreshold), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyVoteThreshold), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenVoteThreshold(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyRewardBand), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyRewardBand), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenRewardBand(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeyRewardDistributionWindow), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeyRewardDistributionWindow), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenRewardDistributionWindow(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeySlashFraction), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeySlashFraction), func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenSlashFraction(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, string(types.KeySlashWindow), + simulation.NewSimLegacyParamChange(types.ModuleName, string(types.KeySlashWindow), func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenSlashWindow(r)) }, diff --git a/x/oracle/types/ballot_test.go b/x/oracle/types/ballot_test.go index ec42c7933e..d4ed992c1e 100644 --- a/x/oracle/types/ballot_test.go +++ b/x/oracle/types/ballot_test.go @@ -7,10 +7,11 @@ import ( "strconv" "testing" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tendermint/tendermint/crypto/secp256k1" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/cometbft/cometbft/crypto/secp256k1" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "gotest.tools/v3/assert" + + sdk "github.com/cosmos/cosmos-sdk/types" ) func TestToMap(t *testing.T) { @@ -199,7 +200,7 @@ func TestPBStandardDeviation(t *testing.T) { }, []int64{1, 1, 100, 1}, []bool{true, true, true, true}, - sdk.MustNewDecFromStr("49995.000362536252310906"), + sdk.MustNewDecFromStr("49995.000362536252310905"), }, { // Adding fake validator doesn't change outcome diff --git a/x/oracle/types/errors.go b/x/oracle/types/errors.go index 0817567098..356b713189 100644 --- a/x/oracle/types/errors.go +++ b/x/oracle/types/errors.go @@ -4,7 +4,7 @@ import ( "fmt" "cosmossdk.io/errors" - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/cometbft/cometbft/crypto/tmhash" ) // Oracle sentinel errors diff --git a/x/oracle/types/events.pb.go b/x/oracle/types/events.pb.go index bbff94dd0e..4efdb99d9c 100644 --- a/x/oracle/types/events.pb.go +++ b/x/oracle/types/events.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/oracle/types/genesis.pb.go b/x/oracle/types/genesis.pb.go index 4072305747..ccf220e159 100644 --- a/x/oracle/types/genesis.pb.go +++ b/x/oracle/types/genesis.pb.go @@ -5,8 +5,8 @@ package types import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/oracle/types/hash.go b/x/oracle/types/hash.go index 822016ad8e..d278b2c38f 100644 --- a/x/oracle/types/hash.go +++ b/x/oracle/types/hash.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + "github.com/cometbft/cometbft/crypto/tmhash" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tendermint/tendermint/crypto/tmhash" "gopkg.in/yaml.v3" ) diff --git a/x/oracle/types/msgs.go b/x/oracle/types/msgs.go index ebf0972626..43489109ee 100644 --- a/x/oracle/types/msgs.go +++ b/x/oracle/types/msgs.go @@ -1,10 +1,10 @@ package types import ( + "github.com/cometbft/cometbft/crypto/tmhash" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" - "github.com/tendermint/tendermint/crypto/tmhash" "github.com/umee-network/umee/v6/util/checkers" ) diff --git a/x/oracle/types/oracle.pb.go b/x/oracle/types/oracle.pb.go index cb8533e660..fbab8e0dd9 100644 --- a/x/oracle/types/oracle.pb.go +++ b/x/oracle/types/oracle.pb.go @@ -6,9 +6,9 @@ package types import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -648,7 +648,7 @@ func (m *AvgCounterParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.AvgShift, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.AvgShift):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.AvgShift, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.AvgShift):]) if err1 != nil { return 0, err1 } @@ -656,7 +656,7 @@ func (m *AvgCounterParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOracle(dAtA, i, uint64(n1)) i-- dAtA[i] = 0x12 - n2, err2 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.AvgPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.AvgPeriod):]) + n2, err2 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.AvgPeriod, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.AvgPeriod):]) if err2 != nil { return 0, err2 } @@ -855,7 +855,7 @@ func (m *AvgCounter) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Start, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Start):]) + n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Start, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Start):]) if err3 != nil { return 0, err3 } @@ -901,7 +901,7 @@ func (m *DenomExchangeRate) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + n4, err4 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) if err4 != nil { return 0, err4 } @@ -990,9 +990,9 @@ func (m *AvgCounterParams) Size() (n int) { } var l int _ = l - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.AvgPeriod) + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.AvgPeriod) n += 1 + l + sovOracle(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.AvgShift) + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.AvgShift) n += 1 + l + sovOracle(uint64(l)) return n } @@ -1082,7 +1082,7 @@ func (m *AvgCounter) Size() (n int) { if m.Num != 0 { n += 1 + sovOracle(uint64(m.Num)) } - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Start) + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Start) n += 1 + l + sovOracle(uint64(l)) return n } @@ -1099,7 +1099,7 @@ func (m *DenomExchangeRate) Size() (n int) { } l = m.Rate.Size() n += 1 + l + sovOracle(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovOracle(uint64(l)) return n } @@ -1521,7 +1521,7 @@ func (m *AvgCounterParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.AvgPeriod, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.AvgPeriod, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1554,7 +1554,7 @@ func (m *AvgCounterParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.AvgShift, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.AvgShift, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2188,7 +2188,7 @@ func (m *AvgCounter) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Start, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Start, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2337,7 +2337,7 @@ func (m *DenomExchangeRate) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/oracle/types/query.pb.go b/x/oracle/types/query.pb.go index d97cf6b9b8..3a6138d90d 100644 --- a/x/oracle/types/query.pb.go +++ b/x/oracle/types/query.pb.go @@ -8,9 +8,9 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/oracle/types/tx.pb.go b/x/oracle/types/tx.pb.go index 1b6bdd77a2..a8122c644f 100644 --- a/x/oracle/types/tx.pb.go +++ b/x/oracle/types/tx.pb.go @@ -6,9 +6,9 @@ package types import ( context "context" fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/x/oracle/types/utils_test.go b/x/oracle/types/utils_test.go index 816c24ec50..370b63bdb1 100644 --- a/x/oracle/types/utils_test.go +++ b/x/oracle/types/utils_test.go @@ -5,11 +5,11 @@ import ( "math/big" sdkmath "cosmossdk.io/math" + "github.com/cometbft/cometbft/crypto/secp256k1" + tmprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/tendermint/tendermint/crypto/secp256k1" - tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" ) const ( diff --git a/x/oracle/types/vote_test.go b/x/oracle/types/vote_test.go index d6cc69add5..d48b9726c1 100644 --- a/x/oracle/types/vote_test.go +++ b/x/oracle/types/vote_test.go @@ -77,13 +77,13 @@ func TestParseExchangeRateTuples(t *testing.T) { } func TestDenomExchangeRateString(t *testing.T) { - t1 := time.Date(2022, 9, 18, 15, 55, 01, 0, time.UTC) + t1 := time.Date(2022, 9, 18, 15, 55, 0o1, 0, time.UTC) er := DenomExchangeRate{Denom: "ABCD", Rate: sdk.MustNewDecFromStr("1.5"), Timestamp: t1} assert.Equal(t, `{"denom":"ABCD","rate":"1.500000000000000000","timestamp":"2022-09-18T15:55:01Z"}`, er.String()) } func TestExchangeRateString(t *testing.T) { - t1 := time.Date(2022, 9, 18, 15, 55, 01, 0, time.UTC) + t1 := time.Date(2022, 9, 18, 15, 55, 0o1, 0, time.UTC) er := ExchangeRate{Rate: sdk.MustNewDecFromStr("1.5"), Timestamp: t1} assert.Equal(t, `{"rate":"1.500000000000000000","timestamp":"2022-09-18T15:55:01Z"}`, er.String()) } diff --git a/x/ugov/client/tests/query_test.go b/x/ugov/client/tests/query_test.go index 2d01d8ac5b..1770b75ee6 100644 --- a/x/ugov/client/tests/query_test.go +++ b/x/ugov/client/tests/query_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - tmcli "github.com/tendermint/tendermint/libs/cli" + tmcli "github.com/cometbft/cometbft/libs/cli" itestsuite "github.com/umee-network/umee/v6/tests/cli" "github.com/umee-network/umee/v6/util/coin" diff --git a/x/ugov/codec.go b/x/ugov/codec.go index d5e1a18331..ce6012278b 100644 --- a/x/ugov/codec.go +++ b/x/ugov/codec.go @@ -1,12 +1,13 @@ package ugov import ( + "github.com/cosmos/gogoproto/proto" + "github.com/cosmos/cosmos-sdk/codec" cdctypes "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" - "github.com/gogo/protobuf/proto" ) // Amino codecs diff --git a/x/ugov/events.pb.go b/x/ugov/events.pb.go index 9e5ca7c39f..22ac002b47 100644 --- a/x/ugov/events.pb.go +++ b/x/ugov/events.pb.go @@ -7,8 +7,8 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/ugov/genesis.pb.go b/x/ugov/genesis.pb.go index 86cf2f5d99..85ee88d7ab 100644 --- a/x/ugov/genesis.pb.go +++ b/x/ugov/genesis.pb.go @@ -7,9 +7,9 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -129,7 +129,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.InflationCycleEnd, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.InflationCycleEnd):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.InflationCycleEnd, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.InflationCycleEnd):]) if err1 != nil { return 0, err1 } @@ -192,7 +192,7 @@ func (m *GenesisState) Size() (n int) { } l = m.InflationParams.Size() n += 1 + l + sovGenesis(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.InflationCycleEnd) + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.InflationCycleEnd) n += 1 + l + sovGenesis(uint64(l)) return n } @@ -359,7 +359,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.InflationCycleEnd, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.InflationCycleEnd, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/ugov/keeper/msg_server.go b/x/ugov/keeper/msg_server.go index e09c106643..b02838debe 100644 --- a/x/ugov/keeper/msg_server.go +++ b/x/ugov/keeper/msg_server.go @@ -56,8 +56,8 @@ func (m msgServer) GovSetEmergencyGroup(ctx context.Context, msg *ugov.MsgGovSet // GovUpdateInflationParams implements ugov.MsgServer. func (m msgServer) GovUpdateInflationParams(ctx context.Context, msg *ugov.MsgGovUpdateInflationParams) ( - *ugov.GovUpdateInflationParamsResponse, error) { - + *ugov.GovUpdateInflationParamsResponse, error, +) { sdkCtx, err := sdkutil.StartMsg(ctx, msg) if err != nil { return nil, err diff --git a/x/ugov/keeper/query_server.go b/x/ugov/keeper/query_server.go index 5d6885703a..1f66927bff 100644 --- a/x/ugov/keeper/query_server.go +++ b/x/ugov/keeper/query_server.go @@ -27,19 +27,24 @@ func (q Querier) MinGasPrice(ctx context.Context, _ *ugov.QueryMinGasPrice) (*ug func (q Querier) EmergencyGroup(ctx context.Context, _ *ugov.QueryEmergencyGroup, ) (*ugov.QueryEmergencyGroupResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) - return &ugov.QueryEmergencyGroupResponse{EmergencyGroup: q.Keeper(&sdkCtx).EmergencyGroup().String()}, nil + return &ugov.QueryEmergencyGroupResponse{ + EmergencyGroup: q.Keeper(&sdkCtx).EmergencyGroup().String(), + }, + nil } // InflationParams returns inflation rate change params func (q Querier) InflationParams(ctx context.Context, _ *ugov.QueryInflationParams) ( - *ugov.QueryInflationParamsResponse, error) { + *ugov.QueryInflationParamsResponse, error, +) { sdkCtx := sdk.UnwrapSDKContext(ctx) return &ugov.QueryInflationParamsResponse{Params: q.Keeper(&sdkCtx).InflationParams()}, nil } // InflationCycleEnd return when the inflation cycle will be ended. func (q Querier) InflationCycleEnd(ctx context.Context, _ *ugov.QueryInflationCycleEnd) ( - *ugov.QueryInflationCycleEndResponse, error) { + *ugov.QueryInflationCycleEndResponse, error, +) { sdkCtx := sdk.UnwrapSDKContext(ctx) cycleEndTime := q.Keeper(&sdkCtx).InflationCycleEnd() return &ugov.QueryInflationCycleEndResponse{End: &cycleEndTime}, nil diff --git a/x/ugov/keeper_interfaces.go b/x/ugov/keeper_interfaces.go index 67e65037f8..db8765d7f4 100644 --- a/x/ugov/keeper_interfaces.go +++ b/x/ugov/keeper_interfaces.go @@ -29,5 +29,7 @@ type WithEmergencyGroup interface { // Builder functions -type EmergencyGroupBuilder func(*sdk.Context) WithEmergencyGroup -type ParamsKeeperBuilder func(*sdk.Context) ParamsKeeper +type ( + EmergencyGroupBuilder func(*sdk.Context) WithEmergencyGroup + ParamsKeeperBuilder func(*sdk.Context) ParamsKeeper +) diff --git a/x/ugov/module/module.go b/x/ugov/module/module.go index d8c5ec2778..808ee4ea1e 100644 --- a/x/ugov/module/module.go +++ b/x/ugov/module/module.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -12,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/umee-network/umee/v6/util" "github.com/umee-network/umee/v6/x/ugov" @@ -140,9 +140,3 @@ func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { return nil } - -// DEPRECATED - -func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil } -func (AppModule) QuerierRoute() string { return "" } -func (AppModule) Route() sdk.Route { return sdk.Route{} } diff --git a/x/ugov/query.pb.go b/x/ugov/query.pb.go index cd5be49505..df7406236a 100644 --- a/x/ugov/query.pb.go +++ b/x/ugov/query.pb.go @@ -8,10 +8,10 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -795,7 +795,7 @@ func (m *QueryInflationCycleEndResponse) MarshalToSizedBuffer(dAtA []byte) (int, var l int _ = l if m.End != nil { - n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.End, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.End):]) + n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.End, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.End):]) if err3 != nil { return 0, err3 } @@ -896,7 +896,7 @@ func (m *QueryInflationCycleEndResponse) Size() (n int) { var l int _ = l if m.End != nil { - l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.End) + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.End) n += 1 + l + sovQuery(uint64(l)) } return n @@ -1417,7 +1417,7 @@ func (m *QueryInflationCycleEndResponse) Unmarshal(dAtA []byte) error { if m.End == nil { m.End = new(time.Time) } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(m.End, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.End, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/ugov/tx.pb.go b/x/ugov/tx.pb.go index 8829a3d225..2f3b59c13d 100644 --- a/x/ugov/tx.pb.go +++ b/x/ugov/tx.pb.go @@ -9,9 +9,9 @@ import ( _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/x/ugov/ugov.pb.go b/x/ugov/ugov.pb.go index d1acead70a..7e6e30f7a9 100644 --- a/x/ugov/ugov.pb.go +++ b/x/ugov/ugov.pb.go @@ -6,9 +6,9 @@ package ugov import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" github_com_umee_network_umee_v6_util_bpmath "github.com/umee-network/umee/v6/util/bpmath" _ "google.golang.org/protobuf/types/known/durationpb" io "io" @@ -131,7 +131,7 @@ func (m *InflationParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x18 } - n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.InflationCycle, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.InflationCycle):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.InflationCycle, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.InflationCycle):]) if err1 != nil { return 0, err1 } @@ -171,7 +171,7 @@ func (m *InflationParams) Size() (n int) { _ = l l = m.MaxSupply.Size() n += 1 + l + sovUgov(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.InflationCycle) + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.InflationCycle) n += 1 + l + sovUgov(uint64(l)) if m.InflationReductionRate != 0 { n += 1 + sovUgov(uint64(m.InflationReductionRate)) @@ -276,7 +276,7 @@ func (m *InflationParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.InflationCycle, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.InflationCycle, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/uibc/client/tests/query_test.go b/x/uibc/client/tests/query_test.go index b2adf7e4ae..42a1100ba3 100644 --- a/x/uibc/client/tests/query_test.go +++ b/x/uibc/client/tests/query_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + tmcli "github.com/cometbft/cometbft/libs/cli" sdk "github.com/cosmos/cosmos-sdk/types" - tmcli "github.com/tendermint/tendermint/libs/cli" itestsuite "github.com/umee-network/umee/v6/tests/cli" "github.com/umee-network/umee/v6/x/uibc" diff --git a/x/uibc/events.pb.go b/x/uibc/events.pb.go index 03f1c30ef0..80f737d350 100644 --- a/x/uibc/events.pb.go +++ b/x/uibc/events.pb.go @@ -5,8 +5,8 @@ package uibc import ( fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" diff --git a/x/uibc/genesis.pb.go b/x/uibc/genesis.pb.go index 4c70dfdfe4..8082cce5f1 100644 --- a/x/uibc/genesis.pb.go +++ b/x/uibc/genesis.pb.go @@ -8,9 +8,9 @@ import ( _ "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/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -131,7 +131,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.QuotaExpires, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.QuotaExpires):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.QuotaExpires, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.QuotaExpires):]) if err1 != nil { return 0, err1 } @@ -203,7 +203,7 @@ func (m *GenesisState) Size() (n int) { } l = m.TotalOutflowSum.Size() n += 1 + l + sovGenesis(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdTime(m.QuotaExpires) + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.QuotaExpires) n += 1 + l + sovGenesis(uint64(l)) return n } @@ -373,7 +373,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.QuotaExpires, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.QuotaExpires, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/uibc/module/abci.go b/x/uibc/module/abci.go index 4c5df229be..e5479e3a0c 100644 --- a/x/uibc/module/abci.go +++ b/x/uibc/module/abci.go @@ -3,8 +3,9 @@ package uibc import ( "time" + abci "github.com/cometbft/cometbft/abci/types" + sdk "github.com/cosmos/cosmos-sdk/types" - abci "github.com/tendermint/tendermint/abci/types" "github.com/umee-network/umee/v6/x/uibc/quota/keeper" ) diff --git a/x/uibc/module/module.go b/x/uibc/module/module.go index e0f3034e78..eb2063ff81 100644 --- a/x/uibc/module/module.go +++ b/x/uibc/module/module.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -12,7 +13,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/umee-network/umee/v6/util" ibctransfer "github.com/umee-network/umee/v6/x/uibc" "github.com/umee-network/umee/v6/x/uibc/client/cli" @@ -132,9 +132,3 @@ func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { return EndBlocker() } - -// DEPRECATED - -func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil } -func (AppModule) QuerierRoute() string { return "" } -func (AppModule) Route() sdk.Route { return sdk.Route{} } diff --git a/x/uibc/query.pb.go b/x/uibc/query.pb.go index 49a5168ad1..1cc3e43514 100644 --- a/x/uibc/query.pb.go +++ b/x/uibc/query.pb.go @@ -9,9 +9,9 @@ import ( _ "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/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/uibc/quota.pb.go b/x/uibc/quota.pb.go index ef354af807..c79fc54588 100644 --- a/x/uibc/quota.pb.go +++ b/x/uibc/quota.pb.go @@ -7,9 +7,9 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/protobuf/types/known/durationpb" io "io" math "math" @@ -195,7 +195,7 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.QuotaDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.QuotaDuration):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.QuotaDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.QuotaDuration):]) if err1 != nil { return 0, err1 } @@ -255,7 +255,7 @@ func (m *Params) Size() (n int) { n += 1 + l + sovQuota(uint64(l)) l = m.TokenQuota.Size() n += 1 + l + sovQuota(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.QuotaDuration) + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.QuotaDuration) n += 1 + l + sovQuota(uint64(l)) return n } @@ -411,7 +411,7 @@ func (m *Params) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.QuotaDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.QuotaDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/uibc/quota/ibc_module.go b/x/uibc/quota/ibc_module.go index f68620f9f9..5edea4eaec 100644 --- a/x/uibc/quota/ibc_module.go +++ b/x/uibc/quota/ibc_module.go @@ -5,13 +5,14 @@ import ( "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" - "github.com/cosmos/ibc-go/v6/modules/core/exported" "github.com/umee-network/umee/v6/util/sdkutil" "github.com/umee-network/umee/v6/x/uibc" diff --git a/x/uibc/quota/ics4_wrapper.go b/x/uibc/quota/ics4_wrapper.go index dfb01c7397..f87649faa6 100644 --- a/x/uibc/quota/ics4_wrapper.go +++ b/x/uibc/quota/ics4_wrapper.go @@ -2,11 +2,12 @@ package quota import ( "cosmossdk.io/errors" + ics20types "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - ics20types "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" ibcutil "github.com/umee-network/umee/v6/util/ibc" "github.com/umee-network/umee/v6/x/uibc/quota/keeper" diff --git a/x/uibc/quota/ics4_wrapper_test.go b/x/uibc/quota/ics4_wrapper_test.go index 5665145166..141f85a16e 100644 --- a/x/uibc/quota/ics4_wrapper_test.go +++ b/x/uibc/quota/ics4_wrapper_test.go @@ -9,10 +9,10 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - ibctransfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - ics20types "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types" - porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ics20types "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" "github.com/golang/mock/gomock" "github.com/umee-network/umee/v6/tests/tsdk" diff --git a/x/uibc/quota/keeper/intest/msg_server_test.go b/x/uibc/quota/keeper/intest/msg_server_test.go index 5a044d66c8..a652a4f598 100644 --- a/x/uibc/quota/keeper/intest/msg_server_test.go +++ b/x/uibc/quota/keeper/intest/msg_server_test.go @@ -30,7 +30,8 @@ func TestMsgServer_GovUpdateQuota(t *testing.T) { Total: sdk.NewDec(100), }, errMsg: "total quota must be greater than or equal to per_denom quota", - }, { + }, + { name: "invalid quota in msg", msg: uibc.MsgGovUpdateQuota{ Description: "", diff --git a/x/uibc/quota/keeper/intest/suite_test.go b/x/uibc/quota/keeper/intest/suite_test.go index 69ceaa422d..a9612ac3d1 100644 --- a/x/uibc/quota/keeper/intest/suite_test.go +++ b/x/uibc/quota/keeper/intest/suite_test.go @@ -4,18 +4,20 @@ import ( "fmt" "testing" - "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/simapp" storetypes "github.com/cosmos/cosmos-sdk/store/types" + + "github.com/cometbft/cometbft/crypto/secp256k1" + tmrand "github.com/cometbft/cometbft/libs/rand" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "gotest.tools/v3/assert" + + "github.com/cosmos/cosmos-sdk/baseapp" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/cosmos-sdk/x/staking/teststaking" - "github.com/tendermint/tendermint/crypto/secp256k1" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "gotest.tools/v3/assert" + "github.com/cosmos/cosmos-sdk/x/staking/testutil" umeeapp "github.com/umee-network/umee/v6/app" appparams "github.com/umee-network/umee/v6/app/params" @@ -33,7 +35,7 @@ const ( // Test addresses var ( - valPubKeys = simapp.CreateTestPubKeys(2) + valPubKeys = simtestutil.CreateTestPubKeys(2) valPubKey = valPubKeys[0] pubKey = secp256k1.GenPrivKey().PubKey() @@ -71,7 +73,7 @@ func initTestSuite(t *testing.T) *IntTestSuite { queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) uibc.RegisterQueryServer(queryHelper, keeper.NewQuerier(app.UIbcQuotaKeeperB)) - sh := teststaking.NewHelper(t, ctx, *app.StakingKeeper) + sh := testutil.NewHelper(t, ctx, app.StakingKeeper) sh.Denom = bondDenom amt := sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction) @@ -86,7 +88,7 @@ func initTestSuite(t *testing.T) *IntTestSuite { sh.CreateValidator(valAddr, valPubKey, amt, true) sh.CreateValidator(valAddr2, valPubKey2, amt, true) - staking.EndBlocker(ctx, *app.StakingKeeper) + staking.EndBlocker(ctx, app.StakingKeeper) s.app = app s.ctx = ctx diff --git a/x/uibc/quota/keeper/params.go b/x/uibc/quota/keeper/params.go index 33b89e925f..e3f3e44516 100644 --- a/x/uibc/quota/keeper/params.go +++ b/x/uibc/quota/keeper/params.go @@ -32,8 +32,8 @@ func (k Keeper) GetParams() (params uibc.Params) { // UpdateQuotaParams update the ibc-transfer quota params for ibc denoms func (k Keeper) UpdateQuotaParams(totalQuota, quotaPerDenom sdk.Dec, quotaDuration time.Duration, - byEmergencyGroup bool) error { - + byEmergencyGroup bool, +) error { pOld := k.GetParams() pNew := pOld pNew.TotalQuota = totalQuota diff --git a/x/uibc/quota/keeper/quota.go b/x/uibc/quota/keeper/quota.go index 2befc6ebed..ce46fd4fc7 100644 --- a/x/uibc/quota/keeper/quota.go +++ b/x/uibc/quota/keeper/quota.go @@ -6,9 +6,9 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types" - channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" - "github.com/cosmos/ibc-go/v6/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/umee-network/umee/v6/util" "github.com/umee-network/umee/v6/util/coin" diff --git a/x/uibc/tx.pb.go b/x/uibc/tx.pb.go index 7b8c5be8eb..c1fe90f60c 100644 --- a/x/uibc/tx.pb.go +++ b/x/uibc/tx.pb.go @@ -9,10 +9,10 @@ import ( _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/gogo/protobuf/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" - github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -406,7 +406,7 @@ func (m *MsgGovUpdateQuota) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.QuotaDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.QuotaDuration):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.QuotaDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.QuotaDuration):]) if err1 != nil { return 0, err1 } @@ -568,7 +568,7 @@ func (m *MsgGovUpdateQuota) Size() (n int) { n += 1 + l + sovTx(uint64(l)) l = m.PerDenom.Size() n += 1 + l + sovTx(uint64(l)) - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.QuotaDuration) + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.QuotaDuration) n += 1 + l + sovTx(uint64(l)) return n } @@ -807,7 +807,7 @@ func (m *MsgGovUpdateQuota) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.QuotaDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.QuotaDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex