forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 18:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core: fix rebase issue

Browse source
This commit is contained in:
Felix Lange 2024-11-26 16:26:46 +01:00
parent 3475f9431f
commit 41cd829d8c
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/state_processor.go
View file

@ -268,32 +268,18 @@ func ProcessParentBlockHash(prevHash common.Hash, evm *vm.EVM) {
// ProcessWithdrawalQueue calls the EIP-7002 withdrawal queue contract. // ProcessWithdrawalQueue calls the EIP-7002 withdrawal queue contract.
// It returns the opaque request data returned by the contract. // It returns the opaque request data returned by the contract.
<<<<<<< HEAD func ProcessWithdrawalQueue(requests *[][]byte, evm *vm.EVM) {
func ProcessWithdrawalQueue(evm *vm.EVM) []byte { processRequestsSystemCall(requests, evm, 0x01, params.WithdrawalQueueAddress)
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)
} }
// ProcessConsolidationQueue calls the EIP-7251 consolidation queue contract. // ProcessConsolidationQueue calls the EIP-7251 consolidation queue contract.
// It returns the opaque request data returned by the contract. // It returns the opaque request data returned by the contract.
<<<<<<< HEAD func ProcessConsolidationQueue(requests *[][]byte, evm *vm.EVM) {
func ProcessConsolidationQueue(evm *vm.EVM) []byte { processRequestsSystemCall(requests, evm, 0x02, params.ConsolidationQueueAddress)
return processRequestsSystemCall(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 { 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 { if tracer.OnSystemCallStart != nil {
tracer.OnSystemCallStart() tracer.OnSystemCallStart()
} }