From 26f20b21b4f9695b07e8c6fe96717e8ac82a5743 Mon Sep 17 00:00:00 2001
From: Rez <rez@berachain.com>
Date: Thu, 20 Mar 2025 07:38:06 +1100
Subject: [PATCH] Fix GetHeader

---
 internal/ethapi/simulate.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/ethapi/simulate.go b/internal/ethapi/simulate.go
index 49a5901a4e..ee7e62f2f1 100644
--- a/internal/ethapi/simulate.go
+++ b/internal/ethapi/simulate.go
@@ -109,8 +109,11 @@ func (m *simChainHeadReader) CurrentHeader() *types.Header {
 }
 
 func (m *simChainHeadReader) GetHeader(hash common.Hash, number uint64) *types.Header {
-	header, err := m.Backend.HeaderByHash(m.Context, hash)
-	if err != nil {
+	header, err := m.Backend.HeaderByNumber(m.Context, rpc.BlockNumber(number))
+	if err != nil || header == nil {
+		return nil
+	}
+	if header.Hash() != hash {
 		return nil
 	}
 	return header