1 files changed, 23 insertions, 20 deletions
diff --git a/core/execution.go b/core/execution.go
index 4f15fb42a..24e085e6d 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -5,20 +5,24 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
 )
 
 type Execution struct {
-	env               vm.Environment
-	address           *common.Address
-	input             []byte
+	env     vm.Environment
+	address *common.Address
+	input   []byte
+	evm     vm.VirtualMachine
+
 	Gas, price, value *big.Int
 }
 
 func NewExecution(env vm.Environment, address *common.Address, input []byte, gas, gasPrice, value *big.Int) *Execution {
-	return &Execution{env: env, address: address, input: input, Gas: gas, price: gasPrice, value: value}
+	exe := &Execution{env: env, address: address, input: input, Gas: gas, price: gasPrice, value: value}
+	exe.evm = vm.NewVm(env)
+	return exe
 }
 
 func (self *Execution) Call(codeAddr common.Address, caller vm.ContextRef) ([]byte, error) {
@@ -28,9 +32,17 @@ func (self *Execution) Call(codeAddr common.Address, caller vm.ContextRef) ([]by
 	return self.exec(&codeAddr, code, caller)
 }
 
+func (self *Execution) Create(caller vm.ContextRef) (ret []byte, err error, account *state.StateObject) {
+	ret, err = self.exec(nil, self.input, caller)
+	account = self.env.State().GetStateObject(*self.address)
+	return
+}
+
 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)
+	evm := self.evm
 	if env.Depth() == vm.MaxCallDepth {
 		caller.ReturnGas(self.Gas, self.price)
 
@@ -42,9 +54,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,24 +69,14 @@ 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)
 	}
 
 	return
 }
-
-func (self *Execution) Create(caller vm.ContextRef) (ret []byte, err error, account *state.StateObject) {
-	ret, err = self.exec(nil, self.input, caller)
-	account = self.env.State().GetStateObject(*self.address)
-
-	return
-}