From 41cd829d8c883cf06bb86670741037dddcaf8002 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 26 Nov 2024 16:26:46 +0100 Subject: [PATCH] core: fix rebase issue --- core/state_processor.go | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/core/state_processor.go b/core/state_processor.go index 8419d50e4c..9472ab638b 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -268,32 +268,18 @@ func ProcessParentBlockHash(prevHash common.Hash, evm *vm.EVM) { // ProcessWithdrawalQueue calls the EIP-7002 withdrawal queue contract. // It returns the opaque request data returned by the contract. -<<<<<<< HEAD -func ProcessWithdrawalQueue(evm *vm.EVM) []byte { - return processRequestsSystemCall(evm, 0x01, params.WithdrawalQueueAddress) -======= -func ProcessWithdrawalQueue(requests *[][]byte, vmenv *vm.EVM, statedb vm.StateDB) { - processRequestsSystemCall(requests, vmenv, statedb, 0x01, params.WithdrawalQueueAddress) ->>>>>>> 7481705901 (all: simplify requests) +func ProcessWithdrawalQueue(requests *[][]byte, evm *vm.EVM) { + processRequestsSystemCall(requests, evm, 0x01, params.WithdrawalQueueAddress) } // ProcessConsolidationQueue calls the EIP-7251 consolidation queue contract. // It returns the opaque request data returned by the contract. -<<<<<<< HEAD -func ProcessConsolidationQueue(evm *vm.EVM) []byte { - return processRequestsSystemCall(evm, 0x02, params.ConsolidationQueueAddress) +func ProcessConsolidationQueue(requests *[][]byte, evm *vm.EVM) { + processRequestsSystemCall(requests, evm, 0x02, params.ConsolidationQueueAddress) } -func processRequestsSystemCall(evm *vm.EVM, requestType byte, addr common.Address) []byte { +func processRequestsSystemCall(requests *[][]byte, evm *vm.EVM, requestType byte, addr common.Address) { if tracer := evm.Config.Tracer; tracer != nil { -======= -func ProcessConsolidationQueue(requests *[][]byte, vmenv *vm.EVM, statedb vm.StateDB) { - processRequestsSystemCall(requests, vmenv, statedb, 0x02, params.ConsolidationQueueAddress) -} - -func processRequestsSystemCall(requests *[][]byte, vmenv *vm.EVM, statedb vm.StateDB, requestType byte, addr common.Address) { - if tracer := vmenv.Config.Tracer; tracer != nil { ->>>>>>> 7481705901 (all: simplify requests) if tracer.OnSystemCallStart != nil { tracer.OnSystemCallStart() }