From ba8200fa39a199f785103990bb73bea6fae79a32 Mon Sep 17 00:00:00 2001 From: Joel Smith Date: Mon, 14 Aug 2023 16:36:35 -0500 Subject: [PATCH] Remove References to Params Module --- app/app.go | 12 ------ app/keepers/keepers.go | 62 +------------------------- app/keepers/keys.go | 4 +- app/modules.go | 44 ++++++++----------- app/upgrades/v14/upgrades.go | 6 --- app/upgrades/v16/upgrades.go | 84 +----------------------------------- 6 files changed, 22 insertions(+), 190 deletions(-) diff --git a/app/app.go b/app/app.go index ee245ed8c..37be2ffed 100644 --- a/app/app.go +++ b/app/app.go @@ -58,8 +58,6 @@ import ( capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" "github.com/cosmos/cosmos-sdk/x/crisis" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - paramsclient "github.com/cosmos/cosmos-sdk/x/params/client" - paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" @@ -180,7 +178,6 @@ func GetWasmOpts(appOpts servertypes.AppOptions) []wasmkeeper.Option { func getGovProposalHandlers() []govclient.ProposalHandler { return []govclient.ProposalHandler{ - paramsclient.ProposalHandler, upgradeclient.LegacyProposalHandler, upgradeclient.LegacyCancelProposalHandler, ibcclientclient.UpdateClientProposalHandler, @@ -252,7 +249,6 @@ func New( appCodec: appCodec, txConfig: txConfig, interfaceRegistry: interfaceRegistry, - tkeys: sdk.NewTransientStoreKeys(paramstypes.TStoreKey), memKeys: sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey), } @@ -556,14 +552,6 @@ func (app *App) InterfaceRegistry() types.InterfaceRegistry { return app.interfaceRegistry } -// GetSubspace returns a param subspace for a given module name. -// -// NOTE: This is solely to be used for testing purposes. -func (app *App) GetSubspace(moduleName string) paramstypes.Subspace { - subspace, _ := app.AppKeepers.ParamsKeeper.GetSubspace(moduleName) - return subspace -} - // RegisterAPIRoutes registers all application module routes with the provided // API server. func (app *App) RegisterAPIRoutes(apiSvr *api.Server, _ config.APIConfig) { diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 3483df998..f5821c190 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -69,10 +69,6 @@ import ( govv1beta "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/nft" nftkeeper "github.com/cosmos/cosmos-sdk/x/nft/keeper" - "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" @@ -140,7 +136,6 @@ type AppKeepers struct { GovKeeper govkeeper.Keeper CrisisKeeper *crisiskeeper.Keeper UpgradeKeeper *upgradekeeper.Keeper - ParamsKeeper paramskeeper.Keeper IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly ICQKeeper icqkeeper.Keeper IBCFeeKeeper ibcfeekeeper.Keeper @@ -191,15 +186,6 @@ func NewAppKeepers( // Set keys KVStoreKey, TransientStoreKey, MemoryStoreKey appKeepers.GenerateKeys() keys := appKeepers.GetKVStoreKey() - tkeys := appKeepers.GetTransientStoreKey() - - appKeepers.ParamsKeeper = initParamsKeeper( - appCodec, - cdc, - keys[paramstypes.StoreKey], - tkeys[paramstypes.TStoreKey], - ) - govModAddress := authtypes.NewModuleAddress(govtypes.ModuleName).String() // set the BaseApp's parameter store @@ -312,7 +298,6 @@ func NewAppKeepers( appKeepers.IBCKeeper = ibckeeper.NewKeeper( appCodec, appKeepers.keys[ibcexported.StoreKey], - appKeepers.GetSubspace(ibcexported.ModuleName), appKeepers.StakingKeeper, appKeepers.UpgradeKeeper, scopedIBCKeeper, @@ -333,7 +318,6 @@ func NewAppKeepers( // register the proposal types govRouter := govv1beta.NewRouter() govRouter.AddRoute(govtypes.RouterKey, govv1beta.ProposalHandler). - AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(appKeepers.ParamsKeeper)). // This should be removed. It is still in place to avoid failures of modules that have not yet been upgraded AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(appKeepers.UpgradeKeeper)). AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(appKeepers.IBCKeeper.ClientKeeper)) @@ -384,8 +368,8 @@ func NewAppKeepers( // Initialize packet forward middleware router appKeepers.PacketForwardKeeper = packetforwardkeeper.NewKeeper( - appCodec, appKeepers.keys[packetforwardtypes.StoreKey], - appKeepers.GetSubspace(packetforwardtypes.ModuleName), + appCodec, + appKeepers.keys[packetforwardtypes.StoreKey], appKeepers.TransferKeeper, // Will be zero-value here. Reference is set later on with SetTransferKeeper. appKeepers.IBCKeeper.ChannelKeeper, appKeepers.DistrKeeper, @@ -397,7 +381,6 @@ func NewAppKeepers( appKeepers.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, appKeepers.keys[ibctransfertypes.StoreKey], - appKeepers.GetSubspace(ibctransfertypes.ModuleName), // The ICS4Wrapper is replaced by the PacketForwardKeeper instead of the channel so that sending can be overridden by the middleware appKeepers.PacketForwardKeeper, appKeepers.IBCKeeper.ChannelKeeper, @@ -413,7 +396,6 @@ func NewAppKeepers( appKeepers.ICQKeeper = icqkeeper.NewKeeper( appCodec, appKeepers.keys[icqtypes.StoreKey], - appKeepers.GetSubspace(icqtypes.ModuleName), appKeepers.IBCKeeper.ChannelKeeper, // may be replaced with middleware appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, @@ -424,7 +406,6 @@ func NewAppKeepers( appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper( appCodec, appKeepers.keys[icahosttypes.StoreKey], - appKeepers.GetSubspace(icahosttypes.SubModuleName), appKeepers.HooksICS4Wrapper, appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, @@ -435,7 +416,6 @@ func NewAppKeepers( // ICA Controller keeper appKeepers.ICAControllerKeeper = icacontrollerkeeper.NewKeeper( - appCodec, appKeepers.keys[icacontrollertypes.StoreKey], appKeepers.GetSubspace(icacontrollertypes.SubModuleName), appKeepers.IBCFeeKeeper, // use ics29 fee as ics4Wrapper in middleware stack appKeepers.IBCKeeper.ChannelKeeper, &appKeepers.IBCKeeper.PortKeeper, scopedICAControllerKeeper, bApp.MsgServiceRouter(), @@ -614,44 +594,6 @@ func NewAppKeepers( return appKeepers } -// initParamsKeeper init params keeper and its subspaces -func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper { - paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - - // https://github.com/cosmos/ibc-go/issues/2010 - // Will remove all of these in the future. For now we keep for legacy proposals to work properly. - paramsKeeper.Subspace(authtypes.ModuleName) - paramsKeeper.Subspace(banktypes.ModuleName) - paramsKeeper.Subspace(distrtypes.ModuleName) - paramsKeeper.Subspace(slashingtypes.ModuleName) - paramsKeeper.Subspace(govtypes.ModuleName) - paramsKeeper.Subspace(crisistypes.ModuleName) - - paramsKeeper.Subspace(stakingtypes.ModuleName).WithKeyTable(stakingtypes.ParamKeyTable()) // Used for GlobalFee - paramsKeeper.Subspace(minttypes.ModuleName) - - // custom - paramsKeeper.Subspace(ibctransfertypes.ModuleName) - paramsKeeper.Subspace(ibcexported.ModuleName) - paramsKeeper.Subspace(icahosttypes.SubModuleName) - paramsKeeper.Subspace(icacontrollertypes.SubModuleName) - paramsKeeper.Subspace(icqtypes.ModuleName) - paramsKeeper.Subspace(packetforwardtypes.ModuleName) - paramsKeeper.Subspace(globalfee.ModuleName) - paramsKeeper.Subspace(tokenfactorytypes.ModuleName) - paramsKeeper.Subspace(feesharetypes.ModuleName) - paramsKeeper.Subspace(wasmtypes.ModuleName) - paramsKeeper.Subspace(buildertypes.ModuleName) - - return paramsKeeper -} - -// GetSubspace returns a param subspace for a given module name. -func (appKeepers *AppKeepers) GetSubspace(moduleName string) paramstypes.Subspace { - subspace, _ := appKeepers.ParamsKeeper.GetSubspace(moduleName) - return subspace -} - // GetStakingKeeper implements the TestingApp interface. func (appKeepers *AppKeepers) GetStakingKeeper() *stakingkeeper.Keeper { return appKeepers.StakingKeeper diff --git a/app/keepers/keys.go b/app/keepers/keys.go index f5995be06..1b566c4fe 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -26,7 +26,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/feegrant" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" nftkeeper "github.com/cosmos/cosmos-sdk/x/nft/keeper" - paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" @@ -41,7 +40,7 @@ func (appKeepers *AppKeepers) GenerateKeys() { appKeepers.keys = sdk.NewKVStoreKeys( authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, crisistypes.StoreKey, minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, - govtypes.StoreKey, paramstypes.StoreKey, consensusparamtypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, + govtypes.StoreKey, consensusparamtypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, capabilitytypes.StoreKey, authzkeeper.StoreKey, nftkeeper.StoreKey, @@ -57,7 +56,6 @@ func (appKeepers *AppKeepers) GenerateKeys() { buildertypes.StoreKey, ) - appKeepers.tkeys = sdk.NewTransientStoreKeys(paramstypes.TStoreKey) appKeepers.memKeys = sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) } diff --git a/app/modules.go b/app/modules.go index b85068794..f80bfe9ab 100644 --- a/app/modules.go +++ b/app/modules.go @@ -50,8 +50,6 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/nft" nftmodule "github.com/cosmos/cosmos-sdk/x/nft/module" - "github.com/cosmos/cosmos-sdk/x/params" - paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/cosmos-sdk/x/slashing" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/cosmos/cosmos-sdk/x/staking" @@ -81,7 +79,6 @@ var ModuleBasics = module.NewBasicManager( mint.AppModuleBasic{}, distr.AppModuleBasic{}, gov.NewAppModuleBasic(getGovProposalHandlers()), - params.AppModuleBasic{}, crisis.AppModuleBasic{}, slashing.AppModuleBasic{}, upgrade.AppModuleBasic{}, @@ -123,31 +120,30 @@ func appModules( app.BaseApp.DeliverTx, encodingConfig.TxConfig, ), - auth.NewAppModule(appCodec, app.AppKeepers.AccountKeeper, nil, app.GetSubspace(authtypes.ModuleName)), + auth.NewAppModule(appCodec, app.AppKeepers.AccountKeeper, nil, nil), vesting.NewAppModule(app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper), - bank.NewAppModule(appCodec, app.AppKeepers.BankKeeper, app.AppKeepers.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + bank.NewAppModule(appCodec, app.AppKeepers.BankKeeper, app.AppKeepers.AccountKeeper, nil), capability.NewAppModule(appCodec, *app.AppKeepers.CapabilityKeeper, false), feegrantmodule.NewAppModule(appCodec, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, &app.AppKeepers.GovKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.GetSubspace(govtypes.ModuleName)), + gov.NewAppModule(appCodec, &app.AppKeepers.GovKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, nil), mint.NewAppModule(appCodec, app.AppKeepers.MintKeeper, app.AppKeepers.AccountKeeper, bondDenom), - slashing.NewAppModule(appCodec, app.AppKeepers.SlashingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)), - distr.NewAppModule(appCodec, app.AppKeepers.DistrKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), - staking.NewAppModule(appCodec, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), + slashing.NewAppModule(appCodec, app.AppKeepers.SlashingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.StakingKeeper, nil), + distr.NewAppModule(appCodec, app.AppKeepers.DistrKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.StakingKeeper, nil), + staking.NewAppModule(appCodec, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, nil), upgrade.NewAppModule(app.AppKeepers.UpgradeKeeper), evidence.NewAppModule(app.AppKeepers.EvidenceKeeper), ibc.NewAppModule(app.AppKeepers.IBCKeeper), - params.NewAppModule(app.AppKeepers.ParamsKeeper), authzmodule.NewAppModule(appCodec, app.AppKeepers.AuthzKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.interfaceRegistry), nftmodule.NewAppModule(appCodec, app.AppKeepers.NFTKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.interfaceRegistry), consensus.NewAppModule(appCodec, app.AppKeepers.ConsensusParamsKeeper), transfer.NewAppModule(app.AppKeepers.TransferKeeper), ibcfee.NewAppModule(app.AppKeepers.IBCFeeKeeper), - tokenfactory.NewAppModule(app.AppKeepers.TokenFactoryKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.GetSubspace(tokenfactorytypes.ModuleName)), + tokenfactory.NewAppModule(app.AppKeepers.TokenFactoryKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, nil), globalfee.NewAppModule(appCodec, app.AppKeepers.GlobalFeeKeeper, bondDenom), - feeshare.NewAppModule(app.AppKeepers.FeeShareKeeper, app.AppKeepers.AccountKeeper, app.GetSubspace(feesharetypes.ModuleName)), - wasm.NewAppModule(appCodec, &app.AppKeepers.WasmKeeper, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), + feeshare.NewAppModule(app.AppKeepers.FeeShareKeeper, app.AppKeepers.AccountKeeper, nil), + wasm.NewAppModule(appCodec, &app.AppKeepers.WasmKeeper, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.MsgServiceRouter(), nil), ica.NewAppModule(&app.AppKeepers.ICAControllerKeeper, &app.AppKeepers.ICAHostKeeper), - crisis.NewAppModule(app.AppKeepers.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), + crisis.NewAppModule(app.AppKeepers.CrisisKeeper, skipGenesisInvariants, nil), buildermodule.NewAppModule(appCodec, app.AppKeepers.BuildKeeper), // IBC modules ibc_hooks.NewAppModule(app.AppKeepers.AccountKeeper), @@ -168,22 +164,21 @@ func simulationModules( bondDenom := app.GetChainBondDenom() return []module.AppModuleSimulation{ - auth.NewAppModule(appCodec, app.AppKeepers.AccountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)), - bank.NewAppModule(appCodec, app.AppKeepers.BankKeeper, app.AppKeepers.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + auth.NewAppModule(appCodec, app.AppKeepers.AccountKeeper, authsims.RandomGenesisAccounts, nil), + bank.NewAppModule(appCodec, app.AppKeepers.BankKeeper, app.AppKeepers.AccountKeeper, nil), capability.NewAppModule(appCodec, *app.AppKeepers.CapabilityKeeper, false), feegrantmodule.NewAppModule(appCodec, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.FeeGrantKeeper, app.interfaceRegistry), authzmodule.NewAppModule(appCodec, app.AppKeepers.AuthzKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, &app.AppKeepers.GovKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.GetSubspace(govtypes.ModuleName)), + gov.NewAppModule(appCodec, &app.AppKeepers.GovKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, nil), mint.NewAppModule(appCodec, app.AppKeepers.MintKeeper, app.AppKeepers.AccountKeeper, bondDenom), - staking.NewAppModule(appCodec, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), - distr.NewAppModule(appCodec, app.AppKeepers.DistrKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), - slashing.NewAppModule(appCodec, app.AppKeepers.SlashingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.StakingKeeper, app.GetSubspace(stakingtypes.ModuleName)), - params.NewAppModule(app.AppKeepers.ParamsKeeper), + staking.NewAppModule(appCodec, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, nil), + distr.NewAppModule(appCodec, app.AppKeepers.DistrKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.StakingKeeper, nil), + slashing.NewAppModule(appCodec, app.AppKeepers.SlashingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.AppKeepers.StakingKeeper, nil), evidence.NewAppModule(app.AppKeepers.EvidenceKeeper), - wasm.NewAppModule(appCodec, &app.AppKeepers.WasmKeeper, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), + wasm.NewAppModule(appCodec, &app.AppKeepers.WasmKeeper, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.MsgServiceRouter(), nil), ibc.NewAppModule(app.AppKeepers.IBCKeeper), transfer.NewAppModule(app.AppKeepers.TransferKeeper), - feeshare.NewAppModule(app.AppKeepers.FeeShareKeeper, app.AppKeepers.AccountKeeper, app.GetSubspace(feesharetypes.ModuleName)), + feeshare.NewAppModule(app.AppKeepers.FeeShareKeeper, app.AppKeepers.AccountKeeper, nil), ibcfee.NewAppModule(app.AppKeepers.IBCFeeKeeper), } } @@ -206,7 +201,6 @@ func orderBeginBlockers() []string { genutiltypes.ModuleName, authz.ModuleName, feegrant.ModuleName, - paramstypes.ModuleName, vestingtypes.ModuleName, nft.ModuleName, consensusparamtypes.ModuleName, @@ -241,7 +235,6 @@ func orderEndBlockers() []string { evidencetypes.ModuleName, authz.ModuleName, feegrant.ModuleName, - paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, nft.ModuleName, @@ -276,7 +269,6 @@ func orderInitBlockers() []string { genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, - paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, feegrant.ModuleName, diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go index 7b773336b..ecb3c3b81 100644 --- a/app/upgrades/v14/upgrades.go +++ b/app/upgrades/v14/upgrades.go @@ -9,7 +9,6 @@ import ( "github.com/CosmosContracts/juno/v17/app/keepers" "github.com/CosmosContracts/juno/v17/app/upgrades" - globalfeetypes "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) func CreateV14UpgradeHandler( @@ -37,11 +36,6 @@ func CreateV14UpgradeHandler( // 0.001 ATOM CHANNEL-1 -> `junod q ibc-transfer denom-trace ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9` sdk.NewDecCoinFromDec("ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9", sdk.NewDecWithPrec(1, 3)), } - s, ok := keepers.ParamsKeeper.GetSubspace(globalfeetypes.ModuleName) - if !ok { - panic("global fee params subspace not found") - } - s.Set(ctx, globalfeetypes.ParamStoreKeyMinGasPrices, minGasPrices) logger.Info(fmt.Sprintf("upgraded global fee params to %s", minGasPrices)) return versionMap, err diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go index c8af9ba30..01ef3add2 100644 --- a/app/upgrades/v16/upgrades.go +++ b/app/upgrades/v16/upgrades.go @@ -3,40 +3,21 @@ package v16 import ( "fmt" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" buildertypes "github.com/skip-mev/pob/x/builder/types" icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" - icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" - icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" - ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" exported "github.com/cosmos/ibc-go/v7/modules/core/exported" // External modules "cosmossdk.io/math" - "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - // SDK v47 modules - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" - distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/CosmosContracts/juno/v17/app/keepers" "github.com/CosmosContracts/juno/v17/app/upgrades" - // Juno modules - feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" - globalfeetypes "github.com/CosmosContracts/juno/v17/x/globalfee/types" - minttypes "github.com/CosmosContracts/juno/v17/x/mint/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func CreateV16UpgradeHandler( @@ -50,69 +31,6 @@ func CreateV16UpgradeHandler( nativeDenom := upgrades.GetChainsDenomToken(ctx.ChainID()) logger.Info(fmt.Sprintf("With native denom %s", nativeDenom)) - // https://github.com/cosmos/cosmos-sdk/pull/12363/files - // Set param key table for params module migration - for _, subspace := range keepers.ParamsKeeper.GetSubspaces() { - subspace := subspace - - var keyTable paramstypes.KeyTable - switch subspace.Name() { - case authtypes.ModuleName: - keyTable = authtypes.ParamKeyTable() //nolint:staticcheck - case banktypes.ModuleName: - keyTable = banktypes.ParamKeyTable() //nolint:staticcheck - case stakingtypes.ModuleName: - keyTable = stakingtypes.ParamKeyTable() //nolint:staticcheck - - // case minttypes.ModuleName: - // keyTable = minttypes.ParamKeyTable() //nolint:staticcheck - case distrtypes.ModuleName: - keyTable = distrtypes.ParamKeyTable() //nolint:staticcheck - case slashingtypes.ModuleName: - keyTable = slashingtypes.ParamKeyTable() //nolint:staticcheck - case govtypes.ModuleName: - keyTable = govv1.ParamKeyTable() //nolint:staticcheck - case crisistypes.ModuleName: - keyTable = crisistypes.ParamKeyTable() //nolint:staticcheck - - // ibc types - case ibctransfertypes.ModuleName: - keyTable = ibctransfertypes.ParamKeyTable() - case icahosttypes.SubModuleName: - keyTable = icahosttypes.ParamKeyTable() - case icacontrollertypes.SubModuleName: - keyTable = icacontrollertypes.ParamKeyTable() - - // wasm - case wasmtypes.ModuleName: - keyTable = wasmtypes.ParamKeyTable() //nolint:staticcheck - - // POB - case buildertypes.ModuleName: - // already SDK v47 - continue - - // juno modules - case feesharetypes.ModuleName: - keyTable = feesharetypes.ParamKeyTable() //nolint:staticcheck - case tokenfactorytypes.ModuleName: - keyTable = tokenfactorytypes.ParamKeyTable() //nolint:staticcheck - case minttypes.ModuleName: - keyTable = minttypes.ParamKeyTable() //nolint:staticcheck - case globalfeetypes.ModuleName: - keyTable = globalfeetypes.ParamKeyTable() //nolint:staticcheck - } - - if !subspace.HasKeyTable() { - subspace.WithKeyTable(keyTable) - } - } - - // Migrate Tendermint consensus parameters from x/params module to a deprecated x/consensus module. - // The old params module is required to still be imported in your app.go in order to handle this migration. - baseAppLegacySS := keepers.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable()) - baseapp.MigrateParams(ctx, baseAppLegacySS, &keepers.ConsensusParamsKeeper) - // Run migrations logger.Info(fmt.Sprintf("pre migrate version map: %v", vm)) versionMap, err := mm.RunMigrations(ctx, cfg, vm)