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

Fix initial vault creation

Browse Source
This commit is contained in:
Dan Finlay 2016-11-02 16:18:47 -07:00
parent 4cf1b606e4
commit ed1917d71a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/scripts/keyring-controller.js
View File

@ -122,6 +122,7 @@ module.exports = class KeyringController extends EventEmitter {
return this.loadKey(password) return this.loadKey(password)
.then((derivedKey) => { .then((derivedKey) => {
key = derivedKey key = derivedKey
this.key = key
return this.idStoreMigrator.oldSeedForPassword(password) return this.idStoreMigrator.oldSeedForPassword(password)
}) })
.then((serialized) => { .then((serialized) => {
@ -144,10 +145,13 @@ module.exports = class KeyringController extends EventEmitter {
const salt = this.encryptor.generateSalt() const salt = this.encryptor.generateSalt()
configManager.setSalt(salt) configManager.setSalt(salt)
return new Promise((res, rej) => { return this.migrateAndGetKey(password)
this.createFirstKeyTree(password, (err, state) => { .then((key) => {
if (err) return rej(err) return new Promise((res, rej) => {
res(configManager.getVault()) this.createFirstKeyTree(password, (err, state) => {
if (err) return rej(err)
res(configManager.getVault())
})
}) })
}) })
.then((encryptedString) => { .then((encryptedString) => {