m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Code

metamask controller - adopt clearSeedWords from keyring controller

Browse Source
This commit is contained in:
kumavis 2017-01-26 20:17:36 -08:00
parent 2b34cb4564
commit 2f79781ab9
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,17 +154,6 @@ module.exports = class KeyringController extends EventEmitter {
.then(this.fullUpdate.bind(this))
}
// ClearSeedWordCache
//
// returns Promise( @string currentSelectedAccount )
//
// Removes the current vault's seed words from the UI's state tree,
// ensuring they are only ever available in the background process.
clearSeedWordCache () {
this.configManager.setSeedWords(null)
return Promise.resolve(this.configManager.getSelectedAccount())
}
// Set Locked
// returns Promise( @object state )
//

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

@ -146,7 +146,14 @@ module.exports = class MetamaskController extends EventEmitter {
promiseToCallback(this.keyringController.fullUpdate())(cb)
})
},
clearSeedWordCache: nodeify(keyringController.clearSeedWordCache).bind(keyringController),
// ClearSeedWordCache
//
// Removes the primary account's seed words from the UI's state tree,
// ensuring they are only ever available in the background process.
clearSeedWordCache: (cb) => {
this.configManager.setSeedWords(null)
cb(null, this.configManager.getSelectedAccount())
},
setLocked: nodeify(keyringController.setLocked).bind(keyringController),
submitPassword: (password, cb) => {
this.migrateOldVaultIfAny(password)
@ -321,9 +328,7 @@ module.exports = class MetamaskController extends EventEmitter {
setupPublicConfig (outStream) {
pipe(
this.publicConfigStore,
outStream,
// cleanup on disconnect
() => this.publicConfigStore.unpipe(outStream)
outStream
)
}