core/rawdb: return iterator error in findTxInBlockBody (#33188)

radik878 · web-flow · commit 95273afec466 · 2025-11-14T13:55:41.000+01:00
The iterator loop in findTxInBlockBody returned the outer-scoped err
when iter.Err() was non-nil, which could incorrectly propagate a nil or
stale error and hide actual RLP decoding issues. This patch returns
iter.Err() as intended by the rlp list iterator API, matching
established patterns elsewhere in the codebase and improving diagnostics
when encountering malformed transaction entries.
diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go
@@ -148,7 +148,7 @@ func findTxInBlockBody(blockbody rlp.RawValue, target common.Hash) (*types.Trans
 	txIndex := uint64(0)
 	for iter.Next() {
 		if iter.Err() != nil {
-			return nil, 0, err
+			return nil, 0, iter.Err()
 		}
 		// The preimage for the hash calculation of legacy transactions
 		// is just their RLP encoding. For typed (EIP-2718) transactions,

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func findTxInBlockBody(blockbody rlp.RawValue, target common.Hash) (*types.Trans`
`148`	`148`	`txIndex := uint64(0)`
`149`	`149`	`for iter.Next() {`
`150`	`150`	`if iter.Err() != nil {`
`151`		`- return nil, 0, err`
	`151`	`+ return nil, 0, iter.Err()`
`152`	`152`	`}`
`153`	`153`	`// The preimage for the hash calculation of legacy transactions`
`154`	`154`	`// is just their RLP encoding. For typed (EIP-2718) transactions,`