diff options
author | Dan Finlay <somniac@me.com> | 2016-12-21 03:50:26 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-21 03:50:26 +0800 |
commit | 674b2689826c770092a3dfee7fe76fb83c0b444a (patch) | |
tree | 96dd32380a338c361131aae49a8f664308a591f0 /app/scripts/keyring-controller.js | |
parent | 4fbea1c7b4e3ca13b76aa49c7a349a3dc2366910 (diff) | |
parent | 20d2204ce6a9e8dcd3269c588b2f4ce6ff93408b (diff) | |
download | tangerine-wallet-browser-674b2689826c770092a3dfee7fe76fb83c0b444a.tar.gz tangerine-wallet-browser-674b2689826c770092a3dfee7fe76fb83c0b444a.tar.zst tangerine-wallet-browser-674b2689826c770092a3dfee7fe76fb83c0b444a.zip |
Merge pull request #916 from MetaMask/i894-DetectBadAccounts
I894 detect bad accounts
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r-- | app/scripts/keyring-controller.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 58366c26f..2888e58a9 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -114,6 +114,7 @@ module.exports = class KeyringController extends EventEmitter { conversionDate: this.configManager.getConversionDate(), keyringTypes: this.keyringTypes.map(krt => krt.type), identities: this.identities, + lostAccounts: this.configManager.getLostAccounts(), } } @@ -622,11 +623,17 @@ module.exports = class KeyringController extends EventEmitter { // may be completed without interruption. migrateOldVaultIfAny (password) { const shouldMigrate = !!this.configManager.getWallet() && !this.configManager.getVault() + if (!shouldMigrate) { + return Promise.resolve() + } + return this.idStoreMigrator.migratedVaultForPassword(password) - .then((serialized) => { + .then((result) => { this.password = password - if (serialized && shouldMigrate) { + if (result && shouldMigrate) { + const { serialized, lostAccounts } = result + this.configManager.setLostAccounts(lostAccounts) return this.restoreKeyring(serialized) .then(keyring => keyring.getAccounts()) .then((accounts) => { |