forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/vm: fix opEOFCreate, forward calldata

Browse source
This commit is contained in:
Marius van der Wijden 2024-07-02 12:51:11 +02:00
parent e9ad878b90
commit f6d4997820
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/vm/eips.go
View file

@ -883,10 +883,9 @@ func opEOFCreate(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) (
offset, size = scope.Stack.pop(), scope.Stack.pop() offset, size = scope.Stack.pop(), scope.Stack.pop()
input = scope.Memory.GetCopy(int64(offset.Uint64()), int64(size.Uint64())) input = scope.Memory.GetCopy(int64(offset.Uint64()), int64(size.Uint64()))
) )
if int(idx) >= len(scope.Contract.Container.ContainerSections) { if int(idx) >= len(scope.Contract.Container.ContainerCode) {
return nil, fmt.Errorf("invalid subcontainer") return nil, fmt.Errorf("invalid subcontainer")
} }
subcontainer := scope.Contract.Container.ContainerSections[idx]
// Deduct hashing charge // Deduct hashing charge
// Since size <= params.MaxInitCodeSize, these multiplication cannot overflow // Since size <= params.MaxInitCodeSize, these multiplication cannot overflow
@ -907,7 +906,7 @@ func opEOFCreate(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) (
scope.Contract.UseGas(gas, interpreter.evm.Config.Tracer, tracing.GasChangeCallContractCreation2) scope.Contract.UseGas(gas, interpreter.evm.Config.Tracer, tracing.GasChangeCallContractCreation2)
// Skip the immediate // Skip the immediate
*pc += 1 *pc += 1
res, addr, returnGas, suberr := interpreter.evm.EOFCreate(scope.Contract, input, subcontainer.MarshalBinary(), gas, &value, &salt) res, addr, returnGas, suberr := interpreter.evm.EOFCreate(scope.Contract, input, scope.Contract.Container.ContainerCode[idx], gas, &value, &salt)
if suberr != nil { if suberr != nil {
stackvalue.Clear() stackvalue.Clear()
} else { } else {
@ -1004,7 +1003,7 @@ func opReturnContract(pc *uint64, interpreter *EVMInterpreter, scope *ScopeConte
// Validate the subcontainer // Validate the subcontainer
var c Container var c Container
if err := c.UnmarshalBinary(deployedCode, true); err != nil { if err := c.UnmarshalBinary(deployedCode, true); err != nil {
panic(fmt.Sprintf("%x", deployedCode)) return nil, err
} }
if err := c.ValidateCode(interpreter.tableEOF); err != nil { if err := c.ValidateCode(interpreter.tableEOF); err != nil {
return nil, err return nil, err
@ -1021,8 +1020,6 @@ func opReturnContract(pc *uint64, interpreter *EVMInterpreter, scope *ScopeConte
scope.ReturnStack = scope.ReturnStack[:last] scope.ReturnStack = scope.ReturnStack[:last]
scope.CodeSection = retCtx.Section scope.CodeSection = retCtx.Section
*pc = retCtx.Pc - 1 *pc = retCtx.Pc - 1
fmt.Printf("%v", c.MarshalBinary())
fmt.Printf("%v", deployedCode)
return c.MarshalBinary(), errStopToken return c.MarshalBinary(), errStopToken
} }

12
core/vm/evm.go
View file

@ -458,7 +458,7 @@ func (c *codeAndHash) Hash() common.Hash {
} }
// create creates a new contract using code as deployment code. // create creates a new contract using code as deployment code.
func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64, value *uint256.Int, address common.Address, typ OpCode, fromEOF bool) (ret []byte, createAddress common.Address, leftOverGas uint64, err error) { func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64, value *uint256.Int, address common.Address, typ OpCode, input []byte, fromEOF bool) (ret []byte, createAddress common.Address, leftOverGas uint64, err error) {
if evm.Config.Tracer != nil { if evm.Config.Tracer != nil {
evm.captureBegin(evm.depth, typ, caller.Address(), address, codeAndHash.code, gas, value.ToBig()) evm.captureBegin(evm.depth, typ, caller.Address(), address, codeAndHash.code, gas, value.ToBig())
defer func(startGas uint64) { defer func(startGas uint64) {
@ -552,7 +552,7 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64,
} }
if err == nil { if err == nil {
ret, err = evm.interpreter.Run(contract, nil, false, contract.IsDeployment) ret, err = evm.interpreter.Run(contract, input, false, contract.IsDeployment)
} }
// Check whether the max code size has been exceeded, assign err if the case. // Check whether the max code size has been exceeded, assign err if the case.
@ -616,7 +616,7 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64,
func (evm *EVM) Create(caller ContractRef, code []byte, gas uint64, value *uint256.Int) (ret []byte, contractAddr common.Address, leftOverGas uint64, err error) { func (evm *EVM) Create(caller ContractRef, code []byte, gas uint64, value *uint256.Int) (ret []byte, contractAddr common.Address, leftOverGas uint64, err error) {
contractAddr = crypto.CreateAddress(caller.Address(), evm.StateDB.GetNonce(caller.Address())) contractAddr = crypto.CreateAddress(caller.Address(), evm.StateDB.GetNonce(caller.Address()))
isEOF := hasEOFMagic(evm.StateDB.GetCode(caller.Address())) isEOF := hasEOFMagic(evm.StateDB.GetCode(caller.Address()))
return evm.create(caller, &codeAndHash{code: code}, gas, value, contractAddr, CREATE, isEOF) return evm.create(caller, &codeAndHash{code: code}, gas, value, contractAddr, CREATE, nil, isEOF)
} }
// Create2 creates a new contract using code as deployment code. // Create2 creates a new contract using code as deployment code.
@ -627,14 +627,14 @@ func (evm *EVM) Create2(caller ContractRef, code []byte, gas uint64, endowment *
codeAndHash := &codeAndHash{code: code} codeAndHash := &codeAndHash{code: code}
contractAddr = crypto.CreateAddress2(caller.Address(), salt.Bytes32(), codeAndHash.Hash().Bytes()) contractAddr = crypto.CreateAddress2(caller.Address(), salt.Bytes32(), codeAndHash.Hash().Bytes())
isEOF := hasEOFMagic(evm.StateDB.GetCode(caller.Address())) isEOF := hasEOFMagic(evm.StateDB.GetCode(caller.Address()))
return evm.create(caller, codeAndHash, gas, endowment, contractAddr, CREATE2, isEOF) return evm.create(caller, codeAndHash, gas, endowment, contractAddr, CREATE2, nil, isEOF)
} }
// EOFCreate // EOFCreate
func (evm *EVM) EOFCreate(caller ContractRef, code []byte, subcontainer []byte, gas uint64, endowment *uint256.Int, salt *uint256.Int) (ret []byte, contractAddr common.Address, leftOverGas uint64, err error) { func (evm *EVM) EOFCreate(caller ContractRef, input []byte, subcontainer []byte, gas uint64, endowment *uint256.Int, salt *uint256.Int) (ret []byte, contractAddr common.Address, leftOverGas uint64, err error) {
codeAndHash := &codeAndHash{code: subcontainer} codeAndHash := &codeAndHash{code: subcontainer}
contractAddr = crypto.CreateAddress2(caller.Address(), salt.Bytes32(), codeAndHash.Hash().Bytes()) contractAddr = crypto.CreateAddress2(caller.Address(), salt.Bytes32(), codeAndHash.Hash().Bytes())
return evm.create(caller, codeAndHash, gas, endowment, contractAddr, CREATE2, true) return evm.create(caller, codeAndHash, gas, endowment, contractAddr, CREATE2, input, true)
} }
// ChainConfig returns the environment's chain configuration // ChainConfig returns the environment's chain configuration