Merge pull request #204 from yihuang/release/v0.46.x

Problem: hard fork logic don't check for chain-id

simapp/app.go

@@ -264,7 +264,7 @@ func NewSimApp(
 		appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(),
 	)
 	stakingKeeper := stakingkeeper.NewKeeper(
-		appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName), 0,
+		appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName), nil,
 	)
 	app.MintKeeper = mintkeeper.NewKeeper(
 		appCodec, keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), &stakingKeeper,

x/auth/migrations/v043/store_test.go

@@ -658,7 +658,7 @@ func createValidator(t *testing.T, ctx sdk.Context, app *simapp.SimApp, powers i
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.GetSubspace(stakingtypes.ModuleName),
-		0,
+		nil,
 	)
 
 	val1, err := stakingtypes.NewValidator(valAddrs[0], pks[0], stakingtypes.Description{})

x/gov/keeper/common_test.go

@@ -48,7 +48,7 @@ func createValidators(t *testing.T, ctx sdk.Context, app *simapp.SimApp, powers
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.GetSubspace(stakingtypes.ModuleName),
-		0,
+		nil,
 	)
 
 	val1, err := stakingtypes.NewValidator(valAddrs[0], pks[0], stakingtypes.Description{})

x/staking/common_test.go

@@ -49,7 +49,7 @@ func getBaseSimappWithCustomKeeper(t *testing.T) (*codec.LegacyAmino, *simapp.Si
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.GetSubspace(types.ModuleName),
-		0,
+		nil,
 	)
 	app.StakingKeeper.SetParams(ctx, types.DefaultParams())
 

x/staking/keeper/common_test.go

@@ -31,7 +31,7 @@ func createTestInput(t *testing.T) (*codec.LegacyAmino, *simapp.SimApp, sdk.Cont
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.GetSubspace(types.ModuleName),
-		0,
+		nil,
 	)
 	return app.LegacyAmino(), app, ctx
 }

x/staking/keeper/grpc_query_test.go

@@ -796,7 +796,7 @@ func createValidators(t *testing.T, ctx sdk.Context, app *simapp.SimApp, powers
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.GetSubspace(types.ModuleName),
-		0,
+		nil,
 	)
 
 	val1 := teststaking.NewValidator(t, valAddrs[0], pks[0])

x/staking/keeper/keeper.go

@@ -28,14 +28,16 @@ type Keeper struct {
 	hooks      types.StakingHooks
 	paramstore paramtypes.Subspace
 
-	hardForkHeight int64
+	// forkEnabledFunc returns true if the forked logic should be enabled.
+	// see: https://github.com/advisories/GHSA-86h5-xcpx-cfqc
+	forkEnabledFunc func(sdk.Context) bool
 }
 
 // NewKeeper creates a new staking Keeper instance
 func NewKeeper(
 	cdc codec.BinaryCodec, key storetypes.StoreKey, ak types.AccountKeeper, bk types.BankKeeper,
 	ps paramtypes.Subspace,
-	hardForkHeight int64,
+	forkEnabledFunc func(sdk.Context) bool,
 ) Keeper {
 	// set KeyTable if it has not already been set
 	if !ps.HasKeyTable() {
@@ -51,6 +53,12 @@ func NewKeeper(
 		panic(fmt.Sprintf("%s module account has not been set", types.NotBondedPoolName))
 	}
 
+	if forkEnabledFunc == nil {
+		forkEnabledFunc = func(sdk.Context) bool {
+			return false
+		}
+	}
+
 	return Keeper{
 		storeKey:   key,
 		cdc:        cdc,
@@ -59,7 +67,7 @@ func NewKeeper(
 		paramstore: ps,
 		hooks:      nil,
 
-		hardForkHeight: hardForkHeight,
+		forkEnabledFunc: forkEnabledFunc,
 	}
 }
 

x/staking/keeper/slash.go

@@ -255,7 +255,7 @@ func (k Keeper) SlashRedelegation(ctx sdk.Context, srcValidator types.Validator,
 			panic(err)
 		}
 
-		if k.hardForkHeight >= ctx.BlockHeight() {
+		if k.forkEnabledFunc(ctx) {
 			// Handle undelegation after redelegation
 			// Prioritize slashing unbondingDelegation than delegation
 			unbondingDelegation, found := k.GetUnbondingDelegation(ctx, sdk.MustAccAddressFromBech32(redelegation.DelegatorAddress), valDstAddr)