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

ensure that all requested withdrawals are included in the block even if we would hit the size cap when filling it with txs

Browse source
This commit is contained in:
Jared Wasinger 2025-06-10 15:20:11 +02:00 committed by Felix Lange
parent 199faa7678
commit 0293afe118
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
miner/worker.go
View file

@ -106,6 +106,30 @@ func (miner *Miner) generateWork(genParam *generateParams, witness bool) *newPay
if err != nil {
return &newPayloadResult{err: err}
}
var includedWithdrawals types.Withdrawals
// If we are post-osaka, incorporate the requested withdrawals into the
// block size up-front to ensure that all requested withdrawals can be
// included even if we hit the size cap when filling the block with txs.
//
// Also, ensure that including all requested withdrawals wouldn't bring us
// 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
}
if !genParam.noTxs {
interrupt := new(atomic.Int32)
timer := time.AfterFunc(miner.config.Recommit, func() {
@ -118,24 +142,7 @@ func (miner *Miner) generateWork(genParam *generateParams, witness bool) *newPay
log.Warn("Block building is interrupted", "allowance", common.PrettyDuration(miner.config.Recommit))
}
}
body := types.Body{Transactions: work.txs}
var includedWithdrawals types.Withdrawals
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
}
includedWithdrawals = append(includedWithdrawals, withdrawal)
work.size += params.WithdrawalSize
}
} else {
includedWithdrawals = genParam.withdrawals
}
body.Withdrawals = includedWithdrawals
body := types.Body{Transactions: work.txs, Withdrawals: includedWithdrawals}
allLogs := make([]*types.Log, 0)
for _, r := range work.receipts {