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

miner: handle requests in block building

Browse source
This commit is contained in:
Manav Darji 2025-03-26 11:14:24 +05:30
parent 657e91ff8a
commit a6c89c1cff
No known key found for this signature in database
GPG key ID: A426F0124435F36E
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
miner/worker.go
View file

@ -526,7 +526,7 @@ func (w *worker) newWorkLoop(recommit time.Duration) {
commit(false, commitInterruptNewHead) commit(false, commitInterruptNewHead)
case head := <-w.chainHeadCh: case head := <-w.chainHeadCh:
clearPending(head.Block.NumberU64()) clearPending(head.Header.Number.Uint64())
timestamp = time.Now().Unix() timestamp = time.Now().Unix()
commit(false, commitInterruptNewHead) commit(false, commitInterruptNewHead)
@ -1410,13 +1410,28 @@ func (w *worker) generateWork(params *generateParams, witness bool) *newPayloadR
for _, r := range work.receipts { for _, r := range work.receipts {
allLogs = append(allLogs, r.Logs...) allLogs = append(allLogs, r.Logs...)
} }
// Read requests if Prague is enabled. // Collect consensus-layer requests if Prague is enabled.
if w.chainConfig.IsPrague(work.header.Number) && w.chainConfig.Bor == nil { var requests [][]byte
requests, err := core.ParseDepositLogs(allLogs, w.chainConfig) if w.chainConfig.IsPrague(work.header.Number) {
// EIP-6110 deposits
depositRequests, err := core.ParseDepositLogs(allLogs, w.chainConfig)
if err != nil { if err != nil {
return &newPayloadResult{err: err} return &newPayloadResult{err: err}
} }
body.Requests = requests requests = append(requests, depositRequests)
// create EVM for system calls
blockContext := core.NewEVMBlockContext(work.header, w.chain, &work.header.Coinbase)
vmenv := vm.NewEVM(blockContext, vm.TxContext{}, work.state, w.chainConfig, vm.Config{})
// EIP-7002 withdrawals
withdrawalRequests := core.ProcessWithdrawalQueue(vmenv, work.state)
requests = append(requests, withdrawalRequests)
// EIP-7251 consolidations
consolidationRequests := core.ProcessConsolidationQueue(vmenv, work.state)
requests = append(requests, consolidationRequests)
}
if requests != nil {
reqHash := types.CalcRequestsHash(requests)
work.header.RequestsHash = &reqHash
} }
block, err := w.engine.FinalizeAndAssemble(w.chain, work.header, work.state, &body, work.receipts) block, err := w.engine.FinalizeAndAssemble(w.chain, work.header, work.state, &body, work.receipts)