diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-09-26 05:37:11 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-09-26 05:37:11 +0800 |
| commit | d9c92cdbd170e40622f081c2d45edaf970280954 (patch) | |
| tree | 8464aa2f1915228d049738511a8fa463166fc07a /app | |
| parent | 8cd7329c91b047ef15c81b164075ea6c1d15b0df (diff) | |
| parent | dfbdb99858ee6553c50e92cb20354b6ed60094d8 (diff) | |
| download | tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.gz tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.bz2 tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.lz tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.xz tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.zst tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.zip | |
Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/keyring-controller.js | 1 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index fa470dd89..2a1af6e29 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -35,6 +35,7 @@ class KeyringController extends EventEmitter { keyrings: [], identities: {}, }) + this.accountTracker = opts.accountTracker this.encryptor = encryptor this.keyrings = [] diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 1dd09d0ad..30e511e19 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -96,6 +96,7 @@ module.exports = class MetamaskController extends EventEmitter { initState: initState.KeyringController, accountTracker: this.accountTracker, getNetwork: this.networkController.getNetworkState.bind(this.networkController), + encryptor: opts.encryptor || undefined, }) // account tracker watches balances, nonces, and any code at their address. |