m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 17:33:23 +01:00
Code

modify verifySeedPhrase to async and call it from addNewAccount also

Browse Source
This commit is contained in:
Csaba Solya 2018-03-06 15:56:27 +01:00
parent 8fde208f0b
commit 59007a6c36
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
app/scripts/metamask-controller.js
View File

@ -345,7 +345,7 @@ module.exports = class MetamaskController extends EventEmitter {
// primary HD keyring management
addNewAccount: nodeify(this.addNewAccount, this),
placeSeedWords: this.placeSeedWords.bind(this),
verifySeedPhrase: this.verifySeedPhrase.bind(this),
verifySeedPhrase: nodeify(this.verifySeedPhrase, this),
clearSeedWordCache: this.clearSeedWordCache.bind(this),
resetAccount: this.resetAccount.bind(this),
importAccountWithStrategy: this.importAccountWithStrategy.bind(this),
@ -567,14 +567,18 @@ module.exports = class MetamaskController extends EventEmitter {
// Opinionated Keyring Management
//
async addNewAccount (cb) {
async addNewAccount () {
const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0]
if (!primaryKeyring) return cb(new Error('MetamaskController - No HD Key Tree found'))
if (!primaryKeyring) {
throw new Error('MetamaskController - No HD Key Tree found')
}
const keyringController = this.keyringController
const oldAccounts = await keyringController.getAccounts()
const keyState = await keyringController.addNewAccount(primaryKeyring)
const newAccounts = await keyringController.getAccounts()
await this.verifySeedPhrase()
newAccounts.forEach((address) => {
if (!oldAccounts.includes(address)) {
this.preferencesController.setSelectedAddress(address)
@ -590,44 +594,42 @@ module.exports = class MetamaskController extends EventEmitter {
// Also used when revealing the seed words in the confirmation view.
placeSeedWords (cb) {
this.verifySeedPhrase((err, seedWords) => {
if (err) {
this.verifySeedPhrase()
.then((seedWords) => {
this.configManager.setSeedWords(seedWords)
return cb(null, seedWords)
})
.catch((err) => {
return cb(err)
}
this.configManager.setSeedWords(seedWords)
return cb(null, seedWords)
})
})
}
// Verifies the current vault's seed words if they can restore the
// accounts belonging to the current vault.
//
// Called when the first account is created and on unlocking the vault.
verifySeedPhrase (cb) {
async verifySeedPhrase () {
const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0]
if (!primaryKeyring) return cb(new Error('MetamaskController - No HD Key Tree found'))
primaryKeyring.serialize()
.then((serialized) => {
const seedWords = serialized.mnemonic
if (!primaryKeyring) {
throw new Error('MetamaskController - No HD Key Tree found')
}
primaryKeyring.getAccounts()
.then((accounts) => {
if (accounts.length < 1) {
return cb(new Error('MetamaskController - No accounts found'))
}
const serialized = await primaryKeyring.serialize()
const seedWords = serialized.mnemonic
seedPhraseVerifier.verifyAccounts(accounts, seedWords)
.then(() => {
return cb(null, seedWords)
})
.catch((err) => {
log.error(err)
return cb(err)
})
})
})
const accounts = await primaryKeyring.getAccounts()
if (accounts.length < 1) {
throw new Error('MetamaskController - No accounts found')
}
try {
await seedPhraseVerifier.verifyAccounts(accounts, seedWords)
return seedWords
} catch (err) {
log.error(err.message)
throw err
}
}
// ClearSeedWordCache