Merge remote-tracking branch 'origin/ma/coalesce-rotation-power-updates' into eric/validate-cons-key-rotation-type

Author: Eric-Warehime

CHANGELOG.md

@@ -70,6 +70,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/staking) [#26408](https://github.com/cosmos/cosmos-sdk/pull/26408) Fix `MsgBeginRedelegate` failure when redelegating all shares from an unbonded source validator that is removed after unbonding.
 * (x/auth/tx) [#26422](https://github.com/cosmos/cosmos-sdk/pull/26422) Reuse the signing context from the codec's `InterfaceRegistry` when `ConfigOptions.SigningOptions` is unset so that `CustomGetSigners` registered via `NewInterfaceRegistryWithOptions` are honored by `NewTxConfig` / `NewTxConfigWithOptions`.
 * (blockstm) [#25893](https://github.com/cosmos/cosmos-sdk/pull/25893) Fix CancelAll cancellation by clearing blocker ESTIMATE marks before waking suspended executors.
+* (x/staking) [#26460](https://github.com/cosmos/cosmos-sdk/pull/26460) Coalesce key rotation power updates to not emit duplicates.
 
 ### Deprecated
 

tests/integration/staking/keeper/cons_key_rotation_test.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	cmtabcitypes "github.com/cometbft/cometbft/abci/types"
+	cmttypes "github.com/cometbft/cometbft/types"
 	"gotest.tools/v3/assert"
 
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -103,8 +104,7 @@ func TestRotateConsPubKey_MsgServerQueuesAndEndBlockerApplies(t *testing.T) {
 	// integration fixture's EndBlocker runs with the captured initial block
 	// height and does not advance with FinalizeBlock.
 	applyCtx := f.sdkCtx.WithBlockHeight(writeHeight + types.ConsensusUpdateDelay)
-	_, err = f.stakingKeeper.ProcessConsKeyRotations(applyCtx, powerReduction)
-	assert.NilError(t, err)
+	assert.NilError(t, f.stakingKeeper.ApplyConsKeyRotations(applyCtx))
 
 	// old by-cons-addr index is gone
 	_, err = f.stakingKeeper.GetValidatorByConsAddr(f.sdkCtx, oldConsAddr)
@@ -185,7 +185,6 @@ func TestRotateConsPubKey_SecondRotationAfterPruningSucceeds(t *testing.T) {
 	t.Parallel()
 	f := initFixture(t)
 	msgServer := keeper.NewMsgServerImpl(f.stakingKeeper)
-	powerReduction := f.stakingKeeper.PowerReduction(f.sdkCtx)
 
 	pkA := ed25519.GenPrivKey().PubKey()
 	pkB := ed25519.GenPrivKey().PubKey()
@@ -213,8 +212,7 @@ func TestRotateConsPubKey_SecondRotationAfterPruningSucceeds(t *testing.T) {
 	// index moves accordingly. The integration fixture's EndBlocker keeps the
 	// captured block height, so the drain pass is invoked here directly.
 	applyCtx := f.sdkCtx.WithBlockHeight(writeHeight + types.ConsensusUpdateDelay)
-	_, err = f.stakingKeeper.ProcessConsKeyRotations(applyCtx, powerReduction)
-	assert.NilError(t, err)
+	assert.NilError(t, f.stakingKeeper.ApplyConsKeyRotations(applyCtx))
 
 	// advance past maturity and let the end blocker prune
 	unbondingTime, err := f.stakingKeeper.UnbondingTime(f.sdkCtx)
@@ -233,8 +231,7 @@ func TestRotateConsPubKey_SecondRotationAfterPruningSucceeds(t *testing.T) {
 
 	// drive the drain again for this second rotation
 	applyCtx = f.sdkCtx.WithBlockHeight(writeHeight + types.ConsensusUpdateDelay)
-	_, err = f.stakingKeeper.ProcessConsKeyRotations(applyCtx, powerReduction)
-	assert.NilError(t, err)
+	assert.NilError(t, f.stakingKeeper.ApplyConsKeyRotations(applyCtx))
 
 	stored, err := f.stakingKeeper.GetValidator(f.sdkCtx, valAddr)
 	assert.NilError(t, err)
@@ -243,6 +240,50 @@ func TestRotateConsPubKey_SecondRotationAfterPruningSucceeds(t *testing.T) {
 	assert.DeepEqual(t, sdk.ConsAddress(pkA.Address()).Bytes(), storedConsAddr)
 }
 
+func TestRotateConsPubKey_PowerChangeUpdatesAcceptedByComet(t *testing.T) {
+	t.Parallel()
+	f := initFixture(t)
+	msgServer := keeper.NewMsgServerImpl(f.stakingKeeper)
+
+	oldPk := ed25519.GenPrivKey().PubKey()
+	newPk := ed25519.GenPrivKey().PubKey()
+	valAddr, _ := bondConsKeyRotationValidator(t, f, oldPk)
+	validator, err := f.stakingKeeper.GetValidator(f.sdkCtx, valAddr)
+	assert.NilError(t, err)
+	initialCmtVals, err := cmttypes.PB2TM.ValidatorUpdates([]cmtabcitypes.ValidatorUpdate{
+		validator.ABCIValidatorUpdate(f.stakingKeeper.PowerReduction(f.sdkCtx)),
+	})
+	assert.NilError(t, err)
+	valSet := cmttypes.NewValidatorSet(initialCmtVals)
+
+	_, err = msgServer.RotateConsPubKey(f.sdkCtx, &types.MsgRotateConsPubKey{
+		ValidatorAddress: valAddr.String(),
+		NewPubkey:        newPubKeyAny(t, newPk),
+	})
+	assert.NilError(t, err)
+
+	// Force a same-height power update for the rotating validator. Staking must
+	// coalesce this with the rotation's new-key update before returning the
+	// batch to CometBFT.
+	validator, err = f.stakingKeeper.GetValidator(f.sdkCtx, valAddr)
+	assert.NilError(t, err)
+	validator, _ = validator.AddTokensFromDel(f.stakingKeeper.TokensFromConsensusPower(f.sdkCtx, 1))
+	keeper.TestingUpdateValidator(f.stakingKeeper, f.sdkCtx, validator, false)
+
+	updates, err := f.stakingKeeper.ApplyAndReturnValidatorSetUpdates(f.sdkCtx)
+	assert.NilError(t, err)
+	assert.Equal(t, 2, len(updates), "%v", updates)
+
+	cmtUpdates, err := cmttypes.PB2TM.ValidatorUpdates(updates)
+	assert.NilError(t, err)
+
+	assert.NilError(t, valSet.UpdateWithChangeSet(cmtUpdates))
+	assert.Assert(t, !valSet.HasAddress(oldPk.Address()))
+	_, newCmtVal := valSet.GetByAddress(newPk.Address())
+	assert.Assert(t, newCmtVal != nil)
+	assert.Equal(t, int64(101), newCmtVal.VotingPower)
+}
+
 // bondConsKeyRotationValidator creates and bonds a single validator under
 // consPk, funding the operator account with enough tokens to cover several
 // rotation fees plus the self delegation.