From 37bb0e229b226a545705cc96c6751048a06d518f Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Wed, 22 Apr 2026 10:17:08 +0200 Subject: [PATCH] all: fix rebasing issues --- beacon/engine/types.go | 3 ++- cmd/evm/internal/t8ntool/execution.go | 6 +++--- consensus/clique/clique.go | 3 ++- core/rawdb/accessors_chain_test.go | 17 ++++++++++------- core/state/state_object.go | 3 ++- core/state/statedb.go | 3 ++- core/state/statedb_hooked.go | 3 ++- core/types.go | 3 ++- .../tracetest/selfdestruct_state_test.go | 2 +- 9 files changed, 26 insertions(+), 17 deletions(-) diff --git a/beacon/engine/types.go b/beacon/engine/types.go index 936daf8b95..b29f09118c 100644 --- a/beacon/engine/types.go +++ b/beacon/engine/types.go @@ -18,10 +18,11 @@ package engine import ( "fmt" - "github.com/ethereum/go-ethereum/core/types/bal" "math/big" "slices" + "github.com/ethereum/go-ethereum/core/types/bal" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index 4ac59c6891..b9bf998122 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -274,7 +274,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig, snapshot = statedb.Snapshot() gp = gaspool.Snapshot() ) - _, receipt, err := core.ApplyTransactionWithEVM(msg, gaspool, statedb, vmContext.BlockNumber, blockHash, pre.Env.Timestamp, tx, evm) + _, _, receipt, err := core.ApplyTransactionWithEVM(msg, gaspool, statedb, vmContext.BlockNumber, blockHash, pre.Env.Timestamp, tx, evm) if err != nil { statedb.RevertToSnapshot(snapshot) log.Info("rejected tx", "index", i, "hash", tx.Hash(), "from", msg.From, "error", err) @@ -343,11 +343,11 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig, return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not parse requests logs: %v", err)) } // EIP-7002 - if _, err := core.ProcessWithdrawalQueue(&requests, evm); err != nil { + if _, _, err := core.ProcessWithdrawalQueue(&requests, evm); err != nil { return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not process withdrawal requests: %v", err)) } // EIP-7251 - if _, err := core.ProcessConsolidationQueue(&requests, evm); err != nil { + if _, _, err := core.ProcessConsolidationQueue(&requests, evm); err != nil { return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not process consolidation requests: %v", err)) } } diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 86f87819fa..14ebffb63a 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -21,13 +21,14 @@ import ( "bytes" "errors" "fmt" - "github.com/ethereum/go-ethereum/core/types/bal" "io" "math/big" "math/rand" "sync" "time" + "github.com/ethereum/go-ethereum/core/types/bal" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/lru" diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index c35f56ee07..d52e1cdab3 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -32,7 +32,6 @@ import ( "github.com/ethereum/go-ethereum/crypto/keccak" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "github.com/holiman/uint256" ) // Tests block header storage and retrieval operations. @@ -906,13 +905,17 @@ func makeTestBAL(t *testing.T) (rlp.RawValue, *bal.BlockAccessList) { t.Helper() cb := bal.NewConstructionBlockAccessList() - addr := common.HexToAddress("0x1111111111111111111111111111111111111111") - cb.AccountRead(addr) - cb.StorageRead(addr, common.BytesToHash([]byte{0x01})) - cb.StorageWrite(0, addr, common.BytesToHash([]byte{0x02}), common.BytesToHash([]byte{0xaa})) - cb.BalanceChange(0, addr, uint256.NewInt(100)) - cb.NonceChange(addr, 0, 1) + /* + TODO MariusVanDerWijden fix after rebase + addr := common.HexToAddress("0x1111111111111111111111111111111111111111") + + cb.AccountRead(addr) + cb.StorageRead(addr, common.BytesToHash([]byte{0x01})) + cb.StorageWrite(0, addr, common.BytesToHash([]byte{0x02}), common.BytesToHash([]byte{0xaa})) + cb.BalanceChange(0, addr, uint256.NewInt(100)) + cb.NonceChange(addr, 0, 1) + */ var buf bytes.Buffer if err := cb.EncodeRLP(&buf); err != nil { t.Fatalf("failed to encode BAL: %v", err) diff --git a/core/state/state_object.go b/core/state/state_object.go index 18e9d0c53b..16daf43830 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -19,11 +19,12 @@ package state import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/core/types/bal" "maps" "slices" "time" + "github.com/ethereum/go-ethereum/core/types/bal" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" diff --git a/core/state/statedb.go b/core/state/statedb.go index 3094629814..5cdcc04eaa 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -20,7 +20,6 @@ package state import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/types/bal" "maps" "slices" "sort" @@ -28,6 +27,8 @@ import ( "sync/atomic" "time" + "github.com/ethereum/go-ethereum/core/types/bal" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/stateless" "github.com/ethereum/go-ethereum/core/tracing" diff --git a/core/state/statedb_hooked.go b/core/state/statedb_hooked.go index af3ffffd7a..ae6d795cd3 100644 --- a/core/state/statedb_hooked.go +++ b/core/state/statedb_hooked.go @@ -18,10 +18,11 @@ package state import ( "bytes" - "github.com/ethereum/go-ethereum/core/types/bal" "math/big" "sort" + "github.com/ethereum/go-ethereum/core/types/bal" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/stateless" "github.com/ethereum/go-ethereum/core/tracing" diff --git a/core/types.go b/core/types.go index b5ea870ad9..52161df523 100644 --- a/core/types.go +++ b/core/types.go @@ -18,9 +18,10 @@ package core import ( "context" - "github.com/ethereum/go-ethereum/core/types/bal" "sync/atomic" + "github.com/ethereum/go-ethereum/core/types/bal" + "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" diff --git a/eth/tracers/internal/tracetest/selfdestruct_state_test.go b/eth/tracers/internal/tracetest/selfdestruct_state_test.go index 39067e8efc..20641201c3 100644 --- a/eth/tracers/internal/tracetest/selfdestruct_state_test.go +++ b/eth/tracers/internal/tracetest/selfdestruct_state_test.go @@ -620,7 +620,7 @@ func TestSelfdestructStateTracer(t *testing.T) { } context := core.NewEVMBlockContext(block.Header(), blockchain, nil) evm := vm.NewEVM(context, hookedState, tt.genesis.Config, vm.Config{Tracer: tracer.Hooks()}) - _, _, err = core.ApplyTransactionWithEVM(msg, core.NewGasPool(msg.GasLimit), statedb, block.Number(), block.Hash(), block.Time(), tx, evm) + _, _, _, err = core.ApplyTransactionWithEVM(msg, core.NewGasPool(msg.GasLimit), statedb, block.Number(), block.Hash(), block.Time(), tx, evm) if err != nil { t.Fatalf("failed to execute transaction: %v", err) }