Merge branch 'dev' into i897-ReplayProtection

1 files changed, 16 insertions, 13 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 31bb4a9c2..86eab9d9c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -63,16 +63,19 @@ module.exports = class MetamaskController {
   }
 
   getState () {
-    return extend(
-      this.state,
-      this.ethStore.getState(),
-      this.configManager.getConfig(),
-      this.keyringController.getState(),
-      this.txManager.getState(),
-      this.noticeController.getState(), {
-        lostAccounts: this.configManager.getLostAccounts(),
-      }
-    )
+    return this.keyringController.getState()
+    .then((keyringControllerState) => {
+      return extend(
+        this.state,
+        this.ethStore.getState(),
+        this.configManager.getConfig(),
+        this.txManager.getState(),
+        keyringControllerState,
+        this.noticeController.getState(), {
+          lostAccounts: this.configManager.getLostAccounts(),
+        }
+      )
+    })
   }
 
   getApi () {
@@ -81,7 +84,7 @@ module.exports = class MetamaskController {
     const noticeController = this.noticeController
 
     return {
-      getState: (cb) => { cb(null, this.getState()) },
+      getState: nodeify(this.getState.bind(this)),
       setRpcTarget: this.setRpcTarget.bind(this),
       setProviderType: this.setProviderType.bind(this),
       useEtherscanProvider: this.useEtherscanProvider.bind(this),
@@ -101,7 +104,7 @@ module.exports = class MetamaskController {
       setLocked: nodeify(keyringController.setLocked).bind(keyringController),
       submitPassword: (password, cb) => {
         this.migrateOldVaultIfAny(password)
-        .then(keyringController.submitPassword.bind(keyringController))
+        .then(keyringController.submitPassword.bind(keyringController, password))
         .then((newState) => { cb(null, newState) })
         .catch((reason) => { cb(reason) })
       },
@@ -471,7 +474,7 @@ module.exports = class MetamaskController {
     return this.idStoreMigrator.migratedVaultForPassword(password)
     .then(this.restoreOldVaultAccounts.bind(this))
     .then(this.restoreOldLostAccounts.bind(this))
-    .then(keyringController.persistAllKeyrings.bind(keyringController))
+    .then(keyringController.persistAllKeyrings.bind(keyringController, password))
     .then(() => password)
   }