check nonce and balance when resubmiting tx

2 files changed, 17 insertions, 11 deletions

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 2769a8d59..58dc8a6ab 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -25,10 +25,10 @@ module.exports = class TransactionController extends EventEmitter {
     this.query = opts.ethQuery
     this.txProviderUtils = new TxProviderUtil(this.query)
     this.blockTracker.on('block', this.checkForTxInBlock.bind(this))
-    this.blockTracker.on('latest', this.resubmitPendingTxs.bind(this))
+    this.provider._blockTracker.on('latest', this.resubmitPendingTxs.bind(this))
     this.signEthTx = opts.signTransaction
     this.nonceLock = Semaphore(1)
-
+    this.ethStore = opts.ethStore
     // memstore is computed from a few different stores
     this._updateMemstore()
     this.store.subscribe(() => this._updateMemstore())
@@ -411,26 +411,31 @@ module.exports = class TransactionController extends EventEmitter {
     const pending = this.getTxsByMetaData('status', 'submitted')
     // only try resubmitting if their are transactions to resubmit
     if (!pending.length) return
-    const resubmit = denodeify(this.resubmitTx.bind(this))
+    const resubmit = denodeify(this._resubmitTx.bind(this))
     Promise.all(pending.map(txMeta => resubmit(txMeta)))
     .catch((reason) => {
       log.info('Problem resubmitting tx', reason)
     })
   }
 
-  resubmitTx (txMeta, cb) {
-    // Increment a try counter.
-    if (!('retryCount' in txMeta)) {
-      txMeta.retryCount = 0
-    }
+  _resubmitTx (txMeta, cb) {
+    const address = txMeta.txParams.from
+    const balance = this.ethStore.getState().accounts[address].balance
+    const nonce = Number.parseInt(this.ethStore.getState().accounts[address].nonce)
+    const txNonce = Number.parseInt(txMeta.txParams.nonce)
+    const gtBalance = Number.parseInt(txMeta.txParams.value) > Number.parseInt(balance)
+    if (!('retryCount' in txMeta)) txMeta.retryCount = 0
 
+    // if the value of the transaction is greater then the balance
+    // or the nonce of the transaction is lower then the accounts nonce
+    // dont resubmit the tx
+    if (gtBalance || txNonce < nonce) return cb()
     // Only auto-submit already-signed txs:
-    if (!('rawTx' in txMeta)) {
-      return cb()
-    }
+    if (!('rawTx' in txMeta)) return cb()
 
     if (txMeta.retryCount > RETRY_LIMIT) return
 
+    // Increment a try counter.
     txMeta.retryCount++
     const rawTx = txMeta.rawTx
     this.txProviderUtils.publishTransaction(rawTx, cb)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a7eb3d056..727c19fb7 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -98,6 +98,7 @@ module.exports = class MetamaskController extends EventEmitter {
       provider: this.provider,
       blockTracker: this.provider,
       ethQuery: this.ethQuery,
+      ethStore: this.ethStore,
     })
 
     // notices