forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/vm: wrap error

Browse source
This commit is contained in:
Martin Holst Swende 2024-03-26 16:34:32 +01:00
parent 43ab2d2501
commit 1766c8ff18
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/vm/gas_table_test.go
View file

@ -18,6 +18,7 @@ package vm
import ( import (
"bytes" "bytes"
"errors"
"math" "math"
"math/big" "math/big"
"sort" "sort"
@ -98,7 +99,7 @@ func TestEIP2200(t *testing.T) {
vmenv := NewEVM(vmctx, TxContext{}, statedb, params.AllEthashProtocolChanges, Config{ExtraEips: []int{2200}}) vmenv := NewEVM(vmctx, TxContext{}, statedb, params.AllEthashProtocolChanges, Config{ExtraEips: []int{2200}})
_, gas, err := vmenv.Call(AccountRef(common.Address{}), address, nil, tt.gaspool, new(uint256.Int)) _, gas, err := vmenv.Call(AccountRef(common.Address{}), address, nil, tt.gaspool, new(uint256.Int))
if err != tt.failure { if !errors.Is(err, tt.failure) {
t.Errorf("test %d: failure mismatch: have %v, want %v", i, err, tt.failure) t.Errorf("test %d: failure mismatch: have %v, want %v", i, err, tt.failure)
} }
if used := tt.gaspool - gas; used != tt.used { if used := tt.gaspool - gas; used != tt.used {

3
core/vm/interpreter.go
View file

@ -17,6 +17,7 @@
package vm package vm
import ( import (
"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/core/tracing" "github.com/ethereum/go-ethereum/core/tracing"
@ -256,7 +257,7 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
dynamicCost, err = operation.dynamicGas(in.evm, contract, stack, mem, memorySize) dynamicCost, err = operation.dynamicGas(in.evm, contract, stack, mem, memorySize)
cost += dynamicCost // for tracing cost += dynamicCost // for tracing
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("%w: %v", ErrOutOfGas, err)
} }
if !contract.UseGas(dynamicCost, in.evm.Config.Tracer, tracing.GasChangeIgnored) { if !contract.UseGas(dynamicCost, in.evm.Config.Tracer, tracing.GasChangeIgnored) {
return nil, ErrOutOfGas return nil, ErrOutOfGas

2
eth/tracers/internal/tracetest/testdata/call_tracer_flat/callcode_precompiled_throw.json vendored
View file

@ -57,7 +57,7 @@
"gas": "0x1a034", "gas": "0x1a034",
"init": "0x36600060003760406103e8366000600060095af26001556103e8516002556104085160035500" "init": "0x36600060003760406103e8366000600060095af26001556103e8516002556104085160035500"
}, },
"error": "out of gas", "error": "out of gas: not enough gas for reentrancy sentry",
"traceAddress": [], "traceAddress": [],
"subtraces": 1, "subtraces": 1,
"transactionPosition": 117, "transactionPosition": 117,

2
eth/tracers/internal/tracetest/testdata/call_tracer_flat/nested_create_action_gas.json vendored
View file

@ -57,7 +57,7 @@
"gas": "0x19ee4", "gas": "0x19ee4",
"init": "0x5a600055600060006000f0505a60015500" "init": "0x5a600055600060006000f0505a60015500"
}, },
"error": "out of gas", "error": "out of gas: not enough gas for reentrancy sentry",
"traceAddress": [], "traceAddress": [],
"subtraces": 1, "subtraces": 1,
"transactionPosition": 63, "transactionPosition": 63,