[consensus] Continuously as Proposer in N rounds

action/protocol/rolldpos/epoch.go

@@ -27,6 +27,9 @@ type Protocol struct {
 	numSubEpochsDardanelles uint64
 	dardanellesHeight       uint64
 	dardanellesOn           bool
+	wakeHeight              uint64
+	numProposalBatch        uint64
+	numProposalBatchWake    uint64
 }
 
 // FindProtocol return a registered protocol from registry
@@ -74,6 +77,15 @@ func EnableDardanellesSubEpoch(height, numSubEpochs uint64) Option {
 	}
 }
 
+// EnableWakeProposalBatch will set the wake height and number of proposal batch wake
+func EnableWakeProposalBatch(wakeHeight, numProposalBatchWake uint64) Option {
+	return func(p *Protocol) error {
+		p.wakeHeight = wakeHeight
+		p.numProposalBatchWake = numProposalBatchWake
+		return nil
+	}
+}
+
 // NewProtocol returns a new rolldpos protocol
 func NewProtocol(numCandidateDelegates, numDelegates, numSubEpochs uint64, opts ...Option) *Protocol {
 	if numCandidateDelegates < numDelegates {
@@ -83,6 +95,7 @@ func NewProtocol(numCandidateDelegates, numDelegates, numSubEpochs uint64, opts
 		numCandidateDelegates: numCandidateDelegates,
 		numDelegates:          numDelegates,
 		numSubEpochs:          numSubEpochs,
+		numProposalBatch:      1,
 	}
 	for _, opt := range opts {
 		if err := opt(p); err != nil {
@@ -260,3 +273,12 @@ func (p *Protocol) ProductivityByEpoch(
 	produce, err := productivity(epochStartHeight, epochEndHeight)
 	return epochEndHeight - epochStartHeight + 1, produce, err
 }
+
+// ProposalBatchSizeByEpoch returns the number of proposal batch size in an epoch
+func (p *Protocol) ProposalBatchSizeByEpoch(epochNum uint64) uint64 {
+	height := p.GetEpochHeight(epochNum)
+	if p.wakeHeight > 0 && height >= p.wakeHeight {
+		return p.numProposalBatchWake
+	}
+	return p.numProposalBatch
+}

blockchain/genesis/genesis.go

@@ -54,6 +54,7 @@ func defaultConfig() Genesis {
 			NumCandidateDelegates:     36,
 			TimeBasedRotation:         false,
 			MinBlocksForBlobRetention: 345600,
+			WakeNumProposalBatchSize:  5,
 			PacificBlockHeight:        432001,
 			AleutianBlockHeight:       864001,
 			BeringBlockHeight:         1512001,
@@ -79,6 +80,7 @@ func defaultConfig() Genesis {
 			TsunamiBlockHeight:        29275561,
 			UpernavikBlockHeight:      31174201,
 			VanuatuBlockHeight:        33730921,
+			WakeBlockHeight:           math.MaxUint64,
 			ToBeEnabledBlockHeight:    math.MaxUint64,
 		},
 		Account: Account{
@@ -186,6 +188,8 @@ type (
 		TimeBasedRotation bool `yaml:"timeBasedRotation"`
 		// MinBlocksForBlobRetention is the minimum number of blocks for blob retention
 		MinBlocksForBlobRetention uint64 `yaml:"minBlocksForBlobRetention"`
+		// WakeNumProposalBatchSize is the number of proposals in a batch
+		WakeNumProposalBatchSize uint64 `yaml:"numProposalBatchSize"`
 		// PacificBlockHeight is the start height of using the logic of Pacific version
 		// TODO: PacificBlockHeight is not added into protobuf definition for backward compatibility
 		PacificBlockHeight uint64 `yaml:"pacificHeight"`
@@ -276,6 +280,9 @@ type (
 		// 1. enable Cancun EVM
 		// 2. enable dynamic fee tx
 		VanuatuBlockHeight uint64 `yaml:"vanuatuHeight"`
+		// WakeBlockHeight is the start height to
+		// 1. enable 3s block interval
+		WakeBlockHeight uint64 `yaml:"wakeHeight"`
 		// ToBeEnabledBlockHeight is a fake height that acts as a gating factor for WIP features
 		// upon next release, change IsToBeEnabled() to IsNextHeight() for features to be released
 		ToBeEnabledBlockHeight uint64 `yaml:"toBeEnabledHeight"`
@@ -641,6 +648,11 @@ func (g *Blockchain) IsVanuatu(height uint64) bool {
 	return g.isPost(g.VanuatuBlockHeight, height)
 }
 
+// IsWake checks whether height is equal to or larger than wake height
+func (g *Blockchain) IsWake(height uint64) bool {
+	return g.isPost(g.WakeBlockHeight, height)
+}
+
 // IsToBeEnabled checks whether height is equal to or larger than toBeEnabled height
 func (g *Blockchain) IsToBeEnabled(height uint64) bool {
 	return g.isPost(g.ToBeEnabledBlockHeight, height)

chainservice/builder.go

@@ -718,6 +718,7 @@ func (builder *Builder) registerRollDPoSProtocol() error {
 		builder.cfg.Genesis.NumDelegates,
 		builder.cfg.Genesis.NumSubEpochs,
 		rolldpos.EnableDardanellesSubEpoch(builder.cfg.Genesis.DardanellesBlockHeight, builder.cfg.Genesis.DardanellesNumSubEpochs),
+		rolldpos.EnableWakeProposalBatch(builder.cfg.Genesis.WakeBlockHeight, builder.cfg.Genesis.WakeNumProposalBatchSize),
 	).Register(builder.cs.registry); err != nil {
 		return err
 	}

consensus/scheme/rolldpos/rolldpos_test.go

@@ -200,7 +200,7 @@ func TestValidateBlockFooter(t *testing.T) {
 	blockHeight := uint64(8)
 	footer := &block.Footer{}
 	bc := mock_blockchain.NewMockBlockchain(ctrl)
-	bc.EXPECT().BlockFooterByHeight(blockHeight).Return(footer, nil).Times(5)
+	bc.EXPECT().BlockFooterByHeight(blockHeight).Return(footer, nil).AnyTimes()
 
 	sk1 := identityset.PrivateKey(1)
 	g := genesis.Default
@@ -216,7 +216,7 @@ func TestValidateBlockFooter(t *testing.T) {
 		Genesis:            g,
 		SystemActive:       true,
 	}
-	bc.EXPECT().Genesis().Return(g).Times(5)
+	bc.EXPECT().Genesis().Return(g).AnyTimes()
 	rp := rolldpos.NewProtocol(
 		g.NumCandidateDelegates,
 		g.NumDelegates,

consensus/scheme/rolldpos/roundcalculator.go

@@ -276,7 +276,8 @@ func (c *roundCalculator) calculateProposer(
 		err = errors.New("invalid proposer list")
 		return
 	}
-	idx := height
+	proposalBatch := c.rp.ProposalBatchSizeByEpoch(c.rp.GetEpochNum(height))
+	idx := height / proposalBatch
 	if c.timeBasedRotation {
 		idx += uint64(round)
 	}