forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 02:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core: post-Amsterdam, don't subtract tx gas limit from GasPool before starting execution

Browse source
This commit is contained in:
Jared Wasinger 2026-04-05 21:22:48 -04:00
parent 6a79e3693b
commit 0f40778274
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/state_transition.go
View file

@ -309,8 +309,16 @@ func (st *stateTransition) buyGas() error {
if have, want := st.state.GetBalance(st.msg.From), balanceCheckU256; have.Cmp(want) < 0 { if have, want := st.state.GetBalance(st.msg.From), balanceCheckU256; have.Cmp(want) < 0 {
return fmt.Errorf("%w: address %v have %v want %v", ErrInsufficientFunds, st.msg.From.Hex(), have, want) return fmt.Errorf("%w: address %v have %v want %v", ErrInsufficientFunds, st.msg.From.Hex(), have, want)
} }
if err := st.gp.SubGas(st.msg.GasLimit); err != nil {
return err // post-amsterdam the regular/state gas used determines how a transaction
// contributes to the fullness of the block's bottleneck resource.
// It isn't drawn from the pool, and it isn't returned as ReturnAmsterdamGas
// would suggest (TODO: jwasinger I changed ReturnGasAmsterdam and now the name doesn't match what it does)
isAmsterdam := st.evm.ChainConfig().IsAmsterdam(st.evm.Context.BlockNumber, st.evm.Context.Time)
if !isAmsterdam {
if err := st.gp.SubGas(st.msg.GasLimit); err != nil {
return err
}
} }
if st.evm.Config.Tracer != nil && st.evm.Config.Tracer.OnGasChange != nil { if st.evm.Config.Tracer != nil && st.evm.Config.Tracer.OnGasChange != nil {
@ -320,7 +328,7 @@ func (st *stateTransition) buyGas() error {
// After Amsterdam we limit the regular gas to 16k, the data gas to the transaction limit // After Amsterdam we limit the regular gas to 16k, the data gas to the transaction limit
limit := st.msg.GasLimit limit := st.msg.GasLimit
if st.evm.ChainConfig().IsAmsterdam(st.evm.Context.BlockNumber, st.evm.Context.Time) { if isAmsterdam {
limit = min(st.msg.GasLimit, params.MaxTxGas) limit = min(st.msg.GasLimit, params.MaxTxGas)
} }
st.initialGas = vm.GasCosts{RegularGas: limit, StateGas: st.msg.GasLimit - limit} st.initialGas = vm.GasCosts{RegularGas: limit, StateGas: st.msg.GasLimit - limit}