From 0ccd62465c85798c653e531c42415ffad085bf1c Mon Sep 17 00:00:00 2001 From: Sina Mahmoodi Date: Wed, 5 Feb 2025 16:00:37 +0100 Subject: [PATCH] simplify systemcall start calling --- core/state_processor.go | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/core/state_processor.go b/core/state_processor.go index 902ff582e8..7041a26932 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -23,7 +23,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/consensus/misc" "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/tracing" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" @@ -213,7 +212,9 @@ func ApplyTransaction(evm *vm.EVM, gp *GasPool, statedb *state.StateDB, header * // contract. This method is exported to be used in tests. func ProcessBeaconBlockRoot(beaconRoot common.Hash, evm *vm.EVM) { if tracer := evm.Config.Tracer; tracer != nil { - onSystemCallStart(tracer, evm.GetVMContext()) + if tracer.OnSystemCallStartV2 != nil { + tracer.OnSystemCallStartV2(evm.GetVMContext()) + } if tracer.OnSystemCallEnd != nil { defer tracer.OnSystemCallEnd() } @@ -237,7 +238,9 @@ func ProcessBeaconBlockRoot(beaconRoot common.Hash, evm *vm.EVM) { // as per EIP-2935/7709. func ProcessParentBlockHash(prevHash common.Hash, evm *vm.EVM) { if tracer := evm.Config.Tracer; tracer != nil { - onSystemCallStart(tracer, evm.GetVMContext()) + if tracer.OnSystemCallStartV2 != nil { + tracer.OnSystemCallStartV2(evm.GetVMContext()) + } if tracer.OnSystemCallEnd != nil { defer tracer.OnSystemCallEnd() } @@ -277,7 +280,9 @@ func ProcessConsolidationQueue(requests *[][]byte, evm *vm.EVM) { func processRequestsSystemCall(requests *[][]byte, evm *vm.EVM, requestType byte, addr common.Address) { if tracer := evm.Config.Tracer; tracer != nil { - onSystemCallStart(tracer, evm.GetVMContext()) + if tracer.OnSystemCallStartV2 != nil { + tracer.OnSystemCallStartV2(evm.GetVMContext()) + } if tracer.OnSystemCallEnd != nil { defer tracer.OnSystemCallEnd() } @@ -323,11 +328,3 @@ func ParseDepositLogs(requests *[][]byte, logs []*types.Log, config *params.Chai } return nil } - -func onSystemCallStart(tracer *tracing.Hooks, ctx *tracing.VMContext) { - if tracer.OnSystemCallStartV2 != nil { - tracer.OnSystemCallStartV2(ctx) - } else if tracer.OnSystemCallStart != nil { - tracer.OnSystemCallStart() - } -}