diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/keyring-controller.js | 5 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index fa470dd89..fb60a5b3e 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -27,7 +27,7 @@ class KeyringController extends EventEmitter { constructor (opts) { super() const initState = opts.initState || {} - this.keyringTypes = keyringTypes + this.keyringTypes = opts.keyringTypes || keyringTypes this.store = new ObservableStore(initState) this.memStore = new ObservableStore({ isUnlocked: false, @@ -35,8 +35,7 @@ class KeyringController extends EventEmitter { keyrings: [], identities: {}, }) - this.accountTracker = opts.accountTracker - this.encryptor = encryptor + this.encryptor = opts.encryptor || encryptor this.keyrings = [] this.getNetwork = opts.getNetwork } 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. |