fix comments

unclezoro · Sep 26, 2021 · 065e69e · 065e69e
1 parent 4a84cfd
commit 065e69e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/consensus/parlia/parlia.go b/consensus/parlia/parlia.go
@@ -886,15 +886,18 @@ func (p *Parlia) Seal(chain consensus.ChainHeaderReader, block *types.Block, res
 }
 
 func (p *Parlia) shouldWaitForCurrentBlockProcess(chain consensus.ChainHeaderReader, header *types.Header, snap *Snapshot) bool {
+	if snap.inturn(p.val) {
+		return false
+	}
+
 	highestVerifiedHeader := chain.GetHighestVerifiedHeader()
-	if highestVerifiedHeader == nil || highestVerifiedHeader.Number == nil {
+	if highestVerifiedHeader == nil {
 		return false
 	}
 
-	if !snap.inturn(p.val) && header.Number.Cmp(highestVerifiedHeader.Number) == 0 {
+	if header.ParentHash == highestVerifiedHeader.ParentHash && header.Difficulty.Cmp(highestVerifiedHeader.Difficulty) < 0 {
 		return true
 	}
-
 	return false
 }
 

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -2001,7 +2001,15 @@ func (bc *BlockChain) updateHighestVerifiedHeader(header *types.Header) {
 		return
 	}
 	currentHeader := bc.highestVerifiedHeader.Load().(*types.Header)
-	if currentHeader == nil || currentHeader.Number == nil || currentHeader.Number.Cmp(header.Number) < 0 {
+	if currentHeader == nil {
+		bc.highestVerifiedHeader.Store(types.CopyHeader(header))
+		return
+	}
+
+	newTD := big.NewInt(0).Add(bc.GetTdByHash(header.ParentHash), header.Difficulty)
+	oldTD := big.NewInt(0).Add(bc.GetTdByHash(currentHeader.ParentHash), currentHeader.Difficulty)
+
+	if newTD.Cmp(oldTD) > 0 {
 		bc.highestVerifiedHeader.Store(types.CopyHeader(header))
 		return
 	}