From bc6fe0f52102392a0e4106f0106da0267a6f4f2c Mon Sep 17 00:00:00 2001
From: Piers Powlesland <pierspowlesland@gmail.com>
Date: Tue, 18 Jun 2024 15:36:31 +0100
Subject: [PATCH] Skip uncle hash check for pre gingerbread headers

Pre gingerbread headers do not have a valid uncle hash because they have
no notion of uncles.
---
 eth/downloader/queue.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
index 6ff858d755..06005d96e6 100644
--- a/eth/downloader/queue.go
+++ b/eth/downloader/queue.go
@@ -782,7 +782,8 @@ func (q *queue) DeliverBodies(id string, txLists [][]*types.Transaction, txListH
 		if txListHashes[index] != header.TxHash {
 			return errInvalidBody
 		}
-		if uncleListHashes[index] != header.UncleHash {
+		// Pre gingerbread headers do not have a valid uncle hash.
+		if !header.IsPreGingerbread() && uncleListHashes[index] != header.UncleHash {
 			return errInvalidBody
 		}
 		if header.WithdrawalsHash == nil {