aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-081-0/+14
|\
| * Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-071-1/+14
| |\
| * \ Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-051-1/+24
| |\ \
| * \ \ Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e...Dan2018-06-011-17/+18
| |\ \ \
| * | | | Auto update gas estimate when to changes.Dan2018-05-311-0/+14
* | | | | lint - remove unused requirekumavis2018-06-071-1/+0
* | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-071-1/+38
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | diagnostics - fix reportMultipleKeyrings callkumavis2018-06-061-1/+1
| * | | | diagnostics - minor fixeskumavis2018-06-061-2/+2
| * | | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-061-29/+9
| * | | | add multivault detection to diagnostics reportingkumavis2018-06-061-0/+33
| | |_|/ | |/| |
| * | | Add first time info to bug reportDan Finlay2018-06-051-0/+1
| * | | Add identity synchronizing codeDan Finlay2018-06-051-1/+17
| * | | metamask-controller - clear account labels on restore from seed phrasekumavis2018-06-041-0/+4
| * | | metamask - update preferences controller identities on keyring controller updatekumavis2018-06-041-0/+2
| | |/ | |/|
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-ma...kumavis2018-05-301-7/+8
| |\ \
| | * | cleanErrorStack moved to separate library moduleAnton2018-05-291-7/+8
| * | | metamask-controller - lint fixkumavis2018-05-291-1/+1
| * | | metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
| | |/ | |/|
* | | metamask-controller - lint fixkumavis2018-05-291-1/+1
* | | metamask-controller - update preferences controller addresses after import ac...kumavis2018-05-291-10/+10
* | | metamask-controller - wrap txController.addUnapprovedTx for wallet middleware...kumavis2018-05-251-1/+13
* | | provider - update wallet hooks for new wallet middlewarekumavis2018-05-251-60/+17
* | | metamask-controller - fix account lookup hookkumavis2018-05-251-2/+2
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-231-11/+16
|\| |
| * | Reveal get filtered tx list (#4332)Frankie2018-05-221-1/+1
| * | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-171-8/+12
| * | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-171-1/+2
| * | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-171-1/+1
* | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-171-3/+4
|/ /
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-171-0/+1
|\ \
| * | transactions - add a nonce check utility for ui usefrankiebee2018-05-021-0/+1
| |/
* / network - remove setNetworkEndpointskumavis2018-05-011-1/+0
|/
* Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-011-2/+0
|\
| * Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-221-2/+0
* | Linted docsDan Finlay2018-04-241-1/+1
* | Linted jsdocsDan Finlay2018-04-211-52/+60
* | Added docs to MM-controllerDan Finlay2018-04-191-130/+321
|/
* Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-191-0/+2
* Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-171-0/+1
|\
| * Require loglevel singleton in each module that uses itbitpshr2018-04-141-0/+1
* | Disable token price polling when no client is activebitpshr2018-04-171-0/+9
* | Maintain token prices using a background servicebitpshr2018-04-161-0/+7
|/
* Add ComposableObservableStore for subscription managementbitpshr2018-04-131-70/+36
* transactions - put the origing on the txMeta to help with debuggingfrankiebee2018-03-311-2/+5
* Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountResetkumavis2018-03-281-34/+39
|\
| * metamask-controller - fix typokumavis2018-03-281-1/+1
| * Fix bug where resetAccount does not clear network cacheDan Finlay2018-03-281-34/+39
* | Undo unnecessary line removals.Dan2018-03-271-0/+1
* | Use extension api to get initial locale.Dan2018-03-221-1/+1
* | Merge branch 'master' into i18n-translator-reduxDan2018-03-221-245/+354
|\|
| * moves setup-related code towads end of file, re #3568Lazaridis2018-03-171-115/+124
| * add ESLint exceptions for //= and //-, re #3568Lazaridis2018-03-161-3/+3
| * group all vault/keyring related methods together, re #3568Lazaridis2018-03-161-128/+130
| * adds initial documentation, re #3568Lazaridis2018-03-161-40/+138
* | Handle i18n with redux.Dan2018-03-161-0/+10
|/
* modify verifySeedPhrase to async and call it from addNewAccount alsoCsaba Solya2018-03-061-32/+34
* add documentationCsaba Solya2018-03-041-0/+4
* verify seedwords on log inCsaba Solya2018-03-041-3/+16
* fix lint issuesCsaba Solya2018-03-031-2/+2
* seed phrase verifierCsaba Solya2018-03-031-2/+18
* 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
|/ /
* | 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
| * 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 s...Dan2017-12-211-1/+1
| | * 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
* | | | | | | 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
* | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
|/ / / / / /
* | | | | | Add Recent Blocks controllerDan Finlay2017-12-181-14/+25
* | | | | | 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
|\ \ \ \ \ \
| * | | | | | LintedDan Finlay2017-11-291-1/+1
| * | | | | | Add seed phrase bounty award noticeDan Finlay2017-11-291-1/+0
| * | | | | | 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
* | | | | | | deps - obs-store@3 + migrate stream plumbingkumavis2017-11-291-1/+2
|/ / / / / /
* | | | | | Prevent creation of multiple vaultsDan Finlay2017-11-211-31/+20
* | | | | | Add reproduction and mutex codeDan Finlay2017-11-211-2/+37
| |_|_|_|/ |/| | | |
* | | | | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-061-1/+1
| |_|_|/ |/| | |
* | | | 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
* | | | 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
* | | | Promisify metamask-controller vault creating methodsDan Finlay2017-10-181-17/+10
* | | | Select first account when restoring seedDan Finlay2017-10-181-3/+17
* | | | 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
* | | 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 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
| |/
* / 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 BreakOut...kumavis2017-09-271-7/+4
| |\
| | * 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
| | * | 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 KeyringControll...Dan Finlay2017-09-221-1/+2
| |/ /
* / / 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
|\
| * 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
|/
* 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
| |\
| | * Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-201-1/+6
| | |\
| | * | Add ability to add tokens to token listDan Finlay2017-06-161-0/+1
* | | | 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 network status to our UI state.Kevin Serrano2017-06-231-1/+14
| * | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-201-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Persist selected account tabDan Finlay2017-06-151-0/+1
* | | 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
| | |/
| * / 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
|\
| * 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 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
| * | 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
| * 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
* | 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
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 10:06:29 +0800