aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-19 03:28:51 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-19 03:28:51 +0800
commit6c2ad7b72ee3d159e1a2439fc16358ceea39118e (patch)
tree9f926db0f3f5a04a26c62a77767c9888da658fc0
parentbd0c0a633bebe8893c4b06a50740047e4376107c (diff)
parentb7baceefdab01e4594b66500b54e089c91f2727a (diff)
downloadgo-tangerine-6c2ad7b72ee3d159e1a2439fc16358ceea39118e.tar
go-tangerine-6c2ad7b72ee3d159e1a2439fc16358ceea39118e.tar.gz
go-tangerine-6c2ad7b72ee3d159e1a2439fc16358ceea39118e.tar.bz2
go-tangerine-6c2ad7b72ee3d159e1a2439fc16358ceea39118e.tar.lz
go-tangerine-6c2ad7b72ee3d159e1a2439fc16358ceea39118e.tar.xz
go-tangerine-6c2ad7b72ee3d159e1a2439fc16358ceea39118e.tar.zst
go-tangerine-6c2ad7b72ee3d159e1a2439fc16358ceea39118e.zip
Merge pull request #1034 from obscuren/tx_pool_fix
Nonce fix for failing transactions
-rw-r--r--xeth/xeth.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 88cd30afc..4d9611cbc 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -924,9 +924,11 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
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
}