feat: wait miner finish the later multi-proposals when restarting the node;

consensus/parlia/snapshot.go

@@ -426,10 +426,13 @@ func (s *Snapshot) nextProposalBlock(proposer common.Address) (uint64, uint64, e
 	currentProposer := validators[s.Number/uint64(s.TurnLength)%uint64(len(validators))]
 	currentIndex := s.indexOfVal(currentProposer)
 	expectIndex := s.indexOfVal(proposer)
+	if currentIndex < 0 {
+		return 0, 0, errors.New("currentProposer not in validator set")
+	}
 	if expectIndex < 0 {
 		return 0, 0, errors.New("proposer not in validator set")
 	}
-	startBlock := uint64((expectIndex+len(validators)-currentIndex)%len(validators)*int(s.TurnLength)) + s.Number
+	startBlock := s.Number + uint64(((expectIndex+len(validators)-currentIndex)%len(validators))*int(s.TurnLength))
 	startBlock = startBlock - startBlock%uint64(s.TurnLength)
 	endBlock := startBlock + uint64(s.TurnLength) - 1
 

miner/minerconfig/config.go

@@ -36,7 +36,7 @@ type Config struct {
 	GasPrice              *big.Int       // Minimum gas price for mining a transaction
 	Recommit              time.Duration  // The time interval for miner to re-create mining work.
 	VoteEnable            bool           // Whether to vote when mining
-	MaxWaitProposalInSecs uint64         // The maximum time to wait for the proposal to be done, it's aimed to prevent validator slashed when restarting
+	MaxWaitProposalInSecs uint64         // The maximum time to wait for the proposal to be done, it's aimed to prevent validator being slashed when restarting
 
 	DisableVoteAttestation bool // Whether to skip assembling vote attestation
 
@@ -56,7 +56,7 @@ var DefaultConfig = Config{
 	DelayLeftOver: 50 * time.Millisecond,
 
 	// The default value is set to 30 seconds.
-	// Because the avg restart time in mainnet is around 30s, so the node try to wait for next proposal done.
+	// Because the avg restart time in mainnet is around 30s, so the node try to wait for the next multi-proposals to be done.
 	MaxWaitProposalInSecs: 30,
 
 	Mev: DefaultMevConfig,

miner/worker.go

@@ -1516,24 +1516,25 @@ func (w *worker) tryWaitProposalDoneWhenStopping() {
 	}
 
 	currentHeader := w.chain.CurrentBlock()
-	startBlock, endBlock, err := posa.NextProposalBlock(w.chain, w.chain.CurrentBlock(), w.coinbase)
+	currentBlock := currentHeader.Number.Uint64()
+	startBlock, endBlock, err := posa.NextProposalBlock(w.chain, currentHeader, w.coinbase)
 	if err != nil {
 		log.Warn("Failed to get next proposal block", "err", err)
 		return
 	}
+	log.Info("Checking miner's next proposal block", "current", currentBlock,
+		"proposalStart", startBlock, "proposalEnd", endBlock, "maxWait", w.config.MaxWaitProposalInSecs)
 
-	currentBlock := currentHeader.Number.Uint64()
+	if endBlock < currentBlock {
+		log.Warn("next proposal end block has passed, ignore")
+		return
+	}
 	waitSecs := (endBlock - currentBlock) * posa.BlockInterval()
 	if waitSecs > 0 && waitSecs <= w.config.MaxWaitProposalInSecs {
 		log.Info("The miner will propose in later, waiting for the proposal to be done",
 			"currentBlock", currentBlock, "nextProposalStart", startBlock, "nextProposalEnd", endBlock, "waitTime", waitSecs)
 		time.Sleep(time.Duration(waitSecs) * time.Second)
 	}
-	if startBlock <= currentBlock && currentBlock < endBlock {
-		log.Info("The miner is proposing, waiting for the proposal to be done",
-			"currentBlock", currentBlock, "nextProposalStart", startBlock, "nextProposalEnd", endBlock, "waitTime", waitSecs)
-		time.Sleep(time.Duration(waitSecs) * time.Second)
-	}
 }
 
 // copyReceipts makes a deep copy of the given receipts.