| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Make encryptor configurable for keyring-controller | Dan Finlay | 2017-09-26 | 1 | -1/+1 |
| * | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 1 | -0/+1 |
| |\ |
|
| | * | Allow custom encryptor to be passed to MetaMaskController and KeyringControll... | Dan Finlay | 2017-09-22 | 1 | -1/+1 |
| * | | Fix account-tracker references | Dan Finlay | 2017-09-23 | 1 | -5/+5 |
| |/ |
|
| * | Properly update keyring state on new account addition. | Kevin Serrano | 2017-09-07 | 1 | -1/+2 |
| * | Fix error message for invalid seed words. | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
| * | Fix linting warnings | Thomas Huang | 2017-04-27 | 1 | -2/+2 |
| * | Fix faucet to only autoFaucet first account | frankiebee | 2017-04-05 | 1 | -0/+1 |
| * | Fix grammar in erro message | frankiebee | 2017-03-08 | 1 | -1/+1 |
| * | fix issue where account import allows for duplicates | frankiebee | 2017-03-08 | 1 | -1/+22 |
| * | Removed redundant personal_recover logic | Dan Finlay | 2017-02-25 | 1 | -11/+0 |
| * | Mostly fix personal_recover | Dan Finlay | 2017-02-25 | 1 | -6/+5 |
| * | Move sigUtil and keyrings to external modules | Dan Finlay | 2017-02-22 | 1 | -3/+32 |
| * | Add memstore update after adding new keyring | Dan Finlay | 2017-02-16 | 1 | -0/+1 |
| * | keyring controller - update memStore after restoreKeyring | kumavis | 2017-02-16 | 1 | -0/+1 |
| * | keyring - replace getState with memStore | kumavis | 2017-02-03 | 1 | -29/+1 |
| * | keyring - manage isUnlocked in memStore | kumavis | 2017-02-03 | 1 | -1/+7 |
| * | keyring - rm config dep | kumavis | 2017-02-03 | 1 | -3/+0 |
| * | metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ... | kumavis | 2017-02-02 | 1 | -1/+0 |
| * | Fix messy merge | Frankie | 2017-02-02 | 1 | -14/+2 |
| * | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 1 | -27/+41 |
| |\ |
|
| | * | metamask - adopt isInitialized from keyring controller | kumavis | 2017-02-01 | 1 | -3/+0 |
| | * | keyring - move identities into memStore | kumavis | 2017-02-01 | 1 | -7/+15 |
| | * | keyring - add keyringtypes to memStore | kumavis | 2017-02-01 | 1 | -3/+3 |
| | * | metamask - inherit some configManager state from keyring controller | kumavis | 2017-02-01 | 1 | -10/+10 |
| | * | keyring - synchronous getState | kumavis | 2017-02-01 | 1 | -24/+31 |
| * | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 1 | -27/+1 |
| |\| |
|
| | * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -3/+1 |
| | * | metamask - move selectedAccount set/get to preferencesController | kumavis | 2017-01-31 | 1 | -24/+0 |
| * | | code clan up and tests | Frankie | 2017-02-02 | 1 | -3/+1 |
| * | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-30 | 1 | -0/+9 |
| |\| |
|
| | * | metamask - lookup selectedAccount via keyringController | kumavis | 2017-01-30 | 1 | -0/+9 |
| * | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 1 | -43/+58 |
| |\| |
|
| | * | migration 5 - move keyring controller state to substate | kumavis | 2017-01-29 | 1 | -67/+53 |
| | * | keyring - add and initialize obs-store | kumavis | 2017-01-29 | 1 | -5/+33 |
| | * | metamask - adopt shapeshift txs from keyringController | kumavis | 2017-01-28 | 1 | -1/+0 |
| * | | Clean up message manger includes: | Frankie | 2017-01-29 | 1 | -86/+19 |
| |/ |
|
| * | keymanager - small clean | kumavis | 2017-01-27 | 1 | -2/+2 |
| * | metamask controller - adopt clearSeedWords from keyring controller | kumavis | 2017-01-27 | 1 | -11/+0 |
| * | background - organize metamask instantiation | kumavis | 2017-01-27 | 1 | -12/+1 |
| * | background controller - extract KeyringC.placeSeedWords to MetamaskC | kumavis | 2017-01-25 | 1 | -21/+6 |
| * | keyring-controller - cleanup | kumavis | 2017-01-25 | 1 | -2/+3 |
| * | keyring-controller - cleanup | kumavis | 2017-01-25 | 1 | -5/+3 |
| * | Move the assumption of their only being one hd keyring when requesting seed w... | Frankie | 2017-01-25 | 1 | -6/+3 |
| * | Fix issue where generating a new account would put it in loose keys | Frankie | 2017-01-25 | 1 | -3/+6 |
| * | keyring controller - placeSeedWords should use first hdKeyring | kumavis | 2017-01-21 | 1 | -1/+3 |
| * | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 1 | -1/+4 |
| * | Fix bug where signed messages were not dismissed | Dan Finlay | 2017-01-17 | 1 | -0/+1 |
| * | Merge branch 'dev' into bug-submitTx | kumavis | 2017-01-14 | 1 | -1/+0 |
| |\ |
|
| | * | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 1 | -1/+1 |
| | |\ |
|
| | * | | Fix wording and icon of failed txs | Frankie | 2017-01-12 | 1 | -1/+0 |
| | * | | Take some of the tx Logic out of the UI and create a visble state for pending... | Frankie | 2017-01-12 | 1 | -1/+1 |
| * | | | background - handle tx finalization in controllers instead of provider-engine | kumavis | 2017-01-13 | 1 | -6/+4 |
| | |/
|/| |
|
| * | | Send update to UI when changing selected account | Dan Finlay | 2017-01-12 | 1 | -1/+1 |
| |/ |
|
| * | remove unnecessary try statments | Frankie | 2017-01-05 | 1 | -12/+6 |
| * | Merge branch 'dev' into fixtTxManager | Frankie | 2017-01-05 | 1 | -16/+39 |
| |\ |
|
| | * | Make single letter variables more verbose | Dan Finlay | 2017-01-03 | 1 | -1/+1 |
| | * | Merge branch 'dev' into ShowDifferentAccounts | Dan Finlay | 2017-01-03 | 1 | -199/+8 |
| | |\ |
|
| | * | | Return keyring metadata on metamask state object | Dan Finlay | 2016-12-23 | 1 | -19/+42 |
| * | | | Fix signing of transactions | Frankie | 2017-01-05 | 1 | -13/+15 |
| | |/
|/| |
|
| * | | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 1 | -46/+5 |
| |\| |
|
| | * | Added error when trying to unlock uninitialized vault | Dan Finlay | 2016-12-22 | 1 | -0/+4 |
| | * | Move old keystore migration code to metamask controller | Dan Finlay | 2016-12-22 | 1 | -45/+1 |
| | * | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 1 | -1/+0 |
| * | | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 1 | -3/+11 |
| |\| |
|
| | * | Merge pull request #916 from MetaMask/i894-DetectBadAccounts | Dan Finlay | 2016-12-21 | 1 | -2/+9 |
| | |\ |
|
| | | * | Got bad account detection working and added to state | Dan Finlay | 2016-12-10 | 1 | -6/+7 |
| | | * | Mostly added bad account detection | Dan Finlay | 2016-12-09 | 1 | -1/+7 |
| | * | | Remove encryptor in favor of external browser-passworder | Dan Finlay | 2016-12-20 | 1 | -1/+2 |
| | * | | Lint. | Kevin Serrano | 2016-12-20 | 1 | -2/+1 |
| | |/ |
|
| * | | Remove txManager in keyring controller | Frances Pangilinan | 2016-12-22 | 1 | -2/+0 |
| * | | Migrate all tx mutation code out of keyring controller and | Frances Pangilinan | 2016-12-22 | 1 | -19/+4 |
| * | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 1 | -96/+5 |
| * | | Create a TxManager | Frances Pangilinan | 2016-12-15 | 1 | -101/+17 |
| |/ |
|
| * | Remove redundant logging block | Dan Finlay | 2016-12-02 | 1 | -3/+0 |
| * | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 1 | -4/+12 |
| * | Return promise correctly from setSelectedAddress | Dan Finlay | 2016-11-30 | 1 | -1/+1 |
| * | Flattened addTx async methods | Dan Finlay | 2016-11-30 | 1 | -89/+82 |
| * | Bind ethQuery to estimateGas to allow it to be moved around. | Dan Finlay | 2016-11-30 | 1 | -2/+2 |
| * | Fix tx adding code | Dan Finlay | 2016-11-30 | 1 | -25/+3 |
| * | Ordered keyringController methods the same in metamask-controller | Dan Finlay | 2016-11-30 | 1 | -1/+5 |
| * | Annotated KeyringController | Dan Finlay | 2016-11-30 | 1 | -219/+496 |
| * | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 1 | -148/+127 |
| * | Fix more async usage of KeyringController | Dan Finlay | 2016-11-24 | 1 | -25/+32 |
| * | Fix more keyring asyncifying tests | Dan Finlay | 2016-11-24 | 1 | -2/+3 |
| * | Mostly got async keyringController tests passing | Dan Finlay | 2016-11-23 | 1 | -7/+9 |
| * | Complete first pass at asyncrhonizing keyring controller | Dan Finlay | 2016-11-23 | 1 | -31/+53 |
| * | Asynced keyrings and started on controller | Dan Finlay | 2016-11-23 | 1 | -15/+29 |
| * | Fix new encryptor migration logic | Dan Finlay | 2016-11-23 | 1 | -2/+2 |
| * | Fix password reference | Dan Finlay | 2016-11-23 | 1 | -1/+2 |
| * | Remove line of cruft | Dan Finlay | 2016-11-23 | 1 | -1/+0 |
| * | Refine isInitialized derivation method | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| * | Simplify Encryptor API Surface | Dan Finlay | 2016-11-23 | 1 | -37/+13 |
| * | Merge branch 'dev' into i843-MoveSaltIntoEncryptor | Dan Finlay | 2016-11-23 | 1 | -17/+76 |
| |\ |
|
| | * | Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev | Dan Finlay | 2016-11-23 | 1 | -5/+61 |
| | |\ |
|
| | | * | KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG | kumavis | 2016-11-23 | 1 | -5/+61 |
| | * | | Merge pull request #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 1 | -1/+6 |
| | |\ \
| | |/
| |/| |
|
| | | * | Move state update outside of conditional callback block | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | | * | Remove callback type check | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | | * | Merge branch 'dev' into i842-WaitForSeedWord | Dan Finlay | 2016-11-23 | 1 | -2/+2 |
| | | |\ |
|
| | | * | | Use callback in placeSeedWord method. | Dan Finlay | 2016-11-22 | 1 | -1/+6 |
| | * | | | Merge pull request #857 from MetaMask/i841-RenameMethod | kumavis | 2016-11-23 | 1 | -1/+1 |
| | |\ \ \ |
|
| | | * | | | Rename idStoreMigrator method for clarity | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
| | | |/ / |
|
| | * | | | Merge branch 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 1 | -2/+2 |
| | |\ \ \
| | | |/
| | |/| |
|
| | | * | | Improve Keyring organization | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | |/ |
|
| | * | | Change fauceting to become a response of an emit. | Kevin Serrano | 2016-11-22 | 1 | -2/+1 |
| | * | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 1 | -2/+1 |
| | * | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 1 | -4/+4 |
| | |/ |
|
| * / | Began moving salt into encryptor | Dan Finlay | 2016-11-23 | 1 | -5/+10 |
| |/ |
|
| * | Promisify persistence of keyrings before returning key | Kevin Serrano | 2016-11-19 | 1 | -5/+5 |
| * | Persist keyrings from migration to storage. | Kevin Serrano | 2016-11-19 | 1 | -1/+1 |
| * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Dan Finlay | 2016-11-18 | 1 | -65/+60 |
| |\ |
|
| | * | Revert one cb to previous state. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | * | Minimize dispatches by using emitters and relying on state updates. | Kevin Serrano | 2016-11-16 | 1 | -7/+6 |
| | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-11-16 | 1 | -0/+2 |
| | |\ |
|
| | | * | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 1 | -5/+6 |
| | * | | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 1 | -7/+6 |
| | |/ |
|
| | * | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 1 | -1/+1 |
| | * | Revert to previous anonymous function for promise. | Kevin Serrano | 2016-11-12 | 1 | -1/+3 |
| | * | Various keyring changes | Kevin Serrano | 2016-11-12 | 1 | -18/+10 |
| | * | Linting to the max. | Kevin Serrano | 2016-11-12 | 1 | -37/+37 |
| | * | fix tx data so it has the network id | Frankie | 2016-11-11 | 1 | -2/+3 |
| * | | Replace old random-id code with incrementing id generator | Dan Finlay | 2016-11-18 | 1 | -1/+2 |
| |/ |
|
| * | Fix 787 gas buffer bug | Dan Finlay | 2016-11-08 | 1 | -5/+5 |
| * | Fix network checking | Dan Finlay | 2016-11-05 | 1 | -21/+1 |
| * | Add tolerance to normalize method | Dan Finlay | 2016-11-04 | 1 | -0/+1 |
| * | Fix password validation and persistence issue | Dan Finlay | 2016-11-04 | 1 | -4/+5 |
| * | Implement private key exporting. | Kevin Serrano | 2016-11-04 | 1 | -2/+7 |
| * | Finish fixing nicknaming bug | Dan Finlay | 2016-11-04 | 1 | -28/+39 |
| * | Fix account nicknaming bug | Dan Finlay | 2016-11-04 | 1 | -1/+4 |
| * | Fix vault creation bug | Dan Finlay | 2016-11-04 | 1 | -17/+13 |
| * | Fix dual vault creation bug | Dan Finlay | 2016-11-03 | 1 | -11/+4 |
| * | Fix initial vault creation | Dan Finlay | 2016-11-03 | 1 | -4/+8 |
| * | Fix handling of migrating old vault style | Dan Finlay | 2016-11-03 | 1 | -39/+63 |
| * | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 1 | -2/+8 |
| * | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 1 | -6/+45 |
| * | Fix seed phrase restore | Dan Finlay | 2016-11-02 | 1 | -1/+1 |
| * | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 1 | -21/+44 |
| * | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 1 | -4/+14 |
| * | Implement auto-fauceting | Kevin Serrano | 2016-11-01 | 1 | -1/+6 |
| * | Now migrating old vaults to new DEN format | Dan Finlay | 2016-10-29 | 1 | -5/+28 |
| * | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 1 | -7/+24 |
| * | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 1 | -1/+0 |
| * | Fix loading indication | Dan Finlay | 2016-10-22 | 1 | -1/+1 |
| * | Added tx & msg managing functionality to new KeyringController | Dan Finlay | 2016-10-22 | 1 | -0/+148 |
| * | Fix bug in new KeyringController vault restoring logic. | Dan Finlay | 2016-10-22 | 1 | -3/+5 |
| * | Create basic keyring-controller unit test file | Dan Finlay | 2016-10-22 | 1 | -12/+7 |
| * | Added SimpleKeyring tests | Dan Finlay | 2016-10-22 | 1 | -0/+2 |
| * | Added tx and msg signing to keychain & controller | Dan Finlay | 2016-10-21 | 1 | -1/+55 |
| * | Improved simple account generation | Dan Finlay | 2016-10-21 | 1 | -23/+38 |
| * | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 1 | -8/+103 |
| * | Fix tests | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| * | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 1 | -34/+9 |
| * | Fix state updating after vault creation and unlocking | Dan Finlay | 2016-10-21 | 1 | -2/+2 |
| * | Fix unlock logic | Dan Finlay | 2016-10-21 | 1 | -6/+17 |
| * | Intermediary commit. | Kevin Serrano | 2016-10-20 | 1 | -4/+33 |
| * | Remove unused crypto dependencies. | Kevin Serrano | 2016-10-20 | 1 | -2/+0 |
| * | Initial work on UI side | Kevin Serrano | 2016-10-16 | 1 | -0/+5 |
| * | Add minimal method signatures to new keyring controller | Dan Finlay | 2016-10-13 | 1 | -1/+61 |
| * | Add initial KeyringController files | Dan Finlay | 2016-10-12 | 1 | -0/+42 |
