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

Stop tracking old account balances after restore vault

Browse Source 
Per @kgserrano note
This commit is contained in:
Dan Finlay 2017-10-18 11:13:14 -07:00
parent cafabf914f
commit 7032edf32b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,17 +459,30 @@ module.exports = class MetamaskController extends EventEmitter {
// //
async createNewVaultAndKeychain (password, cb) { async createNewVaultAndKeychain (password, cb) {
this.forgetOldAccounts()
const vault = await this.keyringController.createNewVaultAndKeychain(password) const vault = await this.keyringController.createNewVaultAndKeychain(password)
this.selectFirstIdentity(vault) this.selectFirstIdentity(vault)
return vault return vault
} }
async createNewVaultAndRestore (password, seed, cb) { async createNewVaultAndRestore (password, seed, cb) {
this.forgetOldAccounts()
const vault = await this.keyringController.createNewVaultAndRestore(password, seed) const vault = await this.keyringController.createNewVaultAndRestore(password, seed)
this.selectFirstIdentity(vault) this.selectFirstIdentity(vault)
return vault return vault
} }
forgetOldAccounts () {
const { accountTracker } = this
let oldAccounts = []
try {
oldAccounts = Object.keys(accountTracker.store.getState().accounts)
} catch (e) {
log.warn('Could not load old accounts to forget', e)
}
oldAccounts.forEach(addr => accountTracker.removeAccount(addr))
}
selectFirstIdentity (vault) { selectFirstIdentity (vault) {
const { identities } = vault const { identities } = vault
const address = Object.keys(identities)[0] const address = Object.keys(identities)[0]