diff --git a/CHANGELOG.md b/CHANGELOG.md index 5258b26e3..d2923c74d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,30 @@ ## [Unreleased] +### API Breaking + +* (Auth) Query for BaseAccount type account is no longer supported and is replaced by EthAccount type. + +### State Machine Breaking + +* (IRISHub) [\#2863](https://github.com/irisnet/irishub/pull/2863) Bump up tibc-go version to xxx +* (IRISHub) [\#2863](https://github.com/irisnet/irishub/pull/2863) Bump up irismod version to xxx +* (IRISHub) [\#2863](https://github.com/irisnet/irishub/pull/2863) Bump up ethermint version to v0.22.0 +* (IRISHub) [\#2863](https://github.com/irisnet/irishub/pull/2863) Bump up ibc-go version to v7.3.0 +* (IRISHub) [\#2863](https://github.com/irisnet/irishub/pull/2863) Bump up cosmos-sdk to v0.47.4 +* (IRISHub) [\#2863](https://github.com/irisnet/irishub/pull/2863) Bump up cometbft to v0.37.2 + +### Features + +* (NFT-Transfer) [\#2863](https://github.com/irisnet/irishub/pull/2863) Feat: support inter nft-transfer module + ### Bug Fixes * (IRISHub) [\#2852](https://github.com/irisnet/irishub/pull/2852) refactor: fix eip712 signature and inject ParseChainID method +* (IRISMod) [irismod \#367](https://github.com/irisnet/irismod/pull/367) Fix rest uri conflict in mt module + +### Security + +* (IRISHub) [\#2865](https://github.com/irisnet/irishub/pull/2865) Disable the vesting account creation to prevent contract address front-running. ## 2.0.0 diff --git a/Dockerfile b/Dockerfile index bf6afb28a..299d97899 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # -# Build image: docker build -t irisnet/irishub:v2.0.0 --build-arg EVM_CHAIN_ID=6688 . +# Build image: docker build -t irisnet/irishub:v2.1.0 --build-arg EVM_CHAIN_ID=6688 . # -FROM golang:1.18-alpine3.16 as builder +FROM golang:1.19.13-alpine3.18 as builder ARG EVM_CHAIN_ID diff --git a/Makefile b/Makefile index 75ed9f8bd..f9cd5343f 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=iris \ -X github.com/cosmos/cosmos-sdk/version.AppName=iris \ -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ - -X github.com/irisnet/irishub/types.EIP155ChainID=$(EVM_CHAIN_ID) \ + -X github.com/irisnet/irishub/v2/types.EIP155ChainID=$(EVM_CHAIN_ID) \ -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" ifeq ($(WITH_CLEVELDB),yes) @@ -199,7 +199,7 @@ lint: golangci-lint format: find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/statik/statik.go" -not -path "*.pb.go" | xargs gofmt -w -s find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/statik/statik.go" -not -path "*.pb.go" | xargs misspell -w - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/statik/statik.go" -not -path "*.pb.go" | xargs goimports -w -local github.com/irisnet/irishub + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./lite/statik/statik.go" -not -path "*.pb.go" | xargs goimports -w -local github.com/irisnet/irishub/v2 benchmark: @go test -mod=readonly -bench=. ./... diff --git a/ante/handler_options.go b/ante/handler_options.go index 726be16d9..fdd1ba244 100644 --- a/ante/handler_options.go +++ b/ante/handler_options.go @@ -14,7 +14,7 @@ import ( oraclekeeper "github.com/irisnet/irismod/modules/oracle/keeper" tokenkeeper "github.com/irisnet/irismod/modules/token/keeper" - guardiankeeper "github.com/irisnet/irishub/modules/guardian/keeper" + guardiankeeper "github.com/irisnet/irishub/v2/modules/guardian/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC @@ -64,6 +64,7 @@ func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler { func newCosmosAnteHandler(options HandlerOptions) sdk.AnteHandler { return sdk.ChainAnteDecorators( RejectMessagesDecorator{}, + NewRejectVestingDecorator(), ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker), ante.NewValidateBasicDecorator(), diff --git a/ante/vesting.go b/ante/vesting.go new file mode 100644 index 000000000..87861df30 --- /dev/null +++ b/ante/vesting.go @@ -0,0 +1,31 @@ +package ante + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + + vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" +) + +// RejectVestingDecorator is responsible for rejecting the vesting msg +type RejectVestingDecorator struct{} + +// NewRejectVestingDecorator returns an instance of ValidateVestingDecorator +func NewRejectVestingDecorator() RejectVestingDecorator { + return RejectVestingDecorator{} +} + +// AnteHandle checks the transaction +func (vvd RejectVestingDecorator) AnteHandle(ctx sdk.Context, + tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) { + for _, msg := range tx.GetMsgs() { + switch msg.(type) { + case *vestingtypes.MsgCreateVestingAccount, + *vestingtypes.MsgCreatePermanentLockedAccount, + *vestingtypes.MsgCreatePeriodicVestingAccount: + return ctx, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, + "currently doesn't support creating vesting account") + } + } + return next(ctx, tx, simulate) +} diff --git a/app/app.go b/app/app.go index 2063defaa..7323b53b4 100644 --- a/app/app.go +++ b/app/app.go @@ -26,6 +26,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/streaming" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/mempool" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -51,24 +52,31 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + "github.com/cosmos/cosmos-sdk/x/params" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/cosmos/cosmos-sdk/x/upgrade" upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" coinswapkeeper "github.com/irisnet/irismod/modules/coinswap/keeper" coinswaptypes "github.com/irisnet/irismod/modules/coinswap/types" + "github.com/irisnet/irismod/modules/farm" farmkeeper "github.com/irisnet/irismod/modules/farm/keeper" farmtypes "github.com/irisnet/irismod/modules/farm/types" htlckeeper "github.com/irisnet/irismod/modules/htlc/keeper" @@ -97,6 +105,7 @@ import ( tibcnfttypes "github.com/bianjieai/tibc-go/modules/tibc/apps/nft_transfer/types" tibchost "github.com/bianjieai/tibc-go/modules/tibc/core/24-host" tibcroutingtypes "github.com/bianjieai/tibc-go/modules/tibc/core/26-routing/types" + tibccli "github.com/bianjieai/tibc-go/modules/tibc/core/client/cli" tibckeeper "github.com/bianjieai/tibc-go/modules/tibc/core/keeper" "github.com/evmos/ethermint/ethereum/eip712" @@ -108,14 +117,19 @@ import ( feemarketkeeper "github.com/evmos/ethermint/x/feemarket/keeper" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/irisnet/irishub/address" - irishubante "github.com/irisnet/irishub/ante" - "github.com/irisnet/irishub/lite" - guardiankeeper "github.com/irisnet/irishub/modules/guardian/keeper" - guardiantypes "github.com/irisnet/irishub/modules/guardian/types" - mintkeeper "github.com/irisnet/irishub/modules/mint/keeper" - minttypes "github.com/irisnet/irishub/modules/mint/types" - iristypes "github.com/irisnet/irishub/types" + nfttransfer "github.com/bianjieai/nft-transfer" + ibcnfttransferkeeper "github.com/bianjieai/nft-transfer/keeper" + ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types" + + "github.com/irisnet/irishub/v2/address" + irishubante "github.com/irisnet/irishub/v2/ante" + "github.com/irisnet/irishub/v2/lite" + guardiankeeper "github.com/irisnet/irishub/v2/modules/guardian/keeper" + guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/internft" + mintkeeper "github.com/irisnet/irishub/v2/modules/mint/keeper" + minttypes "github.com/irisnet/irishub/v2/modules/mint/types" + iristypes "github.com/irisnet/irishub/v2/types" ) var ( @@ -156,8 +170,9 @@ type IrisApp struct { ConsensusParamsKeeper consensuskeeper.Keeper //ibc - IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly - IBCTransferKeeper ibctransferkeeper.Keeper + IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly + IBCTransferKeeper ibctransferkeeper.Keeper + IBCNFTTransferKeeper ibcnfttransferkeeper.Keeper // make scoped keepers public for test purposes scopedIBCKeeper capabilitykeeper.ScopedKeeper @@ -193,9 +208,10 @@ type IrisApp struct { // simulation manager sm *module.SimulationManager - transferModule transfer.AppModule - nfttransferModule tibcnfttransfer.AppModule - mttransferModule tibcmttransfer.AppModule + transferModule transfer.AppModule + nfttransferModule tibcnfttransfer.AppModule + mttransferModule tibcmttransfer.AppModule + ibcnfttransferModule nfttransfer.AppModule } // NewIrisApp returns a reference to an initialized IrisApp. @@ -212,6 +228,9 @@ func NewIrisApp( legacyAmino := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry + // Setup Mempool + baseAppOptions = append(baseAppOptions, NoOpMempoolOption()) + bApp := baseapp.NewBaseApp( iristypes.AppName, logger, @@ -237,6 +256,7 @@ func NewIrisApp( consensustypes.StoreKey, evidencetypes.StoreKey, ibctransfertypes.StoreKey, + ibcnfttransfertypes.StoreKey, capabilitytypes.StoreKey, guardiantypes.StoreKey, tokentypes.StoreKey, @@ -306,6 +326,7 @@ func NewIrisApp( ) scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName) scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) + scopedNFTTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibcnfttransfertypes.ModuleName) app.AccountKeeper = authkeeper.NewAccountKeeper( appCodec, @@ -420,7 +441,8 @@ func NewIrisApp( app.TIBCKeeper = tibckeeper.NewKeeper( appCodec, keys[tibchost.StoreKey], - app.GetSubspace(tibchost.ModuleName), app.StakingKeeper, + app.StakingKeeper, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.NFTKeeper = nftkeeper.NewKeeper( @@ -467,10 +489,25 @@ func NewIrisApp( app.transferModule = transfer.NewAppModule(app.IBCTransferKeeper) transferIBCModule := transfer.NewIBCModule(app.IBCTransferKeeper) + app.IBCNFTTransferKeeper = ibcnfttransferkeeper.NewKeeper( + appCodec, + keys[ibcnfttransfertypes.StoreKey], + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + app.IBCKeeper.ChannelKeeper, + app.IBCKeeper.ChannelKeeper, + &app.IBCKeeper.PortKeeper, + app.AccountKeeper, + internft.NewInterNftKeeper(appCodec, app.NFTKeeper, app.AccountKeeper), + scopedNFTTransferKeeper, + ) + app.ibcnfttransferModule = nfttransfer.NewAppModule(app.IBCNFTTransferKeeper) + nfttransferIBCModule := nfttransfer.NewIBCModule(app.IBCNFTTransferKeeper) + // routerModule := router.NewAppModule(app.RouterKeeper, transferIBCModule) // create static IBC router, add transfer route, then set and seal it ibcRouter := porttypes.NewRouter() - ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferIBCModule) + ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferIBCModule). + AddRoute(ibcnfttransfertypes.ModuleName, nfttransferIBCModule) app.IBCKeeper.SetRouter(ibcRouter) app.nfttransferModule = tibcnfttransfer.NewAppModule(app.TIBCNFTTransferKeeper) @@ -554,6 +591,18 @@ func NewIrisApp( app.ServiceKeeper, ) + govConfig := govtypes.DefaultConfig() + app.GovKeeper = govkeeper.NewKeeper( + appCodec, + keys[govtypes.StoreKey], + app.AccountKeeper, + app.BankKeeper, + app.StakingKeeper, + app.MsgServiceRouter(), + govConfig, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + ) + app.FarmKeeper = farmkeeper.NewKeeper(appCodec, keys[farmtypes.StoreKey], app.BankKeeper, @@ -566,22 +615,21 @@ func NewIrisApp( authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) - govConfig := govtypes.DefaultConfig() - app.GovKeeper = govkeeper.NewKeeper( - appCodec, - keys[govtypes.StoreKey], - app.AccountKeeper, - app.BankKeeper, - app.StakingKeeper, - app.MsgServiceRouter(), - govConfig, - authtypes.NewModuleAddress(govtypes.ModuleName).String(), - ) + // register the proposal types + govRouter := govv1beta1.NewRouter() + govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). + AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). + AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). + AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)). + AddRoute(tibchost.RouterKey, tibccli.NewProposalHandler(app.TIBCKeeper)). + AddRoute(farmtypes.RouterKey, farm.NewCommunityPoolCreateFarmProposalHandler(app.FarmKeeper)) app.GovKeeper.SetHooks(govtypes.NewMultiGovHooks( farmkeeper.NewGovHook(app.FarmKeeper), )) + app.GovKeeper.SetLegacyRouter(govRouter) + tracer := cast.ToString(appOpts.Get(srvflags.EVMTracer)) // Create Ethermint keepers @@ -879,27 +927,37 @@ func initParamsKeeper( ) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - paramsKeeper.Subspace(authtypes.ModuleName) - paramsKeeper.Subspace(banktypes.ModuleName) - paramsKeeper.Subspace(stakingtypes.ModuleName) - paramsKeeper.Subspace(minttypes.ModuleName) - paramsKeeper.Subspace(distrtypes.ModuleName) - paramsKeeper.Subspace(slashingtypes.ModuleName) + paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable()) + paramsKeeper.Subspace(banktypes.ModuleName).WithKeyTable(banktypes.ParamKeyTable()) + paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable()) + paramsKeeper.Subspace(minttypes.ModuleName).WithKeyTable(minttypes.ParamKeyTable()) + paramsKeeper.Subspace(distrtypes.ModuleName).WithKeyTable(distrtypes.ParamKeyTable()) + paramsKeeper.Subspace(slashingtypes.ModuleName).WithKeyTable(slashingtypes.ParamKeyTable()) paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) - paramsKeeper.Subspace(crisistypes.ModuleName) + paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable()) paramsKeeper.Subspace(ibctransfertypes.ModuleName) - paramsKeeper.Subspace(tokentypes.ModuleName) + paramsKeeper.Subspace(tokentypes.ModuleName).WithKeyTable(tokenv1.ParamKeyTable()) paramsKeeper.Subspace(recordtypes.ModuleName) - paramsKeeper.Subspace(htlctypes.ModuleName) - paramsKeeper.Subspace(coinswaptypes.ModuleName) - paramsKeeper.Subspace(servicetypes.ModuleName) + paramsKeeper.Subspace(htlctypes.ModuleName).WithKeyTable(htlctypes.ParamKeyTable()) + paramsKeeper.Subspace(coinswaptypes.ModuleName).WithKeyTable(coinswaptypes.ParamKeyTable()) + paramsKeeper.Subspace(servicetypes.ModuleName).WithKeyTable(servicetypes.ParamKeyTable()) paramsKeeper.Subspace(ibcexported.ModuleName) - paramsKeeper.Subspace(farmtypes.ModuleName) + paramsKeeper.Subspace(farmtypes.ModuleName).WithKeyTable(farmtypes.ParamKeyTable()) paramsKeeper.Subspace(tibchost.ModuleName) // ethermint subspaces - paramsKeeper.Subspace(evmtypes.ModuleName) - paramsKeeper.Subspace(feemarkettypes.ModuleName) + paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(evmtypes.ParamKeyTable()) + paramsKeeper.Subspace(feemarkettypes.ModuleName).WithKeyTable(feemarkettypes.ParamKeyTable()) return paramsKeeper } + +func NoOpMempoolOption() func(*baseapp.BaseApp) { + return func(app *baseapp.BaseApp) { + memPool := mempool.NoOpMempool{} + app.SetMempool(memPool) + handler := baseapp.NewDefaultProposalHandler(memPool, app) + app.SetPrepareProposal(handler.PrepareProposalHandler()) + app.SetProcessProposal(handler.ProcessProposalHandler()) + } +} diff --git a/app/encoding.go b/app/encoding.go index 6b7befb3a..7edee87f6 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/tx" enccodec "github.com/evmos/ethermint/encoding/codec" - "github.com/irisnet/irishub/app/params" + "github.com/irisnet/irishub/v2/app/params" ) // MakeEncodingConfig creates an EncodingConfig for testing diff --git a/app/genesis.go b/app/genesis.go index 1a9dfcf57..c580dff07 100644 --- a/app/genesis.go +++ b/app/genesis.go @@ -1,7 +1,7 @@ package app import ( - "github.com/irisnet/irishub/types" + "github.com/irisnet/irishub/v2/types" ) // NewDefaultGenesisState generates the default state for the application. diff --git a/app/modules.go b/app/modules.go index f7e5706d1..be4dc7e33 100644 --- a/app/modules.go +++ b/app/modules.go @@ -44,6 +44,7 @@ import ( ibc "github.com/cosmos/ibc-go/v7/modules/core" ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" "github.com/irisnet/irismod/modules/coinswap" coinswaptypes "github.com/irisnet/irismod/modules/coinswap/types" @@ -79,12 +80,15 @@ import ( "github.com/evmos/ethermint/x/feemarket" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - irisappparams "github.com/irisnet/irishub/app/params" - irisevm "github.com/irisnet/irishub/modules/evm" - "github.com/irisnet/irishub/modules/guardian" - guardiantypes "github.com/irisnet/irishub/modules/guardian/types" - "github.com/irisnet/irishub/modules/mint" - minttypes "github.com/irisnet/irishub/modules/mint/types" + nfttransfer "github.com/bianjieai/nft-transfer" + ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types" + + irisappparams "github.com/irisnet/irishub/v2/app/params" + irisevm "github.com/irisnet/irishub/v2/modules/evm" + "github.com/irisnet/irishub/v2/modules/guardian" + guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/mint" + minttypes "github.com/irisnet/irishub/v2/modules/mint/types" ) var ( @@ -103,7 +107,9 @@ var ( ModuleBasics = module.NewBasicManager( auth.AppModuleBasic{}, authzmodule.AppModuleBasic{}, - genutil.AppModuleBasic{}, + genutil.AppModuleBasic{ + GenTxValidator: genutiltypes.DefaultMessageValidator, + }, bank.AppModuleBasic{}, capability.AppModuleBasic{}, staking.AppModuleBasic{}, @@ -116,6 +122,7 @@ var ( crisis.AppModuleBasic{}, slashing.AppModuleBasic{}, ibc.AppModuleBasic{}, + ibctm.AppModuleBasic{}, upgrade.AppModuleBasic{}, evidence.AppModuleBasic{}, transfer.AppModuleBasic{}, @@ -138,6 +145,7 @@ var ( tibcnfttransfer.AppModuleBasic{}, tibcmttransfer.AppModuleBasic{}, mt.AppModuleBasic{}, + nfttransfer.AppModuleBasic{}, evm.AppModuleBasic{}, feemarket.AppModuleBasic{}, @@ -257,6 +265,7 @@ func appModules( ibc.NewAppModule(app.IBCKeeper), tibc.NewAppModule(app.TIBCKeeper), params.NewAppModule(app.ParamsKeeper), app.transferModule, + app.ibcnfttransferModule, app.nfttransferModule, app.mttransferModule, guardian.NewAppModule(appCodec, app.GuardianKeeper), @@ -384,6 +393,7 @@ func simulationModules( ), ibc.NewAppModule(app.IBCKeeper), app.transferModule, + app.ibcnfttransferModule, guardian.NewAppModule(appCodec, app.GuardianKeeper), token.NewAppModule( appCodec, @@ -488,6 +498,8 @@ func orderBeginBlockers() []string { tibcnfttypes.ModuleName, tibcmttypes.ModuleName, guardiantypes.ModuleName, + + ibcnfttransfertypes.ModuleName, } } @@ -538,6 +550,8 @@ func orderEndBlockers() []string { tibcnfttypes.ModuleName, tibcmttypes.ModuleName, guardiantypes.ModuleName, + + ibcnfttransfertypes.ModuleName, } } @@ -592,5 +606,7 @@ func orderInitBlockers() []string { guardiantypes.ModuleName, // NOTE: crisis module must go at the end to check for invariants on each module crisistypes.ModuleName, + + ibcnfttransfertypes.ModuleName, } } diff --git a/app/sim_test.go b/app/sim_test.go index 466bc10eb..87a863dd5 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - iristypes "github.com/irisnet/irishub/types" + iristypes "github.com/irisnet/irishub/v2/types" coinswaptypes "github.com/irisnet/irismod/modules/coinswap/types" htlctypes "github.com/irisnet/irismod/modules/htlc/types" mttypes "github.com/irisnet/irismod/modules/mt/types" diff --git a/app/upgrade.go b/app/upgrade.go index 8ccf810fb..d050e5bf0 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -5,12 +5,13 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/irisnet/irishub/app/upgrades" - v110 "github.com/irisnet/irishub/app/upgrades/v110" - v120 "github.com/irisnet/irishub/app/upgrades/v120" - v130 "github.com/irisnet/irishub/app/upgrades/v130" - v140 "github.com/irisnet/irishub/app/upgrades/v140" - v200 "github.com/irisnet/irishub/app/upgrades/v200" + "github.com/irisnet/irishub/v2/app/upgrades" + v110 "github.com/irisnet/irishub/v2/app/upgrades/v110" + v120 "github.com/irisnet/irishub/v2/app/upgrades/v120" + v130 "github.com/irisnet/irishub/v2/app/upgrades/v130" + v140 "github.com/irisnet/irishub/v2/app/upgrades/v140" + v200 "github.com/irisnet/irishub/v2/app/upgrades/v200" + v210 "github.com/irisnet/irishub/v2/app/upgrades/v210" ) var ( @@ -19,7 +20,8 @@ var ( Register(v120.Upgrade). Register(v130.Upgrade). Register(v140.Upgrade). - Register(v200.Upgrade) + Register(v200.Upgrade). + Register(v210.Upgrade) ) // RegisterUpgradePlans register a handler of upgrade plan @@ -30,18 +32,21 @@ func (app *IrisApp) RegisterUpgradePlans() { func (app *IrisApp) appKeepers() upgrades.AppKeepers { return upgrades.AppKeepers{ - AppCodec: app.AppCodec(), - HTLCKeeper: app.HTLCKeeper, - BankKeeper: app.BankKeeper, - AccountKeeper: app.AccountKeeper, - ServiceKeeper: app.ServiceKeeper, - GetKey: app.GetKey, - ModuleManager: app.mm, - TIBCkeeper: app.TIBCKeeper, - EvmKeeper: app.EvmKeeper, - FeeMarketKeeper: app.FeeMarketKeeper, - TokenKeeper: app.TokenKeeper, - ReaderWriter: app, + AppCodec: app.AppCodec(), + HTLCKeeper: app.HTLCKeeper, + BankKeeper: app.BankKeeper, + AccountKeeper: app.AccountKeeper, + ServiceKeeper: app.ServiceKeeper, + GetKey: app.GetKey, + ModuleManager: app.mm, + TIBCkeeper: app.TIBCKeeper, + IBCKeeper: app.IBCKeeper, + EvmKeeper: app.EvmKeeper, + FeeMarketKeeper: app.FeeMarketKeeper, + TokenKeeper: app.TokenKeeper, + ReaderWriter: app, + ConsensusParamsKeeper: app.ConsensusParamsKeeper, + ParamsKeeper: app.ParamsKeeper, } } diff --git a/app/upgrades/types.go b/app/upgrades/types.go index c767a453f..b20f49b07 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -13,6 +13,7 @@ import ( consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" tibckeeper "github.com/bianjieai/tibc-go/modules/tibc/core/keeper" @@ -53,6 +54,7 @@ type AppKeepers struct { GetKey func(moduleName string) *storetypes.KVStoreKey ModuleManager *module.Manager TIBCkeeper *tibckeeper.Keeper + IBCKeeper *ibckeeper.Keeper EvmKeeper *evmkeeper.Keeper FeeMarketKeeper feemarketkeeper.Keeper TokenKeeper tokenkeeper.Keeper diff --git a/app/upgrades/v110/upgrades.go b/app/upgrades/v110/upgrades.go index e6d8fb5ee..77a1ff7e9 100644 --- a/app/upgrades/v110/upgrades.go +++ b/app/upgrades/v110/upgrades.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/irisnet/irishub/app/upgrades" - "github.com/irisnet/irishub/app/upgrades/v110/htlc" - "github.com/irisnet/irishub/app/upgrades/v110/service" + "github.com/irisnet/irishub/v2/app/upgrades" + "github.com/irisnet/irishub/v2/app/upgrades/v110/htlc" + "github.com/irisnet/irishub/v2/app/upgrades/v110/service" htlctypes "github.com/irisnet/irismod/modules/htlc/types" ) diff --git a/app/upgrades/v120/upgrades.go b/app/upgrades/v120/upgrades.go index 663937c05..1bd944b3c 100644 --- a/app/upgrades/v120/upgrades.go +++ b/app/upgrades/v120/upgrades.go @@ -47,13 +47,13 @@ import ( tibcclienttypes "github.com/bianjieai/tibc-go/modules/tibc/core/02-client/types" tibchost "github.com/bianjieai/tibc-go/modules/tibc/core/24-host" - "github.com/irisnet/irishub/app/upgrades" - "github.com/irisnet/irishub/app/upgrades/v120/tibc" - "github.com/irisnet/irishub/modules/guardian" - guardiantypes "github.com/irisnet/irishub/modules/guardian/types" - "github.com/irisnet/irishub/modules/mint" - minttypes "github.com/irisnet/irishub/modules/mint/types" - "github.com/irisnet/irishub/types" + "github.com/irisnet/irishub/v2/app/upgrades" + "github.com/irisnet/irishub/v2/app/upgrades/v120/tibc" + "github.com/irisnet/irishub/v2/modules/guardian" + guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/mint" + minttypes "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v2/types" ) var Upgrade = upgrades.Upgrade{ diff --git a/app/upgrades/v130/upgrades.go b/app/upgrades/v130/upgrades.go index f043e49be..f1bd2d059 100644 --- a/app/upgrades/v130/upgrades.go +++ b/app/upgrades/v130/upgrades.go @@ -10,8 +10,8 @@ import ( mttypes "github.com/irisnet/irismod/modules/mt/types" - "github.com/irisnet/irishub/app/upgrades" - "github.com/irisnet/irishub/app/upgrades/v130/tibc" + "github.com/irisnet/irishub/v2/app/upgrades" + "github.com/irisnet/irishub/v2/app/upgrades/v130/tibc" ) var Upgrade = upgrades.Upgrade{ diff --git a/app/upgrades/v140/upgrades.go b/app/upgrades/v140/upgrades.go index 0797937e0..b5859ef15 100644 --- a/app/upgrades/v140/upgrades.go +++ b/app/upgrades/v140/upgrades.go @@ -11,7 +11,7 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - "github.com/irisnet/irishub/app/upgrades" + "github.com/irisnet/irishub/v2/app/upgrades" ) var Upgrade = upgrades.Upgrade{ diff --git a/app/upgrades/v200/config.go b/app/upgrades/v200/config.go index df4d958ac..d3ffbf8ac 100644 --- a/app/upgrades/v200/config.go +++ b/app/upgrades/v200/config.go @@ -6,7 +6,7 @@ import ( etherminttypes "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/irisnet/irishub/types" + "github.com/irisnet/irishub/v2/types" ) // NOTE: Before the release of irishub 2.0.0, the configuration in this file must be modified diff --git a/app/upgrades/v200/upgrades.go b/app/upgrades/v200/upgrades.go index 622f66211..154ae5f3e 100644 --- a/app/upgrades/v200/upgrades.go +++ b/app/upgrades/v200/upgrades.go @@ -18,8 +18,8 @@ import ( "github.com/evmos/ethermint/x/feemarket" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/irisnet/irishub/app/upgrades" - irisevm "github.com/irisnet/irishub/modules/evm" + "github.com/irisnet/irishub/v2/app/upgrades" + irisevm "github.com/irisnet/irishub/v2/modules/evm" ) var Upgrade = upgrades.Upgrade{ diff --git a/app/upgrades/v210/upgrades.go b/app/upgrades/v210/upgrades.go index 7e653960d..dca36c71b 100644 --- a/app/upgrades/v210/upgrades.go +++ b/app/upgrades/v210/upgrades.go @@ -9,15 +9,18 @@ import ( crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/irisnet/irishub/app/upgrades" + ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types" + + "github.com/irisnet/irishub/v2/app/upgrades" ) var Upgrade = upgrades.Upgrade{ UpgradeName: "v2.1", UpgradeHandlerConstructor: upgradeHandlerConstructor, StoreUpgrades: &storetypes.StoreUpgrades{ - Added: []string{crisistypes.StoreKey, consensustypes.StoreKey}, + Added: []string{crisistypes.StoreKey, consensustypes.StoreKey, ibcnfttransfertypes.StoreKey}, }, } @@ -38,6 +41,12 @@ func upgradeHandlerConstructor( // proposals, // ) + // Enable 09-localhost type in allowed clients according to + // https://github.com/cosmos/ibc-go/blob/v7.3.0/docs/migrations/v7-to-v7_1.md + params := app.IBCKeeper.ClientKeeper.GetParams(ctx) + params.AllowedClients = append(params.AllowedClients, exported.Localhost) + app.IBCKeeper.ClientKeeper.SetParams(ctx, params) + // Migrate Tendermint consensus parameters from x/params module to a // dedicated x/consensus module. baseAppLegacySS := app.ParamsKeeper.Subspace(baseapp.Paramspace). diff --git a/cmd/iris/cmd/genesis.go b/cmd/iris/cmd/genesis.go index 72093487f..69773dc12 100644 --- a/cmd/iris/cmd/genesis.go +++ b/cmd/iris/cmd/genesis.go @@ -16,7 +16,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/irisnet/irishub/app/params" + "github.com/irisnet/irishub/v2/app/params" ) const ( diff --git a/cmd/iris/cmd/keys.go b/cmd/iris/cmd/keys.go index 1aa434f78..99d89a664 100644 --- a/cmd/iris/cmd/keys.go +++ b/cmd/iris/cmd/keys.go @@ -18,7 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/input" "github.com/cosmos/cosmos-sdk/client/keys" - "github.com/irisnet/irishub/keystore" + "github.com/irisnet/irishub/v2/keystore" ) // Commands registers a sub-tree of commands to interact with diff --git a/cmd/iris/cmd/root.go b/cmd/iris/cmd/root.go index 119aab261..417c0c092 100644 --- a/cmd/iris/cmd/root.go +++ b/cmd/iris/cmd/root.go @@ -31,9 +31,9 @@ import ( ethermintserver "github.com/evmos/ethermint/server" servercfg "github.com/evmos/ethermint/server/config" - "github.com/irisnet/irishub/app" - "github.com/irisnet/irishub/app/params" - iristypes "github.com/irisnet/irishub/types" + "github.com/irisnet/irishub/v2/app" + "github.com/irisnet/irishub/v2/app/params" + iristypes "github.com/irisnet/irishub/v2/types" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/iris/cmd/testnet.go b/cmd/iris/cmd/testnet.go index 92cd68ed3..06769428c 100644 --- a/cmd/iris/cmd/testnet.go +++ b/cmd/iris/cmd/testnet.go @@ -41,8 +41,8 @@ import ( servercfg "github.com/evmos/ethermint/server/config" - guardiantypes "github.com/irisnet/irishub/modules/guardian/types" - iristypes "github.com/irisnet/irishub/types" + guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" + iristypes "github.com/irisnet/irishub/v2/types" randomtypes "github.com/irisnet/irismod/modules/random/types" servicetypes "github.com/irisnet/irismod/modules/service/types" tokentypesv1 "github.com/irisnet/irismod/modules/token/types/v1" diff --git a/cmd/iris/main.go b/cmd/iris/main.go index ce434a0a4..d56ba05f8 100644 --- a/cmd/iris/main.go +++ b/cmd/iris/main.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/irisnet/irishub/cmd/iris/cmd" - _ "github.com/irisnet/irishub/lite/statik" - "github.com/irisnet/irishub/types" + "github.com/irisnet/irishub/v2/cmd/iris/cmd" + _ "github.com/irisnet/irishub/v2/lite/statik" + "github.com/irisnet/irishub/v2/types" ) func main() { diff --git a/docs/get-started/mainnet.md b/docs/get-started/mainnet.md index 4923ec2ac..0ad53ae37 100644 --- a/docs/get-started/mainnet.md +++ b/docs/get-started/mainnet.md @@ -30,14 +30,14 @@ iris start Next, your node will process all chain upgrades. Between each upgrade, you must use the specified version to catch up with the block. Don't worry about using the old version at the upgrade height, the node will be halted automatically. -| Proposal | Start height | Upgrade height | irishub version | -| -------- | ------------ | -------------- | ----- | -| genesis | 9146456 | 9593205 | [v1.0.1](https://github.com/irisnet/irishub/releases/tag/v1.0.1) | -| [#1](https://irishub.iobscan.io/#/ProposalsDetail/1) | 9593206 | | [v1.1.0](https://github.com/irisnet/irishub/releases/tag/v1.1.0), [v1.1.1](https://github.com/irisnet/irishub/releases/tag/v1.1.1)| -| [#8](https://irishub.iobscan.io/#/ProposalsDetail/8) | 12393048 | 12534300 | [v1.2.0](https://github.com/irisnet/irishub/releases/tag/v1.2.0), [v1.2.1](https://github.com/irisnet/irishub/releases/tag/v1.2.1) | -| [#11](https://irishub.iobscan.io/#/ProposalsDetail/11) | 14166918 | 14301916 | [v1.3.0](https://github.com/irisnet/irishub/releases/tag/v1.3.0) | -| [#19](https://irishub.iobscan.io/#/gov/proposals/19) | | 17685953 | [v1.4.1](https://github.com/irisnet/irishub/releases/tag/v1.4.1) | - | [#39](https://irishub.iobscan.io/#/gov/proposals/39) | | 19514010 | [v2.0.0](https://github.com/irisnet/irishub/releases/tag/v2.0.0) | +| Proposal | Start height | Upgrade height | irishub version | +| ------------------------------------------------------ | ------------ | -------------- | ---------------------------------------------------------------------------------------------------------------------------------- | +| genesis | 9146456 | 9593205 | [v1.0.1](https://github.com/irisnet/irishub/releases/tag/v1.0.1) | +| [#1](https://irishub.iobscan.io/#/ProposalsDetail/1) | 9593206 | | [v1.1.0](https://github.com/irisnet/irishub/releases/tag/v1.1.0), [v1.1.1](https://github.com/irisnet/irishub/releases/tag/v1.1.1) | +| [#8](https://irishub.iobscan.io/#/ProposalsDetail/8) | 12393048 | 12534300 | [v1.2.0](https://github.com/irisnet/irishub/releases/tag/v1.2.0), [v1.2.1](https://github.com/irisnet/irishub/releases/tag/v1.2.1) | +| [#11](https://irishub.iobscan.io/#/ProposalsDetail/11) | 14166918 | 14301916 | [v1.3.0](https://github.com/irisnet/irishub/releases/tag/v1.3.0) | +| [#19](https://irishub.iobscan.io/#/gov/proposals/19) | | 17685953 | [v1.4.1](https://github.com/irisnet/irishub/releases/tag/v1.4.1) | +| [#39](https://irishub.iobscan.io/#/gov/proposals/39) | | 19514010 | [v2.0.0](https://github.com/irisnet/irishub/releases/tag/v2.0.0) | :::tip You may see some connection errors, it does not matter, the P2P network is trying to find available connections diff --git a/go.mod b/go.mod index caf1b4ac9..085615ee5 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,18 @@ -module github.com/irisnet/irishub +module github.com/irisnet/irishub/v2 go 1.19 require ( - github.com/bianjieai/tibc-go v0.4.4-0.20230703020917-f2c4f40e4f3f + github.com/bianjieai/nft-transfer v1.1.2-ibc-v6.1.0.0.20230911023600-fa7bd3f3cb1e + github.com/bianjieai/tibc-go v0.4.4-0.20230824091732-bbd58021f825 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 - github.com/cosmos/cosmos-sdk v0.47.3 + github.com/cosmos/cosmos-sdk v0.47.4 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/iavl v0.20.0 // indirect - github.com/cosmos/ibc-go/v7 v7.2.0 - github.com/evmos/ethermint v0.20.0 - github.com/irisnet/irismod v1.7.4-0.20230704022721-11481f2b93ed + github.com/cosmos/ibc-go/v7 v7.3.0 + github.com/evmos/ethermint v0.22.0 + github.com/irisnet/irismod v1.7.4-0.20231010070045-9304e04cfc25 ) require ( @@ -30,9 +31,9 @@ require ( github.com/stretchr/testify v1.8.4 github.com/tidwall/gjson v1.14.4 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 - google.golang.org/grpc v1.55.0 - google.golang.org/protobuf v1.30.0 + google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/grpc v1.56.2 + google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 sigs.k8s.io/yaml v1.3.0 // indirect ) @@ -44,12 +45,13 @@ require ( github.com/pkg/errors v0.9.1 github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa github.com/spf13/viper v1.16.0 - golang.org/x/crypto v0.9.0 + golang.org/x/crypto v0.11.0 + google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 ) require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect - cosmossdk.io/log v1.1.0 // indirect + cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect github.com/btcsuite/btcd/btcutil v1.1.3 // indirect github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect @@ -58,25 +60,25 @@ require ( github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf // indirect - github.com/go-playground/locales v0.14.0 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/golang/mock v1.6.0 // indirect - github.com/google/s2a-go v0.1.3 // indirect + github.com/google/s2a-go v0.1.4 // indirect github.com/huandu/skiplist v1.2.0 // indirect github.com/linxGnu/grocksdb v1.7.16 // indirect github.com/tidwall/btree v1.6.0 // indirect github.com/tidwall/sjson v1.2.5 // indirect github.com/zondax/ledger-go v0.14.1 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect pgregory.net/rapid v0.5.5 // indirect ) require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.19.0 // indirect - cloud.google.com/go/iam v0.13.0 // indirect - cloud.google.com/go/storage v1.29.0 // indirect - cosmossdk.io/errors v1.0.0-beta.7 + cloud.google.com/go v0.110.4 // indirect + cloud.google.com/go/compute v1.20.1 // indirect + cloud.google.com/go/iam v1.1.0 // indirect + cloud.google.com/go/storage v1.30.1 // indirect + cosmossdk.io/errors v1.0.0 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 @@ -130,7 +132,7 @@ require ( github.com/google/orderedcode v0.0.1 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.8.0 // indirect + github.com/googleapis/gax-go/v2 v2.11.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 @@ -159,7 +161,7 @@ require ( github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect @@ -201,14 +203,14 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/term v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sync v0.2.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/term v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.122.0 // indirect + google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect @@ -219,6 +221,6 @@ require ( replace github.com/zondax/hid => github.com/zondax/hid v0.9.0 // use bianjieai fork of ethermint -replace github.com/evmos/ethermint => github.com/bianjieai/ethermint v0.6.1-0.20230704054052-1d6b3c366199 +replace github.com/evmos/ethermint => github.com/bianjieai/ethermint v0.6.1-0.20230914085944-3cc455cce3d4 replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 diff --git a/go.sum b/go.sum index 5c4285c35..753552726 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.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk= +cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -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.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= -cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= +cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= +cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -114,13 +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.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94= +cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -178,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.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= -cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= +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= @@ -198,10 +197,10 @@ cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= -cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= -cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= -cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= +cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= +cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= +cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca h1:msenprh2BLLRwNT7zN56TbBHOGk/7ARQckXHxXyvjoQ= +cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca/go.mod h1:PkIAKXZvaxrTRc++z53XMRvFk8AcGGWYHcMIPzVYX9c= cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d h1:E/8y0oG3u9hBR8l4F9MtC0LdZIamPCUwUoLlrHrX86I= @@ -292,10 +291,12 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bianjieai/ethermint v0.6.1-0.20230704054052-1d6b3c366199 h1:lcfs68cN7F7o7496OusRGvBQV+cXWSTUErxRK19y6lE= -github.com/bianjieai/ethermint v0.6.1-0.20230704054052-1d6b3c366199/go.mod h1:3s8Z5Gb/lhW0hi5je917LUqH5tvmUdEwn55A1LaPIPk= -github.com/bianjieai/tibc-go v0.4.4-0.20230703020917-f2c4f40e4f3f h1:EWr2g45dzSgGppbjrGLB/lUz3yTuZZCkVV6qF9wTiUg= -github.com/bianjieai/tibc-go v0.4.4-0.20230703020917-f2c4f40e4f3f/go.mod h1:Q1mspLk9w0O5oBWkRpeCC8kdoZ0Ev8hkknkqu2cXDW8= +github.com/bianjieai/ethermint v0.6.1-0.20230914085944-3cc455cce3d4 h1:M3LU8I+hB9vqsK4oRFq0GxD+6Pzs48eWejvYuebtweQ= +github.com/bianjieai/ethermint v0.6.1-0.20230914085944-3cc455cce3d4/go.mod h1:JEhGmVj5rZX5bTfOqh3nltE2N6+qMI4HVNV2vW6PpOQ= +github.com/bianjieai/nft-transfer v1.1.2-ibc-v6.1.0.0.20230911023600-fa7bd3f3cb1e h1:6XiMxCG7DpIOBjqw2rGtZgMIOgS/0KsbU6m84BQ0mfo= +github.com/bianjieai/nft-transfer v1.1.2-ibc-v6.1.0.0.20230911023600-fa7bd3f3cb1e/go.mod h1:u2PNH4v8CD4AWU4Rf7yt8/qqQtrrwwHiw03qQSKERhg= +github.com/bianjieai/tibc-go v0.4.4-0.20230824091732-bbd58021f825 h1:+/6FK0V7uXouVYigb1EvPGuDN1ZDPfBnvzOUbTRe4rg= +github.com/bianjieai/tibc-go v0.4.4-0.20230824091732-bbd58021f825/go.mod h1:OBT3OZWqF8eTyQNGOvHycGg+pkhWWm5RwELT/NRZM9k= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= @@ -400,8 +401,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= -github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= +github.com/cosmos/cosmos-sdk v0.47.4 h1:FVUpEprm58nMmBX4xkRdMDaIG5Nr4yy92HZAfGAw9bg= +github.com/cosmos/cosmos-sdk v0.47.4/go.mod h1:R5n+uM7vguVPFap4pgkdvQCT1nVo/OtPwrlAU40rvok= 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= @@ -412,8 +413,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go/v7 v7.2.0 h1:dx0DLUl7rxdyZ8NiT6UsrbzKOJx/w7s+BOaewFRH6cg= -github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= +github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw= +github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= @@ -553,7 +554,6 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= @@ -686,8 +686,8 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= -github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.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= @@ -708,8 +708,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.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= -github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= +github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -816,8 +816,8 @@ 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/irisnet/irismod v1.7.4-0.20230704022721-11481f2b93ed h1:gR6n+jqK0T8IOZn7e7wOI+X/8mYfdqRLYCsa4Rsnc6U= -github.com/irisnet/irismod v1.7.4-0.20230704022721-11481f2b93ed/go.mod h1:QL525InqKzSgxPmmRhjKmiGJqTUMm8BRZt11PQ3mQ9M= +github.com/irisnet/irismod v1.7.4-0.20231010070045-9304e04cfc25 h1:Q9d9JpHkMNlKgqJSKM8iCsOClUw+K2L0iejCjyQRNd8= +github.com/irisnet/irismod v1.7.4-0.20231010070045-9304e04cfc25/go.mod h1:6APlocacyWrjIK8YwrKK/jn3u5pJktppITU938rfc10= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= 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= @@ -915,8 +915,8 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -1291,8 +1291,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1403,8 +1403,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1430,8 +1430,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.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1446,8 +1446,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.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1557,14 +1557,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1576,8 +1576,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1715,8 +1715,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es= -google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= +google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= +google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1836,8 +1836,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 h1:s5YSX+ZH5b5vS9rnpGymvIyMpLRJizowqDlOuyjXnTk= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1879,8 +1883,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= -google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= +google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1897,8 +1901,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= @@ -1937,7 +1941,7 @@ 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.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/lite/swagger.go b/lite/swagger.go index 962368a5a..cf13546a9 100644 --- a/lite/swagger.go +++ b/lite/swagger.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - _ "github.com/irisnet/irishub/lite/statik" + _ "github.com/irisnet/irishub/v2/lite/statik" ) // RegisterSwaggerAPI registers swagger route with API Server diff --git a/modules/evm/moudle.go b/modules/evm/moudle.go index 3f6cca58f..5117f75ce 100644 --- a/modules/evm/moudle.go +++ b/modules/evm/moudle.go @@ -17,7 +17,8 @@ var ( // AppModule implements an application module for the evm module. type AppModule struct { ethermint.AppModule - k *Keeper + k *Keeper + ss types.Subspace } // NewAppModule creates a new AppModule object @@ -30,6 +31,7 @@ func NewAppModule( return AppModule{ AppModule: ethermint.NewAppModule(k, ak, ss), k: &Keeper{k, bankKeeper, false}, + ss: ss, } } @@ -38,4 +40,14 @@ func NewAppModule( func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), am.k) types.RegisterQueryServer(cfg.QueryServer(), am.k.evmkeeper) + + m := keeper.NewMigrator(*am.k.evmkeeper, am.ss) + + if err := cfg.RegisterMigration(types.ModuleName, 3, m.Migrate3to4); err != nil { + panic(err) + } + + if err := cfg.RegisterMigration(types.ModuleName, 4, m.Migrate4to5); err != nil { + panic(err) + } } diff --git a/modules/guardian/client/cli/cli_test.go b/modules/guardian/client/cli/cli_test.go index cb1e090c5..8e31f9ac5 100644 --- a/modules/guardian/client/cli/cli_test.go +++ b/modules/guardian/client/cli/cli_test.go @@ -15,10 +15,10 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - guardiancli "github.com/irisnet/irishub/modules/guardian/client/cli" - guardiantestutil "github.com/irisnet/irishub/modules/guardian/client/testutil" - guardiantypes "github.com/irisnet/irishub/modules/guardian/types" - "github.com/irisnet/irishub/simapp" + guardiancli "github.com/irisnet/irishub/v2/modules/guardian/client/cli" + guardiantestutil "github.com/irisnet/irishub/v2/modules/guardian/client/testutil" + guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v2/simapp" ) var privKey cryptotypes.PrivKey diff --git a/modules/guardian/client/cli/query.go b/modules/guardian/client/cli/query.go index 2c0a071f3..84f1f6fb7 100644 --- a/modules/guardian/client/cli/query.go +++ b/modules/guardian/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) // GetQueryCmd returns the cli query commands for the guardian module. diff --git a/modules/guardian/client/cli/tx.go b/modules/guardian/client/cli/tx.go index b978ecaa8..31c9f581e 100644 --- a/modules/guardian/client/cli/tx.go +++ b/modules/guardian/client/cli/tx.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) // NewTxCmd returns the transaction commands for the guardian module. diff --git a/modules/guardian/client/testutil/test_helpers.go b/modules/guardian/client/testutil/test_helpers.go index 85b725e45..ba87c26b5 100644 --- a/modules/guardian/client/testutil/test_helpers.go +++ b/modules/guardian/client/testutil/test_helpers.go @@ -13,8 +13,8 @@ import ( clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" - guardiancli "github.com/irisnet/irishub/modules/guardian/client/cli" - "github.com/irisnet/irishub/simapp" + guardiancli "github.com/irisnet/irishub/v2/modules/guardian/client/cli" + "github.com/irisnet/irishub/v2/simapp" ) // MsgRedelegateExec creates a redelegate message. diff --git a/modules/guardian/genesis.go b/modules/guardian/genesis.go index 64d196297..117e551e1 100644 --- a/modules/guardian/genesis.go +++ b/modules/guardian/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/guardian/keeper" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/keeper" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) // InitGenesis stores genesis data diff --git a/modules/guardian/genesis_test.go b/modules/guardian/genesis_test.go index a8d65c3f4..19e1198e7 100644 --- a/modules/guardian/genesis_test.go +++ b/modules/guardian/genesis_test.go @@ -10,10 +10,10 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/guardian" - "github.com/irisnet/irishub/modules/guardian/keeper" - "github.com/irisnet/irishub/modules/guardian/types" - "github.com/irisnet/irishub/simapp" + "github.com/irisnet/irishub/v2/modules/guardian" + "github.com/irisnet/irishub/v2/modules/guardian/keeper" + "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v2/simapp" ) type TestSuite struct { diff --git a/modules/guardian/handler.go b/modules/guardian/handler.go index 4bf3fbb5d..8876ab7cb 100644 --- a/modules/guardian/handler.go +++ b/modules/guardian/handler.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/irisnet/irishub/modules/guardian/keeper" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/keeper" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) // NewHandler returns a handler for all "guardian" type messages. diff --git a/modules/guardian/keeper/grpc_query.go b/modules/guardian/keeper/grpc_query.go index 3c64a317d..3d70064ac 100644 --- a/modules/guardian/keeper/grpc_query.go +++ b/modules/guardian/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) var _ types.QueryServer = Keeper{} diff --git a/modules/guardian/keeper/grpc_query_test.go b/modules/guardian/keeper/grpc_query_test.go index 46d7a354f..12809a862 100644 --- a/modules/guardian/keeper/grpc_query_test.go +++ b/modules/guardian/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/testutil/testdata" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) func (suite *KeeperTestSuite) TestGRPCQuerySupers() { diff --git a/modules/guardian/keeper/keeper.go b/modules/guardian/keeper/keeper.go index 74abbd8fe..74eb53844 100644 --- a/modules/guardian/keeper/keeper.go +++ b/modules/guardian/keeper/keeper.go @@ -9,7 +9,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) // Keeper of the guardian store diff --git a/modules/guardian/keeper/keeper_test.go b/modules/guardian/keeper/keeper_test.go index 15652f435..dceeff1a5 100644 --- a/modules/guardian/keeper/keeper_test.go +++ b/modules/guardian/keeper/keeper_test.go @@ -13,9 +13,9 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/guardian/keeper" - "github.com/irisnet/irishub/modules/guardian/types" - "github.com/irisnet/irishub/simapp" + "github.com/irisnet/irishub/v2/modules/guardian/keeper" + "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v2/simapp" ) var ( diff --git a/modules/guardian/keeper/msg_service.go b/modules/guardian/keeper/msg_service.go index 20b7f5197..a10cc30e4 100644 --- a/modules/guardian/keeper/msg_service.go +++ b/modules/guardian/keeper/msg_service.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) type msgServer struct { diff --git a/modules/guardian/module.go b/modules/guardian/module.go index fd7dac586..9290e699c 100644 --- a/modules/guardian/module.go +++ b/modules/guardian/module.go @@ -18,9 +18,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/irisnet/irishub/modules/guardian/client/cli" - "github.com/irisnet/irishub/modules/guardian/keeper" - "github.com/irisnet/irishub/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/guardian/client/cli" + "github.com/irisnet/irishub/v2/modules/guardian/keeper" + "github.com/irisnet/irishub/v2/modules/guardian/types" ) var ( diff --git a/modules/guardian/types/genesis.pb.go b/modules/guardian/types/genesis.pb.go index ab36ca059..73f4809f1 100644 --- a/modules/guardian/types/genesis.pb.go +++ b/modules/guardian/types/genesis.pb.go @@ -75,7 +75,7 @@ func init() { func init() { proto.RegisterFile("irishub/guardian/genesis.proto", fileDescriptor_430b7f41c0a2b3b1) } var fileDescriptor_430b7f41c0a2b3b1 = []byte{ - // 196 bytes of a gzipped FileDescriptorProto + // 199 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcb, 0x2c, 0xca, 0x2c, 0xce, 0x28, 0x4d, 0xd2, 0x4f, 0x2f, 0x4d, 0x2c, 0x4a, 0xc9, 0x4c, 0xcc, 0xd3, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x80, 0xca, 0xeb, 0xc1, @@ -83,12 +83,12 @@ var fileDescriptor_430b7f41c0a2b3b1 = []byte{ 0xa6, 0x3e, 0x88, 0x05, 0x11, 0x55, 0x72, 0xe5, 0xe2, 0x71, 0x87, 0x98, 0x1c, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0x64, 0xca, 0xc5, 0x56, 0x5c, 0x5a, 0x90, 0x5a, 0x54, 0x2c, 0xc1, 0xa8, 0xc0, 0xac, 0xc1, 0x6d, 0x24, 0xae, 0x87, 0x6e, 0x93, 0x5e, 0x30, 0x48, 0xde, 0x89, 0xe5, 0xc4, 0x3d, 0x79, - 0x86, 0x20, 0xa8, 0x62, 0x27, 0xef, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, + 0x86, 0x20, 0xa8, 0x62, 0x27, 0xbf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, - 0x32, 0x4c, 0xcf, 0x2c, 0x01, 0x69, 0x4f, 0xce, 0xcf, 0xd5, 0x07, 0x19, 0x95, 0x97, 0x5a, 0xa2, - 0x0f, 0x73, 0x6a, 0x6e, 0x7e, 0x4a, 0x69, 0x4e, 0x6a, 0x31, 0xc2, 0xc9, 0x25, 0x95, 0x05, 0xa9, - 0xc5, 0x49, 0x6c, 0x60, 0xa7, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xda, 0x0f, 0x65, 0xe4, - 0x05, 0x01, 0x00, 0x00, + 0x32, 0x49, 0xcf, 0x2c, 0x01, 0x69, 0x4f, 0xce, 0xcf, 0xd5, 0x07, 0x19, 0x95, 0x97, 0x5a, 0xa2, + 0x0f, 0x73, 0x6a, 0x99, 0x91, 0x7e, 0x6e, 0x7e, 0x4a, 0x69, 0x4e, 0x6a, 0x31, 0xc2, 0xd5, 0x25, + 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xd7, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x49, + 0x97, 0x2a, 0x9a, 0x08, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/guardian/types/guardian.pb.go b/modules/guardian/types/guardian.pb.go index 7a624fb64..6c95fa0d2 100644 --- a/modules/guardian/types/guardian.pb.go +++ b/modules/guardian/types/guardian.pb.go @@ -128,7 +128,7 @@ func init() { func init() { proto.RegisterFile("irishub/guardian/guardian.proto", fileDescriptor_cbcdd28e3c2705db) } var fileDescriptor_cbcdd28e3c2705db = []byte{ - // 325 bytes of a gzipped FileDescriptorProto + // 328 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x2c, 0xca, 0x2c, 0xce, 0x28, 0x4d, 0xd2, 0x4f, 0x2f, 0x4d, 0x2c, 0x4a, 0xc9, 0x4c, 0xcc, 0x83, 0x33, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x04, 0xa0, 0x0a, 0xf4, 0x60, 0xe2, 0x52, 0x22, 0xe9, 0xf9, 0xe9, @@ -144,12 +144,12 @@ var fileDescriptor_cbcdd28e3c2705db = []byte{ 0x73, 0x0d, 0xf6, 0x0c, 0x16, 0x60, 0x90, 0xe2, 0xee, 0x9a, 0xab, 0xc0, 0xee, 0x9e, 0x9a, 0x97, 0x5a, 0x9c, 0x59, 0x2c, 0x24, 0xc5, 0xc5, 0xe1, 0x1f, 0xe4, 0xe2, 0xe9, 0xe7, 0x18, 0x14, 0x29, 0xc0, 0x28, 0xc5, 0xd3, 0x35, 0x57, 0x81, 0xc3, 0xbf, 0x28, 0x25, 0x33, 0x2f, 0xb1, 0xa8, 0x52, - 0x8a, 0xa5, 0x63, 0xb1, 0x1c, 0x83, 0x93, 0xf7, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, + 0x8a, 0xa5, 0x63, 0xb1, 0x1c, 0x83, 0x93, 0xdf, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, - 0x31, 0x44, 0x19, 0xa6, 0x67, 0x96, 0x80, 0x3c, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xf2, 0x68, 0x5e, - 0x6a, 0x89, 0x3e, 0x2c, 0xf0, 0x73, 0xf3, 0x53, 0x4a, 0x73, 0x52, 0x8b, 0x11, 0x91, 0x00, 0xf2, - 0x59, 0x71, 0x12, 0x1b, 0x38, 0x68, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x17, 0xb4, - 0x41, 0xa5, 0x01, 0x00, 0x00, + 0x31, 0x44, 0x99, 0xa4, 0x67, 0x96, 0x80, 0x3c, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xf2, 0x68, 0x5e, + 0x6a, 0x89, 0x3e, 0x2c, 0xf0, 0xcb, 0x8c, 0xf4, 0x73, 0xf3, 0x53, 0x4a, 0x73, 0x52, 0x8b, 0x11, + 0xf1, 0x00, 0xf2, 0x5c, 0x71, 0x12, 0x1b, 0x38, 0x74, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x84, 0xb5, 0xea, 0xa9, 0xa8, 0x01, 0x00, 0x00, } func (m *Super) Marshal() (dAtA []byte, err error) { diff --git a/modules/guardian/types/msgs_test.go b/modules/guardian/types/msgs_test.go index 18e5c434f..21b329453 100644 --- a/modules/guardian/types/msgs_test.go +++ b/modules/guardian/types/msgs_test.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/address" + "github.com/irisnet/irishub/v2/address" ) // nolint: deadcode unused diff --git a/modules/guardian/types/query.pb.go b/modules/guardian/types/query.pb.go index 9779a3955..359bf891c 100644 --- a/modules/guardian/types/query.pb.go +++ b/modules/guardian/types/query.pb.go @@ -137,29 +137,30 @@ func init() { func init() { proto.RegisterFile("irishub/guardian/query.proto", fileDescriptor_49841d96de191552) } var fileDescriptor_49841d96de191552 = []byte{ - // 352 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xbf, 0x4e, 0x02, 0x31, - 0x1c, 0xc7, 0xaf, 0xa8, 0x0c, 0x65, 0x31, 0xd5, 0x44, 0x72, 0x21, 0x07, 0x21, 0xfe, 0x21, 0x0e, - 0x6d, 0xc0, 0xf8, 0x02, 0x0c, 0x3a, 0xb8, 0x28, 0x6e, 0xc6, 0xa5, 0x07, 0x4d, 0x6d, 0x02, 0xed, - 0x71, 0xed, 0x69, 0xd8, 0x8c, 0x4f, 0x60, 0x62, 0x7c, 0x27, 0x46, 0x12, 0x17, 0x27, 0x63, 0x38, - 0x1f, 0xc4, 0x5c, 0x7b, 0x08, 0x78, 0x03, 0x5b, 0xd3, 0xdf, 0xe7, 0xfb, 0xa7, 0xfd, 0xc1, 0x9a, - 0x88, 0x85, 0x7e, 0x48, 0x42, 0xc2, 0x13, 0x1a, 0x0f, 0x04, 0x95, 0x64, 0x9c, 0xb0, 0x78, 0x82, - 0xa3, 0x58, 0x19, 0x85, 0x76, 0xf3, 0x29, 0x5e, 0x4c, 0xfd, 0x7d, 0xae, 0xb8, 0xb2, 0x43, 0x92, - 0x9d, 0x1c, 0xe7, 0xd7, 0x0b, 0x2e, 0x8b, 0x43, 0x0e, 0xd4, 0xb8, 0x52, 0x7c, 0xc8, 0x08, 0x8d, - 0x04, 0xa1, 0x52, 0x2a, 0x43, 0x8d, 0x50, 0x52, 0xe7, 0xd3, 0xd3, 0xbe, 0xd2, 0x23, 0xa5, 0x49, - 0x48, 0x35, 0x73, 0xf9, 0xe4, 0xb1, 0x1d, 0x32, 0x43, 0xdb, 0x24, 0xa2, 0x5c, 0x48, 0x0b, 0x3b, - 0xb6, 0x79, 0x0f, 0xd1, 0x4d, 0x46, 0xdc, 0x26, 0x11, 0x8b, 0x75, 0x8f, 0x8d, 0x13, 0xa6, 0x0d, - 0xba, 0x80, 0x70, 0x49, 0x56, 0x41, 0x03, 0xb4, 0x2a, 0x9d, 0x63, 0xec, 0x6c, 0x71, 0x66, 0x8b, - 0xdd, 0xb3, 0x72, 0x5b, 0x7c, 0x4d, 0x39, 0xcb, 0xb5, 0xbd, 0x15, 0x65, 0xf3, 0x1d, 0xc0, 0xbd, - 0x35, 0x7b, 0x1d, 0x29, 0xa9, 0x19, 0x3a, 0x87, 0x65, 0x6d, 0x6f, 0xaa, 0xa0, 0xb1, 0xd5, 0xaa, - 0x74, 0x0e, 0xf0, 0xff, 0x9f, 0xc1, 0x56, 0xd1, 0xdd, 0x9e, 0x7e, 0xd5, 0xbd, 0x5e, 0x0e, 0xa3, - 0xcb, 0xb5, 0x5a, 0x25, 0x5b, 0xeb, 0x64, 0x63, 0x2d, 0x97, 0xb9, 0xda, 0xab, 0xf3, 0x0c, 0xe0, - 0x8e, 0xed, 0x85, 0x9e, 0x60, 0xd9, 0x75, 0x43, 0x87, 0xc5, 0x0e, 0xc5, 0x9f, 0xf1, 0x8f, 0x36, - 0x50, 0x2e, 0xac, 0xd9, 0x78, 0xf9, 0xf8, 0x79, 0x2b, 0xf9, 0xa8, 0x4a, 0x0a, 0xab, 0x74, 0x6f, - 0xe9, 0x5e, 0x4d, 0xe7, 0x01, 0x98, 0xcd, 0x03, 0xf0, 0x3d, 0x0f, 0xc0, 0x6b, 0x1a, 0x78, 0xb3, - 0x34, 0xf0, 0x3e, 0xd3, 0xc0, 0xbb, 0x6b, 0x73, 0x61, 0xb2, 0x80, 0xbe, 0x1a, 0x59, 0xb5, 0x64, - 0xe6, 0xcf, 0x65, 0xa4, 0x06, 0xc9, 0x90, 0xe9, 0xa5, 0x9b, 0x99, 0x44, 0x4c, 0x87, 0x65, 0xbb, - 0xcc, 0xb3, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x9d, 0x59, 0x80, 0x7f, 0x02, 0x00, 0x00, + // 356 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcb, 0x4e, 0x2a, 0x31, + 0x18, 0xc7, 0xa7, 0x9c, 0x73, 0x58, 0x94, 0xcd, 0x49, 0x35, 0x91, 0x4c, 0xc8, 0x40, 0x88, 0x17, + 0xe2, 0xa2, 0x0d, 0xa3, 0xbe, 0x00, 0x0b, 0xdd, 0x19, 0xc5, 0x9d, 0x71, 0xd3, 0x81, 0xa6, 0x36, + 0x81, 0x76, 0x98, 0x76, 0x30, 0xec, 0x8c, 0x4f, 0x60, 0x62, 0x7c, 0x27, 0x96, 0x24, 0x6e, 0x5c, + 0x19, 0x03, 0x3e, 0x88, 0x99, 0x76, 0x10, 0x70, 0x16, 0xec, 0x9a, 0x7e, 0xbf, 0xff, 0xa5, 0xfd, + 0x60, 0x4d, 0x24, 0x42, 0xdf, 0xa7, 0x11, 0xe1, 0x29, 0x4d, 0xfa, 0x82, 0x4a, 0x32, 0x4a, 0x59, + 0x32, 0xc1, 0x71, 0xa2, 0x8c, 0x42, 0xff, 0xf3, 0x29, 0x5e, 0x4e, 0xfd, 0x5d, 0xae, 0xb8, 0xb2, + 0x43, 0x92, 0x9d, 0x1c, 0xe7, 0xd7, 0x0b, 0x2e, 0xcb, 0x43, 0x0e, 0xd4, 0xb8, 0x52, 0x7c, 0xc0, + 0x08, 0x8d, 0x05, 0xa1, 0x52, 0x2a, 0x43, 0x8d, 0x50, 0x52, 0xe7, 0xd3, 0xe3, 0x9e, 0xd2, 0x43, + 0xa5, 0x49, 0x44, 0x35, 0x73, 0xf9, 0x64, 0xdc, 0x8e, 0x98, 0xa1, 0x6d, 0x12, 0x53, 0x2e, 0xa4, + 0x85, 0x1d, 0xdb, 0xbc, 0x83, 0xe8, 0x3a, 0x23, 0x6e, 0xd2, 0x98, 0x25, 0xba, 0xcb, 0x46, 0x29, + 0xd3, 0x06, 0x9d, 0x43, 0xb8, 0x22, 0xab, 0xa0, 0x01, 0x5a, 0x95, 0xf0, 0x10, 0x3b, 0x5b, 0x9c, + 0xd9, 0x62, 0xf7, 0xac, 0xdc, 0x16, 0x5f, 0x51, 0xce, 0x72, 0x6d, 0x77, 0x4d, 0xd9, 0x7c, 0x05, + 0x70, 0x67, 0xc3, 0x5e, 0xc7, 0x4a, 0x6a, 0x86, 0xce, 0x60, 0x59, 0xdb, 0x9b, 0x2a, 0x68, 0xfc, + 0x69, 0x55, 0xc2, 0x3d, 0xfc, 0xfb, 0x67, 0xb0, 0x55, 0x74, 0xfe, 0x4e, 0x3f, 0xea, 0x5e, 0x37, + 0x87, 0xd1, 0xc5, 0x46, 0xad, 0x92, 0xad, 0x75, 0xb4, 0xb5, 0x96, 0xcb, 0x5c, 0xef, 0x15, 0x3e, + 0x02, 0xf8, 0xcf, 0xf6, 0x42, 0x0f, 0xb0, 0xec, 0xba, 0xa1, 0xfd, 0x62, 0x87, 0xe2, 0xcf, 0xf8, + 0x07, 0x5b, 0x28, 0x17, 0xd6, 0x6c, 0x3c, 0xbd, 0x7d, 0xbd, 0x94, 0x7c, 0x54, 0x25, 0x85, 0x55, + 0xba, 0xb7, 0x74, 0x2e, 0xa7, 0xf3, 0x00, 0xcc, 0xe6, 0x01, 0xf8, 0x9c, 0x07, 0xe0, 0x79, 0x11, + 0x78, 0xb3, 0x45, 0xe0, 0xbd, 0x2f, 0x02, 0xef, 0xf6, 0x94, 0x0b, 0x93, 0x05, 0xf4, 0xd4, 0xd0, + 0xaa, 0x25, 0x33, 0x3f, 0x2e, 0xe3, 0x90, 0x0c, 0x55, 0x3f, 0x1d, 0x30, 0xbd, 0x32, 0x34, 0x93, + 0x98, 0xe9, 0xa8, 0x6c, 0xf7, 0x79, 0xf2, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x08, 0x1d, 0xed, + 0x82, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/guardian/types/tx.pb.go b/modules/guardian/types/tx.pb.go index 66d815497..6a109209a 100644 --- a/modules/guardian/types/tx.pb.go +++ b/modules/guardian/types/tx.pb.go @@ -225,26 +225,26 @@ func init() { func init() { proto.RegisterFile("irishub/guardian/tx.proto", fileDescriptor_02bb99d7e79743a5) } var fileDescriptor_02bb99d7e79743a5 = []byte{ - // 298 bytes of a gzipped FileDescriptorProto + // 301 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcd, 0x4a, 0x03, 0x31, 0x14, 0x85, 0x1b, 0x0b, 0xda, 0xde, 0x82, 0x48, 0x44, 0x99, 0x16, 0x1a, 0xca, 0x80, 0xd0, 0xd5, - 0x0c, 0xea, 0x13, 0x58, 0xdc, 0x88, 0x14, 0xa4, 0xae, 0x74, 0x23, 0xd3, 0xde, 0xcb, 0x18, 0x68, - 0x27, 0x43, 0x92, 0x01, 0xe7, 0x2d, 0x7c, 0x16, 0x9f, 0xc2, 0x65, 0x97, 0x2e, 0xa5, 0xf3, 0x22, - 0xd2, 0xb1, 0x29, 0x51, 0xfc, 0x59, 0xe6, 0x9e, 0x93, 0xef, 0xdc, 0xe4, 0x40, 0x57, 0x6a, 0x69, - 0x1e, 0x8b, 0x69, 0x9c, 0x16, 0x89, 0x46, 0x99, 0x64, 0xb1, 0x7d, 0x8a, 0x72, 0xad, 0xac, 0xe2, - 0x07, 0x1b, 0x29, 0x72, 0x52, 0x88, 0xd0, 0x19, 0x9b, 0xf4, 0x02, 0xf1, 0xb6, 0xc8, 0x49, 0xf3, - 0x01, 0x74, 0x90, 0xcc, 0x4c, 0xcb, 0xdc, 0x4a, 0x95, 0x05, 0x6c, 0xc0, 0x86, 0xed, 0x89, 0x3f, - 0xe2, 0x01, 0xec, 0x25, 0x88, 0x9a, 0x8c, 0x09, 0x76, 0x6a, 0xd5, 0x1d, 0x79, 0x17, 0x5a, 0x09, - 0x22, 0xe1, 0xc3, 0xb4, 0x0c, 0x9a, 0x5b, 0x89, 0x70, 0x54, 0x86, 0x47, 0x70, 0xe8, 0xa5, 0x4c, - 0xc8, 0xe4, 0x2a, 0x33, 0x14, 0x5e, 0xc1, 0xfe, 0xd8, 0xa4, 0x97, 0x34, 0x27, 0x4b, 0x9f, 0xf9, - 0xbf, 0xd3, 0xfb, 0x00, 0x58, 0x1b, 0x3d, 0x7e, 0x7b, 0x33, 0x19, 0x95, 0x61, 0x00, 0xc7, 0x5f, - 0x51, 0x2e, 0xe4, 0xec, 0x85, 0x41, 0x73, 0x6c, 0x52, 0x7e, 0x03, 0xad, 0xed, 0x33, 0xfb, 0xd1, - 0xf7, 0x8f, 0x88, 0xbc, 0xfd, 0x7a, 0x27, 0x7f, 0xca, 0x8e, 0xcc, 0xef, 0xa0, 0xe3, 0xef, 0x3e, - 0xf8, 0xf1, 0x96, 0xe7, 0xe8, 0x0d, 0xff, 0x73, 0x38, 0xf4, 0xe8, 0xfa, 0x75, 0x25, 0xd8, 0x72, - 0x25, 0xd8, 0xfb, 0x4a, 0xb0, 0xe7, 0x4a, 0x34, 0x96, 0x95, 0x68, 0xbc, 0x55, 0xa2, 0x71, 0x7f, - 0x9a, 0x4a, 0xbb, 0x26, 0xcc, 0xd4, 0x22, 0x5e, 0xd3, 0x32, 0xb2, 0xb1, 0x2b, 0x7c, 0xa1, 0xb0, - 0x98, 0x93, 0xf1, 0x8a, 0x2f, 0x73, 0x32, 0xd3, 0xdd, 0xba, 0xfc, 0xf3, 0x8f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xe7, 0x88, 0xdd, 0xcd, 0x19, 0x02, 0x00, 0x00, + 0x0c, 0x54, 0x5f, 0xc0, 0xe2, 0xc6, 0x45, 0x45, 0xea, 0x4a, 0x37, 0x32, 0xed, 0xbd, 0x8c, 0x81, + 0x76, 0x32, 0x24, 0x19, 0x71, 0xde, 0xc2, 0x67, 0xf1, 0x29, 0x5c, 0x76, 0xe9, 0x52, 0xda, 0x17, + 0x91, 0x8e, 0x4d, 0x89, 0xe2, 0xcf, 0x32, 0xf7, 0x9c, 0x7c, 0xe7, 0x26, 0x07, 0xda, 0x52, 0x4b, + 0xf3, 0x50, 0x4c, 0xe2, 0xb4, 0x48, 0x34, 0xca, 0x24, 0x8b, 0xed, 0x53, 0x94, 0x6b, 0x65, 0x15, + 0x3f, 0xd8, 0x48, 0x91, 0x93, 0x42, 0x84, 0xd6, 0xc8, 0xa4, 0xe7, 0x88, 0x37, 0x45, 0x4e, 0x9a, + 0xf7, 0xa0, 0x85, 0x64, 0xa6, 0x5a, 0xe6, 0x56, 0xaa, 0x2c, 0x60, 0x3d, 0xd6, 0x6f, 0x8e, 0xfd, + 0x11, 0x0f, 0x60, 0x2f, 0x41, 0xd4, 0x64, 0x4c, 0xb0, 0x53, 0xa9, 0xee, 0xc8, 0xdb, 0xd0, 0x48, + 0x10, 0x09, 0xef, 0x27, 0x65, 0x50, 0xdf, 0x4a, 0x84, 0xc3, 0x32, 0x3c, 0x82, 0x43, 0x2f, 0x65, + 0x4c, 0x26, 0x57, 0x99, 0xa1, 0xf0, 0x12, 0xf6, 0x47, 0x26, 0xbd, 0xa0, 0x19, 0x59, 0xfa, 0xcc, + 0xff, 0x9d, 0xde, 0x05, 0xc0, 0xca, 0xe8, 0xf1, 0x9b, 0x9b, 0xc9, 0xb0, 0x0c, 0x03, 0x38, 0xfe, + 0x8a, 0x72, 0x21, 0x83, 0x17, 0x06, 0xf5, 0x91, 0x49, 0xf9, 0x35, 0x34, 0xb6, 0xcf, 0xec, 0x46, + 0xdf, 0x3f, 0x22, 0xf2, 0xf6, 0xeb, 0x9c, 0xfc, 0x29, 0x3b, 0x32, 0xbf, 0x85, 0x96, 0xbf, 0x7b, + 0xef, 0xc7, 0x5b, 0x9e, 0xa3, 0xd3, 0xff, 0xcf, 0xe1, 0xd0, 0xc3, 0xab, 0xd7, 0xa5, 0x60, 0x8b, + 0xa5, 0x60, 0xef, 0x4b, 0xc1, 0x9e, 0x57, 0xa2, 0xb6, 0x58, 0x89, 0xda, 0xdb, 0x4a, 0xd4, 0xee, + 0xce, 0x52, 0x69, 0xd7, 0x84, 0xa9, 0x9a, 0xc7, 0x6b, 0x5a, 0x46, 0x36, 0x76, 0x85, 0x3f, 0x0e, + 0xe2, 0xb9, 0xc2, 0x62, 0x46, 0xc6, 0xeb, 0xbe, 0xcc, 0xc9, 0x4c, 0x76, 0xab, 0xfe, 0x4f, 0x3f, + 0x02, 0x00, 0x00, 0xff, 0xff, 0x91, 0xd4, 0xe1, 0x07, 0x1c, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/internft/interface.go b/modules/internft/interface.go new file mode 100644 index 000000000..431f9f383 --- /dev/null +++ b/modules/internft/interface.go @@ -0,0 +1,49 @@ +package internft + +import ( + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + + nftkeeper "github.com/cosmos/cosmos-sdk/x/nft/keeper" + nfttypes "github.com/irisnet/irismod/modules/nft/types" +) + +type ( + // AccountKeeper defines the contract required for account APIs. + AccountKeeper interface { + NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI + // Set an account in the store. + SetAccount(sdk.Context, authtypes.AccountI) + GetModuleAddress(name string) sdk.AccAddress + } + // InterNftKeeper defines the ICS721 Keeper + InterNftKeeper struct { + nk nftkeeper.Keeper + cdc codec.Codec + ak AccountKeeper + cb nfttypes.ClassBuilder + tb nfttypes.TokenBuilder + } + + InterClass struct { + ID string + URI string + Data string + } + + InterToken struct { + ClassID string + ID string + URI string + Data string + } +) + +func (d InterClass) GetID() string { return d.ID } +func (d InterClass) GetURI() string { return d.URI } +func (d InterClass) GetData() string { return d.Data } +func (t InterToken) GetClassID() string { return t.ClassID } +func (t InterToken) GetID() string { return t.ID } +func (t InterToken) GetURI() string { return t.URI } +func (t InterToken) GetData() string { return t.Data } diff --git a/modules/internft/keeper.go b/modules/internft/keeper.go new file mode 100644 index 000000000..175f7dd56 --- /dev/null +++ b/modules/internft/keeper.go @@ -0,0 +1,164 @@ +package internft + +import ( + "github.com/cometbft/cometbft/libs/log" + + "github.com/cosmos/cosmos-sdk/codec" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/nft" + + nfttransfer "github.com/bianjieai/nft-transfer/types" + + irismodnftkeeper "github.com/irisnet/irismod/modules/nft/keeper" + "github.com/irisnet/irismod/modules/nft/types" +) + +// NewInterNftKeeper creates a new ics721 Keeper instance +func NewInterNftKeeper(cdc codec.Codec, + k irismodnftkeeper.Keeper, + ak AccountKeeper, +) InterNftKeeper { + return InterNftKeeper{ + nk: k.NFTkeeper(), + cdc: cdc, + ak: ak, + cb: types.NewClassBuilder(cdc, ak.GetModuleAddress), + tb: types.NewTokenBuilder(cdc), + } +} + +// CreateOrUpdateClass implement the method of ICS721Keeper.CreateOrUpdateClass +func (ik InterNftKeeper) CreateOrUpdateClass(ctx sdk.Context, + classID, + classURI, + classData string, +) error { + var ( + class nft.Class + err error + ) + if len(classData) != 0 { + class, err = ik.cb.Build(classID, classURI, classData) + if err != nil { + return err + } + } else { + var denomMetadata = &types.DenomMetadata{ + Creator: ik.ak.GetModuleAddress(types.ModuleName).String(), + MintRestricted: true, + UpdateRestricted: true, + } + + metadata, err := codectypes.NewAnyWithValue(denomMetadata) + if err != nil { + return err + } + class = nft.Class{ + Id: classID, + Uri: classURI, + Data: metadata, + } + } + + if ik.nk.HasClass(ctx, classID) { + return ik.nk.UpdateClass(ctx, class) + } + return ik.nk.SaveClass(ctx, class) +} + +// Mint implement the method of ICS721Keeper.Mint +func (ik InterNftKeeper) Mint(ctx sdk.Context, + classID, + tokenID, + tokenURI, + tokenData string, + receiver sdk.AccAddress, +) error { + token, err := ik.tb.Build(classID, tokenID, tokenURI, tokenData) + if err != nil { + return err + } + return ik.nk.Mint(ctx, token, receiver) +} + +// Transfer implement the method of ICS721Keeper.Transfer +func (ik InterNftKeeper) Transfer( + ctx sdk.Context, + classID, + tokenID, + tokenData string, + receiver sdk.AccAddress, +) error { + if err := ik.nk.Transfer(ctx, classID, tokenID, receiver); err != nil { + return err + } + if len(tokenData) == 0 { + return nil + } + nft, _ := ik.nk.GetNFT(ctx, classID, tokenID) + token, err := ik.tb.Build(classID, tokenID, nft.Uri, tokenData) + if err != nil { + return err + } + + return ik.nk.Update(ctx, token) +} + +// GetClass implement the method of ICS721Keeper.GetClass +func (ik InterNftKeeper) GetClass(ctx sdk.Context, classID string) (nfttransfer.Class, bool) { + class, exist := ik.nk.GetClass(ctx, classID) + if !exist { + return nil, false + } + + metadata, err := ik.cb.BuildMetadata(class) + if err != nil { + ik.Logger(ctx).Error("encode class data failed") + return nil, false + } + return InterClass{ + ID: classID, + URI: class.Uri, + Data: metadata, + }, true +} + +// GetNFT implement the method of ICS721Keeper.GetNFT +func (ik InterNftKeeper) GetNFT(ctx sdk.Context, classID, tokenID string) (nfttransfer.NFT, bool) { + nft, has := ik.nk.GetNFT(ctx, classID, tokenID) + if !has { + return nil, false + } + metadata, err := ik.tb.BuildMetadata(nft) + if err != nil { + ik.Logger(ctx).Error("encode nft data failed") + return nil, false + } + return InterToken{ + ClassID: classID, + ID: tokenID, + URI: nft.Uri, + Data: metadata, + }, true +} + +// Burn implement the method of ICS721Keeper.Burn +func (ik InterNftKeeper) Burn(ctx sdk.Context, classID string, tokenID string) error { + return ik.nk.Burn(ctx, classID, tokenID) +} + +// GetOwner implement the method of ICS721Keeper.GetOwner +func (ik InterNftKeeper) GetOwner(ctx sdk.Context, classID string, tokenID string) sdk.AccAddress { + return ik.nk.GetOwner(ctx, classID, tokenID) +} + +// HasClass implement the method of ICS721Keeper.HasClass +func (ik InterNftKeeper) HasClass(ctx sdk.Context, classID string) bool { + return ik.nk.HasClass(ctx, classID) +} + +// Logger returns a module-specific logger. +func (ik InterNftKeeper) Logger(ctx sdk.Context) log.Logger { + return ctx.Logger().With("module", "ics721/NFTKeeper") +} diff --git a/modules/mint/abci.go b/modules/mint/abci.go index b932ab493..839ba4e6f 100644 --- a/modules/mint/abci.go +++ b/modules/mint/abci.go @@ -3,8 +3,8 @@ package mint import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/mint/keeper" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/keeper" + "github.com/irisnet/irishub/v2/modules/mint/types" ) // BeginBlocker handles block beginning logic for mint diff --git a/modules/mint/abci_test.go b/modules/mint/abci_test.go index 18f41db75..2ff04ee55 100644 --- a/modules/mint/abci_test.go +++ b/modules/mint/abci_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/irisnet/irishub/modules/mint" - "github.com/irisnet/irishub/modules/mint/types" - "github.com/irisnet/irishub/simapp" + "github.com/irisnet/irishub/v2/modules/mint" + "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v2/simapp" ) func TestBeginBlocker(t *testing.T) { diff --git a/modules/mint/client/cli/cli_test.go b/modules/mint/client/cli/cli_test.go index 5f8d38166..239bcd6bb 100644 --- a/modules/mint/client/cli/cli_test.go +++ b/modules/mint/client/cli/cli_test.go @@ -7,9 +7,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - minttestutil "github.com/irisnet/irishub/modules/mint/client/testutil" - minttypes "github.com/irisnet/irishub/modules/mint/types" - "github.com/irisnet/irishub/simapp" + minttestutil "github.com/irisnet/irishub/v2/modules/mint/client/testutil" + minttypes "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v2/simapp" ) type IntegrationTestSuite struct { diff --git a/modules/mint/client/cli/query.go b/modules/mint/client/cli/query.go index 2de167991..89514459f 100644 --- a/modules/mint/client/cli/query.go +++ b/modules/mint/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) // GetQueryCmd returns the cli query commands for the mint module. diff --git a/modules/mint/client/rest/grpc_query_test.go b/modules/mint/client/rest/grpc_query_test.go index 56176555f..b5621392f 100644 --- a/modules/mint/client/rest/grpc_query_test.go +++ b/modules/mint/client/rest/grpc_query_test.go @@ -10,8 +10,8 @@ package rest_test // "github.com/cosmos/cosmos-sdk/testutil/network" // "github.com/cosmos/cosmos-sdk/types/rest" -// minttypes "github.com/irisnet/irishub/modules/mint/types" -// "github.com/irisnet/irishub/simapp" +// minttypes "github.com/irisnet/irishub/v2/modules/mint/types" +// "github.com/irisnet/irishub/v2/simapp" // ) // type IntegrationTestSuite struct { diff --git a/modules/mint/client/testutil/test_helpers.go b/modules/mint/client/testutil/test_helpers.go index b9a9ff2b8..bc4a9abe2 100644 --- a/modules/mint/client/testutil/test_helpers.go +++ b/modules/mint/client/testutil/test_helpers.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" - mintcli "github.com/irisnet/irishub/modules/mint/client/cli" + mintcli "github.com/irisnet/irishub/v2/modules/mint/client/cli" ) func QueryParamsExec(clientCtx client.Context, extraArgs ...string) (testutil.BufferWriter, error) { diff --git a/modules/mint/genesis.go b/modules/mint/genesis.go index d71adb471..c70888200 100644 --- a/modules/mint/genesis.go +++ b/modules/mint/genesis.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/irisnet/irishub/modules/mint/keeper" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/keeper" + "github.com/irisnet/irishub/v2/modules/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/modules/mint/keeper/grpc_query.go b/modules/mint/keeper/grpc_query.go index 7ea9c3545..e7aed2146 100644 --- a/modules/mint/keeper/grpc_query.go +++ b/modules/mint/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) var _ types.QueryServer = Keeper{} diff --git a/modules/mint/keeper/grpc_query_test.go b/modules/mint/keeper/grpc_query_test.go index a40f0c732..1326c297c 100644 --- a/modules/mint/keeper/grpc_query_test.go +++ b/modules/mint/keeper/grpc_query_test.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) func (suite *KeeperTestSuite) TestGRPCQueryPoolParameters() { diff --git a/modules/mint/keeper/keeper.go b/modules/mint/keeper/keeper.go index f58aa5f8b..db1f5eea9 100644 --- a/modules/mint/keeper/keeper.go +++ b/modules/mint/keeper/keeper.go @@ -9,7 +9,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) // keeper of the mint store diff --git a/modules/mint/keeper/keeper_test.go b/modules/mint/keeper/keeper_test.go index cbf453f78..24ac75758 100644 --- a/modules/mint/keeper/keeper_test.go +++ b/modules/mint/keeper/keeper_test.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/mint/types" - "github.com/irisnet/irishub/simapp" + "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v2/simapp" ) type KeeperTestSuite struct { diff --git a/modules/mint/keeper/migrations.go b/modules/mint/keeper/migrations.go index 626302e56..e2d8d8712 100644 --- a/modules/mint/keeper/migrations.go +++ b/modules/mint/keeper/migrations.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/irisnet/irishub/modules/mint/migrations/v2" + v2 "github.com/irisnet/irishub/v2/modules/mint/migrations/v2" "github.com/irisnet/irismod/types/exported" ) diff --git a/modules/mint/keeper/msg_server.go b/modules/mint/keeper/msg_server.go index ce6a7bdce..9f10fe9db 100644 --- a/modules/mint/keeper/msg_server.go +++ b/modules/mint/keeper/msg_server.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) type msgServer struct { diff --git a/modules/mint/keeper/params.go b/modules/mint/keeper/params.go index 5fc4842e7..3189fe837 100644 --- a/modules/mint/keeper/params.go +++ b/modules/mint/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) // GetParams sets the mint module parameters. diff --git a/modules/mint/migrations/v2/migrate.go b/modules/mint/migrations/v2/migrate.go index 40edf99cf..32b29b3ca 100644 --- a/modules/mint/migrations/v2/migrate.go +++ b/modules/mint/migrations/v2/migrate.go @@ -5,7 +5,7 @@ import ( "github.com/irisnet/irismod/types/exported" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) // MintKeeper defines a interface for SetParams function diff --git a/modules/mint/module.go b/modules/mint/module.go index 48261d768..6afd727ac 100644 --- a/modules/mint/module.go +++ b/modules/mint/module.go @@ -19,10 +19,10 @@ import ( "github.com/irisnet/irismod/types/exported" - "github.com/irisnet/irishub/modules/mint/client/cli" - "github.com/irisnet/irishub/modules/mint/keeper" - "github.com/irisnet/irishub/modules/mint/simulation" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/client/cli" + "github.com/irisnet/irishub/v2/modules/mint/keeper" + "github.com/irisnet/irishub/v2/modules/mint/simulation" + "github.com/irisnet/irishub/v2/modules/mint/types" ) // ConsensusVersion defines the current mint module consensus version. diff --git a/modules/mint/simulation/decoder.go b/modules/mint/simulation/decoder.go index c2d5917a6..554d03853 100644 --- a/modules/mint/simulation/decoder.go +++ b/modules/mint/simulation/decoder.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) // NewDecodeStore returns a function closure that unmarshals the KVPair's values diff --git a/modules/mint/simulation/decoder_test.go b/modules/mint/simulation/decoder_test.go index 780e7fd26..c74468b96 100644 --- a/modules/mint/simulation/decoder_test.go +++ b/modules/mint/simulation/decoder_test.go @@ -10,9 +10,9 @@ import ( sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/irisnet/irishub/modules/mint/simulation" - "github.com/irisnet/irishub/modules/mint/types" - "github.com/irisnet/irishub/simapp" + "github.com/irisnet/irishub/v2/modules/mint/simulation" + "github.com/irisnet/irishub/v2/modules/mint/types" + "github.com/irisnet/irishub/v2/simapp" ) func TestDecodeStore(t *testing.T) { diff --git a/modules/mint/simulation/genesis.go b/modules/mint/simulation/genesis.go index 9d5717d3f..2aa275887 100644 --- a/modules/mint/simulation/genesis.go +++ b/modules/mint/simulation/genesis.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/modules/mint/types" ) // Simulation parameter constants diff --git a/modules/mint/types/genesis.pb.go b/modules/mint/types/genesis.pb.go index 9e2995f1f..ba14bd079 100644 --- a/modules/mint/types/genesis.pb.go +++ b/modules/mint/types/genesis.pb.go @@ -83,7 +83,7 @@ func init() { func init() { proto.RegisterFile("irishub/mint/genesis.proto", fileDescriptor_79c69a4fab6b38a3) } var fileDescriptor_79c69a4fab6b38a3 = []byte{ - // 208 bytes of a gzipped FileDescriptorProto + // 212 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x2c, 0xca, 0x2c, 0xce, 0x28, 0x4d, 0xd2, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x81, 0xca, 0xe9, 0x81, 0xe4, 0xa4, 0xc4, 0x51, @@ -92,11 +92,12 @@ var fileDescriptor_79c69a4fab6b38a3 = []byte{ 0x62, 0x03, 0xe9, 0x49, 0x2d, 0x92, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x12, 0xd1, 0x43, 0x36, 0x5d, 0xcf, 0x17, 0x2c, 0xe7, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x43, 0x10, 0x54, 0x25, 0x48, 0x4f, 0x41, 0x62, 0x51, 0x62, 0x6e, 0xb1, 0x04, 0x13, 0x36, 0x3d, 0x01, 0x60, 0x39, 0x98, 0x1e, 0x88, - 0x4a, 0x27, 0xf7, 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, 0xd2, 0x4d, 0xcf, - 0x2c, 0x01, 0xe9, 0x4d, 0xce, 0xcf, 0xd5, 0x07, 0x99, 0x93, 0x97, 0x5a, 0xa2, 0x0f, 0xf7, 0x53, - 0x7e, 0x4a, 0x69, 0x4e, 0x6a, 0x31, 0xc4, 0x6f, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, - 0x7f, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x96, 0xa5, 0x48, 0x3e, 0x22, 0x01, 0x00, 0x00, + 0x4a, 0x27, 0xaf, 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, 0x48, 0xcf, + 0x2c, 0x01, 0xe9, 0x4d, 0xce, 0xcf, 0xd5, 0x07, 0x99, 0x93, 0x97, 0x5a, 0xa2, 0x0f, 0xf3, 0x53, + 0x99, 0x91, 0x7e, 0x6e, 0x7e, 0x4a, 0x69, 0x4e, 0x6a, 0x31, 0xc4, 0x7b, 0x25, 0x95, 0x05, 0xa9, + 0xc5, 0x49, 0x6c, 0x60, 0xaf, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x9e, 0xc9, 0x3b, + 0x25, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/mint/types/mint.pb.go b/modules/mint/types/mint.pb.go index 0e7985e07..203a1e219 100644 --- a/modules/mint/types/mint.pb.go +++ b/modules/mint/types/mint.pb.go @@ -131,30 +131,30 @@ func init() { func init() { proto.RegisterFile("irishub/mint/mint.proto", fileDescriptor_06d871d90c4bc3c9) } var fileDescriptor_06d871d90c4bc3c9 = []byte{ - // 355 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xbd, 0x6a, 0xeb, 0x30, - 0x14, 0xc7, 0xad, 0xcb, 0x25, 0x60, 0xe5, 0xde, 0x0e, 0xa6, 0xa5, 0x21, 0x50, 0x3b, 0x78, 0x28, - 0x59, 0x62, 0x41, 0xbb, 0x65, 0x34, 0x81, 0x50, 0x68, 0xa1, 0x98, 0x76, 0x69, 0x87, 0x20, 0xc7, - 0x8a, 0x2b, 0x6a, 0x49, 0xc6, 0x92, 0x87, 0xd0, 0x97, 0xc8, 0xd8, 0xb1, 0x8f, 0x93, 0x31, 0x4b, - 0xa1, 0x74, 0x70, 0x4b, 0xf2, 0x06, 0x79, 0x82, 0x22, 0x39, 0x49, 0xd3, 0xb1, 0x8b, 0xa4, 0xf3, - 0x3f, 0xe7, 0xfc, 0x74, 0x3e, 0xe0, 0x31, 0x2d, 0xa8, 0x7c, 0x28, 0x63, 0xc4, 0x28, 0x57, 0xe6, - 0x08, 0xf2, 0x42, 0x28, 0xe1, 0xfc, 0xdb, 0x38, 0x02, 0xad, 0xb5, 0x0f, 0x53, 0x91, 0x0a, 0xe3, - 0x40, 0xfa, 0x55, 0xc7, 0xb4, 0xbd, 0x54, 0x88, 0x34, 0x23, 0xc8, 0x58, 0x71, 0x39, 0x41, 0x8a, - 0x32, 0x22, 0x15, 0x66, 0x79, 0x1d, 0xe0, 0xbf, 0x02, 0xd8, 0xb8, 0xa2, 0x5c, 0x91, 0xc2, 0xb9, - 0x87, 0xcd, 0x0c, 0x4b, 0x35, 0x2a, 0xf3, 0x04, 0x2b, 0xd2, 0x02, 0x1d, 0xd0, 0x6d, 0x9e, 0xb5, - 0x83, 0x9a, 0x10, 0x6c, 0x09, 0xc1, 0xcd, 0x96, 0x10, 0xba, 0xf3, 0xca, 0xb3, 0xd6, 0x95, 0xe7, - 0x4c, 0x31, 0xcb, 0xfa, 0xfe, 0x5e, 0xb2, 0x3f, 0xfb, 0xf0, 0x40, 0x04, 0xb5, 0x72, 0x6b, 0x04, - 0x87, 0xc3, 0x03, 0xca, 0x27, 0x19, 0x56, 0x54, 0xf0, 0x51, 0x8c, 0x25, 0x69, 0xfd, 0xe9, 0x80, - 0xae, 0x1d, 0x0e, 0x35, 0xe3, 0xbd, 0xf2, 0x4e, 0x53, 0xaa, 0x74, 0x2f, 0x63, 0xc1, 0xd0, 0x58, - 0x48, 0x26, 0xe4, 0xe6, 0xea, 0xc9, 0xe4, 0x11, 0xa9, 0x69, 0x4e, 0x64, 0x70, 0xc1, 0xd5, 0xba, - 0xf2, 0x8e, 0xea, 0xdf, 0x7e, 0xd2, 0xfc, 0xe8, 0xff, 0x4e, 0x08, 0xb5, 0xfd, 0x04, 0x1b, 0xd7, - 0xb8, 0xc0, 0x4c, 0x3a, 0x27, 0x10, 0xea, 0x01, 0x8d, 0x12, 0xc2, 0x05, 0x33, 0x5d, 0xd9, 0x91, - 0xad, 0x95, 0x81, 0x16, 0x9c, 0x4b, 0x68, 0xef, 0x32, 0x37, 0x35, 0x05, 0xbf, 0xa8, 0x69, 0x40, - 0xc6, 0xd1, 0x37, 0xa0, 0xff, 0xf7, 0xf9, 0xc5, 0xb3, 0xc2, 0xe1, 0x7c, 0xe9, 0x82, 0xc5, 0xd2, - 0x05, 0x9f, 0x4b, 0x17, 0xcc, 0x56, 0xae, 0xb5, 0x58, 0xb9, 0xd6, 0xdb, 0xca, 0xb5, 0xee, 0x7a, - 0x7b, 0x48, 0xbd, 0x3e, 0x4e, 0x14, 0xda, 0xed, 0x57, 0x24, 0x65, 0x46, 0x64, 0xbd, 0x67, 0x43, - 0x8f, 0x1b, 0x66, 0xea, 0xe7, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xe5, 0x9b, 0x14, 0x04, - 0x02, 0x00, 0x00, + // 356 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xbf, 0x4b, 0xc3, 0x40, + 0x14, 0xc7, 0x73, 0x22, 0x85, 0x5c, 0xd5, 0x21, 0x28, 0x96, 0x82, 0x49, 0xc9, 0x20, 0x5d, 0xcc, + 0x49, 0xdd, 0x3a, 0x86, 0x82, 0x28, 0x0a, 0x12, 0x74, 0xd1, 0xa1, 0x5c, 0x9a, 0x6b, 0x3c, 0xcc, + 0xdd, 0x85, 0xdc, 0x45, 0x28, 0xfe, 0x13, 0x1d, 0x1d, 0xfd, 0x73, 0x3a, 0x76, 0x11, 0xc4, 0x21, + 0x4a, 0xfb, 0x1f, 0xf4, 0x2f, 0x90, 0x4b, 0xda, 0x5a, 0x47, 0x97, 0xe4, 0xde, 0xf7, 0xbd, 0xf7, + 0x79, 0xbf, 0xe0, 0x21, 0xcd, 0xa8, 0x7c, 0xcc, 0x43, 0xc4, 0x28, 0x57, 0xe5, 0xc7, 0x4b, 0x33, + 0xa1, 0x84, 0xb5, 0xb3, 0x74, 0x78, 0x5a, 0x6b, 0xee, 0xc7, 0x22, 0x16, 0xa5, 0x03, 0xe9, 0x57, + 0x15, 0xd3, 0x74, 0x62, 0x21, 0xe2, 0x84, 0xa0, 0xd2, 0x0a, 0xf3, 0x21, 0x52, 0x94, 0x11, 0xa9, + 0x30, 0x4b, 0xab, 0x00, 0xf7, 0x1d, 0xc0, 0xda, 0x35, 0xe5, 0x8a, 0x64, 0xd6, 0x03, 0xac, 0x27, + 0x58, 0xaa, 0x7e, 0x9e, 0x46, 0x58, 0x91, 0x06, 0x68, 0x81, 0x76, 0xbd, 0xd3, 0xf4, 0x2a, 0x82, + 0xb7, 0x22, 0x78, 0xb7, 0x2b, 0x82, 0x6f, 0x4f, 0x0a, 0xc7, 0x58, 0x14, 0x8e, 0x35, 0xc2, 0x2c, + 0xe9, 0xba, 0x1b, 0xc9, 0xee, 0xf8, 0xcb, 0x01, 0x01, 0xd4, 0xca, 0x5d, 0x29, 0x58, 0x1c, 0xee, + 0x51, 0x3e, 0x4c, 0xb0, 0xa2, 0x82, 0xf7, 0x43, 0x2c, 0x49, 0x63, 0xab, 0x05, 0xda, 0xa6, 0x7f, + 0xae, 0x19, 0x9f, 0x85, 0x73, 0x1c, 0x53, 0xa5, 0x67, 0x19, 0x08, 0x86, 0x06, 0x42, 0x32, 0x21, + 0x97, 0xbf, 0x13, 0x19, 0x3d, 0x21, 0x35, 0x4a, 0x89, 0xf4, 0x2e, 0xb8, 0x5a, 0x14, 0xce, 0x41, + 0x55, 0xed, 0x2f, 0xcd, 0x0d, 0x76, 0xd7, 0x82, 0xaf, 0xed, 0x17, 0x58, 0xbb, 0xc1, 0x19, 0x66, + 0xd2, 0x3a, 0x82, 0x50, 0x2f, 0xa8, 0x1f, 0x11, 0x2e, 0x58, 0x39, 0x95, 0x19, 0x98, 0x5a, 0xe9, + 0x69, 0xc1, 0xba, 0x82, 0xe6, 0x3a, 0x73, 0xd9, 0x93, 0xf7, 0x8f, 0x9e, 0x7a, 0x64, 0x10, 0xfc, + 0x02, 0xba, 0xdb, 0xaf, 0x6f, 0x8e, 0xe1, 0x5f, 0x4e, 0x66, 0x36, 0x98, 0xce, 0x6c, 0xf0, 0x3d, + 0xb3, 0xc1, 0x78, 0x6e, 0x1b, 0xd3, 0xb9, 0x6d, 0x7c, 0xcc, 0x6d, 0xe3, 0xfe, 0x74, 0x03, 0xa9, + 0xcf, 0xc7, 0x89, 0x42, 0xab, 0xfb, 0x3e, 0x77, 0x10, 0x13, 0x51, 0x9e, 0x10, 0x59, 0x9d, 0xba, + 0x2c, 0x10, 0xd6, 0xca, 0xc5, 0x9f, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0xab, 0x43, 0x61, 0x1d, + 0x07, 0x02, 0x00, 0x00, } func (m *Minter) Marshal() (dAtA []byte, err error) { diff --git a/modules/mint/types/query.pb.go b/modules/mint/types/query.pb.go index f90bd191f..86799256c 100644 --- a/modules/mint/types/query.pb.go +++ b/modules/mint/types/query.pb.go @@ -128,28 +128,28 @@ func init() { func init() { proto.RegisterFile("irishub/mint/query.proto", fileDescriptor_f3acdec2e023e167) } var fileDescriptor_f3acdec2e023e167 = []byte{ - // 326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x31, 0x4b, 0x03, 0x31, - 0x14, 0xc7, 0xef, 0xaa, 0x76, 0x88, 0x4e, 0xf1, 0xd0, 0x52, 0xca, 0x59, 0xbb, 0x28, 0x82, 0x09, - 0xad, 0x93, 0x6b, 0x17, 0xd7, 0xda, 0xd1, 0x2d, 0x57, 0x43, 0x0c, 0xf6, 0xf2, 0xd2, 0x4b, 0x4e, - 0xe8, 0x2a, 0x7e, 0x00, 0xc1, 0x2f, 0xd5, 0xb1, 0xe0, 0xe2, 0x24, 0xd2, 0xf3, 0x83, 0x48, 0x92, - 0x13, 0x3d, 0x04, 0x97, 0x10, 0xde, 0xfb, 0xff, 0x7f, 0xef, 0xfd, 0x1f, 0xea, 0xc8, 0x42, 0x9a, - 0xbb, 0x32, 0xa3, 0xb9, 0x54, 0x96, 0x2e, 0x4a, 0x5e, 0x2c, 0x89, 0x2e, 0xc0, 0x02, 0xde, 0xab, - 0x3b, 0xc4, 0x75, 0xba, 0x67, 0x33, 0x30, 0x39, 0x18, 0x9a, 0x31, 0xc3, 0x83, 0x8c, 0x3e, 0x0c, - 0x33, 0x6e, 0xd9, 0x90, 0x6a, 0x26, 0xa4, 0x62, 0x56, 0x82, 0x0a, 0xce, 0xee, 0x61, 0x83, 0xe9, - 0x9e, 0xba, 0x91, 0x08, 0x10, 0xe0, 0xbf, 0xd4, 0xfd, 0xea, 0x6a, 0x4f, 0x00, 0x88, 0x39, 0xa7, - 0x4c, 0x4b, 0xca, 0x94, 0x02, 0xeb, 0x59, 0x26, 0x74, 0x07, 0x09, 0xc2, 0xd7, 0x6e, 0xdc, 0x84, - 0x15, 0x2c, 0x37, 0x53, 0xbe, 0x28, 0xb9, 0xb1, 0x83, 0xa7, 0x18, 0xed, 0x37, 0xca, 0x46, 0x83, - 0x32, 0x1c, 0x8f, 0x50, 0x5b, 0xfb, 0x4a, 0x27, 0xee, 0xc7, 0xa7, 0xbb, 0xa3, 0x84, 0xfc, 0x4e, - 0x41, 0x82, 0x7a, 0xbc, 0xbd, 0x7a, 0x3f, 0x8a, 0xa6, 0xb5, 0x12, 0x5f, 0xa2, 0xad, 0x82, 0x9b, - 0x4e, 0xcb, 0x1b, 0x4e, 0x48, 0x08, 0x4a, 0x5c, 0x50, 0x12, 0xee, 0x51, 0x07, 0x25, 0x13, 0x26, - 0xf8, 0xf7, 0xa4, 0xa9, 0xf3, 0x8c, 0x2c, 0xda, 0xf1, 0x5b, 0xe0, 0x7b, 0xd4, 0x0e, 0x6c, 0xdc, - 0x6f, 0x4e, 0xfc, 0xbb, 0x7b, 0xf7, 0xf8, 0x1f, 0x45, 0x80, 0x0f, 0x7a, 0x8f, 0xaf, 0x9f, 0x2f, - 0xad, 0x03, 0x9c, 0xd0, 0xc6, 0x29, 0xc3, 0xc2, 0xe3, 0xab, 0xd5, 0x26, 0x8d, 0xd7, 0x9b, 0x34, - 0xfe, 0xd8, 0xa4, 0xf1, 0x73, 0x95, 0x46, 0xeb, 0x2a, 0x8d, 0xde, 0xaa, 0x34, 0xba, 0x39, 0x17, - 0xd2, 0x3a, 0xf0, 0x0c, 0x72, 0xef, 0x54, 0xdc, 0xfe, 0x10, 0xe0, 0xb6, 0x9c, 0x73, 0x13, 0x48, - 0x76, 0xa9, 0xb9, 0xc9, 0xda, 0xfe, 0xc4, 0x17, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x70, - 0xc2, 0x08, 0x05, 0x02, 0x00, 0x00, + // 330 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xb1, 0x4e, 0xfb, 0x30, + 0x10, 0xc6, 0x93, 0xfe, 0xff, 0x74, 0x30, 0x4c, 0x26, 0x82, 0xaa, 0xaa, 0x42, 0xe9, 0x02, 0x62, + 0xb0, 0x69, 0x98, 0x58, 0x3b, 0x32, 0x95, 0x8e, 0x6c, 0x4e, 0xb1, 0x8c, 0x45, 0xe3, 0x73, 0x63, + 0xa7, 0x52, 0x57, 0xc4, 0x03, 0x20, 0xf1, 0x52, 0x1d, 0x2b, 0xb1, 0x30, 0x21, 0xd4, 0xf2, 0x20, + 0xc8, 0x76, 0x40, 0x44, 0x48, 0x2c, 0x96, 0x75, 0xf7, 0x7d, 0xbf, 0xbb, 0xef, 0x50, 0x47, 0x96, + 0xd2, 0xdc, 0x55, 0x39, 0x2d, 0xa4, 0xb2, 0x74, 0x5e, 0xf1, 0x72, 0x49, 0x74, 0x09, 0x16, 0xf0, + 0x5e, 0xdd, 0x21, 0xae, 0xd3, 0x3d, 0x9b, 0x82, 0x29, 0xc0, 0xd0, 0x9c, 0x19, 0x1e, 0x64, 0x74, + 0x31, 0xcc, 0xb9, 0x65, 0x43, 0xaa, 0x99, 0x90, 0x8a, 0x59, 0x09, 0x2a, 0x38, 0xbb, 0x87, 0x0d, + 0xa6, 0x7b, 0xea, 0x46, 0x22, 0x40, 0x80, 0xff, 0x52, 0xf7, 0xab, 0xab, 0x3d, 0x01, 0x20, 0x66, + 0x9c, 0x32, 0x2d, 0x29, 0x53, 0x0a, 0xac, 0x67, 0x99, 0xd0, 0x1d, 0x24, 0x08, 0x5f, 0xbb, 0x71, + 0x63, 0x56, 0xb2, 0xc2, 0x4c, 0xf8, 0xbc, 0xe2, 0xc6, 0x0e, 0x1e, 0x63, 0xb4, 0xdf, 0x28, 0x1b, + 0x0d, 0xca, 0x70, 0x9c, 0xa1, 0xb6, 0xf6, 0x95, 0x4e, 0xdc, 0x8f, 0x4f, 0x77, 0xb3, 0x84, 0xfc, + 0x4c, 0x41, 0x82, 0x7a, 0xf4, 0x7f, 0xf5, 0x76, 0x14, 0x4d, 0x6a, 0x25, 0xbe, 0x44, 0xff, 0x4a, + 0x6e, 0x3a, 0x2d, 0x6f, 0x38, 0x21, 0x21, 0x28, 0x71, 0x41, 0x49, 0xb8, 0x47, 0x1d, 0x94, 0x8c, + 0x99, 0xe0, 0x5f, 0x93, 0x26, 0xce, 0x93, 0x59, 0xb4, 0xe3, 0xb7, 0xc0, 0xf7, 0xa8, 0x1d, 0xd8, + 0xb8, 0xdf, 0x9c, 0xf8, 0x7b, 0xf7, 0xee, 0xf1, 0x1f, 0x8a, 0x00, 0x1f, 0xf4, 0x1e, 0x5e, 0x3e, + 0x9e, 0x5b, 0x07, 0x38, 0xa1, 0x8d, 0x53, 0x86, 0x85, 0x47, 0x57, 0xab, 0x4d, 0x1a, 0xaf, 0x37, + 0x69, 0xfc, 0xbe, 0x49, 0xe3, 0xa7, 0x6d, 0x1a, 0xad, 0xb7, 0x69, 0xf4, 0xba, 0x4d, 0xa3, 0x9b, + 0x73, 0x21, 0xad, 0x03, 0x4f, 0xa1, 0xf0, 0x4e, 0xc5, 0xed, 0x37, 0x61, 0x91, 0xd1, 0x02, 0x6e, + 0xab, 0x19, 0x37, 0x01, 0x66, 0x97, 0x9a, 0x9b, 0xbc, 0xed, 0xaf, 0x7c, 0xf1, 0x19, 0x00, 0x00, + 0xff, 0xff, 0xbe, 0x22, 0xb3, 0xbb, 0x08, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/mint/types/tx.pb.go b/modules/mint/types/tx.pb.go index e7a38f4dc..2589698cd 100644 --- a/modules/mint/types/tx.pb.go +++ b/modules/mint/types/tx.pb.go @@ -125,7 +125,7 @@ func init() { func init() { proto.RegisterFile("irishub/mint/tx.proto", fileDescriptor_6ccd37db551d9a32) } var fileDescriptor_6ccd37db551d9a32 = []byte{ - // 334 bytes of a gzipped FileDescriptorProto + // 338 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0x2c, 0xca, 0x2c, 0xce, 0x28, 0x4d, 0xd2, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x81, 0x0a, 0xeb, 0x81, 0x84, 0xa5, 0xc4, 0x51, 0x14, 0x81, 0x08, 0x88, 0x32, @@ -141,12 +141,13 @@ var fileDescriptor_6ccd37db551d9a32 = []byte{ 0xc4, 0x74, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0x2a, 0xad, 0xf8, 0x9a, 0x9e, 0x6f, 0xd0, 0x42, 0x98, 0xa1, 0x24, 0xc9, 0x25, 0x8e, 0xe6, 0x9c, 0xa0, 0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0xa3, 0x68, 0x2e, 0x66, 0xdf, 0xe2, 0x74, 0xa1, 0x10, 0x2e, 0x1e, 0x14, 0xd7, 0xca, - 0xa2, 0xda, 0x82, 0xa6, 0x5b, 0x4a, 0x15, 0xaf, 0x34, 0xcc, 0x70, 0x27, 0xef, 0x13, 0x0f, 0xe5, + 0xa2, 0xda, 0x82, 0xa6, 0x5b, 0x4a, 0x15, 0xaf, 0x34, 0xcc, 0x70, 0x27, 0xbf, 0x13, 0x0f, 0xe5, 0x18, 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, 0x4a, 0x37, 0x3d, 0xb3, 0x04, - 0x64, 0x44, 0x72, 0x7e, 0xae, 0x3e, 0xc8, 0xb8, 0xbc, 0xd4, 0x12, 0x7d, 0x78, 0xdc, 0xe5, 0xa7, - 0x94, 0xe6, 0xa4, 0x16, 0x43, 0x23, 0xba, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xb6, 0xc6, - 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x2f, 0x90, 0x3d, 0x05, 0x02, 0x00, 0x00, + 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x20, 0x3d, 0xb3, 0x04, + 0x64, 0x44, 0x72, 0x7e, 0xae, 0x3e, 0xc8, 0xb8, 0xbc, 0xd4, 0x12, 0x7d, 0x58, 0xdc, 0x95, 0x19, + 0xe9, 0xe7, 0xe6, 0xa7, 0x94, 0xe6, 0xa4, 0x16, 0x43, 0xe3, 0xba, 0xb2, 0x20, 0xb5, 0x38, 0x89, + 0x0d, 0x1c, 0xbc, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x8e, 0xd1, 0x64, 0x08, 0x02, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/buf.gen.pulsar.yaml b/proto/buf.gen.pulsar.yaml index ae4fcb5d6..fcb167981 100644 --- a/proto/buf.gen.pulsar.yaml +++ b/proto/buf.gen.pulsar.yaml @@ -8,7 +8,7 @@ managed: - buf.build/cosmos/gogo-proto - buf.build/cosmos/cosmos-proto override: - buf.build/irisnet/irishub: github.com/irisnet/irishub/api + buf.build/irisnet/irishub: github.com/irisnet/irishub/v2/api plugins: - name: go-pulsar out: ../api diff --git a/proto/irishub/guardian/genesis.proto b/proto/irishub/guardian/genesis.proto index 0b15915a2..04ea6b97c 100644 --- a/proto/irishub/guardian/genesis.proto +++ b/proto/irishub/guardian/genesis.proto @@ -4,7 +4,7 @@ package irishub.guardian; import "irishub/guardian/guardian.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/irisnet/irishub/modules/guardian/types"; +option go_package = "github.com/irisnet/irishub/v2/modules/guardian/types"; // GenesisState defines the guardian module's genesis state message GenesisState { diff --git a/proto/irishub/guardian/guardian.proto b/proto/irishub/guardian/guardian.proto index c6db871be..5c286e3b3 100644 --- a/proto/irishub/guardian/guardian.proto +++ b/proto/irishub/guardian/guardian.proto @@ -3,7 +3,7 @@ package irishub.guardian; import "gogoproto/gogo.proto"; -option go_package = "github.com/irisnet/irishub/modules/guardian/types"; +option go_package = "github.com/irisnet/irishub/v2/modules/guardian/types"; // Super defines the super standard message Super { diff --git a/proto/irishub/guardian/query.proto b/proto/irishub/guardian/query.proto index be1da4af0..464e9efb2 100644 --- a/proto/irishub/guardian/query.proto +++ b/proto/irishub/guardian/query.proto @@ -6,7 +6,7 @@ import "irishub/guardian/guardian.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -option go_package = "github.com/irisnet/irishub/modules/guardian/types"; +option go_package = "github.com/irisnet/irishub/v2/modules/guardian/types"; // Query creates service with guardian as RPC service Query { diff --git a/proto/irishub/guardian/tx.proto b/proto/irishub/guardian/tx.proto index 6c086d1cf..7f8c0892b 100644 --- a/proto/irishub/guardian/tx.proto +++ b/proto/irishub/guardian/tx.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package irishub.guardian; -option go_package = "github.com/irisnet/irishub/modules/guardian/types"; +option go_package = "github.com/irisnet/irishub/v2/modules/guardian/types"; // Msg defines the guardian Msg service service Msg { diff --git a/proto/irishub/mint/genesis.proto b/proto/irishub/mint/genesis.proto index 2064a6147..74271bc30 100644 --- a/proto/irishub/mint/genesis.proto +++ b/proto/irishub/mint/genesis.proto @@ -4,7 +4,7 @@ package irishub.mint; import "irishub/mint/mint.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/irisnet/irishub/modules/mint/types"; +option go_package = "github.com/irisnet/irishub/v2/modules/mint/types"; // GenesisState defines the mint module's genesis state message GenesisState { diff --git a/proto/irishub/mint/mint.proto b/proto/irishub/mint/mint.proto index bfd03d3a9..19ab82fc5 100644 --- a/proto/irishub/mint/mint.proto +++ b/proto/irishub/mint/mint.proto @@ -4,7 +4,7 @@ package irishub.mint; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/irisnet/irishub/modules/mint/types"; +option go_package = "github.com/irisnet/irishub/v2/modules/mint/types"; // Minter represents the minting state message Minter { diff --git a/proto/irishub/mint/query.proto b/proto/irishub/mint/query.proto index 0192961b7..a3daa2da7 100644 --- a/proto/irishub/mint/query.proto +++ b/proto/irishub/mint/query.proto @@ -6,7 +6,7 @@ import "irishub/mint/mint.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/irisnet/irishub/modules/mint/types"; +option go_package = "github.com/irisnet/irishub/v2/modules/mint/types"; // Query creates service with guardian as rpc service Query { diff --git a/proto/irishub/mint/tx.proto b/proto/irishub/mint/tx.proto index e026dcfe1..1095f0cfd 100644 --- a/proto/irishub/mint/tx.proto +++ b/proto/irishub/mint/tx.proto @@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/irisnet/irishub/modules/mint/types"; +option go_package = "github.com/irisnet/irishub/v2/modules/mint/types"; option (gogoproto.goproto_getters_all) = false; // Msg defines the coinswap Msg service diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 67c2897b8..df853ec79 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -19,5 +19,5 @@ done cd .. # move proto files to the right places -cp -r github.com/irisnet/irishub/* ./ +cp -r github.com/irisnet/irishub/v2/* ./ rm -rf github.com diff --git a/simapp/app.go b/simapp/app.go index 145675f2f..b7a337d19 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -70,14 +70,14 @@ import ( tokentypes "github.com/irisnet/irismod/modules/token/types" tokenv1 "github.com/irisnet/irismod/modules/token/types/v1" - "github.com/irisnet/irishub/address" - "github.com/irisnet/irishub/lite" - "github.com/irisnet/irishub/modules/guardian" - guardiankeeper "github.com/irisnet/irishub/modules/guardian/keeper" - guardiantypes "github.com/irisnet/irishub/modules/guardian/types" - "github.com/irisnet/irishub/modules/mint" - mintkeeper "github.com/irisnet/irishub/modules/mint/keeper" - minttypes "github.com/irisnet/irishub/modules/mint/types" + "github.com/irisnet/irishub/v2/address" + "github.com/irisnet/irishub/v2/lite" + "github.com/irisnet/irishub/v2/modules/guardian" + guardiankeeper "github.com/irisnet/irishub/v2/modules/guardian/keeper" + guardiantypes "github.com/irisnet/irishub/v2/modules/guardian/types" + "github.com/irisnet/irishub/v2/modules/mint" + mintkeeper "github.com/irisnet/irishub/v2/modules/mint/keeper" + minttypes "github.com/irisnet/irishub/v2/modules/mint/types" tibcmttransfer "github.com/bianjieai/tibc-go/modules/tibc/apps/mt_transfer" tibcnfttransfer "github.com/bianjieai/tibc-go/modules/tibc/apps/nft_transfer" diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index df94ca2ba..f6e648500 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -45,7 +45,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - minttypes "github.com/irisnet/irishub/modules/mint/types" + minttypes "github.com/irisnet/irishub/v2/modules/mint/types" ) func setup(withGenesis bool, invCheckPeriod uint) (*SimApp, GenesisState) { diff --git a/sims.mk b/sims.mk index 2e6f6f5c8..c141b1f85 100644 --- a/sims.mk +++ b/sims.mk @@ -4,7 +4,7 @@ ### Simulations BINDIR ?= $(GOPATH)/bin -SIMAPP = github.com/irisnet/irishub/app +SIMAPP = github.com/irisnet/irishub/v2/app test-sim-nondeterminism: @echo "Running non-determinism test..." diff --git a/types/runtime.go b/types/runtime.go index a133f7925..9365df13b 100644 --- a/types/runtime.go +++ b/types/runtime.go @@ -11,7 +11,7 @@ import ( etherminttypes "github.com/evmos/ethermint/types" - "github.com/irisnet/irishub/address" + "github.com/irisnet/irishub/v2/address" tokentypes "github.com/irisnet/irismod/modules/token/types" tokenv1 "github.com/irisnet/irismod/modules/token/types/v1" )