From 97d384f1bbea5f085b4895baa8c0d881d4f3978b Mon Sep 17 00:00:00 2001 From: MariusVanDerWijden Date: Thu, 5 Feb 2026 14:25:43 +0100 Subject: [PATCH] core: fix rebasing errors --- core/state_transition.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/state_transition.go b/core/state_transition.go index 0e9c3283f9..444e61d5d1 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -19,6 +19,9 @@ package core import ( "bytes" "fmt" + "math" + "math/big" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/tracing" "github.com/ethereum/go-ethereum/core/types" @@ -26,8 +29,6 @@ import ( "github.com/ethereum/go-ethereum/crypto/kzg4844" "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" - "math" - "math/big" ) // ExecutionResult includes all output after executing given evm @@ -576,7 +577,7 @@ func (st *stateTransition) execute() (*ExecutionResult, error) { } return &ExecutionResult{ - UsedGas: peakGasUsed, + UsedGas: st.gasUsed(), MaxUsedGas: peakGasUsed, Err: vmerr, ReturnData: ret,