From 17bfe7af4461c5982ce9bc788b2131b83e7b96bb Mon Sep 17 00:00:00 2001
From: Daniel Liu <139250065@qq.com>
Date: Wed, 20 Aug 2025 14:35:07 +0800
Subject: [PATCH] eth: add error when accessing missing block state #18346
 (#1355)

---
 eth/api_backend.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eth/api_backend.go b/eth/api_backend.go
index 3569012186..01b2ee4bc4 100644
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@@ -203,9 +203,12 @@ func (b *EthAPIBackend) StateAndHeaderByNumber(ctx context.Context, blockNr rpc.
 	}
 	// Otherwise resolve the block number and return its state
 	header, err := b.HeaderByNumber(ctx, blockNr)
-	if header == nil || err != nil {
+	if err != nil {
 		return nil, nil, err
 	}
+	if header == nil {
+		return nil, nil, errors.New("header not found")
+	}
 	stateDb, err := b.eth.BlockChain().StateAt(header.Root)
 	if err != nil {
 		return nil, nil, err