From e68c5b213d5e1b3e5ea24746ca9ced95cf96fbe3 Mon Sep 17 00:00:00 2001
From: jonny rhea <jonathan.rhea@gmail.com>
Date: Sat, 14 Feb 2026 11:47:06 -0600
Subject: [PATCH] core, eth/catalyst: update spanEnd to use error pointer

---
 core/blockchain.go      | 6 +++---
 core/state_processor.go | 4 ++--
 eth/catalyst/api.go     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/blockchain.go b/core/blockchain.go
index dd98e9808a..d41f301243 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -2168,7 +2168,7 @@ func (bc *BlockChain) ProcessBlock(ctx context.Context, parentRoot common.Hash,
 	pstart := time.Now()
 	pctx, _, spanEnd := telemetry.StartSpan(ctx, "bc.processor.Process")
 	res, err := bc.processor.Process(pctx, block, statedb, bc.cfg.VmConfig)
-	spanEnd(err)
+	spanEnd(&err)
 	if err != nil {
 		bc.reportBadBlock(block, res, err)
 		return nil, err
@@ -2178,7 +2178,7 @@ func (bc *BlockChain) ProcessBlock(ctx context.Context, parentRoot common.Hash,
 	vstart := time.Now()
 	_, _, spanEnd = telemetry.StartSpan(ctx, "bc.validator.ValidateState")
 	err = bc.validator.ValidateState(block, statedb, res, false)
-	spanEnd(err)
+	spanEnd(&err)
 	if err != nil {
 		bc.reportBadBlock(block, res, err)
 		return nil, err
@@ -2662,7 +2662,7 @@ func (bc *BlockChain) reorg(oldHead *types.Header, newHead *types.Header) error
 // procedure.
 func (bc *BlockChain) InsertBlockWithoutSetHead(ctx context.Context, block *types.Block, makeWitness bool) (witness *stateless.Witness, err error) {
 	_, _, spanEnd := telemetry.StartSpan(ctx, "core.blockchain.InsertBlockWithoutSetHead")
-	defer spanEnd(err)
+	defer spanEnd(&err)
 	if !bc.chainmu.TryLock() {
 		return nil, errChainStopped
 	}
diff --git a/core/state_processor.go b/core/state_processor.go
index 50f4d303f5..0c2942e42f 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -108,7 +108,7 @@ func (p *StateProcessor) Process(ctx context.Context, block *types.Block, stated
 			telemetry.Int64Attribute("tx.index", int64(i)),
 		)
 		receipt, err := ApplyTransactionWithEVM(msg, gp, statedb, blockNumber, blockHash, context.Time, tx, usedGas, evm)
-		spanEnd(err)
+		spanEnd(&err)
 		if err != nil {
 			return nil, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
 		}
@@ -134,7 +134,7 @@ func (p *StateProcessor) Process(ctx context.Context, block *types.Block, stated
 // postExecution processes the post-execution system calls if Prague is enabled.
 func postExecution(ctx context.Context, config *params.ChainConfig, block *types.Block, allLogs []*types.Log, evm *vm.EVM) (requests [][]byte, err error) {
 	_, _, spanEnd := telemetry.StartSpan(ctx, "core.postExecution")
-	defer spanEnd(err)
+	defer spanEnd(&err)
 	// Read requests if Prague is enabled.
 	if config.IsPrague(block.Number(), block.Time()) {
 		requests = [][]byte{}
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
index 1711c54c2b..1850e4ce40 100644
--- a/eth/catalyst/api.go
+++ b/eth/catalyst/api.go
@@ -719,7 +719,7 @@ func (api *ConsensusAPI) newPayload(ctx context.Context, params engine.Executabl
 		telemetry.Int64Attribute("tx.count", int64(len(params.Transactions))),
 	}
 	ctx, _, spanEnd := telemetry.StartSpan(ctx, "engine.newPayload", attrs...)
-	defer spanEnd(err)
+	defer spanEnd(&err)
 	api.newPayloadLock.Lock()
 	defer api.newPayloadLock.Unlock()