mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-15 08:23:46 +00:00
error code for VM failures (#18)
* Experimental: EVMLogger fixed error code * First pass of review * Move error to `core/vm/errors.go`, ensure also we strictly implement `rpc.Error` (without depending on it)
This commit is contained in:
parent
6ee4fb8eac
commit
1914bc6ed0
4 changed files with 130 additions and 7 deletions
|
|
@ -1148,7 +1148,7 @@ func TestDeleteStorage(t *testing.T) {
|
||||||
addr = common.HexToAddress("0x1")
|
addr = common.HexToAddress("0x1")
|
||||||
)
|
)
|
||||||
// Initialize account and populate storage
|
// Initialize account and populate storage
|
||||||
state.SetBalance(addr, big.NewInt(1))
|
state.SetBalance(addr, big.NewInt(1), 0x0)
|
||||||
state.CreateAccount(addr)
|
state.CreateAccount(addr)
|
||||||
for i := 0; i < 1000; i++ {
|
for i := 0; i < 1000; i++ {
|
||||||
slot := common.Hash(uint256.NewInt(uint64(i)).Bytes32())
|
slot := common.Hash(uint256.NewInt(uint64(i)).Bytes32())
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ package vm
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math"
|
||||||
)
|
)
|
||||||
|
|
||||||
// List evm execution errors
|
// List evm execution errors
|
||||||
|
|
@ -71,3 +72,125 @@ type ErrInvalidOpCode struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *ErrInvalidOpCode) Error() string { return fmt.Sprintf("invalid opcode: %s", e.opcode) }
|
func (e *ErrInvalidOpCode) Error() string { return fmt.Sprintf("invalid opcode: %s", e.opcode) }
|
||||||
|
|
||||||
|
// rpcError is the same interface as the one defined in rpc/errors.go
|
||||||
|
// but we do not want to depend on rpc package here so we redefine it.
|
||||||
|
//
|
||||||
|
// It's used to ensure that the VMError implements the RPC error interface.
|
||||||
|
type rpcError interface {
|
||||||
|
Error() string // returns the message
|
||||||
|
ErrorCode() int // returns the code
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ rpcError = (*VMError)(nil)
|
||||||
|
|
||||||
|
// VMError wraps a VM error with an additional stable error code. The error
|
||||||
|
// field is the original error that caused the VM error and must be one of the
|
||||||
|
// VM error defined at the top of this file.
|
||||||
|
//
|
||||||
|
// If the error is not one of the known error above, the error code will be
|
||||||
|
// set to VMErrorCodeUnknown.
|
||||||
|
type VMError struct {
|
||||||
|
error
|
||||||
|
code int
|
||||||
|
}
|
||||||
|
|
||||||
|
func VMErrorFromErr(err error) error {
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return &VMError{
|
||||||
|
error: err,
|
||||||
|
code: vmErrorCodeFromErr(err),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *VMError) Error() string {
|
||||||
|
return e.error.Error()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *VMError) Unwrap() error {
|
||||||
|
return errors.Unwrap(e.error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *VMError) ErrorCode() int {
|
||||||
|
return e.code
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
// We start the error code at 1 so that we can use 0 later for some possible extension. There
|
||||||
|
// is no unspecified value for the code today because it should always be set to a valid value
|
||||||
|
// that could be VMErrorCodeUnknown if the error is not mapped to a known error code.
|
||||||
|
|
||||||
|
VMErrorCodeOutOfGas = 1 + iota
|
||||||
|
VMErrorCodeCodeStoreOutOfGas
|
||||||
|
VMErrorCodeDepth
|
||||||
|
VMErrorCodeInsufficientBalance
|
||||||
|
VMErrorCodeContractAddressCollision
|
||||||
|
VMErrorCodeExecutionReverted
|
||||||
|
VMErrorCodeMaxInitCodeSizeExceeded
|
||||||
|
VMErrorCodeMaxCodeSizeExceeded
|
||||||
|
VMErrorCodeInvalidJump
|
||||||
|
VMErrorCodeWriteProtection
|
||||||
|
VMErrorCodeReturnDataOutOfBounds
|
||||||
|
VMErrorCodeGasUintOverflow
|
||||||
|
VMErrorCodeInvalidCode
|
||||||
|
VMErrorCodeNonceUintOverflow
|
||||||
|
VMErrorCodeStackUnderflow
|
||||||
|
VMErrorCodeStackOverflow
|
||||||
|
VMErrorCodeInvalidOpCode
|
||||||
|
|
||||||
|
// VMErrorCodeUnknown explicitly marks an error as unknown, this is useful when error is converted
|
||||||
|
// from an actual `error` in which case if the mapping is not known, we can use this value to indicate that.
|
||||||
|
VMErrorCodeUnknown = math.MaxInt - 1
|
||||||
|
)
|
||||||
|
|
||||||
|
func vmErrorCodeFromErr(err error) int {
|
||||||
|
switch {
|
||||||
|
case errors.Is(err, ErrOutOfGas):
|
||||||
|
return VMErrorCodeOutOfGas
|
||||||
|
case errors.Is(err, ErrCodeStoreOutOfGas):
|
||||||
|
return VMErrorCodeCodeStoreOutOfGas
|
||||||
|
case errors.Is(err, ErrDepth):
|
||||||
|
return VMErrorCodeDepth
|
||||||
|
case errors.Is(err, ErrInsufficientBalance):
|
||||||
|
return VMErrorCodeInsufficientBalance
|
||||||
|
case errors.Is(err, ErrContractAddressCollision):
|
||||||
|
return VMErrorCodeContractAddressCollision
|
||||||
|
case errors.Is(err, ErrExecutionReverted):
|
||||||
|
return VMErrorCodeExecutionReverted
|
||||||
|
case errors.Is(err, ErrMaxInitCodeSizeExceeded):
|
||||||
|
return VMErrorCodeMaxInitCodeSizeExceeded
|
||||||
|
case errors.Is(err, ErrMaxCodeSizeExceeded):
|
||||||
|
return VMErrorCodeMaxCodeSizeExceeded
|
||||||
|
case errors.Is(err, ErrInvalidJump):
|
||||||
|
return VMErrorCodeInvalidJump
|
||||||
|
case errors.Is(err, ErrWriteProtection):
|
||||||
|
return VMErrorCodeWriteProtection
|
||||||
|
case errors.Is(err, ErrReturnDataOutOfBounds):
|
||||||
|
return VMErrorCodeReturnDataOutOfBounds
|
||||||
|
case errors.Is(err, ErrGasUintOverflow):
|
||||||
|
return VMErrorCodeGasUintOverflow
|
||||||
|
case errors.Is(err, ErrInvalidCode):
|
||||||
|
return VMErrorCodeInvalidCode
|
||||||
|
case errors.Is(err, ErrNonceUintOverflow):
|
||||||
|
return VMErrorCodeNonceUintOverflow
|
||||||
|
|
||||||
|
default:
|
||||||
|
// Dynamic errors
|
||||||
|
if v := (*ErrStackUnderflow)(nil); errors.As(err, &v) {
|
||||||
|
return VMErrorCodeStackUnderflow
|
||||||
|
}
|
||||||
|
|
||||||
|
if v := (*ErrStackOverflow)(nil); errors.As(err, &v) {
|
||||||
|
return VMErrorCodeStackOverflow
|
||||||
|
}
|
||||||
|
|
||||||
|
if v := (*ErrInvalidOpCode)(nil); errors.As(err, &v) {
|
||||||
|
return VMErrorCodeInvalidOpCode
|
||||||
|
}
|
||||||
|
|
||||||
|
return VMErrorCodeUnknown
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -534,8 +534,8 @@ func (evm *EVM) captureEnd(isRoot bool, typ OpCode, startGas uint64, leftOverGas
|
||||||
}
|
}
|
||||||
|
|
||||||
if isRoot {
|
if isRoot {
|
||||||
tracer.CaptureEnd(ret, startGas-leftOverGas, err)
|
tracer.CaptureEnd(ret, startGas-leftOverGas, VMErrorFromErr(err))
|
||||||
} else {
|
} else {
|
||||||
tracer.CaptureExit(ret, startGas-leftOverGas, err)
|
tracer.CaptureExit(ret, startGas-leftOverGas, VMErrorFromErr(err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -158,9 +158,9 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !logged {
|
if !logged {
|
||||||
in.evm.Config.Tracer.CaptureState(pcCopy, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
|
in.evm.Config.Tracer.CaptureState(pcCopy, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, VMErrorFromErr(err))
|
||||||
} else {
|
} else {
|
||||||
in.evm.Config.Tracer.CaptureFault(pcCopy, op, gasCopy, cost, callContext, in.evm.depth, err)
|
in.evm.Config.Tracer.CaptureFault(pcCopy, op, gasCopy, cost, callContext, in.evm.depth, VMErrorFromErr(err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
@ -219,7 +219,7 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
|
||||||
// Do tracing before memory expansion
|
// Do tracing before memory expansion
|
||||||
if debug {
|
if debug {
|
||||||
in.evm.Config.Tracer.OnGasChange(gasCopy, gasCopy-cost, GasChangeCallOpCode)
|
in.evm.Config.Tracer.OnGasChange(gasCopy, gasCopy-cost, GasChangeCallOpCode)
|
||||||
in.evm.Config.Tracer.CaptureState(pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
|
in.evm.Config.Tracer.CaptureState(pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, VMErrorFromErr(err))
|
||||||
logged = true
|
logged = true
|
||||||
}
|
}
|
||||||
if memorySize > 0 {
|
if memorySize > 0 {
|
||||||
|
|
@ -227,7 +227,7 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
|
||||||
}
|
}
|
||||||
} else if debug {
|
} else if debug {
|
||||||
in.evm.Config.Tracer.OnGasChange(gasCopy, gasCopy-cost, GasChangeCallOpCode)
|
in.evm.Config.Tracer.OnGasChange(gasCopy, gasCopy-cost, GasChangeCallOpCode)
|
||||||
in.evm.Config.Tracer.CaptureState(pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
|
in.evm.Config.Tracer.CaptureState(pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, VMErrorFromErr(err))
|
||||||
logged = true
|
logged = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue