From d40cba3042564f3471aa20a5cf477cafcacc2189 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 7 Jul 2014 10:53:20 +0200
Subject: changed state reset

---
 ethchain/state_transition.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'ethchain/state_transition.go')

diff --git a/ethchain/state_transition.go b/ethchain/state_transition.go
index 6ea9a837d..a92aa4a33 100644
--- a/ethchain/state_transition.go
+++ b/ethchain/state_transition.go
@@ -164,8 +164,6 @@ func (self *StateTransition) TransitionState() (err error) {
 	// Increment the nonce for the next transaction
 	sender.Nonce += 1
 
-	receiver = self.Receiver()
-
 	// Transaction gas
 	if err = self.UseGas(GasTx); err != nil {
 		return
@@ -178,6 +176,10 @@ func (self *StateTransition) TransitionState() (err error) {
 		return
 	}
 
+	snapshot := self.state.Copy()
+
+	receiver = self.Receiver()
+
 	// If the receiver is nil it's a contract (\0*32).
 	if receiver == nil {
 		// Create a new state object for the contract
@@ -192,8 +194,6 @@ func (self *StateTransition) TransitionState() (err error) {
 		return
 	}
 
-	//snapshot := self.state.Copy()
-
 	// Process the init code and create 'valid' contract
 	if IsContractAddr(self.receiver) {
 		// Evaluate the initialization script
@@ -203,8 +203,7 @@ func (self *StateTransition) TransitionState() (err error) {
 
 		code, err := self.Eval(receiver.Init(), receiver, "init")
 		if err != nil {
-			//self.state.Set(snapshot)
-			self.state.ResetStateObject(receiver)
+			self.state.Set(snapshot)
 
 			return fmt.Errorf("Error during init execution %v", err)
 		}
@@ -214,8 +213,7 @@ func (self *StateTransition) TransitionState() (err error) {
 		if len(receiver.Script()) > 0 {
 			_, err = self.Eval(receiver.Script(), receiver, "code")
 			if err != nil {
-				//self.state.Set(snapshot)
-				self.state.ResetStateObject(receiver)
+				self.state.Set(snapshot)
 
 				return fmt.Errorf("Error during code execution %v", err)
 			}
-- 
cgit 


From 68fba4b781652c0181ca58cf176e96a303acffe4 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 7 Jul 2014 11:17:48 +0200
Subject: Fixed state reset on err

---
 ethchain/state_transition.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ethchain/state_transition.go')

diff --git a/ethchain/state_transition.go b/ethchain/state_transition.go
index a92aa4a33..10a795cb8 100644
--- a/ethchain/state_transition.go
+++ b/ethchain/state_transition.go
@@ -176,8 +176,6 @@ func (self *StateTransition) TransitionState() (err error) {
 		return
 	}
 
-	snapshot := self.state.Copy()
-
 	receiver = self.Receiver()
 
 	// If the receiver is nil it's a contract (\0*32).
@@ -194,6 +192,8 @@ func (self *StateTransition) TransitionState() (err error) {
 		return
 	}
 
+	snapshot := self.state.Copy()
+
 	// Process the init code and create 'valid' contract
 	if IsContractAddr(self.receiver) {
 		// Evaluate the initialization script
-- 
cgit 


From b01cb2406f94745277fe05dfa74c6e5d42af1c6a Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 7 Jul 2014 13:59:09 +0200
Subject: Fixed state reset case

---
 ethchain/state_transition.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'ethchain/state_transition.go')

diff --git a/ethchain/state_transition.go b/ethchain/state_transition.go
index 10a795cb8..314d858f2 100644
--- a/ethchain/state_transition.go
+++ b/ethchain/state_transition.go
@@ -176,15 +176,23 @@ func (self *StateTransition) TransitionState() (err error) {
 		return
 	}
 
-	receiver = self.Receiver()
+	/* FIXME
+	 * If tx goes TO "0", goes OOG during init, reverse changes, but initial endowment should happen. The ether is lost forever
+	 */
+	var snapshot *State
 
 	// If the receiver is nil it's a contract (\0*32).
-	if receiver == nil {
+	if tx.CreatesContract() {
+		snapshot = self.state.Copy()
+
 		// Create a new state object for the contract
 		receiver = self.MakeStateObject(self.state, tx)
+		self.rec = receiver
 		if receiver == nil {
 			return fmt.Errorf("Unable to create contract")
 		}
+	} else {
+		receiver = self.Receiver()
 	}
 
 	// Transfer value from sender to receiver
@@ -192,7 +200,9 @@ func (self *StateTransition) TransitionState() (err error) {
 		return
 	}
 
-	snapshot := self.state.Copy()
+	if snapshot == nil {
+		snapshot = self.state.Copy()
+	}
 
 	// Process the init code and create 'valid' contract
 	if IsContractAddr(self.receiver) {
-- 
cgit