Merge pull request #1101 from MetaMask/i1085-synchronousnet

Allowed net_version to be called synchronously

3 files changed, 8 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55c60e185..1d1a2370b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Current Master
+- net_version has been made synchronous.
 
 ## 3.2.1 2017-2-8
 
diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index faecac137..92936de2f 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -84,6 +84,11 @@ MetamaskInpageProvider.prototype.send = function (payload) {
       result = true
       break
 
+    case 'net_version':
+      let networkVersion = self.publicConfigStore.getState().networkVersion
+      result = networkVersion
+      break
+
     // throw not-supported Error
     default:
       var link = 'https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#dizzy-all-async---think-of-metamask-as-a-light-client'
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fb2040c63..33c51dc07 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -178,7 +178,7 @@ module.exports = class MetamaskController extends EventEmitter {
     // sync publicConfigStore with transform
     pipe(
       this.store,
-      storeTransform(selectPublicState),
+      storeTransform(selectPublicState.bind(this)),
       publicConfigStore
     )
 
@@ -186,6 +186,7 @@ module.exports = class MetamaskController extends EventEmitter {
       const result = { selectedAddress: undefined }
       try {
         result.selectedAddress = state.PreferencesController.selectedAddress
+        result.networkVersion = this.getNetworkState()
       } catch (_) {}
       return result
     }