aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into uat-masterDan Finlay2018-02-221-1/+1
|\
| * use the providers initial _blocktracker. fixes #2393Lazaridis2018-02-111-1/+1
| |
* | Merge branch 'uat' into uat-nextDan2018-02-081-9/+12
|\ \
| * | Merge branch 'master' into uatDan2018-02-081-9/+12
| |\|
| | * Merge branch 'master' into localStorage-clean-upFrankie2018-02-011-0/+8
| | |\
| | | * wipe only transactions for current accountBruno Barbieri2018-01-311-4/+4
| | | |
| | | * added reset account featureBruno Barbieri2018-01-311-0/+8
| | | |
| | * | remove RecentBlocks from diskfrankiebee2018-02-011-3/+1
| | | |
| | * | remove BlacklistController from disk statefrankiebee2018-01-311-6/+1
| | |/
| | * Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
| | |
* | | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-081-0/+15
|/ / | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.
* | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-171-0/+14
|\ \ | |/ |/|
| * Track usage of old and new UI (#2794)Alexander Tseung2017-12-231-0/+1
| | | | | | [NewUI] Track usage of old and new UI
| * Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-211-0/+1
| |\
| | * Adds updateTransaction to background and used it to update after editing in ↵Dan2017-12-211-1/+1
| | | | | | | | | | | | send-v2.
| | * Canceled, edited transactions show edited amount.Dan2017-12-211-0/+1
| | |
| * | Merge branch 'master' into NewUI-flatDan2017-12-211-14/+34
| |\ \ | | |/ | |/|
| * | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-081-5/+42
| |\ \
| | * | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-5/+42
| | | |
| * | | Add UI selectionDan2017-12-051-0/+1
| |/ /
| * | more eslint fixesJason Clark2017-11-261-1/+1
| | |
| * | toggle wired up to preferences property storeJason Clark2017-11-251-0/+10
| | |
| * | Merge branch 'master' into merge-masterChi Kei Chan2017-11-161-1/+1
| |\ \
| * \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-211-21/+38
| |\ \ \
| * \ \ \ Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-191-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-041-20/+24
| | |\ \ \ \
| | * | | | | Enables remove token and ensures add/remove update the list without need for ↵Dan2017-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | refresh.
* | | | | | | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-131-6/+1
| | | | | | |
* | | | | | | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first initializing, recent-block controller now back-fills up to its desired history length. This makes estimated gas prices reflect a longer recent history, even when first switching to a new network. Fixes #2925
* | | | | | | Default to 1 gwei for empty blocksDan Finlay2018-01-091-2/+3
| | | | | | |
* | | | | | | Default gas estimate to 1 gwei for networks with no block activityDan Finlay2018-01-091-0/+6
| | | | | | |
* | | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-091-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix condition where failing seed word checks would infinite-spin future attempts.
| * | | | | | | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-041-4/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix feature to workDan Finlay2018-01-061-2/+9
| | | | | | |
* | | | | | | LintedDan Finlay2018-01-061-3/+0
| | | | | | |
* | | | | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-061-1/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | Return the 50th percentile lowest gas price of the previous 20 blocks.
* | | | | | Add Recent Blocks controllerDan Finlay2017-12-181-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracks recent blocks, useful for estimating recent successful gas prices.
* | | | | | Fix retry actionDan Finlay2017-12-071-1/+9
| | | | | |
* | | | | | Add retry background method and actionDan Finlay2017-12-071-0/+1
| | | | | |
* | | | | | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1Thomas Huang2017-11-301-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Versioned notices
| * | | | | | LintedDan Finlay2017-11-291-1/+1
| | | | | | |
| * | | | | | Add seed phrase bounty award noticeDan Finlay2017-11-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only shows to people who installed before or equal to MetaMask 3.12.1
| * | | | | | Get notice version filtering working nicelyDan Finlay2017-11-291-0/+1
| | | | | | |
| * | | | | | Add firstVersion field to notices selectorDan Finlay2017-11-291-0/+1
| | | | | | |
| * | | | | | Add optional version field to noticesDan Finlay2017-11-291-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows notices to only show to users who are on a certain version.
* | | | | | | deps - obs-store@3 + migrate stream plumbingkumavis2017-11-291-1/+2
|/ / / / / /
* | | | | | Prevent creation of multiple vaultsDan Finlay2017-11-211-31/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2577 by ensuring only one seed phrase can be set for a new vault. Also cleans up logs and reproduction logic.
* | | | | | Add reproduction and mutex codeDan Finlay2017-11-211-2/+37
| |_|_|_|/ |/| | | |
* | | | | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-061-1/+1
| |_|_|/ |/| | | | | | | | | | | This typo tripped me up when I was reading through the code and trying to understand what's going on.
* | | | LintedDan Finlay2017-10-201-1/+0
| | | |
* | | | Fix bug where new account was not immediately selectedDan Finlay2017-10-201-3/+14
| | | |
* | | | Remove account-tracker from keyringControllerDan Finlay2017-10-191-1/+0
| | | |
* | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-191-35/+33
|\| | |
| * | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-191-35/+33
| | | |
* | | | Make account tracking much more reactiveDan Finlay2017-10-191-9/+5
| | | |
* | | | Make account tracking more reactiveDan Finlay2017-10-191-21/+1
| | | | | | | | | | | | | | | | | | | | We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers.
* | | | Refresh computed balances controller when restoring vaultDan Finlay2017-10-191-1/+2
| | | |
* | | | Stop tracking old account balances after restore vaultDan Finlay2017-10-191-0/+13
| | | | | | | | | | | | | | | | Per @kgserrano note
* | | | Promisify metamask-controller vault creating methodsDan Finlay2017-10-181-17/+10
| | | |
* | | | Select first account when restoring seedDan Finlay2017-10-181-3/+17
| | | | | | | | | | | | | | | | Fixes #2348
* | | | Select first account on new vault creationDan Finlay2017-10-181-1/+12
|/ / /
* | | lint fixeskumavis2017-10-111-1/+1
| | |
* | | network controller - refactor to use eth-rpc-clientkumavis2017-10-111-3/+4
| | |
* | | metamask controller - define this.newTransaction to ease instantiation orderkumavis2017-10-111-1/+6
| | |
* | | metamask controller - simplify provider initkumavis2017-10-111-22/+16
| | |
* | | metamask controller - breakout getAccounts methodkumavis2017-10-111-12/+14
| | |
* | | Add signTypedData input validationsDan Finlay2017-10-061-4/+9
| | |
* | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-061-1/+0
|\ \ \ | | |/ | |/|
| * | Don't pass origin as an HTTP headerAdam Novak2017-10-021-1/+0
| | | | | | | | | | | | | | | | | | | | | Requests with this nonstandard header are being blocked by CORS when made against Parity. Not sending it ought to fix #1779.
* | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-031-19/+24
|\| |
| * | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactionskumavis2017-09-301-1/+0
| |\ \ | | | | | | | | pending-tx - dont check the balance to rebrodcast
| | * | pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-301-1/+0
| | | |
| * | | network - convert localhost from custom rpc to network typekumavis2017-09-301-7/+0
| | | |
| * | | network controller - small refactorkumavis2017-09-301-17/+21
| |/ /
| * / Ensure selected account is always set if possibleDan Finlay2017-09-301-0/+9
| |/ | | | | | | | | | | Fixes #2218 Subscribes to keyringController, and if only one account exists, sets it as selected.
* / Add eth_signTypedData handlerSergey Ukustov2017-09-301-0/+52
|/
* metamask - improve commentkumavis2017-09-281-2/+1
|
* Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-281-8/+30
|\
| * Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2017-09-271-7/+4
| |\ | | | | | | | | | BreakOutKeyringController
| | * Remove duplicate instantiation of account-trackerDan Finlay2017-09-271-5/+1
| | |
| | * Move obs store into account-tracker instead of inheritingDan Finlay2017-09-271-2/+2
| | |
| | * Pass blocktracker to balances controllerDan Finlay2017-09-271-0/+1
| | |
| | * Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-261-0/+1
| | |\
| * | | Remove keyring controller from projectDan Finlay2017-09-231-1/+1
| | | |
| * | | Merge branch 'AddBalanceController' into BreakOutKeyringControllerDan Finlay2017-09-231-6/+30
| |\| | | | |/ | |/|
| | * Fix accont-tracker merge bugDan Finlay2017-09-231-0/+4
| | |
| | * Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-231-31/+58
| | |\
| | * | Fix computed-balances controller referenceDan Finlay2017-09-231-1/+1
| | | |
| | * | Refactor eth-store into account-trackerDan Finlay2017-09-231-10/+16
| | | | | | | | | | | | | | | | EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it.
| | * | Add computed balance to account detail viewDan Finlay2017-09-141-0/+4
| | | |
| | * | Got pending balance updating correctlyDan Finlay2017-09-141-0/+4
| | | |
| | * | Some progressDan Finlay2017-09-131-1/+7
| | | |
| * | | Define encryptor in constructor params instead of platform objectDan Finlay2017-09-231-1/+1
| | | |
| * | | Merge branch 'master' into ConfigurableEncryptionDan Finlay2017-09-221-1/+1
| |\ \ \ | | | |/ | | |/|
| * / | Allow custom encryptor to be passed to MetaMaskController and ↵Dan Finlay2017-09-221-1/+2
| |/ / | | | | | | | | | KeyringControllers.
* / / metamask - use provider-engines block trackerkumavis2017-09-231-1/+1
|/ /
* | metamask controller - destroy filter polyfill on disconnectkumavis2017-09-141-4/+10
| |
* | metamask controller - move middleware into seperate fileskumavis2017-09-141-34/+7
| |
* | debug - prefer logger over consolekumavis2017-09-141-5/+5
| |
* | metamask cont - standardize multiplex stream namingkumavis2017-09-141-8/+8
| |
* | metamask - add jsonrpc filter middleware on per-connection enginekumavis2017-09-081-2/+8
| |
* | streams - use pump and published obj-multiplexkumavis2017-09-081-7/+27
| |
* | inpage - use json-rpc-engine for inpage-providerkumavis2017-08-251-10/+32
|/
* Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-031-26/+4
|\ | | | | Transaction controller refractor part 1: promises for everyone and more tests!
| * move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-031-21/+2
| |
| * lint fixesfrankiebee2017-08-021-1/+1
| |
| * fix spelling mistakefrankiebee2017-08-021-1/+1
| |
| * make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-021-16/+13
| |
* | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-031-10/+9
| |
* | phishing detection - move phishing detection into contentscript and metamask ↵kumavis2017-08-031-2/+24
|/ | | | controller
* turn off auto faucet and remove filefrankiebee2017-07-181-4/+0
|
* Merge branch 'master' into nonce-trackerfrankiebee2017-07-131-1/+1
|\
| * metamask - on rpc err show whole error bodykumavis2017-07-121-1/+1
| |
* | use new nodeifyfrankiebee2017-07-131-23/+15
| |
* | Merge branch 'master' into nonce-trackerkumavis2017-07-081-2/+10
|\|
| * metamask - append dapp origin domain to rpc requestkumavis2017-07-051-2/+9
| |
| * Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-291-0/+1
| |\ | | | | | | Add ability to add tokens to token list
| | * Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-201-1/+6
| | |\
| | * | Add ability to add tokens to token listDan Finlay2017-06-161-0/+1
| | | | | | | | | | | | | | | | Fiex #1616
* | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-281-1/+15
|\| | |
| * | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-271-1/+14
| |\ \ \ | | |_|/ | |/| | Add Infura Status Information to UI State
| | * | Add infura network status to our UI state.Kevin Serrano2017-06-231-1/+14
| | | |
| * | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-06-201-0/+1
| |\ \ \ | | |/ / | |/| / | | |/ AddTokenList
| | * Persist selected account tabDan Finlay2017-06-151-0/+1
| | | | | | | | | | | | Also improve error handling with token balances.
* | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-171-1/+6
|\| |
| * | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-171-1/+5
| |\ \
| | * | Debounce background updatesDan Finlay2017-06-161-1/+5
| | |/ | | | | | | | | | | | | | | | | | | Our background sometimes emits absurd quantities of updates very quickly. This PR reduces the amount of inter-process traffic by ensuring the `sendUpdate` method does not fire more than every 200 ms. Fixes #1621
| * / check nonce and balance when resubmiting txfrankiebee2017-06-161-0/+1
| |/
* / transaction controller - use nonce-trackerkumavis2017-06-151-1/+1
|/
* include ethQuery in txControllerfrankiebee2017-05-241-0/+1
|
* Fix for testsfrankiebee2017-05-241-2/+1
|
* Wrap the provider in a proxyfrankiebee2017-05-231-37/+5
|
* Merge branch 'master' into networkControllerfrankiebee2017-05-231-16/+16
|\
| * Rename tx manager to tx controllerDan Finlay2017-05-171-16/+16
| |
* | Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-191-72/+52
|/
* metamask - publicConfig - fix init statekumavis2017-05-051-1/+1
|
* metamask - selected accounts - dont reveal when lockedkumavis2017-05-051-15/+17
|
* Use loglevel for more logsDan Finlay2017-05-011-9/+3
|
* Fix linting warningsThomas Huang2017-04-271-39/+38
|
* add platforms to mascara + move buyEther window open to uikumavis2017-04-051-17/+2
|
* Merge pull request #1307 from MetaMask/mascarakumavis2017-04-051-1/+0
|\ | | | | Proof of Concept: Mascara
| * clean - metamask controller - remove logkumavis2017-04-051-1/+0
| |
| * Merge branch 'master' into mascarafrankiebee2017-04-031-6/+8
| |\
| * | WIP: lost enital call from dapp to getAccountsfrankiebee2017-03-301-0/+1
| | |
| * | Merge branch 'master' into mascarafrankiebee2017-03-291-1/+5
| |\ \
| * \ \ Merge branch 'master' into mascarafrankiebee2017-03-241-38/+17
| |\ \ \
| * | | | WIP: streams->indexdbfrankiebee2017-03-241-1/+0
| | | | |
* | | | | Fix faucet to only autoFaucet first accountfrankiebee2017-04-051-0/+2
| |_|_|/ |/| | |
* | | | introduce platform api and rename notifications to notification-managerkumavis2017-03-311-6/+8
| |_|/ |/| |
* | | Merge pull request #1268 from MetaMask/kovan-faucet-instructionsDan Finlay2017-03-291-0/+4
|\ \ \ | | | | | | | | Add Kovan faucet instructions
| * | | Add link to kovan faucet instructions.Kevin Serrano2017-03-281-0/+4
| | |/ | |/|
* / | Assure that seed words are placed into state tree upon request.Kevin Serrano2017-03-281-1/+1
|/ /
* | Remove eth-lightwalletDan Finlay2017-03-171-37/+1
| |
* | Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-151-1/+1
|\ \
| * | Rename variables to proper currency state variables.Kevin Serrano2017-03-151-1/+1
| |/
* | Connect keyring controller to address book to prevent additional duplicates.Kevin Serrano2017-03-111-5/+5
| |
* | Allow for adding recently used addresses to address book.Kevin Serrano2017-03-101-0/+4
| |
* | Create persistence address book.Kevin Serrano2017-03-101-0/+11
|/
* Nodeify and promisify calls to background.Kevin Serrano2017-03-091-2/+4
|
* Refactor of code into separate reducers and actions.Kevin Serrano2017-03-081-4/+13
|
* Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-081-4/+4
|\
| * Fix issue where old txMeta object was being used to pass the txHash to the cbFrankie2017-03-071-4/+4
| |
* | More conflict resolution.Kevin Serrano2017-03-021-3/+3
|\ \
| * | add controllers to root scripts folderDan Finlay2017-02-281-3/+3
| | |
| * | Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-281-19/+101
| |\ \
* | \ \ Fix merge conflicts.Kevin Serrano2017-03-021-31/+112
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add a couple more debug logsDan Finlay2017-03-011-0/+1
| | |
| * | Use correct action to update and submit txDan Finlay2017-03-011-0/+1
| | |
| * | Remove gasMultiplier txMeta paramDan Finlay2017-03-011-10/+0
| | | | | | | | | | | | | | | | | | 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.
| * | Add background method for updating and approving a tx in one callDan Finlay2017-02-281-2/+9
| |/
| * Removed redundant personal_recover logicDan Finlay2017-02-251-7/+0
| |
| * Mostly fix personal_recoverDan Finlay2017-02-251-0/+1
| |
| * Fix cancel msg signing behavior.Dan Finlay2017-02-241-6/+25
| |
| * Got personal_sign workingDan Finlay2017-02-241-19/+36
| | | | | | | | Also fixed bug where signing would not close popup.
| * Add personal sign actions and templateDan Finlay2017-02-231-0/+5
| |
| * Allow provider to init before keyringControllerDan Finlay2017-02-221-2/+6
| |
| * Point metamask-controller personalSignRecover method to keyring-controllerDan Finlay2017-02-221-9/+5
| |
| * Move sigUtil and keyrings to external modulesDan Finlay2017-02-221-1/+48
| | | | | | | | 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.
* | Tested against code to play nice with unit tests.Kevin Serrano2017-02-241-1/+1
| |
* | Fix namingKevin Serrano2017-02-221-1/+1
| |
* | Basic infrasture for RPC list added.Kevin Serrano2017-02-221-0/+1
|/
* Merge branch 'dev' into disclaimer-notifyKevin Serrano2017-02-101-1/+2
|\
| * Allowed net_version to be called synchronouslyKevin Serrano2017-02-091-1/+2
| |
* | Delete all code related to disclaimers.Kevin Serrano2017-02-101-48/+0
|/
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-041-3/+12
| | | | Rendering the list is still having issues, so this isn't done yet.
* id mgmt - update to latest eth_sign speckumavis2017-02-041-16/+16
|
* metamask - add missing diskState and memState subscriptionskumavis2017-02-031-6/+11
|
* migration #9 - break out CurrencyController substatekumavis2017-02-031-25/+22
|
* migration #8 - break out NoticeController substatekumavis2017-02-031-2/+2
|
* eth-store - convert to obs-store subclasskumavis2017-02-031-2/+5
|
* txManager - depend on preferencesStorekumavis2017-02-031-1/+1
|
* metamask - introduce networkStorekumavis2017-02-031-28/+40
|
* migration 7 - break off TransactionManager substatekumavis2017-02-031-9/+12
|
* messageManager - move view state to obs-storekumavis2017-02-031-6/+8
|
* keyring - replace getState with memStorekumavis2017-02-031-1/+1
|
* keyring - rm config depkumavis2017-02-031-2/+2
|
* metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ↵kumavis2017-02-021-0/+1
| | | | controller
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-23/+28
|\
| * metamask - adopt isInitialized from keyring controllerkumavis2017-02-011-1/+8
| |
| * metamask - inherit some configManager state from keyring controllerkumavis2017-02-011-0/+3
| |
| * keyring - synchronous getStatekumavis2017-02-011-22/+16
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-10/+24
|\|
| * inpage - set web3.eth.defaultAccount correctlykumavis2017-01-311-1/+1
| |
| * continue rename selectedAccount to selectedAddresskumavis2017-01-311-4/+4
| |
| * rename selectedAccount to selectedAddresskumavis2017-01-311-4/+6
| |
| * metamask - rename getSelectedAccount to getSelectedAddresskumavis2017-01-311-3/+3
| |
| * metamask - move selectedAccount set/get to preferencesControllerkumavis2017-01-311-9/+12
| |
| * preferences - introduce preferences controllerkumavis2017-01-311-0/+9
| |
* | code clan up and testsFrankie2017-02-021-16/+18
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-301-4/+4
|\|
| * metamask - lookup selectedAccount via keyringControllerkumavis2017-01-301-3/+3
| |
| * public config - get selectedAccount from keyring controller substatekumavis2017-01-301-1/+1
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-291-122/+135
|\|
| * metamask - subscribe metamask store to keyringController substatekumavis2017-01-291-0/+3
| |
| * keyring - add and initialize obs-storekumavis2017-01-291-1/+3
| |
| * metamask - adopt shapeshift txs from keyringControllerkumavis2017-01-281-1/+3
| |
| * metamask - organize methodskumavis2017-01-281-120/+126
| |
* | Clean up message manger includes:Frankie2017-01-291-24/+38
|/ | | | | | | | | 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
* metamask - fix setupProviderConnectionkumavis2017-01-271-1/+1
|
* 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-271-2/+31
|
* metamask controller - adopt clearSeedWords from keyring controllerkumavis2017-01-271-4/+9
|
* background - graceful publicConfigStore connection teardownkumavis2017-01-271-1/+3
|
* background - organize metamask instantiationkumavis2017-01-271-34/+35
|
* obs-store - use published modulekumavis2017-01-251-12/+17
|
* Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2kumavis2017-01-251-2/+20
|\
| * Merge branch 'dev' into i#1048kumavis2017-01-251-0/+11
| |\
| * | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-251-1/+10
| | |
| * | Move the assumption of their only being one hd keyring when requesting seed ↵Frankie2017-01-251-1/+5
| | | | | | | | | | | | words to metamaskController
| * | Fix issue where generating a new account would put it in loose keysFrankie2017-01-251-1/+6
| | |
* | | Merge branch 'dev' into obs-store2kumavis2017-01-221-36/+38
|\ \ \ | | |/ | |/|
| * | Added new modular private key import systemDan Finlay2017-01-191-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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!
| * Allow importing of private key stringsDan Finlay2017-01-181-1/+6
| | | | | | | | | | | | | | | | 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`.
| * background - return txHash to provider-engine on donekumavis2017-01-151-14/+10
| |
| * Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-01-141-0/+1
| |\ | | | | | | | | | bug-submitTx
| | * Merge branch 'dev' into bug-submitTxkumavis2017-01-141-0/+1
| | |\
| | | * Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-17/+6
| | | |\
| | | * | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | 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-131-34/+21
| | |/ | |/|
* | | background - move pojo migrator to outside of metamask controllerkumavis2017-01-121-3/+3
| | |
* | | background - introduce ObservableStorekumavis2017-01-121-25/+28
|/ /
* | rpc - fix sync account cache settingkumavis2017-01-111-17/+1
| |
* | web3 provider - override eth_syncing and web3_clientVersionkumavis2017-01-111-0/+5
|/
* Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-061-12/+18
|\
| * Merge branch 'dev' into fixTxManagerDan Finlay2017-01-061-1/+1
| |\
| * | Combine two identical then blocksDan Finlay2017-01-061-4/+2
| | |
| * | remove unnecessary try statmentsFrankie2017-01-051-2/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-11 05:59:53 +0800