aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-092-6/+30
|\
| * Merge branch 'master' into i1118-IncreaseGasBufferDan Finlay2017-03-081-1/+1
| |\
| | * Fix grammar in erro messagefrankiebee2017-03-081-1/+1
| | |
| * | Merge branch 'master' into i1118-IncreaseGasBufferjaredpereira2017-03-081-1/+22
| |\|
| | * Merge branch 'master' into i#1032frankiebee2017-03-083-13/+19
| | |\
| | * | fix issue where account import allows for duplicatesfrankiebee2017-03-081-1/+22
| | | |
| * | | change BN.mul to BN.mulnJared Pereira2017-03-081-1/+1
| | | |
| * | | remove constant buffer and add multiplierJared Pereira2017-03-081-5/+8
| | |/ | |/|
* | | Nodeify and promisify calls to background.Kevin Serrano2017-03-091-2/+4
| | |
* | | Refactor of code into separate reducers and actions.Kevin Serrano2017-03-082-5/+14
| | |
* | | Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-083-13/+19
|\| |
| * | Merge branch 'master' into i1173-ShowPersonalMessageDan Finlay2017-03-072-5/+5
| |\ \
| | * | Fix issue where old txMeta object was being used to pass the txHash to the cbFrankie2017-03-072-5/+5
| | |/
| * | Fix normalizeMsgData function to always return hex prefixedDan Finlay2017-03-071-1/+1
| | |
| * | Render personal_sign messages as utf-8 textDan Finlay2017-03-071-8/+14
| |/ | | | | | | | | | | | | | | | | | | | | Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173
* | More conflict resolution.Kevin Serrano2017-03-024-4/+4
|\ \
| * | add controllers to root scripts folderDan Finlay2017-02-284-3/+3
| | |
| * | Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-2812-281/+252
| |\ \
* | \ \ Fix merge conflicts.Kevin Serrano2017-03-0214-327/+267
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add a couple more debug logsDan Finlay2017-03-011-0/+1
| | |
| * | Use correct action to update and submit txDan Finlay2017-03-011-0/+1
| | |
| * | LintedDan Finlay2017-03-011-1/+0
| | |
| * | Remove gasMultiplier txMeta paramDan Finlay2017-03-016-44/+4
| | | | | | | | | | | | | | | | | | This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter.
| * | Fixed bug that made send screen sometimes transition to account detailDan Finlay2017-03-011-0/+1
| | |
| * | Add background method for updating and approving a tx in one callDan Finlay2017-02-281-2/+9
| | |
| * | Merge branch 'master' into i765-gaslimitsDan Finlay2017-02-2812-281/+251
| |\|
| | * Removed redundant personal_recover logicDan Finlay2017-02-252-18/+0
| | |
| | * Mostly fix personal_recoverDan Finlay2017-02-252-6/+6
| | |
| | * Fix cancel msg signing behavior.Dan Finlay2017-02-241-6/+25
| | |
| | * Got personal_sign workingDan Finlay2017-02-243-21/+42
| | | | | | | | | | | | Also fixed bug where signing would not close popup.
| | * Add alternate UI for pending personal_sign messagesDan Finlay2017-02-242-1/+3
| | |
| | * Add personal sign actions and templateDan Finlay2017-02-231-0/+5
| | |
| | * Allow provider to init before keyringControllerDan Finlay2017-02-221-2/+6
| | |
| | * Fix referenceDan Finlay2017-02-221-1/+1
| | |
| | * Point metamask-controller personalSignRecover method to keyring-controllerDan Finlay2017-02-221-9/+5
| | |
| | * Move sigUtil and keyrings to external modulesDan Finlay2017-02-2210-261/+202
| | | | | | | | | | | | 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.
| * | Make gasPrice accessible to the UI.Kevin Serrano2017-02-251-0/+1
| |/
* | Tested against code to play nice with unit tests.Kevin Serrano2017-02-242-3/+12
| |
* | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-231-14/+15
| |
* | Fix namingKevin Serrano2017-02-222-3/+3
| |
* | Basic infrasture for RPC list added.Kevin Serrano2017-02-222-3/+24
|/
* Version 3.3.0v3.3.0Dan Finlay2017-02-211-1/+1
|
* Add memstore update after adding new keyringDan Finlay2017-02-161-0/+1
|
* keyring controller - update memStore after restoreKeyringkumavis2017-02-161-0/+1
|
* Merge branch 'master' into devDan Finlay2017-02-163-5/+30
|\
| * got hash test passingDan Finlay2017-02-142-2/+5
| |
| * Version 3.2.2v3.2.2Dan Finlay2017-02-101-1/+1
| |
| * Revert old style message sighingFrankie2017-02-102-2/+24
| |
* | Made migrations non-destructive; fixed currency migration.Kevin Serrano2017-02-1610-22/+49
| |
* | Add migrations for removing terms of use data.Kevin Serrano2017-02-152-0/+31
| |
* | Merge branch 'dev' into disclaimer-notifyKevin Serrano2017-02-102-1/+7
|\ \
| * | Merge branch 'dev' into i1085-synchronousnetkumavis2017-02-101-1/+1
| |\|
| * | Allowed net_version to be called synchronouslyKevin Serrano2017-02-092-1/+7
| | |
* | | Delete all code related to disclaimers.Kevin Serrano2017-02-104-73/+0
| | |
* | | Fix bugs with notice. Add disclaimer notice.Kevin Serrano2017-02-101-3/+3
| |/ |/|
* | Version 3.2.1v3.2.1Dan Finlay2017-02-091-1/+1
|/
* Version 3.2.0v3.2.0Dan Finlay2017-02-081-1/+1
|
* Fix typoDan Finlay2017-02-051-1/+1
|
* Remove shapeshift tx list from idStoreDan Finlay2017-02-051-2/+1
|
* Stop removing old shapeshift txsDan Finlay2017-02-051-16/+0
|
* Do not remove completed shapeshift depositsDan Finlay2017-02-041-1/+2
|
* Fix bug when clearing old shapeshift txsDan Finlay2017-02-041-1/+3
|
* Automatically remove shapeshift txs over 11 minutes old with no paymentDan Finlay2017-02-041-0/+22
|
* Add migration to indexDan Finlay2017-02-041-1/+2
|
* Got ShapeShiftController back to workingDan Finlay2017-02-042-12/+43
|
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-043-37/+112
| | | | Rendering the list is still having issues, so this isn't done yet.
* eth-store - update store state after manipulatingkumavis2017-02-041-0/+2
|
* id mgmt - update to latest eth_sign speckumavis2017-02-044-34/+55
|
* migrations - fix migration #9 and add safety checks to migratorkumavis2017-02-042-3/+14
|
* eths-store - eagerly set current blockkumavis2017-02-041-0/+2
|
* metamask - add missing diskState and memState subscriptionskumavis2017-02-031-6/+11
|
* migration #9 - break out CurrencyController substatekumavis2017-02-036-75/+133
|
* eth-store - cbs default to noopkumavis2017-02-031-5/+5
|
* migration #8 - break out NoticeController substatekumavis2017-02-034-28/+63
|
* eth-store - convert to obs-store subclasskumavis2017-02-032-118/+103
|
* txManager - depend on preferencesStorekumavis2017-02-032-4/+8
|
* metamask - introduce networkStorekumavis2017-02-032-35/+50
|
* migration 7 - break off TransactionManager substatekumavis2017-02-034-25/+89
|
* messageManager - move view state to obs-storekumavis2017-02-032-38/+28
|
* keyring - replace getState with memStorekumavis2017-02-032-30/+2
|
* keyring - manage isUnlocked in memStorekumavis2017-02-031-1/+7
|
* keyring - rm config depkumavis2017-02-032-5/+2
|
* Merge branch 'dev' into notice-managementKevin Serrano2017-02-033-1/+2
|\
| * metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ↵kumavis2017-02-022-1/+1
| | | | | | | | controller
| * emit a update badgeFrankie2017-02-021-1/+1
| |
| * put updateBadge back inFrankie2017-02-021-0/+1
| |
* | Change filepath for new location of notices.Kevin Serrano2017-02-031-1/+1
|/
* swap out set state for updateStateFrankie2017-02-021-4/+1
|
* Fix messy mergeFrankie2017-02-021-14/+2
|
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-022-50/+69
|\
| * metamask - adopt isInitialized from keyring controllerkumavis2017-02-012-4/+8
| |
| * 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-012-10/+13
| |
| * keyring - synchronous getStatekumavis2017-02-012-46/+47
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-028-47/+110
|\|
| * migration #6 - fix selectedAddress data sourcekumavis2017-01-311-2/+2
| |
| * inpage - set web3.eth.defaultAccount correctlykumavis2017-01-312-2/+2
| |
| * continue rename selectedAccount to selectedAddresskumavis2017-01-314-13/+13
| |
| * rename selectedAccount to selectedAddresskumavis2017-01-314-10/+13
| |
| * metamask - rename getSelectedAccount to getSelectedAddresskumavis2017-01-312-5/+5
| |
| * migration #6 - move selectedAccount from keyringController to ↵kumavis2017-01-312-0/+42
| | | | | | | | preferencesController
| * metamask - move selectedAccount set/get to preferencesControllerkumavis2017-01-312-33/+12
| |
| * preferences - introduce preferences controllerkumavis2017-01-312-0/+39
| |
* | code clan up and testsFrankie2017-02-023-41/+39
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-302-4/+13
|\|
| * metamask - lookup selectedAccount via keyringControllerkumavis2017-01-302-3/+12
| |
| * public config - get selectedAccount from keyring controller substatekumavis2017-01-301-1/+1
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-295-174/+236
|\|
| * metamask - subscribe metamask store to keyringController substatekumavis2017-01-291-0/+3
| |
| * migration 5 - move keyring controller state to substatekumavis2017-01-293-67/+95
| |
| * keyring - add and initialize obs-storekumavis2017-01-292-6/+36
| |
| * metamask - adopt shapeshift txs from keyringControllerkumavis2017-01-282-2/+3
| |
| * tests - remove persistence and start with initial statekumavis2017-01-281-9/+1
| |
| * metamask - organize methodskumavis2017-01-281-120/+126
| |
* | Clean up message manger includes:Frankie2017-01-295-126/+129
| | | | | | | | | | | | | | | | | | 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
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-284-194/+205
|\|
| * metamask - fix setupProviderConnectionkumavis2017-01-271-1/+1
| |
| * keymanager - small cleankumavis2017-01-271-2/+2
| |
| * metamask controller - cleanup remote apikumavis2017-01-271-77/+100
| |
| * metamask - organize into sectionskumavis2017-01-271-49/+61
| |
| * metamask - use web3-stream-provider/handler instead of manual wiringkumavis2017-01-271-23/+8
| |
| * metamask controller - adopt setup*Communication from backgroundkumavis2017-01-272-44/+41
| |
| * background - stream disconnection fixkumavis2017-01-272-8/+8
| |
| * metamask controller - adopt clearSeedWords from keyring controllerkumavis2017-01-272-15/+9
| |
* | Rewrite message controller to fit controller patternFrankie2017-01-281-48/+45
|/
* background - graceful publicConfigStore connection teardownkumavis2017-01-271-1/+3
|
* background - organize metamask instantiationkumavis2017-01-273-47/+37
|
* obs-store - use published modulekumavis2017-01-2510-295/+85
|
* migrations - rename 005 to stubbed _multi-keyringkumavis2017-01-251-0/+7
|
* Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2kumavis2017-01-253-32/+34
|\
| * Merge branch 'dev' into i#1048kumavis2017-01-252-0/+56
| |\
| | * Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-251-3/+5
| | |\ | | | | | | | | hotfix - addNewAccount - dont assume hd keyring position
| * | | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-252-22/+16
| | | |
| * | | merge master hotfix into devkumavis2017-01-251-1/+1
| |\ \ \
| | * | | 3.1.2kumavis2017-01-251-1/+1
| | | |/ | | |/|
| | * | hotfix - dont assume hd keyring positionkumavis2017-01-251-3/+5
| | | |
| * | | 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-252-7/+8
| | | | | | | | | | | | | | | | words to metamaskController
| * | | Fix issue where generating a new account would put it in loose keysFrankie2017-01-252-4/+12
| |/ /
* | | Merge branch 'dev' into obs-store2kumavis2017-01-2211-136/+329
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into upToDateFrankie2017-01-211-1/+1
| |\|
| | * 3.1.1kumavis2017-01-211-1/+1
| | |
| * | Merge branch 'master' into upToDateFrankie2017-01-211-1/+3
| |\|
| | * keyring controller - placeSeedWords should use first hdKeyringkumavis2017-01-211-1/+3
| | |
| * | Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-192-2/+2
| |\|
| | * Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-1/+1
| | |\
| | | * Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-192-4/+7
| | | |\
| | | * | Fix the dissplay for submitted transactions and the listner wating to hear ↵Frankie2017-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | when tx's were included in a block
| | * | | Version 3.1.0Dan Finlay2017-01-191-1/+1
| | | | |
| * | | | Add ability to import v3 JSON walletsDan Finlay2017-01-191-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
| * | | | Added new modular private key import systemDan Finlay2017-01-192-0/+48
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
| * | | Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-6/+5
| |\ \ \
| | * | | tx-manager - use rpc-specified txHashkumavis2017-01-191-6/+5
| | | | |
| * | | | Allow importing of private key stringsDan Finlay2017-01-183-8/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | Merge branch 'dev' into conversion-api-errDan Finlay2017-01-1810-131/+250
| |\ \ \
| | * | | Version 3.0.1Dan Finlay2017-01-171-1/+1
| | | | |
| | * | | Fix bug where signed messages were not dismissedDan Finlay2017-01-171-0/+1
| | | | |
| | * | | Fix removeHexPrefix to stripHexPrefixDan Finlay2017-01-171-1/+1
| | | | |
| | * | | Wrote fix for eth.signDan Finlay2017-01-171-2/+1
| | | |/ | | |/|
| | * | Fix manifest versionDan Finlay2017-01-171-1/+1
| | | |
| | * | Version 3.0.0Dan Finlay2017-01-171-1/+1
| | | |
| | * | keyring - simple - throw error if wallet not found for addresskumavis2017-01-171-1/+4
| | | |
| | * | keyring - simple - fix address generationkumavis2017-01-171-3/+3
| | |/
| | * eth-store - emit update on new account addkumavis2017-01-151-1/+3
| | |
| | * background - txManager - filter txs by networkkumavis2017-01-152-4/+6
| | |
| | * background - return txHash to provider-engine on donekumavis2017-01-152-14/+13
| | |
| | * Fix the inclusion of the txFee in the meta tx objectFrankie2017-01-151-3/+5
| | |
| | * fix for lintingFrankie2017-01-141-0/+1
| | |
| | * Satisfy review needs:Frankie2017-01-142-21/+23
| | | | | | | | | | | | | | | | | | | | | removed unnecessary this.query = opts.query from constructor Created a tx error state for errors in approveTransaction validateTxParams has been moved to tx-utils removed "value" arg from _setTxStatus
| | * fix the maxcost not being included in txMetaFrankie2017-01-141-3/+7
| | |
| | * Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-01-144-13/+38
| | |\ | | | | | | | | | | | | bug-submitTx
| | | * Merge branch 'dev' into bug-submitTxkumavis2017-01-144-13/+38
| | | |\
| | | | * Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-141-2/+2
| | | | |\
| | | | * | Clean up codeFrankie2017-01-141-1/+2
| | | | | |
| | | | * | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-1/+1
| | | | |\ \
| | | | * | | Fix wording and icon of failed txsFrankie2017-01-122-15/+16
| | | | | | |
| | | | * | | Add to CHANGELOGFrankie2017-01-121-2/+8
| | | | | | |
| | | | * | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-123-36/+11
| | | | |\ \ \
| | | | * | | | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-124-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pending and unaproved transactions
| | * | | | | | background - metamask controller - fix 'this' refkumavis2017-01-141-7/+8
| | |/ / / / /
| | * | | | / background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-134-108/+186
| | | |_|_|/ | | |/| | |
| * | | | | currency conversion - less noisy errorkumavis2017-01-121-1/+1
| | |_|/ / | |/| | |
* | | | | background - fix metamaskController store -> diskStore persistencekumavis2017-01-131-1/+6
| | | | |
* | | | | migrations - wip - 005 multivault migrationkumavis2017-01-127-31/+82
| | | | |
* | | | | migrations - introduce promise-based migratorkumavis2017-01-125-112/+179
| | | | |
* | | | | background - move pojo migrator to outside of metamask controllerkumavis2017-01-1211-104/+159
| | | | |
* | | | | background - introduce ObservableStorekumavis2017-01-129-166/+204
| |/ / / |/| | |
* | | | bugfix - portstream - dont wrap cb in try catchkumavis2017-01-121-2/+2
| |_|/ |/| |
* | | Send update to UI when changing selected accountDan Finlay2017-01-121-1/+1
|/ / | | | | | | Fixes #981
* | rpc - fix sync account cache settingkumavis2017-01-111-17/+1
| |
* | web3 provider - override eth_syncing and web3_clientVersionkumavis2017-01-111-0/+5
| |
* | Remove erroneous OOG estimation logic.Dan Finlay2017-01-111-15/+2
| |
* | deps - replace promise-request with fetchkumavis2017-01-111-4/+3
|/
* Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-063-31/+33
|\
| * Merge branch 'dev' into fixTxManagerDan Finlay2017-01-062-1/+145
| |\
| * | Combine two identical then blocksDan Finlay2017-01-061-4/+2
| | |
| * | remove unnecessary try statmentsFrankie2017-01-053-37/+24
| | |
| * | clean upFrankie2017-01-051-1/+1
| | |
| * | Merge branch 'dev' into fixtTxManagerFrankie2017-01-054-37/+68
| |\ \
| * | | Fix signing of transactionsFrankie2017-01-053-46/+62
| | | |
* | | | Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-062-1/+145
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed bugs with sanity-checkingDan Finlay2017-01-051-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | - Was incorrectly calling some eth-query methods (left over from old local eth-query) - Was still passing block to getAccount in addAccount - Now emitting update only after all account balances are loaded, reducing UI update traffic.
| * | | Fix dependency referenceDan Finlay2017-01-051-1/+1
| | | |
| * | | Caught typoDan Finlay2017-01-051-2/+3
| | | |
| * | | Add descriptive commentDan Finlay2017-01-051-0/+9
| | | |
| * | | LintedDan Finlay2017-01-051-22/+17
| | | |
| * | | Removed reliance on eth-store internal custom eth-queryDan Finlay2017-01-051-6/+15
| | | |
| * | | Move eth-store@1.1.0 into local repo.Dan Finlay2017-01-051-0/+132
| | |/ | |/|
* / | MetaMask Controller - Convert to EventEmitterFrankie2017-01-062-12/+8
|/ /
* | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into devKevin Serrano2017-01-041-2/+8
|\ \
| * | Fix sendUpdate for new promisified getState methodDan Finlay2017-01-041-2/+6
| | |
| * | Update UI state on ethStore updatesDan Finlay2017-01-041-0/+2
| | | | | | | | | | | | | | | | | | UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity. Fixes #963
* | | Take out unneeded permissions from the app.Kevin Serrano2017-01-041-2/+0
|/ /
* | Make single letter variables more verboseDan Finlay2017-01-032-5/+5
| |
* | Merge branch 'dev' into ShowDifferentAccountsDan Finlay2017-01-038-519/+421
|\|
| * inpage-provider - add isMetaMaskkumavis2017-01-031-0/+2
| | | | | | | | adds `metamaskInpageProvider.isMetaMask === true` Fixes #727
| * Merge branch 'dev' into TxManagerFrankie2016-12-246-53/+94
| |\
| * | fix some minor spelling mistakes and clean up codeFrankie2016-12-243-28/+26
| | |
| * | fix mergeFrances Pangilinan2016-12-221-1/+1
| | |
| * | Merge branch 'dev' into TxManagerFrankie2016-12-2210-192/+191
| |\ \
| * | | Remove txManager in keyring controllerFrances Pangilinan2016-12-221-2/+0
| | | |
| * | | Migrate all tx mutation code out of keyring controller andFrances Pangilinan2016-12-224-54/+71
| | | | | | | | | | | | | | | | Fix up txManager to reflect code review requests
| * | | First pass at revision requestsFrances Pangilinan2016-12-227-511/+184
| | | |
| * | | Clean up and comment functionsFrances Pangilinan2016-12-152-10/+31
| | | |
| * | | Create a TxManagerFrances Pangilinan2016-12-157-159/+350
| | | |
* | | | Add tolerance for hex prefixed private keys to simple keychainDan Finlay2017-01-031-3/+4
| | | |
* | | | Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccountsDan Finlay2016-12-241-2/+2
|\ \ \ \
| * | | | Add additional migration testDan Finlay2016-12-241-2/+2
| | |_|/ | |/| |
* / | | Return keyring metadata on metamask state objectDan Finlay2016-12-232-29/+55
|/ / / | | | | | | | | | | | | | | | | | | 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.
* | | Remove logDan Finlay2016-12-231-1/+0
| | |
* | | Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-235-51/+92
|\ \ \ | | | | | | | | Auto-Recover accounts lost to BIP44 derivation fix
| * | | Break up migration functionDan Finlay2016-12-231-24/+24
| | | |
| * | | Don't bother changing selected accounts since accounts are recoveredDan Finlay2016-12-231-13/+3
| | | |
| * | | Remove logsDan Finlay2016-12-231-2/+2
| | | |
| * | | LintedDan Finlay2016-12-221-4/+3
| | | |
| * | | Restructured migrationDan Finlay2016-12-223-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrator now returns a lostAccount array that includes objects these objects include keys of address and privateKey, this allows the MetamaskController to restore the lost accounts even without customizing the idStore or the KeyringController. Also includes a patch that allows idStore to synchronously export private keys.
| * | | Return undefined when vault is uninitializedDan Finlay2016-12-221-1/+1
| | | |
| * | | Added error when trying to unlock uninitialized vaultDan Finlay2016-12-221-0/+4
| | | |
| * | | Move old keystore migration code to metamask controllerDan Finlay2016-12-222-46/+50
| | | | | | | | | | | | | | | | 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-212-2/+16
| | | | | | | | | | | | | | | | - Confirm button will now dismiss the lost accounts array.
* | | | Fix account injection bugDan Finlay2016-12-231-2/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account. I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](https://github.com/MetaMask/metamask-plugin/commit/f5b0795ac5582dd53de728479cf47c43eabfe67c) by @Zanibas. Sorry, Kevin! Had you actually changed all instances, this bug would not have happened. Fixes #908
* | | Lint.Kevin Serrano2016-12-211-11/+11
|/ /
* | Merge pull request #916 from MetaMask/i894-DetectBadAccountsDan Finlay2016-12-214-16/+57
|\ \ | | | | | | I894 detect bad accounts
| * | Made changes according to feedback.Dan Finlay2016-12-203-13/+12
| | |
| * | Got bad account detection working and added to stateDan Finlay2016-12-103-31/+8
| | |
| * | Mostly added bad account detectionDan Finlay2016-12-094-9/+74
| |/ | | | | | | Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.
* | Merge pull request #939 from MetaMask/BrowserPassworderDan Finlay2016-12-212-157/+2
|\ \ | | | | | | Remove encryptor in favor of external browser-passworder
| * | Remove encryptor in favor of external browser-passworderDan Finlay2016-12-202-157/+2
| | | | | | | | | | | | I broke out the encryptor lib into its own module on npm called browser-passworder.
generated by cgit (git 2.34.1) at 2024-10-17 12:24:28 +0800