From fa799545760739efe23b98cb93b1f1f075874b1d Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Wed, 8 Apr 2026 16:19:24 +0200 Subject: [PATCH] core: fix rebasing issue --- core/state_processor.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/core/state_processor.go b/core/state_processor.go index 2d2ea6a7d1..b71cf7bf96 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -350,13 +350,8 @@ func processRequestsSystemCall(requests *[][]byte, evm *vm.EVM, requestType byte } evm.SetTxContext(NewEVMTxContext(msg)) 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) - evm.StateDB.Finalise(true) ->>>>>>> 96f0b19c51 (core: introduce vm.GasBudget) + mut := evm.StateDB.Finalise(true) if err != nil { return nil, fmt.Errorf("system call failed to execute: %v", err) }