diff --git a/app/upgrade.go b/app/upgrade.go index d66eca870..d050e5bf0 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -40,6 +40,7 @@ func (app *IrisApp) appKeepers() upgrades.AppKeepers { GetKey: app.GetKey, ModuleManager: app.mm, TIBCkeeper: app.TIBCKeeper, + IBCKeeper: app.IBCKeeper, EvmKeeper: app.EvmKeeper, FeeMarketKeeper: app.FeeMarketKeeper, TokenKeeper: app.TokenKeeper, 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/v210/upgrades.go b/app/upgrades/v210/upgrades.go index a46c6d518..dca36c71b 100644 --- a/app/upgrades/v210/upgrades.go +++ b/app/upgrades/v210/upgrades.go @@ -9,6 +9,7 @@ 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" ibcnfttransfertypes "github.com/bianjieai/nft-transfer/types" @@ -40,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).