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

miner: return error when withdrawals overshoot max block size

Browse source
This commit is contained in:
Felix Lange 2025-07-08 07:09:53 +02:00
parent 7754e773a9
commit 84609d8855
1 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
miner/worker.go
View file

@ -106,30 +106,16 @@ func (miner *Miner) generateWork(genParam *generateParams, witness bool) *newPay
if err != nil { if err != nil {
return &newPayloadResult{err: err} return &newPayloadResult{err: err}
} }
var includedWithdrawals types.Withdrawals
// If we are post-osaka, incorporate the requested withdrawals into the // Check withdrawals fit max block size.
// block size calculation up-front to ensure that all requested withdrawals // Due to the cap on withdrawal count, this can actually never happen, but we still need to
// can be included even if we hit the size cap when filling the block with // check to ensure the CL notices there's a problem if the withdrawal cap is ever lifted.
// txs. maxBlockSize := params.BlockRLPSizeCap - blockRLPSizeCapBuffer
// if genParam.withdrawals.Size() > maxBlockSize {
// Also, ensure that including all requested withdrawals wouldn't bring us return &newPayloadResult{err: errors.New("withdrawals exceed max block size")}
// over the block size cap limit. The withdrawal cap ensures that this can't
// actually happen right now, but it doesn't hurt to make this code
// future-proof for a situation where the withdrawal cap is lifted.
if miner.chainConfig.IsOsaka(work.header.Number, work.header.Time) {
maxBlockSize := params.BlockRLPSizeCap - blockRLPSizeCapBuffer
for _, withdrawal := range genParam.withdrawals {
if int(work.size)+params.WithdrawalSize > maxBlockSize {
break
}
work.size += params.WithdrawalSize
includedWithdrawals = append(includedWithdrawals, withdrawal)
}
} else {
includedWithdrawals = genParam.withdrawals
} }
// Also add size of withdrawals to work block size.
work.size += uint64(genParam.withdrawals.Size())
if !genParam.noTxs { if !genParam.noTxs {
interrupt := new(atomic.Int32) interrupt := new(atomic.Int32)
@ -143,7 +129,7 @@ func (miner *Miner) generateWork(genParam *generateParams, witness bool) *newPay
log.Warn("Block building is interrupted", "allowance", common.PrettyDuration(miner.config.Recommit)) log.Warn("Block building is interrupted", "allowance", common.PrettyDuration(miner.config.Recommit))
} }
} }
body := types.Body{Transactions: work.txs, Withdrawals: includedWithdrawals} body := types.Body{Transactions: work.txs, Withdrawals: genParam.withdrawals}
allLogs := make([]*types.Log, 0) allLogs := make([]*types.Log, 0)
for _, r := range work.receipts { for _, r := range work.receipts {