forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-13 03:26:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/vm: fix lint, check leftover gas before stateful check

Browse source
This commit is contained in:
Gary Rong 2026-01-22 13:53:48 +08:00
parent 338285621b
commit 2667b3fb0c
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/vm/gas_table.go
View file

@ -19,6 +19,7 @@ package vm
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
@ -420,7 +421,11 @@ func gasCallIntrinsic(evm *EVM, contract *Contract, stack *Stack, mem *Memory, m
if gas, overflow = math.SafeAdd(memoryGas, transferGas); overflow { if gas, overflow = math.SafeAdd(memoryGas, transferGas); overflow {
return 0, ErrGasUintOverflow return 0, ErrGasUintOverflow
} }
// Terminate the gas measurement if the leftover gas is not sufficient,
// it can effectively prevent accessing the states in the following steps.
if contract.Gas < gas {
return 0, ErrOutOfGas
}
// Stateful check // Stateful check
var stateGas uint64 var stateGas uint64
if evm.chainRules.IsEIP158 { if evm.chainRules.IsEIP158 {

6
core/vm/operations_acl.go
View file

@ -308,7 +308,8 @@ func makeCallVariantGasCallEIP7702(intrinsicFunc gasFunc) gasFunc {
return 0, err return 0, err
} }
// Terminate the gas measurement if the leftover gas is not sufficient, // Terminate the gas measurement if the leftover gas is not sufficient,
// it can effectively prevent accessing the states in the following steps // it can effectively prevent accessing the states in the following steps.
// It's an essential safeguard before any stateful check.
if contract.Gas < intrinsicCost { if contract.Gas < intrinsicCost {
return 0, ErrOutOfGas return 0, ErrOutOfGas
} }
@ -325,7 +326,8 @@ func makeCallVariantGasCallEIP7702(intrinsicFunc gasFunc) gasFunc {
return 0, ErrOutOfGas return 0, ErrOutOfGas
} }
} }
// Calculate the gas budget for the nested call. The costs defined by
// EIP-2929 and EIP-7702 have already been applied.
evm.callGasTemp, err = callGas(evm.chainRules.IsEIP150, contract.Gas, intrinsicCost, stack.Back(0)) evm.callGasTemp, err = callGas(evm.chainRules.IsEIP150, contract.Gas, intrinsicCost, stack.Back(0))
if err != nil { if err != nil {
return 0, err return 0, err