Upgrade IRISHub to v2.1

CHANGELOG.md

@@ -2,8 +2,26 @@
 
 ## [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
 
 ## 2.0.0
 

app/app.go

@@ -99,6 +99,10 @@ import (
 	tibcroutingtypes "github.com/bianjieai/tibc-go/modules/tibc/core/26-routing/types"
 	tibckeeper "github.com/bianjieai/tibc-go/modules/tibc/core/keeper"
 
+	nfttransfer "github.com/bianjieai/nft-transfer"
+	ibcnfttransferkeeper "github.com/bianjieai/nft-transfer/keeper"
+	ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types"
+
 	"github.com/evmos/ethermint/ethereum/eip712"
 	srvflags "github.com/evmos/ethermint/server/flags"
 	ethermint "github.com/evmos/ethermint/types"
@@ -113,6 +117,7 @@ import (
 	"github.com/irisnet/irishub/lite"
 	guardiankeeper "github.com/irisnet/irishub/modules/guardian/keeper"
 	guardiantypes "github.com/irisnet/irishub/modules/guardian/types"
+	"github.com/irisnet/irishub/modules/internft"
 	mintkeeper "github.com/irisnet/irishub/modules/mint/keeper"
 	minttypes "github.com/irisnet/irishub/modules/mint/types"
 	iristypes "github.com/irisnet/irishub/types"
@@ -156,8 +161,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 +199,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.
@@ -237,6 +244,7 @@ func NewIrisApp(
 		consensustypes.StoreKey,
 		evidencetypes.StoreKey,
 		ibctransfertypes.StoreKey,
+		ibcnfttransfertypes.StoreKey,
 		capabilitytypes.StoreKey,
 		guardiantypes.StoreKey,
 		tokentypes.StoreKey,
@@ -306,6 +314,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 +429,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 +477,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)
@@ -715,9 +740,32 @@ func (app *IrisApp) BeginBlocker(
 	ctx sdk.Context,
 	req abci.RequestBeginBlock,
 ) abci.ResponseBeginBlock {
+	// NOTE: if we can't get conParmas from x/consensus, we go for the default x/params
+	// WARNING: this line of code must be removed once the x/params is deprecated
+	ctx = app.getConsensusParams(ctx)
 	return app.mm.BeginBlock(ctx, req)
 }
 
+// getConsensusParams gets the consensus parameters from the x/consensus module or the x/params module
+// Note: some modules require consensus params from the sdk.Context.
+// By default, baseapp.BeginBlock accesses the consensus params from x/consensus
+// module before calling each module's BeginBlock. However, for the first time of
+// consensus params migration, it will only get an empty value until we finalize
+// the upgrade block. So we must access the consensus params from the legacy x/params
+// module instead for that case.
+func (app *IrisApp) getConsensusParams(ctx sdk.Context) sdk.Context {
+	consParams := ctx.ConsensusParams()
+	if consParams.Block == nil && consParams.Evidence == nil && consParams.Validator == nil {
+		baseAppLegacySS, ok := app.ParamsKeeper.GetSubspace(baseapp.Paramspace)
+		if !ok {
+			panic("cannot get param subspace")
+		}
+		consParams = baseapp.GetConsensusParams(ctx, baseAppLegacySS)
+		return ctx.WithConsensusParams(consParams)
+	}
+	return ctx
+}
+
 // EndBlocker application updates every end block
 func (app *IrisApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
 	return app.mm.EndBlock(ctx, req)
@@ -879,27 +927,28 @@ 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)
+	paramsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())
 
 	// 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
 }

app/modules.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"
@@ -74,6 +75,8 @@ import (
 	tibchost "github.com/bianjieai/tibc-go/modules/tibc/core/24-host"
 	tibccli "github.com/bianjieai/tibc-go/modules/tibc/core/client/cli"
 
+	nfttransfer "github.com/bianjieai/nft-transfer"
+
 	"github.com/evmos/ethermint/x/evm"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/evmos/ethermint/x/feemarket"
@@ -138,6 +141,7 @@ var (
 		tibcnfttransfer.AppModuleBasic{},
 		tibcmttransfer.AppModuleBasic{},
 		mt.AppModuleBasic{},
+		nfttransfer.AppModuleBasic{},
 
 		evm.AppModuleBasic{},
 		feemarket.AppModuleBasic{},
@@ -257,6 +261,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 +389,7 @@ func simulationModules(
 		),
 		ibc.NewAppModule(app.IBCKeeper),
 		app.transferModule,
+		app.ibcnfttransferModule,
 		guardian.NewAppModule(appCodec, app.GuardianKeeper),
 		token.NewAppModule(
 			appCodec,
@@ -488,6 +494,8 @@ func orderBeginBlockers() []string {
 		tibcnfttypes.ModuleName,
 		tibcmttypes.ModuleName,
 		guardiantypes.ModuleName,
+
+		ibcnfttransfertypes.ModuleName,
 	}
 }
 
@@ -538,6 +546,8 @@ func orderEndBlockers() []string {
 		tibcnfttypes.ModuleName,
 		tibcmttypes.ModuleName,
 		guardiantypes.ModuleName,
+
+		ibcnfttransfertypes.ModuleName,
 	}
 }
 
@@ -592,5 +602,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,
 	}
 }

app/upgrade.go

@@ -11,6 +11,7 @@ import (
 	v130 "github.com/irisnet/irishub/app/upgrades/v130"
 	v140 "github.com/irisnet/irishub/app/upgrades/v140"
 	v200 "github.com/irisnet/irishub/app/upgrades/v200"
+	v210 "github.com/irisnet/irishub/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,20 @@ 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,
+		EvmKeeper:             app.EvmKeeper,
+		FeeMarketKeeper:       app.FeeMarketKeeper,
+		TokenKeeper:           app.TokenKeeper,
+		ReaderWriter:          app,
+		ConsensusParamsKeeper: app.ConsensusParamsKeeper,
+		ParamsKeeper:          app.ParamsKeeper,
 	}
 }
 

app/upgrades/v210/upgrades.go

@@ -7,17 +7,18 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	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"
 
+	ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types"
+
 	"github.com/irisnet/irishub/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},
 	},
 }
 
@@ -40,8 +41,10 @@ func upgradeHandlerConstructor(
 
 		// Migrate Tendermint consensus parameters from x/params module to a
 		// dedicated x/consensus module.
-		baseAppLegacySS := app.ParamsKeeper.Subspace(baseapp.Paramspace).
-			WithKeyTable(paramstypes.ConsensusParamsKeyTable())
+		baseAppLegacySS, ok := app.ParamsKeeper.GetSubspace(baseapp.Paramspace)
+		if !ok {
+			panic("failed to get legacy param subspace")
+		}
 		baseapp.MigrateParams(ctx, baseAppLegacySS, &app.ConsensusParamsKeeper)
 		return app.ModuleManager.RunMigrations(ctx, c, fromVM)
 	}