From 12bcb4929a983b9c0a56e31aeb49aa9bf04466c4 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Mon, 16 Sep 2024 08:43:37 -0600 Subject: [PATCH] cleanup from review comments --- core/state_transition.go | 1 - core/vm/eips.go | 2 +- core/vm/evm.go | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/core/state_transition.go b/core/state_transition.go index ed909e7558..03e4250688 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -517,7 +517,6 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) { // invalid, the tx is considered valid (so update nonce), but // is to be treated as an exceptional abort (so burn all gas). if errors.Is(vmerr, vm.ErrInvalidEOFInitcode) { - //st.gasRemaining = 0 st.state.SetNonce(msg.From, st.state.GetNonce(sender.Address())+1) } } else { diff --git a/core/vm/eips.go b/core/vm/eips.go index d30f8a153f..7a85d6fe73 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -1073,7 +1073,7 @@ func opExtCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([] ret, returnGas, err = interpreter.evm.Call(scope.Contract, toAddr, args, gas, &value) } - if err == ErrExecutionReverted || err == ErrInsufficientBalance || err == ErrDepth { + if errors.Is(err, ErrExecutionReverted) || errors.Is(err, ErrInsufficientBalance) || errors.Is(err, ErrDepth) { temp.SetOne() } else if err != nil { temp.SetUint64(2) diff --git a/core/vm/evm.go b/core/vm/evm.go index 7499991536..648af525c9 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -571,7 +571,6 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64, // Reject code starting with 0xEF if EIP-3541 is enabled. if err == nil && len(ret) >= 1 && HasEOFByte(ret) { if evm.chainRules.IsPrague && isInitcodeEOF { - fmt.Printf("FIXME - valid EOF deployment\n") // Don't reject EOF contracts after Shanghai } else if evm.chainRules.IsLondon { err = ErrInvalidCode