From a780983dfacd9d15e713ea3d77e6813aec36cf81 Mon Sep 17 00:00:00 2001 From: Jared Wasinger Date: Tue, 3 Feb 2026 12:01:19 -0500 Subject: [PATCH] fix build --- beacon/engine/types.go | 4 ---- eth/tracers/api.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/beacon/engine/types.go b/beacon/engine/types.go index 88c52ec471..27f11f3742 100644 --- a/beacon/engine/types.go +++ b/beacon/engine/types.go @@ -363,12 +363,8 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types. Withdrawals: block.Withdrawals(), BlobGasUsed: block.BlobGasUsed(), ExcessBlobGas: block.ExcessBlobGas(), -<<<<<<< HEAD -======= BlockAccessList: block.AccessList(), ->>>>>>> 959ade7689 (a bunch of changes. mostly bal persistence and removing bal from block body object. wip...) SlotNumber: block.SlotNumber(), - BlockAccessList: block.Body().AccessList, } // Add blobs. diff --git a/eth/tracers/api.go b/eth/tracers/api.go index 211f0dbd62..5f2f16627a 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -1055,7 +1055,7 @@ func (api *API) traceTx(ctx context.Context, tx *types.Transaction, message *cor // Call Prepare to clear out the statedb access list statedb.SetTxContext(txctx.TxHash, txctx.TxIndex) - _, err = core.ApplyTransactionWithEVM(message, new(core.GasPool).AddGas(message.GasLimit), statedb, vmctx.BlockNumber, txctx.BlockHash, vmctx.Time, tx, &usedGas, new(uint64), evm) + _, err = core.ApplyTransactionWithEVM(message, new(core.GasPool).AddGas(message.GasLimit), statedb, vmctx.BlockNumber, txctx.BlockHash, vmctx.Time, tx, &usedGas, evm) if err != nil { return nil, fmt.Errorf("tracing failed: %w", err) }