Merge branch 'fix/excess-propose-signals' into feature/fix-excess-plus-1-sec

Author: Frozen

consensus/consensus.go

@@ -33,13 +33,18 @@ const (
 var errLeaderPriKeyNotFound = errors.New("leader private key not found locally")
 
 type Proposal struct {
-	Type   ProposalType
-	Caller string
+	Type     ProposalType
+	Caller   string
+	blockNum uint64
 }
 
 // NewProposal creates a new proposal
-func NewProposal(t ProposalType) Proposal {
-	return Proposal{Type: t, Caller: utils.GetCallStackInfo(2)}
+func NewProposal(t ProposalType, blockNum uint64) Proposal {
+	return Proposal{
+		Type:     t,
+		Caller:   utils.GetCallStackInfo(2),
+		blockNum: blockNum,
+	}
 }
 
 // ProposalType is to indicate the type of signal for new block proposal

consensus/consensus_service.go

@@ -498,7 +498,7 @@ func (consensus *Consensus) updateConsensusInformation(reason string) Mode {
 					consensus.GetLogger().Info().
 						Str("myKey", myPubKeys.SerializeToHexStr()).
 						Msg("[UpdateConsensusInformation] I am the New Leader")
-					consensus.ReadySignal(NewProposal(SyncProposal), "updateConsensusInformation", "leader changed and I am the new leader")
+					consensus.ReadySignal(NewProposal(SyncProposal, curHeader.NumberU64()+1), "updateConsensusInformation", "leader changed and I am the new leader")
 				}()
 			}
 			return Normal

consensus/consensus_v2.go

@@ -292,7 +292,7 @@ func (consensus *Consensus) _finalCommit(isLeader bool) {
 			// No pipelining
 			go func() {
 				consensus.getLogger().Info().Msg("[finalCommit] sending block proposal signal")
-				consensus.ReadySignal(NewProposal(SyncProposal), "finalCommit", "I am leader and it's the last block in epoch")
+				consensus.ReadySignal(NewProposal(SyncProposal, block.NumberU64()+1), "finalCommit", "I am leader and it's the last block in epoch")
 			}()
 		} else {
 			// pipelining
@@ -368,7 +368,7 @@ func (consensus *Consensus) StartChannel() {
 		consensus.start = true
 		consensus.getLogger().Info().Time("time", time.Now()).Msg("[ConsensusMainLoop] Send ReadySignal")
 		consensus.mutex.Unlock()
-		consensus.ReadySignal(NewProposal(SyncProposal), "StartChannel", "consensus channel is started")
+		consensus.ReadySignal(NewProposal(SyncProposal, consensus.Blockchain().CurrentHeader().NumberU64()+1), "StartChannel", "consensus channel is started")
 		return
 	}
 	consensus.mutex.Unlock()
@@ -620,12 +620,23 @@ func (consensus *Consensus) preCommitAndPropose(blk *types.Block) error {
 		// Send signal to Node to propose the new block for consensus
 		consensus.getLogger().Info().Msg("[preCommitAndPropose] sending block proposal signal")
 		consensus.mutex.Unlock()
-		consensus.ReadySignal(NewProposal(AsyncProposal), "preCommitAndPropose", "proposing new block which will wait on the full commit signatures to finish")
+		if !consensus.isRotation(blk.Epoch()) {
+			consensus.ReadySignal(NewProposal(AsyncProposal, blk.NumberU64()+1), "preCommitAndPropose, before rotation", "proposing new block which will wait on the full commit signatures to finish")
+		} else {
+			next := consensus.rotateLeader(blk.Epoch(), consensus.getLeaderPubKey())
+			if consensus.isMyKey(next) {
+				consensus.ReadySignal(NewProposal(AsyncProposal, blk.NumberU64()+1), "preCommitAndPropose rotation", "proposing new block which will wait on the full commit signatures to finish")
+			}
+		}
 	}()
 
 	return nil
 }
 
+func (consensus *Consensus) isRotation(epoch *big.Int) bool {
+	return consensus.Blockchain().Config().IsLeaderRotationInternalValidators(epoch)
+}
+
 func (consensus *Consensus) verifyLastCommitSig(lastCommitSig []byte, blk *types.Block) error {
 	if len(lastCommitSig) < bls.BLSSignatureSizeInBytes {
 		return errors.New("lastCommitSig not have enough length")
@@ -873,7 +884,7 @@ func (consensus *Consensus) setupForNewConsensus(blk *types.Block, committedMsg
 				blockPeriod := consensus.BlockPeriod
 				go func() {
 					<-time.After(blockPeriod)
-					consensus.ReadySignal(NewProposal(SyncProposal), "setupForNewConsensus", "I am the new leader")
+					consensus.ReadySignal(NewProposal(SyncProposal, blk.NumberU64()+1), "setupForNewConsensus", "I am the new leader")
 				}()
 			}
 		}

consensus/leader.go

@@ -330,6 +330,7 @@ func (consensus *Consensus) onCommit(recvMsg *FBFTMessage) {
 			// only do early commit if it's not epoch block to avoid problems
 			consensus.preCommitAndPropose(blockObj)
 		}
+
 		consensus.transitions.finalCommit = true
 		waitTime := 1000 * time.Millisecond
 		maxWaitTime := time.Until(consensus.NextBlockDue) - 200*time.Millisecond

consensus/proposer.go

@@ -43,7 +43,7 @@ func (p *Proposer) WaitForConsensusReadyV2(stopChan chan struct{}, stoppedChan c
 				for retryCount := 0; retryCount < 3 && consensus.IsLeader(); retryCount++ {
 					time.Sleep(SleepPeriod)
 					utils.Logger().Info().
-						Uint64("blockNum", consensus.Blockchain().CurrentBlock().NumberU64()+1).
+						Uint64("blockNum", proposal.blockNum).
 						Bool("asyncProposal", proposal.Type == AsyncProposal).
 						Str("called", proposal.Caller).
 						Msg("PROPOSING NEW BLOCK ------------------------------------------------")

consensus/view_change.go

@@ -440,7 +440,7 @@ func (consensus *Consensus) onViewChange(recvMsg *FBFTMessage) {
 				consensus.getLogger().Error().Err(err).Msg("[onViewChange] startNewView failed")
 				return
 			}
-			go consensus.ReadySignal(NewProposal(SyncProposal), "onViewChange", "quorum is achieved by mask and is view change mode and M1 payload is empty")
+			go consensus.ReadySignal(NewProposal(SyncProposal, consensus.Blockchain().CurrentHeader().NumberU64()+1), "onViewChange", "quorum is achieved by mask and is view change mode and M1 payload is empty")
 			return
 		}
 

internal/params/config.go

@@ -312,8 +312,8 @@ var (
 		SlotsLimitedEpoch:                     EpochTBD, // epoch to enable HIP-16
 		CrossShardXferPrecompileEpoch:         big.NewInt(1),
 		AllowlistEpoch:                        EpochTBD,
-		LeaderRotationInternalValidatorsEpoch: big.NewInt(5),
-		LeaderRotationExternalValidatorsEpoch: big.NewInt(6),
+		LeaderRotationInternalValidatorsEpoch: big.NewInt(3),
+		LeaderRotationExternalValidatorsEpoch: big.NewInt(3),
 		LeaderRotationV2Epoch:                 EpochTBD,
 		FeeCollectEpoch:                       big.NewInt(2),
 		ValidatorCodeFixEpoch:                 big.NewInt(2),