Merge pull request #1771 from MetaMask/addNonceErrToErrLIst

Add nonce err to err list

3 files changed, 42 insertions, 0 deletions

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 43735a691..4d037ce98 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -433,6 +433,7 @@ module.exports = class TransactionController extends EventEmitter {
         || errorMessage.includes('transaction with the same hash was already imported')
         // other
         || errorMessage.includes('gateway timeout')
+        || errorMessage.includes('nonce too low')
       )
       // ignore resubmit warnings, return early
       if (isKnownTx) return
diff --git a/app/scripts/migrations/017.js b/app/scripts/migrations/017.js
new file mode 100644
index 000000000..24959cd3a
--- /dev/null
+++ b/app/scripts/migrations/017.js
@@ -0,0 +1,40 @@
+const version = 17
+
+/*
+
+This migration sets transactions who were retried and marked as failed to submitted
+
+*/
+
+const clone = require('clone')
+
+module.exports = {
+  version,
+
+  migrate: function (originalVersionedData) {
+    const versionedData = clone(originalVersionedData)
+    versionedData.meta.version = version
+    try {
+      const state = versionedData.data
+      const newState = transformState(state)
+      versionedData.data = newState
+    } catch (err) {
+      console.warn(`MetaMask Migration #${version}` + err.stack)
+    }
+    return Promise.resolve(versionedData)
+  },
+}
+
+function transformState (state) {
+  const newState = state
+  const transactions = newState.TransactionController.transactions
+  newState.TransactionController.transactions = transactions.map((txMeta) => {
+    if (!txMeta.status === 'failed') return txMeta
+    if (txMeta.retryCount > 0 && txMeta.retryCount < 2) {
+      txMeta.status = 'submitted'
+      delete txMeta.err
+    }
+    return txMeta
+  })
+  return newState
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index a4f9c7c4d..f4c87499f 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -27,4 +27,5 @@ module.exports = [
   require('./014'),
   require('./015'),
   require('./016'),
+  require('./017'),
 ]