aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-02-03 14:05:06 +0800
committerkumavis <aaron@kumavis.me>2017-02-03 14:05:06 +0800
commit73edfc9f31b1cbd44ae8b5372e7bef5d1d5959ad (patch)
tree4a1609ce27e1812d2babc0008e41c9df135146fd /app/scripts/metamask-controller.js
parentf08f40aee2614c9e72efce5d2d10f6e4b84d7a10 (diff)
downloadtangerine-wallet-browser-73edfc9f31b1cbd44ae8b5372e7bef5d1d5959ad.tar
tangerine-wallet-browser-73edfc9f31b1cbd44ae8b5372e7bef5d1d5959ad.tar.gz
tangerine-wallet-browser-73edfc9f31b1cbd44ae8b5372e7bef5d1d5959ad.tar.bz2
tangerine-wallet-browser-73edfc9f31b1cbd44ae8b5372e7bef5d1d5959ad.tar.lz
tangerine-wallet-browser-73edfc9f31b1cbd44ae8b5372e7bef5d1d5959ad.tar.xz
tangerine-wallet-browser-73edfc9f31b1cbd44ae8b5372e7bef5d1d5959ad.tar.zst
tangerine-wallet-browser-73edfc9f31b1cbd44ae8b5372e7bef5d1d5959ad.zip
eth-store - convert to obs-store subclass
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index de6e08e0b..9f79cf038 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -55,7 +55,10 @@ module.exports = class MetamaskController extends EventEmitter {
// eth data query tools
this.ethQuery = new EthQuery(this.provider)
- this.ethStore = new EthStore(this.provider)
+ this.ethStore = new EthStore({
+ provider: this.provider,
+ blockTracker: this.provider,
+ })
// key mgmt
this.keyringController = new KeyringController({
@@ -113,7 +116,7 @@ module.exports = class MetamaskController extends EventEmitter {
})
// manual mem state subscriptions
- this.ethStore.on('update', this.sendUpdate.bind(this))
+ this.ethStore.subscribe(this.sendUpdate.bind(this))
this.networkStore.subscribe(this.sendUpdate.bind(this))
this.keyringController.memStore.subscribe(this.sendUpdate.bind(this))
this.txManager.memStore.subscribe(this.sendUpdate.bind(this))