diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-09-26 02:49:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 02:49:38 +0800 |
| commit | dfbdb99858ee6553c50e92cb20354b6ed60094d8 (patch) | |
| tree | bce3e02acf28daf76e52019b174c7d5445e0c2af /app | |
| parent | 40f1d0868401662c42f6a031549c9b023427ccef (diff) | |
| parent | 95afdfe3685a2e666510e203f7d9d7607e703006 (diff) | |
| download | tangerine-wallet-browser-dfbdb99858ee6553c50e92cb20354b6ed60094d8.tar tangerine-wallet-browser-dfbdb99858ee6553c50e92cb20354b6ed60094d8.tar.gz tangerine-wallet-browser-dfbdb99858ee6553c50e92cb20354b6ed60094d8.tar.bz2 tangerine-wallet-browser-dfbdb99858ee6553c50e92cb20354b6ed60094d8.tar.lz tangerine-wallet-browser-dfbdb99858ee6553c50e92cb20354b6ed60094d8.tar.xz tangerine-wallet-browser-dfbdb99858ee6553c50e92cb20354b6ed60094d8.tar.zst tangerine-wallet-browser-dfbdb99858ee6553c50e92cb20354b6ed60094d8.zip | |
Merge branch 'master' 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. |