From 576df064e5cd4bc027120791484cb8100646f284 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 24 Mar 2015 11:49:30 +0100
Subject: [PATCH] Updated for PV59

* Value XFER are refunded back to the sender if the execution fails
---
 core/execution.go        | 18 ++++++++----------
 core/state_transition.go | 15 +++++++--------
 eth/protocol.go          |  2 +-
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/core/execution.go b/core/execution.go
index 92d932a9f..893b79dc7 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 {
@@ -37,7 +39,7 @@ func (self *Execution) exec(contextAddr *common.Address, code []byte, caller vm.
 		return nil, vm.DepthError{}
 	}
 
-	vsnapshot := env.State().Copy()
+	snapshot := env.State().Copy()
 	if self.address == nil {
 		// Generate a new address
 		nonce := env.State().GetNonce(caller.Address())
@@ -49,21 +51,17 @@ func (self *Execution) exec(contextAddr *common.Address, code []byte, caller vm.
 	from, to := env.State().GetStateObject(caller.Address()), env.State().GetOrNewStateObject(*self.address)
 	err = env.Transfer(from, to, self.value)
 	if err != nil {
-		env.State().Set(vsnapshot)
-
-		caller.ReturnGas(self.Gas, self.price)
+		env.State().Set(snapshot)
+		//caller.ReturnGas(self.Gas, self.price)
 
 		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)
 	}
diff --git a/core/state_transition.go b/core/state_transition.go
index e530567d0..d46838d02 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -5,9 +5,9 @@ import (
 	"math/big"
 
 	"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"
 )
 
 const tryJit = false
@@ -182,10 +182,6 @@ func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, er
 		return nil, nil, InvalidTxError(err)
 	}
 
-	// Increment the nonce for the next transaction
-	self.state.SetNonce(sender.Address(), sender.Nonce()+1)
-	//sender.Nonce += 1
-
 	// Pay data gas
 	var dgas int64
 	for _, byt := range self.data {
@@ -199,12 +195,15 @@ func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, er
 		return nil, nil, InvalidTxError(err)
 	}
 
+	// Increment the nonce for the next transaction
+	self.state.SetNonce(sender.Address(), sender.Nonce()+1)
+
 	vmenv := self.env
 	var ref vm.ContextRef
 	if MessageCreatesContract(msg) {
-		contract := makeContract(msg, self.state)
-		addr := contract.Address()
-		ret, err, ref = vmenv.Create(sender, &addr, self.msg.Data(), self.gas, self.gasPrice, self.value)
+		//contract := makeContract(msg, self.state)
+		//addr := contract.Address()
+		ret, err, ref = vmenv.Create(sender, nil, self.msg.Data(), self.gas, self.gasPrice, self.value)
 		if err == nil {
 			dataGas := big.NewInt(int64(len(ret)))
 			dataGas.Mul(dataGas, vm.GasCreateByte)
diff --git a/eth/protocol.go b/eth/protocol.go
index 494c1c1bb..b373c9889 100644
--- a/eth/protocol.go
+++ b/eth/protocol.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	ProtocolVersion    = 58
+	ProtocolVersion    = 59
 	NetworkId          = 0
 	ProtocolLength     = uint64(8)
 	ProtocolMaxMsgSize = 10 * 1024 * 1024