Problem: sdk 53 is not integrated

skip-check-header

fix test

Author: mmsqe

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Improvements
 
 * [#1779](https://github.com/crypto-org-chain/cronos/pull/1779) Upgrade rocksdb to `v9.11.2`.
+* [#1799](https://github.com/crypto-org-chain/cronos/pull/1799) Bump cosmos-sdk to v0.53.
 
 *Apr 9, 2025*
 

app/app.go

@@ -103,13 +103,15 @@ import (
 	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"
+	"github.com/cosmos/cosmos-sdk/x/protocolpool"
+	poolkeeper "github.com/cosmos/cosmos-sdk/x/protocolpool/keeper"
+	pooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-
 	ibccallbacks "github.com/cosmos/ibc-go/modules/apps/callbacks"
 	"github.com/cosmos/ibc-go/modules/capability"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
@@ -214,17 +216,19 @@ var (
 
 	// module account permissions
 	maccPerms = map[string][]string{
-		authtypes.FeeCollectorName:     nil,
-		distrtypes.ModuleName:          nil,
-		minttypes.ModuleName:           {authtypes.Minter},
-		stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
-		stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
-		govtypes.ModuleName:            {authtypes.Burner},
-		ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
-		ibcfeetypes.ModuleName:         nil,
-		icatypes.ModuleName:            nil,
-		evmtypes.ModuleName:            {authtypes.Minter, authtypes.Burner}, // used for secure addition and subtraction of balance using module account
-		cronostypes.ModuleName:         {authtypes.Minter, authtypes.Burner},
+		authtypes.FeeCollectorName:          nil,
+		distrtypes.ModuleName:               nil,
+		pooltypes.ModuleName:                nil,
+		pooltypes.ProtocolPoolEscrowAccount: nil,
+		minttypes.ModuleName:                {authtypes.Minter},
+		stakingtypes.BondedPoolName:         {authtypes.Burner, authtypes.Staking},
+		stakingtypes.NotBondedPoolName:      {authtypes.Burner, authtypes.Staking},
+		govtypes.ModuleName:                 {authtypes.Burner},
+		ibctransfertypes.ModuleName:         {authtypes.Minter, authtypes.Burner},
+		ibcfeetypes.ModuleName:              nil,
+		icatypes.ModuleName:                 nil,
+		evmtypes.ModuleName:                 {authtypes.Minter, authtypes.Burner}, // used for secure addition and subtraction of balance using module account
+		cronostypes.ModuleName:              {authtypes.Minter, authtypes.Burner},
 	}
 	// Module configurator
 
@@ -252,6 +256,7 @@ func StoreKeys() (
 		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
 		govtypes.StoreKey, paramstypes.StoreKey, upgradetypes.StoreKey,
 		evidencetypes.StoreKey, capabilitytypes.StoreKey, consensusparamtypes.StoreKey,
+		pooltypes.StoreKey,
 		feegrant.StoreKey, crisistypes.StoreKey,
 		// ibc keys
 		ibcexported.StoreKey, ibctransfertypes.StoreKey,
@@ -306,15 +311,15 @@ type App struct {
 
 	// keepers
 	AccountKeeper         authkeeper.AccountKeeper
-	BankKeeper            bankkeeper.Keeper
+	BankKeeper            bankkeeper.BaseKeeper
 	CapabilityKeeper      *capabilitykeeper.Keeper
 	StakingKeeper         *stakingkeeper.Keeper
 	SlashingKeeper        slashingkeeper.Keeper
 	MintKeeper            mintkeeper.Keeper
 	DistrKeeper           distrkeeper.Keeper
 	GovKeeper             govkeeper.Keeper
 	CrisisKeeper          crisiskeeper.Keeper
-	UpgradeKeeper         upgradekeeper.Keeper
+	UpgradeKeeper         *upgradekeeper.Keeper
 	ParamsKeeper          paramskeeper.Keeper
 	IBCKeeper             *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
 	IBCFeeKeeper          ibcfeekeeper.Keeper
@@ -324,6 +329,7 @@ type App struct {
 	TransferKeeper        ibctransferkeeper.Keeper
 	FeeGrantKeeper        feegrantkeeper.Keeper
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
+	PoolKeeper            poolkeeper.Keeper
 
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper           capabilitykeeper.ScopedKeeper
@@ -517,8 +523,8 @@ func New(
 	)
 	app.BankKeeper = bankkeeper.NewBaseKeeper(
 		appCodec,
-		runtime.NewKVStoreService(keys[banktypes.StoreKey]),
 		okeys[banktypes.ObjectStoreKey],
+		runtime.NewKVStoreService(keys[banktypes.StoreKey]),
 		app.AccountKeeper,
 		app.BlockedAddrs(),
 		authAddr,
@@ -557,6 +563,13 @@ func New(
 		authtypes.FeeCollectorName,
 		authAddr,
 	)
+	app.PoolKeeper = poolkeeper.NewKeeper(
+		appCodec,
+		runtime.NewKVStoreService(keys[pooltypes.StoreKey]),
+		app.AccountKeeper,
+		app.BankKeeper,
+		authAddr,
+	)
 	app.DistrKeeper = distrkeeper.NewKeeper(
 		appCodec,
 		runtime.NewKVStoreService(keys[distrtypes.StoreKey]),
@@ -565,6 +578,7 @@ func New(
 		app.StakingKeeper,
 		authtypes.FeeCollectorName,
 		authAddr,
+		distrkeeper.WithExternalCommunityPool(app.PoolKeeper),
 	)
 	app.SlashingKeeper = slashingkeeper.NewKeeper(
 		appCodec,
@@ -594,7 +608,7 @@ func New(
 		skipUpgradeHeights[int64(h)] = true
 	}
 	// set the governance module account as the authority for conducting upgrades
-	app.UpgradeKeeper = *upgradekeeper.NewKeeper(
+	app.UpgradeKeeper = upgradekeeper.NewKeeper(
 		skipUpgradeHeights,
 		runtime.NewKVStoreService(keys[upgradetypes.StoreKey]),
 		appCodec,
@@ -817,10 +831,11 @@ func New(
 		),
 		distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)),
 		staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)),
-		upgrade.NewAppModule(&app.UpgradeKeeper, app.AccountKeeper.AddressCodec()),
+		upgrade.NewAppModule(app.UpgradeKeeper, app.AccountKeeper.AddressCodec()),
 		evidence.NewAppModule(app.EvidenceKeeper),
 		params.NewAppModule(app.ParamsKeeper),
 		consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper),
+		protocolpool.NewAppModule(appCodec, app.PoolKeeper, app.AccountKeeper, app.BankKeeper),
 
 		// ibc modules
 		ibc.NewAppModule(app.IBCKeeper),
@@ -862,6 +877,7 @@ func New(
 		evmtypes.ModuleName,
 		minttypes.ModuleName,
 		distrtypes.ModuleName,
+		pooltypes.ModuleName,
 		slashingtypes.ModuleName,
 		evidencetypes.ModuleName,
 		stakingtypes.ModuleName,
@@ -886,6 +902,7 @@ func New(
 		stakingtypes.ModuleName,
 		evmtypes.ModuleName,
 		feemarkettypes.ModuleName,
+		pooltypes.ModuleName,
 		ibcexported.ModuleName,
 		ibctransfertypes.ModuleName,
 		ibcfeetypes.ModuleName,
@@ -915,6 +932,7 @@ func New(
 	initGenesisOrder := []string{
 		capabilitytypes.ModuleName,
 		authtypes.ModuleName,
+		pooltypes.ModuleName, // must be exported before bank.
 		banktypes.ModuleName,
 		distrtypes.ModuleName,
 		stakingtypes.ModuleName,
@@ -945,6 +963,7 @@ func New(
 
 	app.ModuleManager.SetOrderPreBlockers(
 		upgradetypes.ModuleName,
+		authtypes.ModuleName,
 	)
 	app.ModuleManager.SetOrderBeginBlockers(beginBlockersOrder...)
 	app.ModuleManager.SetOrderEndBlockers(endBlockersOrder...)
@@ -1138,9 +1157,9 @@ func (app *App) setAnteHandler(txConfig client.TxConfig, maxGasWanted uint64, bl
 		DynamicFeeChecker:      true,
 		DisabledAuthzMsgs: []string{
 			sdk.MsgTypeURL(&evmtypes.MsgEthereumTx{}),
-			sdk.MsgTypeURL(&vestingtypes.MsgCreateVestingAccount{}),
-			sdk.MsgTypeURL(&vestingtypes.MsgCreatePermanentLockedAccount{}),
-			sdk.MsgTypeURL(&vestingtypes.MsgCreatePeriodicVestingAccount{}),
+			sdk.MsgTypeURL(&vestingtypes.BaseVestingAccount{}),
+			sdk.MsgTypeURL(&vestingtypes.PermanentLockedAccount{}),
+			sdk.MsgTypeURL(&vestingtypes.PeriodicVestingAccount{}),
 		},
 		ExtraDecorators:   []sdk.AnteDecorator{blockAddressDecorator},
 		PendingTxListener: app.onPendingTx,

app/upgrades.go

@@ -3,120 +3,41 @@ package app
 import (
 	"context"
 	"fmt"
-	"time"
 
-	sdkmath "cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	"github.com/cosmos/cosmos-sdk/codec"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
-	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
-	icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
+	pooltypes "github.com/cosmos/cosmos-sdk/x/protocolpool/types"
 )
 
 // RegisterUpgradeHandlers returns if store loader is overridden
 func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, maxVersion int64) bool {
-	planName := "v1.4"
-	app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-		m, err := app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM)
-		if err != nil {
-			return m, err
-		}
-
-		sdkCtx := sdk.UnwrapSDKContext(ctx)
-		{
-			params := app.ICAHostKeeper.GetParams(sdkCtx)
-			params.HostEnabled = false
-			app.ICAHostKeeper.SetParams(sdkCtx, params)
-			evmParams := app.EvmKeeper.GetParams(sdkCtx)
-			evmParams.HeaderHashNum = evmtypes.DefaultHeaderHashNum
-			if err := app.EvmKeeper.SetParams(sdkCtx, evmParams); err != nil {
-				return m, err
-			}
-			if err := UpdateExpeditedParams(ctx, app.GovKeeper); err != nil {
+	planName := "v1.5"
+	app.UpgradeKeeper.SetUpgradeHandler(planName,
+		func(ctx context.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+			m, err := app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM)
+			if err != nil {
 				return m, err
 			}
-		}
-		return m, nil
-	})
-
-	// a hotfix upgrade plan just for testnet
-	hotfixPlanName := "v1.4.0-rc5-testnet"
-	app.UpgradeKeeper.SetUpgradeHandler(hotfixPlanName, func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-		return app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM)
-	})
+			return m, nil
+		},
+	)
 
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))
 	}
 	if !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		if upgradeInfo.Name == planName {
-			app.SetStoreLoader(MaxVersionUpgradeStoreLoader(maxVersion, upgradeInfo.Height, &storetypes.StoreUpgrades{
+			app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storetypes.StoreUpgrades{
 				Added: []string{
-					icahosttypes.StoreKey,
+					pooltypes.ModuleName,
 				},
-				Deleted: []string{"icaauth"},
 			}))
-
 			return true
 		}
 	}
 
 	return false
 }
-
-func UpdateExpeditedParams(ctx context.Context, gov govkeeper.Keeper) error {
-	govParams, err := gov.Params.Get(ctx)
-	if err != nil {
-		return err
-	}
-	if len(govParams.MinDeposit) > 0 {
-		minDeposit := govParams.MinDeposit[0]
-		expeditedAmount := minDeposit.Amount.MulRaw(govv1.DefaultMinExpeditedDepositTokensRatio)
-		govParams.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewCoin(minDeposit.Denom, expeditedAmount))
-	}
-	threshold, err := sdkmath.LegacyNewDecFromStr(govParams.Threshold)
-	if err != nil {
-		return fmt.Errorf("invalid threshold string: %w", err)
-	}
-	expeditedThreshold, err := sdkmath.LegacyNewDecFromStr(govParams.ExpeditedThreshold)
-	if err != nil {
-		return fmt.Errorf("invalid expedited threshold string: %w", err)
-	}
-	if expeditedThreshold.LTE(threshold) {
-		expeditedThreshold = threshold.Mul(DefaultThresholdRatio())
-	}
-	if expeditedThreshold.GT(sdkmath.LegacyOneDec()) {
-		expeditedThreshold = sdkmath.LegacyOneDec()
-	}
-	govParams.ExpeditedThreshold = expeditedThreshold.String()
-	if govParams.ExpeditedVotingPeriod != nil && govParams.VotingPeriod != nil && *govParams.ExpeditedVotingPeriod >= *govParams.VotingPeriod {
-		votingPeriod := DurationToDec(*govParams.VotingPeriod)
-		period := DecToDuration(DefaultPeriodRatio().Mul(votingPeriod))
-		govParams.ExpeditedVotingPeriod = &period
-	}
-	if err := govParams.ValidateBasic(); err != nil {
-		return err
-	}
-	return gov.Params.Set(ctx, govParams)
-}
-
-func DefaultThresholdRatio() sdkmath.LegacyDec {
-	return govv1.DefaultExpeditedThreshold.Quo(govv1.DefaultThreshold)
-}
-
-func DefaultPeriodRatio() sdkmath.LegacyDec {
-	return DurationToDec(govv1.DefaultExpeditedPeriod).Quo(DurationToDec(govv1.DefaultPeriod))
-}
-
-func DurationToDec(d time.Duration) sdkmath.LegacyDec {
-	return sdkmath.LegacyMustNewDecFromStr(fmt.Sprintf("%f", d.Seconds()))
-}
-
-func DecToDuration(d sdkmath.LegacyDec) time.Duration {
-	return time.Second * time.Duration(d.RoundInt64())
-}