From 3011d83e6fd24872c25dbf9f85a31cd4a05bd72f Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 11 Feb 2026 14:50:39 +0100
Subject: [PATCH] cmd/evm/internal/t8ntool, core/rawdb: fix RLP iterator error
 handling (#33820)

This fixes two cases where `Iterator.Err()` was misused. The method will
only return an error after `Next()` has returned false, so it makes no
sense to check for the error within the loop itself.
---
 cmd/evm/internal/t8ntool/transaction.go | 7 ++++---
 core/rawdb/accessors_indexes.go         | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go
index 0f39df0753..4ba7b5f130 100644
--- a/cmd/evm/internal/t8ntool/transaction.go
+++ b/cmd/evm/internal/t8ntool/transaction.go
@@ -115,9 +115,6 @@ func Transaction(ctx *cli.Context) error {
 	}
 	var results []result
 	for it.Next() {
-		if err := it.Err(); err != nil {
-			return NewError(ErrorIO, err)
-		}
 		var tx types.Transaction
 		err := rlp.DecodeBytes(it.Value(), &tx)
 		if err != nil {
@@ -188,6 +185,10 @@ func Transaction(ctx *cli.Context) error {
 		}
 		results = append(results, r)
 	}
+	if err := it.Err(); err != nil {
+		return NewError(ErrorIO, err)
+	}
+
 	out, err := json.MarshalIndent(results, "", "  ")
 	fmt.Println(string(out))
 	return err
diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go
index 10eb454015..8c8c3ec9bb 100644
--- a/core/rawdb/accessors_indexes.go
+++ b/core/rawdb/accessors_indexes.go
@@ -147,9 +147,6 @@ func findTxInBlockBody(blockbody rlp.RawValue, target common.Hash) (*types.Trans
 	}
 	txIndex := uint64(0)
 	for iter.Next() {
-		if iter.Err() != nil {
-			return nil, 0, iter.Err()
-		}
 		// The preimage for the hash calculation of legacy transactions
 		// is just their RLP encoding. For typed (EIP-2718) transactions,
 		// which are encoded as byte arrays, the preimage is the content of
@@ -171,6 +168,9 @@ func findTxInBlockBody(blockbody rlp.RawValue, target common.Hash) (*types.Trans
 		}
 		txIndex++
 	}
+	if iter.Err() != nil {
+		return nil, 0, iter.Err()
+	}
 	return nil, 0, errors.New("transaction not found")
 }