diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-17 21:02:08 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-17 21:02:08 +0800 |
| commit | ff1f6fa09dd24610cb1982a49953fa1cd06696d9 (patch) | |
| tree | d10e4fb803ba9221af13f6b6330651681c0ad302 /rpc | |
| parent | 7ea30f18f9fe1020cd801dd53d881b163198ace4 (diff) | |
| parent | 8603ec7055a09e5e20938ec47930c416ec8e7d5c (diff) | |
| download | dexon-ff1f6fa09dd24610cb1982a49953fa1cd06696d9.tar dexon-ff1f6fa09dd24610cb1982a49953fa1cd06696d9.tar.gz dexon-ff1f6fa09dd24610cb1982a49953fa1cd06696d9.tar.bz2 dexon-ff1f6fa09dd24610cb1982a49953fa1cd06696d9.tar.lz dexon-ff1f6fa09dd24610cb1982a49953fa1cd06696d9.tar.xz dexon-ff1f6fa09dd24610cb1982a49953fa1cd06696d9.tar.zst dexon-ff1f6fa09dd24610cb1982a49953fa1cd06696d9.zip | |
Merge pull request #1649 from maran/pending_tx_response
rpc/api: format pendingTx response. Fixes #1648
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api/eth_args.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go index 5a1841cbe..8bd077e20 100644 --- a/rpc/api/eth_args.go +++ b/rpc/api/eth_args.go @@ -908,14 +908,14 @@ func (args *SubmitWorkArgs) UnmarshalJSON(b []byte) (err error) { type tx struct { tx *types.Transaction - To string - From string - Nonce string - Value string - Data string - GasLimit string - GasPrice string - Hash string + To string `json:"to"` + From string `json:"from"` + Nonce string `json:"nonce"` + Value string `json:"value"` + Data string `json:"data"` + GasLimit string `json:"gas"` + GasPrice string `json:"gasPrice"` + Hash string `json:"hash"` } func newTx(t *types.Transaction) *tx { |