From d4a0aff53f1d0cbad1d4bfc7da2278752fd63f22 Mon Sep 17 00:00:00 2001
From: Giulio rebuffo <giulio.rebuffo@gmail.com>
Date: Tue, 5 Jul 2022 20:03:05 +0200
Subject: [PATCH] fixed hive test: Transaction Reorg - Check Blockhash with NP
 on revert (erigon) (#4640)

---
 turbo/stages/headerdownload/header_algos.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/turbo/stages/headerdownload/header_algos.go b/turbo/stages/headerdownload/header_algos.go
index 4d795003198..2e391f208f2 100644
--- a/turbo/stages/headerdownload/header_algos.go
+++ b/turbo/stages/headerdownload/header_algos.go
@@ -1146,6 +1146,13 @@ func (hd *HeaderDownload) ValidatePayload(tx kv.RwTx, header *types.Header, body
 		hd.cleanupOutdateSideForks(*currentHeight, maxDepth)
 		return
 	}
+	// If the block is stored within the side fork it means it was already validated.
+	if _, ok := hd.sideForksBlock[header.Hash()]; ok {
+		status = remote.EngineStatus_VALID
+		latestValidHash = header.Hash()
+		return
+	}
+
 	// if the block is not in range of MAX_DEPTH from head then we do not validate it.
 	if abs64(int64(*currentHeight)-header.Number.Int64()) > maxDepth {
 		status = remote.EngineStatus_ACCEPTED
@@ -1213,10 +1220,7 @@ func (hd *HeaderDownload) FlushNextForkState(tx kv.RwTx) error {
 	if err := hd.nextForkState.Flush(tx); err != nil {
 		return err
 	}
-	// If the side fork hash is now becoming canonical we can clean up.
-	if _, ok := hd.sideForksBlock[hd.nextForkHash]; ok {
-		delete(hd.sideForksBlock, hd.nextForkHash)
-	}
+
 	hd.nextForkState.Close()
 	hd.nextForkHash = common.Hash{}
 	hd.nextForkState = nil