Fixed excess propose on epoch change.

Author: Frozen

consensus/consensus.go

@@ -39,10 +39,17 @@ type Proposal struct {
 }
 
 // NewProposal creates a new proposal
-func NewProposal(t ProposalType, blockNum uint64) Proposal {
+func NewProposal(t ProposalType, blockNum uint64, stackTrace ...string) Proposal {
+	if len(stackTrace) > 0 {
+		return Proposal{
+			Type:     t,
+			Caller:   stackTrace[0],
+			blockNum: blockNum,
+		}
+	}
 	return Proposal{
 		Type:     t,
-		Caller:   utils.GetCallStackInfo(2),
+		Caller:   utils.GetStackTrace(2),
 		blockNum: blockNum,
 	}
 }

consensus/consensus_service.go

@@ -497,11 +497,12 @@ func (consensus *Consensus) updateConsensusInformation(reason string) Mode {
 			// If the leader changed and I myself become the leader
 			if (oldLeader != nil && consensus.getLeaderPubKey() != nil &&
 				!consensus.getLeaderPubKey().Object.IsEqual(oldLeader.Object)) && consensus.isLeader() {
+				trace := utils.GetStackTrace(1)
 				go func() {
 					consensus.GetLogger().Info().
 						Str("myKey", myPubKeys.SerializeToHexStr()).
 						Msg("[UpdateConsensusInformation] I am the New Leader")
-					consensus.ReadySignal(NewProposal(SyncProposal, curHeader.NumberU64()+1), "updateConsensusInformation", "leader changed and I am the new leader")
+					consensus.ReadySignal(NewProposal(SyncProposal, curHeader.NumberU64()+1, trace), "updateConsensusInformation", "leader changed and I am the new leader")
 				}()
 			}
 			return Normal

consensus/consensus_v2.go

@@ -234,6 +234,7 @@ func (consensus *Consensus) _finalCommit(isLeader bool) {
 	}
 
 	block.SetCurrentCommitSig(commitSigAndBitmap)
+	// commitBlock internally calls setupForNewConsensus, which updates leader key
 	err = consensus.commitBlock(block, FBFTMsg)
 
 	if err != nil || consensus.BlockNum()-beforeCatchupNum != 1 {
@@ -290,10 +291,13 @@ func (consensus *Consensus) _finalCommit(isLeader bool) {
 	if isLeader {
 		if block.IsLastBlockInEpoch() {
 			// No pipelining
-			go func() {
-				consensus.getLogger().Info().Msg("[finalCommit] sending block proposal signal")
-				consensus.ReadySignal(NewProposal(SyncProposal, block.NumberU64()+1), "finalCommit", "I am leader and it's the last block in epoch")
-			}()
+			trace := utils.GetStackTrace(1)
+			if consensus.isMyKey(consensus.getLeaderPubKey()) {
+				go func() {
+					consensus.getLogger().Info().Msg("[finalCommit] sending block proposal signal")
+					consensus.ReadySignal(NewProposal(SyncProposal, block.NumberU64()+1, trace), "finalCommit", "I am leader and it's the last block in epoch")
+				}()
+			}
 		} else {
 			// pipelining
 			go func() {
@@ -726,6 +730,9 @@ func (consensus *Consensus) commitBlock(blk *types.Block, committedMsg *FBFTMess
 // rotateLeader rotates the leader to the next leader in the committee.
 // This function must be called with enabled leader rotation.
 func (consensus *Consensus) rotateLeader(epoch *big.Int, defaultKey *bls.PublicKeyWrapper) *bls.PublicKeyWrapper {
+	if !consensus.isRotation(epoch) {
+		return defaultKey
+	}
 	var (
 		bc        = consensus.Blockchain()
 		leader    = consensus.getLeaderPubKey()
@@ -882,9 +889,10 @@ func (consensus *Consensus) setupForNewConsensus(blk *types.Block, committedMsg
 			if consensus.isLeader() && newLeader && !wasLeader {
 				// leader changed
 				blockPeriod := consensus.BlockPeriod
+				trace := utils.GetStackTrace(1)
 				go func() {
 					<-time.After(blockPeriod)
-					consensus.ReadySignal(NewProposal(SyncProposal, blk.NumberU64()+1), "setupForNewConsensus", "I am the new leader")
+					consensus.ReadySignal(NewProposal(SyncProposal, blk.NumberU64()+1, trace), "setupForNewConsensus", "I am the new leader")
 				}()
 			}
 		}

internal/utils/utils.go

@@ -277,3 +277,19 @@ func FatalError(err error) {
 func FatalErrMsg(err error, format string, args ...interface{}) {
 	FatalError(errors.WithMessagef(err, format, args...))
 }
+
+func GetStackTrace(i int) string {
+	stackBuf := strings.Builder{}
+
+	for ; ; i++ {
+		_, file, line, ok := runtime.Caller(i)
+		if !ok {
+			break
+		}
+		stackBuf.WriteString(file)
+		stackBuf.WriteString(":")
+		stackBuf.WriteString(fmt.Sprint(line))
+		stackBuf.WriteString(" ")
+	}
+	return stackBuf.String()
+}

internal/utils/utils_test.go

@@ -130,3 +130,10 @@ func TestIsPrivateIP(t *testing.T) {
 		}
 	}
 }
+
+func TestGetStackTrace(t *testing.T) {
+	stack := GetStackTrace()
+	if len(stack) == 0 {
+		t.Errorf("GetStackTrace failed")
+	}
+}