forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-19 14:29:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/vm: fix merge bug

Browse source
This commit is contained in:
Marius van der Wijden 2025-02-20 21:28:47 +01:00
parent fa2f3f2819
commit a4c40781a8
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/vm/eof_test.go
View file

@ -30,7 +30,6 @@ func MakeTestContainer(
subContainers []*Container, subContainers []*Container,
data []byte, data []byte,
dataSize int) Container { dataSize int) Container {
testBytes := make([]byte, 0, 16*1024) testBytes := make([]byte, 0, 16*1024)
codeSectionOffsets := make([]int, 0, len(codeSections)) codeSectionOffsets := make([]int, 0, len(codeSections))

2
core/vm/evm.go
View file

@ -343,7 +343,7 @@ func (evm *EVM) DelegateCall(originCaller common.Address, caller common.Address,
return nil, gas, errors.New("extDelegateCall to non-eof contract") return nil, gas, errors.New("extDelegateCall to non-eof contract")
} }
// Initialise a new contract and make initialise the delegate values // Initialise a new contract and make initialise the delegate values
contract := NewContract(originCaller, caller, nil, gas, evm.jumpDests) contract := NewContract(originCaller, caller, value, gas, evm.jumpDests)
contract.Container = evm.parseContainer(code) contract.Container = evm.parseContainer(code)
contract.SetCallCode(evm.resolveCodeHash(addr), code) contract.SetCallCode(evm.resolveCodeHash(addr), code)
ret, err = evm.interpreter.Run(contract, input, false, false) ret, err = evm.interpreter.Run(contract, input, false, false)