From c0d3db6a8ce2fe0522fa4e3cba1e01d10469280f Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 31 Jan 2017 20:02:38 -0800
Subject: keyring - synchronous getState

---
 app/scripts/metamask-controller.js | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

(limited to 'app/scripts/metamask-controller.js')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2c379f8d9..17b5683a1 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -169,22 +169,19 @@ module.exports = class MetamaskController extends EventEmitter {
   //
 
   getState () {
-    return this.keyringController.getState()
-    .then((keyringControllerState) => {
-      return extend(
-        this.state,
-        this.ethStore.getState(),
-        this.configManager.getConfig(),
-        this.txManager.getState(),
-        keyringControllerState,
-        this.preferencesController.store.getState(),
-        this.noticeController.getState(),
-        {
-          shapeShiftTxList: this.configManager.getShapeShiftTxList(),
-          lostAccounts: this.configManager.getLostAccounts(),
-        }
-      )
-    })
+    return extend(
+      this.state,
+      this.ethStore.getState(),
+      this.configManager.getConfig(),
+      this.txManager.getState(),
+      this.keyringController.getState(),
+      this.preferencesController.store.getState(),
+      this.noticeController.getState(),
+      {
+        shapeShiftTxList: this.configManager.getShapeShiftTxList(),
+        lostAccounts: this.configManager.getLostAccounts(),
+      }
+    )
   }
 
   //
@@ -199,7 +196,7 @@ module.exports = class MetamaskController extends EventEmitter {
 
     return {
       // etc
-      getState:              nodeify(this.getState.bind(this)),
+      getState:              (cb) => cb(null, this.getState()),
       setRpcTarget:          this.setRpcTarget.bind(this),
       setProviderType:       this.setProviderType.bind(this),
       useEtherscanProvider:  this.useEtherscanProvider.bind(this),
@@ -295,11 +292,8 @@ module.exports = class MetamaskController extends EventEmitter {
     )
   }
 
-  sendUpdate () {
-    this.getState()
-    .then((state) => {
-      this.emit('update', state)
-    })
+  sendUpdate () {  
+    this.emit('update', this.getState())
   }
 
   //
-- 
cgit 


From ad060e267810dfd1217d5ddf40516976c8b2d68e Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 31 Jan 2017 22:35:11 -0800
Subject: metamask - inherit some configManager state from keyring controller

---
 app/scripts/metamask-controller.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/scripts/metamask-controller.js')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 17b5683a1..23ced75f1 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -180,6 +180,9 @@ module.exports = class MetamaskController extends EventEmitter {
       {
         shapeShiftTxList: this.configManager.getShapeShiftTxList(),
         lostAccounts: this.configManager.getLostAccounts(),
+        currentFiat: this.configManager.getCurrentFiat(),
+        conversionRate: this.configManager.getConversionRate(),
+        conversionDate: this.configManager.getConversionDate(),
       }
     )
   }
-- 
cgit 


From 1cb730144d6b1c05007323bbc31e4375373628fb Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 1 Feb 2017 00:31:26 -0800
Subject: metamask - adopt isInitialized from keyring controller

---
 app/scripts/metamask-controller.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'app/scripts/metamask-controller.js')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 23ced75f1..222a1d618 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -169,14 +169,21 @@ module.exports = class MetamaskController extends EventEmitter {
   //
 
   getState () {
+    const wallet = this.configManager.getWallet()
+    const vault = this.keyringController.store.getState().vault
+    const isInitialized = (!!wallet || !!vault)
     return extend(
+      {
+        isInitialized,
+      },
       this.state,
       this.ethStore.getState(),
-      this.configManager.getConfig(),
       this.txManager.getState(),
       this.keyringController.getState(),
       this.preferencesController.store.getState(),
       this.noticeController.getState(),
+      // config manager
+      this.configManager.getConfig(),
       {
         shapeShiftTxList: this.configManager.getShapeShiftTxList(),
         lostAccounts: this.configManager.getLostAccounts(),
-- 
cgit