From 7a0acb23337772d3204ed037cf320e02f1e5232a Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 30 Jan 2017 13:01:54 -0800
Subject: migration #6 - move selectedAccount from keyringController to
 preferencesController

---
 app/scripts/migrations/006.js | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 app/scripts/migrations/006.js

(limited to 'app/scripts/migrations/006.js')

diff --git a/app/scripts/migrations/006.js b/app/scripts/migrations/006.js
new file mode 100644
index 000000000..b2fcbae15
--- /dev/null
+++ b/app/scripts/migrations/006.js
@@ -0,0 +1,41 @@
+const version = 6
+
+/*
+
+This migration moves KeyringController.selectedAddress to PreferencesController.selectedAddress
+
+*/
+
+const extend = require('xtend')
+
+module.exports = {
+  version,  
+
+  migrate: function (versionedData) {
+    versionedData.meta.version = version
+    try {
+      const state = versionedData.data
+      const newState = migrateState(state)
+      versionedData.data = newState
+    } catch (err) {
+      console.warn(`MetaMask Migration #${version}` + err.stack)
+    }
+    return Promise.resolve(versionedData)
+  },
+}
+
+function migrateState (state) {
+  const config = state.config
+
+  // add new state
+  const newState = extend(state, {
+    PreferencesController: {
+      selectedAccount: config.selectedAccount,
+    },
+  })
+
+  // rm old state
+  delete newState.KeyringController.selectedAccount
+
+  return newState
+}
-- 
cgit v1.2.3


From f9b31fe2c3a43339a4519761e4c8b2f3813e85e0 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 30 Jan 2017 15:08:31 -0800
Subject: rename selectedAccount to selectedAddress

---
 app/scripts/migrations/006.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts/migrations/006.js')

diff --git a/app/scripts/migrations/006.js b/app/scripts/migrations/006.js
index b2fcbae15..677e89bf7 100644
--- a/app/scripts/migrations/006.js
+++ b/app/scripts/migrations/006.js
@@ -30,7 +30,7 @@ function migrateState (state) {
   // add new state
   const newState = extend(state, {
     PreferencesController: {
-      selectedAccount: config.selectedAccount,
+      selectedAddress: config.selectedAccount,
     },
   })
 
-- 
cgit v1.2.3


From 0b9d37c6c8e714eb26bec5156e984a6b0cd268ad Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 30 Jan 2017 15:53:21 -0800
Subject: migration #6 - fix selectedAddress data source

---
 app/scripts/migrations/006.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/scripts/migrations/006.js')

diff --git a/app/scripts/migrations/006.js b/app/scripts/migrations/006.js
index 677e89bf7..950c4deb8 100644
--- a/app/scripts/migrations/006.js
+++ b/app/scripts/migrations/006.js
@@ -25,12 +25,12 @@ module.exports = {
 }
 
 function migrateState (state) {
-  const config = state.config
+  const keyringSubstate = state.KeyringController
 
   // add new state
   const newState = extend(state, {
     PreferencesController: {
-      selectedAddress: config.selectedAccount,
+      selectedAddress: keyringSubstate.selectedAccount,
     },
   })
 
-- 
cgit v1.2.3