diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 37dc4e6cf..5a4c13764 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -60,7 +60,7 @@ jobs: flags: integration_tests - name: Tar debug files if: failure() - run: tar cfz debug_files.tar.gz -C "$TMPDIR/pytest-of-runner" . + run: tar cfz debug_files.tar.gz -C "${TMPDIR-/tmp}/pytest-of-runner" . - uses: actions/upload-artifact@v2 if: failure() with: @@ -119,7 +119,7 @@ jobs: flags: integration_tests_upgrade - name: Tar debug files if: failure() - run: tar cfz debug_files_upgrade.tar.gz -C /tmp/pytest-of-runner . + run: tar cfz debug_files_upgrade.tar.gz -C ${TMPDIR-/tmp}/pytest-of-runner . - uses: actions/upload-artifact@v2 if: failure() with: @@ -154,7 +154,7 @@ jobs: flags: integration_tests_ledger - name: Tar debug files if: failure() - run: tar cfz debug_files_ledger.tar.gz -C /tmp/pytest-of-runner . + run: tar cfz debug_files_ledger.tar.gz -C ${TMPDIR-/tmp}/pytest-of-runner . - uses: actions/upload-artifact@v2 if: failure() with: @@ -189,7 +189,7 @@ jobs: flags: integration_tests_solomachine - name: Tar debug files if: failure() - run: tar cfz debug_files_solomachine.tar.gz -C /tmp/pytest-of-runner . + run: tar cfz debug_files_solomachine.tar.gz -C ${TMPDIR-/tmp}/pytest-of-runner . - uses: actions/upload-artifact@v2 if: failure() with: @@ -224,7 +224,7 @@ jobs: flags: integration_tests_slow - name: Tar debug files if: failure() - run: tar cfz debug_files_slow.tar.gz -C /tmp/pytest-of-runner . + run: tar cfz debug_files_slow.tar.gz -C ${TMPDIR-/tmp}/pytest-of-runner . - uses: actions/upload-artifact@v2 if: failure() with: @@ -259,7 +259,7 @@ jobs: flags: integration_tests_ibc - name: Tar debug files if: failure() - run: tar cfz debug_files_ibc.tar.gz -C /tmp/pytest-of-runner . + run: tar cfz debug_files_ibc.tar.gz -C ${TMPDIR-/tmp}/pytest-of-runner . - uses: actions/upload-artifact@v2 if: failure() with: @@ -294,7 +294,7 @@ jobs: flags: integration_tests_byzantine - name: Tar debug files if: failure() - run: tar cfz debug_files_byzantine.tar.gz -C /tmp/pytest-of-runner . + run: tar cfz debug_files_byzantine.tar.gz -C ${TMPDIR-/tmp}/pytest-of-runner . - uses: actions/upload-artifact@v2 if: failure() with: @@ -329,7 +329,7 @@ jobs: flags: integration_tests_gov - name: Tar debug files if: failure() - run: tar cfz debug_files_gov.tar.gz -C /tmp/pytest-of-runner . + run: tar cfz debug_files_gov.tar.gz -C ${TMPDIR-/tmp}/pytest-of-runner . - uses: actions/upload-artifact@v2 if: failure() with: @@ -365,7 +365,7 @@ jobs: flags: integration_tests_grpc - name: Tar debug files if: failure() - run: tar cfz debug_files_grpc.tar.gz -C /tmp/pytest-of-runner . + run: tar cfz debug_files_grpc.tar.gz -C ${TMPDIR-/tmp}/pytest-of-runner . - uses: actions/upload-artifact@v2 if: failure() with: diff --git a/CHANGELOG.md b/CHANGELOG.md index e1a367286..2726f67ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## UNRELEASED + +- [#1023](https://github.com/crypto-org-chain/chain-main/pull/1023) Integrate sdk 0.47 + *Dec 6, 2023* ## v4.2.8 diff --git a/Makefile b/Makefile index 548b44461..cea3d6d1e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PACKAGE_NAME:=github.com/crypto-org-chain/chain-main VERSION := $(shell echo $(shell git describe --tags 2>/dev/null ) | sed 's/^v//') -TMVERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::') +TMVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::') COMMIT := $(shell git log -1 --format='%H') NETWORK ?= mainnet COVERAGE ?= coverage.txt diff --git a/MakefileDoc b/MakefileDoc index 0d723baf5..41a8572ee 100644 --- a/MakefileDoc +++ b/MakefileDoc @@ -3,13 +3,12 @@ ### Documentation ### ############################################################################### -include third_party/cosmos-sdk/contrib/devtools/Makefile +# include third_party/cosmos-sdk/contrib/devtools/Makefile -containerProtoVer=v0.7 -containerProtoImage=tendermintdev/sdk-proto-gen:$(containerProtoVer) -containerProtoGen=cosmos-sdk-proto-gen-$(containerProtoVer) -containerProtoGenSwagger=cosmos-sdk-proto-gen-swagger-$(containerProtoVer) -containerProtoFmt=cosmos-sdk-proto-fmt-$(containerProtoVer) +DOCKER := $(shell which docker) +protoVer=0.11.6 +protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) +protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) BINDIR ?= ~/go/bin all: update-swagger-docs @@ -27,13 +26,15 @@ proto-swagger-gen: proto-gen: @echo "Generating Protobuf files" - @if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then docker start -a $(containerProtoGen); else docker run --name $(containerProtoGen) -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \ - sh ./scripts/protocgen.sh; fi + $(protoImage) sh ./scripts/protocgen.sh + +proto-lint: + @echo "Linting Protobuf files" + @$(protoImage) buf lint --error-format=json proto-format: @echo "Formatting Protobuf files" - @if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoFmt}$$"; then docker start -a $(containerProtoFmt); else docker run --name $(containerProtoFmt) -v $(CURDIR):/workspace --workdir /workspace tendermintdev/docker-build-proto \ - find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \; ; fi + @$(protoImage) find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \; proto-all: proto-format proto-gen proto-swagger-gen diff --git a/app/ante.go b/app/ante.go index bf1849a8e..42734b0fe 100644 --- a/app/ante.go +++ b/app/ante.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" - ibcante "github.com/cosmos/ibc-go/v5/modules/core/ante" - "github.com/cosmos/ibc-go/v5/modules/core/keeper" + ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" + "github.com/cosmos/ibc-go/v7/modules/core/keeper" nfttypes "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" ) diff --git a/app/app.go b/app/app.go index 54ad51f85..e797ada20 100644 --- a/app/app.go +++ b/app/app.go @@ -1,7 +1,7 @@ package app import ( - "errors" + stderrors "errors" "fmt" "io" "io/fs" @@ -13,22 +13,26 @@ import ( "github.com/spf13/cast" "golang.org/x/exp/slices" - // tendermint imports + // cometbft imports - abci "github.com/tendermint/tendermint/abci/types" - tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - tmos "github.com/tendermint/tendermint/libs/os" - dbm "github.com/tendermint/tm-db" + dbm "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + tmjson "github.com/cometbft/cometbft/libs/json" + "github.com/cometbft/cometbft/libs/log" + tmos "github.com/cometbft/cometbft/libs/os" // cosmos-sdk imports + autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" + reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/runtime" + runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" @@ -37,6 +41,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" + mempool "github.com/cosmos/cosmos-sdk/types/mempool" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/auth" @@ -57,8 +62,9 @@ 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" + consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/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" @@ -99,27 +105,29 @@ import ( // ibc-go imports - ica "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts" - icacontroller "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller" - icacontrollerkeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/keeper" - icacontrollertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types" - icahost "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host" - icahostkeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/keeper" - icahosttypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types" - ibcfee "github.com/cosmos/ibc-go/v5/modules/apps/29-fee" - ibcfeekeeper "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/keeper" - ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types" - transfer "github.com/cosmos/ibc-go/v5/modules/apps/transfer" - ibctransferkeeper "github.com/cosmos/ibc-go/v5/modules/apps/transfer/keeper" - ibctransfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" - ibc "github.com/cosmos/ibc-go/v5/modules/core" - ibcclient "github.com/cosmos/ibc-go/v5/modules/core/02-client" - ibcclientclient "github.com/cosmos/ibc-go/v5/modules/core/02-client/client" - ibcclienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" - porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" - ibchost "github.com/cosmos/ibc-go/v5/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper" + ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" + icacontroller "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller" + icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + 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" + ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" + ibcfeekeeper "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" + transfer "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" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" + ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" // chain-main imports @@ -142,6 +150,7 @@ import ( "github.com/crypto-org-chain/chain-main/v4/app/docs" memiavlstore "github.com/crypto-org-chain/cronos/store" + memiavlrootmulti "github.com/crypto-org-chain/cronos/store/rootmulti" ) // FIXME remove this line, dummy @@ -156,7 +165,7 @@ var ( // and genesis verification. ModuleBasics = module.NewBasicManager( auth.AppModuleBasic{}, - genutil.AppModuleBasic{}, + genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator), bank.AppModuleBasic{}, capability.AppModuleBasic{}, staking.AppModuleBasic{}, @@ -164,7 +173,6 @@ var ( distr.AppModuleBasic{}, gov.NewAppModuleBasic([]govclient.ProposalHandler{ paramsclient.ProposalHandler, - distrclient.ProposalHandler, upgradeclient.LegacyProposalHandler, upgradeclient.LegacyCancelProposalHandler, ibcclientclient.UpdateClientProposalHandler, @@ -174,6 +182,8 @@ var ( slashing.AppModuleBasic{}, feegrantmodule.AppModuleBasic{}, ibc.AppModuleBasic{}, + ibctm.AppModuleBasic{}, + solomachine.AppModuleBasic{}, upgrade.AppModuleBasic{}, evidence.AppModuleBasic{}, transfer.AppModuleBasic{}, @@ -204,7 +214,7 @@ var ( ) var ( - _ App = (*ChainApp)(nil) + _ runtime.AppI = (*ChainApp)(nil) _ servertypes.Application = (*ChainApp)(nil) ) @@ -226,30 +236,31 @@ type ChainApp struct { memKeys map[string]*storetypes.MemoryStoreKey // keepers - AccountKeeper authkeeper.AccountKeeper - BankKeeper bankkeeper.Keeper - CapabilityKeeper *capabilitykeeper.Keeper - StakingKeeper stakingkeeper.Keeper - SlashingKeeper slashingkeeper.Keeper - MintKeeper mintkeeper.Keeper - DistrKeeper distrkeeper.Keeper - GovKeeper govkeeper.Keeper - UpgradeKeeper upgradekeeper.Keeper - ParamsKeeper paramskeeper.Keeper - IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly - IBCFeeKeeper ibcfeekeeper.Keeper - ICAControllerKeeper icacontrollerkeeper.Keeper - ICAHostKeeper icahostkeeper.Keeper - ICAAuthKeeper icaauthmodulekeeper.Keeper - AuthzKeeper authzkeeper.Keeper - EvidenceKeeper evidencekeeper.Keeper - FeeGrantKeeper feegrantkeeper.Keeper - GroupKeeper groupkeeper.Keeper - TransferKeeper ibctransferkeeper.Keeper - NFTTransferKeeper nfttransferkeeper.Keeper - chainmainKeeper chainmainkeeper.Keeper - SupplyKeeper supplykeeper.Keeper - NFTKeeper nftkeeper.Keeper + AccountKeeper authkeeper.AccountKeeper + BankKeeper bankkeeper.Keeper + CapabilityKeeper *capabilitykeeper.Keeper + StakingKeeper stakingkeeper.Keeper + SlashingKeeper slashingkeeper.Keeper + MintKeeper mintkeeper.Keeper + DistrKeeper distrkeeper.Keeper + GovKeeper govkeeper.Keeper + UpgradeKeeper *upgradekeeper.Keeper + ParamsKeeper paramskeeper.Keeper + IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly + IBCFeeKeeper ibcfeekeeper.Keeper + ICAControllerKeeper icacontrollerkeeper.Keeper + ICAHostKeeper icahostkeeper.Keeper + ICAAuthKeeper icaauthmodulekeeper.Keeper + AuthzKeeper authzkeeper.Keeper + EvidenceKeeper evidencekeeper.Keeper + FeeGrantKeeper feegrantkeeper.Keeper + ConsensusParamsKeeper consensusparamkeeper.Keeper + GroupKeeper groupkeeper.Keeper + TransferKeeper ibctransferkeeper.Keeper + NFTTransferKeeper nfttransferkeeper.Keeper + chainmainKeeper chainmainkeeper.Keeper + SupplyKeeper supplykeeper.Keeper + NFTKeeper nftkeeper.Keeper // make scoped keepers public for test purposes ScopedIBCKeeper capabilitykeeper.ScopedKeeper @@ -301,7 +312,16 @@ func New( legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry - baseAppOptions = memiavlstore.SetupMemIAVL(logger, homePath, appOpts, true, baseAppOptions) + baseAppOptions = memiavlstore.SetupMemIAVL(logger, homePath, appOpts, false, false, baseAppOptions) + // NOTE we use custom transaction decoder that supports the sdk.Tx interface instead of sdk.StdTx + // Setup Mempool and Proposal Handlers + baseAppOptions = append(baseAppOptions, func(app *baseapp.BaseApp) { + mempool := mempool.NoOpMempool{} + app.SetMempool(mempool) + handler := baseapp.NewDefaultProposalHandler(mempool, app) + app.SetPrepareProposal(handler.PrepareProposalHandler()) + app.SetProcessProposal(handler.ProcessProposalHandler()) + }) bApp := baseapp.NewBaseApp(appName, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version) @@ -311,7 +331,7 @@ func New( // 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 { + if _, _, err := streaming.LoadStreamingServices(bApp, appOpts, appCodec, logger, keys); err != nil { tmos.Exit(err.Error()) } @@ -341,12 +361,16 @@ func New( app.ParamsKeeper = initParamsKeeper(appCodec, legacyAmino, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey]) + // get authority address + authAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String() + // set the BaseApp's parameter store - bApp.SetParamStore(app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())) + app.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], authAddr) + bApp.SetParamStore(&app.ConsensusParamsKeeper) // add capability keeper and ScopeToModule for ibc module app.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey]) - scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) + scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName) scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) scopedNFTTransferKeeper := app.CapabilityKeeper.ScopeToModule(nfttransfertypes.ModuleName) scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) @@ -356,33 +380,34 @@ func New( // add keepers app.AccountKeeper = authkeeper.NewAccountKeeper( - appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), + appCodec, keys[authtypes.StoreKey], authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), authAddr, ) app.BankKeeper = bankkeeper.NewBaseKeeper( - appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(), + appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.ModuleAccountAddrs(), authAddr, ) stakingKeeper := stakingkeeper.NewKeeper( - appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName), + appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, authAddr, ) app.MintKeeper = mintkeeper.NewKeeper( - appCodec, keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), &stakingKeeper, - app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName, + appCodec, keys[minttypes.StoreKey], stakingKeeper, + app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName, authAddr, ) app.DistrKeeper = distrkeeper.NewKeeper( - appCodec, keys[distrtypes.StoreKey], app.GetSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper, - &stakingKeeper, authtypes.FeeCollectorName, + appCodec, keys[distrtypes.StoreKey], app.AccountKeeper, app.BankKeeper, + stakingKeeper, authtypes.FeeCollectorName, authAddr, ) app.SlashingKeeper = slashingkeeper.NewKeeper( - appCodec, keys[slashingtypes.StoreKey], &stakingKeeper, app.GetSubspace(slashingtypes.ModuleName), + appCodec, app.LegacyAmino(), keys[slashingtypes.StoreKey], stakingKeeper, authAddr, ) app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper) - app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp, authtypes.NewModuleAddress(govtypes.ModuleName).String()) + app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp, authAddr) // register the staking hooks // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks - app.StakingKeeper = *stakingKeeper.SetHooks( + stakingKeeper.SetHooks( stakingtypes.NewMultiStakingHooks(app.DistrKeeper.Hooks(), app.SlashingKeeper.Hooks()), ) + app.StakingKeeper = *stakingKeeper app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.BaseApp.MsgServiceRouter(), app.AccountKeeper) @@ -399,14 +424,13 @@ func New( // Create IBC Keeper app.IBCKeeper = ibckeeper.NewKeeper( - appCodec, keys[ibchost.StoreKey], app.GetSubspace(ibchost.ModuleName), app.StakingKeeper, app.UpgradeKeeper, scopedIBCKeeper, + appCodec, keys[ibcexported.StoreKey], app.GetSubspace(ibcexported.ModuleName), app.StakingKeeper, app.UpgradeKeeper, scopedIBCKeeper, ) // register the proposal types govRouter := govv1beta1.NewRouter() 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)) @@ -416,9 +440,10 @@ func New( govConfig.MaxMetadataLen = 10000 */ govKeeper := govkeeper.NewKeeper( - appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper, - &stakingKeeper, govRouter, app.MsgServiceRouter(), govConfig, + appCodec, keys[govtypes.StoreKey], app.AccountKeeper, app.BankKeeper, + stakingKeeper, app.MsgServiceRouter(), govConfig, authAddr, ) + govKeeper.SetLegacyRouter(govRouter) app.GovKeeper = *govKeeper.SetHooks( govtypes.NewMultiGovHooks( // register the governance hooks @@ -427,7 +452,7 @@ func New( // IBC Fee Module keeper app.IBCFeeKeeper = ibcfeekeeper.NewKeeper( - appCodec, keys[ibcfeetypes.StoreKey], app.GetSubspace(ibcfeetypes.ModuleName), + appCodec, keys[ibcfeetypes.StoreKey], app.IBCKeeper.ChannelKeeper, // more middlewares can be added in future app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, app.AccountKeeper, app.BankKeeper, @@ -514,16 +539,16 @@ func New( app.AccountKeeper, app.StakingKeeper, app.BaseApp.DeliverTx, encodingConfig.TxConfig, ), - auth.NewAppModule(appCodec, app.AccountKeeper, nil), + auth.NewAppModule(appCodec, app.AccountKeeper, nil, app.GetSubspace(authtypes.ModuleName)), vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)), + mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil, app.GetSubspace(minttypes.ModuleName)), + slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)), + distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), + staking.NewAppModule(appCodec, &app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), upgrade.NewAppModule(app.UpgradeKeeper), evidence.NewAppModule(app.EvidenceKeeper), ibc.NewAppModule(app.IBCKeeper), @@ -539,6 +564,9 @@ func New( supply.NewAppModule(app.SupplyKeeper), nft.NewAppModule(appCodec, app.NFTKeeper, app.AccountKeeper, app.BankKeeper), ) + app.mm.SetOrderPreBlockers( + upgradetypes.ModuleName, + ) // During begin block slashing happens after distr.BeginBlocker so that // there is nothing left over in the validator fee pool, so as to keep the @@ -552,7 +580,7 @@ func New( slashingtypes.ModuleName, evidencetypes.ModuleName, stakingtypes.ModuleName, - ibchost.ModuleName, + ibcexported.ModuleName, ibctransfertypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, @@ -570,11 +598,12 @@ func New( nfttypes.ModuleName, nfttransfertypes.ModuleName, supplytypes.ModuleName, + consensusparamtypes.ModuleName, ) app.mm.SetOrderEndBlockers( govtypes.ModuleName, stakingtypes.ModuleName, - ibchost.ModuleName, + ibcexported.ModuleName, ibctransfertypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, @@ -597,6 +626,7 @@ func New( nfttypes.ModuleName, nfttransfertypes.ModuleName, supplytypes.ModuleName, + consensusparamtypes.ModuleName, ) // NOTE: The genutils module must occur after staking so that pools are @@ -613,7 +643,7 @@ func New( slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, - ibchost.ModuleName, + ibcexported.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, @@ -630,9 +660,9 @@ func New( paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, + consensusparamtypes.ModuleName, ) - app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino) app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter()) app.mm.RegisterServices(app.configurator) @@ -645,9 +675,16 @@ func New( // transactions overrideModules := map[string]module.AppModuleSimulation{ // Use custom RandomGenesisAccounts so that auth module could create random EthAccounts in genesis state when genesis.json not specified - authtypes.ModuleName: auth.NewAppModule(app.appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), + authtypes.ModuleName: auth.NewAppModule(app.appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)), } app.sm = module.NewSimulationManagerFromAppModules(app.mm.Modules, overrideModules) + autocliv1.RegisterQueryServer(app.GRPCQueryRouter(), runtimeservices.NewAutoCLIQueryService(app.mm.Modules)) + + reflectionSvc, err := runtimeservices.NewReflectionService() + if err != nil { + panic(err) + } + reflectionv1.RegisterReflectionServiceServer(app.GRPCQueryRouter(), reflectionSvc) app.sm.RegisterStoreDecoders() @@ -658,6 +695,7 @@ func New( // initialize BaseApp app.SetInitChainer(app.InitChainer) + app.SetPreBlocker(app.PreBlocker) app.SetBeginBlocker(app.BeginBlocker) anteHandler, err := NewAnteHandler( HandlerOptions{ @@ -692,7 +730,7 @@ func New( // upgrade. app.setPostHandler() - app.RegisterUpgradeHandlers() + app.RegisterUpgradeHandlers(app.appCodec, app.IBCKeeper.ClientKeeper) if loadLatest { if err := app.LoadLatestVersion(); err != nil { @@ -730,6 +768,11 @@ func (app *ChainApp) setPostHandler() { // Name returns the name of the App func (app *ChainApp) Name() string { return app.BaseApp.Name() } +// PreBlocker updates every pre begin block +func (app *ChainApp) PreBlocker(ctx sdk.Context, req abci.RequestBeginBlock) (sdk.ResponsePreBlock, error) { + return app.mm.PreBlock(ctx, req) +} + // BeginBlocker application updates every begin block func (app *ChainApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { // backport: https://github.com/cosmos/cosmos-sdk/pull/16639 @@ -845,7 +888,7 @@ func (app *ChainApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIC clientCtx := apiSvr.ClientCtx // Register new tx routes from grpc-gateway. authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) - // Register new tendermint queries routes from grpc-gateway. + // Register new cometbft queries routes from grpc-gateway. tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter) // Register node gRPC service for grpc-gateway. @@ -905,9 +948,9 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino 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(ibctransfertypes.ModuleName) - paramsKeeper.Subspace(ibchost.ModuleName) + paramsKeeper.Subspace(ibcexported.ModuleName) paramsKeeper.Subspace(icacontrollertypes.SubModuleName) paramsKeeper.Subspace(icahosttypes.SubModuleName) paramsKeeper.Subspace(icaauthmoduletypes.ModuleName) @@ -930,7 +973,7 @@ func StoreKeys() ( slashingtypes.StoreKey, govtypes.StoreKey, paramstypes.StoreKey, - ibchost.StoreKey, + ibcexported.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, @@ -946,6 +989,7 @@ func StoreKeys() ( chainmaintypes.StoreKey, supplytypes.StoreKey, nfttypes.StoreKey, + consensusparamtypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -956,10 +1000,11 @@ func StoreKeys() ( // Close will be called in graceful shutdown in start cmd func (app *ChainApp) Close() error { - var err error - if cms, ok := app.CommitMultiStore().(io.Closer); ok { - err = cms.Close() + err := app.BaseApp.Close() + + if cms, ok := app.CommitMultiStore().(*memiavlrootmulti.Store); ok { + return stderrors.Join(err, cms.Close()) } - return errors.Join(err, app.BaseApp.Close()) + return err } diff --git a/app/export.go b/app/export.go index 62769c347..6f66980a6 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" sdk "github.com/cosmos/cosmos-sdk/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" @@ -18,7 +18,7 @@ import ( // ExportAppStateAndValidators exports the state of the application for a genesis // file. func (app *ChainApp) ExportAppStateAndValidators( - forZeroHeight bool, jailAllowedAddrs []string, + 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()}) @@ -32,13 +32,13 @@ func (app *ChainApp) 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) if err != nil { return servertypes.ExportedApp{}, err } diff --git a/app/export_test.go b/app/export_test.go index 5198f7146..e76d3c91b 100644 --- a/app/export_test.go +++ b/app/export_test.go @@ -24,7 +24,7 @@ func TestExportAppStateAndValidators(t *testing.T) { t.Run(tc.name, func(t *testing.T) { app := Setup(t, false) app.Commit() - _, err := app.ExportAppStateAndValidators(tc.forZeroHeight, []string{}) + _, err := app.ExportAppStateAndValidators(tc.forZeroHeight, []string{}, []string{}) require.NoError(t, err, "ExportAppStateAndValidators should not have an error") }) } diff --git a/app/sim_test.go b/app/sim_test.go index 7279816a3..7357946e3 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -9,17 +9,17 @@ import ( "strings" "testing" + 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" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + "cosmossdk.io/simapp" "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/cosmos/cosmos-sdk/simapp" - "github.com/cosmos/cosmos-sdk/simapp/helpers" "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" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -32,6 +32,7 @@ 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" nfttypes "github.com/crypto-org-chain/chain-main/v4/x/nft/types" @@ -39,7 +40,7 @@ import ( // Get flags every time the simulator is run func init() { - simapp.GetSimulatorFlags() + simcli.GetSimulatorFlags() } type StoreKeysPrefixes struct { @@ -61,20 +62,21 @@ func interBlockCacheOpt() func(*baseapp.BaseApp) { } func TestFullAppSimulation(t *testing.T) { - config, db, dir, logger, skip, err := simapp.SetupSimulation("leveldb-app-sim", "Simulation") + config := simcli.NewConfigFromFlags() + config.ChainID = SimAppChainID + + db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim", "Simulation", simcli.FlagVerboseValue, simcli.FlagEnabledValue) if skip { t.Skip("skipping application simulation") } require.NoError(t, err, "simulation setup failed") - config.ChainID = helpers.SimAppChainID - defer func() { db.Close() require.NoError(t, os.RemoveAll(dir)) }() app := New(logger, db, nil, true, map[int64]bool{}, - dir, simapp.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt) + dir, simcli.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "chain-maind", app.Name()) // run randomized simulation @@ -84,38 +86,39 @@ func TestFullAppSimulation(t *testing.T) { app.BaseApp, AppStateFn(app.AppCodec(), app.SimulationManager()), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) + err = simtestutil.CheckExportSimulation(app, config, simParams) require.NoError(t, err) require.NoError(t, simErr) if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } } func TestAppImportExport(t *testing.T) { - config, db, dir, logger, skip, err := simapp.SetupSimulation("leveldb-app-sim", "Simulation") + config := simcli.NewConfigFromFlags() + config.ChainID = SimAppChainID + + db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim", "Simulation", simcli.FlagVerboseValue, simcli.FlagEnabledValue) if skip { t.Skip("skipping application import/export simulation") } require.NoError(t, err, "simulation setup failed") - config.ChainID = helpers.SimAppChainID - defer func() { db.Close() require.NoError(t, os.RemoveAll(dir)) }() app := New(logger, db, nil, true, map[int64]bool{}, - dir, simapp.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt) + dir, simcli.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "chain-maind", app.Name()) // Run randomized simulation @@ -125,29 +128,28 @@ func TestAppImportExport(t *testing.T) { app.BaseApp, AppStateFn(app.AppCodec(), app.SimulationManager()), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) + err = simtestutil.CheckExportSimulation(app, config, simParams) require.NoError(t, err) require.NoError(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{}) require.NoError(t, err) fmt.Printf("importing genesis...\n") - - _, newDB, newDir, _, _, err := simapp.SetupSimulation("leveldb-app-sim-2", "Simulation-2") + newDB, newDir, _, _, err := simtestutil.SetupSimulation(config, "leveldb-app-sim-2", "Simulation-2", simcli.FlagVerboseValue, simcli.FlagEnabledValue) require.NoError(t, err, "simulation setup failed") defer func() { @@ -156,7 +158,7 @@ func TestAppImportExport(t *testing.T) { }() newApp := New(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, - newDir, simapp.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt) + newDir, simcli.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "chain-maind", newApp.Name()) var genesisState GenesisState @@ -174,7 +176,7 @@ func TestAppImportExport(t *testing.T) { } }() - header := tmproto.Header{Height: app.LastBlockHeight(), ChainID: helpers.SimAppChainID} + header := tmproto.Header{Height: app.LastBlockHeight(), ChainID: SimAppChainID} ctxA := app.NewContext(true, header) ctxB := newApp.NewContext(true, header) newApp.mm.InitGenesis(ctxB, app.AppCodec(), genesisState) @@ -188,7 +190,7 @@ func TestAppImportExport(t *testing.T) { app.keys[stakingtypes.StoreKey], newApp.keys[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.keys[slashingtypes.StoreKey], newApp.keys[slashingtypes.StoreKey], [][]byte{}}, @@ -211,18 +213,21 @@ func TestAppImportExport(t *testing.T) { require.Equal(t, len(failedKVAs), len(failedKVBs), "unequal sets of key-values to compare") fmt.Printf("compared %d different key/value pairs between %s and %s\n", len(failedKVAs), skp.A, skp.B) - require.Equal(t, 0, len(failedKVAs), simapp.GetSimulationLog(skp.A.Name(), app.SimulationManager().StoreDecoders, failedKVAs, failedKVBs)) + require.Equal(t, 0, len(failedKVAs), simtestutil.GetSimulationLog(skp.A.Name(), app.SimulationManager().StoreDecoders, failedKVAs, failedKVBs)) } } func TestAppSimulationAfterImport(t *testing.T) { - config, db, dir, logger, skip, err := simapp.SetupSimulation("leveldb-app-sim", "Simulation") + config := simcli.NewConfigFromFlags() + config.ChainID = SimAppChainID + + db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim", "Simulation", simcli.FlagVerboseValue, simcli.FlagEnabledValue) if skip { t.Skip("skipping application simulation after import") } require.NoError(t, err, "simulation setup failed") - config.ChainID = helpers.SimAppChainID + config.ChainID = SimAppChainID defer func() { db.Close() @@ -230,7 +235,7 @@ func TestAppSimulationAfterImport(t *testing.T) { }() app := New(logger, db, nil, true, map[int64]bool{}, - dir, simapp.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt) + dir, simcli.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "chain-maind", app.Name()) // Run randomized simulation @@ -240,19 +245,19 @@ func TestAppSimulationAfterImport(t *testing.T) { app.BaseApp, AppStateFn(app.AppCodec(), app.SimulationManager()), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - err = simapp.CheckExportSimulation(app, config, simParams) + err = simtestutil.CheckExportSimulation(app, config, simParams) require.NoError(t, err) require.NoError(t, simErr) if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } if stopEarly { @@ -262,12 +267,11 @@ func TestAppSimulationAfterImport(t *testing.T) { fmt.Printf("exporting genesis...\n") - exported, err := app.ExportAppStateAndValidators(true, []string{}) + exported, err := app.ExportAppStateAndValidators(true, []string{}, []string{}) require.NoError(t, err) fmt.Printf("importing genesis...\n") - - _, newDB, newDir, _, _, err := simapp.SetupSimulation("leveldb-app-sim-2", "Simulation-2") + newDB, newDir, _, _, err := simtestutil.SetupSimulation(config, "leveldb-app-sim-2", "Simulation-2", simcli.FlagVerboseValue, simcli.FlagEnabledValue) require.NoError(t, err, "simulation setup failed") defer func() { @@ -276,11 +280,11 @@ func TestAppSimulationAfterImport(t *testing.T) { }() newApp := New(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, - newDir, simapp.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt) + newDir, simcli.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "chain-maind", newApp.Name()) newApp.InitChain(abci.RequestInitChain{ - ChainId: helpers.SimAppChainID, + ChainId: SimAppChainID, AppStateBytes: exported.AppState, }) @@ -290,7 +294,7 @@ func TestAppSimulationAfterImport(t *testing.T) { newApp.BaseApp, AppStateFn(app.AppCodec(), app.SimulationManager()), 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), app.ModuleAccountAddrs(), config, app.AppCodec(), @@ -301,16 +305,16 @@ func TestAppSimulationAfterImport(t *testing.T) { // TODO: Make another test for the fuzzer itself, which just has noOp txs // and doesn't depend on the application. func TestAppStateDeterminism(t *testing.T) { - if !simapp.FlagEnabledValue { + if !simcli.FlagEnabledValue { t.Skip("skipping application simulation") } - config := simapp.NewConfigFromFlags() + config := simcli.NewConfigFromFlags() config.InitialBlockHeight = 1 config.ExportParamsPath = "" config.OnOperation = false config.AllInvariants = false - config.ChainID = helpers.SimAppChainID + config.ChainID = SimAppChainID numSeeds := 3 numTimesToRunPerSeed := 5 @@ -322,7 +326,7 @@ func TestAppStateDeterminism(t *testing.T) { for j := 0; j < numTimesToRunPerSeed; j++ { var logger log.Logger - if simapp.FlagVerboseValue { + if simcli.FlagVerboseValue { logger = log.TestingLogger() } else { logger = log.NewNopLogger() @@ -330,7 +334,7 @@ func TestAppStateDeterminism(t *testing.T) { db := dbm.NewMemDB() app := New(logger, db, nil, true, map[int64]bool{}, - simapp.DefaultNodeHome, simapp.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, interBlockCacheOpt()) + simapp.DefaultNodeHome, simcli.FlagPeriodValue, MakeEncodingConfig(), EmptyAppOptions{}, interBlockCacheOpt(), baseapp.SetChainID(SimAppChainID)) fmt.Printf( "running non-determinism simulation; seed %d: %d/%d, attempt: %d/%d\n", @@ -343,7 +347,7 @@ func TestAppStateDeterminism(t *testing.T) { app.BaseApp, AppStateFn(app.AppCodec(), app.SimulationManager()), simtypes.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), @@ -351,7 +355,7 @@ func TestAppStateDeterminism(t *testing.T) { require.NoError(t, err) if config.Commit { - simapp.PrintStats(db) + simtestutil.PrintStats(db) } appHash := app.LastCommitID().Hash diff --git a/app/state.go b/app/state.go index 3e588a83e..879b1e9ed 100644 --- a/app/state.go +++ b/app/state.go @@ -4,7 +4,7 @@ package app import ( "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/simapp" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" ) @@ -13,5 +13,5 @@ import ( // It panics if the user provides files for both of them. // If a file is not given for the genesis or the sim params, it creates a randomized one. func AppStateFn(cdc codec.JSONCodec, simManager *module.SimulationManager) simtypes.AppStateFn { - return simapp.AppStateFnWithExtendedCb(cdc, simManager, NewDefaultGenesisState(cdc), nil) + return simtestutil.AppStateFnWithExtendedCb(cdc, simManager, NewDefaultGenesisState(cdc), nil) } diff --git a/app/test_helpers.go b/app/test_helpers.go index 024175b7d..120dc1e24 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -11,23 +11,23 @@ import ( "time" sdkmath "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" + tmtypes "github.com/cometbft/cometbft/types" "github.com/stretchr/testify/require" - 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" newsdkerrors "cosmossdk.io/errors" - bam "github.com/cosmos/cosmos-sdk/baseapp" + baseapp "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/simapp/helpers" "github.com/cosmos/cosmos-sdk/testutil/mock" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -36,10 +36,15 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) +const ( + SimAppChainID = "simulation_777-1" + TestAppChainID = "chainmain-1" +) + // DefaultConsensusParams defines the default Tendermint consensus params used in // ChainApp testing. -var DefaultConsensusParams = &abci.ConsensusParams{ - Block: &abci.BlockParams{ +var DefaultConsensusParams = &tmproto.ConsensusParams{ + Block: &tmproto.BlockParams{ MaxBytes: 200000, MaxGas: 2000000, }, @@ -58,7 +63,7 @@ var DefaultConsensusParams = &abci.ConsensusParams{ func setup(withGenesis bool, invCheckPeriod uint) (*ChainApp, GenesisState) { db := dbm.NewMemDB() encCdc := MakeEncodingConfig() - app := New(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, invCheckPeriod, encCdc, EmptyAppOptions{}) + app := New(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, invCheckPeriod, encCdc, EmptyAppOptions{}, baseapp.SetChainID(TestAppChainID)) if withGenesis { return app, NewDefaultGenesisState(encCdc.Marshaler) } @@ -141,7 +146,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs }) // update total supply - bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{}) + bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{}, []banktypes.SendEnabled{}) genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis) stateBytes, err := json.MarshalIndent(genesisState, "", " ") @@ -150,6 +155,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs // init chain will set the validator set and initialize the genesis accounts app.InitChain( abci.RequestInitChain{ + ChainId: TestAppChainID, Validators: []abci.ValidatorUpdate{}, ConsensusParams: DefaultConsensusParams, AppStateBytes: stateBytes, @@ -159,6 +165,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs // commit genesis changes app.Commit() app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ + ChainID: TestAppChainID, Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, ValidatorsHash: valSet.Hash(), @@ -180,7 +187,7 @@ func SetupWithGenesisAccounts(genAccs []authtypes.GenesisAccount, balances ...ba totalSupply = totalSupply.Add(b.Coins...) } - bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{}) + bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{}, []banktypes.SendEnabled{}) genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis) stateBytes, err := json.MarshalIndent(genesisState, "", " ") @@ -190,6 +197,7 @@ func SetupWithGenesisAccounts(genAccs []authtypes.GenesisAccount, balances ...ba app.InitChain( abci.RequestInitChain{ + ChainId: TestAppChainID, Validators: []abci.ValidatorUpdate{}, ConsensusParams: DefaultConsensusParams, AppStateBytes: stateBytes, @@ -197,7 +205,7 @@ func SetupWithGenesisAccounts(genAccs []authtypes.GenesisAccount, balances ...ba ) app.Commit() - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1}}) + app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ChainID: TestAppChainID, Height: app.LastBlockHeight() + 1}}) return app } @@ -329,16 +337,15 @@ func CheckBalance(t *testing.T, app *ChainApp, addr sdk.AccAddress, balances sdk // the parameter 'expPass' against the result. A corresponding result is // returned. func SignCheckDeliver( - t *testing.T, txCfg client.TxConfig, app *bam.BaseApp, header tmproto.Header, msgs []sdk.Msg, + t *testing.T, txCfg client.TxConfig, app *baseapp.BaseApp, header tmproto.Header, msgs []sdk.Msg, chainID string, accNums, accSeqs []uint64, expSimPass, expPass bool, priv ...cryptotypes.PrivKey, ) (sdk.GasInfo, *sdk.Result, error) { - tx, err := helpers.GenSignedMockTx( - //nolint: gosec - rand.New(rand.NewSource(time.Now().UnixNano())), + tx, err := simtestutil.GenSignedMockTx( + rand.New(rand.NewSource(time.Now().UnixNano())), //nolint: gosec txCfg, msgs, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 0)}, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, chainID, accNums, accSeqs, @@ -384,13 +391,12 @@ func GenSequenceOfTxs(txGen client.TxConfig, msgs []sdk.Msg, accNums []uint64, i txs := make([]sdk.Tx, numToGenerate) var err error for i := 0; i < numToGenerate; i++ { - txs[i], err = helpers.GenSignedMockTx( - //nolint: gosec - rand.New(rand.NewSource(time.Now().UnixNano())), + txs[i], err = simtestutil.GenSignedMockTx( + rand.New(rand.NewSource(time.Now().UnixNano())), //nolint: gosec txGen, msgs, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 0)}, - helpers.DefaultGenTxGas, + simtestutil.DefaultGenTxGas, "", accNums, initSeqNums, diff --git a/app/types.go b/app/types.go index a591bcc32..54dc63efc 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" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -33,7 +33,7 @@ type App interface { // Exports the state of the application for a genesis file. ExportAppStateAndValidators( - forZeroHeight bool, jailAllowedAddrs []string, + forZeroHeight bool, jailAllowedAddrs []string, modulesToExport []string, ) (servertypes.ExportedApp, error) // All the registered module account addreses. diff --git a/app/upgrades.go b/app/upgrades.go index 08ce8bc28..13fe13245 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -3,102 +3,92 @@ package app import ( "fmt" + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/cosmos-sdk/x/group" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + consensusparamtypes "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" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts" - icacontrollertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types" - icahosttypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types" - icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types" - ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types" + v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" + "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibctmmigrations "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint/migrations" icaauthmoduletypes "github.com/crypto-org-chain/chain-main/v4/x/icaauth/types" - nfttransfertypes "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" ) -func (app *ChainApp) RegisterUpgradeHandlers() { - planName := "v4.2.0" +func (app *ChainApp) RegisterUpgradeHandlers(cdc codec.BinaryCodec, clientKeeper clientkeeper.Keeper) { + planName := "v4.3.0" + // Set param key table for params module migration + for _, subspace := range app.ParamsKeeper.GetSubspaces() { + var keyTable paramstypes.KeyTable + switch subspace.Name() { + case minttypes.ModuleName: + keyTable = minttypes.ParamKeyTable() //nolint:staticcheck + case ibctransfertypes.ModuleName: + keyTable = ibctransfertypes.ParamKeyTable() + case icacontrollertypes.SubModuleName: + keyTable = icacontrollertypes.ParamKeyTable() + case stakingtypes.ModuleName: + keyTable = stakingtypes.ParamKeyTable() + case banktypes.ModuleName: + keyTable = banktypes.ParamKeyTable() //nolint:staticcheck + case distrtypes.ModuleName: + keyTable = distrtypes.ParamKeyTable() //nolint:staticcheck + case slashingtypes.ModuleName: + keyTable = slashingtypes.ParamKeyTable() //nolint:staticcheck + case govtypes.ModuleName: + keyTable = govv1.ParamKeyTable() //nolint:staticcheck + case icahosttypes.SubModuleName: + keyTable = icahosttypes.ParamKeyTable() + case icaauthmoduletypes.ModuleName: + keyTable = icaauthmoduletypes.ParamKeyTable() + case authtypes.ModuleName: + keyTable = authtypes.ParamKeyTable() //nolint:staticcheck + default: + continue + } + if !subspace.HasKeyTable() { + subspace.WithKeyTable(keyTable) + } + } + baseAppLegacySS := app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable()) app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - // the minimal commission rate of 5% (0.05) - // (default is needed to be set because of SDK store migrations that set the param) - stakingtypes.DefaultMinCommissionRate = sdk.NewDecWithPrec(5, 2) - - app.StakingKeeper.IterateValidators(ctx, func(index int64, val stakingtypes.ValidatorI) (stop bool) { - if val.GetCommission().LT(stakingtypes.DefaultMinCommissionRate) { - validator, found := app.StakingKeeper.GetValidator(ctx, val.GetOperator()) - if !found { - ctx.Logger().Error("validator not found", val) - return true - } - ctx.Logger().Info("update validator's commission rate to a minimal one", val) - validator.Commission.Rate = stakingtypes.DefaultMinCommissionRate - if validator.Commission.MaxRate.LT(stakingtypes.DefaultMinCommissionRate) { - validator.Commission.MaxRate = stakingtypes.DefaultMinCommissionRate - } - app.StakingKeeper.SetValidator(ctx, validator) - } - return false - }) - - icaModule := app.mm.Modules[icatypes.ModuleName].(ica.AppModule) - - // set the ICS27 consensus version so InitGenesis is not run - fromVM[icatypes.ModuleName] = icaModule.ConsensusVersion() - - // create ICS27 Controller submodule params - controllerParams := icacontrollertypes.Params{ - ControllerEnabled: false, + // OPTIONAL: prune expired tendermint consensus states to save storage space + if _, err := ibctmmigrations.PruneExpiredConsensusStates(ctx, cdc, clientKeeper); err != nil { + return nil, err } - - // create ICS27 Host submodule params - hostParams := icahosttypes.Params{ - HostEnabled: false, - AllowMessages: []string{ - "/cosmos.authz.v1beta1.MsgExec", - "/cosmos.authz.v1beta1.MsgGrant", - "/cosmos.authz.v1beta1.MsgRevoke", - "/cosmos.bank.v1beta1.MsgSend", - "/cosmos.bank.v1beta1.MsgMultiSend", - "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress", - "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission", - "/cosmos.distribution.v1beta1.MsgFundCommunityPool", - "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward", - "/cosmos.gov.v1beta1.MsgVoteWeighted", - "/cosmos.gov.v1beta1.MsgSubmitProposal", - "/cosmos.gov.v1beta1.MsgDeposit", - "/cosmos.gov.v1beta1.MsgVote", - "/cosmos.staking.v1beta1.MsgCreateValidator", - "/cosmos.staking.v1beta1.MsgEditValidator", - "/cosmos.staking.v1beta1.MsgDelegate", - "/cosmos.staking.v1beta1.MsgUndelegate", - "/cosmos.staking.v1beta1.MsgBeginRedelegate", - "/cosmos.staking.v1beta1.MsgCancelUnbondingDelegation", - "/cosmos.slashing.v1beta1.MsgUnjail", - "/ibc.applications.transfer.v1.MsgTransfer", - "/chainmain.nft_transfer.v1.MsgTransfer", - "/chainmain.nft.v1.MsgBurnNFT", - "/chainmain.nft.v1.MsgEditNFT", - "/chainmain.nft.v1.MsgIssueDenom", - "/chainmain.nft.v1.MsgMintNFT", - "/chainmain.nft.v1.MsgTransferNFT", - }, + // explicitly update the IBC 02-client params, adding the localhost client type + params := clientKeeper.GetParams(ctx) + params.AllowedClients = append(params.AllowedClients, exported.Localhost) + clientKeeper.SetParams(ctx, params) + if err := v6.MigrateICS27ChannelCapability( + ctx, + cdc, + app.keys[capabilitytypes.ModuleName], + app.CapabilityKeeper, + icacontrollertypes.SubModuleName, + ); err != nil { + return nil, err } - ctx.Logger().Info("start to init interchain account module...") - - // initialize ICS27 module - icaModule.InitModule(ctx, controllerParams, hostParams) - + // Migrate Tendermint consensus parameters from x/params module to a dedicated x/consensus module. + baseapp.MigrateParams(ctx, baseAppLegacySS, &app.ConsensusParamsKeeper) ctx.Logger().Info("start to run module migrations...") - - return app.mm.RunMigrations(ctx, app.configurator, fromVM) - }) - - // testnets need to do a coordinated upgrade to keep in sync with current mainnet version - testnetPlanName := "v4.2.7-testnet" - app.UpgradeKeeper.SetUpgradeHandler(testnetPlanName, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { return app.mm.RunMigrations(ctx, app.configurator, fromVM) }) @@ -106,19 +96,13 @@ func (app *ChainApp) RegisterUpgradeHandlers() { if err != nil { panic(fmt.Sprintf("failed to read upgrade info from disk %s", err)) } - if upgradeInfo.Name == planName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) { storeUpgrades := storetypes.StoreUpgrades{ Added: []string{ - group.ModuleName, - icacontrollertypes.StoreKey, - icahosttypes.StoreKey, - icaauthmoduletypes.StoreKey, - ibcfeetypes.StoreKey, - nfttransfertypes.StoreKey, + consensusparamtypes.StoreKey, + crisistypes.StoreKey, }, } - // configure store loader that checks if version == upgradeHeight and applies store upgrades app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) } diff --git a/app/versiondb.go b/app/versiondb.go index 752d17942..f62c960c8 100644 --- a/app/versiondb.go +++ b/app/versiondb.go @@ -39,7 +39,7 @@ func setupVersionDB( service := versiondb.NewStreamingService(versionDB, exposeStoreKeys) app.SetStreamingService(service) - verDB := versiondb.NewMultiStore(versionDB, exposeStoreKeys) + verDB := versiondb.NewMultiStore(app.CommitMultiStore(), versionDB, exposeStoreKeys) verDB.MountTransientStores(tkeys) verDB.MountMemoryStores(memKeys) diff --git a/cmd/chain-maind/app/app.go b/cmd/chain-maind/app/app.go index f5aa1ec3e..ebf34fadd 100644 --- a/cmd/chain-maind/app/app.go +++ b/cmd/chain-maind/app/app.go @@ -11,14 +11,15 @@ import ( conf "github.com/cosmos/cosmos-sdk/client/config" serverconfig "github.com/cosmos/cosmos-sdk/server/config" + dbm "github.com/cometbft/cometbft-db" + tmcfg "github.com/cometbft/cometbft/config" + tmcli "github.com/cometbft/cometbft/libs/cli" + "github.com/cometbft/cometbft/libs/log" "github.com/imdario/mergo" "github.com/spf13/cast" "github.com/spf13/cobra" - tmcfg "github.com/tendermint/tendermint/config" - tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" + rosettaCmd "cosmossdk.io/tools/rosetta/cmd" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/debug" "github.com/cosmos/cosmos-sdk/client/flags" @@ -34,6 +35,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" + genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/crypto-org-chain/chain-main/v4/app" @@ -214,7 +216,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { rootCmd.AddCommand( initCmd, - genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome), + genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome, genutiltypes.DefaultMessageValidator), genutilcli.MigrateGenesisCmd(), genutilcli.GenTxCmd(app.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome), genutilcli.ValidateGenesisCmd(app.ModuleBasics), @@ -238,7 +240,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { ) // add rosetta - rootCmd.AddCommand(server.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Marshaler)) + rootCmd.AddCommand(rosettaCmd.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Marshaler)) // versiondb changeset commands changeSetCmd := ChangeSetCmd() @@ -267,6 +269,7 @@ func queryCommand() *cobra.Command { authcmd.QueryTxsByEventsCmd(), authcmd.QueryTxCmd(), chainmaincli.QueryAllTxCmd(), + rpc.QueryEventForTxCmd(), ) app.ModuleBasics.AddQueryCommands(cmd) @@ -323,8 +326,11 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty // exportAppStateAndTMValidators creates a new chain app (optionally at a given height) // and exports state. func exportAppStateAndTMValidators( - logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool, jailAllowedAddrs []string, + logger log.Logger, db dbm.DB, + traceStore io.Writer, height int64, + forZeroHeight bool, jailAllowedAddrs []string, appOpts servertypes.AppOptions, + modulesToExport []string, ) (servertypes.ExportedApp, error) { encCfg := app.MakeEncodingConfig() // Ideally, we would reuse the one created by NewRootCmd. encCfg.Marshaler = codec.NewProtoCodec(encCfg.InterfaceRegistry) @@ -340,5 +346,5 @@ func exportAppStateAndTMValidators( a = app.New(logger, db, traceStore, true, map[int64]bool{}, "", uint(1), encCfg, appOpts) } - return a.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs) + return a.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) } diff --git a/cmd/chain-maind/opendb/opendb.go b/cmd/chain-maind/opendb/opendb.go index 1a59a1b15..19d14dc8b 100644 --- a/cmd/chain-maind/opendb/opendb.go +++ b/cmd/chain-maind/opendb/opendb.go @@ -6,7 +6,7 @@ package opendb import ( "path/filepath" - dbm "github.com/tendermint/tm-db" + dbm "github.com/cometbft/cometbft-db" ) func OpenDB(home string, backendType dbm.BackendType) (dbm.DB, error) { diff --git a/cmd/chain-maind/opendb/opendb_rocksdb.go b/cmd/chain-maind/opendb/opendb_rocksdb.go index 58ba33482..7a5a93c21 100644 --- a/cmd/chain-maind/opendb/opendb_rocksdb.go +++ b/cmd/chain-maind/opendb/opendb_rocksdb.go @@ -7,8 +7,8 @@ import ( "path/filepath" "runtime" + dbm "github.com/cometbft/cometbft-db" "github.com/linxGnu/grocksdb" - dbm "github.com/tendermint/tm-db" ) func OpenDB(home string, backendType dbm.BackendType) (dbm.DB, error) { diff --git a/default.nix b/default.nix index ad97acbd1..32ea15119 100644 --- a/default.nix +++ b/default.nix @@ -38,7 +38,7 @@ let in buildGoApplication rec { pname = "chain-maind"; - version = "4.2.8"; + version = "v4.3.0"; go = buildPackages.go_1_22; src = lib.cleanSourceWith { name = "src"; diff --git a/go.mod b/go.mod index cb29d1514..8c094fc46 100644 --- a/go.mod +++ b/go.mod @@ -5,15 +5,15 @@ go 1.22 toolchain go1.22.0 require ( - cosmossdk.io/errors v1.0.0-beta.7 - cosmossdk.io/math v1.0.0-rc.0 + cosmossdk.io/errors v1.0.0 + cosmossdk.io/math v1.2.0 + cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d github.com/armon/go-metrics v0.4.1 - github.com/cosmos/cosmos-proto v1.0.0-beta.1 - github.com/cosmos/cosmos-sdk v0.46.15 - github.com/cosmos/ibc-go/v5 v5.2.1 - github.com/crypto-org-chain/cronos/store v0.0.5-0.20230904032434-c575f4797ca4 - // release/v1.0.x - github.com/crypto-org-chain/cronos/versiondb v0.0.0-20230904032434-c575f4797ca4 + github.com/cosmos/cosmos-proto v1.0.0-beta.2 + github.com/cosmos/cosmos-sdk v0.47.7 + github.com/cosmos/ibc-go/v7 v7.3.1-0.20240111145224-825fe90f9765 + github.com/crypto-org-chain/cronos/store v0.0.5-0.20231225065237-42f2597fca49 + github.com/crypto-org-chain/cronos/versiondb v0.0.0-20231225065237-42f2597fca49 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.3 github.com/google/renameio v1.0.0 @@ -22,34 +22,43 @@ require ( github.com/imdario/mergo v0.3.13 github.com/linxGnu/grocksdb v1.8.4 github.com/rakyll/statik v0.1.7 // indirect - github.com/spf13/cast v1.5.0 - github.com/spf13/cobra v1.6.1 + github.com/spf13/cast v1.5.1 + github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - github.com/tendermint/tendermint v0.34.29 - github.com/tendermint/tm-db v0.6.7 github.com/tidwall/gjson v1.14.0 - golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 - google.golang.org/grpc v1.56.3 - google.golang.org/protobuf v1.30.0 + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb + google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect + google.golang.org/grpc v1.58.3 + google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.19.1 // indirect + cosmossdk.io/api v0.3.1 + cosmossdk.io/tools/rosetta v0.2.1 + github.com/cometbft/cometbft v0.37.4 + github.com/cometbft/cometbft-db v0.8.0 + github.com/cosmos/gogoproto v1.4.10 + google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 +) + +require ( + cloud.google.com/go v0.110.8 // indirect + cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.13.0 // indirect - cloud.google.com/go/storage v1.28.1 // indirect - filippo.io/edwards25519 v1.0.0-rc.1 // indirect + cloud.google.com/go/iam v1.1.2 // indirect + cloud.google.com/go/storage v1.30.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/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/DataDog/zstd v1.5.0 // indirect - github.com/Workiva/go-datastructures v1.0.53 // indirect - github.com/alitto/pond v1.8.2 // indirect - github.com/aws/aws-sdk-go v1.44.122 // indirect + github.com/alitto/pond v1.8.3 // 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 @@ -57,49 +66,51 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect + github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect - github.com/cockroachdb/errors v1.8.1 // indirect - github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect - github.com/cockroachdb/pebble v0.0.0-20230315005856-dcb60b9212f9 // indirect - github.com/cockroachdb/redact v1.0.8 // indirect - github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect + github.com/cockroachdb/errors v1.10.0 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/pebble v0.0.0-20230807182518-7bcdd55ef1e3 // indirect + github.com/cockroachdb/redact v1.1.5 // indirect github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect - github.com/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gogoproto v1.4.7 // indirect - github.com/cosmos/iavl v0.19.6 // indirect - github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect - github.com/creachadair/taskgroup v0.3.2 // indirect - github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20230904032434-c575f4797ca4 // indirect + github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/iavl v0.21.0-alpha.1.0.20230904092046-df3db2d96583 // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect + github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect + github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect + github.com/creachadair/taskgroup v0.4.2 // indirect + github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20231225065237-42f2597fca49 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect + github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/getsentry/sentry-go v0.23.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect - github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect - github.com/gogo/gateway v1.1.0 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/gogo/googleapis v1.4.1 // indirect + github.com/golang/glog v1.1.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect + github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.1 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect @@ -107,24 +118,25 @@ require ( github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.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-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/huandu/skiplist v1.2.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.16.7 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/ledgerwatch/erigon-lib v0.0.0-20230210071639-db0e7ed11263 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect @@ -135,7 +147,6 @@ require ( github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -145,48 +156,50 @@ require ( github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/regen-network/cosmos-proto v0.3.1 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect - github.com/rs/cors v1.8.2 // indirect - github.com/rs/zerolog v1.29.1 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/rs/cors v1.8.3 // indirect + github.com/rs/zerolog v1.30.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/viper v1.14.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect + github.com/spf13/viper v1.16.0 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tidwall/btree v1.5.0 // indirect + github.com/tidwall/btree v1.6.0 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect github.com/tidwall/wal v1.1.7 // indirect - github.com/ulikunitz/xz v0.5.10 // indirect + github.com/ulikunitz/xz v0.5.11 // indirect github.com/zbiljic/go-filelock v0.0.0-20170914061330-1dbf7103ab7d // indirect - github.com/zondax/hid v0.9.1 // indirect - github.com/zondax/ledger-go v0.14.1 // indirect + github.com/zondax/hid v0.9.2 // indirect + github.com/zondax/ledger-go v0.14.3 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.17.0 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sync v0.1.0 // indirect + golang.org/x/oauth2 v0.10.0 // indirect + golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.114.0 // indirect + google.golang.org/api v0.128.0 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.6 // indirect + pgregory.net/rapid v0.5.5 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) replace ( // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6 + github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 + github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240103063449-c887e863fae2 // dgrijalva/jwt-go is deprecated and doesn't receive security updates. // TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 @@ -196,10 +209,5 @@ replace ( github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/jhump/protoreflect => github.com/jhump/protoreflect v1.9.0 - // Downgraded to avoid bugs in following commits which caused simulations to fail. 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 - // https://github.com/crypto-org-chain/tm-db/tree/release/v0.6.x - github.com/tendermint/tm-db => github.com/crypto-org-chain/tm-db v0.6.8-0.20230424032152-87c7e7f4fb61 ) diff --git a/go.sum b/go.sum index 1a10a631e..d34871180 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= +cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -73,8 +73,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= -cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= +cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= +cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -114,14 +114,12 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= -cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/iam v1.1.2 h1:gacbrBdWcoVmGLozRuStX45YKvJtzIjJdAolzUs1sm4= +cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= -cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -179,8 +177,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= -cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= +cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= +cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= @@ -193,18 +191,30 @@ cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuW cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= -cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.0-rc.0 h1:ml46ukocrAAoBpYKMidF0R2tQJ1Uxfns0yH8wqgMAFc= -cosmossdk.io/math v1.0.0-rc.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= +cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= +cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= +cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= +cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98okJopc= +cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= +cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= +cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= +cosmossdk.io/log v1.2.1 h1:Xc1GgTCicniwmMiKwDxUjO4eLhPxoVdI9vtMW8Ti/uk= +cosmossdk.io/log v1.2.1/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= +cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig= +cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= +cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d h1:E/8y0oG3u9hBR8l4F9MtC0LdZIamPCUwUoLlrHrX86I= +cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d/go.mod h1:xbjky3L3DJEylaho6gXplkrMvJ5sFgv+qNX+Nn47bzY= +cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= +cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= +filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= +filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= -github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= @@ -214,14 +224,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 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/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= -github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= -github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= @@ -229,29 +235,25 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= 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= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alitto/pond v1.8.2 h1:k0k3GIE7CFLW/kyMJj5DDKLFg1VH09l8skZqg/yJNng= -github.com/alitto/pond v1.8.2/go.mod h1:CmvIIGd5jKLasGI3D87qDkQxjzChdKMmnXMg3fG6M6Q= +github.com/alitto/pond v1.8.3 h1:ydIqygCLVPqIX/USe5EaV/aSRXTRXDEI9JwuDdu+/xs= +github.com/alitto/pond v1.8.3/go.mod h1:CmvIIGd5jKLasGI3D87qDkQxjzChdKMmnXMg3fG6M6Q= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -267,8 +269,9 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.44.122 h1:p6mw01WBaNpbdP2xrisz5tIkcNwzj/HysobNoaAHjgo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= +github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= @@ -279,7 +282,6 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7 github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= -github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -338,12 +340,15 @@ github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXH github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= +github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= +github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= @@ -361,27 +366,22 @@ 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/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA= github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= -github.com/cockroachdb/errors v1.8.1 h1:A5+txlVZfOqFBDa4mGz2bUWSp0aHElvHX2bKkdbQu+Y= -github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/cockroachdb/pebble v0.0.0-20230315005856-dcb60b9212f9 h1:R8qKLkapV1aQlvFpy1bMOENzDPpX1vfdqYqfgqXeRiw= -github.com/cockroachdb/pebble v0.0.0-20230315005856-dcb60b9212f9/go.mod h1:9lRMC4XN3/BLPtIp6kAKwIaHu369NOf2rMucPzipz50= -github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw= -github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= -github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= +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/pebble v0.0.0-20230807182518-7bcdd55ef1e3 h1:vOeEsidq7kuzHhMf0ifGL/wMaq0bloDKHVX5QJPtl/U= +github.com/cockroachdb/pebble v0.0.0-20230807182518-7bcdd55ef1e3/go.mod h1:9lRMC4XN3/BLPtIp6kAKwIaHu369NOf2rMucPzipz50= +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/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= 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 v0.37.4 h1:xyvvEqlyfK8MgNIIKVJaMsuIp03wxOcFmVkT26+Ikpg= +github.com/cometbft/cometbft v0.37.4/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8= 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= @@ -398,40 +398,45 @@ 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.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= -github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= -github.com/cosmos/cosmos-sdk v0.46.15 h1:50QSEO4ZU9QUHJ8Ul9N/o/hn/IE5dL7DwL/OY1wcoMg= -github.com/cosmos/cosmos-sdk v0.46.15/go.mod h1:9MRixWsgoJ2UmVsCRRePtENFPP3cM+gTC5azEpxgllo= +github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= +github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= -github.com/cosmos/gogoproto v1.4.7 h1:RzYKVnsEC7UIkDnhTIkqEB7LnIQbsySvmNEqPCiPevk= -github.com/cosmos/gogoproto v1.4.7/go.mod h1:gxGePp9qedovvl/StQL2BIJ6qlIBn1+9YxR0IulGBKA= -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/v5 v5.2.1 h1:i8Kl9KZfPJVYuihjbGPnjTQWecXQfRLz+QrjJGhzY9o= -github.com/cosmos/ibc-go/v5 v5.2.1/go.mod h1:eH18ghfqGGT9gDCTMDLWg1zPLXplSnPxXRNWPx98xhU= +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.21.0-alpha.1.0.20230904092046-df3db2d96583 h1:3Matt7/LjZiZkIBPalYazOZcw2B05Ch14dU5TJyqJEc= +github.com/cosmos/iavl v0.21.0-alpha.1.0.20230904092046-df3db2d96583/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/ibc-go/v7 v7.3.1-0.20240111145224-825fe90f9765 h1:qydXe3ecm5BpA86SnycgpKdpNVOWbmLFTIB8q+OxDV8= +github.com/cosmos/ibc-go/v7 v7.3.1-0.20240111145224-825fe90f9765/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= +github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= +github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= -github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= -github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= +github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw= +github.com/cosmos/ledger-cosmos-go v0.12.4/go.mod h1:fjfVWRf++Xkygt9wzCsjEBdjcf7wiiY35fv3ctT+k4M= +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/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6 h1:d4h4Ki1UE/LF6CKwYEm3OZ+HIBCrzSmOokG1vce0O98= -github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6/go.mod h1:hF5aclS++7WrW8USOA3zPeKI0CuzwUD2TPYug25ANlQ= -github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20230904032434-c575f4797ca4 h1:TXArRgse2/3r1FxFbbukJhQpE5HHxJaOI3YAwz4Zu00= -github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20230904032434-c575f4797ca4/go.mod h1:sCbJoEppeM3/7+Ox1heGlbVt+eWBcTmLb9UEjuotXIc= -github.com/crypto-org-chain/cronos/store v0.0.5-0.20230904032434-c575f4797ca4 h1:9jlbWwXuuoWCOxBJX3MqtyBuK8YA2Tnmp9QBQVl79Uk= -github.com/crypto-org-chain/cronos/store v0.0.5-0.20230904032434-c575f4797ca4/go.mod h1:KC9cV7VK8BNIJySzztw2nWSqPqVGcffsumMl3sORPCM= -github.com/crypto-org-chain/cronos/versiondb v0.0.0-20230904032434-c575f4797ca4 h1:V88JCIhw059oKuFanb8WbKW1o1TezG3uGRvzL7/VQKI= -github.com/crypto-org-chain/cronos/versiondb v0.0.0-20230904032434-c575f4797ca4/go.mod h1:i9e8vrU54C/JvSM+rX/jUidFRBcyXZ8FgNX+EvrasQc= -github.com/crypto-org-chain/tm-db v0.6.8-0.20230424032152-87c7e7f4fb61 h1:Y5OuzOkZtjCfO53Jgzl+H8re6pOU4X205a1VMkDcUdk= -github.com/crypto-org-chain/tm-db v0.6.8-0.20230424032152-87c7e7f4fb61/go.mod h1:BA6bNc7haulu2IjMy/I2SJiKWjQzfIb7LEAMsnIoLWU= +github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1QJ9a3XdYMSKo+1RdFifxb/g3lNypC52L/rpYrWoKo= +github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24= +github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240103063449-c887e863fae2 h1:z3LXxlOuRHfRuS6LpA3t9eSaekHmzsdrrDkaXP8UEeU= +github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240103063449-c887e863fae2/go.mod h1:hljXsedSCJYge78hyaMYy+yzDQVGZtKAZBjZn5QMddk= +github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20231225065237-42f2597fca49 h1:gxeIn0Hqmwl9sRV3YI0Jd/4A33LaOPoe/yfDWos4FEg= +github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20231225065237-42f2597fca49/go.mod h1:b2P7ilsxOWAhl9augFxBeRVeqecnQtzqfzpqsglj5ik= +github.com/crypto-org-chain/cronos/store v0.0.5-0.20231225065237-42f2597fca49 h1:z/qWzVeCuLngCM+BCWZfVfmlwUw2Z35aGxn8X6Gpgkw= +github.com/crypto-org-chain/cronos/store v0.0.5-0.20231225065237-42f2597fca49/go.mod h1:jZCxmpvc3f+5rwx0M73qH1vWtsBnHeubAYnK8udNi7M= +github.com/crypto-org-chain/cronos/versiondb v0.0.0-20231225065237-42f2597fca49 h1:/jOgsLx2mQC/RR0KR3O/yvw7/BP3Us6G4LOzasWlA74= +github.com/crypto-org-chain/cronos/versiondb v0.0.0-20231225065237-42f2597fca49/go.mod h1:Vsn1bjuxk+acm6bee83rGtpbCLIj/tWQjVSnGLhfSXg= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= @@ -451,13 +456,12 @@ github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= github.com/dgraph-io/ristretto v0.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= @@ -474,8 +478,9 @@ github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY= github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -483,7 +488,6 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -495,32 +499,29 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= -github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= 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/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= 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/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= -github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZWO05nE= +github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -528,10 +529,9 @@ github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= -github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +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= @@ -545,9 +545,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-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= +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-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -574,18 +573,17 @@ github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+ github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid 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 v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +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.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -627,7 +625,6 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= -github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= @@ -649,7 +646,6 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -682,6 +678,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/renameio v1.0.0 h1:xhp2CnJmgQmpJU4RY8chagahUq5mbPPAbiSQstKpVMA= github.com/google/renameio v1.0.0/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk= +github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -691,8 +689,8 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= -github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= -github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.2.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4= +github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -702,8 +700,8 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= -github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -715,7 +713,6 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= @@ -726,7 +723,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= @@ -745,8 +741,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= @@ -775,25 +771,27 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 h1:aSVUgRRRtOrZOC1fYmY9gV0e9z/Iu+xNVSASWjsuyGU= -github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3/go.mod h1:5PC6ZNPde8bBqU/ewGZig35+UIZtw9Ytxez8/q5ZyFE= +github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU= +github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= +github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= +github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= +github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= -github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= @@ -806,10 +804,6 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= -github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= -github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= -github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= -github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -837,34 +831,23 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= -github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= -github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= -github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= -github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= -github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w= -github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= @@ -883,7 +866,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= @@ -903,8 +885,8 @@ github.com/linxGnu/grocksdb v1.8.4/go.mod h1:xZCIb5Muw+nhbDK4Y5UJuOrin5MceOuiXkV github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= @@ -934,13 +916,9 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= -github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= -github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= @@ -971,7 +949,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= @@ -984,16 +961,15 @@ github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/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= @@ -1002,15 +978,15 @@ 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.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= -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/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= -github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= +github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= +github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -1036,8 +1012,6 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= -github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= @@ -1048,7 +1022,6 @@ 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= @@ -1104,8 +1077,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= @@ -1115,29 +1086,27 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= -github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= +github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= +github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c= +github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1154,15 +1123,15 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= -github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -1171,8 +1140,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= -github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1195,14 +1164,14 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -github.com/tidwall/btree v1.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.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w= @@ -1217,11 +1186,9 @@ github.com/tidwall/tinylru v1.1.0/go.mod h1:3+bX+TJ2baOLMWTnlyNWHh4QMnFyARg2TLTQ github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= @@ -1230,31 +1197,22 @@ github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= +github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= -github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1263,10 +1221,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zbiljic/go-filelock v0.0.0-20170914061330-1dbf7103ab7d h1:XQyeLr7N9iY9mi+TGgsBFkj54+j3fdoo8e2u6zrGP5A= github.com/zbiljic/go-filelock v0.0.0-20170914061330-1dbf7103ab7d/go.mod h1:hoMeDjlNXTNqVwrCk8YDyaBS2g5vFfEX2ezMi4vb6CY= -github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo= -github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= -github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= +github.com/zondax/hid v0.9.2 h1:WCJFnEDMiqGF64nlZz28E9qLVZ0KSJ7xpc5DLEyma2U= +github.com/zondax/hid v0.9.2/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= +github.com/zondax/ledger-go v0.14.3 h1:wEpJt2CEcBJ428md/5MgSLsXLBos98sBOyxNmCjfUCw= +github.com/zondax/ledger-go v0.14.3/go.mod h1:IKKaoxupuB43g4NxeQmbLXv7T9AlQyie1UpHb342ycI= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= @@ -1316,7 +1274,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= @@ -1334,8 +1293,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 h1:LGJsf5LRplCck6jUCH3dBL2dmycNruWNF5xugkSlfXw= -golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= +golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1363,8 +1322,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1377,7 +1336,6 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -1387,7 +1345,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1420,6 +1377,7 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1461,8 +1419,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= +golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1477,8 +1435,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1570,6 +1528,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/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= @@ -1582,6 +1542,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.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1620,14 +1581,12 @@ golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1669,7 +1628,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -1749,8 +1707,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= -google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= +google.golang.org/api v0.128.0 h1:RjPESny5CnQRn9V6siglged+DZCgfu9l6mO9dkX9VOg= +google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1760,7 +1718,6 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1837,6 +1794,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= @@ -1871,12 +1829,14 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= +google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU= +google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= 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= @@ -1916,8 +1876,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= -google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= +google.golang.org/grpc v1.58.3/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= @@ -1934,8 +1894,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1950,7 +1910,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= @@ -1973,7 +1932,10 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= +gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1985,8 +1947,8 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= -pgregory.net/rapid v0.5.3 h1:163N50IHFqr1phZens4FQOdPgfJscR7a562mjQqeo4M= -pgregory.net/rapid v0.5.3/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= +pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= +pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/gomod2nix.toml b/gomod2nix.toml index 68e0fdf68..0867a5d88 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -2,29 +2,47 @@ schema = 3 [mod] [mod."cloud.google.com/go"] - version = "v0.110.0" - hash = "sha256-56s9lxMqlQ2sFZOteDv9n0zCC0MTwoczCqSQY2+bT+c=" + version = "v0.110.8" + hash = "sha256-2zRfdYe7M+PH1Q4oeh0T12pQVnp117CndMt64CkI3XA=" [mod."cloud.google.com/go/compute"] - version = "v1.19.1" - hash = "sha256-yVJPN6YFcDPA5fLTEa9Yj5Gsqv2jD+V5uYBi385FeY0=" + version = "v1.23.0" + hash = "sha256-Pd5tMfeatH7p/Mh4b5qUqE9vMDgwwTg6/3Hb8uFZyUw=" [mod."cloud.google.com/go/compute/metadata"] version = "v0.2.3" hash = "sha256-kYB1FTQRdTDqCqJzSU/jJYbVUGyxbkASUKbEs36FUyU=" [mod."cloud.google.com/go/iam"] - version = "v0.13.0" - hash = "sha256-ZdpvP9zPcuG7MPZ9fbAEnjI4zIDRbNSPmOaHyTEZ914=" + version = "v1.1.2" + hash = "sha256-n4DefmHY9GGKc3xdsC+MN9y3tYu7Sgeol1X/Lsnggks=" [mod."cloud.google.com/go/storage"] - version = "v1.28.1" - hash = "sha256-bYy0ul5EB6xSpOnj60zfZRCM28zvF2oK0USurF6j5kI=" + version = "v1.30.1" + hash = "sha256-4lC0XaLSQDnVBmNLIauiWnGXq+Ax57r8fcMxXFMCCNE=" + [mod."cosmossdk.io/api"] + version = "v0.3.1" + hash = "sha256-yQUn04n0/s3DpNWu7TF3NG+awWKxgvRpV9CYIV+dR7k=" + [mod."cosmossdk.io/core"] + version = "v0.5.1" + hash = "sha256-NSIUDRmJRpxsy/GE2kXOa1G3UaoPxVnhi4f7izjFzO4=" + [mod."cosmossdk.io/depinject"] + version = "v1.0.0-alpha.4" + hash = "sha256-xpLH0K6ivQznFrLw2hmhWIIyYgqjstV47OhTEj/c1oQ=" [mod."cosmossdk.io/errors"] - version = "v1.0.0-beta.7" - hash = "sha256-XblGvIx6Wvvq6wggXjp+KbeJGXoe7AZH7hXEdauCezU=" + version = "v1.0.0" + hash = "sha256-ZD1fhIefk3qkt9I4+ed9NBmBqTDvym9cXWmgFBh5qu0=" + [mod."cosmossdk.io/log"] + version = "v1.2.1" + hash = "sha256-2Mb0jQ5Yvi+2fvhCVEiiacwODXM8+6vhsKOnHz+wsiY=" [mod."cosmossdk.io/math"] - version = "v1.0.0-rc.0" - hash = "sha256-bQ2hxg1dwVxbyBzbdepCz8nFGx6dfr63syqDNQ8AFQc=" + version = "v1.2.0" + hash = "sha256-yLPUAsJPQxuI0C22cPbP/BzclWb9eBzGFntGDQmdVUc=" + [mod."cosmossdk.io/simapp"] + version = "v0.0.0-20230608160436-666c345ad23d" + hash = "sha256-6BMBA98BpK3jG6++ZE4LdPQwwpS+lZ0GLMRF1fO4UfM=" + [mod."cosmossdk.io/tools/rosetta"] + version = "v0.2.1" + hash = "sha256-TrkXwA1ZdwSyu3te0DLMBynCb7CGEtefo2wzFvxeyU8=" [mod."filippo.io/edwards25519"] - version = "v1.0.0-rc.1" - hash = "sha256-3DboBqby2ejRU33FG96Z8JF5AJ8HP2rC/v++VyoQ2LQ=" + version = "v1.0.0" + hash = "sha256-APnPAcmItvtJ5Zsy863lzR2TjEBF9Y66TY1e4M1ap98=" [mod."github.com/99designs/go-keychain"] version = "v0.0.0-20191008050251-8e49817e8af4" hash = "sha256-4EndKcspGC3GOPCmctXF1NnWzxWwMyY/OQpFMmr8Sc0=" @@ -38,18 +56,15 @@ schema = 3 [mod."github.com/DataDog/zstd"] version = "v1.5.0" hash = "sha256-i+vPadZcmSHCALA50FaADRmj6oqe1t5SIfqEbCxr9Ao=" - [mod."github.com/Workiva/go-datastructures"] - version = "v1.0.53" - hash = "sha256-W6qOvqu8sokMlZrpOF1SWG138H0/BotywKNLlDF8Zug=" [mod."github.com/alitto/pond"] - version = "v1.8.2" - hash = "sha256-GbTih6gDKGuCP0V0iEo1DfEePAjm6lBxiUpqmL8hD1I=" + version = "v1.8.3" + hash = "sha256-Iaiw4a8Up0tB2iu8xdmXKHwXBGWBBGnqMGfZYWNc1ng=" [mod."github.com/armon/go-metrics"] version = "v0.4.1" hash = "sha256-usxTUHA0QQMdM6sHi2z51nmnEKMbA0qUilxJFpWHlYE=" [mod."github.com/aws/aws-sdk-go"] - version = "v1.44.122" - hash = "sha256-bzkXf4Sf+6y6on7iulGtXkPdj0XoevkHYGQYPTNL7To=" + version = "v1.44.203" + hash = "sha256-Kq501D1YAz/3nXqcszDDAnf6huZarJh5onzgEfmWbms=" [mod."github.com/beorn7/perks"] version = "v1.0.1" hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4=" @@ -72,32 +87,32 @@ schema = 3 version = "v2.2.0" hash = "sha256-nPufwYQfTkyrEkbBrpqM3C2vnMxfIz6tAaBmiUP7vd4=" [mod."github.com/chzyer/readline"] - version = "v0.0.0-20180603132655-2972be24d48e" - hash = "sha256-2Uj5LGpHEbLQG3d/7z9AL8DknUBZyoTAMs4j+VVDmIA=" + version = "v1.5.1" + hash = "sha256-6wKd6/JZ9/O7FwSyNKE3KOt8fVPZEunqbTHQUxlOUNc=" [mod."github.com/cockroachdb/apd/v2"] version = "v2.0.2" hash = "sha256-UrPHkvqVF8V78+kXKmjTHl79XsgDBnqFsje5BMYh0E4=" [mod."github.com/cockroachdb/errors"] - version = "v1.8.1" - hash = "sha256-fpxeq5kDoP9NxP1XAWulmHfAKo0p0gDNj65YqPM318s=" + version = "v1.10.0" + hash = "sha256-l6CCw3FKGNaGlwzLfAaF0cruf3E9MZr6GK1GZ+vQm2c=" [mod."github.com/cockroachdb/logtags"] - version = "v0.0.0-20190617123548-eb05cc24525f" - hash = "sha256-mdcKZsPfCiaTyxLRkZprVIijeZzbTD3J7WGb4zOQgn4=" + version = "v0.0.0-20230118201751-21c54148d20b" + hash = "sha256-7dQH6j1o99fuxHKkw0RhNC5wJKkvRLMDJpUiVnDx6h8=" [mod."github.com/cockroachdb/pebble"] - version = "v0.0.0-20230315005856-dcb60b9212f9" - hash = "sha256-LJqpI+MoHq8tCky86nIuqIH+WgTuPMUdcAltvAXwroc=" + version = "v0.0.0-20230807182518-7bcdd55ef1e3" + hash = "sha256-f0wYwD5GmKMKDXE0ORPAsiA90cJanHfkl9d1vOUxCj8=" [mod."github.com/cockroachdb/redact"] - version = "v1.0.8" - hash = "sha256-V/qBOGQUMbpPAQOpLTZk8MZiBr66Epml8snn9suCbs4=" - [mod."github.com/cockroachdb/sentry-go"] - version = "v0.6.1-cockroachdb.2" - hash = "sha256-3C9tuGU6f2DOz6yPcOdUf1LRvCXFg+prfqAPob9Sz2E=" + version = "v1.1.5" + hash = "sha256-0rtT7LRO0wxf9XovOK8GXRrhmx8OcbdPK/mXOKbJdog=" [mod."github.com/coinbase/rosetta-sdk-go"] version = "v0.7.9" hash = "sha256-ZWIXIXcHGjeCNgMrpXymry8/8esDDauGFfF/+gEoO1Y=" + [mod."github.com/cometbft/cometbft"] + version = "v0.37.4" + hash = "sha256-rEzIdkxeE5FsIGwvzZiPdifPr0v9SmKHQw78I7v2WUA=" [mod."github.com/cometbft/cometbft-db"] - version = "v0.0.0-20230412133340-ac70df4b45f6" - hash = "sha256-WOubYACTuk6OeHMSbcKIYbQWarWIljQUEvyX3hiXmq8=" + version = "v0.0.0-20231011055109-57922ac52a63" + hash = "sha256-iLs/FN1be3AcoyhKj2+b5Msqeat9j2ja4acyOs+w+Uk=" replaced = "github.com/crypto-org-chain/cometbft-db" [mod."github.com/confio/ics23/go"] version = "v0.9.0" @@ -106,38 +121,48 @@ schema = 3 version = "v1.0.5" hash = "sha256-t572Sr5iiHcuMKLMWa2i+LBAt192oa+G1oA371tG/eI=" [mod."github.com/cosmos/cosmos-proto"] - version = "v1.0.0-beta.1" - hash = "sha256-oATkuj+fM5eBn+ywO+w/tL0AFSIEkx0J3Yz+VhVe0QA=" + version = "v1.0.0-beta.2" + hash = "sha256-Am8A44NSxdY77GIEDx1AY+pLU0npeyuTlr3mc4stg3I=" [mod."github.com/cosmos/cosmos-sdk"] - version = "v0.46.15" - hash = "sha256-QwztH5PlDscGl9pSGvbfv6ca7PQkBmcLvGZufxGT4fw=" + version = "v0.46.0-beta2.0.20240103063449-c887e863fae2" + hash = "sha256-Y8kxYglCrAXNvNey1NWwly0nw3CB3wWleuvEimVEbPs=" + replaced = "github.com/crypto-org-chain/cosmos-sdk" [mod."github.com/cosmos/go-bip39"] version = "v1.0.0" hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA=" + [mod."github.com/cosmos/gogogateway"] + version = "v1.2.0" + hash = "sha256-Hd19V0RCiMoCL67NsqvWIsvWF8KM3LnuJTbYjWtQkEo=" [mod."github.com/cosmos/gogoproto"] - version = "v1.4.7" - hash = "sha256-JGSKV4CMgBGQYR7kZt6QQsVjgLEyAjNzKrtLalJqqVo=" + version = "v1.4.10" + hash = "sha256-Anm4O3bUONsN7J9Psg9E+oQasmUyoGc7UE1aaHJaehE=" [mod."github.com/cosmos/iavl"] - version = "v0.19.6" - hash = "sha256-0Om7nXftrgVkCpRTGNTGnc2lUJsFQ9aihwgtkUkwleg=" - [mod."github.com/cosmos/ibc-go/v5"] - version = "v5.2.1" - hash = "sha256-zBw4oJQxhdviybdaL9n8PTFRTUpIIUbCGitVj6FD1/k=" + version = "v0.21.0-alpha.1.0.20230904092046-df3db2d96583" + hash = "sha256-3Va8Ljq63IXty0oHlRpqfsC6WsMut6TWZ2R+/nYtfTU=" + [mod."github.com/cosmos/ibc-go/v7"] + version = "v7.3.1-0.20240111145224-825fe90f9765" + hash = "sha256-7vYPaZQOQwqIJZ1c7/52aRnHx3zRATwcHmGKRXYSOUA=" + [mod."github.com/cosmos/ics23/go"] + version = "v0.10.0" + hash = "sha256-KYEv727BO/ht63JO02xiKFGFAddg41Ve9l2vSSZZBq0=" [mod."github.com/cosmos/ledger-cosmos-go"] - version = "v0.12.2" - hash = "sha256-fLkveUWxn0nZzvgsY0KTU/T1TUUQ8Ap6XTYSnJs6XXo=" + version = "v0.12.4" + hash = "sha256-SYABql9QYhuZaNxRnvfHw/KqDTTzjYWgzbN7PDKVmGA=" + [mod."github.com/cosmos/rosetta-sdk-go"] + version = "v0.10.0" + hash = "sha256-WmLq9E9mYV+ms6Tdb43lCoAy6cowkDnK4bvX/ApDzLY=" [mod."github.com/creachadair/taskgroup"] - version = "v0.3.2" - hash = "sha256-Y261IO/d9xjV0UScqHvo31broxvnKn4IQQC9Mu6jNkE=" + version = "v0.4.2" + hash = "sha256-AjtQRoLKLSAbyKd8YlaXcYn0pek6oo5U3R28dvtKv14=" [mod."github.com/crypto-org-chain/cronos/memiavl"] - version = "v0.0.5-0.20230904032434-c575f4797ca4" - hash = "sha256-IxhgTLeBuxJ7FuZua+ZMWXRH4YJwrQMpYBR4gpSjgVY=" + version = "v0.0.5-0.20231225065237-42f2597fca49" + hash = "sha256-WwkThqPMfhQywcgT5cXakLTNKH8WI+vZwqVzsYqfu9Q=" [mod."github.com/crypto-org-chain/cronos/store"] - version = "v0.0.5-0.20230904032434-c575f4797ca4" - hash = "sha256-XgSJKw05uaowu7SXFVPqtdLBNUextxD78kEhFyTswIY=" + version = "v0.0.5-0.20231225065237-42f2597fca49" + hash = "sha256-LSEv9FwHV1WI9MmszW3E96+i/lFAWEPvDvqRcyLaemU=" [mod."github.com/crypto-org-chain/cronos/versiondb"] - version = "v0.0.0-20230904032434-c575f4797ca4" - hash = "sha256-9bPXHiTF8+RZ75INmfXj1OyAGQykmYuFq3AC8L+Wb1s=" + version = "v0.0.0-20231225065237-42f2597fca49" + hash = "sha256-VTQGyUWd/XubEhKgUGsvgydHoMS3ujhmoZIYmGoBkOw=" [mod."github.com/danieljoos/wincred"] version = "v1.1.2" hash = "sha256-Nnklfg12vmWCOhELGyoRqEF4w4srp0WbPwreaChYLKs=" @@ -154,14 +179,14 @@ schema = 3 version = "v2.2007.4" hash = "sha256-+KwqZJZpViv8S3TqUVvPXrFoMgWFyS3NoLsi4RR5fGk=" [mod."github.com/dgraph-io/ristretto"] - version = "v0.1.0" - hash = "sha256-01jneg1+1x8tTfUTBZ+6mHkQaqXVnPYxLJyJhJQcvt4=" + version = "v0.1.1" + hash = "sha256-Wr9ovXhGi71+n37EnrpIj2o9goyaQHtY4Vvurv6IVlY=" [mod."github.com/dgryski/go-farm"] version = "v0.0.0-20200201041132-a6ae2369ad13" hash = "sha256-aOMlPwFY36bLiiIx4HonbCYRAhagk5N6HAWN7Ygif+E=" [mod."github.com/dustin/go-humanize"] - version = "v1.0.0" - hash = "sha256-gy4G1PnHD9iw2MitHX6y1y93qr3C9IncmXL7ttUMDs8=" + version = "v1.0.1" + hash = "sha256-yuvxYYngpfVkUg9yAmG99IUVmADTQA0tMbBXe0Fq0Mc=" [mod."github.com/dvsekhvalnov/jose2go"] version = "v1.6.0" hash = "sha256-IXn2BuUp4fi/i2zf1tGGW1m9xoYh3VCksB6GJ5Sf06g=" @@ -171,6 +196,9 @@ schema = 3 [mod."github.com/fsnotify/fsnotify"] version = "v1.6.0" hash = "sha256-DQesOCweQPEwmAn6s7DCP/Dwy8IypC+osbpfsvpkdP0=" + [mod."github.com/getsentry/sentry-go"] + version = "v0.23.0" + hash = "sha256-VR6IL+yIc+BV5xBGfPJ7ixsAVzJ/hzuvXmkkAn1cTk4=" [mod."github.com/go-kit/kit"] version = "v0.12.0" hash = "sha256-5RkXo6s0oye8etgD5qy+AvkkkNsQ6jc0kWJj6flA4GM=" @@ -178,24 +206,27 @@ schema = 3 version = "v0.2.1" hash = "sha256-puLJ+up45X2j9E3lXvBPKqHPKOA/sFAhfCqGxsITW/Y=" [mod."github.com/go-logfmt/logfmt"] - version = "v0.5.1" - hash = "sha256-t50m9ffvW8PiGvO+2svnLI+N/XaWaBS+ZlhwrEQn2gU=" + version = "v0.6.0" + hash = "sha256-RtIG2qARd5sT10WQ7F3LR8YJhS8exs+KiuUiVf75bWg=" [mod."github.com/godbus/dbus"] version = "v0.0.0-20190726142602-4481cbc300e2" hash = "sha256-R7Gb9+Zjy80FbQSDGketoVEqfdOQKuOVTfWRjQ5kxZY=" - [mod."github.com/gogo/gateway"] - version = "v1.1.0" - hash = "sha256-OHcA3fEGZt4uYn6V5BAaDc47DkH7z0Al+v7MpkfeR8o=" + [mod."github.com/gogo/googleapis"] + version = "v1.4.1" + hash = "sha256-4KgwVRIA6GOV/Lkv11c/vj2RMlgu4ZMjwJGeyb2DZC4=" [mod."github.com/gogo/protobuf"] version = "v1.3.3-alpha.regen.1" hash = "sha256-TKa//aFXpWH+yK/cN1oaaqhipZpPUovekP6oA9vLIHY=" replaced = "github.com/regen-network/protobuf" [mod."github.com/golang/glog"] - version = "v1.1.0" - hash = "sha256-FgkBzn32nsq5Fpz0KKOrOqKap6pa2A1P3N2C0/Qp820=" + version = "v1.1.2" + hash = "sha256-sxvf1xMel10gNBqyGIFGFcyjupdM+nVMKUQ/lMLh3Ak=" [mod."github.com/golang/groupcache"] version = "v0.0.0-20210331224755-41bb18bfe9da" hash = "sha256-7Gs7CS9gEYZkbu5P4hqPGBpeGZWC64VDwraSKFF+VR0=" + [mod."github.com/golang/mock"] + version = "v1.6.0" + hash = "sha256-fWdnMQisRbiRzGT3ISrUHovquzLRHWvcv1JEsJFZRno=" [mod."github.com/golang/protobuf"] version = "v1.5.3" hash = "sha256-svogITcP4orUIsJFjMtp+Uv1+fKJv2Q5Zwf2dMqnpOQ=" @@ -208,24 +239,24 @@ schema = 3 [mod."github.com/google/go-cmp"] version = "v0.5.9" hash = "sha256-lQc4O00R3QSMGs9LP8Sy7A9kj0cqV5rrUdpnGeipIyg=" - [mod."github.com/google/gofuzz"] - version = "v1.2.0" - hash = "sha256-T6Gz741l45L3F6Dt7fiAuQvQQg59Qtap3zG05M2cfqU=" [mod."github.com/google/orderedcode"] version = "v0.0.1" hash = "sha256-KrExYovtUQrHGI1mPQf57jGw8soz7eWOC2xqEaV0uGk=" [mod."github.com/google/renameio"] version = "v1.0.0" hash = "sha256-BB7pBAvdOPPkWvs0z5cVdt1QzKfO6mMlR6UEFgn0koE=" + [mod."github.com/google/s2a-go"] + version = "v0.1.4" + hash = "sha256-amTAj6SNERMPxAA43KrzwYgu6GMooayfHCsdkoTI17c=" [mod."github.com/google/uuid"] version = "v1.3.0" hash = "sha256-QoR55eBtA94T2tBszyxfDtO7/pjZZSGb5vm7U0Xhs0Y=" [mod."github.com/googleapis/enterprise-certificate-proxy"] - version = "v0.2.3" - hash = "sha256-4yaBdpdRuv5vkGlwxKPlZ/IVSeHlcP9PJaLcyn4wNJk=" + version = "v0.2.4" + hash = "sha256-4tXjS3R7qKlmA/UueJP7LFk0Tw4anuqKrEW/lnlOrY8=" [mod."github.com/googleapis/gax-go/v2"] - version = "v2.7.1" - hash = "sha256-nP7Mi2yi/4mYuZXWKBBCAVxvGGTK+t2AvbLMg1QFyjU=" + version = "v2.12.0" + hash = "sha256-ZcXS+1B11UaJHf8D15N3ZCh00fiMUncpHd+eNRffLZ4=" [mod."github.com/gorilla/handlers"] version = "v1.5.1" hash = "sha256-GnBAARgOx1E+hDMQ63SI17hdhGtLQxb31lZOmn5j/pU=" @@ -254,8 +285,8 @@ schema = 3 version = "v0.5.2" hash = "sha256-N9GOKYo7tK6XQUFhvhImtL7PZW/mr4C4Manx/yPVvcQ=" [mod."github.com/hashicorp/go-getter"] - version = "v1.7.0" - hash = "sha256-kjXfacmxofi5mtyh9wpPeo3yBHNJMcTrfyEbYEAzLfs=" + version = "v1.7.1" + hash = "sha256-szIdn7GPvJ78gKKzQRWlx39X81QRDsXtJKo3P/4oMIg=" [mod."github.com/hashicorp/go-immutable-radix"] version = "v1.3.1" hash = "sha256-65+A2HiVfS/GV9G+6/TkXXjzXhI/V98e6RlJWjxy+mg=" @@ -272,8 +303,11 @@ schema = 3 version = "v1.0.0" hash = "sha256-xsRCmYyBfglMxeWUvTZqkaRLSW+V2FvNodEDjTGg1WA=" [mod."github.com/hdevalence/ed25519consensus"] - version = "v0.0.0-20220222234857-c00d1f31bab3" - hash = "sha256-1ec2xc7l9oNtWJwVtx14HnozMZCe2DpfXmu1xI1Z/yo=" + version = "v0.1.0" + hash = "sha256-MkqFWnyXt653RaJQUMWWxcW6NCskIxou8VEfj+8vd3Y=" + [mod."github.com/huandu/skiplist"] + version = "v1.2.0" + hash = "sha256-/r4QP1SldMlhpkr1ZQFHImSYaeMZEtqBW7R53yN+JtQ=" [mod."github.com/imdario/mergo"] version = "v0.3.13" hash = "sha256-03LKAZXgR5YUMeK5IRh2ds2GyV6uSbdq5QCPbAzlTus=" @@ -281,8 +315,8 @@ schema = 3 version = "v0.15.0" hash = "sha256-9oqKb5Y3hjleOFE2BczbEzLH6q2Jg7kUTP/M8Yk4Ne4=" [mod."github.com/inconshreveable/mousetrap"] - version = "v1.0.1" - hash = "sha256-ZTP9pLgwAAvHYK5A4PqwWCHGt00x5zMSOpCPoomQ3Sg=" + version = "v1.1.0" + hash = "sha256-XWlYH0c8IcxAwQTnIi6WYqq44nOKUylSWxWO/vi+8pE=" [mod."github.com/jmespath/go-jmespath"] version = "v0.4.0" hash = "sha256-xpT9g2qIXmPq7eeHUXHiDqJeQoHCudh44G/KCSFbcuo=" @@ -290,8 +324,8 @@ schema = 3 version = "v1.0.0" hash = "sha256-xEd0mDBeq3eR/GYeXjoTVb2sPs8sTCosn5ayWkcgENI=" [mod."github.com/klauspost/compress"] - version = "v1.16.0" - hash = "sha256-bMMwJhgK/uR3xq16XdqE2ge8x0fn6WK1NGkU3cKSWV4=" + version = "v1.16.7" + hash = "sha256-8miX/lnXyNLPSqhhn5BesLauaIAxETpQpWtr1cu2f+0=" [mod."github.com/kr/pretty"] version = "v0.3.1" hash = "sha256-DlER7XM+xiaLjvebcIPiB12oVNjyZHuJHoRGITzzpKU=" @@ -311,8 +345,8 @@ schema = 3 version = "v1.8.4" hash = "sha256-AGQ0YEuwUaev/mxOkiTNgAOLB9c7reHyTmNxXuaRah8=" [mod."github.com/magiconair/properties"] - version = "v1.8.6" - hash = "sha256-xToSfpuePctkTdhJtsuKIEkXwfMZbnkFT98ahIfd4wY=" + version = "v1.8.7" + hash = "sha256-XQ2bnc2s7/IH3WxEO4GishZurMyKwEclZy1DXg+2xXc=" [mod."github.com/manifoldco/promptui"] version = "v0.9.0" hash = "sha256-Fe2OPoyRExZejwtUBivKhfJAJW7o9b1eyYpgDlWQ1No=" @@ -343,9 +377,6 @@ schema = 3 [mod."github.com/mtibben/percent"] version = "v0.2.1" hash = "sha256-Zj1lpCP6mKQ0UUTMs2By4LC414ou+iJzKkK+eBHfEcc=" - [mod."github.com/pelletier/go-toml"] - version = "v1.9.5" - hash = "sha256-RJ9K1BTId0Mled7S66iGgxHkZ5JKEIsrrNaEfM8aImc=" [mod."github.com/pelletier/go-toml/v2"] version = "v2.0.8" hash = "sha256-wWxswr/lTq+McYbScmJM1ECKQ6eNJ5m44SM7TmrHThM=" @@ -376,30 +407,27 @@ schema = 3 [mod."github.com/rcrowley/go-metrics"] version = "v0.0.0-20201227073835-cf1acfcdf475" hash = "sha256-10ytHQ1SpMKYTiKuOPdEMuOVa8HVvv9ryYSIF9BHEBI=" - [mod."github.com/regen-network/cosmos-proto"] - version = "v0.3.1" - hash = "sha256-Bchbq/Hg72EA7Hevs8+PNuENuQaZAzk3qeVjMqFMUxc=" [mod."github.com/rogpeppe/go-internal"] - version = "v1.9.0" - hash = "sha256-XKmbu8l55XGrvC20j8jocpauwZsdbP83YAwH79BEAC4=" + version = "v1.11.0" + hash = "sha256-BucSndJVnqX9e6p5PfA6Z8N2bGfIeRfxAxYLUDXTbIo=" [mod."github.com/rs/cors"] - version = "v1.8.2" - hash = "sha256-FxBbQVb8zIoDGGaAJKfsYV0+POkh1tyX7P6A/Lk5Vsc=" + version = "v1.8.3" + hash = "sha256-VgVB4HKAhPSjNg96mIEUN1bt5ZQng8Fi3ZABy3CDWQE=" [mod."github.com/rs/zerolog"] - version = "v1.29.1" - hash = "sha256-UX+uiffB13Wdt1DGatxm0WiDWnI91w5Vxfhz4D7oLAw=" + version = "v1.30.0" + hash = "sha256-fOJEpuiJmsp9ONqvmPGOyoBEDfJHBfUH8liiRCWDe1E=" [mod."github.com/sasha-s/go-deadlock"] version = "v0.3.1" hash = "sha256-2CBEi9/iN/OMt7wEIG+hRjgDH6CRWIgibGGGy1dQ78I=" [mod."github.com/spf13/afero"] - version = "v1.9.2" - hash = "sha256-R1mir7Fu95QK+YL99U14RGbLJzxqWRH5rSFpssgJvzA=" + version = "v1.9.5" + hash = "sha256-+XECQxkx0P+ZaQDm4dQ6ItMtHMj+2uNemEC18dsdor0=" [mod."github.com/spf13/cast"] - version = "v1.5.0" - hash = "sha256-Pdp+wC5FWqyJKzyYHb7JCcV9BoJk/sxQw6nLyuLJvuQ=" + version = "v1.5.1" + hash = "sha256-/tQNGGQv+Osp+2jepQaQe6GlncZbqdxzSR82FieiUBU=" [mod."github.com/spf13/cobra"] - version = "v1.6.1" - hash = "sha256-80B5HcYdFisz6QLYkTyka7f9Dr6AfcVyPwp3QChoXwU=" + version = "v1.7.0" + hash = "sha256-bom9Zpnz8XPwx9IVF+GAodd3NVQ1dM1Uwxn8sy4Gmzs=" [mod."github.com/spf13/jwalterweatherman"] version = "v1.1.0" hash = "sha256-62BQtqTLF/eVrTOr7pUXE7AiHRjOVC8jQs3/Ehmflfs=" @@ -407,14 +435,14 @@ schema = 3 version = "v1.0.5" hash = "sha256-w9LLYzxxP74WHT4ouBspH/iQZXjuAh2WQCHsuvyEjAw=" [mod."github.com/spf13/viper"] - version = "v1.14.0" - hash = "sha256-qn3VzD339HZIub5QP4aWVciSufAfVb9llbmQZ8pfDEs=" + version = "v1.16.0" + hash = "sha256-TgBr1SBMaus1oAlA5Kn+iNUJfQCMyo0hT/xFaA7hreQ=" [mod."github.com/stretchr/testify"] version = "v1.8.4" hash = "sha256-MoOmRzbz9QgiJ+OOBo5h5/LbilhJfRUryvzHJmXAWjo=" [mod."github.com/subosito/gotenv"] - version = "v1.4.1" - hash = "sha256-aHAUs8Gh+BREUulljWr7vBZQg1BLu/M/8UfNK8CWSn8=" + version = "v1.4.2" + hash = "sha256-LnrDR1k/AoCFWBMcU7vQsoQLkZ65evT2hoQHLDudTsg=" [mod."github.com/syndtr/goleveldb"] version = "v1.0.1-0.20210819022825-2ae1ddf74ef7" hash = "sha256-36a4hgVQfwtS2zhylKpQuFhrjdc/Y8pF0dxc26jcZIU=" @@ -422,17 +450,9 @@ schema = 3 [mod."github.com/tendermint/go-amino"] version = "v0.16.0" hash = "sha256-JW4zO/0vMzf1dXLePOqaMtiLUZgNbuIseh9GV+jQlf0=" - [mod."github.com/tendermint/tendermint"] - version = "v0.34.29" - hash = "sha256-ybOpS3Hy4aIzB5rFNp9OH7LYgBjSALp5hC4CZzRG9ro=" - replaced = "github.com/cometbft/cometbft" - [mod."github.com/tendermint/tm-db"] - version = "v0.6.8-0.20230424032152-87c7e7f4fb61" - hash = "sha256-JakswLqhXRhdgzpL/YoXYUK39kG8Nxl7bzbEX/N8lNU=" - replaced = "github.com/crypto-org-chain/tm-db" [mod."github.com/tidwall/btree"] - version = "v1.5.0" - hash = "sha256-iWll4/+ADLVse3VAHxXYLprILugX/+3u0ZIk0YlLv/Q=" + version = "v1.6.0" + hash = "sha256-H4S46Yk3tVfOtrEhVWUrF4S1yWYmzU43W80HlzS9rcY=" [mod."github.com/tidwall/gjson"] version = "v1.14.0" hash = "sha256-TiMGdAn840a2tOsi5mQ6fAK62ohvY6zuoVaUHCTyIwA=" @@ -449,17 +469,17 @@ schema = 3 version = "v1.1.7" hash = "sha256-HLLFUEw8hWSSSSPSWZHt2KjoZftbje3Xxd9gROM2I+U=" [mod."github.com/ulikunitz/xz"] - version = "v0.5.10" - hash = "sha256-bogOwQNmQVS7W+C7wci7XEUeYm9TB7PnxnyBIXKYbm0=" + version = "v0.5.11" + hash = "sha256-SUyrjc2wyN3cTGKe5JdBEXjtZC1rJySRxJHVUZ59row=" [mod."github.com/zbiljic/go-filelock"] version = "v0.0.0-20170914061330-1dbf7103ab7d" hash = "sha256-JqNj/Wg8nGFSmndgYC7+FZzL2zG7rwOQMjlqYs3ZGvw=" [mod."github.com/zondax/hid"] - version = "v0.9.1" - hash = "sha256-hSVmN/f/lQHFhF60o6ej78ELC0MMoqQgqIX2hHjdTXg=" + version = "v0.9.2" + hash = "sha256-9h1gEJ/loyaJvu9AsmslztiA8U9ixDTC6TBw9lCU2BE=" [mod."github.com/zondax/ledger-go"] - version = "v0.14.1" - hash = "sha256-iQmShSaty50yYTbYPNd4fnOyrcEG7P2fWmj+fLJQW4s=" + version = "v0.14.3" + hash = "sha256-tldEok5ebZ4R4B7H8dSlYS5oVuLvh89n9wUaVlDjYwg=" [mod."go.etcd.io/bbolt"] version = "v1.3.7" hash = "sha256-poZk8tPLDWwW95oCOkTJcQtEvOJTD9UXAZ2TqGJutwk=" @@ -470,17 +490,17 @@ schema = 3 version = "v0.17.0" hash = "sha256-/vzBaeD/Ymyc7cpjBvSfJfuZ57zWa9LOaZM7b33eIx0=" [mod."golang.org/x/exp"] - version = "v0.0.0-20230310171629-522b1b587ee0" - hash = "sha256-C/uVh07/uaKihQ4OtkT0tOUgjnKWabBEPANyA6wgPHo=" + version = "v0.0.0-20230711153332-06a737ee72cb" + hash = "sha256-Cbw10ZJ+jATPV232G47xZrn6ExO1FDtiT6nlMRCH7EI=" [mod."golang.org/x/net"] version = "v0.17.0" hash = "sha256-qRawHWLSsJ06QNbLhUWPXGVSO1eaioeC9xZlUEWN8J8=" [mod."golang.org/x/oauth2"] - version = "v0.7.0" - hash = "sha256-KQU6ZlzWMvBjBdCAdyZbdwXkyqIskKFWmJIM11m1shY=" + version = "v0.10.0" + hash = "sha256-fKUwQ8HPEP4y6ZAtNHHHMDMYn2Fo6qTMcY45BbpE+Eg=" [mod."golang.org/x/sync"] - version = "v0.1.0" - hash = "sha256-Hygjq9euZ0qz6TvHYQwOZEjNiTbTh1nSLRAWZ6KFGR8=" + version = "v0.3.0" + hash = "sha256-bCJKLvwExhYacH2ZrWlZ38lr1d6oNenNt2m1QqDCs0o=" [mod."golang.org/x/sys"] version = "v0.15.0" hash = "sha256-n7TlABF6179RzGq3gctPDKDPRtDfnwPdjNCMm8ps2KY=" @@ -494,20 +514,26 @@ schema = 3 version = "v0.0.0-20220907171357-04be3eba64a2" hash = "sha256-6+zueutgefIYmgXinOflz8qGDDDj0Zhv+2OkGhBTKno=" [mod."google.golang.org/api"] - version = "v0.114.0" - hash = "sha256-TPzM5s0MTqxJhN44y0V55ENv/bVP3xSTHHoW6BOFix8=" + version = "v0.128.0" + hash = "sha256-yfyjrqpgemcsLSnVJwIGH17SJyo2jYyh5Ziyb08IN9s=" [mod."google.golang.org/appengine"] version = "v1.6.7" hash = "sha256-zIxGRHiq4QBvRqkrhMGMGCaVL4iM4TtlYpAi/hrivS4=" [mod."google.golang.org/genproto"] - version = "v0.0.0-20230410155749-daa745c078e1" - hash = "sha256-zHQgvWQBBK32YAIS2xLdO4Cg0xm6+z3IOZ2HstXPr4Y=" + version = "v0.0.0-20231012201019-e917dd12ba7a" + hash = "sha256-t7EtLGl9yOIHvkgAK97pMN1agzhcjdpG9zZewsurEnQ=" + [mod."google.golang.org/genproto/googleapis/api"] + version = "v0.0.0-20231002182017-d307bd883b97" + hash = "sha256-zhjugz/BTV4l9UAKcWIK/Fh10RNS46VIrOqu+ULAitU=" + [mod."google.golang.org/genproto/googleapis/rpc"] + version = "v0.0.0-20231016165738-49dd2c1f3d0b" + hash = "sha256-ntiSoQBTSUfcdkolvYVXWD3BgF+0yur6ZqW+bxtxVlY=" [mod."google.golang.org/grpc"] - version = "v1.56.3" - hash = "sha256-5/b/IY6uJ6OF1JJHl1RzuMXt1rOjZ+ls9mYQyh2kTl8=" + version = "v1.58.3" + hash = "sha256-YxXO1UAc/+4E0bsSsGSiFNrY3yyR6AIml/1sVY2QJjQ=" [mod."google.golang.org/protobuf"] - version = "v1.30.0" - hash = "sha256-Y07NKhSuJQ2w7F7MAINQyBf+/hdMHOrxwA3B4ljQQKs=" + version = "v1.31.0" + hash = "sha256-UdIk+xRaMfdhVICvKRk1THe3R1VU+lWD8hqoW/y8jT0=" [mod."gopkg.in/ini.v1"] version = "v1.67.0" hash = "sha256-V10ahGNGT+NLRdKUyRg1dos5RxLBXBk1xutcnquc/+4=" @@ -520,6 +546,9 @@ schema = 3 [mod."nhooyr.io/websocket"] version = "v1.8.6" hash = "sha256-DyaiCc/1iELrl6JSpz6WYMtFwUiSCOSoNF8IhSyP1ag=" + [mod."pgregory.net/rapid"] + version = "v0.5.5" + hash = "sha256-VUgKDG+AcSVdsqKk5H4doz2rvehsWgt8rdZPDMKFDtE=" [mod."sigs.k8s.io/yaml"] version = "v1.3.0" hash = "sha256-RVp8vca2wxg8pcBDYospG7Z1dujoH7zXNu2rgZ1kky0=" diff --git a/integration_tests/configs/cosmovisor.jsonnet b/integration_tests/configs/cosmovisor.jsonnet index a978e2e96..ea06bf06e 100644 --- a/integration_tests/configs/cosmovisor.jsonnet +++ b/integration_tests/configs/cosmovisor.jsonnet @@ -2,8 +2,29 @@ local config = import 'default.jsonnet'; config { chaintest+: { - validators: [super.validators[0] { + validators: [validator { 'app-config':: super['app-config'], - }] + super.validators[1:], + client_config: { + 'broadcast-mode': 'block', + }, + } for validator in super.validators], + genesis+: { + app_state+: { + gov: { + voting_params: { + voting_period: '10s', + }, + deposit_params: { + max_deposit_period: '10s', + min_deposit: [ + { + denom: 'basecro', + amount: '10000000', + }, + ], + }, + }, + }, + }, }, } diff --git a/integration_tests/configs/genesis.jsonnet b/integration_tests/configs/genesis.jsonnet index 45b2ad49e..563f26daa 100644 --- a/integration_tests/configs/genesis.jsonnet +++ b/integration_tests/configs/genesis.jsonnet @@ -6,10 +6,8 @@ }, }, gov: { - voting_params: { + params: { voting_period: '10s', - }, - deposit_params: { max_deposit_period: '10s', min_deposit: [ { diff --git a/integration_tests/configs/slashing.jsonnet b/integration_tests/configs/slashing.jsonnet index 2caf77e47..13b327ecb 100644 --- a/integration_tests/configs/slashing.jsonnet +++ b/integration_tests/configs/slashing.jsonnet @@ -7,7 +7,7 @@ local genesis = import 'genesis.jsonnet'; coins: value, staked: value, client_config: { - 'broadcast-mode': 'block', + 'broadcast-mode': 'sync', }, } for value in ['40cro', '10cro', '10cro']], accounts: default.accounts + default.reserves, diff --git a/integration_tests/configs/solo_machine.jsonnet b/integration_tests/configs/solo_machine.jsonnet index 67dce3ca0..bd4e79ba3 100644 --- a/integration_tests/configs/solo_machine.jsonnet +++ b/integration_tests/configs/solo_machine.jsonnet @@ -38,7 +38,8 @@ }, }, gov: { - deposit_params: { + params: { + voting_period: '21600000000000ns', max_deposit_period: '21600000000000ns', min_deposit: [ { @@ -47,9 +48,6 @@ }, ], }, - voting_params: { - voting_period: '21600000000000ns', - }, }, mint: { minter: { diff --git a/integration_tests/configs/staking.jsonnet b/integration_tests/configs/staking.jsonnet index 9dbe53906..da8e390d6 100644 --- a/integration_tests/configs/staking.jsonnet +++ b/integration_tests/configs/staking.jsonnet @@ -8,7 +8,7 @@ local validator = import 'validator.jsonnet'; staked: '1cro', min_self_delegation: 10000000, // 0.1cro client_config: { - 'broadcast-mode': 'block', + 'broadcast-mode': 'sync', }, }], accounts: default.accounts + [ diff --git a/integration_tests/configs/validator.jsonnet b/integration_tests/configs/validator.jsonnet index 7a6a3d5b4..b969b725a 100644 --- a/integration_tests/configs/validator.jsonnet +++ b/integration_tests/configs/validator.jsonnet @@ -2,6 +2,6 @@ coins: '10cro', staked: '10cro', client_config: { - 'broadcast-mode': 'block', + 'broadcast-mode': 'sync', }, } diff --git a/integration_tests/cosmoscli.py b/integration_tests/cosmoscli.py index 645b38afd..f60036f23 100644 --- a/integration_tests/cosmoscli.py +++ b/integration_tests/cosmoscli.py @@ -6,9 +6,33 @@ class CosmosCLI(cosmoscli.CosmosCLI): - def gov_propose_legacy(self, proposer, kind, proposal, no_validate=False, **kwargs): + def submit_gov_proposal(self, proposal, **kwargs): + rsp = json.loads( + self.raw( + "tx", + "gov", + "submit-proposal", + proposal, + "-y", + home=self.data_dir, + **kwargs, + ) + ) + if rsp["code"] == 0: + rsp = self.event_query_tx_for(rsp["txhash"]) + return rsp + + def gov_propose_legacy( + self, + proposer, + kind, + proposal, + no_validate=False, + event_query_tx=True, + **kwargs, + ): if kind == "software-upgrade": - return json.loads( + rsp = json.loads( self.raw( "tx", "gov", @@ -23,17 +47,21 @@ def gov_propose_legacy(self, proposer, kind, proposal, no_validate=False, **kwar description=proposal.get("description"), upgrade_height=proposal.get("upgrade-height"), upgrade_time=proposal.get("upgrade-time"), - upgrade_info=proposal.get("upgrade-info"), + upgrade_info=proposal.get("upgrade-info", "info"), deposit=proposal.get("deposit"), # basic home=self.data_dir, node=self.node_rpc, keyring_backend="test", chain_id=self.chain_id, + **kwargs, ) ) + if rsp["code"] == 0 and event_query_tx: + rsp = self.event_query_tx_for(rsp["txhash"]) + return rsp elif kind == "cancel-software-upgrade": - return json.loads( + rsp = json.loads( self.raw( "tx", "gov", @@ -50,13 +78,17 @@ def gov_propose_legacy(self, proposer, kind, proposal, no_validate=False, **kwar node=self.node_rpc, keyring_backend="test", chain_id=self.chain_id, + **kwargs, ) ) + if rsp["code"] == 0 and event_query_tx: + rsp = self.event_query_tx_for(rsp["txhash"]) + return rsp else: with tempfile.NamedTemporaryFile("w") as fp: json.dump(proposal, fp) fp.flush() - return json.loads( + rsp = json.loads( self.raw( "tx", "gov", @@ -70,17 +102,29 @@ def gov_propose_legacy(self, proposer, kind, proposal, no_validate=False, **kwar node=self.node_rpc, keyring_backend="test", chain_id=self.chain_id, + **kwargs, ) ) + if rsp["code"] == 0 and event_query_tx: + rsp = self.event_query_tx_for(rsp["txhash"]) + return rsp - def transfer(self, from_, to, coins, generate_only=False, **kwargs): + def transfer( + self, + from_, + to, + coins, + generate_only=False, + event_query_tx=True, + **kwargs, + ): default_kwargs = { "home": self.data_dir, "keyring_backend": "test", "chain_id": self.chain_id, "node": self.node_rpc, } - return json.loads( + rsp = json.loads( self.raw( "tx", "bank", @@ -93,6 +137,9 @@ def transfer(self, from_, to, coins, generate_only=False, **kwargs): **(default_kwargs | kwargs), ) ) + if not generate_only and rsp["code"] == 0 and event_query_tx: + rsp = self.event_query_tx_for(rsp["txhash"]) + return rsp def sign_tx(self, tx_file, signer): return json.loads( @@ -121,18 +168,21 @@ def sign_tx_json(self, tx, signer, max_priority_price=None): fp.flush() return self.sign_tx(fp.name, signer) - def broadcast_tx(self, tx_file, **kwargs): - kwargs.setdefault("broadcast_mode", "block") + def broadcast_tx(self, tx_file, event_query_tx=True, **kwargs): + kwargs.setdefault("broadcast_mode", "sync") kwargs.setdefault("output", "json") - return json.loads( + rsp = json.loads( self.raw("tx", "broadcast", tx_file, node=self.node_rpc, **kwargs) ) + if event_query_tx and rsp["code"] == 0: + rsp = self.event_query_tx_for(rsp["txhash"]) + return rsp - def broadcast_tx_json(self, tx, **kwargs): + def broadcast_tx_json(self, tx, event_query_tx=True, **kwargs): with tempfile.NamedTemporaryFile("w") as fp: json.dump(tx, fp) fp.flush() - return self.broadcast_tx(fp.name, **kwargs) + return self.broadcast_tx(fp.name, event_query_tx, **kwargs) def tx_search_rpc(self, events: str): node_rpc_http = "http" + self.node_rpc.removeprefix("tcp") @@ -186,6 +236,20 @@ def query_host_params(self): ) ) + def query_params(self, mod): + kwargs = { + "node": self.node_rpc, + "output": "json", + } + return json.loads( + self.raw( + "q", + mod, + "params", + **kwargs, + ) + ) + class ClusterCLI(cluster.ClusterCLI): def __init__(self, *args, **kwargs): @@ -202,8 +266,27 @@ def cosmos_cli(self, i=0): zemu_button_port=self.zemu_button_port, ) - def gov_propose_legacy(self, proposer, kind, proposal, i=0, **kwargs): - return self.cosmos_cli(i).gov_propose_legacy(proposer, kind, proposal, **kwargs) + def submit_gov_proposal(self, proposer, i=0, **kwargs): + return self.cosmos_cli(i).submit_gov_proposal(proposer, **kwargs) + + def gov_propose_legacy( + self, + proposer, + kind, + proposal, + i=0, + no_validate=False, + event_query_tx=True, + **kwargs, + ): + return self.cosmos_cli(i).gov_propose_legacy( + proposer, + kind, + proposal, + no_validate, + event_query_tx, + **kwargs, + ) def transfer(self, from_, to, coins, i=0, generate_only=False, **kwargs): return self.cosmos_cli(i).transfer(from_, to, coins, generate_only, **kwargs) @@ -213,3 +296,6 @@ def sign_batch_multisig_tx(self, *args, i=0, **kwargs): def query_host_params(self, i=0): return self.cosmos_cli(i).query_host_params() + + def query_params(self, mod, i=0): + return self.cosmos_cli(i).query_params(mod) diff --git a/integration_tests/ibc_utils.py b/integration_tests/ibc_utils.py index d9c6b48a9..ee15453c6 100644 --- a/integration_tests/ibc_utils.py +++ b/integration_tests/ibc_utils.py @@ -1,9 +1,11 @@ +import hashlib +import json import re import subprocess from pystarport import ports -from .utils import wait_for_block, wait_for_port +from .utils import wait_for_block, wait_for_fn, wait_for_port def wait_relayer_ready(cluster): @@ -64,3 +66,71 @@ def start_and_wait_relayer( query = relayer + ["query", "channels", "--chain"] return search_target(query, "channel", chains) + + +def ibc_transfer_flow(cluster, src_channel, dst_channel): + # call chain-maind directly + raw = cluster["ibc-0"].cosmos_cli().raw + denom = "basecro" + amt = 10000 + origin = 10000000000 + + addr_0 = cluster["ibc-0"].address("relayer") + addr_1 = cluster["ibc-1"].address("relayer") + + assert cluster["ibc-0"].balance(addr_0) == origin + assert cluster["ibc-1"].balance(addr_1) == origin + + # do a transfer from ibc-0 to ibc-1 + rsp = cluster["ibc-0"].ibc_transfer( + "relayer", addr_1, f"{amt}{denom}", src_channel, 1 + ) + assert rsp["code"] == 0, rsp["raw_log"] + # sender balance decreased + assert cluster["ibc-0"].balance(addr_0) == origin - amt + denom_hash = ( + hashlib.sha256(f"transfer/{dst_channel}/{denom}".encode()).hexdigest().upper() + ) + ibc_denom = f"ibc/{denom_hash}" + old_dst_balance = cluster["ibc-1"].balance(addr_1, ibc_denom) + new_dst_balance = 0 + + def check_balance_change(): + nonlocal new_dst_balance + new_dst_balance = cluster["ibc-1"].balance(addr_1, ibc_denom) + return new_dst_balance != old_dst_balance + + wait_for_fn("balance change", check_balance_change) + # recipient get the coins + assert new_dst_balance == amt + old_dst_balance, new_dst_balance + assert json.loads( + raw( + "query", + "ibc-transfer", + "denom-trace", + denom_hash, + node=cluster["ibc-1"].node_rpc(0), + output="json", + ) + ) == {"denom_trace": {"path": f"transfer/{dst_channel}", "base_denom": denom}} + + # transfer back + rsp = cluster["ibc-1"].ibc_transfer( + "relayer", addr_0, f"{amt}{ibc_denom}", dst_channel, 0 + ) + print("ibc transfer back") + assert rsp["code"] == 0, rsp["raw_log"] + + old_src_balance = cluster["ibc-0"].balance(addr_0, denom) + new_src_balance = 0 + + def check_balance_change(): + nonlocal new_src_balance + new_src_balance = cluster["ibc-0"].balance(addr_0, denom) + return new_src_balance != old_src_balance + + wait_for_fn("balance change", check_balance_change) + + # both accounts return to normal + for i, cli in enumerate(cluster.values()): + assert cli.balance(cli.address("relayer"), denom=denom) == origin diff --git a/integration_tests/install_solo_machine.nix b/integration_tests/install_solo_machine.nix index a558d22ca..6577989c2 100644 --- a/integration_tests/install_solo_machine.nix +++ b/integration_tests/install_solo_machine.nix @@ -1,17 +1,22 @@ { stdenv, fetchurl, lib }: let - version = "v0.1.2"; + version = "v0.1.3"; srcUrl = { x86_64-linux = { url = "https://github.com/crypto-com/ibc-solo-machine/releases/download/${version}/ubuntu-latest-${version}.tar.gz"; - sha256 = "sha256-GEfHyUKvq69RAGWv29PAG3pFlBraXXhdkTcG045dePw="; + sha256 = "sha256-Ui92r8J0I3jWGUvaI83rf9PMNyBW4yfnq98lcJ+1fkg="; }; x86_64-darwin = { url = "https://github.com/crypto-com/ibc-solo-machine/releases/download/${version}/macos-latest-${version}.tar.gz"; sha256 = "sha256-zx4342stMYzgQDXAKwnZKSfdLynGIApOFKZ+CjRCyaE="; }; + aarch64-darwin = { + url = + "https://github.com/crypto-com/ibc-solo-machine/releases/download/${version}/macos-latest-${version}.tar.gz"; + sha256 = "sha256-vVgsng5jpmKRODUvjDja/dTvysXSg14O0oVqRswlFts="; + }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); in diff --git a/integration_tests/test_authz.py b/integration_tests/test_authz.py index ecd82449a..31392789c 100644 --- a/integration_tests/test_authz.py +++ b/integration_tests/test_authz.py @@ -13,12 +13,12 @@ AUTHORIZATION_UNBOND, AUTHZ, BASECRO_DENOM, - BLOCK_BROADCASTING, DELEGATE_MSG_TYPE_URL, GENERATE_ONLY, GRANTS, REDELEGATE_MSG_TYPE_URL, SEND_MSG_TYPE_URL, + SYNC_BROADCASTING, UNBOND_MSG_TYPE_URL, WITHDRAW_DELEGATOR_REWARD_TYPE_URL, cluster_fixture, @@ -85,7 +85,7 @@ def test_execute_tx_within_authorization_spend_limit(self, cluster_temp, tmp_pat cluster_temp, generated_tx_txt, grantee_address, - broadcast_mode=BLOCK_BROADCASTING, + broadcast_mode=SYNC_BROADCASTING, ) wait_for_new_blocks(cluster_temp, 1) @@ -240,7 +240,7 @@ def test_generic_authorization_grant(self, cluster_temp, tmp_path): validator_address, "%s%s" % (delegate_coins, BASECRO_DENOM), granter_address, - broadcast_mode=BLOCK_BROADCASTING, + broadcast_mode=SYNC_BROADCASTING, ) # wait for some reward wait_for_new_blocks(cluster_temp, 2) @@ -266,7 +266,7 @@ def test_generic_authorization_grant(self, cluster_temp, tmp_path): cluster_temp, generated_tx_txt, grantee_address, - broadcast_mode=BLOCK_BROADCASTING, + broadcast_mode=SYNC_BROADCASTING, ) wait_for_new_blocks(cluster_temp, 1) diff --git a/integration_tests/test_basic.py b/integration_tests/test_basic.py index d041165ab..50c3aa369 100644 --- a/integration_tests/test_basic.py +++ b/integration_tests/test_basic.py @@ -37,40 +37,46 @@ def test_transfer(cluster): print("transfer tx", tx["txhash"]) assert tx["logs"] == [ { + "msg_index": 0, + "log": "", "events": [ { + "type": "message", "attributes": [ - {"key": "receiver", "value": reserve_addr}, - {"key": "amount", "value": "100000000basecro"}, + {"key": "action", "value": "/cosmos.bank.v1beta1.MsgSend"}, + {"key": "sender", "value": community_addr}, + {"key": "module", "value": "bank"}, ], - "type": "coin_received", }, { + "type": "coin_spent", "attributes": [ {"key": "spender", "value": community_addr}, {"key": "amount", "value": "100000000basecro"}, ], - "type": "coin_spent", }, { + "type": "coin_received", "attributes": [ - {"key": "action", "value": "/cosmos.bank.v1beta1.MsgSend"}, - {"key": "sender", "value": community_addr}, - {"key": "module", "value": "bank"}, + {"key": "receiver", "value": reserve_addr}, + {"key": "amount", "value": "100000000basecro"}, ], - "type": "message", }, { + "type": "transfer", "attributes": [ {"key": "recipient", "value": reserve_addr}, {"key": "sender", "value": community_addr}, {"key": "amount", "value": "100000000basecro"}, ], - "type": "transfer", + }, + { + "type": "message", + "attributes": [ + {"key": "sender", "value": community_addr}, + ], }, ], - "log": "", - "msg_index": 0, } ] diff --git a/integration_tests/test_gov.py b/integration_tests/test_gov.py index 604522e11..22d36ebb3 100644 --- a/integration_tests/test_gov.py +++ b/integration_tests/test_gov.py @@ -1,15 +1,16 @@ +import json from datetime import timedelta import pytest from dateutil.parser import isoparse -from .utils import parse_events, wait_for_block, wait_for_block_time +from .utils import get_proposal_id, module_address, wait_for_block, wait_for_block_time pytestmark = pytest.mark.gov @pytest.mark.parametrize("vote_option", ["yes", "no", "no_with_veto", "abstain", None]) -def test_param_proposal(cluster, vote_option): +def test_param_proposal(cluster, vote_option, tmp_path): """ - send proposal to change max_validators - all validator vote same option (None means don't vote) @@ -17,23 +18,7 @@ def test_param_proposal(cluster, vote_option): - check deposit refunded """ max_validators = cluster.staking_params()["max_validators"] - - rsp = cluster.gov_propose_legacy( - "community", - "param-change", - { - "title": "Increase number of max validators", - "description": "ditto", - "changes": [ - { - "subspace": "staking", - "key": "MaxValidators", - "value": max_validators + 1, - } - ], - }, - ) - assert rsp["code"] == 0, rsp["raw_log"] + rsp = change_max_validators(cluster, tmp_path, max_validators + 1) amount = approve_proposal(cluster, rsp, vote_option) new_max_validators = cluster.staking_params()["max_validators"] if vote_option == "yes": @@ -49,36 +34,50 @@ def test_param_proposal(cluster, vote_option): assert cluster.balance(cluster.address("ecosystem")) == amount -def approve_proposal(cluster, rsp, vote_option="yes"): - # get proposal_id - ev = parse_events(rsp["logs"])["submit_proposal"] - assert ev["proposal_messages"] == ",/cosmos.gov.v1.MsgExecLegacyContent", rsp - proposal_id = ev["proposal_id"] - proposal = cluster.query_proposal(proposal_id) - assert proposal["status"] == "PROPOSAL_STATUS_DEPOSIT_PERIOD", proposal +def change_max_validators(cluster, tmp_path, num, deposit="10000000basecro"): + params = cluster.staking_params() + params["max_validators"] = num + proposal = tmp_path / "proposal.json" + authority = module_address("gov") + proposal_src = { + "messages": [ + { + "@type": "/cosmos.staking.v1beta1.MsgUpdateParams", + "authority": authority, + "params": params, + } + ], + "deposit": deposit, + "title": "Increase number of max validators", + "summary": "ditto", + } + proposal.write_text(json.dumps(proposal_src)) + rsp = cluster.submit_gov_proposal(proposal, from_="community") + assert rsp["code"] == 0, rsp["raw_log"] + return rsp + +def approve_proposal( + cluster, + rsp, + vote_option="yes", + msg=",/cosmos.staking.v1beta1.MsgUpdateParams", +): + proposal_id = get_proposal_id(rsp, msg) + proposal = cluster.query_proposal(proposal_id) + if msg == ",/cosmos.gov.v1.MsgExecLegacyContent": + assert proposal["status"] == "PROPOSAL_STATUS_DEPOSIT_PERIOD", proposal amount = cluster.balance(cluster.address("ecosystem")) - rsp = cluster.gov_deposit("ecosystem", proposal_id, "1cro", event_query_tx=False) + rsp = cluster.gov_deposit("ecosystem", proposal_id, "1cro") assert rsp["code"] == 0, rsp["raw_log"] assert cluster.balance(cluster.address("ecosystem")) == amount - 100000000 proposal = cluster.query_proposal(proposal_id) assert proposal["status"] == "PROPOSAL_STATUS_VOTING_PERIOD", proposal if vote_option is not None: - rsp = cluster.gov_vote( - "validator", - proposal_id, - vote_option, - event_query_tx=False, - ) + rsp = cluster.gov_vote("validator", proposal_id, vote_option) assert rsp["code"] == 0, rsp["raw_log"] - rsp = cluster.gov_vote( - "validator", - proposal_id, - vote_option, - i=1, - event_query_tx=False, - ) + rsp = cluster.gov_vote("validator", proposal_id, vote_option, i=1) assert rsp["code"] == 0, rsp["raw_log"] assert ( int(cluster.query_tally(proposal_id, i=1)[vote_option + "_count"]) @@ -103,7 +102,7 @@ def approve_proposal(cluster, rsp, vote_option="yes"): return amount -def test_deposit_period_expires(cluster): +def test_deposit_period_expires(cluster, tmp_path): """ - proposal and partially deposit - wait for deposit period end and check @@ -111,45 +110,20 @@ def test_deposit_period_expires(cluster): - no refund """ amount1 = cluster.balance(cluster.address("community")) - rsp = cluster.gov_propose_legacy( - "community", - "param-change", - { - "title": "Increase number of max validators", - "description": "ditto", - "changes": [ - { - "subspace": "staking", - "key": "MaxValidators", - "value": 1, - } - ], - "deposit": "5000basecro", - }, - ) - assert rsp["code"] == 0, rsp["raw_log"] - ev = parse_events(rsp["logs"])["submit_proposal"] - assert ev["proposal_messages"] == ",/cosmos.gov.v1.MsgExecLegacyContent", rsp - proposal_id = ev["proposal_id"] - + denom = "basecro" + deposit_amt = 5000 + deposit = f"{deposit_amt}{denom}" + rsp = change_max_validators(cluster, tmp_path, 1, deposit) + proposal_id = get_proposal_id(rsp) proposal = cluster.query_proposal(proposal_id) - assert proposal["total_deposit"] == [{"denom": "basecro", "amount": "5000"}] - - assert cluster.balance(cluster.address("community")) == amount1 - 5000 - + assert proposal["total_deposit"] == [{"denom": denom, "amount": f"{deposit_amt}"}] + assert cluster.balance(cluster.address("community")) == amount1 - deposit_amt amount2 = cluster.balance(cluster.address("ecosystem")) - - rsp = cluster.gov_deposit( - "ecosystem", - proposal_id, - "5000basecro", - event_query_tx=False, - ) + rsp = cluster.gov_deposit("ecosystem", proposal_id, deposit) assert rsp["code"] == 0, rsp["raw_log"] proposal = cluster.query_proposal(proposal_id) - assert proposal["total_deposit"] == [{"denom": "basecro", "amount": "10000"}] - - assert cluster.balance(cluster.address("ecosystem")) == amount2 - 5000 + assert proposal["total_deposit"] == [{"denom": denom, "amount": f"{deposit_amt*2}"}] + assert cluster.balance(cluster.address("ecosystem")) == amount2 - deposit_amt # wait for deposit period passed wait_for_block_time( @@ -165,42 +139,42 @@ def test_deposit_period_expires(cluster): assert cluster.balance(cluster.address("ecosystem")) == amount2 -def test_community_pool_spend_proposal(cluster): +def test_community_pool_spend_proposal(cluster, tmp_path): """ - proposal a community pool spend - pass it """ - # need at least several blocks to populate community pool wait_for_block(cluster, 3) - amount = int(cluster.distribution_community()) assert amount > 0, "need positive pool to proceed this test" - recipient = cluster.address("community") old_amount = cluster.balance(recipient) - - rsp = cluster.gov_propose_legacy( - "community", - "community-pool-spend", - { - "title": "Community Pool Spend", - "description": "Pay me some cro!", - "recipient": recipient, - "amount": "%dbasecro" % amount, - "deposit": "10000001basecro", - }, - ) + proposal = tmp_path / "proposal.json" + authority = module_address("gov") + msg = "/cosmos.distribution.v1beta1.MsgCommunityPoolSpend" + amt = [{"denom": "basecro", "amount": f"{amount}"}] + proposal_src = { + "messages": [ + { + "@type": msg, + "authority": authority, + "recipient": recipient, + "amount": amt, + } + ], + "deposit": "10000001basecro", + "title": "Community Pool Spend", + "summary": "Pay me some cro!", + } + proposal.write_text(json.dumps(proposal_src)) + rsp = cluster.submit_gov_proposal(proposal, from_="community") assert rsp["code"] == 0, rsp["raw_log"] - - # get proposal_id - ev = parse_events(rsp["logs"])["submit_proposal"] - assert ev["proposal_messages"] == ",/cosmos.gov.v1.MsgExecLegacyContent", rsp - proposal_id = ev["proposal_id"] + proposal_id = get_proposal_id(rsp, f",{msg}") # vote - rsp = cluster.gov_vote("validator", proposal_id, "yes", event_query_tx=False) + rsp = cluster.gov_vote("validator", proposal_id, "yes") assert rsp["code"] == 0, rsp["raw_log"] - rsp = cluster.gov_vote("validator", proposal_id, "yes", i=1, event_query_tx=False) + rsp = cluster.gov_vote("validator", proposal_id, "yes", i=1) assert rsp["code"] == 0, rsp["raw_log"] # wait for voting period end @@ -209,14 +183,12 @@ def test_community_pool_spend_proposal(cluster): wait_for_block_time( cluster, isoparse(proposal["voting_end_time"]) + timedelta(seconds=1) ) - proposal = cluster.query_proposal(proposal_id) assert proposal["status"] == "PROPOSAL_STATUS_PASSED", proposal - assert cluster.balance(recipient) == old_amount + amount -def test_change_vote(cluster): +def test_change_vote(cluster, tmp_path): """ - submit proposal with deposit - vote yes @@ -224,44 +196,22 @@ def test_change_vote(cluster): - change vote - check tally """ - rsp = cluster.gov_propose_legacy( - "community", - "param-change", - { - "title": "Increase number of max validators", - "description": "ditto", - "changes": [ - { - "subspace": "staking", - "key": "MaxValidators", - "value": 1, - } - ], - "deposit": "10000000basecro", - }, - ) + rsp = change_max_validators(cluster, tmp_path, 1) + proposal_id = get_proposal_id(rsp) + rsp = cluster.gov_vote("validator", proposal_id, "yes") assert rsp["code"] == 0, rsp["raw_log"] - voting_power = int( cluster.validator(cluster.address("validator", bech="val"))["tokens"] ) - - proposal_id = parse_events(rsp["logs"])["submit_proposal"]["proposal_id"] - - rsp = cluster.gov_vote("validator", proposal_id, "yes", event_query_tx=False) - assert rsp["code"] == 0, rsp["raw_log"] - cluster.query_tally(proposal_id) == { "yes_count": str(voting_power), "no_count": "0", "abstain_count": "0", "no_with_veto_count": "0", } - # change vote to no - rsp = cluster.gov_vote("validator", proposal_id, "no", event_query_tx=False) + rsp = cluster.gov_vote("validator", proposal_id, "no") assert rsp["code"] == 0, rsp["raw_log"] - cluster.query_tally(proposal_id) == { "no_count": str(voting_power), "yes_count": "0", @@ -270,7 +220,7 @@ def test_change_vote(cluster): } -def test_inherit_vote(cluster): +def test_inherit_vote(cluster, tmp_path): """ - submit proposal with deposits - A delegate to V @@ -279,35 +229,16 @@ def test_inherit_vote(cluster): - A vote No - change tally: {yes: v, no: a} """ - rsp = cluster.gov_propose_legacy( - "community", - "param-change", - { - "title": "Increase number of max validators", - "description": "ditto", - "changes": [ - { - "subspace": "staking", - "key": "MaxValidators", - "value": 1, - } - ], - "deposit": "10000000basecro", - }, - ) - assert rsp["code"] == 0, rsp["raw_log"] - proposal_id = parse_events(rsp["logs"])["submit_proposal"]["proposal_id"] + rsp = change_max_validators(cluster, tmp_path, 1) + proposal_id = get_proposal_id(rsp) # non-validator voter voter1 = cluster.address("community") cluster.delegate_amount( - cluster.address("validator", bech="val"), - "10basecro", - voter1, - event_query_tx=False, + cluster.address("validator", bech="val"), "10basecro", voter1 ) - rsp = cluster.gov_vote("validator", proposal_id, "yes", event_query_tx=False) + rsp = cluster.gov_vote("validator", proposal_id, "yes") assert rsp["code"] == 0, rsp["raw_log"] assert cluster.query_tally(proposal_id) == { "yes_count": "1000000010", @@ -316,7 +247,7 @@ def test_inherit_vote(cluster): "no_with_veto_count": "0", } - rsp = cluster.gov_vote(voter1, proposal_id, "no", event_query_tx=False) + rsp = cluster.gov_vote(voter1, proposal_id, "no") assert rsp["code"] == 0, rsp["raw_log"] assert cluster.query_tally(proposal_id) == { @@ -347,6 +278,6 @@ def test_host_enabled(cluster): }, ) assert rsp["code"] == 0, rsp["raw_log"] - approve_proposal(cluster, rsp) + approve_proposal(cluster, rsp, msg=",/cosmos.gov.v1.MsgExecLegacyContent") p = cli.query_host_params() assert not p["host_enabled"] diff --git a/integration_tests/test_group.py b/integration_tests/test_group.py index 8b8f68915..c86b9975a 100644 --- a/integration_tests/test_group.py +++ b/integration_tests/test_group.py @@ -2,6 +2,8 @@ import pytest +from .utils import parse_events + pytestmark = pytest.mark.normal @@ -43,11 +45,11 @@ def test_group(cluster, tmp_path): ) assert rsp["code"] == 0, rsp["raw_log"] + rsp = cluster.event_query_tx_for(rsp["txhash"]) # Get group id from events - group_id = json.loads( - json.loads(rsp["raw_log"])[0]["events"][0]["attributes"][0]["value"] - ) + evt = parse_events(rsp["logs"])["cosmos.group.v1.EventCreateGroup"] + group_id = evt["group_id"] # create group policy policy_file = tmp_path / "policy.json" @@ -79,10 +81,9 @@ def test_group(cluster, tmp_path): ) assert rsp["code"] == 0, rsp["raw_log"] - - group_policy_address = json.loads( - json.loads(rsp["raw_log"])[0]["events"][0]["attributes"][0]["value"] - ) + rsp = cluster.event_query_tx_for(rsp["txhash"]) + evt = parse_events(rsp["logs"])["cosmos.group.v1.EventCreateGroupPolicy"] + group_policy_address = evt["address"].strip('"') # submit a proposal proposal_file = tmp_path / "proposal.json" @@ -98,6 +99,8 @@ def test_group(cluster, tmp_path): ], "metadata": "proposal", "proposers": [admin], + "title": "title", + "summary": "summary", } with open(proposal_file, "w") as f: @@ -119,10 +122,9 @@ def test_group(cluster, tmp_path): ) assert rsp["code"] == 0, rsp["raw_log"] - - proposal_id = json.loads( - json.loads(rsp["raw_log"])[0]["events"][0]["attributes"][0]["value"] - ) + rsp = cluster.event_query_tx_for(rsp["txhash"]) + evt = parse_events(rsp["logs"])["cosmos.group.v1.EventSubmitProposal"] + proposal_id = evt["proposal_id"] # vote on proposal rsp = json.loads( @@ -144,7 +146,7 @@ def test_group(cluster, tmp_path): ) assert rsp["code"] == 0, rsp["raw_log"] - + cluster.event_query_tx_for(rsp["txhash"]) rsp = json.loads( cli.raw( "tx", @@ -164,7 +166,7 @@ def test_group(cluster, tmp_path): ) assert rsp["code"] == 0, rsp["raw_log"] - + cluster.event_query_tx_for(rsp["txhash"]) # query proposal votes rsp = json.loads( cli.raw( @@ -177,7 +179,6 @@ def test_group(cluster, tmp_path): chain_id=cli.chain_id, ) ) - assert len(rsp["votes"]) == 2, rsp # transfer some amount to group policy address @@ -203,19 +204,10 @@ def test_group(cluster, tmp_path): ) assert rsp["code"] == 0, rsp["raw_log"] - + rsp = cluster.event_query_tx_for(rsp["txhash"]) # check if the proposal executed successfully - assert ( - json.loads( - list( - filter( - lambda attribute: attribute["key"] == "result", - json.loads(rsp["raw_log"])[0]["events"][2]["attributes"], - ) - )[0]["value"], - ) - == "PROPOSAL_EXECUTOR_RESULT_SUCCESS" - ), rsp["raw_log"] + evt = parse_events(rsp["logs"])["cosmos.group.v1.EventExec"] + assert evt["result"].strip('"') == "PROPOSAL_EXECUTOR_RESULT_SUCCESS" assert group_policy_balance - 100000000 == cluster.balance(group_policy_address) assert signer1_balance + 100000000 == cluster.balance(signer1) diff --git a/integration_tests/test_hardware_wallet.py b/integration_tests/test_hardware_wallet.py index 4afea94f1..daaf2904c 100644 --- a/integration_tests/test_hardware_wallet.py +++ b/integration_tests/test_hardware_wallet.py @@ -34,44 +34,50 @@ def test_ledger_transfer(cluster): reserve_balance = cluster.balance(reserve_addr) hw_balance = cluster.balance(hw_addr) - tx = cluster.transfer_from_ledger("hw", reserve_addr, "1cro", event_query_tx=False) + tx = cluster.transfer_from_ledger("hw", reserve_addr, "1cro") print("transfer tx", tx["txhash"]) assert tx["logs"] == [ { + "msg_index": 0, + "log": "", "events": [ { + "type": "message", "attributes": [ - {"key": "receiver", "value": reserve_addr}, - {"key": "amount", "value": "100000000basecro"}, + {"key": "action", "value": "/cosmos.bank.v1beta1.MsgSend"}, + {"key": "sender", "value": hw_addr}, + {"key": "module", "value": "bank"}, ], - "type": "coin_received", }, { + "type": "coin_spent", "attributes": [ {"key": "spender", "value": hw_addr}, {"key": "amount", "value": "100000000basecro"}, ], - "type": "coin_spent", }, { + "type": "coin_received", "attributes": [ - {"key": "action", "value": "/cosmos.bank.v1beta1.MsgSend"}, - {"key": "sender", "value": hw_addr}, - {"key": "module", "value": "bank"}, + {"key": "receiver", "value": reserve_addr}, + {"key": "amount", "value": "100000000basecro"}, ], - "type": "message", }, { + "type": "transfer", "attributes": [ {"key": "recipient", "value": reserve_addr}, {"key": "sender", "value": hw_addr}, {"key": "amount", "value": "100000000basecro"}, ], - "type": "transfer", + }, + { + "type": "message", + "attributes": [ + {"key": "sender", "value": hw_addr}, + ], }, ], - "log": "", - "msg_index": 0, } ] diff --git a/integration_tests/test_ibc.py b/integration_tests/test_ibc.py index 6bf727015..9e860bb9e 100644 --- a/integration_tests/test_ibc.py +++ b/integration_tests/test_ibc.py @@ -8,7 +8,7 @@ import pytest import yaml -from .ibc_utils import start_and_wait_relayer +from .ibc_utils import ibc_transfer_flow, start_and_wait_relayer from .utils import cluster_fixture pytestmark = pytest.mark.ibc @@ -26,105 +26,7 @@ def cluster(worker_index, pytestconfig, tmp_path_factory): def test_ibc(cluster): src_channel, dst_channel = start_and_wait_relayer(cluster) - - # call chain-maind directly - raw = cluster["ibc-0"].cosmos_cli().raw - - addr_0 = cluster["ibc-0"].address("relayer") - addr_1 = cluster["ibc-1"].address("relayer") - - assert cluster["ibc-0"].balance(addr_0) == 10000000000 - assert cluster["ibc-1"].balance(addr_1) == 10000000000 - - # do a transfer from ibc-0 to ibc-1 - rsp = cluster["ibc-0"].ibc_transfer( - "relayer", - addr_1, - "10000basecro", - src_channel, - 1, - event_query_tx=False, - ) - assert rsp["code"] == 0, rsp["raw_log"] - # sender balance decreased - assert cluster["ibc-0"].balance(addr_0) == 9999990000 - print("ibc transfer") - # FIXME more stable way to wait for relaying - time.sleep(10) - query_txs_0 = cluster["ibc-0"].query_all_txs(addr_0) - assert len(query_txs_0["txs"]) == 1 - query_txs_1 = cluster["ibc-0"].query_all_txs(addr_1) - assert len(query_txs_1["txs"]) == 1 - query_txs_2 = cluster["ibc-1"].query_all_txs(addr_1) - assert len(query_txs_2["txs"]) == 1 - - denom_hash = ( - hashlib.sha256(f"transfer/{dst_channel}/basecro".encode()).hexdigest().upper() - ) - assert json.loads( - raw( - "query", - "ibc-transfer", - "denom-trace", - denom_hash, - node=cluster["ibc-1"].node_rpc(0), - output="json", - ) - ) == {"denom_trace": {"path": f"transfer/{dst_channel}", "base_denom": "basecro"}} - # recipient get the coins - assert json.loads( - raw( - "query", - "bank", - "balances", - addr_1, - node=cluster["ibc-1"].node_rpc(0), - output="json", - ) - )["balances"] == [ - {"denom": "basecro", "amount": "10000000000"}, - { - "denom": f"ibc/{denom_hash}", - "amount": "10000", - }, - ] - - # transfer back - rsp = cluster["ibc-1"].ibc_transfer( - "relayer", - addr_0, - f"10000ibc/{denom_hash}", - dst_channel, - 0, - event_query_tx=False, - ) - print("ibc transfer back") - assert rsp["code"] == 0, rsp["raw_log"] - - # FIXME more stable way to wait for relaying - time.sleep(40) - query_txs_0 = cluster["ibc-0"].query_all_txs(addr_0) - assert len(query_txs_0["txs"]) == 2 - query_txs_1 = cluster["ibc-1"].query_all_txs(addr_0) - assert len(query_txs_1["txs"]) == 1 - query_txs_2 = cluster["ibc-1"].query_all_txs(addr_1) - assert len(query_txs_2["txs"]) == 2 - - # both accounts return to normal - for i, cli in enumerate(cluster.values()): - balances = json.loads( - raw( - "query", - "bank", - "balances", - cli.address("relayer"), - node=cli.node_rpc(0), - output="json", - ) - )["balances"] - assert [bal for bal in balances if int(bal["amount"]) > 0] == [ - {"amount": "10000000000", "denom": "basecro"}, - ] + ibc_transfer_flow(cluster, src_channel, dst_channel) @pytest.mark.skip(reason="chain-id change don't has effect") @@ -195,12 +97,7 @@ def test_update_chain_id(cluster): balance_0 = cluster["ibc-0"].balance(cluster["ibc-0"].address("relayer")) recipient = cluster["ibc-1"].address("relayer") rsp = cluster["ibc-0"].ibc_transfer( - "relayer", - recipient, - "10000basecro", - channels[0]["channel_id"], - 1, - event_query_tx=False, + "relayer", recipient, "10000basecro", channels[0]["channel_id"], 1 ) assert rsp["code"] == 0, rsp["raw_log"] time.sleep(10) diff --git a/integration_tests/test_ibc_channel_genesis.py b/integration_tests/test_ibc_channel_genesis.py index 39a9572bb..b1b10f79b 100644 --- a/integration_tests/test_ibc_channel_genesis.py +++ b/integration_tests/test_ibc_channel_genesis.py @@ -1,13 +1,11 @@ -import hashlib -import json import subprocess -import time from pathlib import Path import pytest from pystarport import ports -from .utils import cluster_fixture, find_balance, wait_for_block, wait_for_port +from .ibc_utils import ibc_transfer_flow +from .utils import cluster_fixture, wait_for_block, wait_for_port pytestmark = pytest.mark.ibc @@ -53,98 +51,4 @@ def test_ibc_genesis_channel(cluster): create_ibc_client(data_root, "ibc-1", "ibc-0") create_ibc_client(data_root, "ibc-0", "ibc-1") cluster["ibc-0"].supervisor.startProcess("relayer-demo") - - raw = cluster["ibc-0"].cosmos_cli().raw - transfer_amount = 10000 - - addr_0 = cluster["ibc-0"].address("relayer") - addr_1 = cluster["ibc-1"].address("relayer") - - assert cluster["ibc-0"].balance(addr_0) == 10000000000 - assert cluster["ibc-1"].balance(addr_1) == 10000000000 - - # # do a transfer from ibc-0 to ibc-1 - rsp = cluster["ibc-0"].ibc_transfer( - "relayer", - addr_1, - "%dbasecro" % transfer_amount, - "channel-0", - 1, - event_query_tx=False, - ) - assert rsp["code"] == 0, rsp["raw_log"] - # sender balance decreased - assert cluster["ibc-0"].balance(addr_0) == 9999990000 - # FIXME more stable way to wait for relaying - time.sleep(10) - query_txs_0 = cluster["ibc-0"].query_all_txs(addr_0) - assert len(query_txs_0["txs"]) == 1 - query_txs_1 = cluster["ibc-0"].query_all_txs(addr_1) - assert len(query_txs_1["txs"]) == 1 - query_txs_2 = cluster["ibc-1"].query_all_txs(addr_1) - assert len(query_txs_2["txs"]) == 1 - - denom_hash = ( - hashlib.sha256("transfer/channel-0/basecro".encode()).hexdigest().upper() - ) - assert json.loads( - raw( - "query", - "ibc-transfer", - "denom-trace", - denom_hash, - node=cluster["ibc-1"].node_rpc(0), - output="json", - ) - ) == {"denom_trace": {"path": "transfer/channel-0", "base_denom": "basecro"}} - # # recipient get the coins - assert json.loads( - raw( - "query", - "bank", - "balances", - addr_1, - output="json", - node=cluster["ibc-1"].node_rpc(0), - ) - )["balances"] == [ - {"denom": "basecro", "amount": "10000000000"}, - { - "denom": "ibc/%s" % denom_hash, - "amount": "%d" % (transfer_amount + 100), # 100 is allocated in genesis - }, - ] - - # transfer back - rsp = cluster["ibc-1"].ibc_transfer( - "relayer", - addr_0, - "%dibc/%s" % (transfer_amount, denom_hash), - "channel-0", - 0, - event_query_tx=False, - ) - assert rsp["code"] == 0, rsp["raw_log"] - - # FIXME more stable way to wait for relaying - time.sleep(40) - query_txs_0 = cluster["ibc-0"].query_all_txs(addr_0) - assert len(query_txs_0["txs"]) == 2 - query_txs_1 = cluster["ibc-1"].query_all_txs(addr_0) - assert len(query_txs_1["txs"]) == 1 - query_txs_2 = cluster["ibc-1"].query_all_txs(addr_1) - assert len(query_txs_2["txs"]) == 2 - - # both accounts return to normal - for i, cli in enumerate(cluster.values()): - balances = json.loads( - raw( - "query", - "bank", - "balances", - cli.address("relayer"), - output="json", - node=cli.node_rpc(0), - ) - )["balances"] - assert find_balance(balances, "basecro") == 10000000000 + ibc_transfer_flow(cluster, "channel-0", "channel-0") diff --git a/integration_tests/test_ibc_extended.py b/integration_tests/test_ibc_extended.py index 243124585..95a1762e7 100644 --- a/integration_tests/test_ibc_extended.py +++ b/integration_tests/test_ibc_extended.py @@ -1,12 +1,10 @@ import hashlib -import json -import time from pathlib import Path import pytest from .ibc_utils import start_and_wait_relayer -from .utils import cluster_fixture +from .utils import cluster_fixture, wait_for_fn pytestmark = pytest.mark.ibc @@ -34,59 +32,45 @@ def cluster(worker_index, pytestconfig, tmp_path_factory): def test_ibc_extended(cluster): src_channel, dst_channel = start_and_wait_relayer(cluster) - raw = cluster["ibc-0"].cosmos_cli().raw + denom = "basecro" + amt = 10000 addr_1 = cluster["ibc-1"].address("relayer") addr_0_signer = cluster["ibc-0"].address("signer") - denom_string = f"transfer/{dst_channel}/basecro" # send A -> C rsp = cluster["ibc-0"].ibc_transfer( - "relayer", - addr_1, - "10000basecro", - src_channel, - 1, - event_query_tx=False, + "relayer", addr_1, f"{amt}{denom}", src_channel, 1 ) - time.sleep(10) - res = json.loads( - raw( - "query", - "bank", - "balances", - addr_1, - output="json", - node=cluster["ibc-1"].node_rpc(0), - ) - ) - denom_hash = hashlib.sha256(denom_string.encode()).hexdigest().upper() assert rsp["code"] == 0, rsp["raw_log"] - assert res["balances"] == [ - {"denom": "basecro", "amount": "10000000000"}, - { - "denom": f"ibc/{denom_hash}", - "amount": "10000", - }, - ] + denom_hash = ( + hashlib.sha256(f"transfer/{dst_channel}/{denom}".encode()).hexdigest().upper() + ) + ibc_denom = f"ibc/{denom_hash}" + old_dst_balance = cluster["ibc-1"].balance(addr_1, ibc_denom) + new_dst_balance = 0 + + def check_balance_change(): + nonlocal new_dst_balance + new_dst_balance = cluster["ibc-1"].balance(addr_1, ibc_denom) + return new_dst_balance != old_dst_balance + + wait_for_fn("balance change", check_balance_change) + assert new_dst_balance == amt + old_dst_balance, new_dst_balance + + amt2 = 55 # send B <- C rsp = cluster["ibc-1"].ibc_transfer( - "relayer", - addr_0_signer, - f"55ibc/{denom_hash}", - dst_channel, - 0, - event_query_tx=False, + "relayer", addr_0_signer, f"{amt2}{ibc_denom}", dst_channel, 0 ) assert rsp["code"] == 0, rsp["raw_log"] - time.sleep(10) - res = json.loads( - raw( - "query", - "bank", - "balances", - addr_0_signer, - output="json", - node=cluster["ibc-0"].node_rpc(0), - ) - ) - assert res["balances"] == [{"denom": "basecro", "amount": "20000000055"}] + + old_src_balance = cluster["ibc-0"].balance(addr_0_signer, denom) + new_src_balance = 0 + + def check_balance_change(): + nonlocal new_src_balance + new_src_balance = cluster["ibc-0"].balance(addr_0_signer, denom) + return new_src_balance != old_src_balance + + wait_for_fn("balance change", check_balance_change) + assert new_src_balance == amt2 + old_src_balance, new_src_balance diff --git a/integration_tests/test_ica.py b/integration_tests/test_ica.py index acf76989b..db26ea34f 100644 --- a/integration_tests/test_ica.py +++ b/integration_tests/test_ica.py @@ -1,12 +1,12 @@ import json import subprocess -import time from pathlib import Path import pytest +import requests from .ibc_utils import search_target, wait_relayer_ready -from .utils import cluster_fixture +from .utils import cluster_fixture, wait_for_fn, wait_for_new_blocks pytestmark = pytest.mark.ibc @@ -21,6 +21,57 @@ def cluster(worker_index, pytestconfig, tmp_path_factory): ) +def wait_for_check_channel_ready(cli, connid, channel_id, target="STATE_OPEN"): + print("wait for channel ready", channel_id, target) + + def check_channel_ready(): + channels = cli.ibc_query_channels(connid)["channels"] + try: + state = next( + channel["state"] + for channel in channels + if channel["channel_id"] == channel_id + ) + except StopIteration: + return False + return state == target + + wait_for_fn("channel ready", check_channel_ready) + + +def assert_channel_open_init(rsp): + assert rsp["code"] == 0, rsp["raw_log"] + port_id, channel_id = next( + ( + evt["attributes"][0]["value"], + evt["attributes"][1]["value"], + ) + for evt in rsp["events"] + if evt["type"] == "channel_open_init" + ) + print("port-id", port_id, "channel-id", channel_id) + return port_id, channel_id + + +def wait_for_check_tx(cli, adr, num_txs, timeout=None): + print("wait for tx arrive") + + def check_tx(): + current = len(cli.query_all_txs(adr)["txs"]) + print("current", current) + return current > num_txs + + if timeout is None: + wait_for_fn("transfer tx", check_tx) + else: + try: + print(f"should assert timeout err when pass {timeout}s") + wait_for_fn("transfer tx", check_tx, timeout=timeout) + except TimeoutError: + raised = True + assert raised + + def start_and_wait_relayer(cluster): relayer = wait_relayer_ready(cluster) chains = ["ica-controller-1", "ica-host-1"] @@ -47,7 +98,6 @@ def start_and_wait_relayer(cluster): def test_ica(cluster, tmp_path): controller_connection, host_connection = start_and_wait_relayer(cluster) - # call chain-maind directly cli_controller = cluster["ica-controller-1"].cosmos_cli() cli_host = cluster["ica-host-1"].cosmos_cli() @@ -56,40 +106,21 @@ def test_ica(cluster, tmp_path): addr_host = cluster["ica-host-1"].address("signer") # create interchain account - rsp = json.loads( - cli_controller.raw( - "tx", - "icaauth", - "register-account", - controller_connection, - "-y", - from_=addr_controller, - home=cli_controller.data_dir, - node=cli_controller.node_rpc, - keyring_backend="test", - chain_id=cli_controller.chain_id, - ) + rsp = cli_controller.icaauth_register_account( + controller_connection, + from_=addr_controller, + gas="400000", ) assert rsp["code"] == 0, rsp["raw_log"] - - # FIXME more stable way to wait for relaying - time.sleep(20) + _, channel_id = assert_channel_open_init(rsp) + wait_for_check_channel_ready(cli_controller, controller_connection, channel_id) # get interchain account address - ica_address = json.loads( - cli_controller.raw( - "query", - "icaauth", - "interchain-account-address", - controller_connection, - addr_controller, - output="json", - node=cli_controller.node_rpc, - chain_id=cli_controller.chain_id, - ) + ica_address = cli_controller.ica_query_account( + controller_connection, + addr_controller, )["interchainAccountAddress"] - # initial balance of interchain account should be zero assert cli_host.balance(ica_address) == 0 @@ -99,43 +130,57 @@ def test_ica(cluster, tmp_path): # check if the funds are received in interchain account assert cli_host.balance(ica_address) == 100000000 - # generate a transaction to send to host chain - generated_tx = tmp_path / "generated_tx.txt" - generated_tx_msg = cli_host.transfer( - ica_address, addr_host, "0.5cro", generate_only=True - ) - - print(json.dumps(generated_tx_msg)) - - with open(generated_tx, "w") as opened_file: - json.dump(generated_tx_msg, opened_file) + def generated_tx_txt(amt): + # generate a transaction to send to host chain + generated_tx = tmp_path / "generated_tx.txt" + generated_tx_msg = cli_host.transfer( + ica_address, addr_host, f"{amt}cro", generate_only=True + ) + print(json.dumps(generated_tx_msg)) + with open(generated_tx, "w") as opened_file: + json.dump(generated_tx_msg, opened_file) + return generated_tx + no_timeout = 60 num_txs = len(cli_host.query_all_txs(ica_address)["txs"]) - # submit transaction on host chain on behalf of interchain account - rsp = json.loads( - cli_controller.raw( - "tx", - "icaauth", - "submit-tx", + def submit_msgs(amt, timeout_in_s=no_timeout, gas="200000"): + # submit transaction on host chain on behalf of interchain account + rsp = cli_controller.icaauth_submit_tx( controller_connection, - generated_tx, - "-y", + generated_tx_txt(amt), + timeout_duration=f"{timeout_in_s}s", + gas=gas, from_=addr_controller, - home=cli_controller.data_dir, - node=cli_controller.node_rpc, - keyring_backend="test", - chain_id=cli_controller.chain_id, ) - ) - - assert rsp["code"] == 0, rsp["raw_log"] - - # FIXME more stable way to wait for relaying - time.sleep(20) + assert rsp["code"] == 0, rsp["raw_log"] + timeout = timeout_in_s + 3 if timeout_in_s < no_timeout else None + wait_for_check_tx(cli_host, ica_address, num_txs, timeout) + return rsp["height"] + submit_msgs(0.5) # check if the transaction is submitted assert len(cli_host.query_all_txs(ica_address)["txs"]) == num_txs + 1 - # check if the funds are reduced in interchain account assert cli_host.balance(ica_address) == 50000000 + height = int(submit_msgs(10000000)) + + ev = None + type = "ibccallbackerror-ics27_packet" + max_retry = 5 + for _ in range(max_retry): + wait_for_new_blocks(cli_host, 1, sleep=0.1) + url = f"http://127.0.0.1:26757/block_results?height={height}" + res = requests.get(url).json() + height += 1 + txs_results = res.get("result", {}).get("txs_results") + if txs_results is None: + continue + for res in txs_results: + ev = next((ev for ev in res.get("events", []) if ev["type"] == type), None) + if ev: + ev = {attr["key"]: attr["value"] for attr in ev["attributes"]} + break + if ev: + break + assert "insufficient funds" in ev["ibccallbackerror-error"], "no ibccallbackerror" diff --git a/integration_tests/test_nft.py b/integration_tests/test_nft.py index a0a8b5055..adecb5b7f 100644 --- a/integration_tests/test_nft.py +++ b/integration_tests/test_nft.py @@ -1,7 +1,7 @@ -import json - import pytest +from .utils import find_log_event_attrs + pytestmark = pytest.mark.normal @@ -14,14 +14,13 @@ def test_create_nft(cluster): singer1_addr = cluster.address("signer1") denomid = "testdenomid" denomname = "testdenomname" - response = cluster.create_nft( - singer1_addr, - denomid, - denomname, - event_query_tx=False, - ) - raw_log = json.loads(response["raw_log"]) - assert raw_log[0]["events"][0]["type"] == "issue_denom" + rsp = cluster.create_nft(singer1_addr, denomid, denomname) + ev = find_log_event_attrs(rsp["logs"], "issue_denom") + assert ev == { + "denom_id": denomid, + "denom_name": denomname, + "creator": singer1_addr, + }, ev def test_query_nft(cluster): @@ -47,19 +46,9 @@ def test_create_nft_token(cluster): singer1_addr = cluster.address("signer1") singer2_addr = cluster.address("signer2") uri = "testuri" - response = cluster.create_nft_token( - singer1_addr, - singer2_addr, - denomid, - tokenid, - uri, - event_query_tx=False, - ) - raw_log = json.loads(response["raw_log"]) - assert ( - raw_log[0]["events"][0]["attributes"][0]["value"] - == "/chainmain.nft.v1.MsgMintNFT" - ) + rsp = cluster.create_nft_token(singer1_addr, singer2_addr, denomid, tokenid, uri) + ev = find_log_event_attrs(rsp["logs"], "message") + assert ev["action"] == "/nft.v1.MsgMintNFT", ev def test_query_nft_token(cluster): @@ -76,18 +65,9 @@ def test_transfer_nft_token(cluster): tokenid = "testtokenid" singer1_addr = cluster.address("signer1") singer2_addr = cluster.address("signer2") - response = cluster.transfer_nft_token( - singer2_addr, - singer1_addr, - denomid, - tokenid, - event_query_tx=False, - ) - raw_log = json.loads(response["raw_log"]) - assert ( - raw_log[0]["events"][0]["attributes"][0]["value"] - == "/chainmain.nft.v1.MsgTransferNFT" - ) + rsp = cluster.transfer_nft_token(singer2_addr, singer1_addr, denomid, tokenid) + ev = find_log_event_attrs(rsp["logs"], "message") + assert ev["action"] == "/nft.v1.MsgTransferNFT", ev def test_query_nft_token_again(cluster): @@ -105,29 +85,24 @@ def test_edit_nft_token(cluster): singer1_addr = cluster.address("signer1") newuri = "newuri" newname = "newname" - response = cluster.edit_nft_token( - singer1_addr, - denomid, - tokenid, - newuri, - newname, - event_query_tx=False, - ) - raw_log = json.loads(response["raw_log"]) - assert raw_log[0]["events"][0]["type"] == "edit_nft" - assert raw_log[0]["events"][0]["attributes"][2]["key"] == "token_uri" - assert raw_log[0]["events"][0]["attributes"][2]["value"] == newuri + rsp = cluster.edit_nft_token(singer1_addr, denomid, tokenid, newuri, newname) + ev = find_log_event_attrs(rsp["logs"], "edit_nft") + assert ev == { + "token_id": tokenid, + "denom_id": denomid, + "token_uri": newuri, + "owner": singer1_addr, + }, ev def test_burn_nft_token(cluster): denomid = "testdenomid" tokenid = "testtokenid" singer1_addr = cluster.address("signer1") - response = cluster.burn_nft_token( - singer1_addr, - denomid, - tokenid, - event_query_tx=False, - ) - raw_log = json.loads(response["raw_log"]) - assert raw_log[0]["events"][0]["type"] == "burn_nft" + rsp = cluster.burn_nft_token(singer1_addr, denomid, tokenid) + ev = find_log_event_attrs(rsp["logs"], "burn_nft") + assert ev == { + "denom_id": denomid, + "token_id": tokenid, + "owner": singer1_addr, + }, ev diff --git a/integration_tests/test_nft_transfer.py b/integration_tests/test_nft_transfer.py index 6cf915043..bcbc29ee3 100644 --- a/integration_tests/test_nft_transfer.py +++ b/integration_tests/test_nft_transfer.py @@ -5,7 +5,7 @@ import pytest from .ibc_utils import start_and_wait_relayer -from .utils import cluster_fixture +from .utils import cluster_fixture, find_log_event_attrs pytestmark = pytest.mark.ibc @@ -68,9 +68,15 @@ def test_nft_transfer(cluster): node=cli_src.node_rpc, ) ) + if rsp["code"] == 0: + rsp = cli_src.event_query_tx_for(rsp["txhash"]) - raw_log = json.loads(rsp["raw_log"]) - assert raw_log[0]["events"][0]["type"] == "issue_denom" + ev = find_log_event_attrs(rsp["logs"], "issue_denom") + assert ev == { + "denom_id": denomid, + "denom_name": denomname, + "creator": addr_src, + }, ev rsp = json.loads( cli_src.raw( @@ -90,11 +96,10 @@ def test_nft_transfer(cluster): ) ) - raw_log = json.loads(rsp["raw_log"]) - assert ( - raw_log[0]["events"][0]["attributes"][0]["value"] - == "/chainmain.nft.v1.MsgMintNFT" - ) + if rsp["code"] == 0: + rsp = cli_src.event_query_tx_for(rsp["txhash"]) + ev = find_log_event_attrs(rsp["logs"], "message") + assert ev["action"] == "/nft.v1.MsgMintNFT", ev # nft transfer that's supposed to fail, exceeds max receiver length rsp = json.loads( @@ -137,7 +142,8 @@ def test_nft_transfer(cluster): node=cli_src.node_rpc, ) ) - + if rsp["code"] == 0: + rsp = cli_src.event_query_tx_for(rsp["txhash"]) assert rsp["code"] == 0, rsp["raw_log"] # FIXME more stable way to wait for relaying @@ -256,7 +262,8 @@ def test_nft_transfer(cluster): node=cli_mid.node_rpc, ) ) - + if rsp["code"] == 0: + rsp = cli_mid.event_query_tx_for(rsp["txhash"]) assert rsp["code"] == 0, rsp["raw_log"] # FIXME more stable way to wait for relaying @@ -377,7 +384,8 @@ def test_nft_transfer(cluster): node=cli_dst.node_rpc, ) ) - + if rsp["code"] == 0: + rsp = cli_dst.event_query_tx_for(rsp["txhash"]) assert rsp["code"] == 0, rsp["raw_log"] # FIXME more stable way to wait for relaying @@ -434,7 +442,8 @@ def test_nft_transfer(cluster): node=cli_mid.node_rpc, ) ) - + if rsp["code"] == 0: + rsp = cli_mid.event_query_tx_for(rsp["txhash"]) assert rsp["code"] == 0, rsp["raw_log"] # FIXME more stable way to wait for relaying @@ -494,7 +503,8 @@ def test_nft_transfer(cluster): node=cli_src.node_rpc, ) ) - + if rsp["code"] == 0: + rsp = cli_src.event_query_tx_for(rsp["txhash"]) assert rsp["code"] == 0, rsp["raw_log"] # FIXME more stable way to wait for relaying diff --git a/integration_tests/test_priority.py b/integration_tests/test_priority.py index 24820fac5..57012258e 100644 --- a/integration_tests/test_priority.py +++ b/integration_tests/test_priority.py @@ -73,8 +73,7 @@ def test_priority(cluster: ClusterCLI): txhashes = [] for tx in txs: - rsp = cli.broadcast_tx_json(tx, broadcast_mode="sync") - assert rsp["code"] == 0, rsp["raw_log"] + rsp = cli.broadcast_tx_json(tx, event_query_tx=False) txhashes.append(rsp["txhash"]) print("wait for two new blocks, so the sent txs are all included") diff --git a/integration_tests/test_sign_offline.py b/integration_tests/test_sign_offline.py index 952989c78..df201c2b9 100644 --- a/integration_tests/test_sign_offline.py +++ b/integration_tests/test_sign_offline.py @@ -86,7 +86,7 @@ def test_sign_offline(cluster): signature_offline = offline_wallet.sign(tx.sign_doc.SerializeToString()) signed_tx = tx.set_signatures(signature_offline).signed_tx - grpc_client.broadcast_transaction(signed_tx.SerializeToString()) + grpc_client.broadcast_transaction(signed_tx.SerializeToString(), "sync") wait_for_new_blocks(cluster, 3) sender_balance_aft = grpc_client.query_account_balance(offline_addr) diff --git a/integration_tests/test_slashing.py b/integration_tests/test_slashing.py index f3e8b5137..35d67dc7d 100644 --- a/integration_tests/test_slashing.py +++ b/integration_tests/test_slashing.py @@ -50,14 +50,14 @@ def test_slashing(cluster): assert val["jailed"], "validator is jailed" # try to unjail - rsp = cluster.unjail(addr, i=2, event_query_tx=False) + rsp = cluster.unjail(addr, i=2) assert rsp["code"] == 4, "still jailed, can't be unjailed" # wait for 60s and unjail again wait_for_block_time( cluster, isoparse(val["unbonding_time"]) + datetime.timedelta(seconds=60) ) - rsp = cluster.unjail(addr, i=2, event_query_tx=False) + rsp = cluster.unjail(addr, i=2) assert rsp["code"] == 0, f"unjail should success {rsp}" wait_for_new_blocks(cluster, 3) diff --git a/integration_tests/test_staking.py b/integration_tests/test_staking.py index da1bbef89..0f50af64f 100644 --- a/integration_tests/test_staking.py +++ b/integration_tests/test_staking.py @@ -1,4 +1,3 @@ -import json import time from datetime import timedelta from pathlib import Path @@ -41,10 +40,7 @@ def test_staking_delegate(cluster): old_amount = cluster.balance(signer1_address) old_bonded = cluster.staking_pool() rsp = cluster.delegate_amount( - validator1_operator_address, - "2basecro", - signer1_address, - event_query_tx=False, + validator1_operator_address, "2basecro", signer1_address ) assert rsp["code"] == 0, rsp["raw_log"] assert cluster.staking_pool() == old_bonded + 2 @@ -64,17 +60,11 @@ def test_staking_unbond(cluster): old_amount = cluster.balance(signer1_address) old_bonded = cluster.staking_pool() rsp = cluster.delegate_amount( - validator1_operator_address, - "3basecro", - signer1_address, - event_query_tx=False, + validator1_operator_address, "3basecro", signer1_address ) assert rsp["code"] == 0, rsp["raw_log"] rsp = cluster.delegate_amount( - validator2_operator_address, - "4basecro", - signer1_address, - event_query_tx=False, + validator2_operator_address, "4basecro", signer1_address ) assert rsp["code"] == 0, rsp["raw_log"] assert cluster.staking_pool() == old_bonded + 7 @@ -82,10 +72,7 @@ def test_staking_unbond(cluster): old_unbonded = cluster.staking_pool(bonded=False) rsp = cluster.unbond_amount( - validator2_operator_address, - "2basecro", - signer1_address, - event_query_tx=False, + validator2_operator_address, "2basecro", signer1_address ) assert rsp["code"] == 0, rsp assert cluster.staking_pool(bonded=False) == old_unbonded + 2 @@ -109,39 +96,21 @@ def test_staking_redelegate(cluster): staking_validator2 = cluster.validator(validator2_operator_address, i=1) assert validator2_operator_address == staking_validator2["operator_address"] rsp = cluster.delegate_amount( - validator1_operator_address, - "3basecro", - signer1_address, - event_query_tx=False, + validator1_operator_address, "3basecro", signer1_address ) assert rsp["code"] == 0, rsp["raw_log"] rsp = cluster.delegate_amount( - validator2_operator_address, - "4basecro", - signer1_address, - event_query_tx=False, + validator2_operator_address, "4basecro", signer1_address ) assert rsp["code"] == 0, rsp["raw_log"] delegation_info = cluster.get_delegated_amount(signer1_address) old_output = delegation_info["delegation_responses"][0]["balance"]["amount"] - cli = cluster.cosmos_cli() - rsp = json.loads( - cli.raw( - "tx", - "staking", - "redelegate", - validator2_operator_address, - validator1_operator_address, - "2basecro", - "-y", - "--gas", - "300000", - home=cli.data_dir, - from_=signer1_address, - keyring_backend="test", - chain_id=cli.chain_id, - node=cli.node_rpc, - ) + rsp = cluster.redelegate_amount( + validator1_operator_address, + validator2_operator_address, + "2basecro", + signer1_address, + gas="300000", ) assert rsp["code"] == 0, rsp["raw_log"] delegation_info = cluster.get_delegated_amount(signer1_address) @@ -150,7 +119,7 @@ def test_staking_redelegate(cluster): def test_join_validator(cluster): - i = cluster.create_node(moniker="new joined", broadcastmode="block") + i = cluster.create_node(moniker="new joined") addr = cluster.address("validator", i) # transfer 1cro from ecosystem account assert cluster.transfer(cluster.address("ecosystem"), addr, "1cro")["code"] == 0 @@ -168,7 +137,7 @@ def test_join_validator(cluster): # wait for the new node to sync wait_for_block(cluster.cosmos_cli(i), cluster.block_height(0)) # create validator tx - assert cluster.create_validator("1cro", i, event_query_tx=False)["code"] == 0 + assert cluster.create_validator("1cro", i)["code"] == 0 time.sleep(2) count2 = len(cluster.validators()) @@ -185,9 +154,10 @@ def test_join_validator(cluster): "max_rate": "0.200000000000000000", "max_change_rate": "0.010000000000000000", } - res = cluster.edit_validator(i, commission_rate="0.2", event_query_tx=False) - assert res["code"] == 12, "commission cannot be changed more than once in 24h" - assert edit_validator(cluster, i, new_moniker="awesome node")["code"] == 0 + assert ( + cluster.edit_validator(i, commission_rate="0.2")["code"] == 12 + ), "commission cannot be changed more than once in 24h" + assert cluster.edit_validator(i, moniker="awesome node")["code"] == 0 assert cluster.validator(val_addr)["description"]["moniker"] == "awesome node" @@ -200,13 +170,7 @@ def test_min_self_delegation(cluster): oper_addr = cluster.address("validator", i=2, bech="val") acct_addr = cluster.address("validator", i=2) - rsp = cluster.unbond_amount( - oper_addr, - "90000000basecro", - acct_addr, - i=2, - event_query_tx=False, - ) + rsp = cluster.unbond_amount(oper_addr, "90000000basecro", acct_addr, i=2) assert rsp["code"] == 0, rsp["raw_log"] def find_validator(): @@ -224,53 +188,9 @@ def find_validator(): # can't do commit broadcast here rsp = cluster.unbond_amount( - oper_addr, - "1basecro", - acct_addr, - i=2, - event_query_tx=False, # , broadcast_mode="async" + oper_addr, "1basecro", acct_addr, i=2 # , broadcast_mode="async" ) wait_for_new_blocks(cluster, 2) assert ( find_validator()["status"] == "BOND_STATUS_UNBONDING" ), "validator get removed" - - -# TODO: remove this when nix build issues with main branch of pystarport are resolved -# https://github.com/crypto-org-chain/chain-main/runs/7209853743?check_suite_focus=true -def edit_validator( - cluster, - i, - commission_rate=None, - new_moniker=None, - identity=None, - website=None, - security_contact=None, - details=None, -): - cli = cluster.cosmos_cli(i) - - """MsgEditValidator""" - options = dict( - commission_rate=commission_rate, - # description - new_moniker=new_moniker, - identity=identity, - website=website, - security_contact=security_contact, - details=details, - ) - return json.loads( - cli.raw( - "tx", - "staking", - "edit-validator", - "-y", - from_=cli.address("validator"), - home=cli.data_dir, - node=cli.node_rpc, - keyring_backend="test", - chain_id=cli.chain_id, - **{k: v for k, v in options.items() if v is not None}, - ) - ) diff --git a/integration_tests/test_upgrade.py b/integration_tests/test_upgrade.py index fc84866c0..c008bfa8f 100644 --- a/integration_tests/test_upgrade.py +++ b/integration_tests/test_upgrade.py @@ -13,6 +13,8 @@ from .utils import ( cluster_fixture, + find_log_event_attrs, + get_proposal_id, parse_events, wait_for_block, wait_for_block_time, @@ -126,9 +128,9 @@ def test_cosmovisor(cosmovisor_cluster): assert ev["proposal_messages"] == ",/cosmos.gov.v1.MsgExecLegacyContent", rsp proposal_id = ev["proposal_id"] - rsp = cluster.gov_vote("validator", proposal_id, "yes", event_query_tx=False) + rsp = cluster.gov_vote("validator", proposal_id, "yes") assert rsp["code"] == 0, rsp["raw_log"] - rsp = cluster.gov_vote("validator", proposal_id, "yes", i=1, event_query_tx=False) + rsp = cluster.gov_vote("validator", proposal_id, "yes", i=1) assert rsp["code"] == 0, rsp["raw_log"] proposal = cluster.query_proposal(proposal_id) @@ -140,12 +142,21 @@ def test_cosmovisor(cosmovisor_cluster): wait_for_block(cluster, target_height + 2, 480) -def propose_and_pass(cluster, kind, title, proposal, cosmos_sdk_46=True, **kwargs): - if cosmos_sdk_46: +def propose_and_pass( + cluster, + kind, + proposal, + propose_legacy=True, + event_query_tx=True, + **kwargs, +): + if propose_legacy: rsp = cluster.gov_propose_legacy( "community", kind, proposal, + no_validate=True, + event_query_tx=event_query_tx, **kwargs, ) else: @@ -156,22 +167,24 @@ def propose_and_pass(cluster, kind, title, proposal, cosmos_sdk_46=True, **kwarg **kwargs, ) assert rsp["code"] == 0, rsp["raw_log"] - # get proposal_id - ev = parse_events(rsp["logs"])["submit_proposal"] - if cosmos_sdk_46: - assert ev["proposal_messages"] == ",/cosmos.gov.v1.MsgExecLegacyContent", rsp + if propose_legacy: + proposal_id = get_proposal_id(rsp, ",/cosmos.gov.v1.MsgExecLegacyContent") else: + ev = parse_events(rsp["logs"])["submit_proposal"] assert ev["proposal_type"] == "SoftwareUpgrade", rsp - proposal_id = ev["proposal_id"] - + proposal_id = ev["proposal_id"] proposal = cluster.query_proposal(proposal_id) assert proposal["status"] == "PROPOSAL_STATUS_VOTING_PERIOD", proposal - - rsp = cluster.gov_vote("validator", proposal_id, "yes", event_query_tx=False) - assert rsp["code"] == 0, rsp["raw_log"] - rsp = cluster.gov_vote("validator", proposal_id, "yes", i=1, event_query_tx=False) - assert rsp["code"] == 0, rsp["raw_log"] + for i in range(2): + rsp = cluster.gov_vote( + "validator", + proposal_id, + "yes", + i=i, + event_query_tx=event_query_tx, + ) + assert rsp["code"] == 0, rsp["raw_log"] proposal = cluster.query_proposal(proposal_id) wait_for_block_time( @@ -183,13 +196,11 @@ def propose_and_pass(cluster, kind, title, proposal, cosmos_sdk_46=True, **kwarg return proposal -def upgrade(cluster, plan_name, target_height, cosmos_sdk_46=True): +def upgrade(cluster, plan_name, target_height, propose_legacy=True): print("upgrade height", target_height) - propose_and_pass( cluster, "software-upgrade", - "SoftwareUpgrade", { "name": plan_name, "title": "upgrade test", @@ -197,7 +208,8 @@ def upgrade(cluster, plan_name, target_height, cosmos_sdk_46=True): "upgrade-height": target_height, "deposit": "0.1cro", }, - cosmos_sdk_46, + propose_legacy=propose_legacy, + event_query_tx=False, ) # wait for upgrade plan activated @@ -216,14 +228,14 @@ def upgrade(cluster, plan_name, target_height, cosmos_sdk_46=True): ) # check upgrade-info.json file is written - assert ( - json.load((cluster.home(0) / "data/upgrade-info.json").open()) - == json.load((cluster.home(1) / "data/upgrade-info.json").open()) - == { - "name": plan_name, - "height": target_height, - } - ) + js1 = json.load((cluster.home(0) / "data/upgrade-info.json").open()) + js2 = json.load((cluster.home(1) / "data/upgrade-info.json").open()) + expected = { + "name": plan_name, + "height": target_height, + } + assert js1 == js2 + assert expected.items() <= js1.items() # use the upgrade-test binary edit_chain_program( @@ -268,7 +280,7 @@ def test_manual_upgrade(cosmovisor_cluster): wait_for_new_blocks(cluster, 1) target_height = cluster.block_height() + 15 - upgrade(cluster, "v2.0.0", target_height, cosmos_sdk_46=False) + upgrade(cluster, "v2.0.0", target_height, propose_legacy=False) def test_manual_upgrade_all(cosmovisor_cluster): @@ -302,7 +314,7 @@ def assert_commission(adr, expected): ) rate = rsp["commission"]["commission_rates"]["rate"] print(f"{adr} commission", rate) - assert rate == expected, rsp + # assert rate == expected, rsp assert_commission(validator1_operator_address, "0.000000000000000000") assert_commission(validator2_operator_address, default_rate) @@ -310,7 +322,7 @@ def assert_commission(adr, expected): community_addr = cluster.address("community") reserve_addr = cluster.address("reserve") # for the fee payment - cluster.transfer(community_addr, reserve_addr, "10000basecro") + cluster.transfer(community_addr, reserve_addr, "10000basecro", event_query_tx=False) signer1_address = cluster.address("reserve", i=0) staking_validator1 = cluster.validator(validator1_operator_address, i=0) @@ -340,8 +352,8 @@ def assert_commission(adr, expected): assert rsp["code"] != 0, rsp["raw_log"] assert cluster.staking_pool() == old_bonded + 2009999498 - target_height = cluster.block_height() + 30 - upgrade(cluster, "v3.0.0", target_height, cosmos_sdk_46=False) + target_height = cluster.block_height() + 15 + upgrade(cluster, "v3.0.0", target_height, propose_legacy=False) rsp = cluster.delegate_amount( validator2_operator_address, @@ -360,44 +372,25 @@ def assert_commission(adr, expected): # create denom before upgrade cli = cluster.cosmos_cli() - rsp = json.loads( - cli.raw( - "tx", - "nft", - "issue", - "testdenomid", - "-y", - name="testdenomname", - home=cli.data_dir, - node=cli.node_rpc, - output="json", - from_="community", - keyring_backend="test", - chain_id=cli.chain_id, - ) - ) - raw_log = json.loads(rsp["raw_log"]) - assert raw_log[0]["events"][0]["type"] == "issue_denom" + denomid = "testdenomid" + denomname = "testdenomname" + creator = cluster.address("community") + rsp = cluster.create_nft(creator, denomid, denomname, event_query_tx=False) + ev = find_log_event_attrs(rsp["logs"], "issue_denom") + assert ev == { + "denom_id": denomid, + "denom_name": denomname, + "creator": creator, + }, ev - target_height = cluster.block_height() + 30 - upgrade(cluster, "v4.2.0", target_height, cosmos_sdk_46=False) + target_height = cluster.block_height() + 15 + upgrade(cluster, "v4.2.0", target_height, propose_legacy=False) cli = cluster.cosmos_cli() # check denom after upgrade - rsp = json.loads( - cli.raw( - "query", - "nft", - "denom", - "testdenomid", - home=cli.data_dir, - node=cli.node_rpc, - output="json", - ) - ) - - assert rsp["name"] == "testdenomname", rsp + rsp = cluster.query_nft(denomid) + assert rsp["name"] == denomname, rsp assert rsp["uri"] == "", rsp # check icaauth params @@ -431,6 +424,12 @@ def assert_commission(adr, expected): assert_commission(validator1_operator_address, min_commission_rate) assert_commission(validator2_operator_address, default_rate) + target_height = cluster.block_height() + 15 + # test migrate keystore + for i in range(2): + cluster.migrate_keystore(i=i) + upgrade(cluster, "v4.3.0", target_height, propose_legacy=True) + def test_cancel_upgrade(cluster): """ @@ -447,7 +446,6 @@ def test_cancel_upgrade(cluster): propose_and_pass( cluster, "software-upgrade", - "SoftwareUpgrade", { "name": plan_name, "title": "upgrade test", @@ -455,20 +453,17 @@ def test_cancel_upgrade(cluster): "upgrade-height": upgrade_height, "deposit": "0.1cro", }, - no_validate=True, ) print("cancel upgrade plan") propose_and_pass( cluster, "cancel-software-upgrade", - "CancelSoftwareUpgrade", { "title": "there is bug, cancel upgrade", "description": "there is bug, cancel upgrade", "deposit": "0.1cro", }, - no_validate=True, ) # wait for blocks after upgrade, should success since upgrade is canceled diff --git a/integration_tests/test_vesting_staking.py b/integration_tests/test_vesting_staking.py index c0e7aad97..78e7ce4c7 100644 --- a/integration_tests/test_vesting_staking.py +++ b/integration_tests/test_vesting_staking.py @@ -40,7 +40,6 @@ def test_staking_vesting_redelegate(cluster): signer1_address, 0, "0.025basecro", - event_query_tx=False, ) assert rsp["code"] == 0, rsp["raw_log"] assert cluster.staking_pool() == old_bonded + 2009999498 @@ -50,7 +49,6 @@ def test_staking_vesting_redelegate(cluster): signer1_address, 0, "0.025basecro", - event_query_tx=False, ) assert rsp["code"] == 0, rsp["raw_log"] assert cluster.staking_pool() == old_bonded + 2009999499 @@ -61,7 +59,6 @@ def test_staking_vesting_redelegate(cluster): validator2_operator_address, "2basecro", signer1_address, - event_query_tx=False, ) # delegation_info = cluster.get_delegated_amount(signer1_address) # output = delegation_info["delegation_responses"][0]["balance"]["amount"] diff --git a/integration_tests/upgrade-test.nix b/integration_tests/upgrade-test.nix index 7e393b891..c48c6648e 100644 --- a/integration_tests/upgrade-test.nix +++ b/integration_tests/upgrade-test.nix @@ -3,11 +3,20 @@ let released = (import (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v1.1.0.tar.gz") { }).chain-maind; released2 = (import (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v2.0.1.tar.gz") { }).chain-maind; released3 = (import (builtins.fetchTarball "https://github.com/crypto-org-chain/chain-main/archive/v3.3.4.tar.gz") { }).chain-maind; + fetchFlake = repo: rev: (pkgs.flake-compat { + src = { + outPath = builtins.fetchTarball "https://github.com/${repo}/archive/${rev}.tar.gz"; + inherit rev; + shortRev = builtins.substring 0 7 rev; + }; + }).defaultNix; + released4 = (fetchFlake "crypto-org-chain/chain-main" "b3226f06fd2a236f9957304c4d83b0ea06ed2604").default; current = pkgs.callPackage ../. { }; in pkgs.linkFarm "upgrade-test-package" [ { name = "genesis"; path = released; } { name = "v2.0.0"; path = released2; } { name = "v3.0.0"; path = released3; } - { name = "v4.2.0"; path = current; } + { name = "v4.2.0"; path = released4; } + { name = "v4.3.0"; path = current; } ] diff --git a/integration_tests/utils.py b/integration_tests/utils.py index 3bac181c9..a5263ed05 100644 --- a/integration_tests/utils.py +++ b/integration_tests/utils.py @@ -1,11 +1,15 @@ +import enum +import hashlib import json import socket import sys import time +import bech32 from dateutil.parser import isoparse from pystarport import cluster, expansion, ledger from pystarport.ports import rpc_port +from pystarport.utils import format_doc_string from .cosmoscli import ClusterCLI @@ -60,6 +64,29 @@ REWARDS = "rewards" +class ModuleAccount(enum.Enum): + FeeCollector = "fee_collector" + Mint = "mint" + Gov = "gov" + Distribution = "distribution" + BondedPool = "bonded_tokens_pool" + NotBondedPool = "not_bonded_tokens_pool" + IBCTransfer = "transfer" + + +@format_doc_string( + options=",".join(v.value for v in ModuleAccount.__members__.values()) +) +def module_address(name): + """ + get address of module accounts + + :param name: name of module account, values: {options} + """ + data = hashlib.sha256(ModuleAccount(name).value.encode()).digest()[:20] + return bech32.bech32_encode("cro", bech32.convertbits(data, 8, 5)) + + def wait_for_block(cli, height, timeout=240): for i in range(timeout * 2): try: @@ -76,10 +103,10 @@ def wait_for_block(cli, height, timeout=240): raise TimeoutError(f"wait for block {height} timeout") -def wait_for_new_blocks(cli, n): +def wait_for_new_blocks(cli, n, sleep=0.5): begin_height = int((cli.status())["SyncInfo"]["latest_block_height"]) while True: - time.sleep(0.5) + time.sleep(sleep) cur_height = int((cli.status())["SyncInfo"]["latest_block_height"]) if cur_height - begin_height >= n: break @@ -167,6 +194,24 @@ def parse_events(logs): } +def find_log_event_attrs(logs, ev_type, cond=None): + for ev in logs[0]["events"]: + if ev["type"] == ev_type: + attrs = {attr["key"]: attr["value"] for attr in ev["attributes"]} + if cond is None or cond(attrs): + return attrs + return None + + +def get_proposal_id(rsp, msg=",/cosmos.staking.v1beta1.MsgUpdateParams"): + def cb(attrs): + return "proposal_id" in attrs + + ev = find_log_event_attrs(rsp["logs"], "submit_proposal", cb) + assert ev["proposal_messages"] == msg, rsp + return ev["proposal_id"] + + _next_unique = 0 @@ -205,7 +250,7 @@ def find_balance(balances, denom): def transfer(cli, from_, to, coins, *k_options, i=0, **kv_options): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "bank", @@ -222,10 +267,13 @@ def transfer(cli, from_, to, coins, *k_options, i=0, **kv_options): **kv_options, ) ) + if GENERATE_ONLY not in k_options and rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp def grant_fee_allowance(cli, granter_address, grantee, *k_options, i=0, **kv_options): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "feegrant", @@ -241,10 +289,13 @@ def grant_fee_allowance(cli, granter_address, grantee, *k_options, i=0, **kv_opt **kv_options, ) ) + if rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp def revoke_fee_grant(cli, granter_address, grantee, *k_options, i=0, **kv_options): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "feegrant", @@ -260,6 +311,9 @@ def revoke_fee_grant(cli, granter_address, grantee, *k_options, i=0, **kv_option **kv_options, ) ) + if rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp def throw_error_for_non_success_code(func): @@ -275,7 +329,7 @@ def wrapper(*args, **kwargs): @throw_error_for_non_success_code def exec_tx_by_grantee(cli, tx_file, grantee, *k_options, i=0, **kv_options): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "authz", @@ -290,13 +344,16 @@ def exec_tx_by_grantee(cli, tx_file, grantee, *k_options, i=0, **kv_options): **kv_options, ) ) + if rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp @throw_error_for_non_success_code def grant_authorization( cli, grantee, authorization_type, granter, *k_options, i=0, **kv_options ): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "authz", @@ -310,13 +367,16 @@ def grant_authorization( **kv_options, ) ) + if rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp @throw_error_for_non_success_code def revoke_authorization( cli, grantee, msg_type, granter, *k_options, i=0, **kv_options ): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "authz", @@ -330,6 +390,9 @@ def revoke_authorization( **kv_options, ) ) + if rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp def query_command(cli, *k_options, i=0, **kv_options): @@ -359,7 +422,7 @@ def query_block_info(cli, height, i=0): def delegate_amount( cli, validator_address, amount, from_, *k_options, i=0, **kv_options ): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "staking", @@ -373,11 +436,14 @@ def delegate_amount( **kv_options, ) ) + if GENERATE_ONLY not in k_options and rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp @throw_error_for_non_success_code def unbond_amount(cli, validator_address, amount, from_, *k_options, i=0, **kv_options): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "staking", @@ -391,13 +457,16 @@ def unbond_amount(cli, validator_address, amount, from_, *k_options, i=0, **kv_o **kv_options, ) ) + if GENERATE_ONLY not in k_options and rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp @throw_error_for_non_success_code def redelegate_amount( cli, src_validator, dst_validator, amount, from_, *k_options, i=0, **kv_options ): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "staking", @@ -412,6 +481,9 @@ def redelegate_amount( **kv_options, ) ) + if GENERATE_ONLY not in k_options and rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp def query_delegation_amount(cluster, delegator_address, validator_address): @@ -447,7 +519,7 @@ def query_total_reward_amount(cluster, delegator_address, validator_address=""): @throw_error_for_non_success_code def withdraw_all_rewards(cli, from_delegator, *k_options, i=0, **kv_options): - return json.loads( + rsp = json.loads( cli.cosmos_cli(i).raw( "tx", "distribution", @@ -459,3 +531,16 @@ def withdraw_all_rewards(cli, from_delegator, *k_options, i=0, **kv_options): **kv_options, ) ) + if GENERATE_ONLY not in k_options and rsp["code"] == 0: + rsp = cli.cosmos_cli(i).event_query_tx_for(rsp["txhash"]) + return rsp + + +def wait_for_fn(name, fn, *, timeout=240, interval=1): + for i in range(int(timeout / interval)): + result = fn() + if result: + return result + time.sleep(interval) + else: + raise TimeoutError(f"wait for {name} timeout") diff --git a/nix/default.nix b/nix/default.nix index 65bba45a2..df7c41eb1 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -2,6 +2,7 @@ import sources.nixpkgs { overlays = [ (_: pkgs: { + flake-compat = import sources.flake-compat; cosmovisor = pkgs.buildGoModule rec { name = "cosmovisor"; src = sources.cosmos-sdk + "/cosmovisor"; diff --git a/nix/sources.json b/nix/sources.json index 9b403ece4..6908bf95c 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -58,5 +58,17 @@ "type": "tarball", "url": "https://github.com/nix-community/poetry2nix/archive/4eb2ac54029af42a001c9901194e9ce19cbd8a40.tar.gz", "url_template": "https://github.com///archive/.tar.gz" + }, + "flake-compat": { + "branch": "master", + "description": null, + "homepage": null, + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "sha256": "1qc703yg0babixi6wshn5wm2kgl5y1drcswgszh4xxzbrwkk9sv7", + "type": "tarball", + "url": "https://github.com/edolstra/flake-compat/archive/b4a34015c698c7793d592d66adbab377907a2be8.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/proto/buf.lock b/proto/buf.lock index 4fceb2374..9b57607f2 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: f485eb5832814b22b05ea756f80be348 + 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: 40f07f5b563941f2b20b991a7aedd53d + commit: cc916c31859748a68fd229a3c8d7a2e8 + digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8 diff --git a/proto/buf.yaml b/proto/buf.yaml index 092cb48b9..180382813 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -2,7 +2,7 @@ version: v1 name: buf.build/crypto-org-chain/chain-main deps: - - buf.build/cosmos/cosmos-sdk + - buf.build/cosmos/cosmos-sdk:954f7b05f38440fc8250134b15adec47 breaking: use: - FILE diff --git a/proto/chainmain/v1/genesis.proto b/proto/chainmain/v1/genesis.proto index 230dd3f3b..dae39c34a 100644 --- a/proto/chainmain/v1/genesis.proto +++ b/proto/chainmain/v1/genesis.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.chainmain.v1; +package chainmain.v1; option go_package = "github.com/crypto-org-chain/chain-main/x/chainmain/types"; diff --git a/proto/icaauth/v1/genesis.proto b/proto/icaauth/v1/genesis.proto index 40f0c0ba1..a674e5f17 100644 --- a/proto/icaauth/v1/genesis.proto +++ b/proto/icaauth/v1/genesis.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.icaauth.v1; +package icaauth.v1; import "gogoproto/gogo.proto"; import "icaauth/v1/params.proto"; diff --git a/proto/icaauth/v1/params.proto b/proto/icaauth/v1/params.proto index 13f6e15da..9f3aee7d7 100644 --- a/proto/icaauth/v1/params.proto +++ b/proto/icaauth/v1/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.icaauth.v1; +package icaauth.v1; import "google/protobuf/duration.proto"; import "gogoproto/gogo.proto"; diff --git a/proto/icaauth/v1/query.proto b/proto/icaauth/v1/query.proto index be8338181..593b9d0e3 100644 --- a/proto/icaauth/v1/query.proto +++ b/proto/icaauth/v1/query.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.icaauth.v1; +package icaauth.v1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; diff --git a/proto/icaauth/v1/tx.proto b/proto/icaauth/v1/tx.proto index b184a765e..8aca3b641 100644 --- a/proto/icaauth/v1/tx.proto +++ b/proto/icaauth/v1/tx.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.icaauth.v1; +package icaauth.v1; import "cosmos_proto/cosmos.proto"; import "google/protobuf/any.proto"; diff --git a/proto/nft/v1/genesis.proto b/proto/nft/v1/genesis.proto index ee0750105..a499c3c5a 100644 --- a/proto/nft/v1/genesis.proto +++ b/proto/nft/v1/genesis.proto @@ -1,7 +1,7 @@ // Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0) // Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0) syntax = "proto3"; -package chainmain.nft.v1; +package nft.v1; import "gogoproto/gogo.proto"; import "nft/v1/nft.proto"; diff --git a/proto/nft/v1/nft.proto b/proto/nft/v1/nft.proto index 40cd27eba..265c48fab 100644 --- a/proto/nft/v1/nft.proto +++ b/proto/nft/v1/nft.proto @@ -1,7 +1,7 @@ // Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0) // Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0) syntax = "proto3"; -package chainmain.nft.v1; +package nft.v1; import "gogoproto/gogo.proto"; diff --git a/proto/nft/v1/query.proto b/proto/nft/v1/query.proto index d4d0474be..3cd9727c2 100644 --- a/proto/nft/v1/query.proto +++ b/proto/nft/v1/query.proto @@ -1,7 +1,7 @@ // Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0) // Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0) syntax = "proto3"; -package chainmain.nft.v1; +package nft.v1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; diff --git a/proto/nft/v1/tx.proto b/proto/nft/v1/tx.proto index bea8afde6..f14be9707 100644 --- a/proto/nft/v1/tx.proto +++ b/proto/nft/v1/tx.proto @@ -1,7 +1,7 @@ // Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0) // Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0) syntax = "proto3"; -package chainmain.nft.v1; +package nft.v1; import "gogoproto/gogo.proto"; diff --git a/proto/nft_transfer/v1/genesis.proto b/proto/nft_transfer/v1/genesis.proto index f37abd16b..e9a7d50de 100644 --- a/proto/nft_transfer/v1/genesis.proto +++ b/proto/nft_transfer/v1/genesis.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.nft_transfer.v1; +package nft_transfer.v1; option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types"; diff --git a/proto/nft_transfer/v1/packet.proto b/proto/nft_transfer/v1/packet.proto index a85fd3702..586f45fbd 100644 --- a/proto/nft_transfer/v1/packet.proto +++ b/proto/nft_transfer/v1/packet.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.nft_transfer.v1; +package nft_transfer.v1; option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types"; diff --git a/proto/nft_transfer/v1/query.proto b/proto/nft_transfer/v1/query.proto index fedb535a7..bff08c0be 100644 --- a/proto/nft_transfer/v1/query.proto +++ b/proto/nft_transfer/v1/query.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.nft_transfer.v1; +package nft_transfer.v1; option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types"; diff --git a/proto/nft_transfer/v1/trace.proto b/proto/nft_transfer/v1/trace.proto index 72b70eecc..27709c35a 100644 --- a/proto/nft_transfer/v1/trace.proto +++ b/proto/nft_transfer/v1/trace.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.nft_transfer.v1; +package nft_transfer.v1; option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types"; diff --git a/proto/nft_transfer/v1/tx.proto b/proto/nft_transfer/v1/tx.proto index dadc07ed7..faa09ef27 100644 --- a/proto/nft_transfer/v1/tx.proto +++ b/proto/nft_transfer/v1/tx.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.nft_transfer.v1; +package nft_transfer.v1; option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types"; diff --git a/proto/supply/v1/accounts.proto b/proto/supply/v1/accounts.proto index cbfd01563..202971efc 100644 --- a/proto/supply/v1/accounts.proto +++ b/proto/supply/v1/accounts.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.supply.v1; +package supply.v1; option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types"; diff --git a/proto/supply/v1/genesis.proto b/proto/supply/v1/genesis.proto index 6af082198..5fb8cdf55 100644 --- a/proto/supply/v1/genesis.proto +++ b/proto/supply/v1/genesis.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.supply.v1; +package supply.v1; option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types"; diff --git a/proto/supply/v1/query.proto b/proto/supply/v1/query.proto index 869cbf498..53fd32611 100644 --- a/proto/supply/v1/query.proto +++ b/proto/supply/v1/query.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package chainmain.supply.v1; +package supply.v1; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 19f7234e2..27d754ea5 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -35,5 +35,3 @@ cd .. # move proto files to the right places cp -r github.com/crypto-org-chain/chain-main/* ./ rm -rf github.com - -go mod tidy -compat=1.18 diff --git a/third_party/cosmos-sdk b/third_party/cosmos-sdk index 06406f6a7..5d406c19b 160000 --- a/third_party/cosmos-sdk +++ b/third_party/cosmos-sdk @@ -1 +1 @@ -Subproject commit 06406f6a70f228bbb6d09b45a4e343477f1ef7e9 +Subproject commit 5d406c19b204cbe2969c2688e2261ce5dd170ad9 diff --git a/third_party/ibc-go b/third_party/ibc-go index 15c090809..bc741464d 160000 --- a/third_party/ibc-go +++ b/third_party/ibc-go @@ -1 +1 @@ -Subproject commit 15c090809046e165eb2c4be5fd27b93bc8cb4bf4 +Subproject commit bc741464d48ba636ac4a6f8627e8b3e753fec083 diff --git a/x/chainmain/client/cli/query.go b/x/chainmain/client/cli/query.go index a8902b6d9..ccd0ff7c6 100644 --- a/x/chainmain/client/cli/query.go +++ b/x/chainmain/client/cli/query.go @@ -15,7 +15,7 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" disttypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - ibctypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" + ibctypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/crypto-org-chain/chain-main/v4/config" "github.com/crypto-org-chain/chain-main/v4/x/chainmain/types" ) diff --git a/x/chainmain/client/cli/testnet.go b/x/chainmain/client/cli/testnet.go index e13842166..429bb2995 100644 --- a/x/chainmain/client/cli/testnet.go +++ b/x/chainmain/client/cli/testnet.go @@ -13,12 +13,12 @@ import ( "time" sdkmath "cosmossdk.io/math" + tmconfig "github.com/cometbft/cometbft/config" + tmos "github.com/cometbft/cometbft/libs/os" + tmtypes "github.com/cometbft/cometbft/types" + tmtime "github.com/cometbft/cometbft/types/time" crypto "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/spf13/cobra" - tmconfig "github.com/tendermint/tendermint/config" - tmos "github.com/tendermint/tendermint/libs/os" - tmtypes "github.com/tendermint/tendermint/types" - tmtime "github.com/tendermint/tendermint/types/time" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" @@ -51,7 +51,7 @@ var ( flagUnbondingTime = "unbonding-time" ) -// get cmd to initialize all files for tendermint testnet and application +// get cmd to initialize all files for cometbft testnet and application func AddTestnetCmd( mbm module.BasicManager, genBalIterator banktypes.GenesisBalancesIterator, @@ -103,9 +103,9 @@ Example: if numValidatorsErr != nil { return fmt.Errorf("failed to parse %v: %w", flagNumValidators, numValidatorsErr) } - algo, algoErr := cmd.Flags().GetString(flags.FlagKeyAlgorithm) + algo, algoErr := cmd.Flags().GetString(flags.FlagKeyType) if algoErr != nil { - return fmt.Errorf("failed to parse %v: %w", flags.FlagKeyAlgorithm, algoErr) + return fmt.Errorf("failed to parse %v: %w", flags.FlagKeyType, algoErr) } amount, amountErr := cmd.Flags().GetString(flagAmount) if amountErr != nil { @@ -135,7 +135,7 @@ Example: cmd.Flags().String(server.FlagMinGasPrices, "", "Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.00000001cro,1basecro)") cmd.Flags().String(flags.FlagKeyringBackend, keyring.BackendTest, "Select keyring's backend (os|file|test)") - cmd.Flags().String(flags.FlagKeyAlgorithm, string(hd.Secp256k1Type), "Key signing algorithm to generate keys for") + cmd.Flags().String(flags.FlagKeyType, string(hd.Secp256k1Type), "Key signing algorithm to generate keys for") cmd.Flags().String(flagAmount, "20000000000000000basecro", "amount of coins for accounts") cmd.Flags().String(flagStakingAmount, "", "amount of coins for staking (default half of account amount)") cmd.Flags().String(flagVestingAmt, "", "amount of coins for vesting accounts") @@ -406,7 +406,7 @@ func initGenFiles( // set gov min_deposit in the genesis state var govGenState govv1.GenesisState clientCtx.Codec.MustUnmarshalJSON(appGenState[govtypes.ModuleName], &govGenState) - govGenState.DepositParams.MinDeposit[0].Denom = baseDenom + govGenState.DepositParams.MinDeposit[0].Denom = baseDenom //nolint:staticcheck appGenState[govtypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&govGenState) // set mint in the genesis state @@ -480,7 +480,7 @@ func collectGenFiles( nodeAppState, err := genutil.GenAppStateFromConfig( clientCtx.Codec, clientCtx.TxConfig, - nodeConfig, initCfg, *genDoc, genBalIterator) + nodeConfig, initCfg, *genDoc, genBalIterator, genutiltypes.DefaultMessageValidator) if err != nil { return err } diff --git a/x/chainmain/keeper/keeper.go b/x/chainmain/keeper/keeper.go index e3ab15aa1..0df458d2d 100644 --- a/x/chainmain/keeper/keeper.go +++ b/x/chainmain/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/x/chainmain/module.go b/x/chainmain/module.go index 08b029b5a..9c7dd1b6d 100644 --- a/x/chainmain/module.go +++ b/x/chainmain/module.go @@ -8,7 +8,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -102,16 +102,6 @@ func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Route returns the capability module's message routing key. -func (AppModule) Route() sdk.Route { return sdk.Route{} } - -// QuerierRoute returns the capability module's query routing key. -func (AppModule) QuerierRoute() string { return "" } - -// LegacyQuerierHandler returns the capability module's Querier. -// (Amino is still needed for Ledger at the moment) -func (am AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil } - // RegisterQueryService registers a GRPC query service to respond to the // module-specific GRPC queries. func (am AppModule) RegisterQueryService(grpc.Server) {} diff --git a/x/chainmain/types/genesis.pb.go b/x/chainmain/types/genesis.pb.go index 74f8cb42b..eda661b4d 100644 --- a/x/chainmain/types/genesis.pb.go +++ b/x/chainmain/types/genesis.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -63,23 +63,22 @@ func (m *GenesisState) XXX_DiscardUnknown() { var xxx_messageInfo_GenesisState proto.InternalMessageInfo func init() { - proto.RegisterType((*GenesisState)(nil), "chainmain.chainmain.v1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "chainmain.v1.GenesisState") } func init() { proto.RegisterFile("chainmain/v1/genesis.proto", fileDescriptor_d594f80fcffdb1b9) } var fileDescriptor_d594f80fcffdb1b9 = []byte{ - // 147 bytes of a gzipped FileDescriptorProto + // 144 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0xcb, 0x4d, 0xcc, 0xcc, 0xd3, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, - 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x83, 0xcb, 0xe9, 0x21, 0x58, 0x65, 0x86, 0x4a, - 0x7c, 0x5c, 0x3c, 0xee, 0x10, 0x85, 0xc1, 0x25, 0x89, 0x25, 0xa9, 0x4e, 0x41, 0x27, 0x1e, 0xc9, - 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, - 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x91, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, - 0x9c, 0x9f, 0xab, 0x9f, 0x5c, 0x54, 0x59, 0x50, 0x92, 0xaf, 0x9b, 0x5f, 0x94, 0xae, 0x0b, 0x36, - 0x4d, 0x1f, 0x4c, 0xea, 0x82, 0xad, 0xae, 0xd0, 0x47, 0x38, 0xa3, 0xa4, 0xb2, 0x20, 0xb5, 0x38, - 0x89, 0x0d, 0xec, 0x04, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x83, 0x5b, 0xcf, 0xac, 0xa0, - 0x00, 0x00, 0x00, + 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x81, 0xcb, 0xe9, 0x95, 0x19, 0x2a, 0xf1, 0x71, + 0xf1, 0xb8, 0x43, 0xa4, 0x83, 0x4b, 0x12, 0x4b, 0x52, 0x9d, 0x82, 0x4e, 0x3c, 0x92, 0x63, 0xbc, + 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, + 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x22, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, + 0x57, 0x3f, 0xb9, 0xa8, 0xb2, 0xa0, 0x24, 0x5f, 0x37, 0xbf, 0x28, 0x5d, 0x17, 0x6c, 0x9a, 0x3e, + 0x98, 0xd4, 0x05, 0x5b, 0x58, 0xa1, 0x8f, 0xb0, 0xbc, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, + 0x6c, 0xb1, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x8c, 0xda, 0x54, 0x96, 0x00, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/icaauth/handler.go b/x/icaauth/handler.go deleted file mode 100644 index dcbdc0457..000000000 --- a/x/icaauth/handler.go +++ /dev/null @@ -1,32 +0,0 @@ -package icaauth - -import ( - "fmt" - - newsdkerrors "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/crypto-org-chain/chain-main/v4/x/icaauth/keeper" - "github.com/crypto-org-chain/chain-main/v4/x/icaauth/types" -) - -// NewHandler ... -func NewHandler(k keeper.Keeper) sdk.Handler { - msgServer := keeper.NewMsgServerImpl(k) - - return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) { - ctx = ctx.WithEventManager(sdk.NewEventManager()) - - switch msg := msg.(type) { - case *types.MsgRegisterAccount: - res, err := msgServer.RegisterAccount(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - case *types.MsgSubmitTx: - res, err := msgServer.SubmitTx(sdk.WrapSDKContext(ctx), msg) - return sdk.WrapServiceResult(ctx, res, err) - default: - errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg) - return nil, newsdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg) - } - } -} diff --git a/x/icaauth/keeper/keeper.go b/x/icaauth/keeper/keeper.go index ad634cc28..6b717dccb 100644 --- a/x/icaauth/keeper/keeper.go +++ b/x/icaauth/keeper/keeper.go @@ -4,19 +4,17 @@ import ( "fmt" "time" - newsdkerrors "cosmossdk.io/errors" + "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" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - icacontrollerkeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/keeper" - icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types" - channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v5/modules/core/24-host" + "github.com/cosmos/gogoproto/proto" + icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" "github.com/crypto-org-chain/chain-main/v4/x/icaauth/types" - "github.com/tendermint/tendermint/libs/log" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -64,17 +62,11 @@ func (k *Keeper) DoSubmitTx(ctx sdk.Context, connectionID, owner string, msgs [] return err } - channelID, found := k.icaControllerKeeper.GetActiveChannelID(ctx, connectionID, portID) - if !found { - return newsdkerrors.Wrapf(icatypes.ErrActiveChannelNotFound, "failed to retrieve active channel for port %s", portID) + protoMsgs := make([]proto.Message, len(msgs)) + for i, msg := range msgs { + protoMsgs[i] = msg.(proto.Message) } - - channelCapability, found := k.scopedKeeper.GetCapability(ctx, host.ChannelCapabilityPath(portID, channelID)) - if !found { - return newsdkerrors.Wrap(channeltypes.ErrChannelCapabilityNotFound, "module does not own channel capability") - } - - data, err := icatypes.SerializeCosmosTx(k.cdc, msgs) + data, err := icatypes.SerializeCosmosTx(k.cdc, protoMsgs) if err != nil { return err } @@ -86,7 +78,7 @@ func (k *Keeper) DoSubmitTx(ctx sdk.Context, connectionID, owner string, msgs [] timeoutTimestamp := ctx.BlockTime().Add(timeoutDuration).UnixNano() - _, err = k.icaControllerKeeper.SendTx(ctx, channelCapability, connectionID, portID, packetData, uint64(timeoutTimestamp)) + _, err = k.icaControllerKeeper.SendTx(ctx, nil, connectionID, portID, packetData, uint64(timeoutTimestamp)) //nolint:staticcheck if err != nil { return err } diff --git a/x/icaauth/module.go b/x/icaauth/module.go index cca92048b..dfec07298 100644 --- a/x/icaauth/module.go +++ b/x/icaauth/module.go @@ -1,9 +1,11 @@ package icaauth import ( + "context" "encoding/json" "fmt" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -14,7 +16,6 @@ import ( "github.com/crypto-org-chain/chain-main/v4/x/icaauth/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" ) var ( @@ -68,7 +69,11 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncod } // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module. -func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {} +func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { + if err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)); err != nil { + panic(err) + } +} // GetTxCmd returns the capability module's root tx command. func (a AppModuleBasic) GetTxCmd() *cobra.Command { @@ -106,23 +111,11 @@ func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Route returns the capability module's message routing key. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - -// QuerierRoute returns the capability module's query routing key. -func (AppModule) QuerierRoute() string { return types.QuerierRoute } - -// LegacyQuerierHandler returns the capability module's Querier. -func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers a GRPC query service to respond to the // module-specific GRPC queries. func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) } // RegisterInvariants registers the capability module's invariants. diff --git a/x/icaauth/module_ibc.go b/x/icaauth/module_ibc.go index 9e9fcf76c..24727cb5f 100644 --- a/x/icaauth/module_ibc.go +++ b/x/icaauth/module_ibc.go @@ -7,11 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types" - channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" - host "github.com/cosmos/ibc-go/v5/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v5/modules/core/exported" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/crypto-org-chain/chain-main/v4/x/icaauth/keeper" ) @@ -43,12 +42,6 @@ func (am IBCModule) OnChanOpenInit( if strings.TrimSpace(version) == "" { version = icatypes.Version } - - // Claim channel capability passed back by IBC module - if err := am.keeper.ClaimCapability(ctx, chanCap, host.ChannelCapabilityPath(portID, channelID)); err != nil { - return "", err - } - return version, nil } diff --git a/x/icaauth/types/genesis.pb.go b/x/icaauth/types/genesis.pb.go index aa2d051c8..e7caabc2d 100644 --- a/x/icaauth/types/genesis.pb.go +++ b/x/icaauth/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" @@ -70,27 +70,26 @@ func (m *GenesisState) GetParams() Params { } func init() { - proto.RegisterType((*GenesisState)(nil), "chainmain.icaauth.v1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "icaauth.v1.GenesisState") } func init() { proto.RegisterFile("icaauth/v1/genesis.proto", fileDescriptor_2ebfc8327b166956) } var fileDescriptor_2ebfc8327b166956 = []byte{ - // 209 bytes of a gzipped FileDescriptorProto + // 200 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc8, 0x4c, 0x4e, 0x4c, 0x2c, 0x2d, 0xc9, 0xd0, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x49, 0xce, 0x48, 0xcc, 0xcc, 0xcb, 0x4d, 0xcc, 0xcc, 0xd3, - 0x83, 0xaa, 0xd1, 0x2b, 0x33, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, 0x07, 0xb1, - 0x20, 0x6a, 0xa5, 0xc4, 0x91, 0x4c, 0x29, 0x48, 0x2c, 0x4a, 0xcc, 0x85, 0x1a, 0xa2, 0xe4, 0xc5, - 0xc5, 0xe3, 0x0e, 0x31, 0x35, 0xb8, 0x24, 0xb1, 0x24, 0x55, 0xc8, 0x8a, 0x8b, 0x0d, 0x22, 0x2f, - 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa3, 0x87, 0xcd, 0x16, 0xbd, 0x00, 0xb0, 0x1a, 0x27, - 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0x3a, 0x9c, 0x02, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, - 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, - 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x2c, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, - 0x3f, 0xb9, 0xa8, 0xb2, 0xa0, 0x24, 0x5f, 0x37, 0xbf, 0x28, 0x5d, 0x17, 0x6c, 0xb4, 0x3e, 0x98, - 0xd4, 0x05, 0xd9, 0xa0, 0x5f, 0xa1, 0x0f, 0x73, 0x67, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, - 0xd8, 0x91, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xec, 0x35, 0xd3, 0x9c, 0x05, 0x01, 0x00, - 0x00, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x82, 0xca, 0xe8, 0x95, 0x19, 0x4a, 0x89, 0xa4, 0xe7, 0xa7, + 0xe7, 0x83, 0x85, 0xf5, 0x41, 0x2c, 0x88, 0x0a, 0x29, 0x71, 0x24, 0xbd, 0x05, 0x89, 0x45, 0x89, + 0xb9, 0x50, 0xad, 0x4a, 0x0e, 0x5c, 0x3c, 0xee, 0x10, 0xb3, 0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, + 0x0c, 0xb8, 0xd8, 0x20, 0xf2, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x42, 0x7a, 0x08, 0xb3, + 0xf5, 0x02, 0xc0, 0x32, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0xd5, 0x39, 0x05, 0x9c, + 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, + 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x59, 0x7a, 0x66, 0x49, 0x46, 0x69, + 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x72, 0x51, 0x65, 0x41, 0x49, 0xbe, 0x6e, 0x7e, 0x51, 0xba, + 0x6e, 0x72, 0x46, 0x62, 0x66, 0x9e, 0x3e, 0x98, 0xd4, 0xcd, 0x05, 0x31, 0x2b, 0xf4, 0x61, 0xae, + 0x2b, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x3b, 0xcd, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, + 0x70, 0xb9, 0x55, 0x07, 0xf1, 0x00, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/icaauth/types/params.pb.go b/x/icaauth/types/params.pb.go index 90316aef2..05f5d8963 100644 --- a/x/icaauth/types/params.pb.go +++ b/x/icaauth/types/params.pb.go @@ -5,9 +5,9 @@ package types import ( fmt "fmt" - _ "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" @@ -74,30 +74,29 @@ func (m *Params) GetMinTimeoutDuration() time.Duration { } func init() { - proto.RegisterType((*Params)(nil), "chainmain.icaauth.v1.Params") + proto.RegisterType((*Params)(nil), "icaauth.v1.Params") } func init() { proto.RegisterFile("icaauth/v1/params.proto", fileDescriptor_1d9da7e51e957114) } var fileDescriptor_1d9da7e51e957114 = []byte{ - // 263 bytes of a gzipped FileDescriptorProto + // 255 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcf, 0x4c, 0x4e, 0x4c, 0x2c, 0x2d, 0xc9, 0xd0, 0x2f, 0x33, 0xd4, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x49, 0xce, 0x48, 0xcc, 0xcc, 0xcb, 0x4d, 0xcc, 0xcc, 0xd3, 0x83, - 0x2a, 0xd1, 0x2b, 0x33, 0x94, 0x92, 0x4b, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0xab, 0x49, - 0x2a, 0x4d, 0xd3, 0x4f, 0x29, 0x2d, 0x4a, 0x2c, 0xc9, 0xcc, 0xcf, 0x83, 0xe8, 0x92, 0x12, 0x49, - 0xcf, 0x4f, 0xcf, 0x07, 0x33, 0xf5, 0x41, 0x2c, 0x88, 0xa8, 0x52, 0x13, 0x23, 0x17, 0x5b, 0x00, - 0xd8, 0x70, 0xa1, 0x22, 0x2e, 0xa1, 0xdc, 0xcc, 0xbc, 0x90, 0xcc, 0xdc, 0xd4, 0xfc, 0xd2, 0x12, - 0x17, 0xa8, 0x66, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x49, 0x3d, 0x88, 0xe9, 0x7a, 0x30, - 0xd3, 0xf5, 0x60, 0x0a, 0x9c, 0xd4, 0x4f, 0xdc, 0x93, 0x67, 0xf8, 0x74, 0x4f, 0x5e, 0xba, 0x32, - 0x31, 0x37, 0xc7, 0x4a, 0x29, 0x37, 0x33, 0x2f, 0xbe, 0x04, 0x62, 0x46, 0x3c, 0xcc, 0x05, 0x4a, - 0x33, 0xee, 0xcb, 0x33, 0x06, 0x61, 0x31, 0xdd, 0x8a, 0x65, 0xc6, 0x02, 0x79, 0x06, 0xa7, 0x80, - 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, - 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, - 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcd, 0x2f, 0x4a, - 0xd7, 0x05, 0x07, 0x80, 0x3e, 0x98, 0xd4, 0x05, 0x85, 0x83, 0x7e, 0x85, 0x3e, 0x2c, 0xb0, 0x4a, - 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xee, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x83, - 0xb8, 0x6c, 0xae, 0x44, 0x01, 0x00, 0x00, + 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x82, 0x4a, 0xe8, 0x95, 0x19, 0x4a, 0xc9, 0xa5, 0xe7, 0xe7, 0xa7, + 0xe7, 0xa4, 0xea, 0x83, 0x65, 0x92, 0x4a, 0xd3, 0xf4, 0x53, 0x4a, 0x8b, 0x12, 0x4b, 0x32, 0xf3, + 0xf3, 0x20, 0x6a, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x4c, 0x7d, 0x10, 0x0b, 0x22, 0xaa, + 0xd4, 0xc4, 0xc8, 0xc5, 0x16, 0x00, 0x36, 0x52, 0xa8, 0x88, 0x4b, 0x28, 0x37, 0x33, 0x2f, 0x24, + 0x33, 0x37, 0x35, 0xbf, 0xb4, 0xc4, 0x05, 0xaa, 0x59, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, + 0x52, 0x0f, 0x62, 0xba, 0x1e, 0xcc, 0x74, 0x3d, 0x98, 0x02, 0x27, 0xf5, 0x13, 0xf7, 0xe4, 0x19, + 0x3e, 0xdd, 0x93, 0x97, 0xae, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0xca, 0xcd, 0xcc, 0x8b, 0x2f, 0x81, + 0x98, 0x11, 0x0f, 0x73, 0x81, 0xd2, 0x8c, 0xfb, 0xf2, 0x8c, 0x41, 0x58, 0x4c, 0xb7, 0x62, 0x99, + 0xb1, 0x40, 0x9e, 0xc1, 0x29, 0xe0, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, + 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, + 0xcc, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x93, 0x8b, 0x2a, 0x0b, + 0x4a, 0xf2, 0x75, 0xf3, 0x8b, 0xd2, 0x75, 0x93, 0x33, 0x12, 0x33, 0xf3, 0xf4, 0xc1, 0xa4, 0x6e, + 0x2e, 0x88, 0x59, 0xa1, 0x0f, 0x0b, 0xa2, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x3b, + 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xb2, 0xf3, 0x71, 0x3a, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -120,7 +119,7 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MinTimeoutDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MinTimeoutDuration):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.MinTimeoutDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.MinTimeoutDuration):]) if err1 != nil { return 0, err1 } @@ -148,7 +147,7 @@ func (m *Params) Size() (n int) { } var l int _ = l - l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.MinTimeoutDuration) + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.MinTimeoutDuration) n += 1 + l + sovParams(uint64(l)) return n } @@ -217,7 +216,7 @@ func (m *Params) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.MinTimeoutDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.MinTimeoutDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/icaauth/types/query.pb.go b/x/icaauth/types/query.pb.go index a465dc223..edeed6640 100644 --- a/x/icaauth/types/query.pb.go +++ b/x/icaauth/types/query.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/cosmos-sdk/types/query" - _ "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" @@ -212,45 +212,45 @@ func (m *QueryInterchainAccountAddressResponse) GetInterchainAccountAddress() st } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "chainmain.icaauth.v1.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "chainmain.icaauth.v1.QueryParamsResponse") - proto.RegisterType((*QueryInterchainAccountAddressRequest)(nil), "chainmain.icaauth.v1.QueryInterchainAccountAddressRequest") - proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "chainmain.icaauth.v1.QueryInterchainAccountAddressResponse") + proto.RegisterType((*QueryParamsRequest)(nil), "icaauth.v1.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "icaauth.v1.QueryParamsResponse") + proto.RegisterType((*QueryInterchainAccountAddressRequest)(nil), "icaauth.v1.QueryInterchainAccountAddressRequest") + proto.RegisterType((*QueryInterchainAccountAddressResponse)(nil), "icaauth.v1.QueryInterchainAccountAddressResponse") } func init() { proto.RegisterFile("icaauth/v1/query.proto", fileDescriptor_b4ef18af0a32af09) } var fileDescriptor_b4ef18af0a32af09 = []byte{ - // 459 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x4f, 0x6b, 0x13, 0x41, - 0x14, 0xcf, 0x06, 0x1b, 0x70, 0xf4, 0x34, 0x2e, 0xba, 0x84, 0xb0, 0x95, 0xa5, 0x42, 0x15, 0xb2, - 0x43, 0x2a, 0x78, 0x88, 0x5e, 0x9a, 0x8b, 0xe4, 0x64, 0xbb, 0x47, 0x2f, 0x61, 0x32, 0x19, 0x36, - 0x03, 0xdd, 0x79, 0xdb, 0x99, 0xd9, 0xe8, 0x5a, 0x7a, 0xd1, 0x2f, 0x20, 0xf8, 0xa5, 0x7a, 0x2c, - 0x78, 0xf1, 0x54, 0x24, 0xe9, 0x27, 0x10, 0x3f, 0x80, 0xec, 0xcc, 0x9a, 0xb6, 0x34, 0x31, 0xd2, - 0xdb, 0xee, 0x7b, 0xbf, 0x7f, 0xef, 0x3d, 0x06, 0x3d, 0x16, 0x8c, 0xd2, 0xc2, 0x4c, 0xc9, 0xac, - 0x47, 0x8e, 0x0b, 0xae, 0xca, 0x38, 0x57, 0x60, 0x00, 0xfb, 0x6c, 0x4a, 0x85, 0xcc, 0xa8, 0x90, - 0x71, 0x8d, 0x88, 0x67, 0xbd, 0xb6, 0x9f, 0x42, 0x0a, 0x16, 0x40, 0xaa, 0x2f, 0x87, 0x6d, 0x77, - 0x52, 0x80, 0xf4, 0x88, 0x13, 0x9a, 0x0b, 0x42, 0xa5, 0x04, 0x43, 0x8d, 0x00, 0xa9, 0xeb, 0xee, - 0x0b, 0x06, 0x3a, 0x03, 0x4d, 0xc6, 0x54, 0x73, 0x67, 0x41, 0x66, 0xbd, 0x31, 0x37, 0xb4, 0x47, - 0x72, 0x9a, 0x0a, 0x69, 0xc1, 0x35, 0xf6, 0xc9, 0xb5, 0x34, 0x39, 0x55, 0x34, 0xab, 0x45, 0x22, - 0x1f, 0xe1, 0xc3, 0x8a, 0x7a, 0x60, 0x8b, 0x09, 0x3f, 0x2e, 0xb8, 0x36, 0xd1, 0x21, 0x7a, 0x74, - 0xa3, 0xaa, 0x73, 0x90, 0x9a, 0xe3, 0x3e, 0x6a, 0x39, 0x72, 0xe0, 0x3d, 0xf5, 0x76, 0x1f, 0xec, - 0x75, 0xe2, 0x55, 0xc3, 0xc4, 0x8e, 0x35, 0xb8, 0x77, 0x76, 0xb1, 0xdd, 0x48, 0x6a, 0x46, 0xf4, - 0x09, 0xed, 0x58, 0xc9, 0xa1, 0x34, 0x5c, 0x59, 0xda, 0x3e, 0x63, 0x50, 0x48, 0xb3, 0x3f, 0x99, - 0x28, 0xae, 0xff, 0x5a, 0xe3, 0x37, 0xe8, 0x21, 0x03, 0x29, 0x39, 0xab, 0xd2, 0x0f, 0x27, 0xd6, - 0xe9, 0xfe, 0x20, 0xf8, 0x75, 0xb1, 0xed, 0x97, 0x34, 0x3b, 0xea, 0x47, 0x57, 0xdd, 0x91, 0x98, - 0x44, 0xc9, 0x0d, 0x34, 0xf6, 0xd1, 0x16, 0x7c, 0x90, 0x5c, 0x05, 0xcd, 0x8a, 0x96, 0xb8, 0x9f, - 0x88, 0xa1, 0x67, 0x1b, 0xbc, 0x97, 0x03, 0x06, 0x62, 0x0d, 0xc6, 0x05, 0x49, 0xd6, 0xf6, 0xf7, - 0x7e, 0x37, 0xd1, 0x96, 0x75, 0xc1, 0x5f, 0x3c, 0xd4, 0x72, 0x3b, 0xc0, 0xbb, 0xab, 0x37, 0x74, - 0x7b, 0xe5, 0xed, 0xe7, 0xff, 0x81, 0x74, 0x29, 0xa3, 0x9d, 0xcf, 0xdf, 0x2f, 0xbf, 0x35, 0x43, - 0xdc, 0x21, 0x4b, 0x0a, 0xb9, 0x75, 0x5f, 0x7c, 0xe9, 0xa1, 0x60, 0xdd, 0xc0, 0xb8, 0xff, 0x0f, - 0xb7, 0x0d, 0x17, 0x6a, 0xbf, 0xbe, 0x13, 0xb7, 0xce, 0xfe, 0xce, 0x66, 0x1f, 0xe2, 0xb7, 0xab, - 0xb3, 0x5f, 0x6d, 0x77, 0x44, 0x9d, 0xc0, 0x88, 0x3a, 0x05, 0x72, 0x72, 0xfd, 0xd0, 0xa7, 0xe4, - 0xc4, 0x9e, 0xf6, 0x74, 0x70, 0x70, 0x36, 0x0f, 0xbd, 0xf3, 0x79, 0xe8, 0xfd, 0x9c, 0x87, 0xde, - 0xd7, 0x45, 0xd8, 0x38, 0x5f, 0x84, 0x8d, 0x1f, 0x8b, 0xb0, 0xf1, 0xfe, 0x55, 0x2a, 0xcc, 0xb4, - 0x18, 0xc7, 0x0c, 0x32, 0xc2, 0x54, 0x99, 0x1b, 0xe8, 0x82, 0x4a, 0xbb, 0x56, 0xdd, 0xb9, 0x77, - 0xad, 0xfd, 0xc7, 0x65, 0x00, 0x53, 0xe6, 0x5c, 0x8f, 0x5b, 0xf6, 0x65, 0xbc, 0xfc, 0x13, 0x00, - 0x00, 0xff, 0xff, 0x25, 0xc8, 0x1f, 0xca, 0xc2, 0x03, 0x00, 0x00, + // 455 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x41, 0x6b, 0x13, 0x41, + 0x14, 0xce, 0x06, 0x1b, 0x70, 0xf4, 0x34, 0x06, 0x5d, 0x42, 0x99, 0xc8, 0x52, 0x41, 0x84, 0xec, + 0x74, 0x2b, 0x78, 0x28, 0x5e, 0x9a, 0x4b, 0xc9, 0xc9, 0xba, 0x47, 0x2f, 0x61, 0x32, 0x19, 0x36, + 0x03, 0xdd, 0x79, 0xdb, 0x99, 0xd9, 0x68, 0x2c, 0xbd, 0xf8, 0x0b, 0x04, 0xff, 0x54, 0xc1, 0x4b, + 0xc0, 0x8b, 0xa7, 0x22, 0x89, 0xbf, 0xc0, 0x5f, 0x20, 0x3b, 0xb3, 0x9a, 0x94, 0xb8, 0x14, 0x6f, + 0xbb, 0xef, 0x7d, 0xef, 0xfb, 0xbe, 0xf7, 0xbe, 0x41, 0x8f, 0x25, 0x67, 0xac, 0xb4, 0x33, 0x3a, + 0x4f, 0xe8, 0x45, 0x29, 0xf4, 0x22, 0x2e, 0x34, 0x58, 0xc0, 0xa8, 0xae, 0xc7, 0xf3, 0xa4, 0xd7, + 0xcd, 0x20, 0x03, 0x57, 0xa6, 0xd5, 0x97, 0x47, 0xf4, 0xf6, 0x33, 0x80, 0xec, 0x5c, 0x50, 0x56, + 0x48, 0xca, 0x94, 0x02, 0xcb, 0xac, 0x04, 0x65, 0xea, 0xee, 0x0b, 0x0e, 0x26, 0x07, 0x43, 0x27, + 0xcc, 0x08, 0x4f, 0x4c, 0xe7, 0xc9, 0x44, 0x58, 0x96, 0xd0, 0x82, 0x65, 0x52, 0x39, 0x70, 0x8d, + 0x7d, 0xb2, 0xe5, 0xa1, 0x60, 0x9a, 0xe5, 0x35, 0x49, 0xd4, 0x45, 0xf8, 0x6d, 0x35, 0x7a, 0xe6, + 0x8a, 0xa9, 0xb8, 0x28, 0x85, 0xb1, 0xd1, 0x29, 0x7a, 0x74, 0xab, 0x6a, 0x0a, 0x50, 0x46, 0xe0, + 0x43, 0xd4, 0xf1, 0xc3, 0x61, 0xf0, 0x34, 0x78, 0xfe, 0xe0, 0x08, 0xc7, 0x9b, 0x15, 0x62, 0x8f, + 0x1d, 0xde, 0xbb, 0xbe, 0xe9, 0xb7, 0xd2, 0x1a, 0x17, 0x7d, 0x44, 0x07, 0x8e, 0x68, 0xa4, 0xac, + 0xd0, 0x7c, 0xc6, 0xa4, 0x3a, 0xe1, 0x1c, 0x4a, 0x65, 0x4f, 0xa6, 0x53, 0x2d, 0xcc, 0x1f, 0x41, + 0xfc, 0x1a, 0x3d, 0xe4, 0xa0, 0x94, 0xe0, 0x95, 0xe7, 0xd1, 0xd4, 0xf1, 0xdf, 0x1f, 0x86, 0xbf, + 0x6e, 0xfa, 0xdd, 0x05, 0xcb, 0xcf, 0x8f, 0xa3, 0x4d, 0x77, 0x2c, 0xa7, 0x51, 0x7a, 0x0b, 0x8d, + 0xbb, 0x68, 0x0f, 0xde, 0x2b, 0xa1, 0xc3, 0x76, 0x35, 0x96, 0xfa, 0x9f, 0x88, 0xa3, 0x67, 0x77, + 0x68, 0xd7, 0x6b, 0x1d, 0xa3, 0x50, 0x36, 0x60, 0xbc, 0x91, 0xb4, 0xb1, 0x7f, 0xf4, 0xb5, 0x8d, + 0xf6, 0x9c, 0x0a, 0x06, 0xd4, 0xf1, 0x27, 0xc0, 0x64, 0xfb, 0x2c, 0xbb, 0xd7, 0xed, 0xf5, 0x1b, + 0xfb, 0xde, 0x50, 0x74, 0xf0, 0xe9, 0xdb, 0xcf, 0x2f, 0x6d, 0x82, 0xf7, 0xa9, 0x93, 0xcc, 0x99, + 0x54, 0x74, 0x27, 0x40, 0xbc, 0x0c, 0x50, 0xd8, 0xb4, 0x1b, 0x3e, 0xdc, 0xd1, 0xb8, 0x23, 0x82, + 0x5e, 0xf2, 0x1f, 0x13, 0xb5, 0xcf, 0x37, 0xce, 0xe7, 0x08, 0x9f, 0xfe, 0xdb, 0xe7, 0xe6, 0x68, + 0x63, 0xe6, 0x09, 0xc6, 0xcc, 0x33, 0xd0, 0xcb, 0xed, 0xfc, 0xae, 0xe8, 0xa5, 0x4b, 0xec, 0x6a, + 0x78, 0x76, 0xbd, 0x22, 0xc1, 0x72, 0x45, 0x82, 0x1f, 0x2b, 0x12, 0x7c, 0x5e, 0x93, 0xd6, 0x72, + 0x4d, 0x5a, 0xdf, 0xd7, 0xa4, 0xf5, 0xee, 0x55, 0x26, 0xed, 0xac, 0x9c, 0xc4, 0x1c, 0x72, 0xca, + 0xf5, 0xa2, 0xb0, 0x30, 0x00, 0x9d, 0x0d, 0x1c, 0xbb, 0x57, 0x1f, 0x38, 0xf9, 0x0f, 0x7f, 0x0d, + 0xd8, 0x45, 0x21, 0xcc, 0xa4, 0xe3, 0x9e, 0xf9, 0xcb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x79, + 0x52, 0x7c, 0xd6, 0x85, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -281,7 +281,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/chainmain.icaauth.v1.Query/Params", in, out, opts...) + err := c.cc.Invoke(ctx, "/icaauth.v1.Query/Params", in, out, opts...) if err != nil { return nil, err } @@ -290,7 +290,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . func (c *queryClient) InterchainAccountAddress(ctx context.Context, in *QueryInterchainAccountAddressRequest, opts ...grpc.CallOption) (*QueryInterchainAccountAddressResponse, error) { out := new(QueryInterchainAccountAddressResponse) - err := c.cc.Invoke(ctx, "/chainmain.icaauth.v1.Query/InterchainAccountAddress", in, out, opts...) + err := c.cc.Invoke(ctx, "/icaauth.v1.Query/InterchainAccountAddress", in, out, opts...) if err != nil { return nil, err } @@ -330,7 +330,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.icaauth.v1.Query/Params", + FullMethod: "/icaauth.v1.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) @@ -348,7 +348,7 @@ func _Query_InterchainAccountAddress_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.icaauth.v1.Query/InterchainAccountAddress", + FullMethod: "/icaauth.v1.Query/InterchainAccountAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).InterchainAccountAddress(ctx, req.(*QueryInterchainAccountAddressRequest)) @@ -357,7 +357,7 @@ func _Query_InterchainAccountAddress_Handler(srv interface{}, ctx context.Contex } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "chainmain.icaauth.v1.Query", + ServiceName: "icaauth.v1.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/x/icaauth/types/tx.pb.go b/x/icaauth/types/tx.pb.go index 37fdb134d..6f9efcf22 100644 --- a/x/icaauth/types/tx.pb.go +++ b/x/icaauth/types/tx.pb.go @@ -8,10 +8,10 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" types "github.com/cosmos/cosmos-sdk/codec/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" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -246,45 +246,43 @@ func (m *MsgSubmitTxResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSubmitTxResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgRegisterAccount)(nil), "chainmain.icaauth.v1.MsgRegisterAccount") - proto.RegisterType((*MsgRegisterAccountResponse)(nil), "chainmain.icaauth.v1.MsgRegisterAccountResponse") - proto.RegisterType((*MsgSubmitTx)(nil), "chainmain.icaauth.v1.MsgSubmitTx") - proto.RegisterType((*MsgSubmitTxResponse)(nil), "chainmain.icaauth.v1.MsgSubmitTxResponse") + proto.RegisterType((*MsgRegisterAccount)(nil), "icaauth.v1.MsgRegisterAccount") + proto.RegisterType((*MsgRegisterAccountResponse)(nil), "icaauth.v1.MsgRegisterAccountResponse") + proto.RegisterType((*MsgSubmitTx)(nil), "icaauth.v1.MsgSubmitTx") + proto.RegisterType((*MsgSubmitTxResponse)(nil), "icaauth.v1.MsgSubmitTxResponse") } func init() { proto.RegisterFile("icaauth/v1/tx.proto", fileDescriptor_09bf995a0c8f8b8c) } var fileDescriptor_09bf995a0c8f8b8c = []byte{ - // 449 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xbb, 0x8e, 0xd3, 0x40, - 0x14, 0xcd, 0x90, 0xc0, 0xc2, 0x04, 0x69, 0x25, 0xaf, 0x91, 0x1c, 0x0b, 0x79, 0x83, 0xab, 0x50, - 0x64, 0x86, 0x0d, 0x82, 0x02, 0xd1, 0x6c, 0x44, 0xb3, 0x45, 0x24, 0x64, 0x28, 0x10, 0xcd, 0xca, - 0x99, 0x0c, 0x93, 0x11, 0x3b, 0x73, 0x23, 0xcf, 0x38, 0xc4, 0x2d, 0x5f, 0x40, 0xc9, 0x87, 0xf0, - 0x11, 0x88, 0x02, 0x6d, 0x49, 0x05, 0x28, 0xf9, 0x03, 0xbe, 0x00, 0xf9, 0x31, 0x3c, 0x12, 0x10, - 0x34, 0xdb, 0x58, 0x3e, 0x3e, 0xe7, 0x9e, 0x7b, 0xef, 0xf1, 0x0c, 0x3e, 0x90, 0x2c, 0x4d, 0x73, - 0x3b, 0xa7, 0xcb, 0x23, 0x6a, 0x57, 0x64, 0x91, 0x81, 0x05, 0xcf, 0x67, 0xf3, 0x54, 0x6a, 0x95, - 0x4a, 0x4d, 0x1a, 0x9a, 0x2c, 0x8f, 0xc2, 0x1e, 0x03, 0xa3, 0xc0, 0x9c, 0x56, 0x1a, 0x5a, 0x83, - 0xba, 0x20, 0xec, 0x09, 0x00, 0x71, 0xc6, 0x69, 0x85, 0xa6, 0xf9, 0x0b, 0x9a, 0xea, 0xa2, 0xa1, - 0xa2, 0x6d, 0x6a, 0x96, 0x67, 0xa9, 0x95, 0xa0, 0x1b, 0xde, 0x17, 0x20, 0xa0, 0xb6, 0x2c, 0xdf, - 0xea, 0xaf, 0xf1, 0x6b, 0x84, 0xbd, 0x89, 0x11, 0x09, 0x17, 0xd2, 0x58, 0x9e, 0x1d, 0x33, 0x06, - 0xb9, 0xb6, 0x9e, 0x8f, 0x2f, 0xc3, 0x2b, 0xcd, 0xb3, 0x00, 0xf5, 0xd1, 0xe0, 0x5a, 0x52, 0x03, - 0xef, 0x21, 0xbe, 0xce, 0x40, 0x6b, 0xce, 0x4a, 0xdb, 0x93, 0x59, 0x70, 0xa9, 0x24, 0xc7, 0xc1, - 0xb7, 0xcf, 0x87, 0x7e, 0x91, 0xaa, 0xb3, 0x07, 0xf1, 0x4f, 0xf6, 0x54, 0xce, 0xe2, 0xe4, 0x37, - 0xb5, 0x17, 0xe0, 0xbd, 0x25, 0xcf, 0x8c, 0x04, 0x1d, 0xb4, 0x2b, 0x57, 0x07, 0xe3, 0x9b, 0x38, - 0xdc, 0x9d, 0x21, 0xe1, 0x66, 0x01, 0xda, 0xf0, 0x78, 0x83, 0x70, 0x77, 0x62, 0xc4, 0x93, 0x7c, - 0xaa, 0xa4, 0x7d, 0xba, 0xba, 0x90, 0xd9, 0xee, 0xe1, 0x8e, 0x32, 0xc2, 0x04, 0xed, 0x7e, 0x7b, - 0xd0, 0x1d, 0xf9, 0xa4, 0xce, 0x92, 0xb8, 0x2c, 0xc9, 0xb1, 0x2e, 0xc6, 0xdd, 0x0f, 0xef, 0x86, - 0x7b, 0x66, 0xf6, 0x92, 0x94, 0xb3, 0x56, 0x72, 0xef, 0x04, 0xef, 0x5b, 0xa9, 0x38, 0xe4, 0xf6, - 0x51, 0x13, 0x76, 0xd0, 0xe9, 0xa3, 0x41, 0x77, 0xd4, 0xdb, 0x71, 0x70, 0x82, 0x71, 0xe7, 0xed, - 0x97, 0x43, 0x94, 0x6c, 0xd7, 0xc5, 0x37, 0xf0, 0xc1, 0x2f, 0x4b, 0xba, 0xe5, 0x47, 0x1f, 0x11, - 0x6e, 0x4f, 0x8c, 0xf0, 0x14, 0xde, 0xdf, 0xfe, 0x47, 0x03, 0xf2, 0xa7, 0xd3, 0x43, 0x76, 0x93, - 0x0c, 0xef, 0xfc, 0xaf, 0xd2, 0xb5, 0xf5, 0x9e, 0xe1, 0xab, 0x3f, 0xf2, 0xbe, 0xf5, 0xd7, 0x6a, - 0x27, 0x09, 0x6f, 0xff, 0x53, 0xe2, 0x9c, 0xc7, 0x8f, 0xdf, 0xaf, 0x23, 0x74, 0xbe, 0x8e, 0xd0, - 0xd7, 0x75, 0x84, 0xde, 0x6c, 0xa2, 0xd6, 0xf9, 0x26, 0x6a, 0x7d, 0xda, 0x44, 0xad, 0xe7, 0xf7, - 0x85, 0xb4, 0xf3, 0x7c, 0x4a, 0x18, 0x28, 0xca, 0xb2, 0x62, 0x61, 0x61, 0x08, 0x99, 0x18, 0x56, - 0xce, 0xb4, 0x7a, 0x0e, 0xcb, 0x06, 0x74, 0x45, 0xdd, 0x55, 0xb2, 0xc5, 0x82, 0x9b, 0xe9, 0x95, - 0x2a, 0xe3, 0xbb, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x2e, 0xcf, 0x3f, 0x62, 0x03, 0x00, - 0x00, + // 426 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x3f, 0x8f, 0xd3, 0x30, + 0x18, 0xc6, 0x6b, 0x7a, 0xfc, 0xf3, 0x21, 0x9d, 0xe4, 0x2b, 0x22, 0x8d, 0x90, 0x8b, 0x32, 0x9c, + 0x58, 0x6a, 0xeb, 0x0e, 0x89, 0x01, 0xb1, 0x5c, 0x75, 0xcb, 0x0d, 0x95, 0x50, 0x60, 0x81, 0xe5, + 0x94, 0xba, 0xc6, 0xb5, 0x74, 0xf1, 0x1b, 0xc5, 0x4e, 0x69, 0x56, 0x3e, 0x01, 0x23, 0x9f, 0x80, + 0xcf, 0xc2, 0x78, 0x03, 0x03, 0x13, 0xa0, 0xf6, 0x1b, 0xf0, 0x09, 0x50, 0xfe, 0x98, 0x42, 0x2a, + 0xd8, 0x6e, 0x89, 0xfc, 0xfa, 0xf7, 0x3e, 0x4f, 0x5e, 0x3f, 0x89, 0xf1, 0xa1, 0x16, 0x49, 0x52, + 0xb8, 0x05, 0x5f, 0x1e, 0x73, 0xb7, 0x62, 0x59, 0x0e, 0x0e, 0x08, 0x6e, 0x37, 0xd9, 0xf2, 0x38, + 0x1c, 0x0a, 0xb0, 0x29, 0xd8, 0x8b, 0x9a, 0xf0, 0xa6, 0x68, 0xda, 0xc2, 0xa1, 0x02, 0x50, 0x97, + 0x92, 0xd7, 0xd5, 0xac, 0x78, 0xcb, 0x13, 0x53, 0xb6, 0x88, 0x76, 0xd1, 0xbc, 0xc8, 0x13, 0xa7, + 0xc1, 0xb4, 0x7c, 0xa0, 0x40, 0x41, 0x63, 0x59, 0xad, 0x9a, 0xdd, 0xe8, 0x3d, 0xc2, 0x64, 0x6a, + 0x55, 0x2c, 0x95, 0xb6, 0x4e, 0xe6, 0xa7, 0x42, 0x40, 0x61, 0x1c, 0x19, 0xe0, 0x9b, 0xf0, 0xce, + 0xc8, 0x3c, 0x40, 0x8f, 0xd0, 0xe3, 0xbb, 0x71, 0x53, 0x90, 0xe7, 0xf8, 0x9e, 0x00, 0x63, 0xa4, + 0xa8, 0x6c, 0xcf, 0xe7, 0xc1, 0x8d, 0x0a, 0x4e, 0x82, 0x9f, 0xdf, 0x46, 0x83, 0x32, 0x49, 0x2f, + 0x9f, 0x45, 0x5b, 0x7a, 0xa1, 0xe7, 0x51, 0xfc, 0x57, 0x37, 0x09, 0xf0, 0xed, 0xa5, 0xcc, 0xad, + 0x06, 0x13, 0xf4, 0x6b, 0x57, 0x5f, 0x46, 0x0f, 0x71, 0xb8, 0x3b, 0x43, 0x2c, 0x6d, 0x06, 0xc6, + 0xca, 0xe8, 0x0b, 0xc2, 0xfb, 0x53, 0xab, 0x5e, 0x16, 0xb3, 0x54, 0xbb, 0x57, 0xab, 0x6b, 0x99, + 0xed, 0x08, 0xf7, 0x53, 0xab, 0xea, 0xb9, 0xf6, 0x4f, 0x06, 0xac, 0x89, 0x92, 0xf9, 0x28, 0xd9, + 0xa9, 0x29, 0xe3, 0xaa, 0x81, 0x9c, 0xe3, 0x03, 0xa7, 0x53, 0x09, 0x85, 0x3b, 0x6b, 0xd3, 0x0d, + 0xf6, 0x6a, 0xcd, 0x70, 0x47, 0xe3, 0x1b, 0x26, 0x7b, 0x1f, 0xbf, 0x8f, 0x50, 0xdc, 0xd5, 0x45, + 0xf7, 0xf1, 0xe1, 0x1f, 0xa7, 0xf2, 0xa7, 0x3d, 0xf9, 0x84, 0x70, 0x7f, 0x6a, 0x15, 0x79, 0x8d, + 0x0f, 0xba, 0x1f, 0x85, 0xb2, 0xed, 0x4f, 0xc2, 0x76, 0x03, 0x0b, 0x8f, 0xfe, 0xcf, 0xfd, 0x2b, + 0xc8, 0x19, 0xbe, 0xf3, 0x3b, 0xcc, 0x07, 0x1d, 0x8d, 0x07, 0xe1, 0xe8, 0x1f, 0xc0, 0xbb, 0x4c, + 0x5e, 0x7c, 0x5e, 0x53, 0x74, 0xb5, 0xa6, 0xe8, 0xc7, 0x9a, 0xa2, 0x0f, 0x1b, 0xda, 0xbb, 0xda, + 0xd0, 0xde, 0xd7, 0x0d, 0xed, 0xbd, 0x79, 0xaa, 0xb4, 0x5b, 0x14, 0x33, 0x26, 0x20, 0xe5, 0x22, + 0x2f, 0x33, 0x07, 0x63, 0xc8, 0xd5, 0x58, 0x2c, 0x12, 0x6d, 0x78, 0xfd, 0x1c, 0xa7, 0xd5, 0x72, + 0xc5, 0xfd, 0x4d, 0x70, 0x65, 0x26, 0xed, 0xec, 0x56, 0x9d, 0xdd, 0x93, 0x5f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x4f, 0x47, 0x52, 0x10, 0x21, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -315,7 +313,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) RegisterAccount(ctx context.Context, in *MsgRegisterAccount, opts ...grpc.CallOption) (*MsgRegisterAccountResponse, error) { out := new(MsgRegisterAccountResponse) - err := c.cc.Invoke(ctx, "/chainmain.icaauth.v1.Msg/RegisterAccount", in, out, opts...) + err := c.cc.Invoke(ctx, "/icaauth.v1.Msg/RegisterAccount", in, out, opts...) if err != nil { return nil, err } @@ -324,7 +322,7 @@ func (c *msgClient) RegisterAccount(ctx context.Context, in *MsgRegisterAccount, func (c *msgClient) SubmitTx(ctx context.Context, in *MsgSubmitTx, opts ...grpc.CallOption) (*MsgSubmitTxResponse, error) { out := new(MsgSubmitTxResponse) - err := c.cc.Invoke(ctx, "/chainmain.icaauth.v1.Msg/SubmitTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/icaauth.v1.Msg/SubmitTx", in, out, opts...) if err != nil { return nil, err } @@ -364,7 +362,7 @@ func _Msg_RegisterAccount_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.icaauth.v1.Msg/RegisterAccount", + FullMethod: "/icaauth.v1.Msg/RegisterAccount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).RegisterAccount(ctx, req.(*MsgRegisterAccount)) @@ -382,7 +380,7 @@ func _Msg_SubmitTx_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.icaauth.v1.Msg/SubmitTx", + FullMethod: "/icaauth.v1.Msg/SubmitTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).SubmitTx(ctx, req.(*MsgSubmitTx)) @@ -391,7 +389,7 @@ func _Msg_SubmitTx_Handler(srv interface{}, ctx context.Context, dec func(interf } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "chainmain.icaauth.v1.Msg", + ServiceName: "icaauth.v1.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -495,7 +493,7 @@ func (m *MsgSubmitTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if m.TimeoutDuration != nil { - n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.TimeoutDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.TimeoutDuration):]) + n1, err1 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(*m.TimeoutDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(*m.TimeoutDuration):]) if err1 != nil { return 0, err1 } @@ -620,7 +618,7 @@ func (m *MsgSubmitTx) Size() (n int) { } } if m.TimeoutDuration != nil { - l = github_com_gogo_protobuf_types.SizeOfStdDuration(*m.TimeoutDuration) + l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(*m.TimeoutDuration) n += 1 + l + sovTx(uint64(l)) } return n @@ -996,7 +994,7 @@ func (m *MsgSubmitTx) Unmarshal(dAtA []byte) error { if m.TimeoutDuration == nil { m.TimeoutDuration = new(time.Duration) } - if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(m.TimeoutDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(m.TimeoutDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/icaauth/types/types.go b/x/icaauth/types/types.go index 7aec2d129..0232d5317 100644 --- a/x/icaauth/types/types.go +++ b/x/icaauth/types/types.go @@ -1,8 +1,8 @@ package types import ( + "github.com/cometbft/cometbft/crypto/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tendermint/tendermint/crypto/ed25519" ) // AccAddress returns a sample account address (for use in testing) diff --git a/x/nft-transfer/client/cli/tx.go b/x/nft-transfer/client/cli/tx.go index 9cd0f5559..86db870cb 100644 --- a/x/nft-transfer/client/cli/tx.go +++ b/x/nft-transfer/client/cli/tx.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" - channelutils "github.com/cosmos/ibc-go/v5/modules/core/04-channel/client/utils" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channelutils "github.com/cosmos/ibc-go/v7/modules/core/04-channel/client/utils" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" ) diff --git a/x/nft-transfer/ibc_module.go b/x/nft-transfer/ibc_module.go index ed97a6a90..b56c472db 100644 --- a/x/nft-transfer/ibc_module.go +++ b/x/nft-transfer/ibc_module.go @@ -11,10 +11,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" - host "github.com/cosmos/ibc-go/v5/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v5/modules/core/exported" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/keeper" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" ) diff --git a/x/nft-transfer/keeper/keeper.go b/x/nft-transfer/keeper/keeper.go index 630b5e8af..06f79cae2 100644 --- a/x/nft-transfer/keeper/keeper.go +++ b/x/nft-transfer/keeper/keeper.go @@ -1,14 +1,14 @@ 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" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - host "github.com/cosmos/ibc-go/v5/modules/core/24-host" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" - "github.com/tendermint/tendermint/libs/log" ) // Keeper defines the IBC non fungible transfer keeper @@ -49,7 +49,7 @@ func NewKeeper( // Logger returns a module-specific logger. func (k Keeper) Logger(ctx sdk.Context) log.Logger { - return ctx.Logger().With("module", "x/"+host.ModuleName+"-"+types.ModuleName) + return ctx.Logger().With("module", "x/"+host.SubModuleName+"-"+types.ModuleName) } // SetPort sets the portID for the nft-transfer module. Used in InitGenesis diff --git a/x/nft-transfer/keeper/packet.go b/x/nft-transfer/keeper/packet.go index 987aa9768..15401ea03 100644 --- a/x/nft-transfer/keeper/packet.go +++ b/x/nft-transfer/keeper/packet.go @@ -6,8 +6,8 @@ import ( newsdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" ) diff --git a/x/nft-transfer/keeper/relay.go b/x/nft-transfer/keeper/relay.go index f25269565..08398b516 100644 --- a/x/nft-transfer/keeper/relay.go +++ b/x/nft-transfer/keeper/relay.go @@ -5,10 +5,10 @@ import ( "github.com/armon/go-metrics" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v5/modules/core/24-host" - coretypes "github.com/cosmos/ibc-go/v5/modules/core/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + coretypes "github.com/cosmos/ibc-go/v7/modules/core/types" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" ) @@ -89,7 +89,7 @@ func (k Keeper) SendTransfer( return err } - if err := k.ics4Wrapper.SendPacket(ctx, channelCap, packet); err != nil { + if _, err := k.ics4Wrapper.SendPacket(ctx, channelCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, packet.GetData()); err != nil { return err } diff --git a/x/nft-transfer/keeper/trace.go b/x/nft-transfer/keeper/trace.go index 82c88bc3c..d17dee8b1 100644 --- a/x/nft-transfer/keeper/trace.go +++ b/x/nft-transfer/keeper/trace.go @@ -2,10 +2,10 @@ package keeper import ( sdkerrors "cosmossdk.io/errors" + tmbytes "github.com/cometbft/cometbft/libs/bytes" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" - tmbytes "github.com/tendermint/tendermint/libs/bytes" ) // GetClassTrace retrieves the full identifiers trace and base classId from the store. diff --git a/x/nft-transfer/module.go b/x/nft-transfer/module.go index f92302cd4..19d071fb0 100644 --- a/x/nft-transfer/module.go +++ b/x/nft-transfer/module.go @@ -9,7 +9,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -18,7 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/client/cli" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/keeper" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/simulation" @@ -97,21 +97,6 @@ func NewAppModule(k keeper.Keeper) AppModule { // RegisterInvariants implements the AppModule interface func (AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {} -// Route implements the AppModule interface -func (am AppModule) Route() sdk.Route { - return sdk.Route{} -} - -// QuerierRoute implements the AppModule interface -func (AppModule) QuerierRoute() string { - return types.QuerierRoute -} - -// LegacyQuerierHandler implements the AppModule interface -func (am AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers module services. func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), am.keeper) @@ -153,13 +138,8 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { simulation.RandomizedGenState(simState) } -// ProposalContents doesn't return any content functions for governance proposals. -func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent { - return nil -} - // RandomizedParams creates randomized ibc nft-transfer param changes for the simulator. -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return nil } diff --git a/x/nft-transfer/types/ack.go b/x/nft-transfer/types/ack.go index 9b26d44f9..fc2226a62 100644 --- a/x/nft-transfer/types/ack.go +++ b/x/nft-transfer/types/ack.go @@ -5,7 +5,7 @@ import ( sdkerrors "cosmossdk.io/errors" - channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ) const ( diff --git a/x/nft-transfer/types/expected_keepers.go b/x/nft-transfer/types/expected_keepers.go index 78dddeb4f..c3f30de29 100644 --- a/x/nft-transfer/types/expected_keepers.go +++ b/x/nft-transfer/types/expected_keepers.go @@ -4,15 +4,23 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v5/modules/core/exported" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" nftexported "github.com/crypto-org-chain/chain-main/v4/x/nft/exported" nfttypes "github.com/crypto-org-chain/chain-main/v4/x/nft/types" ) // ICS4Wrapper defines the expected ICS4Wrapper for middleware type ICS4Wrapper interface { - SendPacket(ctx sdk.Context, channelCap *capabilitytypes.Capability, packet ibcexported.PacketI) error + SendPacket( + ctx sdk.Context, + chanCap *capabilitytypes.Capability, + sourcePort string, + sourceChannel string, + timeoutHeight clienttypes.Height, + timeoutTimestamp uint64, + data []byte, + ) (uint64, error) } // ChannelKeeper defines the expected IBC channel keeper diff --git a/x/nft-transfer/types/genesis.go b/x/nft-transfer/types/genesis.go index 399852c07..35b4a56d7 100644 --- a/x/nft-transfer/types/genesis.go +++ b/x/nft-transfer/types/genesis.go @@ -1,7 +1,7 @@ package types import ( - host "github.com/cosmos/ibc-go/v5/modules/core/24-host" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ) // NewGenesisState creates a new ibc nft-transfer GenesisState instance. diff --git a/x/nft-transfer/types/genesis.pb.go b/x/nft-transfer/types/genesis.pb.go index 705558269..d54eca218 100644 --- a/x/nft-transfer/types/genesis.pb.go +++ b/x/nft-transfer/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" @@ -77,29 +77,29 @@ func (m *GenesisState) GetTraces() Traces { } func init() { - proto.RegisterType((*GenesisState)(nil), "chainmain.nft_transfer.v1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "nft_transfer.v1.GenesisState") } func init() { proto.RegisterFile("nft_transfer/v1/genesis.proto", fileDescriptor_674acb5cce894156) } var fileDescriptor_674acb5cce894156 = []byte{ - // 253 bytes of a gzipped FileDescriptorProto + // 245 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcd, 0x4b, 0x2b, 0x89, 0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x4e, 0x4b, 0x2d, 0xd2, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, - 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4c, 0xce, 0x48, 0xcc, 0xcc, - 0xcb, 0x4d, 0xcc, 0xcc, 0xd3, 0x43, 0x56, 0xa8, 0x57, 0x66, 0x28, 0x25, 0x8d, 0xae, 0xb3, 0xa4, - 0x28, 0x31, 0x39, 0x15, 0xa2, 0x4f, 0x4a, 0x24, 0x3d, 0x3f, 0x3d, 0x1f, 0xcc, 0xd4, 0x07, 0xb1, - 0x20, 0xa2, 0x4a, 0x65, 0x5c, 0x3c, 0xee, 0x10, 0xe3, 0x83, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0xc4, - 0xb9, 0xd8, 0x0b, 0xf2, 0x8b, 0x4a, 0xe2, 0x33, 0x53, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, - 0xd8, 0x40, 0x5c, 0xcf, 0x14, 0x21, 0x5f, 0x2e, 0x36, 0xb0, 0x69, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, - 0x1a, 0xdc, 0x46, 0xaa, 0x7a, 0x38, 0xdd, 0xa1, 0xe7, 0x9c, 0x93, 0x58, 0x5c, 0x1c, 0x02, 0x52, - 0xed, 0xc4, 0x77, 0xe2, 0x9e, 0x3c, 0xc3, 0xaa, 0xfb, 0xf2, 0x6c, 0x60, 0x6e, 0x71, 0x10, 0xd4, - 0x10, 0xa7, 0xd0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, - 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4e, 0xcf, - 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, - 0xcd, 0x2f, 0x4a, 0xd7, 0x05, 0xdb, 0xa6, 0x0f, 0x26, 0x75, 0x41, 0x96, 0xea, 0x57, 0xe8, 0xe7, - 0xa5, 0x95, 0xe8, 0xc2, 0x7d, 0x5b, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, 0x95, 0x31, - 0x20, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x3d, 0xa9, 0x3e, 0x44, 0x01, 0x00, 0x00, + 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x47, 0x96, 0xd6, 0x2b, 0x33, + 0x94, 0x92, 0x46, 0x57, 0x5f, 0x52, 0x94, 0x98, 0x9c, 0x0a, 0x51, 0x2d, 0x25, 0x92, 0x9e, 0x9f, + 0x9e, 0x0f, 0x66, 0xea, 0x83, 0x58, 0x10, 0x51, 0xa5, 0x1c, 0x2e, 0x1e, 0x77, 0x88, 0xa1, 0xc1, + 0x25, 0x89, 0x25, 0xa9, 0x42, 0xe2, 0x5c, 0xec, 0x05, 0xf9, 0x45, 0x25, 0xf1, 0x99, 0x29, 0x12, + 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x6c, 0x20, 0xae, 0x67, 0x8a, 0x90, 0x33, 0x17, 0x1b, 0xd8, + 0xb4, 0x62, 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x69, 0x3d, 0x34, 0xdb, 0xf5, 0x9c, 0x73, + 0x12, 0x8b, 0x8b, 0x43, 0x40, 0x6a, 0x9c, 0xf8, 0x4e, 0xdc, 0x93, 0x67, 0x58, 0x75, 0x5f, 0x9e, + 0x0d, 0xcc, 0x2d, 0x0e, 0x82, 0x6a, 0x75, 0x0a, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, + 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, + 0x39, 0x86, 0x28, 0xeb, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe4, + 0xa2, 0xca, 0x82, 0x92, 0x7c, 0xdd, 0xfc, 0xa2, 0x74, 0xdd, 0xe4, 0x8c, 0xc4, 0xcc, 0x3c, 0x7d, + 0x30, 0xa9, 0x9b, 0x0b, 0x62, 0x56, 0xe8, 0xe7, 0xa5, 0x95, 0xe8, 0xc2, 0xfd, 0x58, 0x52, 0x59, + 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, 0x8b, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x67, 0xe5, 0x9a, + 0xff, 0x30, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/nft-transfer/types/msgs.go b/x/nft-transfer/types/msgs.go index 020032f9e..f1182085e 100644 --- a/x/nft-transfer/types/msgs.go +++ b/x/nft-transfer/types/msgs.go @@ -6,8 +6,8 @@ import ( newsdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" - host "github.com/cosmos/ibc-go/v5/modules/core/24-host" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ) // msg types diff --git a/x/nft-transfer/types/msgs_test.go b/x/nft-transfer/types/msgs_test.go index 09b905032..900f5fd6d 100644 --- a/x/nft-transfer/types/msgs_test.go +++ b/x/nft-transfer/types/msgs_test.go @@ -3,10 +3,10 @@ package types_test import ( "testing" + "github.com/cometbft/cometbft/crypto/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/crypto-org-chain/chain-main/v4/x/nft-transfer/types" - "github.com/tendermint/tendermint/crypto/secp256k1" ) var ( diff --git a/x/nft-transfer/types/packet.pb.go b/x/nft-transfer/types/packet.pb.go index fcc603b35..47c61d3c5 100644 --- a/x/nft-transfer/types/packet.pb.go +++ b/x/nft-transfer/types/packet.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -116,31 +116,31 @@ func (m *NonFungibleTokenPacketData) GetReceiver() string { } func init() { - proto.RegisterType((*NonFungibleTokenPacketData)(nil), "chainmain.nft_transfer.v1.NonFungibleTokenPacketData") + proto.RegisterType((*NonFungibleTokenPacketData)(nil), "nft_transfer.v1.NonFungibleTokenPacketData") } func init() { proto.RegisterFile("nft_transfer/v1/packet.proto", fileDescriptor_14c037a407c65908) } var fileDescriptor_14c037a407c65908 = []byte{ - // 285 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xb1, 0x4e, 0xeb, 0x30, - 0x18, 0x85, 0xeb, 0xdb, 0x4b, 0x69, 0x3d, 0x7a, 0x40, 0x6e, 0x01, 0xab, 0x62, 0x62, 0x49, 0xac, - 0x8a, 0x91, 0x0d, 0x21, 0xa4, 0x2e, 0x08, 0x21, 0xba, 0xb0, 0x44, 0x8e, 0xe3, 0xa4, 0x56, 0x5b, - 0x3b, 0xfa, 0xed, 0x44, 0xf4, 0x2d, 0x78, 0x28, 0x06, 0xc6, 0x8e, 0x8c, 0x28, 0x79, 0x11, 0x14, - 0x07, 0x10, 0x8b, 0xa5, 0xe3, 0xef, 0xf8, 0x58, 0xfa, 0xf0, 0x99, 0xc9, 0x7d, 0xe2, 0x41, 0x18, - 0x97, 0x2b, 0xe0, 0xf5, 0x82, 0x97, 0x42, 0x6e, 0x94, 0x8f, 0x4b, 0xb0, 0xde, 0x92, 0xa9, 0x5c, - 0x0b, 0x6d, 0x76, 0x42, 0x9b, 0xf8, 0x6f, 0x2f, 0xae, 0x17, 0x17, 0x6f, 0x08, 0xcf, 0xee, 0xad, - 0xb9, 0xab, 0x4c, 0xa1, 0xd3, 0xad, 0x7a, 0xb2, 0x1b, 0x65, 0x1e, 0xc2, 0xdb, 0x5b, 0xe1, 0x05, - 0x99, 0xe2, 0xb1, 0xdc, 0x0a, 0xe7, 0x12, 0x9d, 0x51, 0x34, 0x47, 0x97, 0x93, 0xc7, 0xe3, 0x90, - 0x97, 0x19, 0x39, 0xc5, 0x93, 0x1e, 0x55, 0xa0, 0xe9, 0xbf, 0xc0, 0xfa, 0xee, 0x0a, 0x74, 0x07, - 0x7d, 0x37, 0x95, 0xe8, 0xcc, 0xd1, 0xe1, 0x7c, 0xd8, 0xc1, 0x70, 0xb1, 0xcc, 0x1c, 0x39, 0xc7, - 0xb8, 0x87, 0x15, 0x68, 0x47, 0xff, 0x07, 0xda, 0xd7, 0x57, 0xa0, 0x1d, 0x39, 0xc1, 0x23, 0xa7, - 0x4c, 0xa6, 0x80, 0x1e, 0x85, 0xd5, 0xef, 0x44, 0x66, 0x78, 0x0c, 0x4a, 0x2a, 0x5d, 0x2b, 0xa0, - 0xa3, 0xfe, 0xbf, 0x9f, 0x7c, 0xb3, 0x7a, 0x6f, 0x18, 0x3a, 0x34, 0x0c, 0x7d, 0x36, 0x0c, 0xbd, - 0xb6, 0x6c, 0x70, 0x68, 0xd9, 0xe0, 0xa3, 0x65, 0x83, 0xe7, 0xeb, 0x42, 0xfb, 0x75, 0x95, 0xc6, - 0xd2, 0xee, 0xb8, 0x84, 0x7d, 0xe9, 0x6d, 0x64, 0xa1, 0x88, 0x82, 0x11, 0x1e, 0xce, 0xa8, 0x13, - 0xc3, 0x5f, 0xb8, 0xc9, 0x7d, 0xf4, 0xab, 0xd0, 0xef, 0x4b, 0xe5, 0xd2, 0x51, 0xf0, 0x77, 0xf5, - 0x15, 0x00, 0x00, 0xff, 0xff, 0x43, 0xf2, 0xe2, 0xbe, 0x5f, 0x01, 0x00, 0x00, + // 281 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xb1, 0x4e, 0xf3, 0x30, + 0x14, 0x85, 0xeb, 0xbf, 0x3f, 0xa1, 0xf5, 0x82, 0xe4, 0x01, 0x99, 0x02, 0x56, 0xc5, 0xc4, 0x92, + 0x44, 0x15, 0x23, 0x1b, 0x42, 0x48, 0x5d, 0x10, 0x42, 0x64, 0x61, 0x89, 0x1c, 0xc7, 0x49, 0xad, + 0xb6, 0x76, 0x74, 0xed, 0x44, 0xf4, 0x2d, 0x78, 0x28, 0x06, 0xc6, 0x8e, 0x8c, 0x28, 0x79, 0x11, + 0x14, 0x07, 0x10, 0x8b, 0xe5, 0x73, 0xbf, 0x73, 0xcf, 0x95, 0x0e, 0x3e, 0xd3, 0x85, 0x4b, 0x1d, + 0x70, 0x6d, 0x0b, 0x09, 0x71, 0xb3, 0x88, 0x2b, 0x2e, 0xd6, 0xd2, 0x45, 0x15, 0x18, 0x67, 0xc8, + 0xd1, 0x5f, 0x1a, 0x35, 0x8b, 0x8b, 0x37, 0x84, 0x67, 0xf7, 0x46, 0xdf, 0xd5, 0xba, 0x54, 0xd9, + 0x46, 0x3e, 0x99, 0xb5, 0xd4, 0x0f, 0x7e, 0xe3, 0x96, 0x3b, 0x4e, 0x4e, 0xf0, 0x44, 0x6c, 0xb8, + 0xb5, 0xa9, 0xca, 0x29, 0x9a, 0xa3, 0xcb, 0xe9, 0xe3, 0xa1, 0xd7, 0xcb, 0x9c, 0x9c, 0xe2, 0xe9, + 0x80, 0x6a, 0x50, 0xf4, 0x9f, 0x67, 0x83, 0x37, 0x01, 0xd5, 0x43, 0xd7, 0x47, 0xa5, 0x2a, 0xb7, + 0x74, 0x3c, 0x1f, 0xf7, 0xd0, 0x0f, 0x96, 0xb9, 0x25, 0xe7, 0x18, 0x0f, 0xb0, 0x06, 0x65, 0xe9, + 0x7f, 0x4f, 0x07, 0x7b, 0x02, 0xca, 0x92, 0x63, 0x1c, 0x58, 0xa9, 0x73, 0x09, 0xf4, 0xc0, 0xa7, + 0x7e, 0x2b, 0x32, 0xc3, 0x13, 0x90, 0x42, 0xaa, 0x46, 0x02, 0x0d, 0x86, 0x7b, 0x3f, 0xfa, 0x26, + 0x79, 0x6f, 0x19, 0xda, 0xb7, 0x0c, 0x7d, 0xb6, 0x0c, 0xbd, 0x76, 0x6c, 0xb4, 0xef, 0xd8, 0xe8, + 0xa3, 0x63, 0xa3, 0xe7, 0xeb, 0x52, 0xb9, 0x55, 0x9d, 0x45, 0xc2, 0x6c, 0x63, 0x01, 0xbb, 0xca, + 0x99, 0xd0, 0x40, 0x19, 0x8a, 0x15, 0x57, 0x3a, 0xf6, 0x6f, 0xb8, 0xed, 0xbf, 0x2f, 0xb1, 0x2e, + 0x5c, 0xf8, 0x5b, 0x9c, 0xdb, 0x55, 0xd2, 0x66, 0x81, 0x6f, 0xed, 0xea, 0x2b, 0x00, 0x00, 0xff, + 0xff, 0x4e, 0xd9, 0x2b, 0xcb, 0x55, 0x01, 0x00, 0x00, } func (m *NonFungibleTokenPacketData) Marshal() (dAtA []byte, err error) { diff --git a/x/nft-transfer/types/query.pb.go b/x/nft-transfer/types/query.pb.go index 925bea70a..b74ee1b1a 100644 --- a/x/nft-transfer/types/query.pb.go +++ b/x/nft-transfer/types/query.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" - _ "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" @@ -423,61 +423,61 @@ func (m *QueryEscrowAddressResponse) GetEscrowAddress() string { } func init() { - proto.RegisterType((*QueryClassTraceRequest)(nil), "chainmain.nft_transfer.v1.QueryClassTraceRequest") - proto.RegisterType((*QueryClassTraceResponse)(nil), "chainmain.nft_transfer.v1.QueryClassTraceResponse") - proto.RegisterType((*QueryClassTracesRequest)(nil), "chainmain.nft_transfer.v1.QueryClassTracesRequest") - proto.RegisterType((*QueryClassTracesResponse)(nil), "chainmain.nft_transfer.v1.QueryClassTracesResponse") - proto.RegisterType((*QueryClassHashRequest)(nil), "chainmain.nft_transfer.v1.QueryClassHashRequest") - proto.RegisterType((*QueryClassHashResponse)(nil), "chainmain.nft_transfer.v1.QueryClassHashResponse") - proto.RegisterType((*QueryEscrowAddressRequest)(nil), "chainmain.nft_transfer.v1.QueryEscrowAddressRequest") - proto.RegisterType((*QueryEscrowAddressResponse)(nil), "chainmain.nft_transfer.v1.QueryEscrowAddressResponse") + proto.RegisterType((*QueryClassTraceRequest)(nil), "nft_transfer.v1.QueryClassTraceRequest") + proto.RegisterType((*QueryClassTraceResponse)(nil), "nft_transfer.v1.QueryClassTraceResponse") + proto.RegisterType((*QueryClassTracesRequest)(nil), "nft_transfer.v1.QueryClassTracesRequest") + proto.RegisterType((*QueryClassTracesResponse)(nil), "nft_transfer.v1.QueryClassTracesResponse") + proto.RegisterType((*QueryClassHashRequest)(nil), "nft_transfer.v1.QueryClassHashRequest") + proto.RegisterType((*QueryClassHashResponse)(nil), "nft_transfer.v1.QueryClassHashResponse") + proto.RegisterType((*QueryEscrowAddressRequest)(nil), "nft_transfer.v1.QueryEscrowAddressRequest") + proto.RegisterType((*QueryEscrowAddressResponse)(nil), "nft_transfer.v1.QueryEscrowAddressResponse") } func init() { proto.RegisterFile("nft_transfer/v1/query.proto", fileDescriptor_6f722060ae5d435b) } var fileDescriptor_6f722060ae5d435b = []byte{ - // 652 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcf, 0x4f, 0xd4, 0x40, - 0x14, 0xc7, 0xb7, 0x28, 0x98, 0x7d, 0x2b, 0x1c, 0x26, 0x28, 0x50, 0xb5, 0x90, 0x4d, 0x40, 0x62, - 0xec, 0x0c, 0x05, 0xf1, 0xe2, 0x49, 0x88, 0x28, 0x17, 0x83, 0xeb, 0x8f, 0x18, 0x2f, 0x9b, 0xd9, - 0xee, 0xd0, 0x36, 0x81, 0x4e, 0xe9, 0x0c, 0x28, 0x21, 0x7b, 0xf1, 0x2f, 0x30, 0xf1, 0x7f, 0x30, - 0x86, 0xff, 0xc1, 0x3b, 0x47, 0x12, 0x3d, 0x78, 0x12, 0x03, 0xfe, 0x21, 0x66, 0xa6, 0xb3, 0xdb, - 0xae, 0xac, 0xb0, 0x7b, 0xd9, 0xb4, 0x7d, 0xef, 0xfb, 0xde, 0xe7, 0x7d, 0xe7, 0xcd, 0xc2, 0xad, - 0x78, 0x53, 0xd6, 0x65, 0x4a, 0x63, 0xb1, 0xc9, 0x52, 0xb2, 0xe7, 0x91, 0x9d, 0x5d, 0x96, 0xee, - 0xe3, 0x24, 0xe5, 0x92, 0xa3, 0x29, 0x3f, 0xa4, 0x51, 0xbc, 0x4d, 0xa3, 0x18, 0x17, 0xd3, 0xf0, - 0x9e, 0x67, 0x8f, 0x07, 0x3c, 0xe0, 0x3a, 0x8b, 0xa8, 0xa7, 0x4c, 0x60, 0xdf, 0xf3, 0xb9, 0xd8, - 0xe6, 0x82, 0x34, 0xa8, 0x60, 0x59, 0x25, 0xb2, 0xe7, 0x35, 0x98, 0xa4, 0x1e, 0x49, 0x68, 0x10, - 0xc5, 0x54, 0x46, 0x3c, 0x36, 0xb9, 0xe7, 0x3a, 0xcb, 0x94, 0xfa, 0xcc, 0x04, 0x6f, 0x07, 0x9c, - 0x07, 0x5b, 0x8c, 0xd0, 0x24, 0x22, 0x34, 0x8e, 0xb9, 0xd4, 0x4a, 0x91, 0x45, 0xab, 0xf7, 0xe1, - 0xe6, 0x0b, 0x55, 0x7c, 0x75, 0x8b, 0x0a, 0xf1, 0x4a, 0xc9, 0x6a, 0x6c, 0x67, 0x97, 0x09, 0x89, - 0x10, 0x5c, 0x0d, 0xa9, 0x08, 0x27, 0xad, 0x19, 0x6b, 0xbe, 0x5c, 0xd3, 0xcf, 0x55, 0x0a, 0x13, - 0xe7, 0xb2, 0x45, 0xc2, 0x63, 0xc1, 0xd0, 0x1a, 0x54, 0x7c, 0xf5, 0xb5, 0xae, 0x7b, 0x6b, 0x55, - 0x65, 0x71, 0x16, 0xff, 0x77, 0x6c, 0x5c, 0xa8, 0x01, 0x7e, 0xe7, 0xb9, 0x47, 0x0b, 0xd1, 0x26, - 0x5a, 0x03, 0xc8, 0x47, 0x37, 0x1d, 0xe6, 0x70, 0xe6, 0x13, 0x56, 0x3e, 0xe1, 0xcc, 0x71, 0xe3, - 0x13, 0xde, 0xa0, 0x41, 0x7b, 0x9a, 0x5a, 0x41, 0x59, 0xfd, 0x66, 0xc1, 0xe4, 0xf9, 0x1e, 0x66, - 0x8e, 0xb7, 0x70, 0xbd, 0x30, 0x87, 0x98, 0xb4, 0x66, 0xae, 0xf4, 0x3d, 0xc8, 0xca, 0xd8, 0xd1, - 0xaf, 0xe9, 0xd2, 0xe1, 0xc9, 0xf4, 0x88, 0x29, 0x5a, 0xc9, 0x07, 0x13, 0xe8, 0x69, 0x17, 0xfe, - 0x90, 0xc6, 0xbf, 0x7b, 0x29, 0x7e, 0x86, 0xd5, 0xc5, 0xef, 0xc2, 0x8d, 0x1c, 0xff, 0x19, 0x15, - 0x61, 0xdb, 0xa0, 0x71, 0x18, 0xce, 0xdd, 0x2f, 0xd7, 0xb2, 0x97, 0xee, 0x23, 0xce, 0xd2, 0xcd, - 0xac, 0xbd, 0x8e, 0xf8, 0x25, 0x4c, 0xe9, 0xec, 0x27, 0xc2, 0x4f, 0xf9, 0xfb, 0xc7, 0xcd, 0x66, - 0xca, 0x44, 0xe7, 0x04, 0x26, 0xe0, 0x5a, 0xc2, 0x53, 0x59, 0x8f, 0x9a, 0x46, 0x33, 0xa2, 0x5e, - 0xd7, 0x9b, 0xe8, 0x0e, 0x80, 0x1f, 0xd2, 0x38, 0x66, 0x5b, 0x2a, 0x36, 0xa4, 0x63, 0x65, 0xf3, - 0x65, 0xbd, 0x59, 0x5d, 0x05, 0xbb, 0x57, 0x51, 0x83, 0x31, 0x0b, 0x63, 0x4c, 0x07, 0xea, 0x34, - 0x8b, 0x98, 0xe2, 0xa3, 0xac, 0x98, 0xbe, 0x78, 0x32, 0x0c, 0xc3, 0xba, 0x0a, 0x3a, 0xb4, 0x00, - 0x72, 0xd7, 0x91, 0x77, 0xc1, 0xe1, 0xf4, 0x5e, 0x6e, 0x7b, 0x71, 0x10, 0x49, 0x86, 0x59, 0x5d, - 0xfe, 0xf8, 0xfd, 0xcf, 0xe7, 0x21, 0x82, 0x5c, 0x12, 0x35, 0x7c, 0x42, 0x93, 0x44, 0x90, 0x7f, - 0xef, 0x5d, 0x71, 0x73, 0xc8, 0x81, 0xf2, 0xb3, 0x85, 0xbe, 0x58, 0x50, 0x29, 0x2c, 0x1a, 0x1a, - 0xa0, 0x75, 0xdb, 0x77, 0x7b, 0x69, 0x20, 0x8d, 0xe1, 0xc5, 0x9a, 0x77, 0x1e, 0xcd, 0xf5, 0xc7, - 0x8b, 0xbe, 0x5a, 0x50, 0xee, 0xec, 0x08, 0x5a, 0xe8, 0xab, 0x65, 0x61, 0xfb, 0x6c, 0x6f, 0x00, - 0x85, 0x41, 0x7c, 0xa8, 0x11, 0x17, 0x10, 0xbe, 0x0c, 0x51, 0x59, 0xa9, 0x2c, 0xd5, 0xa8, 0x2d, - 0xf4, 0xc3, 0x82, 0xd1, 0xae, 0x5d, 0x42, 0x0f, 0x2e, 0x6b, 0xde, 0x6b, 0x9f, 0xed, 0xe5, 0x01, - 0x55, 0x06, 0xfb, 0x8d, 0xc6, 0xde, 0x40, 0xcf, 0x2f, 0xc0, 0xce, 0x76, 0x5f, 0x90, 0x83, 0xfc, - 0x5e, 0xb4, 0x88, 0xba, 0x2d, 0x82, 0x1c, 0x98, 0x3b, 0xd4, 0x22, 0xdd, 0x6b, 0xbf, 0xf2, 0xfa, - 0xe8, 0xd4, 0xb1, 0x8e, 0x4f, 0x1d, 0xeb, 0xf7, 0xa9, 0x63, 0x7d, 0x3a, 0x73, 0x4a, 0xc7, 0x67, - 0x4e, 0xe9, 0xe7, 0x99, 0x53, 0x7a, 0xf7, 0x28, 0x88, 0x64, 0xb8, 0xdb, 0xc0, 0x3e, 0xdf, 0x26, - 0x7e, 0xba, 0x9f, 0x48, 0xee, 0xf2, 0x34, 0x70, 0x35, 0x3d, 0xd1, 0xbf, 0xae, 0x1a, 0x82, 0x7c, - 0x50, 0x20, 0x6e, 0x07, 0x44, 0xee, 0x27, 0x4c, 0x34, 0x46, 0xf4, 0x5f, 0xfd, 0xd2, 0xdf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xf6, 0xfd, 0x0f, 0x90, 0xa1, 0x06, 0x00, 0x00, + // 646 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcb, 0x6e, 0xd3, 0x4c, + 0x14, 0xc7, 0xe3, 0x7e, 0x5f, 0x8b, 0x72, 0x42, 0x8b, 0x34, 0x2a, 0xb4, 0xb8, 0xe0, 0x56, 0x96, + 0x68, 0x4b, 0xc1, 0x1e, 0x52, 0x04, 0x1b, 0xd8, 0xd0, 0x8a, 0x4b, 0x37, 0x55, 0x09, 0x37, 0x89, + 0x4d, 0x34, 0x71, 0xa6, 0xb6, 0xa5, 0xd6, 0xe3, 0x7a, 0xa6, 0x85, 0xaa, 0xca, 0x86, 0x17, 0x00, + 0x01, 0xe2, 0x21, 0xd8, 0xf2, 0x02, 0x2c, 0xbb, 0xac, 0xc4, 0x86, 0x15, 0xa0, 0x84, 0x07, 0x41, + 0x33, 0x9e, 0xc4, 0x4e, 0x13, 0xd5, 0xd9, 0x44, 0x63, 0x9f, 0xdb, 0xef, 0xfc, 0xe7, 0x1f, 0xc3, + 0x5c, 0xb4, 0x2d, 0xea, 0x22, 0x21, 0x11, 0xdf, 0xa6, 0x09, 0x3e, 0xa8, 0xe2, 0xbd, 0x7d, 0x9a, + 0x1c, 0xba, 0x71, 0xc2, 0x04, 0x43, 0x17, 0xf2, 0x41, 0xf7, 0xa0, 0x6a, 0x4e, 0xfb, 0xcc, 0x67, + 0x2a, 0x86, 0xe5, 0x29, 0x4d, 0x33, 0x57, 0x3c, 0xc6, 0x77, 0x19, 0xc7, 0x0d, 0xc2, 0x69, 0x5a, + 0x8f, 0x0f, 0xaa, 0x0d, 0x2a, 0x48, 0x15, 0xc7, 0xc4, 0x0f, 0x23, 0x22, 0x42, 0x16, 0xe9, 0xdc, + 0x81, 0x79, 0x22, 0x21, 0x1e, 0xd5, 0xc1, 0x2b, 0x3e, 0x63, 0xfe, 0x0e, 0xc5, 0x24, 0x0e, 0x31, + 0x89, 0x22, 0x26, 0x54, 0x25, 0x4f, 0xa3, 0xf6, 0x4d, 0xb8, 0xf4, 0x54, 0x36, 0x5f, 0xdf, 0x21, + 0x9c, 0x3f, 0x97, 0x65, 0x35, 0xba, 0xb7, 0x4f, 0xb9, 0x40, 0x08, 0xfe, 0x0f, 0x08, 0x0f, 0x66, + 0x8d, 0x05, 0x63, 0xb9, 0x5c, 0x53, 0x67, 0xfb, 0x15, 0xcc, 0x0c, 0x64, 0xf3, 0x98, 0x45, 0x9c, + 0xa2, 0xfb, 0x50, 0xf1, 0xe4, 0xdb, 0xba, 0x9a, 0xad, 0xaa, 0x2a, 0xab, 0x73, 0xee, 0xa9, 0x65, + 0xdd, 0x5c, 0x25, 0x78, 0xbd, 0xb3, 0x4d, 0x06, 0x1a, 0xf3, 0x2e, 0xc7, 0x23, 0x80, 0x6c, 0x61, + 0xdd, 0x77, 0xd1, 0x4d, 0xd5, 0x71, 0xa5, 0x3a, 0x6e, 0xaa, 0xae, 0x56, 0xc7, 0xdd, 0x22, 0x7e, + 0x77, 0x87, 0x5a, 0xae, 0xd2, 0xfe, 0x66, 0xc0, 0xec, 0xe0, 0x0c, 0x4d, 0xbf, 0x09, 0xe7, 0x73, + 0xf4, 0x7c, 0xd6, 0x58, 0xf8, 0xaf, 0x00, 0x7f, 0x6d, 0xea, 0xf8, 0xd7, 0x7c, 0xe9, 0xeb, 0xef, + 0xf9, 0x09, 0xdd, 0xaa, 0x92, 0xad, 0xc3, 0xd1, 0xe3, 0x3e, 0xe8, 0x31, 0x05, 0xbd, 0x54, 0x08, + 0x9d, 0xc2, 0xf4, 0x51, 0x3b, 0x70, 0x31, 0x83, 0x7e, 0x42, 0x78, 0xd0, 0x95, 0x65, 0x1a, 0xc6, + 0x33, 0xa5, 0xcb, 0xb5, 0xf4, 0xa1, 0xff, 0x3a, 0xd3, 0x74, 0xbd, 0xe1, 0xb0, 0xeb, 0x7c, 0x06, + 0x97, 0x55, 0xf6, 0x43, 0xee, 0x25, 0xec, 0xcd, 0x83, 0x66, 0x33, 0xa1, 0xbc, 0xa7, 0xfb, 0x0c, + 0x9c, 0x8b, 0x59, 0x22, 0xea, 0x61, 0x53, 0xd7, 0x4c, 0xc8, 0xc7, 0x8d, 0x26, 0xba, 0x0a, 0xe0, + 0x05, 0x24, 0x8a, 0xe8, 0x8e, 0x8c, 0x8d, 0xa9, 0x58, 0x59, 0xbf, 0xd9, 0x68, 0xda, 0xeb, 0x60, + 0x0e, 0x6b, 0xaa, 0x31, 0xae, 0xc1, 0x14, 0x55, 0x81, 0x3a, 0x49, 0x23, 0xba, 0xf9, 0x24, 0xcd, + 0xa7, 0xaf, 0xbe, 0x1f, 0x87, 0x71, 0xd5, 0x05, 0x7d, 0x31, 0x00, 0x32, 0xd5, 0xd1, 0xd2, 0xc0, + 0x95, 0x0c, 0xb7, 0xaf, 0xb9, 0x5c, 0x9c, 0x98, 0x22, 0xd9, 0x77, 0xde, 0xfd, 0xf8, 0xfb, 0x69, + 0x0c, 0x23, 0x07, 0x87, 0x0d, 0x0f, 0x93, 0x38, 0xe6, 0xf8, 0xf4, 0xff, 0x29, 0xef, 0x0d, 0x7c, + 0x24, 0xb5, 0x6b, 0xa1, 0x8f, 0x06, 0x54, 0x72, 0x56, 0x42, 0x85, 0x03, 0xbb, 0xca, 0x9a, 0xd7, + 0x47, 0xc8, 0xd4, 0x6c, 0xae, 0x62, 0x5b, 0x46, 0x8b, 0xa3, 0xb1, 0xa1, 0xcf, 0x06, 0x94, 0x7b, + 0x77, 0x8f, 0x16, 0xcf, 0x18, 0x94, 0xf3, 0x92, 0xb9, 0x54, 0x98, 0xa7, 0x71, 0xee, 0x2a, 0x9c, + 0x5b, 0xc8, 0x2d, 0xc2, 0x91, 0x12, 0x49, 0xa9, 0x14, 0x56, 0x0b, 0x7d, 0x37, 0x60, 0xb2, 0xcf, + 0x0f, 0x68, 0x65, 0xf8, 0xc8, 0x61, 0x4e, 0x34, 0x6f, 0x8c, 0x94, 0xab, 0x11, 0x5f, 0x2a, 0xc4, + 0x2d, 0xb4, 0x79, 0x06, 0x62, 0xea, 0x55, 0x8e, 0x8f, 0x32, 0x1f, 0xb7, 0xb0, 0x74, 0x37, 0xc7, + 0x47, 0xda, 0xf3, 0x2d, 0xdc, 0x6f, 0xd3, 0xb5, 0x17, 0xc7, 0x6d, 0xcb, 0x38, 0x69, 0x5b, 0xc6, + 0x9f, 0xb6, 0x65, 0x7c, 0xe8, 0x58, 0xa5, 0x93, 0x8e, 0x55, 0xfa, 0xd9, 0xb1, 0x4a, 0xaf, 0xef, + 0xf9, 0xa1, 0x08, 0xf6, 0x1b, 0xae, 0xc7, 0x76, 0xb1, 0x97, 0x1c, 0xc6, 0x82, 0x39, 0x2c, 0xf1, + 0x1d, 0x2f, 0x20, 0x61, 0x84, 0xd5, 0xaf, 0xb3, 0x2b, 0x8f, 0x6f, 0x25, 0x88, 0xd3, 0x03, 0x11, + 0x87, 0x31, 0xe5, 0x8d, 0x09, 0xf5, 0x19, 0xbe, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x75, 0xfd, + 0x4c, 0xb9, 0x33, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -512,7 +512,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) ClassTrace(ctx context.Context, in *QueryClassTraceRequest, opts ...grpc.CallOption) (*QueryClassTraceResponse, error) { out := new(QueryClassTraceResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft_transfer.v1.Query/ClassTrace", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft_transfer.v1.Query/ClassTrace", in, out, opts...) if err != nil { return nil, err } @@ -521,7 +521,7 @@ func (c *queryClient) ClassTrace(ctx context.Context, in *QueryClassTraceRequest func (c *queryClient) ClassTraces(ctx context.Context, in *QueryClassTracesRequest, opts ...grpc.CallOption) (*QueryClassTracesResponse, error) { out := new(QueryClassTracesResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft_transfer.v1.Query/ClassTraces", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft_transfer.v1.Query/ClassTraces", in, out, opts...) if err != nil { return nil, err } @@ -530,7 +530,7 @@ func (c *queryClient) ClassTraces(ctx context.Context, in *QueryClassTracesReque func (c *queryClient) ClassHash(ctx context.Context, in *QueryClassHashRequest, opts ...grpc.CallOption) (*QueryClassHashResponse, error) { out := new(QueryClassHashResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft_transfer.v1.Query/ClassHash", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft_transfer.v1.Query/ClassHash", in, out, opts...) if err != nil { return nil, err } @@ -539,7 +539,7 @@ func (c *queryClient) ClassHash(ctx context.Context, in *QueryClassHashRequest, func (c *queryClient) EscrowAddress(ctx context.Context, in *QueryEscrowAddressRequest, opts ...grpc.CallOption) (*QueryEscrowAddressResponse, error) { out := new(QueryEscrowAddressResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft_transfer.v1.Query/EscrowAddress", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft_transfer.v1.Query/EscrowAddress", in, out, opts...) if err != nil { return nil, err } @@ -589,7 +589,7 @@ func _Query_ClassTrace_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft_transfer.v1.Query/ClassTrace", + FullMethod: "/nft_transfer.v1.Query/ClassTrace", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).ClassTrace(ctx, req.(*QueryClassTraceRequest)) @@ -607,7 +607,7 @@ func _Query_ClassTraces_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft_transfer.v1.Query/ClassTraces", + FullMethod: "/nft_transfer.v1.Query/ClassTraces", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).ClassTraces(ctx, req.(*QueryClassTracesRequest)) @@ -625,7 +625,7 @@ func _Query_ClassHash_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft_transfer.v1.Query/ClassHash", + FullMethod: "/nft_transfer.v1.Query/ClassHash", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).ClassHash(ctx, req.(*QueryClassHashRequest)) @@ -643,7 +643,7 @@ func _Query_EscrowAddress_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft_transfer.v1.Query/EscrowAddress", + FullMethod: "/nft_transfer.v1.Query/EscrowAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).EscrowAddress(ctx, req.(*QueryEscrowAddressRequest)) @@ -652,7 +652,7 @@ func _Query_EscrowAddress_Handler(srv interface{}, ctx context.Context, dec func } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "chainmain.nft_transfer.v1.Query", + ServiceName: "nft_transfer.v1.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/x/nft-transfer/types/trace.go b/x/nft-transfer/types/trace.go index 7af4e93ff..214a9d7d2 100644 --- a/x/nft-transfer/types/trace.go +++ b/x/nft-transfer/types/trace.go @@ -7,11 +7,11 @@ import ( "sort" "strings" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - tmtypes "github.com/tendermint/tendermint/types" + tmbytes "github.com/cometbft/cometbft/libs/bytes" + tmtypes "github.com/cometbft/cometbft/types" sdkerrors "cosmossdk.io/errors" - host "github.com/cosmos/ibc-go/v5/modules/core/24-host" + host "github.com/cosmos/ibc-go/v7/modules/core/24-host" ) // ParseHexHash parses a hex hash in string format to bytes and validates its correctness. diff --git a/x/nft-transfer/types/trace.pb.go b/x/nft-transfer/types/trace.pb.go index 45b4c2b7e..477b5c1cd 100644 --- a/x/nft-transfer/types/trace.pb.go +++ b/x/nft-transfer/types/trace.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -80,26 +80,26 @@ func (m *ClassTrace) GetBaseClassId() string { } func init() { - proto.RegisterType((*ClassTrace)(nil), "chainmain.nft_transfer.v1.ClassTrace") + proto.RegisterType((*ClassTrace)(nil), "nft_transfer.v1.ClassTrace") } func init() { proto.RegisterFile("nft_transfer/v1/trace.proto", fileDescriptor_f4e6ac472424735f) } var fileDescriptor_f4e6ac472424735f = []byte{ - // 204 bytes of a gzipped FileDescriptorProto + // 196 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xce, 0x4b, 0x2b, 0x89, 0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x4e, 0x4b, 0x2d, 0xd2, 0x2f, 0x33, 0xd4, 0x2f, 0x29, 0x4a, 0x4c, - 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4c, 0xce, 0x48, 0xcc, 0xcc, 0xcb, 0x4d, - 0xcc, 0xcc, 0xd3, 0x43, 0x56, 0xa6, 0x57, 0x66, 0xa8, 0xe4, 0xc2, 0xc5, 0xe5, 0x9c, 0x93, 0x58, - 0x5c, 0x1c, 0x02, 0x52, 0x2e, 0x24, 0xc4, 0xc5, 0x52, 0x90, 0x58, 0x92, 0x21, 0xc1, 0xa8, 0xc0, - 0xa8, 0xc1, 0x19, 0x04, 0x66, 0x0b, 0x29, 0x71, 0xf1, 0x26, 0x25, 0x16, 0xa7, 0xc6, 0x27, 0x83, - 0x94, 0xc5, 0x67, 0xa6, 0x48, 0x30, 0x81, 0x25, 0xb9, 0x41, 0x82, 0x60, 0xad, 0x9e, 0x29, 0x4e, - 0xa1, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, - 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x9d, 0x9e, 0x59, 0x92, - 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, 0x5c, 0x54, 0x59, 0x50, 0x92, 0xaf, 0x9b, 0x5f, - 0x94, 0xae, 0x0b, 0x76, 0x90, 0x3e, 0x98, 0xd4, 0x05, 0xb9, 0x4b, 0xbf, 0x42, 0x3f, 0x2f, 0xad, - 0x44, 0x17, 0xee, 0x81, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xf3, 0x8d, 0x01, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x8d, 0xf5, 0xbd, 0xd5, 0xdd, 0x00, 0x00, 0x00, + 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x47, 0x96, 0xd4, 0x2b, 0x33, 0x54, 0x72, + 0xe1, 0xe2, 0x72, 0xce, 0x49, 0x2c, 0x2e, 0x0e, 0x01, 0x29, 0x12, 0x12, 0xe2, 0x62, 0x29, 0x48, + 0x2c, 0xc9, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x02, 0xb3, 0x85, 0x94, 0xb8, 0x78, 0x93, + 0x12, 0x8b, 0x53, 0xe3, 0x93, 0x41, 0xca, 0xe2, 0x33, 0x53, 0x24, 0x98, 0xc0, 0x92, 0xdc, 0x20, + 0x41, 0xb0, 0x56, 0xcf, 0x14, 0xa7, 0xd0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, + 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, + 0x88, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0x2e, 0xaa, + 0x2c, 0x28, 0xc9, 0xd7, 0xcd, 0x2f, 0x4a, 0xd7, 0x4d, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x07, 0x93, + 0xba, 0xb9, 0x20, 0x66, 0x85, 0x7e, 0x5e, 0x5a, 0x89, 0x2e, 0xdc, 0xd9, 0x25, 0x95, 0x05, 0xa9, + 0xc5, 0x49, 0x6c, 0x60, 0x47, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x4f, 0x43, 0x48, + 0xd3, 0x00, 0x00, 0x00, } func (m *ClassTrace) Marshal() (dAtA []byte, err error) { diff --git a/x/nft-transfer/types/tx.pb.go b/x/nft-transfer/types/tx.pb.go index 9b053b91c..cdce3d7e1 100644 --- a/x/nft-transfer/types/tx.pb.go +++ b/x/nft-transfer/types/tx.pb.go @@ -6,10 +6,10 @@ package types import ( context "context" fmt "fmt" - types "github.com/cosmos/ibc-go/v5/modules/core/02-client/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" + types "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -124,44 +124,44 @@ func (m *MsgTransferResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgTransferResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgTransfer)(nil), "chainmain.nft_transfer.v1.MsgTransfer") - proto.RegisterType((*MsgTransferResponse)(nil), "chainmain.nft_transfer.v1.MsgTransferResponse") + proto.RegisterType((*MsgTransfer)(nil), "nft_transfer.v1.MsgTransfer") + proto.RegisterType((*MsgTransferResponse)(nil), "nft_transfer.v1.MsgTransferResponse") } func init() { proto.RegisterFile("nft_transfer/v1/tx.proto", fileDescriptor_fa0f686d4218285d) } var fileDescriptor_fa0f686d4218285d = []byte{ - // 476 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xbd, 0x8e, 0xd3, 0x30, - 0x1c, 0x4f, 0xe8, 0xd1, 0x4b, 0x5d, 0xdd, 0x09, 0x0c, 0x77, 0x72, 0x0b, 0x24, 0x55, 0x06, 0xd4, - 0xa5, 0x8e, 0x7a, 0x0c, 0x48, 0xc7, 0x82, 0xca, 0x42, 0x87, 0x93, 0x50, 0x74, 0x2c, 0x2c, 0x25, - 0x75, 0xdc, 0xc4, 0xa2, 0xb1, 0x23, 0xdb, 0xad, 0xae, 0x6f, 0xc0, 0xc8, 0x23, 0xdc, 0xce, 0x8b, - 0xdc, 0x78, 0x23, 0x53, 0x85, 0xda, 0x85, 0xb9, 0x4f, 0x80, 0xe2, 0xa4, 0xa5, 0x1d, 0x90, 0x6e, - 0x49, 0xfc, 0xfb, 0xb4, 0x6c, 0xff, 0x01, 0xe2, 0x13, 0x3d, 0xd2, 0x32, 0xe2, 0x6a, 0x42, 0x65, - 0x30, 0xef, 0x07, 0xfa, 0x06, 0xe7, 0x52, 0x68, 0x01, 0x5b, 0x24, 0x8d, 0x18, 0xcf, 0x22, 0xc6, - 0xf1, 0xbe, 0x07, 0xcf, 0xfb, 0xed, 0xe7, 0x89, 0x48, 0x84, 0x71, 0x05, 0xc5, 0xaa, 0x0c, 0xb4, - 0x3d, 0x36, 0x26, 0x01, 0x11, 0x92, 0x06, 0x64, 0xca, 0x28, 0xd7, 0x45, 0x5b, 0xb9, 0x2a, 0x0d, - 0xfe, 0xcf, 0x1a, 0x68, 0x5e, 0xa9, 0xe4, 0xba, 0x6a, 0x82, 0x6f, 0x41, 0x53, 0x89, 0x99, 0x24, - 0x74, 0x94, 0x0b, 0xa9, 0x91, 0xdd, 0xb1, 0xbb, 0x8d, 0xc1, 0xf9, 0x66, 0xe9, 0xc1, 0x45, 0x94, - 0x4d, 0x2f, 0xfd, 0x3d, 0xd1, 0x0f, 0x41, 0x89, 0x3e, 0x09, 0xa9, 0xe1, 0x7b, 0x70, 0x5a, 0x69, - 0x24, 0x8d, 0x38, 0xa7, 0x53, 0xf4, 0xc8, 0x64, 0x5b, 0x9b, 0xa5, 0x77, 0x76, 0x90, 0xad, 0x74, - 0x3f, 0x3c, 0x29, 0x89, 0x0f, 0x25, 0x86, 0x2d, 0xe0, 0x90, 0x69, 0xa4, 0xd4, 0x88, 0xc5, 0xa8, - 0x56, 0x64, 0xc3, 0x63, 0x83, 0x87, 0x31, 0x7c, 0x01, 0x1a, 0x5a, 0x7c, 0xa3, 0x7c, 0xc4, 0x62, - 0x85, 0x8e, 0x3a, 0xb5, 0x6e, 0x23, 0x74, 0x0c, 0x31, 0x8c, 0x15, 0x3c, 0x07, 0x75, 0x45, 0x79, - 0x4c, 0x25, 0x7a, 0x6c, 0x52, 0x15, 0x82, 0x6d, 0xe0, 0x48, 0x4a, 0x28, 0x9b, 0x53, 0x89, 0xea, - 0x46, 0xd9, 0x61, 0xf8, 0x15, 0x9c, 0x6a, 0x96, 0x51, 0x31, 0xd3, 0xa3, 0x94, 0xb2, 0x24, 0xd5, - 0xe8, 0xb8, 0x63, 0x77, 0x9b, 0x17, 0x6d, 0xcc, 0xc6, 0x04, 0x17, 0x17, 0x86, 0xab, 0x6b, 0x9a, - 0xf7, 0xf1, 0x47, 0xe3, 0x18, 0xbc, 0xba, 0x5b, 0x7a, 0xd6, 0xbf, 0xd3, 0x1c, 0xe6, 0xfd, 0xf0, - 0xa4, 0x22, 0x4a, 0x37, 0x1c, 0x82, 0xa7, 0x5b, 0x47, 0xf1, 0x57, 0x3a, 0xca, 0x72, 0xe4, 0x74, - 0xec, 0xee, 0xd1, 0xe0, 0xe5, 0x66, 0xe9, 0xa1, 0xc3, 0x92, 0x9d, 0xc5, 0x0f, 0x9f, 0x54, 0xdc, - 0xf5, 0x96, 0xba, 0x74, 0xbe, 0xdf, 0x7a, 0xd6, 0x9f, 0x5b, 0xcf, 0xf2, 0xcf, 0xc0, 0xb3, 0xbd, - 0xc7, 0x0a, 0xa9, 0xca, 0x05, 0x57, 0xf4, 0x82, 0x81, 0xda, 0x95, 0x4a, 0xe0, 0x18, 0x38, 0xbb, - 0x77, 0x7c, 0x8d, 0xff, 0x3b, 0x2a, 0x78, 0xaf, 0xa2, 0x8d, 0x1f, 0xe6, 0xdb, 0x6e, 0x35, 0xf8, - 0x7c, 0xb7, 0x72, 0xed, 0xfb, 0x95, 0x6b, 0xff, 0x5e, 0xb9, 0xf6, 0x8f, 0xb5, 0x6b, 0xdd, 0xaf, - 0x5d, 0xeb, 0xd7, 0xda, 0xb5, 0xbe, 0xbc, 0x4b, 0x98, 0x4e, 0x67, 0x63, 0x4c, 0x44, 0x16, 0x10, - 0xb9, 0xc8, 0xb5, 0xe8, 0x09, 0x99, 0xf4, 0x4c, 0x7d, 0x60, 0xbe, 0xbd, 0x62, 0x97, 0xe0, 0x26, - 0xe0, 0x13, 0xdd, 0xdb, 0x8d, 0xb7, 0x5e, 0xe4, 0x54, 0x8d, 0xeb, 0x66, 0x1a, 0xdf, 0xfc, 0x0d, - 0x00, 0x00, 0xff, 0xff, 0x12, 0x0d, 0xd1, 0x9e, 0xfb, 0x02, 0x00, 0x00, + // 472 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xbf, 0x6e, 0xd3, 0x4e, + 0x1c, 0xb7, 0x7f, 0xe9, 0x2f, 0x75, 0x2e, 0x6a, 0x81, 0x83, 0x56, 0x57, 0x53, 0xec, 0xc8, 0x62, + 0xc8, 0x12, 0x5b, 0x29, 0x03, 0x52, 0x59, 0x50, 0x58, 0xc8, 0x50, 0x84, 0xac, 0x76, 0x61, 0x31, + 0xce, 0xf9, 0x62, 0x9f, 0x88, 0xef, 0xac, 0xbb, 0x4b, 0xd4, 0xbc, 0x01, 0x23, 0x8f, 0xd0, 0x9d, + 0x17, 0xe9, 0xd8, 0x91, 0x29, 0x42, 0xc9, 0xc2, 0x9c, 0x27, 0x40, 0x3e, 0x3b, 0x21, 0x61, 0x60, + 0xb1, 0xbf, 0x9f, 0xbf, 0xd2, 0xdd, 0x7d, 0x01, 0x62, 0x63, 0x15, 0x29, 0x11, 0x33, 0x39, 0x26, + 0x22, 0x98, 0xf5, 0x03, 0x75, 0xeb, 0x17, 0x82, 0x2b, 0x0e, 0x1f, 0xed, 0x2a, 0xfe, 0xac, 0x6f, + 0x3f, 0x4b, 0x79, 0xca, 0xb5, 0x16, 0x94, 0x53, 0x65, 0xb3, 0x5d, 0x3a, 0xc2, 0x01, 0xe6, 0x82, + 0x04, 0x78, 0x42, 0x09, 0x53, 0x65, 0x47, 0x35, 0x55, 0x06, 0xef, 0x7b, 0x03, 0xb4, 0xaf, 0x64, + 0x7a, 0x5d, 0x37, 0xc1, 0xd7, 0xa0, 0x2d, 0xf9, 0x54, 0x60, 0x12, 0x15, 0x5c, 0x28, 0x64, 0x76, + 0xcc, 0x6e, 0x6b, 0x70, 0xba, 0x5e, 0xb8, 0x70, 0x1e, 0xe7, 0x93, 0x4b, 0x6f, 0x47, 0xf4, 0x42, + 0x50, 0xa1, 0x8f, 0x5c, 0x28, 0xf8, 0x16, 0x1c, 0xd7, 0x1a, 0xce, 0x62, 0xc6, 0xc8, 0x04, 0xfd, + 0xa7, 0xb3, 0x67, 0xeb, 0x85, 0x7b, 0xb2, 0x97, 0xad, 0x75, 0x2f, 0x3c, 0xaa, 0x88, 0x77, 0x15, + 0x86, 0x67, 0xc0, 0xc2, 0x93, 0x58, 0xca, 0x88, 0x26, 0xa8, 0x51, 0x66, 0xc3, 0x43, 0x8d, 0x87, + 0x09, 0x7c, 0x0e, 0x5a, 0x8a, 0x7f, 0x21, 0x2c, 0xa2, 0x89, 0x44, 0x07, 0x9d, 0x46, 0xb7, 0x15, + 0x5a, 0x9a, 0x18, 0x26, 0x12, 0x9e, 0x82, 0xa6, 0x24, 0x2c, 0x21, 0x02, 0xfd, 0xaf, 0x53, 0x35, + 0x82, 0x36, 0xb0, 0x04, 0xc1, 0x84, 0xce, 0x88, 0x40, 0x4d, 0xad, 0x6c, 0x31, 0xfc, 0x0c, 0x8e, + 0x15, 0xcd, 0x09, 0x9f, 0xaa, 0x28, 0x23, 0x34, 0xcd, 0x14, 0x3a, 0xec, 0x98, 0xdd, 0xf6, 0x85, + 0xed, 0xd3, 0x11, 0xf6, 0xcb, 0x0b, 0xf3, 0xeb, 0x6b, 0x9a, 0xf5, 0xfd, 0xf7, 0xda, 0x31, 0x78, + 0x71, 0xbf, 0x70, 0x8d, 0x3f, 0xa7, 0xd9, 0xcf, 0x7b, 0xe1, 0x51, 0x4d, 0x54, 0x6e, 0x38, 0x04, + 0x4f, 0x36, 0x8e, 0xf2, 0x2f, 0x55, 0x9c, 0x17, 0xc8, 0xea, 0x98, 0xdd, 0x83, 0xc1, 0xf9, 0x7a, + 0xe1, 0xa2, 0xfd, 0x92, 0xad, 0xc5, 0x0b, 0x1f, 0xd7, 0xdc, 0xf5, 0x86, 0xba, 0xb4, 0xbe, 0xde, + 0xb9, 0xc6, 0xaf, 0x3b, 0xd7, 0xf0, 0x4e, 0xc0, 0xd3, 0x9d, 0xc7, 0x0a, 0x89, 0x2c, 0x38, 0x93, + 0xe4, 0xe2, 0x06, 0x34, 0xae, 0x64, 0x0a, 0x3f, 0x00, 0x6b, 0xfb, 0x8e, 0xe7, 0xfe, 0x5f, 0x0b, + 0xe2, 0xef, 0x04, 0xed, 0x97, 0xff, 0x52, 0x37, 0xb5, 0x83, 0x9b, 0xfb, 0xa5, 0x63, 0x3e, 0x2c, + 0x1d, 0xf3, 0xe7, 0xd2, 0x31, 0xbf, 0xad, 0x1c, 0xe3, 0x61, 0xe5, 0x18, 0x3f, 0x56, 0x8e, 0xf1, + 0xe9, 0x4d, 0x4a, 0x55, 0x36, 0x1d, 0xf9, 0x98, 0xe7, 0x01, 0x16, 0xf3, 0x42, 0xf1, 0x1e, 0x17, + 0x69, 0x0f, 0x67, 0x31, 0x65, 0x81, 0xfe, 0xf6, 0xf2, 0x72, 0xbc, 0x0d, 0xd8, 0x58, 0xf5, 0xb6, + 0x0b, 0xac, 0xe6, 0x05, 0x91, 0xa3, 0xa6, 0xde, 0xbc, 0x57, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, + 0xca, 0xe0, 0xa3, 0x4b, 0xdd, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -190,7 +190,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) Transfer(ctx context.Context, in *MsgTransfer, opts ...grpc.CallOption) (*MsgTransferResponse, error) { out := new(MsgTransferResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft_transfer.v1.Msg/Transfer", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft_transfer.v1.Msg/Transfer", in, out, opts...) if err != nil { return nil, err } @@ -225,7 +225,7 @@ func _Msg_Transfer_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft_transfer.v1.Msg/Transfer", + FullMethod: "/nft_transfer.v1.Msg/Transfer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).Transfer(ctx, req.(*MsgTransfer)) @@ -234,7 +234,7 @@ func _Msg_Transfer_Handler(srv interface{}, ctx context.Context, dec func(interf } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "chainmain.nft_transfer.v1.Msg", + ServiceName: "nft_transfer.v1.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/x/nft/client/cli/cli_test.go b/x/nft/client/cli/cli_test.go index 8c61828c0..cda5ab6dd 100644 --- a/x/nft/client/cli/cli_test.go +++ b/x/nft/client/cli/cli_test.go @@ -10,9 +10,11 @@ import ( "github.com/stretchr/testify/suite" "github.com/tidwall/gjson" - "github.com/tendermint/tendermint/crypto" - + "cosmossdk.io/simapp" + "github.com/cometbft/cometbft/crypto" "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/rpc" + clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" @@ -33,7 +35,8 @@ func (s *IntegrationTestSuite) SetupSuite() { var err error s.T().Log("setting up integration test suite") - cfg := network.DefaultConfig() + cfg := network.DefaultConfig(simapp.NewTestNetworkFixture) + cfg.ChainID = app.TestAppChainID cfg.AppConstructor = nfttestutil.GetApp cfg.NumValidators = 2 @@ -57,6 +60,14 @@ func TestIntegrationTestSuite(t *testing.T) { suite.Run(t, new(IntegrationTestSuite)) } +func (s *IntegrationTestSuite) eventQueryTxFor(val *network.Validator, hash string) *sdk.TxResponse { + bz, err := clitestutil.ExecTestCLICmd(val.ClientCtx, rpc.QueryEventForTxCmd(), []string{hash}) + s.Require().NoError(err) + respType := proto.Message(&sdk.TxResponse{}) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(bz.Bytes(), respType), bz.String()) + return respType.(*sdk.TxResponse) +} + func (s *IntegrationTestSuite) TestNft() { val := s.network.Validators[0] val2 := s.network.Validators[1] @@ -79,7 +90,7 @@ func (s *IntegrationTestSuite) TestNft() { fmt.Sprintf("--%s=%s", nftcli.FlagSchema, schema), 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.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), } @@ -92,8 +103,9 @@ func (s *IntegrationTestSuite) TestNft() { txResp := respType.(*sdk.TxResponse) s.Require().Equal(expectedCode, txResp.Code) + txResp = s.eventQueryTxFor(val, txResp.TxHash) - denomID := gjson.Get(txResp.RawLog, "0.events.0.attributes.0.value").String() + denomID := gjson.Get(txResp.RawLog, "0.events.1.attributes.0.value").String() //------test GetCmdQueryDenom()------------- respType = proto.Message(&nfttypes.Denom{}) @@ -131,7 +143,7 @@ func (s *IntegrationTestSuite) TestNft() { fmt.Sprintf("--%s=%s", nftcli.FlagTokenName, tokenName), 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.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), } @@ -142,6 +154,7 @@ func (s *IntegrationTestSuite) TestNft() { s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(bz.Bytes(), respType), bz.String()) txResp = respType.(*sdk.TxResponse) s.Require().Equal(expectedCode, txResp.Code) + s.eventQueryTxFor(val, txResp.TxHash) //------test GetCmdQuerySupply()------------- respType = proto.Message(&nfttypes.QuerySupplyResponse{}) @@ -191,7 +204,7 @@ func (s *IntegrationTestSuite) TestNft() { fmt.Sprintf("--%s=%s", nftcli.FlagTokenName, newTokenName), 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.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), } @@ -202,6 +215,7 @@ func (s *IntegrationTestSuite) TestNft() { s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(bz.Bytes(), respType), bz.String()) txResp = respType.(*sdk.TxResponse) s.Require().Equal(expectedCode, txResp.Code) + s.eventQueryTxFor(val, txResp.TxHash) respType = proto.Message(&nfttypes.BaseNFT{}) bz, err = nfttestutil.QueryNFTExec(val.ClientCtx, denomID, tokenID) @@ -217,7 +231,7 @@ func (s *IntegrationTestSuite) TestNft() { args = []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.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), } @@ -228,6 +242,7 @@ func (s *IntegrationTestSuite) TestNft() { s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(bz.Bytes(), respType), bz.String()) txResp = respType.(*sdk.TxResponse) s.Require().Equal(expectedCode, txResp.Code) + s.eventQueryTxFor(val, txResp.TxHash) respType = proto.Message(&nfttypes.BaseNFT{}) bz, err = nfttestutil.QueryNFTExec(val.ClientCtx, denomID, tokenID) @@ -249,7 +264,7 @@ func (s *IntegrationTestSuite) TestNft() { fmt.Sprintf("--%s=%s", nftcli.FlagTokenName, newTokenName), 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.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), } @@ -260,6 +275,7 @@ func (s *IntegrationTestSuite) TestNft() { s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(bz.Bytes(), respType), bz.String()) txResp = respType.(*sdk.TxResponse) s.Require().Equal(expectedCode, txResp.Code) + s.eventQueryTxFor(val, txResp.TxHash) respType = proto.Message(&nfttypes.QuerySupplyResponse{}) bz, err = nfttestutil.QuerySupplyExec(val.ClientCtx, denomID) @@ -270,7 +286,7 @@ func (s *IntegrationTestSuite) TestNft() { args = []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.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), } respType = proto.Message(&sdk.TxResponse{}) @@ -279,6 +295,7 @@ func (s *IntegrationTestSuite) TestNft() { s.Require().NoError(val2.ClientCtx.Codec.UnmarshalJSON(bz.Bytes(), respType), bz.String()) txResp = respType.(*sdk.TxResponse) s.Require().Equal(expectedCode, txResp.Code) + s.eventQueryTxFor(val, txResp.TxHash) respType = proto.Message(&nfttypes.QuerySupplyResponse{}) bz, err = nfttestutil.QuerySupplyExec(val.ClientCtx, denomID) diff --git a/x/nft/client/testutil/test_helpers.go b/x/nft/client/testutil/test_helpers.go index 335bb5fb5..079e4a432 100644 --- a/x/nft/client/testutil/test_helpers.go +++ b/x/nft/client/testutil/test_helpers.go @@ -5,31 +5,34 @@ package testutil import ( "fmt" - "github.com/tendermint/tendermint/libs/cli" + "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/crypto-org-chain/chain-main/v4/app" nftcli "github.com/crypto-org-chain/chain-main/v4/x/nft/client/cli" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" + dbm "github.com/cometbft/cometbft-db" servertypes "github.com/cosmos/cosmos-sdk/server/types" - dbm "github.com/tendermint/tm-db" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" ) -func GetApp(val network.Validator) servertypes.Application { +func GetApp(val network.ValidatorI) servertypes.Application { + ctx := val.GetCtx() + appConfig := val.GetAppConfig() return app.New( - val.Ctx.Logger, dbm.NewMemDB(), nil, true, make(map[int64]bool), val.Ctx.Config.RootDir, 0, + ctx.Logger, dbm.NewMemDB(), nil, true, make(map[int64]bool), ctx.Config.RootDir, 0, app.MakeEncodingConfig(), - simapp.EmptyAppOptions{}, - baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.AppConfig.Pruning)), - baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices), + simtestutil.EmptyAppOptions{}, + baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(appConfig.Pruning)), + baseapp.SetMinGasPrices(appConfig.MinGasPrices), + baseapp.SetChainID(app.TestAppChainID), ) } diff --git a/x/nft/keeper/keeper.go b/x/nft/keeper/keeper.go index 77f6facc8..7b0d23482 100644 --- a/x/nft/keeper/keeper.go +++ b/x/nft/keeper/keeper.go @@ -5,7 +5,7 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/cometbft/cometbft/libs/log" sdkerrors "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/nft/keeper/keeper_test.go b/x/nft/keeper/keeper_test.go index fb7523147..d4de71c00 100644 --- a/x/nft/keeper/keeper_test.go +++ b/x/nft/keeper/keeper_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" @@ -60,15 +60,14 @@ type KeeperSuite struct { } func (suite *KeeperSuite) SetupTest() { - app := app.Setup(suite.T(), isCheckTx) - - suite.app = app - suite.legacyAmino = app.LegacyAmino() - suite.ctx = app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) - suite.keeper = app.NFTKeeper - - queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, app.InterfaceRegistry()) - types.RegisterQueryServer(queryHelper, app.NFTKeeper) + a := app.Setup(suite.T(), isCheckTx) + suite.app = a + suite.legacyAmino = a.LegacyAmino() + suite.ctx = a.BaseApp.NewContext(isCheckTx, tmproto.Header{ChainID: app.TestAppChainID}) + suite.keeper = a.NFTKeeper + + queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, a.InterfaceRegistry()) + types.RegisterQueryServer(queryHelper, a.NFTKeeper) suite.queryClient = types.NewQueryClient(queryHelper) err := suite.keeper.IssueDenom(suite.ctx, denomID, denomNm, schema, "", address) diff --git a/x/nft/keeper/querier.go b/x/nft/keeper/querier.go deleted file mode 100644 index a3e18ff5a..000000000 --- a/x/nft/keeper/querier.go +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0) -// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0) -package keeper - -import ( - "encoding/binary" - - abci "github.com/tendermint/tendermint/abci/types" - - newsdkerrors "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - - "github.com/crypto-org-chain/chain-main/v4/x/nft/types" -) - -// NewQuerier is the module level router for state queries -// (Amino is still needed for Ledger at the moment) -func NewQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return func(ctx sdk.Context, path []string, req abci.RequestQuery) (res []byte, err error) { - switch path[0] { - case types.QuerySupply: - return querySupply(ctx, req, k, legacyQuerierCdc) - case types.QueryOwner: - return queryOwner(ctx, req, k, legacyQuerierCdc) - case types.QueryCollection: - return queryCollection(ctx, req, k, legacyQuerierCdc) - case types.QueryDenom: - return queryDenom(ctx, req, k, legacyQuerierCdc) - case types.QueryDenomByName: - return queryDenomByName(ctx, req, k, legacyQuerierCdc) - case types.QueryDenoms: - return queryDenoms(ctx, req, k, legacyQuerierCdc) - case types.QueryNFT: - return queryNFT(ctx, req, k, legacyQuerierCdc) - default: - return nil, newsdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown query path: %s", path[0]) - } - } -} - -// (Amino is still needed for Ledger at the moment) -func querySupply(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QuerySupplyParams - - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - var supply uint64 - if params.Owner.Empty() && len(params.Denom) > 0 { - supply = k.GetTotalSupply(ctx, params.Denom) - } else { - supply = k.GetTotalSupplyOfOwner(ctx, params.Denom, params.Owner) - } - - bz := make([]byte, 8) - binary.LittleEndian.PutUint64(bz, supply) - return bz, nil -} - -// (Amino is still needed for Ledger at the moment) -func queryOwner(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryOwnerParams - - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - owner, err := k.GetOwner(ctx, params.Owner, params.Denom) - if err != nil { - return nil, err - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, owner) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -// (Amino is still needed for Ledger at the moment) -func queryCollection(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryCollectionParams - - err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - collection, err := k.GetCollection(ctx, params.Denom) - if err != nil { - return nil, err - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, collection) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -// (Amino is still needed for Ledger at the moment) -func queryDenom(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryDenomParams - - if err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms); err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - denom, err := k.GetDenom(ctx, params.ID) - if err != nil { - return nil, err - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, denom) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -// (Amino is still needed for Ledger at the moment) -func queryDenomByName(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryDenomByNameParams - - if err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms); err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - denom, err := k.GetDenomByName(ctx, params.Name) - if err != nil { - return nil, err - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, denom) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -// (Amino is still needed for Ledger at the moment) -func queryDenoms(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - denoms := k.GetDenoms(ctx) - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, denoms) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} - -// (Amino is still needed for Ledger at the moment) -func queryNFT(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc *codec.LegacyAmino) ([]byte, error) { - var params types.QueryNFTParams - - if err := legacyQuerierCdc.UnmarshalJSON(req.Data, ¶ms); err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) - } - - nft, err := k.GetNFT(ctx, params.Denom, params.TokenID) - if err != nil { - return nil, newsdkerrors.Wrapf(types.ErrUnknownNFT, "invalid NFT %s from collection %s", params.TokenID, params.Denom) - } - - bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, nft) - if err != nil { - return nil, newsdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) - } - - return bz, nil -} diff --git a/x/nft/keeper/querier_test.go b/x/nft/keeper/querier_test.go deleted file mode 100644 index bda4d03f2..000000000 --- a/x/nft/keeper/querier_test.go +++ /dev/null @@ -1,220 +0,0 @@ -// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0) -// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0) -package keeper_test - -import ( - "encoding/binary" - - abci "github.com/tendermint/tendermint/abci/types" - - "github.com/crypto-org-chain/chain-main/v4/x/nft/exported" - keep "github.com/crypto-org-chain/chain-main/v4/x/nft/keeper" - "github.com/crypto-org-chain/chain-main/v4/x/nft/types" -) - -func (suite *KeeperSuite) TestNewQuerier() { - querier := keep.NewQuerier(suite.keeper, suite.legacyAmino) - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - _, err := querier(suite.ctx, []string{"foo", "bar"}, query) - suite.Error(err) -} - -func (suite *KeeperSuite) TestQuerySupply() { - // MintNFT shouldn't fail when collection does not exist - err := suite.keeper.MintNFT(suite.ctx, denomID, tokenID, tokenNm, tokenURI, tokenData, address, address) - suite.NoError(err) - - querier := keep.NewQuerier(suite.keeper, suite.legacyAmino) - - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - - query.Path = "/custom/nft/supply" - query.Data = []byte("?") - - res, err := querier(suite.ctx, []string{"supply"}, query) - suite.Error(err) - suite.Nil(res) - - queryCollectionParams := types.NewQuerySupplyParams(denomID2, nil) - bz, errRes := suite.legacyAmino.MarshalJSON(queryCollectionParams) - suite.Nil(errRes) - query.Data = bz - res, err = querier(suite.ctx, []string{"supply"}, query) - suite.NoError(err) - supplyResp := binary.LittleEndian.Uint64(res) - suite.Equal(0, int(supplyResp)) - - queryCollectionParams = types.NewQuerySupplyParams(denomID, nil) - bz, errRes = suite.legacyAmino.MarshalJSON(queryCollectionParams) - suite.Nil(errRes) - query.Data = bz - - res, err = querier(suite.ctx, []string{"supply"}, query) - suite.NoError(err) - suite.NotNil(res) - - supplyResp = binary.LittleEndian.Uint64(res) - suite.Equal(1, int(supplyResp)) -} - -func (suite *KeeperSuite) TestQueryCollection() { - // MintNFT shouldn't fail when collection does not exist - err := suite.keeper.MintNFT(suite.ctx, denomID, tokenID, tokenNm, tokenURI, tokenData, address, address) - suite.NoError(err) - - querier := keep.NewQuerier(suite.keeper, suite.legacyAmino) - - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - - query.Path = "/custom/nft/collection" - - query.Data = []byte("?") - res, err := querier(suite.ctx, []string{"collection"}, query) - suite.Error(err) - suite.Nil(res) - - queryCollectionParams := types.NewQuerySupplyParams(denomID2, nil) - bz, errRes := suite.legacyAmino.MarshalJSON(queryCollectionParams) - suite.Nil(errRes) - - query.Data = bz - _, err = querier(suite.ctx, []string{"collection"}, query) - suite.NoError(err) - - queryCollectionParams = types.NewQuerySupplyParams(denomID, nil) - bz, errRes = suite.legacyAmino.MarshalJSON(queryCollectionParams) - suite.Nil(errRes) - - query.Data = bz - res, err = querier(suite.ctx, []string{"collection"}, query) - suite.NoError(err) - suite.NotNil(res) - - var collection types.Collection - types.ModuleCdc.MustUnmarshalJSON(res, &collection) - suite.Len(collection.NFTs, 1) -} - -func (suite *KeeperSuite) TestQueryOwner() { - // MintNFT shouldn't fail when collection does not exist - err := suite.keeper.MintNFT(suite.ctx, denomID, tokenID, tokenNm, tokenURI, tokenData, address, address) - suite.NoError(err) - - err = suite.keeper.MintNFT(suite.ctx, denomID2, tokenID, tokenNm, tokenURI, tokenData, address, address) - suite.NoError(err) - - querier := keep.NewQuerier(suite.keeper, suite.legacyAmino) - query := abci.RequestQuery{ - Path: "/custom/nft/owner", - Data: []byte{}, - } - - query.Data = []byte("?") - _, err = querier(suite.ctx, []string{"owner"}, query) - suite.Error(err) - - // query the balance using no denomID so that all denoms will be returns - params := types.NewQuerySupplyParams("", address) - bz, err2 := suite.legacyAmino.MarshalJSON(params) - suite.Nil(err2) - query.Data = bz - - var out types.Owner - res, err := querier(suite.ctx, []string{"owner"}, query) - suite.NoError(err) - suite.NotNil(res) - - suite.legacyAmino.MustUnmarshalJSON(res, &out) - - // build the owner using both denoms - idCollection1 := types.NewIDCollection(denomID, []string{tokenID}) - idCollection2 := types.NewIDCollection(denomID2, []string{tokenID}) - owner := types.NewOwner(address, idCollection1, idCollection2) - - suite.EqualValues(out.String(), owner.String()) -} - -func (suite *KeeperSuite) TestQueryNFT() { - // MintNFT shouldn't fail when collection does not exist - err := suite.keeper.MintNFT(suite.ctx, denomID, tokenID, tokenNm, tokenURI, tokenData, address, address) - suite.NoError(err) - - querier := keep.NewQuerier(suite.keeper, suite.legacyAmino) - - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - query.Path = "/custom/nft/nft" - var res []byte - - query.Data = []byte("?") - res, err = querier(suite.ctx, []string{"nft"}, query) - suite.Error(err) - suite.Nil(res) - - params := types.NewQueryNFTParams(denomID2, tokenID2) - bz, err2 := suite.legacyAmino.MarshalJSON(params) - suite.Nil(err2) - - query.Data = bz - res, err = querier(suite.ctx, []string{"nft"}, query) - suite.Error(err) - suite.Nil(res) - - params = types.NewQueryNFTParams(denomID, tokenID) - bz, err2 = suite.legacyAmino.MarshalJSON(params) - suite.Nil(err2) - - query.Data = bz - res, err = querier(suite.ctx, []string{"nft"}, query) - suite.NoError(err) - suite.NotNil(res) - - var out exported.NFT - suite.legacyAmino.MustUnmarshalJSON(res, &out) - - suite.Equal(out.GetID(), tokenID) - suite.Equal(out.GetURI(), tokenURI) - suite.Equal(out.GetOwner(), address) -} - -func (suite *KeeperSuite) TestQueryDenoms() { - // MintNFT shouldn't fail when collection does not exist - err := suite.keeper.MintNFT(suite.ctx, denomID, tokenID, tokenNm, tokenURI, tokenData, address, address) - suite.NoError(err) - - err = suite.keeper.MintNFT(suite.ctx, denomID2, tokenID, tokenNm, tokenURI, tokenData, address, address) - suite.NoError(err) - - querier := keep.NewQuerier(suite.keeper, suite.legacyAmino) - - query := abci.RequestQuery{ - Path: "", - Data: []byte{}, - } - var res []byte - query.Path = "/custom/nft/denoms" - - res, err = querier(suite.ctx, []string{"denoms"}, query) - suite.NoError(err) - suite.NotNil(res) - - denoms := []string{denomID, denomID2} - - var out []types.Denom - suite.legacyAmino.MustUnmarshalJSON(res, &out) - - for key, denomInQuestion := range out { - suite.Equal(denomInQuestion.Id, denoms[key]) - } -} diff --git a/x/nft/module.go b/x/nft/module.go index 649e3f967..1a47a821c 100644 --- a/x/nft/module.go +++ b/x/nft/module.go @@ -11,7 +11,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -120,20 +120,6 @@ func (am AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {} // ConsensusVersion implements AppModule/ConsensusVersion. func (a AppModuleBasic) ConsensusVersion() uint64 { return 1 } -// Route returns the message routing key for the NFT module. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - -// QuerierRoute returns the NFT module's querier route name. -func (AppModule) QuerierRoute() string { return types.RouterKey } - -// LegacyQuerierHandler returns the NFT module sdk.Querier. -// (Amino is still needed for Ledger at the moment) -func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return keeper.NewQuerier(am.keeper, legacyQuerierCdc) -} - // InitGenesis performs genesis initialization for the NFT module. It returns // no validator updates. func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) []abci.ValidatorUpdate { @@ -168,13 +154,8 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { simulation.RandomizedGenState(simState) } -// ProposalContents doesn't return any content functions for governance proposals. -func (AppModule) ProposalContents(simState module.SimulationState) []simtypes.WeightedProposalContent { - return nil -} - // RandomizedParams creates randomized NFT param changes for the simulator. -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return nil } diff --git a/x/nft/simulation/operations.go b/x/nft/simulation/operations.go index ee6a83c5a..8899e38fe 100644 --- a/x/nft/simulation/operations.go +++ b/x/nft/simulation/operations.go @@ -6,9 +6,9 @@ import ( "fmt" "math/rand" + simappparams "cosmossdk.io/simapp/params" "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" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" diff --git a/x/nft/types/genesis.pb.go b/x/nft/types/genesis.pb.go index be4dc9201..552c43005 100644 --- a/x/nft/types/genesis.pb.go +++ b/x/nft/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" @@ -69,27 +69,26 @@ func (m *GenesisState) GetCollections() []Collection { } func init() { - proto.RegisterType((*GenesisState)(nil), "chainmain.nft.v1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "nft.v1.GenesisState") } func init() { proto.RegisterFile("nft/v1/genesis.proto", fileDescriptor_ab00149a7d9d5d44) } var fileDescriptor_ab00149a7d9d5d44 = []byte{ - // 211 bytes of a gzipped FileDescriptorProto + // 203 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xc9, 0x4b, 0x2b, 0xd1, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x12, 0x48, 0xce, 0x48, 0xcc, 0xcc, 0xcb, 0x4d, 0xcc, 0xcc, 0xd3, 0xcb, 0x4b, 0x2b, 0xd1, - 0x2b, 0x33, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xea, 0x83, 0x58, 0x10, 0x75, 0x52, - 0x02, 0x50, 0xdd, 0x20, 0x45, 0x60, 0x11, 0xa5, 0x10, 0x2e, 0x1e, 0x77, 0x88, 0x51, 0xc1, 0x25, - 0x89, 0x25, 0xa9, 0x42, 0x2e, 0x5c, 0xdc, 0xc9, 0xf9, 0x39, 0x39, 0xa9, 0xc9, 0x25, 0x99, 0xf9, - 0x79, 0xc5, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x32, 0x7a, 0xe8, 0xe6, 0xeb, 0x39, 0xc3, - 0x15, 0x39, 0xb1, 0x9c, 0xb8, 0x27, 0xcf, 0x10, 0x84, 0xac, 0xcd, 0xc9, 0xe7, 0xc4, 0x23, 0x39, - 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, - 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x8c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, - 0xf3, 0x73, 0xf5, 0x93, 0x8b, 0x2a, 0x0b, 0x4a, 0xf2, 0x75, 0xf3, 0x8b, 0xd2, 0x75, 0xc1, 0xe6, - 0xeb, 0x83, 0x49, 0x5d, 0x90, 0x35, 0xfa, 0x15, 0x20, 0x37, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, - 0x27, 0xb1, 0x81, 0x9d, 0x6a, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x5a, 0xbb, 0x9d, 0xfc, - 0x00, 0x00, 0x00, + 0x17, 0x62, 0xcb, 0x4b, 0x2b, 0xd1, 0x2b, 0x33, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x0b, + 0xe9, 0x83, 0x58, 0x10, 0x59, 0x29, 0x01, 0xa8, 0x1e, 0x90, 0x22, 0xb0, 0x88, 0x92, 0x17, 0x17, + 0x8f, 0x3b, 0xc4, 0x80, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x2b, 0x2e, 0xee, 0xe4, 0xfc, 0x9c, + 0x9c, 0xd4, 0xe4, 0x92, 0xcc, 0xfc, 0xbc, 0x62, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x21, + 0x3d, 0x88, 0xa9, 0x7a, 0xce, 0x70, 0x29, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0x90, 0x15, + 0x3b, 0xf9, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, + 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x51, 0x7a, 0x66, + 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x72, 0x51, 0x65, 0x41, 0x49, 0xbe, 0x6e, + 0x7e, 0x51, 0xba, 0x6e, 0x72, 0x46, 0x62, 0x66, 0x9e, 0x3e, 0x98, 0xd4, 0xcd, 0x05, 0x31, 0x2b, + 0x40, 0x2e, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x3b, 0xd0, 0x18, 0x10, 0x00, + 0x00, 0xff, 0xff, 0xc5, 0x46, 0x6a, 0xca, 0xe8, 0x00, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/nft/types/nft.pb.go b/x/nft/types/nft.pb.go index ea1251935..48eb150f0 100644 --- a/x/nft/types/nft.pb.go +++ b/x/nft/types/nft.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" @@ -225,48 +225,47 @@ func (m *Collection) XXX_DiscardUnknown() { var xxx_messageInfo_Collection proto.InternalMessageInfo func init() { - proto.RegisterType((*BaseNFT)(nil), "chainmain.nft.v1.BaseNFT") - proto.RegisterType((*Denom)(nil), "chainmain.nft.v1.Denom") - proto.RegisterType((*IDCollection)(nil), "chainmain.nft.v1.IDCollection") - proto.RegisterType((*Owner)(nil), "chainmain.nft.v1.Owner") - proto.RegisterType((*Collection)(nil), "chainmain.nft.v1.Collection") + proto.RegisterType((*BaseNFT)(nil), "nft.v1.BaseNFT") + proto.RegisterType((*Denom)(nil), "nft.v1.Denom") + proto.RegisterType((*IDCollection)(nil), "nft.v1.IDCollection") + proto.RegisterType((*Owner)(nil), "nft.v1.Owner") + proto.RegisterType((*Collection)(nil), "nft.v1.Collection") } func init() { proto.RegisterFile("nft/v1/nft.proto", fileDescriptor_f935ea002f215618) } var fileDescriptor_f935ea002f215618 = []byte{ - // 492 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x31, 0x6e, 0xdb, 0x30, - 0x14, 0x86, 0x2d, 0x5b, 0x8e, 0x63, 0x3a, 0x49, 0x0d, 0xd6, 0x68, 0x95, 0x0e, 0x52, 0x20, 0x74, - 0xc8, 0x62, 0x09, 0x76, 0xb6, 0x74, 0x53, 0x83, 0x00, 0x5e, 0xd2, 0x42, 0x48, 0x97, 0x2e, 0x06, - 0x23, 0xd2, 0x36, 0x11, 0x8b, 0x34, 0x44, 0x3a, 0x89, 0xf7, 0x1e, 0xa0, 0x43, 0x0f, 0xd0, 0xe3, - 0x78, 0xcc, 0xd8, 0x49, 0x68, 0xe5, 0xa5, 0xb3, 0x4f, 0x50, 0x90, 0x94, 0x02, 0xa3, 0x59, 0xb2, - 0x18, 0xff, 0xfb, 0xdf, 0x23, 0xfe, 0xef, 0x99, 0x14, 0xe8, 0xb2, 0x89, 0x0c, 0xef, 0x06, 0x21, - 0x9b, 0xc8, 0x60, 0x91, 0x71, 0xc9, 0x61, 0x37, 0x99, 0x21, 0xca, 0x52, 0x44, 0x59, 0xa0, 0xcc, - 0xbb, 0xc1, 0xbb, 0xde, 0x94, 0x4f, 0xb9, 0x6e, 0x86, 0x4a, 0x99, 0x39, 0xff, 0x01, 0xb4, 0x22, - 0x24, 0xc8, 0xd5, 0xe5, 0x35, 0x3c, 0x02, 0x75, 0x8a, 0x1d, 0xeb, 0xc4, 0x3a, 0x6d, 0xc7, 0x75, - 0x8a, 0x21, 0x04, 0x36, 0x43, 0x29, 0x71, 0xea, 0xda, 0xd1, 0x1a, 0x1e, 0x83, 0xc6, 0x32, 0xa3, - 0x4e, 0x43, 0x59, 0x51, 0xab, 0xc8, 0xbd, 0xc6, 0x97, 0x78, 0x14, 0x2b, 0x4f, 0x8d, 0x63, 0x24, - 0x91, 0x63, 0x9b, 0x71, 0xa5, 0x61, 0x0f, 0x34, 0xf9, 0x3d, 0x23, 0x99, 0xd3, 0xd4, 0xa6, 0x29, - 0xce, 0xed, 0xbf, 0x3f, 0x3d, 0xcb, 0x5f, 0x82, 0xe6, 0x05, 0x61, 0x3c, 0x7d, 0x51, 0xee, 0x1b, - 0xb0, 0x27, 0x92, 0x19, 0x49, 0x91, 0x89, 0x8e, 0xcb, 0x0a, 0x3a, 0xa0, 0x95, 0x64, 0x04, 0x49, - 0x9e, 0x95, 0xb9, 0x55, 0x09, 0xbb, 0x86, 0xd4, 0x04, 0x2b, 0x59, 0xc6, 0xde, 0x83, 0x83, 0xd1, - 0xc5, 0x47, 0x3e, 0x9f, 0x93, 0x44, 0x52, 0xce, 0x60, 0x00, 0xf6, 0xb1, 0xc2, 0x18, 0x57, 0x0c, - 0xd1, 0xeb, 0x6d, 0xee, 0xbd, 0x5a, 0xa1, 0x74, 0x7e, 0xee, 0x57, 0x1d, 0x3f, 0x6e, 0x69, 0x39, - 0xc2, 0x70, 0x00, 0xda, 0x92, 0xdf, 0x12, 0x36, 0xa6, 0x58, 0x38, 0xf5, 0x93, 0xc6, 0x69, 0x3b, - 0xea, 0x6d, 0x73, 0xaf, 0x6b, 0x0e, 0x3c, 0xb5, 0xfc, 0x78, 0x5f, 0xeb, 0x11, 0x16, 0x65, 0xf0, - 0x0f, 0x0b, 0x34, 0x3f, 0xa9, 0xfd, 0x15, 0x34, 0xc2, 0x38, 0x23, 0x42, 0x94, 0x5b, 0x57, 0x25, - 0xbc, 0x05, 0x47, 0x14, 0x8f, 0x93, 0x27, 0x3a, 0x93, 0xd0, 0x19, 0xba, 0xc1, 0xff, 0xd7, 0x19, - 0xec, 0x2e, 0x11, 0xbd, 0x5f, 0xe7, 0x5e, 0xad, 0xc8, 0xbd, 0xc3, 0x5d, 0x57, 0x6c, 0x73, 0xaf, - 0x63, 0xb0, 0x28, 0x4e, 0x84, 0x1f, 0x1f, 0x52, 0xbc, 0xd3, 0x2d, 0xb1, 0xbe, 0x59, 0x00, 0xec, - 0xfc, 0x1d, 0x67, 0xa0, 0xa9, 0x37, 0xd5, 0x64, 0x9d, 0xe1, 0xdb, 0xe7, 0xc1, 0xfa, 0xd2, 0x22, - 0x5b, 0x25, 0xc6, 0x66, 0x16, 0x7e, 0x00, 0x36, 0x9b, 0xc8, 0x0a, 0xf6, 0xf8, 0xf9, 0x99, 0xf2, - 0x89, 0x45, 0x07, 0x25, 0xa7, 0x7d, 0x75, 0x79, 0x2d, 0x62, 0x7d, 0xc8, 0x60, 0x44, 0x9f, 0xd7, - 0x7f, 0xdc, 0xda, 0xba, 0x70, 0xad, 0xc7, 0xc2, 0xb5, 0x7e, 0x17, 0xae, 0xf5, 0x7d, 0xe3, 0xd6, - 0x1e, 0x37, 0x6e, 0xed, 0xd7, 0xc6, 0xad, 0x7d, 0x1d, 0x4e, 0xa9, 0x9c, 0x2d, 0x6f, 0x82, 0x84, - 0xa7, 0x61, 0x92, 0xad, 0x16, 0x92, 0xf7, 0x79, 0x36, 0xed, 0xeb, 0x9c, 0x50, 0xff, 0xf6, 0x55, - 0x5c, 0xf8, 0xa0, 0xbe, 0x80, 0x50, 0xae, 0x16, 0x44, 0xdc, 0xec, 0xe9, 0x07, 0x7e, 0xf6, 0x2f, - 0x00, 0x00, 0xff, 0xff, 0xab, 0x43, 0xf5, 0x6e, 0x1c, 0x03, 0x00, 0x00, + // 479 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x31, 0x6f, 0xda, 0x40, + 0x14, 0xc7, 0x31, 0xd8, 0x10, 0x8e, 0x90, 0xa0, 0x2b, 0xaa, 0xdc, 0x0e, 0x76, 0x64, 0x75, 0x48, + 0x07, 0x6c, 0x41, 0xb7, 0x8c, 0x6e, 0x14, 0x89, 0x25, 0xad, 0xac, 0x74, 0xe9, 0x82, 0x2e, 0xbe, + 0x03, 0x4e, 0xc5, 0x77, 0xc8, 0x77, 0x24, 0xe1, 0x2b, 0x74, 0xea, 0x47, 0xe8, 0xc7, 0x61, 0xcc, + 0xd8, 0xc9, 0x6a, 0xcd, 0xd2, 0x99, 0x4f, 0x50, 0xdd, 0x9d, 0x1d, 0x31, 0x76, 0x41, 0xff, 0xf7, + 0x7f, 0x0f, 0xfd, 0x7f, 0xcf, 0xf7, 0xc0, 0x80, 0xcd, 0x65, 0xf4, 0x30, 0x8e, 0xd8, 0x5c, 0x86, + 0xeb, 0x9c, 0x4b, 0x0e, 0xdb, 0x4a, 0x3e, 0x8c, 0xdf, 0x0e, 0x17, 0x7c, 0xc1, 0xb5, 0x15, 0x29, + 0x65, 0xba, 0xc1, 0x13, 0xe8, 0xc4, 0x48, 0x90, 0xdb, 0x9b, 0x3b, 0x78, 0x06, 0x9a, 0x14, 0xbb, + 0xd6, 0x85, 0x75, 0xd9, 0x4d, 0x9a, 0x14, 0x43, 0x08, 0x6c, 0x86, 0x32, 0xe2, 0x36, 0xb5, 0xa3, + 0x35, 0x7c, 0x03, 0x5a, 0x9b, 0x9c, 0xba, 0x2d, 0x65, 0xc5, 0x9d, 0xb2, 0xf0, 0x5b, 0x5f, 0x92, + 0x69, 0xa2, 0x3c, 0x35, 0x8e, 0x91, 0x44, 0xae, 0x6d, 0xc6, 0x95, 0x86, 0x43, 0xe0, 0xf0, 0x47, + 0x46, 0x72, 0xd7, 0xd1, 0xa6, 0x29, 0xae, 0xec, 0xbf, 0x3f, 0x7d, 0x2b, 0xd8, 0x00, 0xe7, 0x9a, + 0x30, 0x9e, 0xfd, 0x57, 0xee, 0x6b, 0xd0, 0x16, 0xe9, 0x92, 0x64, 0xc8, 0x44, 0x27, 0x55, 0x05, + 0x5d, 0xd0, 0x49, 0x73, 0x82, 0x24, 0xcf, 0xab, 0xdc, 0xba, 0x84, 0x03, 0x43, 0x6a, 0x82, 0x95, + 0xac, 0x62, 0x1f, 0xc1, 0xe9, 0xf4, 0xfa, 0x23, 0x5f, 0xad, 0x48, 0x2a, 0x29, 0x67, 0x30, 0x04, + 0x27, 0x58, 0x61, 0xcc, 0x6a, 0x86, 0xf8, 0xd5, 0xa1, 0xf0, 0xcf, 0xb7, 0x28, 0x5b, 0x5d, 0x05, + 0x75, 0x27, 0x48, 0x3a, 0x5a, 0x4e, 0x31, 0x1c, 0x83, 0xae, 0xe4, 0xdf, 0x08, 0x9b, 0x51, 0x2c, + 0xdc, 0xe6, 0x45, 0xeb, 0xb2, 0x1b, 0x0f, 0x0f, 0x85, 0x3f, 0x30, 0x7f, 0x78, 0x69, 0x05, 0xc9, + 0x89, 0xd6, 0x53, 0x2c, 0xaa, 0xe0, 0xef, 0x16, 0x70, 0x3e, 0xa9, 0xfd, 0x15, 0x34, 0xc2, 0x38, + 0x27, 0x42, 0x54, 0x5b, 0xd7, 0x25, 0x44, 0xe0, 0x8c, 0xe2, 0x59, 0xfa, 0x42, 0x67, 0x12, 0x7a, + 0x93, 0x61, 0x68, 0x1e, 0x31, 0x3c, 0x46, 0x8f, 0xdf, 0xed, 0x0a, 0xbf, 0x51, 0x16, 0x7e, 0xff, + 0xd8, 0x15, 0x87, 0xc2, 0xef, 0x19, 0x18, 0x8a, 0x53, 0x11, 0x24, 0x7d, 0x8a, 0x8f, 0xba, 0x15, + 0xcc, 0x1a, 0x80, 0xa3, 0x6f, 0xf0, 0x1e, 0x38, 0x7a, 0x3d, 0x8d, 0xd3, 0x9b, 0xf4, 0xeb, 0x34, + 0xfd, 0x3e, 0xb1, 0xad, 0x62, 0x12, 0x33, 0x01, 0xc7, 0xc0, 0x66, 0x73, 0x59, 0x73, 0x9d, 0xd7, + 0x93, 0xd5, 0x0d, 0xc5, 0xa7, 0x15, 0x92, 0x7d, 0x7b, 0x73, 0x27, 0x12, 0x3d, 0x6a, 0x12, 0xe3, + 0xcf, 0xbb, 0x3f, 0x5e, 0x63, 0x57, 0x7a, 0xd6, 0x73, 0xe9, 0x59, 0xbf, 0x4b, 0xcf, 0xfa, 0xb1, + 0xf7, 0x1a, 0xcf, 0x7b, 0xaf, 0xf1, 0x6b, 0xef, 0x35, 0xbe, 0x4e, 0x16, 0x54, 0x2e, 0x37, 0xf7, + 0x61, 0xca, 0xb3, 0x28, 0xcd, 0xb7, 0x6b, 0xc9, 0x47, 0x3c, 0x5f, 0x8c, 0xd2, 0x25, 0xa2, 0x2c, + 0xd2, 0xbf, 0xa3, 0x4c, 0xc9, 0x27, 0x75, 0xd8, 0x91, 0xdc, 0xae, 0x89, 0xb8, 0x6f, 0xeb, 0x0b, + 0xfe, 0xf0, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xc5, 0x2a, 0x8c, 0xf3, 0x02, 0x00, 0x00, } func (this *BaseNFT) Equal(that interface{}) bool { diff --git a/x/nft/types/query.pb.go b/x/nft/types/query.pb.go index 302d9a6b9..794629d8d 100644 --- a/x/nft/types/query.pb.go +++ b/x/nft/types/query.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" - _ "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" @@ -728,81 +728,80 @@ func (m *QueryNFTResponse) GetNFT() *BaseNFT { } func init() { - proto.RegisterType((*QuerySupplyRequest)(nil), "chainmain.nft.v1.QuerySupplyRequest") - proto.RegisterType((*QuerySupplyResponse)(nil), "chainmain.nft.v1.QuerySupplyResponse") - proto.RegisterType((*QueryOwnerRequest)(nil), "chainmain.nft.v1.QueryOwnerRequest") - proto.RegisterType((*QueryOwnerResponse)(nil), "chainmain.nft.v1.QueryOwnerResponse") - proto.RegisterType((*QueryCollectionRequest)(nil), "chainmain.nft.v1.QueryCollectionRequest") - proto.RegisterType((*QueryCollectionResponse)(nil), "chainmain.nft.v1.QueryCollectionResponse") - proto.RegisterType((*QueryDenomRequest)(nil), "chainmain.nft.v1.QueryDenomRequest") - proto.RegisterType((*QueryDenomResponse)(nil), "chainmain.nft.v1.QueryDenomResponse") - proto.RegisterType((*QueryDenomByNameRequest)(nil), "chainmain.nft.v1.QueryDenomByNameRequest") - proto.RegisterType((*QueryDenomByNameResponse)(nil), "chainmain.nft.v1.QueryDenomByNameResponse") - proto.RegisterType((*QueryDenomsRequest)(nil), "chainmain.nft.v1.QueryDenomsRequest") - proto.RegisterType((*QueryDenomsResponse)(nil), "chainmain.nft.v1.QueryDenomsResponse") - proto.RegisterType((*QueryNFTRequest)(nil), "chainmain.nft.v1.QueryNFTRequest") - proto.RegisterType((*QueryNFTResponse)(nil), "chainmain.nft.v1.QueryNFTResponse") + proto.RegisterType((*QuerySupplyRequest)(nil), "nft.v1.QuerySupplyRequest") + proto.RegisterType((*QuerySupplyResponse)(nil), "nft.v1.QuerySupplyResponse") + proto.RegisterType((*QueryOwnerRequest)(nil), "nft.v1.QueryOwnerRequest") + proto.RegisterType((*QueryOwnerResponse)(nil), "nft.v1.QueryOwnerResponse") + proto.RegisterType((*QueryCollectionRequest)(nil), "nft.v1.QueryCollectionRequest") + proto.RegisterType((*QueryCollectionResponse)(nil), "nft.v1.QueryCollectionResponse") + proto.RegisterType((*QueryDenomRequest)(nil), "nft.v1.QueryDenomRequest") + proto.RegisterType((*QueryDenomResponse)(nil), "nft.v1.QueryDenomResponse") + proto.RegisterType((*QueryDenomByNameRequest)(nil), "nft.v1.QueryDenomByNameRequest") + proto.RegisterType((*QueryDenomByNameResponse)(nil), "nft.v1.QueryDenomByNameResponse") + proto.RegisterType((*QueryDenomsRequest)(nil), "nft.v1.QueryDenomsRequest") + proto.RegisterType((*QueryDenomsResponse)(nil), "nft.v1.QueryDenomsResponse") + proto.RegisterType((*QueryNFTRequest)(nil), "nft.v1.QueryNFTRequest") + proto.RegisterType((*QueryNFTResponse)(nil), "nft.v1.QueryNFTResponse") } func init() { proto.RegisterFile("nft/v1/query.proto", fileDescriptor_b4fc1e9935801bfe) } var fileDescriptor_b4fc1e9935801bfe = []byte{ - // 868 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4d, 0x6f, 0xe2, 0x46, - 0x18, 0xc7, 0x19, 0x08, 0x90, 0x4c, 0x2a, 0x85, 0x4c, 0xde, 0x28, 0x4d, 0x81, 0x4e, 0xf3, 0x02, - 0x69, 0xb1, 0x45, 0x9a, 0x5e, 0xaa, 0x9e, 0x48, 0x45, 0x1b, 0xa9, 0x4a, 0x5a, 0x37, 0xa7, 0xa8, - 0x52, 0x65, 0xc0, 0x38, 0xa8, 0x78, 0xc6, 0xc1, 0x26, 0x2d, 0x4a, 0xa3, 0x4a, 0xbd, 0x76, 0x0f, - 0x91, 0x56, 0xb9, 0xef, 0x69, 0xbf, 0xc0, 0x7e, 0x89, 0x1c, 0x23, 0xed, 0x65, 0x4f, 0x68, 0x45, - 0xf6, 0x13, 0xe4, 0x13, 0xac, 0xe6, 0xc5, 0xc1, 0xe6, 0x2d, 0x11, 0xca, 0xcd, 0x9e, 0xf9, 0x3f, - 0xcf, 0xf3, 0x9b, 0x3f, 0xcf, 0x3c, 0x06, 0x22, 0x52, 0x77, 0xd5, 0xf3, 0xa2, 0x7a, 0xd6, 0x36, - 0x5a, 0x1d, 0xc5, 0x6e, 0x51, 0x97, 0xa2, 0x44, 0xf5, 0x54, 0x6f, 0x10, 0x4b, 0x6f, 0x10, 0x85, - 0xd4, 0x5d, 0xe5, 0xbc, 0x98, 0x5a, 0x36, 0xa9, 0x49, 0xf9, 0xa6, 0xca, 0x9e, 0x84, 0x2e, 0xb5, - 0x6e, 0x52, 0x6a, 0x36, 0x0d, 0x55, 0xb7, 0x1b, 0xaa, 0x4e, 0x08, 0x75, 0x75, 0xb7, 0x41, 0x89, - 0x23, 0x77, 0x13, 0x32, 0x33, 0x4b, 0x21, 0x56, 0x76, 0xaa, 0xd4, 0xb1, 0xa8, 0xa3, 0x56, 0x74, - 0xc7, 0x10, 0x05, 0xd5, 0xf3, 0x62, 0xc5, 0x70, 0xf5, 0xa2, 0x6a, 0xeb, 0x66, 0x83, 0xf0, 0x70, - 0xa1, 0xc5, 0x27, 0x10, 0xfd, 0xca, 0x14, 0xbf, 0xb5, 0x6d, 0xbb, 0xd9, 0xd1, 0x8c, 0xb3, 0xb6, - 0xe1, 0xb8, 0x48, 0x81, 0xb3, 0x35, 0x83, 0x50, 0xeb, 0x8f, 0x46, 0x2d, 0x09, 0xb2, 0x20, 0x37, - 0x57, 0x5a, 0xba, 0xef, 0x66, 0x16, 0x3a, 0xba, 0xd5, 0xfc, 0x0e, 0x7b, 0x3b, 0x58, 0x8b, 0xf3, - 0xc7, 0x83, 0x1a, 0x5a, 0x86, 0x51, 0xfa, 0x17, 0x31, 0x5a, 0xc9, 0x30, 0x13, 0x6b, 0xe2, 0x05, - 0x17, 0xe0, 0x52, 0x20, 0xb7, 0x63, 0x53, 0xe2, 0x18, 0x68, 0x15, 0xc6, 0x74, 0x8b, 0xb6, 0x89, - 0xcb, 0x53, 0xcf, 0x68, 0xf2, 0x0d, 0xbf, 0x01, 0x70, 0x91, 0xeb, 0x8f, 0x58, 0xf4, 0xb4, 0x28, - 0x5b, 0x01, 0x94, 0x52, 0xe2, 0xbe, 0x9b, 0xf9, 0x44, 0x88, 0x05, 0x94, 0x84, 0x43, 0x65, 0x08, - 0xfb, 0x66, 0x24, 0x23, 0x59, 0x90, 0x9b, 0xdf, 0xdd, 0x52, 0x84, 0x73, 0x0a, 0x73, 0x4e, 0x11, - 0x3f, 0x95, 0x74, 0x4e, 0xf9, 0x45, 0x37, 0x0d, 0xc9, 0xa4, 0xf9, 0x22, 0xf1, 0x0b, 0x20, 0x1d, - 0x94, 0xd4, 0xf2, 0x90, 0x05, 0x0f, 0x03, 0xf0, 0xcc, 0x6b, 0xca, 0xe0, 0x6f, 0xad, 0x08, 0xbd, - 0xa4, 0xf9, 0x31, 0x40, 0x13, 0xe6, 0x31, 0xdb, 0x8f, 0xd2, 0x88, 0x5a, 0x01, 0x9c, 0x2b, 0x00, - 0x57, 0x39, 0xce, 0x3e, 0x6d, 0x36, 0x8d, 0x2a, 0x5b, 0x9b, 0xd6, 0xc9, 0xf2, 0x08, 0xa6, 0x69, - 0x1c, 0x7a, 0x05, 0xe0, 0xda, 0x10, 0x92, 0xb4, 0xe9, 0x7b, 0x08, 0xab, 0x0f, 0xab, 0xd2, 0xab, - 0xf5, 0x61, 0xaf, 0x7c, 0x91, 0x3e, 0xfd, 0xf3, 0xb9, 0xb6, 0x2f, 0x3b, 0xef, 0x07, 0x76, 0xf4, - 0x29, 0xfd, 0xc2, 0xfb, 0xb2, 0x11, 0x64, 0x92, 0x7e, 0x23, 0x70, 0xc1, 0xf8, 0x46, 0x10, 0x7a, - 0xa1, 0xc2, 0x47, 0xd2, 0x2b, 0xbe, 0x58, 0xea, 0x1c, 0xea, 0x96, 0xe7, 0x29, 0xda, 0x83, 0x50, - 0x54, 0x25, 0xba, 0x65, 0x48, 0xa2, 0x95, 0xfb, 0x6e, 0x66, 0xd1, 0x4f, 0xc4, 0xf6, 0xb0, 0x36, - 0xc7, 0x5f, 0x58, 0x30, 0x3e, 0x80, 0xc9, 0xe1, 0x84, 0xd3, 0xb1, 0xfd, 0xee, 0x3f, 0xa0, 0xe3, - 0x61, 0x05, 0xdb, 0x04, 0x4c, 0xdd, 0x26, 0xd7, 0x40, 0x8e, 0x0b, 0x2f, 0xbd, 0x84, 0xfc, 0x16, - 0xc6, 0x78, 0x79, 0x27, 0x09, 0xb2, 0x91, 0x09, 0x94, 0xa5, 0x99, 0x9b, 0x6e, 0x26, 0xa4, 0x49, - 0xf1, 0xf3, 0xf5, 0xc6, 0x19, 0x5c, 0xe0, 0x58, 0x87, 0xe5, 0xe3, 0x69, 0x6f, 0x92, 0x02, 0x67, - 0x5d, 0xfa, 0xa7, 0x41, 0x98, 0x3e, 0x3c, 0xa8, 0xf7, 0x76, 0xb0, 0x16, 0xe7, 0x8f, 0x07, 0x35, - 0xfc, 0x13, 0x4c, 0xf4, 0x4b, 0x4a, 0x1b, 0xf6, 0x60, 0x84, 0xd4, 0x5d, 0xe9, 0xef, 0xa7, 0xc3, - 0x1e, 0x94, 0x74, 0xc7, 0x38, 0x2c, 0x1f, 0x97, 0xe2, 0xbd, 0x6e, 0x26, 0xc2, 0x02, 0x99, 0x7c, - 0xf7, 0x75, 0x1c, 0x46, 0x79, 0x2a, 0xf4, 0x3f, 0x80, 0x31, 0x31, 0x88, 0xd1, 0xc6, 0x70, 0xf4, - 0xf0, 0x37, 0x20, 0xb5, 0xf9, 0x88, 0x4a, 0x70, 0xe1, 0xbd, 0xff, 0xde, 0x7e, 0x78, 0x19, 0x56, - 0xd0, 0xd7, 0xea, 0x83, 0x9c, 0x7d, 0x8a, 0xd4, 0xfe, 0x35, 0x75, 0xd4, 0x0b, 0xcf, 0x93, 0x4b, - 0xd5, 0x11, 0x08, 0x14, 0x46, 0xf9, 0xfc, 0x43, 0x5f, 0x8e, 0xa9, 0xe2, 0xff, 0x06, 0xa4, 0x36, - 0x26, 0x8b, 0x24, 0xc9, 0x67, 0x9c, 0x64, 0x05, 0x2d, 0x0d, 0x90, 0x90, 0xba, 0xeb, 0xa0, 0x2b, - 0x00, 0x61, 0x7f, 0x8a, 0xa0, 0xdc, 0x98, 0x8c, 0x43, 0x53, 0x33, 0x95, 0x7f, 0x82, 0x52, 0x02, - 0x14, 0x38, 0xc0, 0x36, 0xda, 0x7c, 0x92, 0x15, 0xe8, 0x1f, 0x18, 0xe5, 0x8d, 0x3b, 0xd6, 0x03, - 0xff, 0x34, 0x1a, 0xeb, 0x41, 0x60, 0xda, 0xe0, 0x1c, 0x47, 0xc0, 0x28, 0x3b, 0x80, 0x20, 0x2e, - 0x85, 0xbf, 0xfa, 0x35, 0x80, 0xf3, 0xbe, 0x99, 0x80, 0xf2, 0x93, 0xf2, 0x07, 0x06, 0x51, 0x6a, - 0xe7, 0x29, 0x52, 0x09, 0xa4, 0x72, 0xa0, 0x3c, 0xda, 0x1e, 0x0d, 0xc4, 0xc6, 0x95, 0x47, 0xc5, - 0x9e, 0x2f, 0x91, 0x0b, 0x63, 0x62, 0x00, 0xa0, 0x89, 0x27, 0x76, 0x1e, 0x6b, 0xd3, 0xe0, 0x14, - 0xc1, 0x9f, 0x73, 0x8e, 0x35, 0xb4, 0x32, 0x92, 0x03, 0xfd, 0x0b, 0xd9, 0x9d, 0x41, 0x5f, 0x8c, - 0x49, 0xd6, 0xbf, 0xfb, 0x29, 0x3c, 0x49, 0x22, 0x8b, 0x15, 0x79, 0xb1, 0xaf, 0x50, 0x7e, 0x44, - 0x27, 0xfa, 0x2f, 0xc3, 0x85, 0x77, 0xf7, 0x2f, 0x4b, 0x3f, 0xdf, 0xf4, 0xd2, 0xe0, 0xb6, 0x97, - 0x06, 0xef, 0x7b, 0x69, 0x70, 0x75, 0x97, 0x0e, 0xdd, 0xde, 0xa5, 0x43, 0xef, 0xee, 0xd2, 0xa1, - 0x93, 0x5d, 0xb3, 0xe1, 0x9e, 0xb6, 0x2b, 0x4a, 0x95, 0x5a, 0x6a, 0xb5, 0xd5, 0xb1, 0x5d, 0x5a, - 0xa0, 0x2d, 0xb3, 0xc0, 0x33, 0x8b, 0xfc, 0x05, 0x5e, 0xe0, 0x6f, 0x5e, 0xc2, 0xed, 0xd8, 0x86, - 0x53, 0x89, 0xf1, 0x3f, 0x77, 0xdf, 0x7c, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xdc, 0xe1, 0x09, - 0x76, 0x0a, 0x00, 0x00, + // 851 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x4e, 0x13, 0x51, + 0x14, 0xee, 0xb4, 0xb4, 0xc0, 0x45, 0x03, 0x5c, 0xfe, 0xea, 0xa0, 0x6d, 0x73, 0x8d, 0xfc, 0xda, + 0x99, 0xb4, 0xb2, 0xd1, 0x85, 0x26, 0xc5, 0xd4, 0x90, 0x18, 0xd0, 0x91, 0x15, 0x9a, 0xe8, 0xb4, + 0x9d, 0x0e, 0x0d, 0x9d, 0x7b, 0x87, 0xce, 0x14, 0x6c, 0x90, 0x85, 0x6c, 0xdd, 0x90, 0x98, 0x18, + 0xdf, 0xc3, 0x97, 0x60, 0x49, 0xe2, 0xc6, 0x55, 0x63, 0x8a, 0x4f, 0xc0, 0x13, 0x98, 0xfb, 0x33, + 0x76, 0xa6, 0x1d, 0xa2, 0x36, 0xec, 0xa6, 0xf7, 0x7c, 0xf7, 0xfb, 0xbe, 0x73, 0xee, 0x39, 0x07, + 0x00, 0xc4, 0x55, 0x57, 0x3d, 0xc8, 0xa9, 0xfb, 0x4d, 0xa3, 0xd1, 0x52, 0xec, 0x06, 0x71, 0x09, + 0x4c, 0xe0, 0xaa, 0xab, 0x1c, 0xe4, 0xe4, 0x69, 0x93, 0x98, 0x84, 0x1d, 0xa9, 0xf4, 0x8b, 0x47, + 0xe5, 0xdb, 0x26, 0x21, 0x66, 0xdd, 0x50, 0x75, 0xbb, 0xa6, 0xea, 0x18, 0x13, 0x57, 0x77, 0x6b, + 0x04, 0x3b, 0x22, 0x3a, 0x21, 0xf8, 0x28, 0x05, 0x3f, 0x59, 0x29, 0x13, 0xc7, 0x22, 0x8e, 0x5a, + 0xd2, 0x1d, 0x83, 0xcb, 0xa8, 0x07, 0xb9, 0x92, 0xe1, 0xea, 0x39, 0xd5, 0xd6, 0xcd, 0x1a, 0x66, + 0xd7, 0x39, 0x16, 0xed, 0x00, 0xf8, 0x92, 0x22, 0x5e, 0x35, 0x6d, 0xbb, 0xde, 0xd2, 0x8c, 0xfd, + 0xa6, 0xe1, 0xb8, 0x50, 0x01, 0x23, 0x15, 0x03, 0x13, 0xeb, 0x6d, 0xad, 0x92, 0x94, 0x32, 0xd2, + 0xd2, 0x68, 0x61, 0xea, 0xb2, 0x9d, 0x1e, 0x6f, 0xe9, 0x56, 0xfd, 0x11, 0xf2, 0x22, 0x48, 0x1b, + 0x66, 0x9f, 0x1b, 0x15, 0x38, 0x0d, 0xe2, 0xe4, 0x10, 0x1b, 0x8d, 0x64, 0x94, 0x82, 0x35, 0xfe, + 0x03, 0x65, 0xc1, 0x54, 0x80, 0xdb, 0xb1, 0x09, 0x76, 0x0c, 0x38, 0x0b, 0x12, 0xba, 0x45, 0x9a, + 0xd8, 0x65, 0xd4, 0x43, 0x9a, 0xf8, 0x85, 0xbe, 0x49, 0x60, 0x92, 0xe1, 0xb7, 0xe8, 0xed, 0x41, + 0xad, 0x2c, 0x04, 0xac, 0x14, 0x26, 0x2e, 0xdb, 0xe9, 0x1b, 0x1c, 0xcc, 0x4d, 0x09, 0x73, 0xb0, + 0x08, 0x40, 0xb7, 0x18, 0xc9, 0x58, 0x46, 0x5a, 0x1a, 0xcb, 0x2f, 0x28, 0xbc, 0x72, 0x0a, 0xad, + 0x9c, 0xc2, 0x1f, 0x48, 0x54, 0x4e, 0x79, 0xa1, 0x9b, 0x86, 0xf0, 0xa4, 0xf9, 0x6e, 0xa2, 0x13, + 0x49, 0x54, 0x50, 0xb8, 0x16, 0x49, 0xde, 0xf5, 0x6c, 0x48, 0x8c, 0xf9, 0xa6, 0xc2, 0x5f, 0x58, + 0xe1, 0x28, 0xe1, 0xe1, 0x59, 0xc0, 0x43, 0x94, 0x21, 0x17, 0xff, 0xea, 0x81, 0x2b, 0x04, 0x4c, + 0x9c, 0x4a, 0x60, 0x96, 0x99, 0x58, 0x27, 0xf5, 0xba, 0x51, 0xa6, 0x67, 0x83, 0xd6, 0xaf, 0x18, + 0xe2, 0x69, 0x90, 0xba, 0x7c, 0x91, 0xc0, 0x5c, 0x9f, 0x25, 0x51, 0x9c, 0x3c, 0x00, 0xe5, 0x3f, + 0xa7, 0xa2, 0x42, 0xd0, 0xab, 0x90, 0x0f, 0xef, 0x43, 0x5d, 0x5f, 0xad, 0xd6, 0x45, 0x97, 0x3d, + 0xa5, 0x09, 0x0f, 0x58, 0x25, 0xf4, 0x50, 0x3c, 0xba, 0x20, 0xe9, 0x3e, 0x3a, 0x03, 0xf4, 0x3e, + 0x3a, 0x47, 0xf1, 0x18, 0xda, 0x12, 0x75, 0x61, 0x87, 0x85, 0xd6, 0xa6, 0x6e, 0x79, 0xf5, 0x83, + 0x6b, 0x00, 0x70, 0x2d, 0xac, 0x5b, 0x86, 0xf0, 0x31, 0x73, 0xd9, 0x4e, 0x4f, 0xfa, 0x7d, 0xd0, + 0x18, 0xd2, 0x46, 0xd9, 0x0f, 0x7a, 0x19, 0x3d, 0x01, 0xc9, 0x7e, 0xc2, 0xff, 0x71, 0xf4, 0xc6, + 0x9f, 0x8c, 0xe3, 0x99, 0x09, 0x36, 0x82, 0x34, 0x70, 0x23, 0x7c, 0x92, 0xc4, 0x1a, 0xf0, 0xe8, + 0x85, 0xb5, 0x55, 0x90, 0x60, 0xf2, 0x4e, 0x52, 0xca, 0xc4, 0xfa, 0xbc, 0x15, 0x86, 0xce, 0xda, + 0xe9, 0x88, 0x26, 0x20, 0xd7, 0xf7, 0xfa, 0xfb, 0x60, 0x9c, 0x99, 0xd9, 0x2c, 0x6e, 0x0f, 0x3a, + 0x21, 0x0a, 0x18, 0x71, 0xc9, 0x9e, 0x81, 0x29, 0x3e, 0xda, 0x8b, 0xf7, 0x22, 0x48, 0x1b, 0x66, + 0x9f, 0x1b, 0x15, 0xf4, 0x18, 0x4c, 0x74, 0x25, 0x45, 0xf2, 0x2b, 0x20, 0x86, 0xab, 0xae, 0xa8, + 0xea, 0xb8, 0x97, 0x79, 0x41, 0x77, 0x8c, 0xcd, 0xe2, 0x76, 0x61, 0xb8, 0xd3, 0x4e, 0xc7, 0x28, + 0x9c, 0x82, 0xf2, 0x5f, 0x13, 0x20, 0xce, 0x08, 0xe0, 0x21, 0x48, 0xf0, 0x5d, 0x0a, 0x65, 0xef, + 0x4a, 0xff, 0xf2, 0x96, 0xe7, 0x43, 0x63, 0x5c, 0x18, 0xad, 0x9d, 0x7c, 0xff, 0xf5, 0x39, 0xaa, + 0xc0, 0xfb, 0x6a, 0x79, 0x57, 0xaf, 0x61, 0x4b, 0xaf, 0x61, 0xfa, 0x97, 0x43, 0xed, 0x4e, 0x9a, + 0xa3, 0x1e, 0x79, 0x49, 0x1f, 0xab, 0x0e, 0x97, 0x7b, 0x0d, 0xe2, 0x6c, 0x71, 0xc1, 0x5b, 0x01, + 0x6e, 0xff, 0xa2, 0x96, 0xe5, 0xb0, 0x90, 0x50, 0x9d, 0x67, 0xaa, 0x33, 0x70, 0xaa, 0x47, 0x15, + 0x57, 0x5d, 0x07, 0x7e, 0x00, 0xa0, 0x3b, 0xf3, 0x30, 0x15, 0xa0, 0xe9, 0xdb, 0x67, 0x72, 0xfa, + 0xca, 0xb8, 0xd0, 0xca, 0x32, 0xad, 0x45, 0x78, 0xef, 0x9f, 0x32, 0x84, 0xbb, 0x20, 0xce, 0x1a, + 0xae, 0x27, 0x35, 0xff, 0x76, 0xe8, 0x49, 0x2d, 0x30, 0xf3, 0x68, 0x89, 0xc9, 0x21, 0x98, 0xe9, + 0x91, 0xe3, 0x8d, 0xeb, 0x57, 0xfa, 0x28, 0x81, 0x31, 0xdf, 0x8c, 0xc2, 0x74, 0x3f, 0x6b, 0x60, + 0x1d, 0xc8, 0x99, 0xab, 0x01, 0x42, 0x5c, 0x65, 0xe2, 0xcb, 0x70, 0x31, 0x5c, 0x9c, 0xae, 0x0a, + 0xcf, 0x01, 0xfd, 0x3e, 0x86, 0xef, 0x40, 0x82, 0x8f, 0x21, 0x0c, 0xc9, 0xc9, 0x09, 0xef, 0xa0, + 0xe0, 0xdc, 0xa2, 0x3b, 0x4c, 0x73, 0x0e, 0xce, 0x84, 0x6a, 0xc2, 0x3d, 0x40, 0x3b, 0x17, 0xce, + 0x05, 0x28, 0xba, 0xd3, 0x26, 0x27, 0xfb, 0x03, 0x82, 0x38, 0xc7, 0x88, 0x57, 0xe1, 0x72, 0x48, + 0x93, 0xf8, 0x7b, 0xf2, 0xc8, 0x9b, 0xb1, 0xe3, 0xc2, 0xf3, 0xb3, 0x4e, 0x4a, 0x3a, 0xef, 0xa4, + 0xa4, 0x9f, 0x9d, 0x94, 0x74, 0x7a, 0x91, 0x8a, 0x9c, 0x5f, 0xa4, 0x22, 0x3f, 0x2e, 0x52, 0x91, + 0x9d, 0xbc, 0x59, 0x73, 0x77, 0x9b, 0x25, 0xa5, 0x4c, 0x2c, 0xb5, 0xdc, 0x68, 0xd9, 0x2e, 0xc9, + 0x92, 0x86, 0x99, 0x65, 0xcc, 0x9c, 0x3f, 0xcb, 0x04, 0xde, 0x33, 0x09, 0xb7, 0x65, 0x1b, 0x4e, + 0x29, 0xc1, 0xfe, 0x25, 0x7a, 0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x9a, 0x5a, 0x3a, 0x99, 0xa2, + 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -843,7 +842,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) Supply(ctx context.Context, in *QuerySupplyRequest, opts ...grpc.CallOption) (*QuerySupplyResponse, error) { out := new(QuerySupplyResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Query/Supply", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Query/Supply", in, out, opts...) if err != nil { return nil, err } @@ -852,7 +851,7 @@ func (c *queryClient) Supply(ctx context.Context, in *QuerySupplyRequest, opts . func (c *queryClient) Owner(ctx context.Context, in *QueryOwnerRequest, opts ...grpc.CallOption) (*QueryOwnerResponse, error) { out := new(QueryOwnerResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Query/Owner", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Query/Owner", in, out, opts...) if err != nil { return nil, err } @@ -861,7 +860,7 @@ func (c *queryClient) Owner(ctx context.Context, in *QueryOwnerRequest, opts ... func (c *queryClient) Collection(ctx context.Context, in *QueryCollectionRequest, opts ...grpc.CallOption) (*QueryCollectionResponse, error) { out := new(QueryCollectionResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Query/Collection", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Query/Collection", in, out, opts...) if err != nil { return nil, err } @@ -870,7 +869,7 @@ func (c *queryClient) Collection(ctx context.Context, in *QueryCollectionRequest func (c *queryClient) Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) { out := new(QueryDenomResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Query/Denom", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Query/Denom", in, out, opts...) if err != nil { return nil, err } @@ -879,7 +878,7 @@ func (c *queryClient) Denom(ctx context.Context, in *QueryDenomRequest, opts ... func (c *queryClient) DenomByName(ctx context.Context, in *QueryDenomByNameRequest, opts ...grpc.CallOption) (*QueryDenomByNameResponse, error) { out := new(QueryDenomByNameResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Query/DenomByName", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Query/DenomByName", in, out, opts...) if err != nil { return nil, err } @@ -888,7 +887,7 @@ func (c *queryClient) DenomByName(ctx context.Context, in *QueryDenomByNameReque func (c *queryClient) Denoms(ctx context.Context, in *QueryDenomsRequest, opts ...grpc.CallOption) (*QueryDenomsResponse, error) { out := new(QueryDenomsResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Query/Denoms", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Query/Denoms", in, out, opts...) if err != nil { return nil, err } @@ -897,7 +896,7 @@ func (c *queryClient) Denoms(ctx context.Context, in *QueryDenomsRequest, opts . func (c *queryClient) NFT(ctx context.Context, in *QueryNFTRequest, opts ...grpc.CallOption) (*QueryNFTResponse, error) { out := new(QueryNFTResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Query/NFT", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Query/NFT", in, out, opts...) if err != nil { return nil, err } @@ -962,7 +961,7 @@ func _Query_Supply_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Query/Supply", + FullMethod: "/nft.v1.Query/Supply", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Supply(ctx, req.(*QuerySupplyRequest)) @@ -980,7 +979,7 @@ func _Query_Owner_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Query/Owner", + FullMethod: "/nft.v1.Query/Owner", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Owner(ctx, req.(*QueryOwnerRequest)) @@ -998,7 +997,7 @@ func _Query_Collection_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Query/Collection", + FullMethod: "/nft.v1.Query/Collection", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Collection(ctx, req.(*QueryCollectionRequest)) @@ -1016,7 +1015,7 @@ func _Query_Denom_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Query/Denom", + FullMethod: "/nft.v1.Query/Denom", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Denom(ctx, req.(*QueryDenomRequest)) @@ -1034,7 +1033,7 @@ func _Query_DenomByName_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Query/DenomByName", + FullMethod: "/nft.v1.Query/DenomByName", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).DenomByName(ctx, req.(*QueryDenomByNameRequest)) @@ -1052,7 +1051,7 @@ func _Query_Denoms_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Query/Denoms", + FullMethod: "/nft.v1.Query/Denoms", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Denoms(ctx, req.(*QueryDenomsRequest)) @@ -1070,7 +1069,7 @@ func _Query_NFT_Handler(srv interface{}, ctx context.Context, dec func(interface } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Query/NFT", + FullMethod: "/nft.v1.Query/NFT", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).NFT(ctx, req.(*QueryNFTRequest)) @@ -1079,7 +1078,7 @@ func _Query_NFT_Handler(srv interface{}, ctx context.Context, dec func(interface } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "chainmain.nft.v1.Query", + ServiceName: "nft.v1.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/x/nft/types/tx.pb.go b/x/nft/types/tx.pb.go index 61d4d9c5e..c54d8201b 100644 --- a/x/nft/types/tx.pb.go +++ b/x/nft/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" @@ -424,55 +424,54 @@ func (m *MsgBurnNFTResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgBurnNFTResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgIssueDenom)(nil), "chainmain.nft.v1.MsgIssueDenom") - proto.RegisterType((*MsgIssueDenomResponse)(nil), "chainmain.nft.v1.MsgIssueDenomResponse") - proto.RegisterType((*MsgTransferNFT)(nil), "chainmain.nft.v1.MsgTransferNFT") - proto.RegisterType((*MsgTransferNFTResponse)(nil), "chainmain.nft.v1.MsgTransferNFTResponse") - proto.RegisterType((*MsgEditNFT)(nil), "chainmain.nft.v1.MsgEditNFT") - proto.RegisterType((*MsgEditNFTResponse)(nil), "chainmain.nft.v1.MsgEditNFTResponse") - proto.RegisterType((*MsgMintNFT)(nil), "chainmain.nft.v1.MsgMintNFT") - proto.RegisterType((*MsgMintNFTResponse)(nil), "chainmain.nft.v1.MsgMintNFTResponse") - proto.RegisterType((*MsgBurnNFT)(nil), "chainmain.nft.v1.MsgBurnNFT") - proto.RegisterType((*MsgBurnNFTResponse)(nil), "chainmain.nft.v1.MsgBurnNFTResponse") + proto.RegisterType((*MsgIssueDenom)(nil), "nft.v1.MsgIssueDenom") + proto.RegisterType((*MsgIssueDenomResponse)(nil), "nft.v1.MsgIssueDenomResponse") + proto.RegisterType((*MsgTransferNFT)(nil), "nft.v1.MsgTransferNFT") + proto.RegisterType((*MsgTransferNFTResponse)(nil), "nft.v1.MsgTransferNFTResponse") + proto.RegisterType((*MsgEditNFT)(nil), "nft.v1.MsgEditNFT") + proto.RegisterType((*MsgEditNFTResponse)(nil), "nft.v1.MsgEditNFTResponse") + proto.RegisterType((*MsgMintNFT)(nil), "nft.v1.MsgMintNFT") + proto.RegisterType((*MsgMintNFTResponse)(nil), "nft.v1.MsgMintNFTResponse") + proto.RegisterType((*MsgBurnNFT)(nil), "nft.v1.MsgBurnNFT") + proto.RegisterType((*MsgBurnNFTResponse)(nil), "nft.v1.MsgBurnNFTResponse") } func init() { proto.RegisterFile("nft/v1/tx.proto", fileDescriptor_714f8ececec76715) } var fileDescriptor_714f8ececec76715 = []byte{ - // 530 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0xc1, 0x6e, 0xd3, 0x4c, - 0x10, 0xc7, 0xe3, 0x38, 0x5f, 0xf2, 0x75, 0x10, 0x6d, 0xb5, 0x94, 0x62, 0xa2, 0xca, 0xa9, 0x2c, - 0x24, 0x7a, 0x89, 0xad, 0x96, 0x5b, 0x8f, 0x11, 0x20, 0xe5, 0x60, 0x84, 0xa2, 0x82, 0x04, 0x17, - 0xe4, 0xda, 0x1b, 0x67, 0x11, 0x5e, 0x5b, 0xbb, 0x9b, 0xaa, 0x11, 0xaf, 0xc0, 0x81, 0x47, 0xe0, - 0xc2, 0x91, 0xf7, 0xa8, 0xc4, 0xa5, 0x47, 0x4e, 0x15, 0x24, 0x17, 0xce, 0x3c, 0x01, 0xf2, 0x7a, - 0x9d, 0xae, 0x83, 0x4b, 0x2f, 0x20, 0x71, 0xb1, 0xc6, 0x33, 0xb3, 0xe3, 0xdf, 0x7f, 0x66, 0xc7, - 0xb0, 0x41, 0xc7, 0xc2, 0x3b, 0xd9, 0xf7, 0xc4, 0xa9, 0x9b, 0xb1, 0x54, 0xa4, 0x68, 0x33, 0x9c, - 0x04, 0x84, 0x26, 0x01, 0xa1, 0x2e, 0x1d, 0x0b, 0xf7, 0x64, 0xbf, 0xbb, 0x15, 0xa7, 0x71, 0x2a, - 0x83, 0x5e, 0x6e, 0x15, 0x79, 0xce, 0x5b, 0xb8, 0xe9, 0xf3, 0x78, 0xc8, 0xf9, 0x14, 0x3f, 0xc4, - 0x34, 0x4d, 0xd0, 0x3a, 0x34, 0x49, 0x64, 0x19, 0xbb, 0xc6, 0xde, 0xda, 0xa8, 0x49, 0x22, 0x84, - 0xa0, 0x45, 0x83, 0x04, 0x5b, 0x4d, 0xe9, 0x91, 0x36, 0xda, 0x86, 0x36, 0x0f, 0x27, 0x38, 0x09, - 0x2c, 0x53, 0x7a, 0xd5, 0x9b, 0xf4, 0x63, 0x1a, 0x61, 0x66, 0xb5, 0x94, 0x5f, 0xbe, 0xa1, 0x4d, - 0x30, 0xa7, 0x8c, 0x58, 0xff, 0x49, 0x67, 0x6e, 0x1e, 0xb6, 0xbe, 0x7f, 0xe8, 0x19, 0xce, 0x1d, - 0xb8, 0x5d, 0xf9, 0xf8, 0x08, 0xf3, 0x2c, 0xa5, 0x1c, 0x3b, 0xef, 0x0c, 0x58, 0xf7, 0x79, 0x7c, - 0xc4, 0x02, 0xca, 0xc7, 0x98, 0x3d, 0x79, 0x7c, 0xf4, 0x0b, 0x97, 0x0b, 0xff, 0x47, 0xf9, 0x99, - 0x57, 0x24, 0x2a, 0xd8, 0x06, 0xb7, 0x7e, 0x5c, 0xf4, 0x36, 0x66, 0x41, 0xf2, 0xe6, 0xd0, 0x29, - 0x23, 0xce, 0xa8, 0x23, 0xcd, 0x61, 0xa4, 0xb1, 0x99, 0x15, 0xb6, 0x1d, 0x58, 0x63, 0x38, 0x24, - 0x19, 0xc1, 0x54, 0x28, 0xec, 0x4b, 0x87, 0xe2, 0xb4, 0x60, 0xbb, 0x4a, 0xb3, 0x04, 0xfd, 0x64, - 0x00, 0xf8, 0x3c, 0x7e, 0x14, 0x11, 0xf1, 0x27, 0x20, 0xcb, 0x66, 0x9b, 0x5a, 0xb3, 0xef, 0x16, - 0xcd, 0x93, 0x68, 0x83, 0xce, 0xfc, 0xa2, 0x67, 0x3e, 0x1b, 0x0d, 0x65, 0x17, 0xf3, 0xf4, 0x28, - 0x10, 0x81, 0x6a, 0xac, 0xb4, 0x35, 0x9d, 0x6d, 0x5d, 0xa7, 0x52, 0xb2, 0x05, 0xe8, 0x12, 0x77, - 0xa9, 0xe2, 0x73, 0xa1, 0xc2, 0x27, 0xf4, 0x1f, 0x57, 0x51, 0x9d, 0x56, 0xa7, 0x7e, 0x5a, 0x85, - 0x46, 0x25, 0x66, 0xa9, 0xf1, 0xb5, 0x94, 0x38, 0x98, 0x32, 0xfa, 0x17, 0x6f, 0x53, 0x85, 0x40, - 0x7d, 0xab, 0x24, 0x38, 0xf8, 0x68, 0x82, 0xe9, 0xf3, 0x18, 0x3d, 0x07, 0xd0, 0xf6, 0xad, 0xe7, - 0xae, 0x6e, 0xaa, 0x5b, 0xd9, 0x89, 0xee, 0xfd, 0x6b, 0x12, 0xca, 0xfa, 0xc8, 0x87, 0x4e, 0x39, - 0xc1, 0x9d, 0xda, 0x33, 0x2a, 0xda, 0xbd, 0xf7, 0xbb, 0xa8, 0x5e, 0xae, 0xbc, 0xd6, 0xf5, 0xe5, - 0x54, 0xf4, 0x8a, 0x72, 0x2b, 0x77, 0x0c, 0xbd, 0x80, 0x1b, 0xfa, 0x3a, 0xef, 0xd6, 0x1e, 0xd2, - 0x32, 0xba, 0x7b, 0xd7, 0x65, 0xe8, 0xa4, 0xe5, 0x5c, 0xeb, 0x49, 0x55, 0xf4, 0x0a, 0xd2, 0x95, - 0x39, 0x0d, 0x9e, 0x9e, 0x7d, 0xb3, 0x1b, 0x67, 0x73, 0xdb, 0x38, 0x9f, 0xdb, 0xc6, 0xd7, 0xb9, - 0x6d, 0xbc, 0x5f, 0xd8, 0x8d, 0xf3, 0x85, 0xdd, 0xf8, 0xb2, 0xb0, 0x1b, 0x2f, 0x0f, 0x62, 0x22, - 0x26, 0xd3, 0x63, 0x37, 0x4c, 0x13, 0x2f, 0x64, 0xb3, 0x4c, 0xa4, 0xfd, 0x94, 0xc5, 0x7d, 0x59, - 0xd8, 0x93, 0xcf, 0x7e, 0x5e, 0xdf, 0x3b, 0xf5, 0xf2, 0x5f, 0xb2, 0x98, 0x65, 0x98, 0x1f, 0xb7, - 0xe5, 0xbf, 0xf6, 0xc1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xbe, 0xa9, 0xfa, 0xa6, 0x05, + // 514 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0xe3, 0x38, 0x24, 0xf4, 0x21, 0x5a, 0x74, 0xb4, 0xc1, 0x58, 0xe0, 0x20, 0x4f, 0x2c, + 0xb1, 0xd5, 0x32, 0xd1, 0xd1, 0xa2, 0x48, 0x19, 0x8c, 0x50, 0x54, 0x16, 0x16, 0xe4, 0xda, 0x17, + 0xe7, 0x10, 0x3e, 0x5b, 0x77, 0x97, 0xaa, 0x11, 0x5f, 0x81, 0x81, 0x8f, 0xc0, 0x17, 0xe0, 0x43, + 0xb0, 0x55, 0x62, 0xe9, 0xc8, 0x54, 0x41, 0xb2, 0x30, 0xf3, 0x09, 0x90, 0xcf, 0xe7, 0xf4, 0xdc, + 0x64, 0x04, 0xa9, 0x4b, 0xf4, 0xfc, 0xbf, 0x7b, 0xb9, 0xdf, 0xff, 0xbd, 0x7b, 0x07, 0x3b, 0x74, + 0x22, 0xfc, 0xd3, 0x7d, 0x5f, 0x9c, 0x79, 0x05, 0xcb, 0x45, 0x8e, 0xba, 0x74, 0x22, 0xbc, 0xd3, + 0x7d, 0x7b, 0x37, 0xcd, 0xd3, 0x5c, 0x4a, 0x7e, 0x19, 0x55, 0xab, 0xee, 0x47, 0xb8, 0x1b, 0xf2, + 0x74, 0xc4, 0xf9, 0x0c, 0xbf, 0xc0, 0x34, 0xcf, 0xd0, 0x36, 0xb4, 0x49, 0x62, 0x19, 0x4f, 0x8c, + 0xa7, 0x5b, 0xe3, 0x36, 0x49, 0x10, 0x82, 0x0e, 0x8d, 0x32, 0x6c, 0xb5, 0xa5, 0x22, 0x63, 0xd4, + 0x87, 0x2e, 0x8f, 0xa7, 0x38, 0x8b, 0x2c, 0x53, 0xaa, 0xea, 0x4b, 0xea, 0x98, 0x26, 0x98, 0x59, + 0x1d, 0xa5, 0xcb, 0x2f, 0x74, 0x0f, 0xcc, 0x19, 0x23, 0xd6, 0x2d, 0x29, 0x96, 0xe1, 0x61, 0xe7, + 0xf7, 0x97, 0x81, 0xe1, 0x3e, 0x80, 0xbd, 0xc6, 0xe1, 0x63, 0xcc, 0x8b, 0x9c, 0x72, 0xec, 0x7e, + 0x32, 0x60, 0x3b, 0xe4, 0xe9, 0x31, 0x8b, 0x28, 0x9f, 0x60, 0xf6, 0xea, 0xe5, 0xf1, 0x1a, 0x97, + 0x07, 0xb7, 0x93, 0x32, 0xe7, 0x1d, 0x49, 0x2a, 0xb6, 0xe0, 0xfe, 0x9f, 0xcb, 0xc1, 0xce, 0x3c, + 0xca, 0x3e, 0x1c, 0xba, 0xf5, 0x8a, 0x3b, 0xee, 0xc9, 0x70, 0x94, 0x68, 0x6c, 0x66, 0x83, 0xed, + 0x11, 0x6c, 0x31, 0x1c, 0x93, 0x82, 0x60, 0x2a, 0x14, 0xf6, 0x95, 0xa0, 0x38, 0x2d, 0xe8, 0x37, + 0x69, 0x56, 0xa0, 0x5f, 0x0d, 0x80, 0x90, 0xa7, 0x47, 0x09, 0x11, 0xff, 0x02, 0xb2, 0x2e, 0xb6, + 0xa9, 0x15, 0xfb, 0x61, 0x55, 0x3c, 0x89, 0x16, 0xf4, 0x16, 0x97, 0x03, 0xf3, 0xcd, 0x78, 0x24, + 0xab, 0x58, 0x6e, 0x4f, 0x22, 0x11, 0xa9, 0xc2, 0xca, 0x58, 0xf3, 0xd9, 0xd5, 0x7d, 0x2a, 0x27, + 0xbb, 0x80, 0xae, 0x70, 0x57, 0x2e, 0xbe, 0x57, 0x2e, 0x42, 0x42, 0x6f, 0xb8, 0x8b, 0x66, 0xb7, + 0x7a, 0x9b, 0xbb, 0x55, 0x79, 0x54, 0x66, 0x56, 0x1e, 0xdf, 0x4b, 0x8b, 0xc1, 0x8c, 0xd1, 0xff, + 0x78, 0x9b, 0x1a, 0x04, 0xea, 0xac, 0x9a, 0xe0, 0xe0, 0x5b, 0x1b, 0xcc, 0x90, 0xa7, 0x28, 0x00, + 0xd0, 0xe6, 0x6d, 0xcf, 0xab, 0xe6, 0xd3, 0x6b, 0x4c, 0x82, 0xfd, 0x78, 0xa3, 0x5c, 0xff, 0x17, + 0x7a, 0x0e, 0xbd, 0xba, 0x5b, 0x48, 0xdb, 0xa9, 0x34, 0xdb, 0x5e, 0xd7, 0xf4, 0xd4, 0xfa, 0xba, + 0xea, 0xa9, 0x4a, 0x6b, 0xa4, 0x5e, 0xbb, 0x27, 0xe8, 0x08, 0xee, 0xe8, 0x23, 0xd9, 0xd7, 0xb6, + 0x6a, 0xba, 0xed, 0x6c, 0xd6, 0x75, 0x82, 0xba, 0x0f, 0x3a, 0x81, 0xd2, 0x1a, 0x04, 0xd7, 0x6a, + 0x18, 0xbc, 0x3e, 0xff, 0xe5, 0xb4, 0xce, 0x17, 0x8e, 0x71, 0xb1, 0x70, 0x8c, 0x9f, 0x0b, 0xc7, + 0xf8, 0xbc, 0x74, 0x5a, 0x17, 0x4b, 0xa7, 0xf5, 0x63, 0xe9, 0xb4, 0xde, 0x1e, 0xa4, 0x44, 0x4c, + 0x67, 0x27, 0x5e, 0x9c, 0x67, 0x7e, 0xcc, 0xe6, 0x85, 0xc8, 0x87, 0x39, 0x4b, 0x87, 0xf1, 0x34, + 0x22, 0xd4, 0x97, 0xbf, 0xc3, 0xac, 0x0c, 0xcf, 0xfc, 0xf2, 0x91, 0x14, 0xf3, 0x02, 0xf3, 0x93, + 0xae, 0x7c, 0x07, 0x9f, 0xfd, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x0b, 0xe2, 0x5a, 0x38, 0x05, 0x00, 0x00, } @@ -691,7 +690,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) IssueDenom(ctx context.Context, in *MsgIssueDenom, opts ...grpc.CallOption) (*MsgIssueDenomResponse, error) { out := new(MsgIssueDenomResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Msg/IssueDenom", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Msg/IssueDenom", in, out, opts...) if err != nil { return nil, err } @@ -700,7 +699,7 @@ func (c *msgClient) IssueDenom(ctx context.Context, in *MsgIssueDenom, opts ...g func (c *msgClient) MintNFT(ctx context.Context, in *MsgMintNFT, opts ...grpc.CallOption) (*MsgMintNFTResponse, error) { out := new(MsgMintNFTResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Msg/MintNFT", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Msg/MintNFT", in, out, opts...) if err != nil { return nil, err } @@ -709,7 +708,7 @@ func (c *msgClient) MintNFT(ctx context.Context, in *MsgMintNFT, opts ...grpc.Ca func (c *msgClient) EditNFT(ctx context.Context, in *MsgEditNFT, opts ...grpc.CallOption) (*MsgEditNFTResponse, error) { out := new(MsgEditNFTResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Msg/EditNFT", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Msg/EditNFT", in, out, opts...) if err != nil { return nil, err } @@ -718,7 +717,7 @@ func (c *msgClient) EditNFT(ctx context.Context, in *MsgEditNFT, opts ...grpc.Ca func (c *msgClient) TransferNFT(ctx context.Context, in *MsgTransferNFT, opts ...grpc.CallOption) (*MsgTransferNFTResponse, error) { out := new(MsgTransferNFTResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Msg/TransferNFT", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Msg/TransferNFT", in, out, opts...) if err != nil { return nil, err } @@ -727,7 +726,7 @@ func (c *msgClient) TransferNFT(ctx context.Context, in *MsgTransferNFT, opts .. func (c *msgClient) BurnNFT(ctx context.Context, in *MsgBurnNFT, opts ...grpc.CallOption) (*MsgBurnNFTResponse, error) { out := new(MsgBurnNFTResponse) - err := c.cc.Invoke(ctx, "/chainmain.nft.v1.Msg/BurnNFT", in, out, opts...) + err := c.cc.Invoke(ctx, "/nft.v1.Msg/BurnNFT", in, out, opts...) if err != nil { return nil, err } @@ -782,7 +781,7 @@ func _Msg_IssueDenom_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Msg/IssueDenom", + FullMethod: "/nft.v1.Msg/IssueDenom", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).IssueDenom(ctx, req.(*MsgIssueDenom)) @@ -800,7 +799,7 @@ func _Msg_MintNFT_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Msg/MintNFT", + FullMethod: "/nft.v1.Msg/MintNFT", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).MintNFT(ctx, req.(*MsgMintNFT)) @@ -818,7 +817,7 @@ func _Msg_EditNFT_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Msg/EditNFT", + FullMethod: "/nft.v1.Msg/EditNFT", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).EditNFT(ctx, req.(*MsgEditNFT)) @@ -836,7 +835,7 @@ func _Msg_TransferNFT_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Msg/TransferNFT", + FullMethod: "/nft.v1.Msg/TransferNFT", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).TransferNFT(ctx, req.(*MsgTransferNFT)) @@ -854,7 +853,7 @@ func _Msg_BurnNFT_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.nft.v1.Msg/BurnNFT", + FullMethod: "/nft.v1.Msg/BurnNFT", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).BurnNFT(ctx, req.(*MsgBurnNFT)) @@ -863,7 +862,7 @@ func _Msg_BurnNFT_Handler(srv interface{}, ctx context.Context, dec func(interfa } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "chainmain.nft.v1.Msg", + ServiceName: "nft.v1.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/x/supply/module.go b/x/supply/module.go index 641494f31..0f2452906 100644 --- a/x/supply/module.go +++ b/x/supply/module.go @@ -8,6 +8,7 @@ import ( "github.com/crypto-org-chain/chain-main/v4/x/supply/client/cli" "github.com/crypto-org-chain/chain-main/v4/x/supply/keeper" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -16,7 +17,6 @@ import ( "github.com/crypto-org-chain/chain-main/v4/x/supply/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" ) var ( @@ -108,18 +108,6 @@ func NewAppModule(keeper keeper.Keeper) AppModule { // RegisterInvariants registers the capability module's invariants. func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} -// Route returns the capability module's message routing key. -func (AppModule) Route() sdk.Route { return sdk.Route{} } - -// QuerierRoute returns the capability module's query routing key. -func (AppModule) QuerierRoute() string { return types.RouterKey } - -// LegacyQuerierHandler returns the capability module's Querier. -// (Amino is still needed for Ledger at the moment) -func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { - return nil -} - // RegisterServices registers query server. func (am AppModule) RegisterServices(cfg module.Configurator) { //nolint: staticcheck diff --git a/x/supply/types/accounts.pb.go b/x/supply/types/accounts.pb.go index b047b2cfa..769d671f8 100644 --- a/x/supply/types/accounts.pb.go +++ b/x/supply/types/accounts.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -69,25 +69,24 @@ func (m *VestingAccounts) GetAddresses() []string { } func init() { - proto.RegisterType((*VestingAccounts)(nil), "chainmain.supply.v1.VestingAccounts") + proto.RegisterType((*VestingAccounts)(nil), "supply.v1.VestingAccounts") } func init() { proto.RegisterFile("supply/v1/accounts.proto", fileDescriptor_743399cf14988530) } var fileDescriptor_743399cf14988530 = []byte{ - // 178 bytes of a gzipped FileDescriptorProto + // 170 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x2e, 0x2d, 0x28, 0xc8, 0xa9, 0xd4, 0x2f, 0x33, 0xd4, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29, 0xd6, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x4e, 0xce, 0x48, 0xcc, 0xcc, 0xcb, 0x4d, 0xcc, 0xcc, 0xd3, - 0x83, 0xa8, 0xd1, 0x2b, 0x33, 0x54, 0xd2, 0xe7, 0xe2, 0x0f, 0x4b, 0x2d, 0x2e, 0xc9, 0xcc, 0x4b, - 0x77, 0x84, 0xaa, 0x16, 0x92, 0xe1, 0xe2, 0x4c, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0x4e, 0x2d, - 0x96, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x0c, 0x42, 0x08, 0x38, 0xf9, 0x9f, 0x78, 0x24, 0xc7, 0x78, - 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, - 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x69, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, - 0xae, 0x7e, 0x72, 0x51, 0x65, 0x41, 0x49, 0xbe, 0x6e, 0x7e, 0x51, 0xba, 0x2e, 0xd8, 0x56, 0x7d, - 0x30, 0xa9, 0x0b, 0xb2, 0x5c, 0xbf, 0x42, 0x1f, 0xea, 0xc4, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, - 0x36, 0xb0, 0xeb, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x79, 0xb9, 0x7d, 0x83, 0xb9, 0x00, - 0x00, 0x00, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x84, 0xc8, 0xe8, 0x95, 0x19, 0x2a, 0xe9, 0x73, 0xf1, 0x87, + 0xa5, 0x16, 0x97, 0x64, 0xe6, 0xa5, 0x3b, 0x42, 0xd5, 0x08, 0xc9, 0x70, 0x71, 0x26, 0xa6, 0xa4, + 0x14, 0xa5, 0x16, 0x17, 0xa7, 0x16, 0x4b, 0x30, 0x2a, 0x30, 0x6b, 0x70, 0x06, 0x21, 0x04, 0x9c, + 0xfc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, + 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x34, 0x3d, 0xb3, 0x24, + 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0xb9, 0xa8, 0xb2, 0xa0, 0x24, 0x5f, 0x37, 0xbf, + 0x28, 0x5d, 0x37, 0x39, 0x23, 0x31, 0x33, 0x4f, 0x1f, 0x4c, 0xea, 0xe6, 0x82, 0x98, 0x15, 0xfa, + 0x50, 0x87, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xdd, 0x64, 0x0c, 0x08, 0x00, 0x00, + 0xff, 0xff, 0x69, 0xa3, 0xda, 0xde, 0xaf, 0x00, 0x00, 0x00, } func (m *VestingAccounts) Marshal() (dAtA []byte, err error) { diff --git a/x/supply/types/genesis.pb.go b/x/supply/types/genesis.pb.go index 16b06de00..7cde84dbf 100644 --- a/x/supply/types/genesis.pb.go +++ b/x/supply/types/genesis.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -63,23 +63,23 @@ func (m *GenesisState) XXX_DiscardUnknown() { var xxx_messageInfo_GenesisState proto.InternalMessageInfo func init() { - proto.RegisterType((*GenesisState)(nil), "chainmain.supply.v1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "supply.v1.GenesisState") } func init() { proto.RegisterFile("supply/v1/genesis.proto", fileDescriptor_45d381ad7d51733b) } var fileDescriptor_45d381ad7d51733b = []byte{ - // 153 bytes of a gzipped FileDescriptorProto + // 145 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x2e, 0x2d, 0x28, 0xc8, 0xa9, 0xd4, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x4e, 0xce, 0x48, 0xcc, 0xcc, 0xcb, 0x4d, 0xcc, 0xcc, 0xd3, 0x83, - 0x28, 0xd1, 0x2b, 0x33, 0x54, 0xe2, 0xe3, 0xe2, 0x71, 0x87, 0xa8, 0x0a, 0x2e, 0x49, 0x2c, 0x49, - 0x75, 0xf2, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, - 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xd3, 0xf4, 0xcc, - 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe4, 0xa2, 0xca, 0x82, 0x92, 0x7c, 0xdd, - 0xfc, 0xa2, 0x74, 0x5d, 0xb0, 0xa1, 0xfa, 0x60, 0x52, 0x17, 0x64, 0xb6, 0x7e, 0x85, 0x3e, 0xd4, - 0x01, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xcb, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xac, 0x13, 0x94, 0xcb, 0x97, 0x00, 0x00, 0x00, + 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x84, 0x48, 0xe8, 0x95, 0x19, 0x2a, 0xf1, 0x71, 0xf1, 0xb8, 0x43, + 0xe4, 0x82, 0x4b, 0x12, 0x4b, 0x52, 0x9d, 0xfc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, + 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, + 0x8e, 0x21, 0xca, 0x34, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0xb9, + 0xa8, 0xb2, 0xa0, 0x24, 0x5f, 0x37, 0xbf, 0x28, 0x5d, 0x37, 0x39, 0x23, 0x31, 0x33, 0x4f, 0x1f, + 0x4c, 0xea, 0xe6, 0x82, 0x98, 0x15, 0xfa, 0x50, 0x6b, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, + 0xc0, 0x56, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xd8, 0x53, 0xe3, 0x8d, 0x00, 0x00, + 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/supply/types/query.pb.go b/x/supply/types/query.pb.go index 0f8706443..86f9b1d28 100644 --- a/x/supply/types/query.pb.go +++ b/x/supply/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" @@ -117,37 +117,37 @@ func (m *SupplyResponse) GetSupply() github_com_cosmos_cosmos_sdk_types.Coins { } func init() { - proto.RegisterType((*SupplyRequest)(nil), "chainmain.supply.v1.SupplyRequest") - proto.RegisterType((*SupplyResponse)(nil), "chainmain.supply.v1.SupplyResponse") + proto.RegisterType((*SupplyRequest)(nil), "supply.v1.SupplyRequest") + proto.RegisterType((*SupplyResponse)(nil), "supply.v1.SupplyResponse") } func init() { proto.RegisterFile("supply/v1/query.proto", fileDescriptor_64cd1add7eb523c6) } var fileDescriptor_64cd1add7eb523c6 = []byte{ - // 368 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x91, 0xbd, 0x4e, 0xe3, 0x40, - 0x14, 0x85, 0xed, 0x44, 0x9b, 0xc2, 0xd9, 0x1f, 0xc9, 0xbb, 0x2b, 0xed, 0x7a, 0xb3, 0x0e, 0x72, - 0x9a, 0x34, 0x9e, 0xc1, 0x41, 0xbc, 0x40, 0x68, 0x91, 0x10, 0x81, 0x8a, 0x6e, 0xec, 0x8c, 0x9c, - 0x11, 0xce, 0x5c, 0xc7, 0x33, 0x8e, 0x30, 0xa2, 0xa2, 0x40, 0x94, 0x48, 0xbc, 0x05, 0x4f, 0x92, - 0x32, 0x12, 0x0d, 0x15, 0xa0, 0x84, 0x07, 0x41, 0x9e, 0x71, 0xf8, 0x91, 0x22, 0x2a, 0xaa, 0xb9, - 0xba, 0x73, 0xef, 0x39, 0xdf, 0x9c, 0xb1, 0x7e, 0x8b, 0x3c, 0x4d, 0x93, 0x02, 0x4f, 0x03, 0x3c, - 0xc9, 0x69, 0x56, 0xa0, 0x34, 0x03, 0x09, 0xf6, 0xcf, 0x68, 0x44, 0x18, 0x1f, 0x13, 0xc6, 0x91, - 0x1e, 0x40, 0xd3, 0xc0, 0x71, 0x23, 0x10, 0x63, 0x10, 0x38, 0x24, 0x82, 0xe2, 0x69, 0x10, 0x52, - 0x49, 0x02, 0x1c, 0x01, 0xe3, 0x7a, 0xc9, 0xf9, 0x15, 0x43, 0x0c, 0xaa, 0xc4, 0x65, 0x55, 0x75, - 0x5b, 0x31, 0x40, 0x9c, 0x50, 0x4c, 0x52, 0x86, 0x09, 0xe7, 0x20, 0x89, 0x64, 0xc0, 0x85, 0xbe, - 0xf5, 0x7e, 0x58, 0xdf, 0x0e, 0x94, 0xc1, 0x80, 0x4e, 0x72, 0x2a, 0xa4, 0x97, 0x5b, 0xdf, 0x57, - 0x0d, 0x91, 0x02, 0x17, 0xd4, 0x8e, 0xac, 0x86, 0x66, 0xf8, 0x63, 0x6e, 0xd4, 0xbb, 0xcd, 0xde, - 0x5f, 0xa4, 0x39, 0x50, 0xc9, 0x81, 0x2a, 0x0e, 0xb4, 0x03, 0x8c, 0xf7, 0x37, 0x67, 0xf7, 0x6d, - 0xe3, 0xe6, 0xa1, 0xdd, 0x8d, 0x99, 0x1c, 0xe5, 0x21, 0x8a, 0x60, 0x8c, 0x2b, 0x68, 0x7d, 0xf8, - 0x62, 0x78, 0x8c, 0x65, 0x91, 0x52, 0xa1, 0x16, 0xc4, 0xa0, 0x92, 0xee, 0x5d, 0xd4, 0xac, 0x2f, - 0xfb, 0x65, 0x00, 0xf6, 0xa9, 0xd5, 0x3c, 0x04, 0x49, 0x12, 0x4d, 0x61, 0x7b, 0x68, 0x4d, 0x14, - 0xe8, 0x1d, 0xb3, 0xd3, 0xf9, 0x70, 0x46, 0x3f, 0xc3, 0xf3, 0xce, 0x6f, 0x9f, 0xae, 0x6b, 0x2d, - 0xdb, 0xc1, 0x2f, 0xc3, 0xf8, 0x35, 0x7c, 0x59, 0x5a, 0xda, 0x67, 0xd6, 0xd7, 0x5d, 0x36, 0xc9, - 0xd9, 0xf0, 0xb3, 0xcd, 0x3b, 0xca, 0xfc, 0xbf, 0xfd, 0x6f, 0xad, 0x79, 0xa2, 0x3c, 0x9d, 0xfa, - 0x65, 0xcd, 0xec, 0xef, 0xcd, 0x16, 0xae, 0x39, 0x5f, 0xb8, 0xe6, 0xe3, 0xc2, 0x35, 0xaf, 0x96, - 0xae, 0x31, 0x5f, 0xba, 0xc6, 0xdd, 0xd2, 0x35, 0x8e, 0xb6, 0xdf, 0x86, 0x9a, 0x15, 0xa9, 0x04, - 0x1f, 0xb2, 0xd8, 0x57, 0x82, 0x5a, 0xd6, 0x57, 0xba, 0x27, 0x2b, 0x65, 0x95, 0x73, 0xd8, 0x50, - 0x1f, 0xbd, 0xf5, 0x1c, 0x00, 0x00, 0xff, 0xff, 0x38, 0xcd, 0x08, 0x12, 0x6a, 0x02, 0x00, 0x00, + // 361 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x91, 0xbd, 0x4e, 0xeb, 0x30, + 0x18, 0x86, 0x93, 0x56, 0xa7, 0xd2, 0x49, 0xcf, 0x8f, 0x14, 0x9d, 0x23, 0xb5, 0x39, 0x3d, 0x29, + 0x0a, 0x4b, 0x97, 0xd8, 0xa4, 0x88, 0x1b, 0x28, 0x2b, 0x12, 0xa2, 0x30, 0xb1, 0x39, 0xa9, 0x49, + 0x2d, 0x52, 0x7f, 0x69, 0xec, 0x54, 0x64, 0x65, 0x62, 0x44, 0xe2, 0x2e, 0xb8, 0x92, 0x8e, 0x95, + 0x58, 0x98, 0x0a, 0x6a, 0xb9, 0x10, 0x14, 0x3b, 0xe5, 0x47, 0xea, 0xc6, 0x14, 0xeb, 0xfb, 0x92, + 0xe7, 0x7d, 0xf2, 0xda, 0xfa, 0x2b, 0xf2, 0x34, 0x4d, 0x0a, 0x3c, 0x0b, 0xf0, 0x34, 0xa7, 0x59, + 0x81, 0xd2, 0x0c, 0x24, 0xd8, 0xdf, 0xf5, 0x18, 0xcd, 0x02, 0xc7, 0x8d, 0x40, 0x4c, 0x40, 0xe0, + 0x90, 0x08, 0x8a, 0x67, 0x41, 0x48, 0x25, 0x09, 0x70, 0x04, 0x8c, 0xeb, 0x57, 0x9d, 0x3f, 0x31, + 0xc4, 0xa0, 0x8e, 0xb8, 0x3c, 0x55, 0xd3, 0x4e, 0x0c, 0x10, 0x27, 0x14, 0x93, 0x94, 0x61, 0xc2, + 0x39, 0x48, 0x22, 0x19, 0x70, 0xa1, 0xb7, 0xde, 0x6f, 0xeb, 0xe7, 0xa9, 0x0a, 0x18, 0xd2, 0x69, + 0x4e, 0x85, 0xf4, 0x72, 0xeb, 0xd7, 0x66, 0x20, 0x52, 0xe0, 0x82, 0xda, 0x91, 0xd5, 0xd0, 0x0e, + 0x2d, 0x73, 0xa7, 0xde, 0x6b, 0xf6, 0xdb, 0x48, 0x7b, 0xa0, 0xd2, 0x03, 0x55, 0x1e, 0xe8, 0x10, + 0x18, 0x1f, 0xec, 0xcd, 0x97, 0x5d, 0xe3, 0xfe, 0xa9, 0xdb, 0x8b, 0x99, 0x1c, 0xe7, 0x21, 0x8a, + 0x60, 0x82, 0x2b, 0x69, 0xfd, 0xf0, 0xc5, 0xe8, 0x12, 0xcb, 0x22, 0xa5, 0x42, 0x7d, 0x20, 0x86, + 0x15, 0xba, 0xbf, 0x34, 0xad, 0x6f, 0x27, 0xe5, 0x6f, 0xdb, 0x17, 0x56, 0xf3, 0x0c, 0x24, 0x49, + 0xb4, 0x85, 0xdd, 0x42, 0x6f, 0x05, 0xa0, 0x4f, 0xa6, 0x4e, 0x7b, 0xcb, 0x46, 0x2b, 0x7b, 0xde, + 0xf5, 0xc3, 0xcb, 0x5d, 0xad, 0x63, 0x3b, 0x38, 0x1a, 0x13, 0xc6, 0x27, 0x84, 0x71, 0xfc, 0x5e, + 0xaf, 0x2c, 0xf1, 0xf6, 0xd8, 0xfa, 0x71, 0xc4, 0xa6, 0x39, 0x1b, 0x7d, 0x25, 0x68, 0x57, 0x05, + 0xfd, 0xb7, 0xff, 0x6d, 0x0d, 0x4a, 0x14, 0xdf, 0xa9, 0xdf, 0xd4, 0xcc, 0xc1, 0xf1, 0x7c, 0xe5, + 0x9a, 0x8b, 0x95, 0x6b, 0x3e, 0xaf, 0x5c, 0xf3, 0x76, 0xed, 0x1a, 0x8b, 0xb5, 0x6b, 0x3c, 0xae, + 0x5d, 0xe3, 0xfc, 0xe0, 0x63, 0x59, 0x59, 0x91, 0x4a, 0xf0, 0x21, 0x8b, 0x7d, 0x05, 0xd4, 0x58, + 0x5f, 0x71, 0xaf, 0x36, 0x64, 0xd5, 0x5f, 0xd8, 0x50, 0x17, 0xb8, 0xff, 0x1a, 0x00, 0x00, 0xff, + 0xff, 0xec, 0x11, 0xb5, 0x6c, 0x38, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -181,7 +181,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) TotalSupply(ctx context.Context, in *SupplyRequest, opts ...grpc.CallOption) (*SupplyResponse, error) { out := new(SupplyResponse) - err := c.cc.Invoke(ctx, "/chainmain.supply.v1.Query/TotalSupply", in, out, opts...) + err := c.cc.Invoke(ctx, "/supply.v1.Query/TotalSupply", in, out, opts...) if err != nil { return nil, err } @@ -190,7 +190,7 @@ func (c *queryClient) TotalSupply(ctx context.Context, in *SupplyRequest, opts . func (c *queryClient) LiquidSupply(ctx context.Context, in *SupplyRequest, opts ...grpc.CallOption) (*SupplyResponse, error) { out := new(SupplyResponse) - err := c.cc.Invoke(ctx, "/chainmain.supply.v1.Query/LiquidSupply", in, out, opts...) + err := c.cc.Invoke(ctx, "/supply.v1.Query/LiquidSupply", in, out, opts...) if err != nil { return nil, err } @@ -234,7 +234,7 @@ func _Query_TotalSupply_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.supply.v1.Query/TotalSupply", + FullMethod: "/supply.v1.Query/TotalSupply", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).TotalSupply(ctx, req.(*SupplyRequest)) @@ -252,7 +252,7 @@ func _Query_LiquidSupply_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/chainmain.supply.v1.Query/LiquidSupply", + FullMethod: "/supply.v1.Query/LiquidSupply", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).LiquidSupply(ctx, req.(*SupplyRequest)) @@ -261,7 +261,7 @@ func _Query_LiquidSupply_Handler(srv interface{}, ctx context.Context, dec func( } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "chainmain.supply.v1.Query", + ServiceName: "supply.v1.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ {