From 0a94ec41d3a2877ed7cfd3c8f9e9f9d725659183 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 22:42:59 -0700
Subject: [PATCH] pending-tx - move incrementing of the retryCount on the
 txMeta outside pending-tx-tracker

---
 app/scripts/controllers/transactions.js | 5 +++++
 app/scripts/lib/pending-tx-tracker.js   | 3 +--
 test/unit/tx-controller-test.js         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 6ea2933dc..3cd107031 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -75,6 +75,11 @@ module.exports = class TransactionController extends EventEmitter {
     this.pendingTxTracker.on('tx:warning', this.txStateManager.updateTx.bind(this.txStateManager))
     this.pendingTxTracker.on('tx:failed', this.txStateManager.setTxStatusFailed.bind(this.txStateManager))
     this.pendingTxTracker.on('tx:confirmed', this.txStateManager.setTxStatusConfirmed.bind(this.txStateManager))
+    this.pendingTxTracker.on('tx:retry', (txMeta) => {
+      if (!('retryCount' in txMeta)) txMeta.retryCount = 0
+      txMeta.retryCount++
+      this.txStateManager.updateTx(txMeta)
+    })
 
     this.blockTracker.on('rawBlock', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker))
     // this is a little messy but until ethstore has been either
diff --git a/app/scripts/lib/pending-tx-tracker.js b/app/scripts/lib/pending-tx-tracker.js
index 31cf9babb..b07a6bd39 100644
--- a/app/scripts/lib/pending-tx-tracker.js
+++ b/app/scripts/lib/pending-tx-tracker.js
@@ -102,7 +102,6 @@ module.exports = class PendingTransactionTracker extends EventEmitter {
     const address = txMeta.txParams.from
     const balance = this.getBalance(address)
     if (balance === undefined) return
-    if (!('retryCount' in txMeta)) txMeta.retryCount = 0
 
     if (txMeta.retryCount > this.retryLimit) {
       const err = new Error(`Gave up submitting after ${this.retryLimit} blocks un-mined.`)
@@ -124,7 +123,7 @@ module.exports = class PendingTransactionTracker extends EventEmitter {
     const txHash = await this.publishTransaction(rawTx)
 
     // Increment successful tries:
-    txMeta.retryCount++
+    this.emit('tx:retry', txMeta)
     return txHash
   }
 
diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 9ffba31ee..66772ff88 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -25,7 +25,7 @@ describe('Transaction Controller', function () {
       networkStore: new ObservableStore(currentNetworkId),
       txHistoryLimit: 10,
       blockTracker: { getCurrentBlock: noop, on: noop, once: noop },
-      accountTracker: { store: {getState: noop} },
+      accountTracker: { store: { getState: noop } },
       signTransaction: (ethTx) => new Promise((resolve) => {
         ethTx.sign(privKey)
         resolve()