aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
Commit message (Collapse)AuthorAgeFilesLines
* Commit to the eth-keyring-controller moduleDan Finlay2017-09-281-599/+0
|
* Remove dead referenceDan Finlay2017-09-281-1/+0
|
* Fix Account SelectionDan Finlay2017-09-281-2/+6
| | | | | | Do not select accounts on restore, only on creation and deliberate selection. Fixes #2164
* Fix accountTracker store referencesDan Finlay2017-09-281-1/+1
|
* Make encryptor configurable for keyring-controllerDan Finlay2017-09-261-1/+1
|
* Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-261-0/+1
|\
| * Allow custom encryptor to be passed to MetaMaskController and ↵Dan Finlay2017-09-221-1/+1
| | | | | | | | KeyringControllers.
* | Fix account-tracker referencesDan Finlay2017-09-231-5/+5
|/
* Properly update keyring state on new account addition.Kevin Serrano2017-09-071-1/+2
|
* Fix error message for invalid seed words.Kevin Serrano2017-06-271-1/+1
|
* Fix linting warningsThomas Huang2017-04-271-2/+2
|
* Fix faucet to only autoFaucet first accountfrankiebee2017-04-051-0/+1
|
* Fix grammar in erro messagefrankiebee2017-03-081-1/+1
|
* fix issue where account import allows for duplicatesfrankiebee2017-03-081-1/+22
|
* Removed redundant personal_recover logicDan Finlay2017-02-251-11/+0
|
* Mostly fix personal_recoverDan Finlay2017-02-251-6/+5
|
* Move sigUtil and keyrings to external modulesDan Finlay2017-02-221-3/+32
| | | | These external modules now have their own test coverage and build enforcement. This allowed me to somewhat more easily add good tests around our personalSign strategy (held now in [eth-sig-util](https://github.com/flyswatter/eth-sig-util), and allow each of the keyrings to import that, etc.
* Add memstore update after adding new keyringDan Finlay2017-02-161-0/+1
|
* keyring controller - update memStore after restoreKeyringkumavis2017-02-161-0/+1
|
* keyring - replace getState with memStorekumavis2017-02-031-29/+1
|
* keyring - manage isUnlocked in memStorekumavis2017-02-031-1/+7
|
* keyring - rm config depkumavis2017-02-031-3/+0
|
* metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ↵kumavis2017-02-021-1/+0
| | | | controller
* Fix messy mergeFrankie2017-02-021-14/+2
|
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-27/+41
|\
| * metamask - adopt isInitialized from keyring controllerkumavis2017-02-011-3/+0
| |
| * keyring - move identities into memStorekumavis2017-02-011-7/+15
| |
| * keyring - add keyringtypes to memStorekumavis2017-02-011-3/+3
| |
| * metamask - inherit some configManager state from keyring controllerkumavis2017-02-011-10/+10
| |
| * keyring - synchronous getStatekumavis2017-02-011-24/+31
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-27/+1
|\|
| * rename selectedAccount to selectedAddresskumavis2017-01-311-3/+1
| |
| * metamask - move selectedAccount set/get to preferencesControllerkumavis2017-01-311-24/+0
| |
* | code clan up and testsFrankie2017-02-021-3/+1
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-301-0/+9
|\|
| * metamask - lookup selectedAccount via keyringControllerkumavis2017-01-301-0/+9
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-291-43/+58
|\|
| * migration 5 - move keyring controller state to substatekumavis2017-01-291-67/+53
| |
| * keyring - add and initialize obs-storekumavis2017-01-291-5/+33
| |
| * metamask - adopt shapeshift txs from keyringControllerkumavis2017-01-281-1/+0
| |
* | Clean up message manger includes:Frankie2017-01-291-86/+19
|/ | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
* keymanager - small cleankumavis2017-01-271-2/+2
|
* metamask controller - adopt clearSeedWords from keyring controllerkumavis2017-01-271-11/+0
|
* background - organize metamask instantiationkumavis2017-01-271-12/+1
|
* background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-251-21/+6
|
* keyring-controller - cleanupkumavis2017-01-251-2/+3
|
* keyring-controller - cleanupkumavis2017-01-251-5/+3
|
* Move the assumption of their only being one hd keyring when requesting seed ↵Frankie2017-01-251-6/+3
| | | | words to metamaskController
* Fix issue where generating a new account would put it in loose keysFrankie2017-01-251-3/+6
|
* keyring controller - placeSeedWords should use first hdKeyringkumavis2017-01-211-1/+3
|
* Allow importing of private key stringsDan Finlay2017-01-181-1/+4
| | | | | | | | Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
* Fix bug where signed messages were not dismissedDan Finlay2017-01-171-0/+1
|
* Merge branch 'dev' into bug-submitTxkumavis2017-01-141-1/+0
|\
| * Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-1/+1
| |\
| * | Fix wording and icon of failed txsFrankie2017-01-121-1/+0
| | |
| * | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-121-1/+1
| | | | | | | | | | | | pending and unaproved transactions
* | | background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-131-6/+4
| |/ |/|
* | Send update to UI when changing selected accountDan Finlay2017-01-121-1/+1
|/ | | | Fixes #981
* remove unnecessary try statmentsFrankie2017-01-051-12/+6
|
* Merge branch 'dev' into fixtTxManagerFrankie2017-01-051-16/+39
|\
| * Make single letter variables more verboseDan Finlay2017-01-031-1/+1
| |
| * Merge branch 'dev' into ShowDifferentAccountsDan Finlay2017-01-031-199/+8
| |\
| * | Return keyring metadata on metamask state objectDan Finlay2016-12-231-19/+42
| | | | | | | | | | | | | | | | | | | | | Required making the getState methods for both keyringController and metamaskController async. They both now return promises, and the main metamask-controller.getState method is now nodeified. Will allow the UI to render loose keys differently than persisted keys.
* | | Fix signing of transactionsFrankie2017-01-051-13/+15
| |/ |/|
* | Merge branch 'dev' into TxManagerFrankie2016-12-241-46/+5
|\|
| * Added error when trying to unlock uninitialized vaultDan Finlay2016-12-221-0/+4
| |
| * Move old keystore migration code to metamask controllerDan Finlay2016-12-221-45/+1
| | | | | | | | Allows keyring controller to be more generic, less opinionated, and who knows, maybe sooner publishable as its own thing.
| * Make notices confirmation configurableDan Finlay2016-12-211-1/+0
| | | | | | | | - Confirm button will now dismiss the lost accounts array.
* | Merge branch 'dev' into TxManagerFrankie2016-12-221-3/+11
|\|
| * Merge pull request #916 from MetaMask/i894-DetectBadAccountsDan Finlay2016-12-211-2/+9
| |\ | | | | | | I894 detect bad accounts
| | * Got bad account detection working and added to stateDan Finlay2016-12-101-6/+7
| | |
| | * Mostly added bad account detectionDan Finlay2016-12-091-1/+7
| | | | | | | | | | | | Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.
| * | Remove encryptor in favor of external browser-passworderDan Finlay2016-12-201-1/+2
| | | | | | | | | | | | I broke out the encryptor lib into its own module on npm called browser-passworder.
| * | Lint.Kevin Serrano2016-12-201-2/+1
| |/
* | Remove txManager in keyring controllerFrances Pangilinan2016-12-221-2/+0
| |
* | Migrate all tx mutation code out of keyring controller andFrances Pangilinan2016-12-221-19/+4
| | | | | | | | Fix up txManager to reflect code review requests
* | First pass at revision requestsFrances Pangilinan2016-12-221-96/+5
| |
* | Create a TxManagerFrances Pangilinan2016-12-151-101/+17
|/
* Remove redundant logging blockDan Finlay2016-12-021-3/+0
|
* Fix vault encrypting & unlocking bugDan Finlay2016-12-011-4/+12
| | | | | | | | This is only a bug in dev, but was committed yesterday. Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults. To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.
* Return promise correctly from setSelectedAddressDan Finlay2016-11-301-1/+1
|
* Flattened addTx async methodsDan Finlay2016-11-301-89/+82
|
* Bind ethQuery to estimateGas to allow it to be moved around.Dan Finlay2016-11-301-2/+2
|
* Fix tx adding codeDan Finlay2016-11-301-25/+3
| | | | | | | | | Broken in this commit: https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.
* Ordered keyringController methods the same in metamask-controllerDan Finlay2016-11-301-1/+5
|
* Annotated KeyringControllerDan Finlay2016-11-301-219/+496
|
* Denodeify most of KeyringControllerDan Finlay2016-11-291-148/+127
| | | | | | | | | | Mostly Fixes #893 A couple methods cache callbacks, and will require a larger refactor to fully denodeify. Specifically, our methods involving web3 requests to sign a tx, sign a message, and approve or cancel either of those. I think we should postpone those until the TxManager refactor, since it will likely handle this response caching itself.
* Fix more async usage of KeyringControllerDan Finlay2016-11-241-25/+32
|
* Fix more keyring asyncifying testsDan Finlay2016-11-241-2/+3
|
* Mostly got async keyringController tests passingDan Finlay2016-11-231-7/+9
|
* Complete first pass at asyncrhonizing keyring controllerDan Finlay2016-11-231-31/+53
|
* Asynced keyrings and started on controllerDan Finlay2016-11-231-15/+29
|
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-31 06:39:07 +0800