diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-03-24 06:20:51 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-03-24 06:20:51 +0800 |
| commit | 75c86f8646ed6a21116d6c5f5e400dd966bb218d (patch) | |
| tree | 6c979fd121e7721328b9502f1855387b602dcd87 /core/execution.go | |
| parent | 9866f19d6af607f629be311cb1c879e8f6472773 (diff) | |
| parent | 0cfa21fc7f34d9da93abc41541dd4a98d70eb9dd (diff) | |
| download | dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.gz dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.bz2 dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.lz dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.xz dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.zst dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.zip | |
Merge pull request #2141 from obscuren/evm-init
core, core/vm, tests: changed the initialisation behaviour of the EVM
Diffstat (limited to 'core/execution.go')
| -rw-r--r-- | core/execution.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/execution.go b/core/execution.go index 24c0c93ae..d90dceafc 100644 --- a/core/execution.go +++ b/core/execution.go @@ -60,7 +60,7 @@ func Create(env vm.Environment, caller vm.ContractRef, code []byte, gas, gasPric } func exec(env vm.Environment, caller vm.ContractRef, address, codeAddr *common.Address, input, code []byte, gas, gasPrice, value *big.Int) (ret []byte, addr common.Address, err error) { - evm := vm.NewVm(env) + evm := env.Vm() // Depth check execution. Fail if we're trying to execute above the // limit. if env.Depth() > int(params.CallCreateDepth.Int64()) { @@ -136,7 +136,7 @@ func exec(env vm.Environment, caller vm.ContractRef, address, codeAddr *common.A } func execDelegateCall(env vm.Environment, caller vm.ContractRef, originAddr, toAddr, codeAddr *common.Address, input, code []byte, gas, gasPrice, value *big.Int) (ret []byte, addr common.Address, err error) { - evm := vm.NewVm(env) + evm := env.Vm() // Depth check execution. Fail if we're trying to execute above the // limit. if env.Depth() > int(params.CallCreateDepth.Int64()) { |