Merge pull request #3442 from rlan35/main

Avoid reset state that's resetting committed content.

api/service/syncing/syncing.go

@@ -1025,7 +1025,6 @@ func (ss *StateSync) SyncLoop(bc *core.BlockChain, worker *worker.Worker, isBeac
 		if err := ss.addConsensusLastMile(bc, consensus); err != nil {
 			utils.Logger().Error().Err(err).Msg("[SYNC] Add consensus last mile")
 		}
-		consensus.SetMode(consensus.UpdateConsensusInformation())
 	}
 	ss.purgeAllBlocksFromCache()
 }

consensus/consensus_v2.go

@@ -535,47 +535,48 @@ func (consensus *Consensus) preCommitAndPropose(blk *types.Block) error {
 	}
 
 	// Construct committed message
-	consensus.mutex.Lock()
 	network, err := consensus.construct(msg_pb.MessageType_COMMITTED, nil, []*bls.PrivateKeyWrapper{leaderPriKey})
-	consensus.mutex.Unlock()
 	if err != nil {
 		consensus.getLogger().Warn().Err(err).
 			Msg("[preCommitAndPropose] Unable to construct Committed message")
 		return err
 	}
-	msgToSend, FBFTMsg :=
-		network.Bytes,
-		network.FBFTMsg
-	bareMinimumCommit := FBFTMsg.Payload
-	consensus.FBFTLog.AddMessage(FBFTMsg)
 
-	blk.SetCurrentCommitSig(bareMinimumCommit)
+	go func() {
+		msgToSend, FBFTMsg :=
+			network.Bytes,
+			network.FBFTMsg
+		bareMinimumCommit := FBFTMsg.Payload
+		consensus.FBFTLog.AddMessage(FBFTMsg)
 
-	if _, err := consensus.Blockchain.InsertChain([]*types.Block{blk}, true); err != nil {
-		consensus.getLogger().Error().Err(err).Msg("[preCommitAndPropose] Failed to add block to chain")
-		return err
-	}
+		blk.SetCurrentCommitSig(bareMinimumCommit)
 
-	// if leader successfully finalizes the block, send committed message to validators
-	if err := consensus.msgSender.SendWithRetry(
-		blk.NumberU64(),
-		msg_pb.MessageType_COMMITTED, []nodeconfig.GroupID{
-			nodeconfig.NewGroupIDByShardID(nodeconfig.ShardID(consensus.ShardID)),
-		},
-		p2p.ConstructMessage(msgToSend)); err != nil {
-		consensus.getLogger().Warn().Err(err).Msg("[preCommitAndPropose] Cannot send committed message")
-	} else {
-		consensus.getLogger().Info().
-			Str("blockHash", blk.Hash().Hex()).
-			Uint64("blockNum", consensus.blockNum).
-			Msg("[preCommitAndPropose] Sent Committed Message")
-	}
-	consensus.consensusTimeout[timeoutConsensus].Start()
+		if _, err := consensus.Blockchain.InsertChain([]*types.Block{blk}, true); err != nil {
+			consensus.getLogger().Error().Err(err).Msg("[preCommitAndPropose] Failed to add block to chain")
+		}
+
+		// if leader successfully finalizes the block, send committed message to validators
+		if err := consensus.msgSender.SendWithRetry(
+			blk.NumberU64(),
+			msg_pb.MessageType_COMMITTED, []nodeconfig.GroupID{
+				nodeconfig.NewGroupIDByShardID(nodeconfig.ShardID(consensus.ShardID)),
+			},
+			p2p.ConstructMessage(msgToSend)); err != nil {
+			consensus.getLogger().Warn().Err(err).Msg("[preCommitAndPropose] Cannot send committed message")
+		} else {
+			consensus.getLogger().Info().
+				Str("blockHash", blk.Hash().Hex()).
+				Uint64("blockNum", consensus.blockNum).
+				Msg("[preCommitAndPropose] Sent Committed Message")
+		}
+		consensus.consensusTimeout[timeoutConsensus].Start()
+
+		// Send signal to Node to propose the new block for consensus
+		consensus.getLogger().Info().Msg("[preCommitAndPropose] sending block proposal signal")
 
-	// Send signal to Node to propose the new block for consensus
-	consensus.getLogger().Info().Msg("[preCommitAndPropose] sending block proposal signal")
+		consensus.ReadySignal <- AsyncProposal
+	}()
 
-	consensus.ReadySignal <- AsyncProposal
 	return nil
 }
 

consensus/leader.go

@@ -302,10 +302,10 @@ func (consensus *Consensus) onCommit(msg *msg_pb.Message) {
 
 		if !blockObj.IsLastBlockInEpoch() {
 			// only do early commit if it's not epoch block to avoid problems
-			go func() {
-				// TODO: make it synchronized with commitFinishChan
-				consensus.preCommitAndPropose(blockObj)
-			}()
+
+			// TODO: make it synchronized with commitFinishChan
+			consensus.preCommitAndPropose(blockObj)
+
 		}
 
 		consensus.getLogger().Info().Msg("[OnCommit] Starting Grace Period")