diff options
| author | Bas van Kervel <bas@ethdev.com> | 2015-07-10 17:35:15 +0800 |
|---|---|---|
| committer | Bas van Kervel <bas@ethdev.com> | 2015-07-28 16:42:31 +0800 |
| commit | 7e31df39877d95446b48c8064e55ebef48d4e5c6 (patch) | |
| tree | 7092be5bdfe8cff0c7ec014576b87add78b8f79b /rpc/api/eth_args.go | |
| parent | 5a810758dbe75dce9537d464ac0e5b5385b0e78f (diff) | |
| download | dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.tar.gz dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.tar.zst dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.zip | |
bugfix, pending transaction was resend with new gas price/limit but not removed from transaction pool
Diffstat (limited to 'rpc/api/eth_args.go')
| -rw-r--r-- | rpc/api/eth_args.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go index f63b43334..5d0ec8ec4 100644 --- a/rpc/api/eth_args.go +++ b/rpc/api/eth_args.go @@ -888,6 +888,7 @@ type tx struct { Data string GasLimit string GasPrice string + Hash string } func newTx(t *types.Transaction) *tx { @@ -906,6 +907,7 @@ func newTx(t *types.Transaction) *tx { Data: "0x" + common.Bytes2Hex(t.Data()), GasLimit: t.Gas().String(), GasPrice: t.GasPrice().String(), + Hash: t.Hash().Hex(), } } @@ -931,6 +933,12 @@ func (tx *tx) UnmarshalJSON(b []byte) (err error) { contractCreation = true ) + if val, found := fields["Hash"]; found { + if hashVal, ok := val.(string); ok { + tx.Hash = hashVal + } + } + if val, found := fields["To"]; found { if strVal, ok := val.(string); ok && len(strVal) > 0 { tx.To = strVal |