diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
| commit | 45152dead5c6bc144f8ed51ed85d5ef64f783735 (patch) | |
| tree | 48aa51432821a0d49ffa6d2a015c16f4867a1c63 /xeth/xeth.go | |
| parent | 10fc73376789b1b016fbbd86df3b378df0238a0c (diff) | |
| parent | 912cf7ba049e4bcd5e497c62bb7cb96e7502f1b9 (diff) | |
| download | dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.gz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.bz2 dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.lz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.xz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.zst dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.zip | |
Merge pull request #1181 from obscuren/txpool_fixes
cmd: transaction pool fixes and improvements
Diffstat (limited to 'xeth/xeth.go')
| -rw-r--r-- | xeth/xeth.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index 157fe76c7..d0d51bfe0 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -936,24 +936,23 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS tx = types.NewTransactionMessage(to, value, gas, price, data) } - state := self.backend.ChainManager().TxState() + state := self.backend.TxPool().State() var nonce uint64 if len(nonceStr) != 0 { nonce = common.Big(nonceStr).Uint64() } else { - nonce = 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) |