Merge pull request #6969 from MetaMask/developv7.0.0

Master Version Bump

6 files changed, 75 insertions, 14 deletions

diff --git a/app/scripts/migrations/018.js b/app/scripts/migrations/018.js
index ffbf24a4b..f6442dacc 100644
--- a/app/scripts/migrations/018.js
+++ b/app/scripts/migrations/018.js
@@ -43,9 +43,9 @@ function transformState (state) {
       const newHistory = (
         txStateHistoryHelper.migrateFromSnapshotsToDiffs(txMeta.history)
         // remove empty diffs
-        .filter((entry) => {
-          return !Array.isArray(entry) || entry.length > 0
-        })
+          .filter((entry) => {
+            return !Array.isArray(entry) || entry.length > 0
+          })
       )
       txMeta.history = newHistory
       return txMeta
diff --git a/app/scripts/migrations/019.js b/app/scripts/migrations/019.js
index ce5da6859..7b726c3e8 100644
--- a/app/scripts/migrations/019.js
+++ b/app/scripts/migrations/019.js
@@ -38,13 +38,13 @@ function transformState (state) {
       if (txMeta.status !== 'submitted') return txMeta
 
       const confirmedTxs = txList.filter((tx) => tx.status === 'confirmed')
-      .filter((tx) => tx.txParams.from === txMeta.txParams.from)
-      .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
+        .filter((tx) => tx.txParams.from === txMeta.txParams.from)
+        .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
       const highestConfirmedNonce = getHighestNonce(confirmedTxs)
 
       const pendingTxs = txList.filter((tx) => tx.status === 'submitted')
-      .filter((tx) => tx.txParams.from === txMeta.txParams.from)
-      .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
+        .filter((tx) => tx.txParams.from === txMeta.txParams.from)
+        .filter((tx) => tx.metamaskNetworkId.from === txMeta.metamaskNetworkId.from)
       const highestContinuousNonce = getHighestContinuousFrom(pendingTxs, highestConfirmedNonce)
 
       const maxNonce = Math.max(highestContinuousNonce, highestConfirmedNonce)
@@ -78,7 +78,7 @@ function getHighestContinuousFrom (txList, startPoint) {
 
 function getHighestNonce (txList) {
   const nonces = txList.map((txMeta) => {
-  const nonce = txMeta.txParams.nonce
+    const nonce = txMeta.txParams.nonce
     return parseInt(nonce || '0x0', 16)
   })
   const highestNonce = Math.max.apply(null, nonces)
diff --git a/app/scripts/migrations/024.js b/app/scripts/migrations/024.js
index 6239bab13..5ffaea377 100644
--- a/app/scripts/migrations/024.js
+++ b/app/scripts/migrations/024.js
@@ -32,7 +32,7 @@ function transformState (state) {
       txMeta.status === 'unapproved' &&
       txMeta.txParams &&
       txMeta.txParams.from
-      ) {
+    ) {
       txMeta.txParams.from = txMeta.txParams.from.toLowerCase()
     }
     return txMeta
diff --git a/app/scripts/migrations/031.js b/app/scripts/migrations/031.js
index 98d182828..9c8cbeb09 100644
--- a/app/scripts/migrations/031.js
+++ b/app/scripts/migrations/031.js
@@ -2,14 +2,14 @@
 const version = 31
 const clone = require('clone')
 
- /*
+/*
   * The purpose of this migration is to properly set the completedOnboarding flag baesd on the state
   * of the KeyringController.
   */
 module.exports = {
   version,
 
-   migrate: async function (originalVersionedData) {
+  migrate: async function (originalVersionedData) {
     const versionedData = clone(originalVersionedData)
     versionedData.meta.version = version
     const state = versionedData.data
@@ -19,13 +19,13 @@ module.exports = {
   },
 }
 
- function transformState (state) {
+function transformState (state) {
   const { KeyringController, PreferencesController } = state
 
-   if (KeyringController && PreferencesController) {
+  if (KeyringController && PreferencesController) {
     const { vault } = KeyringController
     PreferencesController.completedOnboarding = Boolean(vault)
   }
 
-   return state
+  return state
 }
diff --git a/app/scripts/migrations/034.js b/app/scripts/migrations/034.js
new file mode 100644
index 000000000..7c852de96
--- /dev/null
+++ b/app/scripts/migrations/034.js
@@ -0,0 +1,33 @@
+const version = 34
+const clone = require('clone')
+
+/**
+ * The purpose of this migration is to enable the {@code privacyMode} feature flag and set the user as being migrated
+ * if it was {@code false}.
+ */
+module.exports = {
+  version,
+  migrate: async function (originalVersionedData) {
+    const versionedData = clone(originalVersionedData)
+    versionedData.meta.version = version
+    const state = versionedData.data
+    versionedData.data = transformState(state)
+    return versionedData
+  },
+}
+
+function transformState (state) {
+  const { PreferencesController } = state
+
+  if (PreferencesController) {
+    const featureFlags = PreferencesController.featureFlags || {}
+
+    if (!featureFlags.privacyMode && typeof PreferencesController.migratedPrivacyMode === 'undefined') {
+      // Mark the state has being migrated and enable Privacy Mode
+      PreferencesController.migratedPrivacyMode = true
+      featureFlags.privacyMode = true
+    }
+  }
+
+  return state
+}
diff --git a/app/scripts/migrations/035.js b/app/scripts/migrations/035.js
new file mode 100644
index 000000000..02b01f588
--- /dev/null
+++ b/app/scripts/migrations/035.js
@@ -0,0 +1,28 @@
+// next version number
+const version = 35
+
+/*
+
+Removes the deprecated 'seedWords' state
+
+*/
+
+const clone = require('clone')
+
+module.exports = {
+  version,
+
+  migrate: async function (originalVersionedData) {
+    const versionedData = clone(originalVersionedData)
+    versionedData.meta.version = version
+    versionedData.data = transformState(versionedData.data)
+    return versionedData
+  },
+}
+
+function transformState (state) {
+  if (state.PreferencesController && state.PreferencesController.seedWords !== undefined) {
+    delete state.PreferencesController.seedWords
+  }
+  return state
+}