From 36c0db2ac9e1505bfcb29a137f67ba31efde4c90 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 4 Jun 2015 11:35:37 +0200
Subject: xeth: use the correct nonce for creating transactions

---
 xeth/xeth.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'xeth')

diff --git a/xeth/xeth.go b/xeth/xeth.go
index 187892a49..d0d51bfe0 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -942,18 +942,17 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
 	if len(nonceStr) != 0 {
 		nonce = common.Big(nonceStr).Uint64()
 	} else {
-		nonce = state.GetNonce(from) + 1 //state.NewNonce(from)
+		nonce = state.GetNonce(from)
 	}
 	tx.SetNonce(nonce)
 
 	if err := self.sign(tx, from, false); err != nil {
-		//state.RemoveNonce(from, tx.Nonce())
 		return "", err
 	}
 	if err := self.backend.TxPool().Add(tx); err != nil {
-		//state.RemoveNonce(from, tx.Nonce())
 		return "", err
 	}
+	state.SetNonce(from, nonce+1)
 
 	if contractCreation {
 		addr := core.AddressFromMessage(tx)
-- 
cgit v1.2.3