m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-29 23:58:06 +01:00
Code

Fix unlock logic

Browse Source
This commit is contained in:
Dan Finlay 2016-10-20 10:28:45 -07:00
parent f090828f99
commit 2132477797
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ module.exports = class KeyringController extends EventEmitter {
getState() {
return {
isInitialized: !!this.key,
isInitialized: !!this.configManager.getVault(),
isUnlocked: !!this.key,
isConfirmed: true, // this.configManager.getConfirmed(),
isEthConfirmed: this.configManager.getShouldntShowWarning(),
@ -66,9 +66,8 @@ module.exports = class KeyringController extends EventEmitter {
}
createNewVault(password, entropy, cb) {
encryptor.keyFromPassword(password)
this.loadKey(password)
.then((key) => {
this.key = key
return encryptor.encryptWithKey(key, {})
})
.then((encryptedString) => {
@ -80,10 +79,22 @@ module.exports = class KeyringController extends EventEmitter {
})
}
submitPassword(password, cb) {
cb()
this.loadKey(password)
.then((key) => {
cb(null, [])
})
.catch((err) => {
cb(err)
})
}
loadKey(password) {
return encryptor.keyFromPassword(password)
.then((key) => {
this.key = key
return key
})
}
setSelectedAddress(address, cb) {