diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2017-09-27 06:17:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-27 06:17:24 +0800 |
commit | 6ca519e97c4c282023ab6b7788715ff8d7ec8189 (patch) | |
tree | c1f884dcd4f7e4af7d2846bb937aa531d1352400 /app/scripts/metamask-controller.js | |
parent | b1daa5ae260be0aa91516bde0cbdb8820099587b (diff) | |
parent | 651098c70d21edbca98a96ef2a8800d164035638 (diff) | |
download | tangerine-wallet-browser-6ca519e97c4c282023ab6b7788715ff8d7ec8189.tar.gz tangerine-wallet-browser-6ca519e97c4c282023ab6b7788715ff8d7ec8189.tar.zst tangerine-wallet-browser-6ca519e97c4c282023ab6b7788715ff8d7ec8189.zip |
Merge pull request #2183 from MetaMask/Fix2094
Fix 2094 related issues
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index cca796678..0f850b7f5 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -86,6 +86,7 @@ module.exports = class MetamaskController extends EventEmitter { // eth data query tools this.ethQuery = new EthQuery(this.provider) + // account tracker watches balances, nonces, and any code at their address. this.accountTracker = new AccountTracker({ provider: this.provider, blockTracker: this.blockTracker, @@ -99,11 +100,6 @@ module.exports = class MetamaskController extends EventEmitter { encryptor: opts.encryptor || undefined, }) - // account tracker watches balances, nonces, and any code at their address. - this.accountTracker = new AccountTracker({ - provider: this.provider, - blockTracker: this.provider, - }) this.keyringController.on('newAccount', (address) => { this.preferencesController.setSelectedAddress(address) this.accountTracker.addAccount(address) @@ -194,7 +190,7 @@ module.exports = class MetamaskController extends EventEmitter { // manual mem state subscriptions this.networkController.store.subscribe(this.sendUpdate.bind(this)) - this.accountTracker.subscribe(this.sendUpdate.bind(this)) + this.accountTracker.store.subscribe(this.sendUpdate.bind(this)) this.txController.memStore.subscribe(this.sendUpdate.bind(this)) this.balancesController.store.subscribe(this.sendUpdate.bind(this)) this.messageManager.memStore.subscribe(this.sendUpdate.bind(this)) @@ -277,7 +273,7 @@ module.exports = class MetamaskController extends EventEmitter { isInitialized, }, this.networkController.store.getState(), - this.accountTracker.getState(), + this.accountTracker.store.getState(), this.txController.memStore.getState(), this.messageManager.memStore.getState(), this.personalMessageManager.memStore.getState(), |