diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-10-29 03:10:35 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-10-29 03:10:35 +0800 |
commit | 6ec471c6dcc52a9d2b599b849fa5017f3056fd43 (patch) | |
tree | fba209ff6234299ba31c08a2d7cead3b29f1eae1 /app/scripts/keyring-controller.js | |
parent | 2690d1acfd3042f468cb2cd7ccc2dccd63c20cc9 (diff) | |
download | tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.tar.gz tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.tar.zst tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.zip |
Configure BIP44 Keychain as default one
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r-- | app/scripts/keyring-controller.js | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 5e7900b10..3ac101ad8 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -11,8 +11,10 @@ const createId = require('web3-provider-engine/util/random-id') // Keyrings: const SimpleKeyring = require('./keyrings/simple') +const HdKeyring = require('./keyrings/hd') const keyringTypes = [ SimpleKeyring, + HdKeyring, ] module.exports = class KeyringController extends EventEmitter { @@ -67,7 +69,12 @@ module.exports = class KeyringController extends EventEmitter { }) .then((encryptedString) => { this.configManager.setVault(encryptedString) - cb(null, this.getState()) + + // TEMPORARY SINGLE-KEYRING CONFIG: + this.addNewKeyring('HD Key Tree', null, cb) + + // NORMAL BEHAVIOR: + // cb(null, this.getState()) }) .catch((err) => { cb(err) @@ -97,25 +104,35 @@ module.exports = class KeyringController extends EventEmitter { } addNewKeyring(type, opts, cb) { - const i = this.getAccounts().length const Keyring = this.getKeyringClassForType(type) const keyring = new Keyring(opts) const accounts = keyring.addAccounts(1) - accounts.forEach((account) => { - this.loadBalanceAndNickname(account, i) - }) - + this.setupAccounts(accounts) this.keyrings.push(keyring) this.persistAllKeyrings() .then(() => { - cb(this.getState()) + cb(null, this.getState()) }) .catch((reason) => { cb(reason) }) } + addNewAccount(keyRingNum = 0, cb) { + const ring = this.keyrings[keyRingNum] + const accounts = ring.addAccounts(1) + this.setupAccounts(accounts) + cb(null, this.getState()) + } + + setupAccounts(accounts) { + const i = this.getAccounts().length + accounts.forEach((account) => { + this.loadBalanceAndNickname(account, i) + }) + } + // Takes an account address and an iterator representing // the current number of named accounts. loadBalanceAndNickname(account, i) { |