diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-07 02:23:58 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-07 02:23:58 +0800 |
| commit | 323216ed85b48abec07266a203b731e7491d4286 (patch) | |
| tree | e9ac9734d08effe53094f6cb00ff306dc51ffe73 /xeth/xeth.go | |
| parent | 1f26a1b86319f9468395e0772b5ae8f02cce8ec8 (diff) | |
| parent | 05ac1209c731722a486fb54d3b5cc9282c760c81 (diff) | |
| download | dexon-323216ed85b48abec07266a203b731e7491d4286.tar dexon-323216ed85b48abec07266a203b731e7491d4286.tar.gz dexon-323216ed85b48abec07266a203b731e7491d4286.tar.bz2 dexon-323216ed85b48abec07266a203b731e7491d4286.tar.lz dexon-323216ed85b48abec07266a203b731e7491d4286.tar.xz dexon-323216ed85b48abec07266a203b731e7491d4286.tar.zst dexon-323216ed85b48abec07266a203b731e7491d4286.zip | |
Merge pull request #861 from obscuren/transaction_pool_fixes
core: transaction pool fixes & resending transactions
Diffstat (limited to 'xeth/xeth.go')
| -rw-r--r-- | xeth/xeth.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index 692fb338c..ac59069d5 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -648,7 +648,7 @@ func (self *XEth) ConfirmTransaction(tx string) bool { } -func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeStr string) (string, error) { +func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceStr, codeStr string) (string, error) { var ( from = common.HexToAddress(fromStr) to = common.HexToAddress(toStr) @@ -704,7 +704,13 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt } state := self.backend.ChainManager().TxState() - nonce := state.NewNonce(from) + + var nonce uint64 + if len(nonceStr) != 0 { + nonce = common.Big(nonceStr).Uint64() + } else { + nonce = state.NewNonce(from) + } tx.SetNonce(nonce) if err := self.sign(tx, from, false); err != nil { |