Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Only apply effective gas limit when building new blocks #394

Merged
merged 2 commits into from
Oct 2, 2024
Merged

fix: Only apply effective gas limit when building new blocks #394

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fa08a0
fix: Only apply effective gas limit when building new blocks
BrianBland Oct 1, 2024
5e3de7c
Update comment
BrianBland Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions miner/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,16 @@ func (miner *Miner) generateWork(params *generateParams) *newPayloadResult {
return &newPayloadResult{err: err}
}
if work.gasPool == nil {
gasLimit := miner.config.EffectiveGasCeil
if gasLimit == 0 || gasLimit > work.header.GasLimit {
gasLimit = work.header.GasLimit
gasLimit := work.header.GasLimit

// If we're building blocks with mempool transactions, we need to ensure that the
// gas limit is not higher than the effective gas limit. We must still accept any
// explicitly selected transactions with gas usage up to the block header's limit.
if !params.noTxs {
effectiveGasLimit := miner.config.EffectiveGasCeil
if effectiveGasLimit != 0 && effectiveGasLimit < gasLimit {
gasLimit = effectiveGasLimit
}
}
work.gasPool = new(core.GasPool).AddGas(gasLimit)
}
Expand Down