From 10cd083c78f5a2152c9512fb1cdbae9ec95e5f36 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Tue, 4 Feb 2025 10:31:42 +0100 Subject: [PATCH] core/vm: revert merge errors --- core/vm/instructions.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index dca9c57b9f..e3af3cb217 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -352,10 +352,6 @@ func opReturnDataCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeConte func opExtCodeSize(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) { slot := scope.Stack.peek() - address := slot.Bytes20() - if witness := interpreter.evm.StateDB.Witness(); witness != nil { - witness.AddCode(interpreter.evm.StateDB.GetCode(address)) - } // TODO this should not need to pull up the whole code code := interpreter.evm.StateDB.GetCode(slot.Bytes20()) if isEOFVersion1(code) { @@ -403,9 +399,6 @@ func opExtCodeCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) } addr := common.Address(a.Bytes20()) code := interpreter.evm.StateDB.GetCode(addr) - if witness := interpreter.evm.StateDB.Witness(); witness != nil { - witness.AddCode(code) - } if isEOFVersion1(code) { codeCopy = getData(eofMagic, uint64CodeOffset, lengthU64) } else {