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

core/vm/runtime: cap regular gas budget at MaxTxGas for Amsterdam

Browse source 
Apply the Amsterdam gas budget split in runtime.Execute so regular gas
is limited to MaxTxGas and the remainder is charged as inflation gas.
This commit is contained in:
Weixie Cui 2026-07-05 10:32:54 +08:00
parent e3b6d0c86f
commit 4b0278bd69
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/vm/runtime/runtime.go
View file

@ -143,12 +143,16 @@ func Execute(code, input []byte, cfg *Config) ([]byte, *state.StateDB, error) {
cfg.State.CreateAccount(address)
// set the receiver's (the executing contract) code for execution.
cfg.State.SetCode(address, code, tracing.CodeChangeUnspecified)
limit := cfg.GasLimit
if rules.IsAmsterdam {
limit = min(cfg.GasLimit, params.MaxTxGas)
}
// Call the code with the given configuration.
ret, result, err := vmenv.Call(
cfg.Origin,
common.BytesToAddress([]byte("contract")),
input,
vm.NewGasBudget(cfg.GasLimit, 0),
vm.NewGasBudget(limit, cfg.GasLimit-limit),
uint256.MustFromBig(cfg.Value),
)
if cfg.EVMConfig.Tracer != nil && cfg.EVMConfig.Tracer.OnTxEnd != nil {
@ -178,11 +182,15 @@ func Create(input []byte, cfg *Config) ([]byte, common.Address, uint64, error) {
// - prepare accessList(post-berlin)
// - reset transient storage(eip 1153)
cfg.State.Prepare(rules, cfg.Origin, cfg.Coinbase, nil, vm.ActivePrecompiles(rules), nil)
limit := cfg.GasLimit
if rules.IsAmsterdam {
limit = min(cfg.GasLimit, params.MaxTxGas)
}
// Call the code with the given configuration.
code, address, result, _, err := vmenv.Create(
cfg.Origin,
input,
vm.NewGasBudget(cfg.GasLimit, 0),
vm.NewGasBudget(limit, cfg.GasLimit-limit),
uint256.MustFromBig(cfg.Value),
)
if cfg.EVMConfig.Tracer != nil && cfg.EVMConfig.Tracer.OnTxEnd != nil {
@ -212,12 +220,16 @@ func Call(address common.Address, input []byte, cfg *Config) ([]byte, uint64, er
// - reset transient storage(eip 1153)
statedb.Prepare(rules, cfg.Origin, cfg.Coinbase, &address, vm.ActivePrecompiles(rules), nil)
limit := cfg.GasLimit
if rules.IsAmsterdam {
limit = min(cfg.GasLimit, params.MaxTxGas)
}
// Call the code with the given configuration.
ret, result, err := vmenv.Call(
cfg.Origin,
address,
input,
vm.NewGasBudget(cfg.GasLimit, 0),
vm.NewGasBudget(limit, cfg.GasLimit-limit),
uint256.MustFromBig(cfg.Value),
)
if cfg.EVMConfig.Tracer != nil && cfg.EVMConfig.Tracer.OnTxEnd != nil {