interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

core/vm: revert merge errors

This commit is contained in:
Marius van der Wijden 2025-02-04 10:31:42 +01:00
parent 1c931f0f8f
commit 10cd083c78
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/vm/instructions.go
View File

@ -352,10 +352,6 @@ func opReturnDataCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeConte
func opExtCodeSize(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) { func opExtCodeSize(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
slot := scope.Stack.peek() 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 // TODO this should not need to pull up the whole code
code := interpreter.evm.StateDB.GetCode(slot.Bytes20()) code := interpreter.evm.StateDB.GetCode(slot.Bytes20())
if isEOFVersion1(code) { if isEOFVersion1(code) {
@ -403,9 +399,6 @@ func opExtCodeCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
} }
addr := common.Address(a.Bytes20()) addr := common.Address(a.Bytes20())
code := interpreter.evm.StateDB.GetCode(addr) code := interpreter.evm.StateDB.GetCode(addr)
if witness := interpreter.evm.StateDB.Witness(); witness != nil {
witness.AddCode(code)
}
if isEOFVersion1(code) { if isEOFVersion1(code) {
codeCopy = getData(eofMagic, uint64CodeOffset, lengthU64) codeCopy = getData(eofMagic, uint64CodeOffset, lengthU64)
} else { } else {