diff options
Diffstat (limited to 'core/execution.go')
| -rw-r--r-- | core/execution.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/execution.go b/core/execution.go index 92d932a9f..72eb22bd5 100644 --- a/core/execution.go +++ b/core/execution.go @@ -5,9 +5,9 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/vm" + "github.com/ethereum/go-ethereum/crypto" ) type Execution struct { @@ -29,6 +29,8 @@ func (self *Execution) Call(codeAddr common.Address, caller vm.ContextRef) ([]by } func (self *Execution) exec(contextAddr *common.Address, code []byte, caller vm.ContextRef) (ret []byte, err error) { + start := time.Now() + env := self.env evm := vm.NewVm(env) if env.Depth() == vm.MaxCallDepth { @@ -42,9 +44,10 @@ func (self *Execution) exec(contextAddr *common.Address, code []byte, caller vm. // Generate a new address nonce := env.State().GetNonce(caller.Address()) addr := crypto.CreateAddress(caller.Address(), nonce) - self.address = &addr env.State().SetNonce(caller.Address(), nonce+1) + self.address = &addr } + snapshot := env.State().Copy() from, to := env.State().GetStateObject(caller.Address()), env.State().GetOrNewStateObject(*self.address) err = env.Transfer(from, to, self.value) @@ -56,14 +59,11 @@ func (self *Execution) exec(contextAddr *common.Address, code []byte, caller vm. return nil, ValueTransferErr("insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance()) } - snapshot := env.State().Copy() - start := time.Now() - context := vm.NewContext(caller, to, self.value, self.Gas, self.price) context.SetCallCode(contextAddr, code) - ret, err = evm.Run(context, self.input) //self.value, self.Gas, self.price, self.input) - chainlogger.Debugf("vm took %v\n", time.Since(start)) + ret, err = evm.Run(context, self.input) + evm.Printf("message call took %v", time.Since(start)).Endl() if err != nil { env.State().Set(snapshot) } |