From 7e31df39877d95446b48c8064e55ebef48d4e5c6 Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Fri, 10 Jul 2015 11:35:15 +0200 Subject: bugfix, pending transaction was resend with new gas price/limit but not removed from transaction pool --- rpc/api/eth_args.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'rpc/api/eth_args.go') 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 -- cgit v1.2.3