forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-17 13:36:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fix rebasing issue

Browse source
This commit is contained in:
Marius van der Wijden 2026-04-08 16:19:24 +02:00
parent ce91d227c2
commit fa79954576
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/state_processor.go
View file

@ -350,13 +350,8 @@ func processRequestsSystemCall(requests *[][]byte, evm *vm.EVM, requestType byte
} }
evm.SetTxContext(NewEVMTxContext(msg)) evm.SetTxContext(NewEVMTxContext(msg))
evm.StateDB.AddAddressToAccessList(addr) evm.StateDB.AddAddressToAccessList(addr)
<<<<<<< HEAD
ret, _, _, err := evm.Call(msg.From, *msg.To, msg.Data, vm.GasCosts{RegularGas: 30_000_000}, common.U2560)
mut := evm.StateDB.Finalise(true)
=======
ret, _, _, err := evm.Call(msg.From, *msg.To, msg.Data, vm.GasBudget{RegularGas: 30_000_000}, common.U2560) ret, _, _, err := evm.Call(msg.From, *msg.To, msg.Data, vm.GasBudget{RegularGas: 30_000_000}, common.U2560)
evm.StateDB.Finalise(true) mut := evm.StateDB.Finalise(true)
>>>>>>> 96f0b19c51 (core: introduce vm.GasBudget)
if err != nil { if err != nil {
return nil, fmt.Errorf("system call failed to execute: %v", err) return nil, fmt.Errorf("system call failed to execute: %v", err)
} }