From a3a64afdd5b2ed6bbed8c8dba5cc0f14d4a1ad99 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 21 Dec 2016 17:20:14 -0800
Subject: Return undefined when vault is uninitialized

---
 app/scripts/lib/config-manager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts/lib')

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index d36ccf0db..ede877b76 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -121,7 +121,7 @@ ConfigManager.prototype.setVault = function (encryptedString) {
 
 ConfigManager.prototype.getVault = function () {
   var data = this.getData()
-  return ('vault' in data) && data.vault
+  return data.vault
 }
 
 ConfigManager.prototype.getKeychains = function () {
-- 
cgit 


From ebeaf3b3d6cf79e2e0f251b9b2da765f0fe6d0e1 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 21 Dec 2016 17:21:10 -0800
Subject: Restructured migration

Migrator now returns a lostAccount array that includes objects
these objects include keys of address and privateKey,
this allows the MetamaskController to restore the lost accounts
even without customizing the idStore or the KeyringController.

Also includes a patch that allows idStore to synchronously export private keys.
---
 app/scripts/lib/idStore-migrator.js | 7 ++++++-
 app/scripts/lib/idStore.js          | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/scripts/lib')

diff --git a/app/scripts/lib/idStore-migrator.js b/app/scripts/lib/idStore-migrator.js
index 2e9418376..655aed0af 100644
--- a/app/scripts/lib/idStore-migrator.js
+++ b/app/scripts/lib/idStore-migrator.js
@@ -63,7 +63,12 @@ module.exports = class IdentityStoreMigrator {
 
       return {
         serialized,
-        lostAccounts,
+        lostAccounts: lostAccounts.map((address) => {
+          return {
+            address,
+            privateKey: this.idStore.exportAccount(address),
+          }
+        }),
       }
     })
   }
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index cf4353e48..66e5d966c 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -202,7 +202,8 @@ IdentityStore.prototype.submitPassword = function (password, cb) {
 
 IdentityStore.prototype.exportAccount = function (address, cb) {
   var privateKey = this._idmgmt.exportPrivateKey(address)
-  cb(null, privateKey)
+  if (cb) cb(null, privateKey)
+  return privateKey
 }
 
 //
-- 
cgit