forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-04-10 03:47:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core: fix tx-inclusion tests

Browse source
This commit is contained in:
Marius van der Wijden 2026-04-08 12:44:39 +02:00
parent 60096253be
commit 3e37ed1b82
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/gaspool.go
View file

@ -74,19 +74,21 @@ func (gp *GasPool) ReturnGas(returned uint64, gasUsed uint64) error {
}
// ReturnGasAmsterdam calculates the new remaining gas in the pool after the
// execution of a message. The remaining gas in the pool is
// block.gasLimit - max(cumulative_regular, cumulative_state)
// execution of a message.
func (gp *GasPool) ReturnGasAmsterdam(txRegular, txState, receiptGasUsed uint64) error {
gp.cumulativeRegular += txRegular
gp.cumulativeState += txState
gp.cumulativeUsed += receiptGasUsed
// Block validity: both dimensions must fit within the gas limit.
blockUsed := max(gp.cumulativeRegular, gp.cumulativeState)
if gp.initial < blockUsed {
return fmt.Errorf("%w: block gas overflow: initial %d, used %d (regular: %d, state: %d)",
ErrGasLimitReached, gp.initial, blockUsed, gp.cumulativeRegular, gp.cumulativeState)
}
gp.remaining = gp.initial - blockUsed
// TX inclusion: only the regular dimension is checked when deciding
// whether the next transaction fits.
gp.remaining = gp.initial - gp.cumulativeRegular
return nil
}