aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-29 03:10:35 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-29 03:10:35 +0800
commit6ec471c6dcc52a9d2b599b849fa5017f3056fd43 (patch)
treefba209ff6234299ba31c08a2d7cead3b29f1eae1 /app/scripts
parent2690d1acfd3042f468cb2cd7ccc2dccd63c20cc9 (diff)
downloadtangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.tar
tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.tar.gz
tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.tar.bz2
tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.tar.lz
tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.tar.xz
tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.tar.zst
tangerine-wallet-browser-6ec471c6dcc52a9d2b599b849fa5017f3056fd43.zip
Configure BIP44 Keychain as default one
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/keyring-controller.js31
-rw-r--r--app/scripts/metamask-controller.js1
2 files changed, 25 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) {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 9c89d752b..a7d9a8ec2 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -61,6 +61,7 @@ module.exports = class MetamaskController {
// forward directly to keyringController
createNewVault: keyringController.createNewVault.bind(keyringController),
addNewKeyring: keyringController.addNewKeyring.bind(keyringController),
+ addNewAccount: keyringController.addNewAccount.bind(keyringController),
submitPassword: keyringController.submitPassword.bind(keyringController),
setSelectedAddress: keyringController.setSelectedAddress.bind(keyringController),
approveTransaction: keyringController.approveTransaction.bind(keyringController),