From d97c6533b87b0a9dd6937c1ca57ec05129ac619b Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 11 Jul 2017 11:59:56 -0700
Subject: [PATCH] Remove local nonce error setting.

---
 CHANGELOG.md                            | 2 ++
 app/scripts/controllers/transactions.js | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 696d68345..f53bdead5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- No longer validate nonce client-side in retry loop.
+
 ## 3.8.4 2017-7-7
 
 - Improve transaction resubmit logic to fail more eagerly when a user would expect it to.
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 18bb245de..02487c385 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -458,14 +458,6 @@ module.exports = class TransactionController extends EventEmitter {
       return log.error(message)
     }
 
-    // if the nonce of the transaction is lower then the accounts nonce, fail.
-    if (txNonce < nonce) {
-      const message = 'Invalid nonce.'
-      this.setTxStatusFailed(txMeta.id, { message })
-      cb()
-      return log.error(message)
-    }
-
     // Only auto-submit already-signed txs:
     if (!('rawTx' in txMeta)) return cb()