diff options
| author | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
|---|---|---|
| committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
| commit | 2ba65f4fbaea49c1e0d99959b0331e09b153f931 (patch) | |
| tree | add8cabb05cd7fbf0ba4b4bbaf9460dacfc2082d /core/execution.go | |
| parent | 2da367a2bee84d74d1bb0ea1b42d4c22fae486dd (diff) | |
| parent | 60318c96d03bcaaf731802b1080a3d87cb482124 (diff) | |
| download | dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.gz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.bz2 dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.lz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.xz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.zst dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.zip | |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Diffstat (limited to 'core/execution.go')
| -rw-r--r-- | core/execution.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/execution.go b/core/execution.go index cad4e84aa..5e0cbd37e 100644 --- a/core/execution.go +++ b/core/execution.go @@ -33,8 +33,7 @@ func (self *Execution) Call(codeAddr []byte, caller vm.ContextRef) ([]byte, erro func (self *Execution) exec(code, contextAddr []byte, caller vm.ContextRef) (ret []byte, err error) { env := self.env - evm := vm.New(env) - + evm := vm.NewVm(env) if env.Depth() == vm.MaxCallDepth { caller.ReturnGas(self.Gas, self.price) |