fix!: artificially resetting the proposer priority

consensus/state.go

@@ -1073,6 +1073,10 @@ func (cs *State) enterNewRound(height int64, round int32) {
 		validators.IncrementProposerPriority(cmtmath.SafeSubInt32(round, cs.Round))
 	}
 
+	if (round > 0 && round%types.PriorityResetRoundInterval == 0) ||
+		height%types.PriorityResetHeightInterval == 0 {
+		validators.ResetPriorities()
+	}
 	// Setup new round
 	// we don't fire newStep for this step,
 	// but we fire an event, so update the round step first

node/node.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	_ "net/http/pprof" //nolint: gosec
 	"os"
 	"time"
 
@@ -38,8 +39,6 @@ import (
 	"github.com/cometbft/cometbft/types"
 	cmttime "github.com/cometbft/cometbft/types/time"
 	"github.com/cometbft/cometbft/version"
-
-	_ "net/http/pprof" //nolint: gosec
 )
 
 // Node is the highest level interface to a full CometBFT node.

state/execution.go

@@ -280,6 +280,11 @@ func (blockExec *BlockExecutor) applyBlock(state State, blockID types.BlockID, b
 		blockExec.metrics.ConsensusParamUpdates.Add(1)
 	}
 
+	if (block.Height%types.PriorityResetHeightInterval == 0) ||
+		(block.LastCommit.Round >= types.PriorityResetRoundInterval) {
+		state.NextValidators.ResetPriorities()
+	}
+
 	// Update the state with the block and responses.
 	state, err = updateState(state, blockID, &block.Header, abciResponse, validatorUpdates)
 	if err != nil {

state/store.go

@@ -621,13 +621,11 @@ func (store dbStore) saveValidatorsInfo(height, lastHeightChanged int64, valSet
 	}
 	// Only persist validator set if it was updated or checkpoint height (see
 	// valSetCheckpointInterval) is reached.
-	if height == lastHeightChanged || height%valSetCheckpointInterval == 0 {
-		pv, err := valSet.ToProto()
-		if err != nil {
-			return err
-		}
-		valInfo.ValidatorSet = pv
+	pv, err := valSet.ToProto()
+	if err != nil {
+		return err
 	}
+	valInfo.ValidatorSet = pv
 
 	bz, err := valInfo.Marshal()
 	if err != nil {

types/priority_reset.go

@@ -0,0 +1,10 @@
+package types
+
+var (
+	// PriorityResetHeightInterval determines the interval at which the validator priority is reset.
+	// If set to 100, the priority is reset every 100 blocks (e.g., at heights 100, 200, 300, ...).
+	// When the chain reaches a height that is a multiple of this value, the validator priority is reset.
+	PriorityResetHeightInterval int64 = 100
+	// PriorityResetRoundInterval defines the interval at which the validator priority is reset.
+	PriorityResetRoundInterval int32 = 20
+)

types/validator_set.go

@@ -367,6 +367,12 @@ func (vals *ValidatorSet) Iterate(fn func(index int, val *Validator) bool) {
 	}
 }
 
+func (vals *ValidatorSet) ResetPriorities() {
+	for _, val := range vals.Validators {
+		val.ProposerPriority = 0
+	}
+}
+
 // Checks changes against duplicates, splits the changes in updates and
 // removals, sorts them by address.
 //