forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve master changes

Browse source
This commit is contained in:
Sina Mahmoodi 2025-05-02 16:33:41 +02:00
parent 052eeebe11
commit 1cb25d9ac3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/ethapi/simulate.go
View file

@ -334,11 +334,11 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
} }
// EIP-7002 // EIP-7002
if err := core.ProcessWithdrawalQueue(&requests, evm); err != nil { if err := core.ProcessWithdrawalQueue(&requests, evm); err != nil {
return nil, nil, err return nil, nil, nil, err
} }
// EIP-7251 // EIP-7251
if err := core.ProcessConsolidationQueue(&requests, evm); err != nil { if err := core.ProcessConsolidationQueue(&requests, evm); err != nil {
return nil, nil, err return nil, nil, nil, err
} }
} }
if requests != nil { if requests != nil {
@ -349,7 +349,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
chainHeadReader := &simChainHeadReader{ctx, sim.b} chainHeadReader := &simChainHeadReader{ctx, sim.b}
b, err := sim.b.Engine().FinalizeAndAssemble(chainHeadReader, header, sim.state, blockBody, receipts) b, err := sim.b.Engine().FinalizeAndAssemble(chainHeadReader, header, sim.state, blockBody, receipts)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, nil, err
} }
repairLogs(callResults, b.Hash()) repairLogs(callResults, b.Hash())
return b, callResults, senders, nil return b, callResults, senders, nil