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 /rpc/api.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 'rpc/api.go')
| -rw-r--r-- | rpc/api.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rpc/api.go b/rpc/api.go index 6d3a20bfa..b79a1306e 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -173,7 +173,13 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err return fmt.Errorf("Transaction not confirmed") } - v, err := api.xeth().Transact(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data) + // nonce may be nil ("guess" mode) + var nonce string + if args.Nonce != nil { + nonce = args.Nonce.String() + } + + v, err := api.xeth().Transact(args.From, args.To, nonce, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data) if err != nil { return err } |