Merge pull request #3907 from MetaMask/fix-all-migrations

migrations - back fixes

9 files changed, 124 insertions, 89 deletions

diff --git a/app/scripts/migrations/013.js b/app/scripts/migrations/013.js
index 8f11e510e..15a9b28d4 100644
--- a/app/scripts/migrations/013.js
+++ b/app/scripts/migrations/013.js
@@ -27,8 +27,11 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-  if (newState.config.provider.type === 'testnet') {
-    newState.config.provider.type = 'ropsten'
+  const { config } = newState
+  if ( config && config.provider ) {
+    if (config.provider.type === 'testnet') {
+      newState.config.provider.type = 'ropsten'
+    }
   }
   return newState
 }
diff --git a/app/scripts/migrations/015.js b/app/scripts/migrations/015.js
index 4b839580b..5e2f9e63b 100644
--- a/app/scripts/migrations/015.js
+++ b/app/scripts/migrations/015.js
@@ -28,11 +28,14 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-  const transactions = newState.TransactionController.transactions
-  newState.TransactionController.transactions = transactions.map((txMeta) => {
-    if (!txMeta.err) return txMeta
-    else if (txMeta.err.message === 'Gave up submitting tx.') txMeta.status = 'failed'
-    return txMeta
-  })
+  const { TransactionController } = newState
+  if (TransactionController && TransactionController.transactions) {
+    const transactions = TransactionController.transactions
+    newState.TransactionController.transactions = transactions.map((txMeta) => {
+      if (!txMeta.err) return txMeta
+      else if (txMeta.err.message === 'Gave up submitting tx.') txMeta.status = 'failed'
+      return txMeta
+    })
+  }
   return newState
 }
diff --git a/app/scripts/migrations/016.js b/app/scripts/migrations/016.js
index 4fc534f1c..048c7a40e 100644
--- a/app/scripts/migrations/016.js
+++ b/app/scripts/migrations/016.js
@@ -28,14 +28,18 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-  const transactions = newState.TransactionController.transactions
-  newState.TransactionController.transactions = transactions.map((txMeta) => {
-    if (!txMeta.err) return txMeta
-    if (txMeta.err === 'transaction with the same hash was already imported.') {
-      txMeta.status = 'submitted'
-      delete txMeta.err
-    }
-    return txMeta
-  })
+  const { TransactionController } = newState
+  if (TransactionController && TransactionController.transactions) {
+    const transactions = newState.TransactionController.transactions
+
+    newState.TransactionController.transactions = transactions.map((txMeta) => {
+      if (!txMeta.err) return txMeta
+      if (txMeta.err === 'transaction with the same hash was already imported.') {
+        txMeta.status = 'submitted'
+        delete txMeta.err
+      }
+      return txMeta
+    })
+  }
   return newState
 }
diff --git a/app/scripts/migrations/017.js b/app/scripts/migrations/017.js
index 24959cd3a..5f6d906d6 100644
--- a/app/scripts/migrations/017.js
+++ b/app/scripts/migrations/017.js
@@ -27,14 +27,17 @@ module.exports = {
 
 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
-  })
+  const { TransactionController } = newState
+  if (TransactionController && TransactionController.transactions) {
+    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/018.js b/app/scripts/migrations/018.js
index d27fe3f46..bea1fe3da 100644
--- a/app/scripts/migrations/018.js
+++ b/app/scripts/migrations/018.js
@@ -29,24 +29,27 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-  const transactions = newState.TransactionController.transactions
-  newState.TransactionController.transactions = transactions.map((txMeta) => {
-    // no history: initialize
-    if (!txMeta.history || txMeta.history.length === 0) {
-      const snapshot = txStateHistoryHelper.snapshotFromTxMeta(txMeta)
-      txMeta.history = [snapshot]
+  const { TransactionController } = newState
+  if (TransactionController && TransactionController.transactions) {
+    const transactions = newState.TransactionController.transactions
+    newState.TransactionController.transactions = transactions.map((txMeta) => {
+      // no history: initialize
+      if (!txMeta.history || txMeta.history.length === 0) {
+        const snapshot = txStateHistoryHelper.snapshotFromTxMeta(txMeta)
+        txMeta.history = [snapshot]
+        return txMeta
+      }
+      // has history: migrate
+      const newHistory = (
+        txStateHistoryHelper.migrateFromSnapshotsToDiffs(txMeta.history)
+        // remove empty diffs
+        .filter((entry) => {
+          return !Array.isArray(entry) || entry.length > 0
+        })
+      )
+      txMeta.history = newHistory
       return txMeta
-    }
-    // has history: migrate
-    const newHistory = (
-      txStateHistoryHelper.migrateFromSnapshotsToDiffs(txMeta.history)
-      // remove empty diffs
-      .filter((entry) => {
-        return !Array.isArray(entry) || entry.length > 0
-      })
-    )
-    txMeta.history = newHistory
-    return txMeta
-  })
+    })
+  }
   return newState
 }
diff --git a/app/scripts/migrations/019.js b/app/scripts/migrations/019.js
index 072c96370..ce5da6859 100644
--- a/app/scripts/migrations/019.js
+++ b/app/scripts/migrations/019.js
@@ -29,32 +29,36 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-  const transactions = newState.TransactionController.transactions
+  const { TransactionController } = newState
+  if (TransactionController && TransactionController.transactions) {
 
-  newState.TransactionController.transactions = transactions.map((txMeta, _, txList) => {
-    if (txMeta.status !== 'submitted') return txMeta
+    const transactions = newState.TransactionController.transactions
 
-    const confirmedTxs = txList.filter((tx) => tx.status === 'confirmed')
-    .filter((tx) => tx.txParams.from === txMeta.txParams.from)
-    .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
-    const highestConfirmedNonce = getHighestNonce(confirmedTxs)
+    newState.TransactionController.transactions = transactions.map((txMeta, _, txList) => {
+      if (txMeta.status !== 'submitted') return txMeta
 
-    const pendingTxs = txList.filter((tx) => tx.status === 'submitted')
-    .filter((tx) => tx.txParams.from === txMeta.txParams.from)
-    .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
-    const highestContinuousNonce = getHighestContinuousFrom(pendingTxs, highestConfirmedNonce)
+      const confirmedTxs = txList.filter((tx) => tx.status === 'confirmed')
+      .filter((tx) => tx.txParams.from === txMeta.txParams.from)
+      .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
+      const highestConfirmedNonce = getHighestNonce(confirmedTxs)
 
-    const maxNonce = Math.max(highestContinuousNonce, highestConfirmedNonce)
+      const pendingTxs = txList.filter((tx) => tx.status === 'submitted')
+      .filter((tx) => tx.txParams.from === txMeta.txParams.from)
+      .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
+      const highestContinuousNonce = getHighestContinuousFrom(pendingTxs, highestConfirmedNonce)
 
-    if (parseInt(txMeta.txParams.nonce, 16) > maxNonce + 1) {
-      txMeta.status = 'failed'
-      txMeta.err = {
-        message: 'nonce too high',
-        note: 'migration 019 custom error',
+      const maxNonce = Math.max(highestContinuousNonce, highestConfirmedNonce)
+
+      if (parseInt(txMeta.txParams.nonce, 16) > maxNonce + 1) {
+        txMeta.status = 'failed'
+        txMeta.err = {
+          message: 'nonce too high',
+          note: 'migration 019 custom error',
+        }
       }
-    }
-    return txMeta
-  })
+      return txMeta
+    })
+  }
   return newState
 }
 
diff --git a/app/scripts/migrations/022.js b/app/scripts/migrations/022.js
index c3c0d53ef..1fbe241e6 100644
--- a/app/scripts/migrations/022.js
+++ b/app/scripts/migrations/022.js
@@ -28,12 +28,15 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-  const transactions = newState.TransactionController.transactions
-
-  newState.TransactionController.transactions = transactions.map((txMeta) => {
-    if (txMeta.status !== 'submitted' || txMeta.submittedTime) return txMeta
-    txMeta.submittedTime = (new Date()).getTime()
-    return txMeta
-  })
+  const { TransactionController } = newState
+  if (TransactionController && TransactionController.transactions) {
+    const transactions = newState.TransactionController.transactions
+
+    newState.TransactionController.transactions = transactions.map((txMeta) => {
+      if (txMeta.status !== 'submitted' || txMeta.submittedTime) return txMeta
+      txMeta.submittedTime = (new Date()).getTime()
+      return txMeta
+    })
+  }
   return newState
 }
diff --git a/app/scripts/migrations/023.js b/app/scripts/migrations/023.js
index bce0a5bea..151496b06 100644
--- a/app/scripts/migrations/023.js
+++ b/app/scripts/migrations/023.js
@@ -28,23 +28,27 @@ module.exports = {
 
 function transformState (state) {
   const newState = state
-  const transactions = newState.TransactionController.transactions
-
-  if (transactions.length <= 40) return newState
-
-  let reverseTxList = transactions.reverse()
-  let stripping = true
-  while (reverseTxList.length > 40 && stripping) {
-    let txIndex = reverseTxList.findIndex((txMeta) => {
-      return (txMeta.status === 'failed' ||
-      txMeta.status === 'rejected' ||
-      txMeta.status === 'confirmed' ||
-      txMeta.status === 'dropped')
-    })
-    if (txIndex < 0) stripping = false
-    else reverseTxList.splice(txIndex, 1)
-  }
 
-  newState.TransactionController.transactions = reverseTxList.reverse()
+  const { TransactionController } = newState
+  if (TransactionController && TransactionController.transactions) {
+    const transactions = newState.TransactionController.transactions
+
+    if (transactions.length <= 40) return newState
+
+    let reverseTxList = transactions.reverse()
+    let stripping = true
+    while (reverseTxList.length > 40 && stripping) {
+      let txIndex = reverseTxList.findIndex((txMeta) => {
+        return (txMeta.status === 'failed' ||
+        txMeta.status === 'rejected' ||
+        txMeta.status === 'confirmed' ||
+        txMeta.status === 'dropped')
+      })
+      if (txIndex < 0) stripping = false
+      else reverseTxList.splice(txIndex, 1)
+    }
+
+    newState.TransactionController.transactions = reverseTxList.reverse()
+  }
   return newState
 }
diff --git a/test/unit/migrator-test.js b/test/unit/migrator-test.js
index 2bad7da51..4404e1dc4 100644
--- a/test/unit/migrator-test.js
+++ b/test/unit/migrator-test.js
@@ -50,11 +50,19 @@ describe('Migrator', () => {
     const migrator = new Migrator({ migrations: liveMigrations })
     migrator.migrateData(firstTimeState)
     .then((migratedData) => {
-    console.log(migratedData)
       const last = liveMigrations.length - 1
       assert.equal(migratedData.meta.version, liveMigrations[last].version)
       done()
     }).catch(done)
   })
 
+  it('should emit an error', function (done) {
+    this.timeout(15000)
+    const migrator = new Migrator({ migrations: [{ version: 1, migrate: async () => { throw new Error('test') } } ] })
+    migrator.on('error', () => done())
+    migrator.migrateData({ meta: {version: 0} })
+    .then((migratedData) => {
+    }).catch(done)
+  })
+
 })