Merge pull request #1461 from bas-vk/eth_resend

Old transaction after resend was not removed from pool

1 files changed, 8 insertions, 0 deletions

diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 2f864b5c1..1218bd625 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -884,6 +884,7 @@ type tx struct {
 	Data     string
 	GasLimit string
 	GasPrice string
+	Hash     string
 }
 
 func newTx(t *types.Transaction) *tx {
@@ -902,6 +903,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(),
 	}
 }
 
@@ -927,6 +929,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