-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improvement/migrate aes crypto lib (#1755)
* Update aes crypto lib working * Working on iOS * init migration * Recreate vault on login and fingerprint * Fix selectedAddress * Add passwordSet again * Fix recreate vault * Improve getting simple key pair accounts * Update tests * Make sure selectedAddress is available * Fix for multiple imported accounts * remove unecessary async await * Rename and remove unecessary code * Using logger now * Check new error on android
- Loading branch information
1 parent
91b4840
commit 84cc298
Showing
13 changed files
with
158 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import Engine from './Engine'; | ||
| import Logger from '../util/Logger'; | ||
|
|
||
| /** | ||
| * Returns current vault seed phrase | ||
| * It does it using an empty password or a password set by the user | ||
| * depending on the state the app is currently in | ||
| */ | ||
| export const getSeedPhrase = async (password = '') => { | ||
| const { KeyringController } = Engine.context; | ||
| const mnemonic = await KeyringController.exportSeedPhrase(password); | ||
| return JSON.stringify(mnemonic).replace(/"/g, ''); | ||
| }; | ||
|
|
||
| /** | ||
| * Recreates a vault with the same password for the purpose of using the newest encryption methods | ||
| * | ||
| * @param password - Password to recreate and set the vault with | ||
| */ | ||
| export const recreateVaultWithSamePassword = async (password = '', selectedAddress) => { | ||
| const { KeyringController, PreferencesController } = Engine.context; | ||
| const seedPhrase = await getSeedPhrase(password); | ||
|
|
||
| let importedAccounts = []; | ||
| try { | ||
| // Get imported accounts | ||
| const simpleKeyrings = KeyringController.state.keyrings.filter(keyring => keyring.type === 'Simple Key Pair'); | ||
| for (let i = 0; i < simpleKeyrings.length; i++) { | ||
| const simpleKeyring = simpleKeyrings[i]; | ||
| const simpleKeyringAccounts = await Promise.all( | ||
| simpleKeyring.accounts.map(account => KeyringController.exportAccount(password, account)) | ||
| ); | ||
| importedAccounts = [...importedAccounts, ...simpleKeyringAccounts]; | ||
| } | ||
| } catch (e) { | ||
| Logger.error(e, 'error while trying to get imported accounts on recreate vault'); | ||
| } | ||
|
|
||
| // Recreate keyring with password given to this method | ||
| await KeyringController.createNewVaultAndRestore(password, seedPhrase); | ||
|
|
||
| // Get props to restore vault | ||
| const hdKeyring = KeyringController.state.keyrings[0]; | ||
| const existingAccountCount = hdKeyring.accounts.length; | ||
| let preferencesControllerState = PreferencesController.state; | ||
|
|
||
| // Create previous accounts again | ||
| for (let i = 0; i < existingAccountCount - 1; i++) { | ||
| await KeyringController.addNewAccount(); | ||
| } | ||
|
|
||
| try { | ||
| // Import imported accounts again | ||
| for (let i = 0; i < importedAccounts.length; i++) { | ||
| await KeyringController.importAccountWithStrategy('privateKey', [importedAccounts[i]]); | ||
| } | ||
| } catch (e) { | ||
| Logger.error(e, 'error while trying to import accounts on recreate vault'); | ||
| } | ||
|
|
||
| // Reset preferencesControllerState | ||
| preferencesControllerState = PreferencesController.state; | ||
|
|
||
| // Set preferencesControllerState again | ||
| await PreferencesController.update(preferencesControllerState); | ||
| // Reselect previous selected account if still available | ||
| if (hdKeyring.accounts.includes(selectedAddress)) { | ||
| PreferencesController.setSelectedAddress(selectedAddress); | ||
| } else { | ||
| PreferencesController.setSelectedAddress(hdKeyring[0]); | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.