aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
Commit message (Collapse)AuthorAgeFilesLines
* Fix new encryptor migration logicDan Finlay2016-11-231-2/+2
|
* Fix password referenceDan Finlay2016-11-231-1/+2
|
* Remove line of cruftDan Finlay2016-11-231-1/+0
|
* Refine isInitialized derivation methodDan Finlay2016-11-231-1/+1
|
* Simplify Encryptor API SurfaceDan Finlay2016-11-231-37/+13
| | | | | | | | | | | | | At least, the portion of it that we use. Moved salting within the encryptor, so it does not need to be managed externally. KeyringController now caches the password instead of a passwordDerivedKey, since it is ignorant of the salt. Encryptor payload is now in a JSON format, so its portions are both base64 encoded *and* labeled appropriately. The format is `{ "data": "0x0", "iv": "0x0", "salt": "string" }`. Fixes #843 Fixes #859
* Merge branch 'dev' into i843-MoveSaltIntoEncryptorDan Finlay2016-11-231-17/+76
|\
| * Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-devDan Finlay2016-11-231-5/+61
| |\ | | | | | | I868 estimate gas too high dev
| | * KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOGkumavis2016-11-231-5/+61
| | |
| * | Merge pull request #858 from MetaMask/i842-WaitForSeedWordkumavis2016-11-231-1/+6
| |\ \ | | |/ | |/| I842 wait for seed word
| | * Move state update outside of conditional callback blockDan Finlay2016-11-231-1/+1
| | |
| | * Remove callback type checkDan Finlay2016-11-231-1/+1
| | |
| | * Merge branch 'dev' into i842-WaitForSeedWordDan Finlay2016-11-231-2/+2
| | |\
| | * | Use callback in placeSeedWord method.Dan Finlay2016-11-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842
| * | | Merge pull request #857 from MetaMask/i841-RenameMethodkumavis2016-11-231-1/+1
| |\ \ \ | | | | | | | | | | Rename idStoreMigrator method for clarity
| | * | | Rename idStoreMigrator method for clarityDan Finlay2016-11-221-1/+1
| | |/ / | | | | | | | | | | | | Fixes #841
| * | | Merge branch 'dev' into dev-cleanupKevin Serrano2016-11-231-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Improve Keyring organizationDan Finlay2016-11-221-2/+2
| | |/ | | | | | | | | | | | | Separated public & private methods. (Fixes #845) Made class method `type()` into a simple property. (Fixes #846)
| * | Change fauceting to become a response of an emit.Kevin Serrano2016-11-221-2/+1
| | |
| * | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-221-2/+1
| | |
| * | Remove entropy from encryption and project.Kevin Serrano2016-11-221-4/+4
| |/
* / Began moving salt into encryptorDan Finlay2016-11-231-5/+10
|/
* Promisify persistence of keyrings before returning keyKevin Serrano2016-11-191-5/+5
| | | | Change single letter variables (shame)
* Persist keyrings from migration to storage.Kevin Serrano2016-11-191-1/+1
|
* Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-11-181-65/+60
|\ | | | | | | i328-MultiVault
| * Revert one cb to previous state.Kevin Serrano2016-11-161-1/+1
| |
| * Minimize dispatches by using emitters and relying on state updates.Kevin Serrano2016-11-161-7/+6
| |
| * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-11-161-0/+2
| |\ | | | | | | | | | i328-MultiVault
| | * Minimize repeated code.Kevin Serrano2016-11-161-5/+6
| | |
| * | Minimize repeated code.Kevin Serrano2016-11-161-7/+6
| |/
| * Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-151-1/+1
| |
| * Revert to previous anonymous function for promise.Kevin Serrano2016-11-121-1/+3
| |
| * Various keyring changesKevin Serrano2016-11-121-18/+10
| | | | | | | | | | | | | | - Rearrange the require statements. - Remove unused web3. - Simplify some callbacks and promises. - Clarify certain parameters.
| * Linting to the max.Kevin Serrano2016-11-121-37/+37
| |
| * fix tx data so it has the network idFrankie2016-11-111-2/+3
| |
* | Replace old random-id code with incrementing id generatorDan Finlay2016-11-181-1/+2
|/
* Fix 787 gas buffer bugDan Finlay2016-11-081-5/+5
|
* Fix network checkingDan Finlay2016-11-051-21/+1
|
* Add tolerance to normalize methodDan Finlay2016-11-041-0/+1
|
* Fix password validation and persistence issueDan Finlay2016-11-041-4/+5
| | | | Was wiping the vault on each successful password attempt... :P
* Implement private key exporting.Kevin Serrano2016-11-041-2/+7
|
* Finish fixing nicknaming bugDan Finlay2016-11-041-28/+39
|
* Fix account nicknaming bugDan Finlay2016-11-041-1/+4
| | | | When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting.
* Fix vault creation bugDan Finlay2016-11-041-17/+13
|
* Fix dual vault creation bugDan Finlay2016-11-031-11/+4
|
* Fix initial vault creationDan Finlay2016-11-031-4/+8
|
* Fix handling of migrating old vault styleDan Finlay2016-11-031-39/+63
| | | | | | Now old vaults are recognized as an "Initialized" MetaMask instance. Upon logging in, when fetching the initial password-derived key, if there is no new-style vault, but there is an old style vault, it is migrated to the new format before proceeding through the usual unlocking steps.
* Add reveal of seed words.Kevin Serrano2016-11-021-2/+8
|
* Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-021-6/+45
|
* Fix seed phrase restoreDan Finlay2016-11-021-1/+1
|
* Made progress on parity for MultiVaultKevin Serrano2016-11-021-21/+44
| | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.
* Implement seed word confirmation page.Kevin Serrano2016-11-011-4/+14
| | | | | Remove logs. Move HD render files to ui/app.
* Implement auto-faucetingKevin Serrano2016-11-011-1/+6
|
* Now migrating old vaults to new DEN formatDan Finlay2016-10-291-5/+28
|
* Configure BIP44 Keychain as default oneDan Finlay2016-10-291-7/+24
|
* Phase out extra warning screen.Kevin Serrano2016-10-261-1/+0
|
* Fix loading indicationDan Finlay2016-10-221-1/+1
|
* Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-221-0/+148
|
* Fix bug in new KeyringController vault restoring logic.Dan Finlay2016-10-221-3/+5
|
* Create basic keyring-controller unit test fileDan Finlay2016-10-221-12/+7
|
* Added SimpleKeyring testsDan Finlay2016-10-221-0/+2
|
* Added tx and msg signing to keychain & controllerDan Finlay2016-10-211-1/+55
|
* Improved simple account generationDan Finlay2016-10-211-23/+38
|
* Began adding first basic keyringDan Finlay2016-10-211-8/+103
|
* Fix testsDan Finlay2016-10-211-1/+1
|
* Linted & added salting to vaultDan Finlay2016-10-211-34/+9
|
* Fix state updating after vault creation and unlockingDan Finlay2016-10-211-2/+2
|
* Fix unlock logicDan Finlay2016-10-211-6/+17
|
* Intermediary commit.Kevin Serrano2016-10-201-4/+33
|
* Remove unused crypto dependencies.Kevin Serrano2016-10-201-2/+0
|
* Initial work on UI sideKevin Serrano2016-10-161-0/+5
|
* Add minimal method signatures to new keyring controllerDan Finlay2016-10-131-1/+61
|
* Add initial KeyringController filesDan Finlay2016-10-121-0/+42