aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md2
-rw-r--r--app/scripts/lib/inpage-provider.js5
-rw-r--r--app/scripts/metamask-controller.js3
3 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28f2410ad..ccaa70370 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+- net_version has been made synchronous.
+
## 3.2.0 2017-1-24
- Add ability to import accounts in JSON file format (used by Mist, Geth, MyEtherWallet, and more!)
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
}