Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Get popup appearing when suggesting new token | Dan Finlay | 2018-06-19 | 1 | -0/+1 |
| | |||||
* | Begin adding eth_watchToken | Dan Finlay | 2018-06-19 | 1 | -0/+1 |
| | |||||
* | Merge pull request #4571 from MetaMask/disable-diagnostics | Dan Finlay | 2018-06-15 | 1 | -8/+0 |
|\ | | | | | diagnostics - temporarily disable | ||||
| * | diagnostics - temporarily disable | kumavis | 2018-06-14 | 1 | -8/+0 |
| | | |||||
* | | notices - replace getLatestNotice with getNextNotice | kumavis | 2018-06-14 | 1 | -3/+0 |
|/ | |||||
* | metamask - ensure all nonce locks are released | kumavis | 2018-06-13 | 1 | -12/+8 |
| | |||||
* | Merge pull request #4523 from MetaMask/i4462-FixResetBug | Dan Finlay | 2018-06-08 | 1 | -4/+1 |
|\ | | | | | Fix bug where reset account would not work. | ||||
| * | Fix bug where reset account would not work. | Dan Finlay | 2018-06-07 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes #4462 Ensures that resetAccount() can work on non-stock providers. I'm unclear how this was ever working, this code hasn't moved in months, but users report it recently breaking. Maybe we only recently pushed it to prod. | ||||
* | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-07 | 1 | -1/+14 |
|\| | |||||
| * | diagnostics - fix reportMultipleKeyrings call | kumavis | 2018-06-06 | 1 | -1/+1 |
| | | |||||
| * | diagnostics - minor fixes | kumavis | 2018-06-06 | 1 | -2/+2 |
| | | |||||
| * | diagnostics - rewrite bug-notifier as diagnostics-reporter | kumavis | 2018-06-06 | 1 | -29/+9 |
| | | |||||
| * | add multivault detection to diagnostics reporting | kumavis | 2018-06-06 | 1 | -0/+33 |
| | | |||||
* | | Merge branch 'develop' into i3725-refactor-send-component- | Dan | 2018-06-05 | 1 | -1/+24 |
|\| | |||||
| * | Add first time info to bug report | Dan Finlay | 2018-06-05 | 1 | -0/+1 |
| | | |||||
| * | Add identity synchronizing code | Dan Finlay | 2018-06-05 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | Addresses #4475, where entries in the identities object do not necessarily have corresponding accounts in the vault. On password submission, this change passes known accounts to the preferencesController (responsible for nickname management), and removes unknown entries. Includes "TODO" notes for where we could log the issue to sentry or notify the user. | ||||
| * | metamask-controller - clear account labels on restore from seed phrase | kumavis | 2018-06-04 | 1 | -0/+4 |
| | | |||||
| * | metamask - update preferences controller identities on keyring controller update | kumavis | 2018-06-04 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'i3725-refactor-send-component-' into ↵ | Dan | 2018-06-01 | 1 | -17/+18 |
|\| | | | | | | | i3914-fix-newui-send-gas-estimation | ||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-30 | 1 | -7/+8 |
| |\ | | | | | | | | | | merge-master | ||||
| | * | cleanErrorStack moved to separate library module | Anton | 2018-05-29 | 1 | -7/+8 |
| | | | | | | | | | | | | more errors traces cleaned up | ||||
| * | | metamask-controller - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| | | | |||||
| * | | metamask-controller - update preferences controller addresses after import ↵ | kumavis | 2018-05-29 | 1 | -10/+10 |
| | | | | | | | | | | | | account | ||||
* | | | Auto update gas estimate when to changes. | Dan | 2018-05-31 | 1 | -0/+14 |
|/ / | |||||
* | | Reveal get filtered tx list (#4332) | Frankie | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | | | | | * add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken) | ||||
* | | Add PreferencesController#setAddresses to update ids | Whymarrh Whitby | 2018-05-17 | 1 | -8/+12 |
| | | |||||
* | | Update AddressBookController to read from preferences store | Whymarrh Whitby | 2018-05-17 | 1 | -1/+2 |
| | | |||||
* | | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 1 | -0/+1 |
|\ \ | | | | | | | | | | network-controller-remove-setNetworkEndpoints | ||||
| * | | transactions - add a nonce check utility for ui use | frankiebee | 2018-05-02 | 1 | -0/+1 |
| |/ | |||||
* / | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 1 | -2/+0 |
|\ | | | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow. | ||||
| * | Revert "Fix UI getting stuck in Reveal Seed screen" | Alexander Tseung | 2018-04-22 | 1 | -2/+0 |
| | | | | | | | | This reverts commit 2c8156ebe91941309d49e8f8f1ed8e9d740bb9de. | ||||
* | | Linted docs | Dan Finlay | 2018-04-24 | 1 | -1/+1 |
| | | |||||
* | | Linted jsdocs | Dan Finlay | 2018-04-21 | 1 | -52/+60 |
| | | |||||
* | | Added docs to MM-controller | Dan Finlay | 2018-04-19 | 1 | -130/+321 |
|/ | |||||
* | Fix UI getting stuck in Reveal Seed screen | Alexander Tseung | 2018-04-19 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into i3981-contract-rates | Dan Finlay | 2018-04-17 | 1 | -0/+1 |
|\ | |||||
| * | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 1 | -0/+1 |
| | | |||||
* | | Disable token price polling when no client is active | bitpshr | 2018-04-17 | 1 | -0/+9 |
| | | |||||
* | | Maintain token prices using a background service | bitpshr | 2018-04-16 | 1 | -0/+7 |
|/ | |||||
* | Add ComposableObservableStore for subscription management | bitpshr | 2018-04-13 | 1 | -70/+36 |
| | |||||
* | transactions - put the origing on the txMeta to help with debugging | frankiebee | 2018-03-31 | 1 | -2/+5 |
| | |||||
* | Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset | kumavis | 2018-03-28 | 1 | -34/+39 |
|\ | | | | | Fix bug where resetAccount does not clear network cache | ||||
| * | metamask-controller - fix typo | kumavis | 2018-03-28 | 1 | -1/+1 |
| | | |||||
| * | Fix bug where resetAccount does not clear network cache | Dan Finlay | 2018-03-28 | 1 | -34/+39 |
| | | | | | | | | Fixes #3439 | ||||
* | | Undo unnecessary line removals. | Dan | 2018-03-27 | 1 | -0/+1 |
| | | |||||
* | | Use extension api to get initial locale. | Dan | 2018-03-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into i18n-translator-redux | Dan | 2018-03-22 | 1 | -245/+354 |
|\| | |||||
| * | moves setup-related code towads end of file, re #3568 | Lazaridis | 2018-03-17 | 1 | -115/+124 |
| | | |||||
| * | add ESLint exceptions for //= and //-, re #3568 | Lazaridis | 2018-03-16 | 1 | -3/+3 |
| | | |||||
| * | group all vault/keyring related methods together, re #3568 | Lazaridis | 2018-03-16 | 1 | -128/+130 |
| | | |||||
| * | adds initial documentation, re #3568 | Lazaridis | 2018-03-16 | 1 | -40/+138 |
| | | |||||
* | | Handle i18n with redux. | Dan | 2018-03-16 | 1 | -0/+10 |
|/ | |||||
* | modify verifySeedPhrase to async and call it from addNewAccount also | Csaba Solya | 2018-03-06 | 1 | -32/+34 |
| | |||||
* | add documentation | Csaba Solya | 2018-03-04 | 1 | -0/+4 |
| | |||||
* | verify seedwords on log in | Csaba Solya | 2018-03-04 | 1 | -3/+16 |
| | |||||
* | fix lint issues | Csaba Solya | 2018-03-03 | 1 | -2/+2 |
| | |||||
* | seed phrase verifier | Csaba Solya | 2018-03-03 | 1 | -2/+18 |
| | |||||
* | Merge branch 'master' into uat-master | Dan Finlay | 2018-02-22 | 1 | -1/+1 |
|\ | |||||
| * | use the providers initial _blocktracker. fixes #2393 | Lazaridis | 2018-02-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 1 | -9/+12 |
|\ \ | |||||
| * | | Merge branch 'master' into uat | Dan | 2018-02-08 | 1 | -9/+12 |
| |\| | |||||
| | * | Merge branch 'master' into localStorage-clean-up | Frankie | 2018-02-01 | 1 | -0/+8 |
| | |\ | |||||
| | | * | wipe only transactions for current account | Bruno Barbieri | 2018-01-31 | 1 | -4/+4 |
| | | | | |||||
| | | * | added reset account feature | Bruno Barbieri | 2018-01-31 | 1 | -0/+8 |
| | | | | |||||
| | * | | remove RecentBlocks from disk | frankiebee | 2018-02-01 | 1 | -3/+1 |
| | | | | |||||
| | * | | remove BlacklistController from disk state | frankiebee | 2018-01-31 | 1 | -6/+1 |
| | |/ | |||||
| | * | Bump limit for event emitter warning. | Kevin Serrano | 2018-01-26 | 1 | -0/+2 |
| | | | |||||
* | | | [NewUI] Opens to full screen when restoring from seed. (#3201) | Dan J Miller | 2018-02-08 | 1 | -0/+15 |
|/ / | | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call. | ||||
* | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 1 | -0/+14 |
|\ \ | |/ |/| | |||||
| * | Track usage of old and new UI (#2794) | Alexander Tseung | 2017-12-23 | 1 | -0/+1 |
| | | | | | | [NewUI] Track usage of old and new UI | ||||
| * | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 1 | -0/+1 |
| |\ | |||||
| | * | Adds updateTransaction to background and used it to update after editing in ↵ | Dan | 2017-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | send-v2. | ||||
| | * | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 1 | -14/+34 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 1 | -5/+42 |
| |\ \ | |||||
| | * | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 1 | -5/+42 |
| | | | | |||||
| * | | | Add UI selection | Dan | 2017-12-05 | 1 | -0/+1 |
| |/ / | |||||
| * | | more eslint fixes | Jason Clark | 2017-11-26 | 1 | -1/+1 |
| | | | |||||
| * | | toggle wired up to preferences property store | Jason Clark | 2017-11-25 | 1 | -0/+10 |
| | | | |||||
| * | | Merge branch 'master' into merge-master | Chi Kei Chan | 2017-11-16 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-21 | 1 | -21/+38 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-04 | 1 | -20/+24 |
| | |\ \ \ \ | |||||
| | * | | | | | Enables remove token and ensures add/remove update the list without need for ↵ | Dan | 2017-10-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | refresh. | ||||
* | | | | | | | Prefer passing a provider over an ethQuery instance | Dan Finlay | 2018-01-13 | 1 | -6/+1 |
| | | | | | | | |||||
* | | | | | | | Improve gas price estimation by backfilling recent-blocks | Dan Finlay | 2018-01-12 | 1 | -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 blocks | Dan Finlay | 2018-01-09 | 1 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | Default gas estimate to 1 gwei for networks with no block activity | Dan Finlay | 2018-01-09 | 1 | -0/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfix | Kevin Serrano | 2018-01-09 | 1 | -4/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix condition where failing seed word checks would infinite-spin future attempts. | ||||
| * | | | | | | | Add fix for infinite spinner for incorrect seed phrase. | Kevin Serrano | 2018-01-04 | 1 | -4/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Fix feature to work | Dan Finlay | 2018-01-06 | 1 | -2/+9 |
| | | | | | | | |||||
* | | | | | | | Linted | Dan Finlay | 2018-01-06 | 1 | -3/+0 |
| | | | | | | | |||||
* | | | | | | | Derive gas price estimate from previous transactions | Dan Finlay | 2018-01-06 | 1 | -1/+20 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Return the 50th percentile lowest gas price of the previous 20 blocks. | ||||
* | | | | | | Add Recent Blocks controller | Dan Finlay | 2017-12-18 | 1 | -14/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracks recent blocks, useful for estimating recent successful gas prices. | ||||
* | | | | | | Fix retry action | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| | | | | | | |||||
* | | | | | | Add retry background method and action | Dan Finlay | 2017-12-07 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1 | Thomas Huang | 2017-11-30 | 1 | -1/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Versioned notices | ||||
| * | | | | | | Linted | Dan Finlay | 2017-11-29 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add seed phrase bounty award notice | Dan Finlay | 2017-11-29 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only shows to people who installed before or equal to MetaMask 3.12.1 | ||||
| * | | | | | | Get notice version filtering working nicely | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add firstVersion field to notices selector | Dan Finlay | 2017-11-29 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add optional version field to notices | Dan Finlay | 2017-11-29 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows notices to only show to users who are on a certain version. | ||||
* | | | | | | | deps - obs-store@3 + migrate stream plumbing | kumavis | 2017-11-29 | 1 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | Prevent creation of multiple vaults | Dan Finlay | 2017-11-21 | 1 | -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 code | Dan Finlay | 2017-11-21 | 1 | -2/+37 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 1 | -1/+1 |
| |_|_|/ |/| | | | | | | | | | | | This typo tripped me up when I was reading through the code and trying to understand what's going on. | ||||
* | | | | Linted | Dan Finlay | 2017-10-20 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fix bug where new account was not immediately selected | Dan Finlay | 2017-10-20 | 1 | -3/+14 |
| | | | | |||||
* | | | | Remove account-tracker from keyringController | Dan Finlay | 2017-10-19 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-19 | 1 | -35/+33 |
|\| | | | |||||
| * | | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 1 | -35/+33 |
| | | | | |||||
* | | | | Make account tracking much more reactive | Dan Finlay | 2017-10-19 | 1 | -9/+5 |
| | | | | |||||
* | | | | Make account tracking more reactive | Dan Finlay | 2017-10-19 | 1 | -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 vault | Dan Finlay | 2017-10-19 | 1 | -1/+2 |
| | | | | |||||
* | | | | Stop tracking old account balances after restore vault | Dan Finlay | 2017-10-19 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | Per @kgserrano note | ||||
* | | | | Promisify metamask-controller vault creating methods | Dan Finlay | 2017-10-18 | 1 | -17/+10 |
| | | | | |||||
* | | | | Select first account when restoring seed | Dan Finlay | 2017-10-18 | 1 | -3/+17 |
| | | | | | | | | | | | | | | | | Fixes #2348 | ||||
* | | | | Select first account on new vault creation | Dan Finlay | 2017-10-18 | 1 | -1/+12 |
|/ / / | |||||
* | | | lint fixes | kumavis | 2017-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | network controller - refactor to use eth-rpc-client | kumavis | 2017-10-11 | 1 | -3/+4 |
| | | | |||||
* | | | metamask controller - define this.newTransaction to ease instantiation order | kumavis | 2017-10-11 | 1 | -1/+6 |
| | | | |||||
* | | | metamask controller - simplify provider init | kumavis | 2017-10-11 | 1 | -22/+16 |
| | | | |||||
* | | | metamask controller - breakout getAccounts method | kumavis | 2017-10-11 | 1 | -12/+14 |
| | | | |||||
* | | | Add signTypedData input validations | Dan Finlay | 2017-10-06 | 1 | -4/+9 |
| | | | |||||
* | | | Merge branch 'master' into SignTypedData | Dan Finlay | 2017-10-06 | 1 | -1/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | Don't pass origin as an HTTP header | Adam Novak | 2017-10-02 | 1 | -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 Ukustov | 2017-10-03 | 1 | -19/+24 |
|\| | | |||||
| * | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions | kumavis | 2017-09-30 | 1 | -1/+0 |
| |\ \ | | | | | | | | | pending-tx - dont check the balance to rebrodcast | ||||
| | * | | pending-tx - dont check the balance to rebrodcast | frankiebee | 2017-09-30 | 1 | -1/+0 |
| | | | | |||||
| * | | | network - convert localhost from custom rpc to network type | kumavis | 2017-09-30 | 1 | -7/+0 |
| | | | | |||||
| * | | | network controller - small refactor | kumavis | 2017-09-30 | 1 | -17/+21 |
| |/ / | |||||
| * / | Ensure selected account is always set if possible | Dan Finlay | 2017-09-30 | 1 | -0/+9 |
| |/ | | | | | | | | | | | Fixes #2218 Subscribes to keyringController, and if only one account exists, sets it as selected. | ||||
* / | Add eth_signTypedData handler | Sergey Ukustov | 2017-09-30 | 1 | -0/+52 |
|/ | |||||
* | metamask - improve comment | kumavis | 2017-09-28 | 1 | -2/+1 |
| | |||||
* | Merge branch 'master' into filter-fixes-moar | Dan Finlay | 2017-09-28 | 1 | -8/+30 |
|\ | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-09-27 | 1 | -7/+4 |
| |\ | | | | | | | | | | BreakOutKeyringController | ||||
| | * | Remove duplicate instantiation of account-tracker | Dan Finlay | 2017-09-27 | 1 | -5/+1 |
| | | | |||||
| | * | Move obs store into account-tracker instead of inheriting | Dan Finlay | 2017-09-27 | 1 | -2/+2 |
| | | | |||||
| | * | Pass blocktracker to balances controller | Dan Finlay | 2017-09-27 | 1 | -0/+1 |
| | | | |||||
| | * | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 1 | -0/+1 |
| | |\ | |||||
| * | | | Remove keyring controller from project | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'AddBalanceController' into BreakOutKeyringController | Dan Finlay | 2017-09-23 | 1 | -6/+30 |
| |\| | | | |/ | |/| | |||||
| | * | Fix accont-tracker merge bug | Dan Finlay | 2017-09-23 | 1 | -0/+4 |
| | | | |||||
| | * | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-23 | 1 | -31/+58 |
| | |\ | |||||
| | * | | Fix computed-balances controller reference | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Refactor eth-store into account-tracker | Dan Finlay | 2017-09-23 | 1 | -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 view | Dan Finlay | 2017-09-14 | 1 | -0/+4 |
| | | | | |||||
| | * | | Got pending balance updating correctly | Dan Finlay | 2017-09-14 | 1 | -0/+4 |
| | | | | |||||
| | * | | Some progress | Dan Finlay | 2017-09-13 | 1 | -1/+7 |
| | | | | |||||
| * | | | Define encryptor in constructor params instead of platform object | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into ConfigurableEncryption | Dan Finlay | 2017-09-22 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| * / | | Allow custom encryptor to be passed to MetaMaskController and ↵ | Dan Finlay | 2017-09-22 | 1 | -1/+2 |
| |/ / | | | | | | | | | | KeyringControllers. | ||||
* / / | metamask - use provider-engines block tracker | kumavis | 2017-09-23 | 1 | -1/+1 |
|/ / | |||||
* | | metamask controller - destroy filter polyfill on disconnect | kumavis | 2017-09-14 | 1 | -4/+10 |
| | | |||||
* | | metamask controller - move middleware into seperate files | kumavis | 2017-09-14 | 1 | -34/+7 |
| | | |||||
* | | debug - prefer logger over console | kumavis | 2017-09-14 | 1 | -5/+5 |
| | | |||||
* | | metamask cont - standardize multiplex stream naming | kumavis | 2017-09-14 | 1 | -8/+8 |
| | | |||||
* | | metamask - add jsonrpc filter middleware on per-connection engine | kumavis | 2017-09-08 | 1 | -2/+8 |
| | | |||||
* | | streams - use pump and published obj-multiplex | kumavis | 2017-09-08 | 1 | -7/+27 |
| | | |||||
* | | inpage - use json-rpc-engine for inpage-provider | kumavis | 2017-08-25 | 1 | -10/+32 |
|/ | |||||
* | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 1 | -26/+4 |
|\ | | | | | Transaction controller refractor part 1: promises for everyone and more tests! | ||||
| * | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 1 | -21/+2 |
| | | |||||
| * | lint fixes | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | | |||||
| * | fix spelling mistake | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | | |||||
| * | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 1 | -16/+13 |
| | | |||||
* | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 1 | -10/+9 |
| | | |||||
* | | phishing detection - move phishing detection into contentscript and metamask ↵ | kumavis | 2017-08-03 | 1 | -2/+24 |
|/ | | | | controller | ||||
* | turn off auto faucet and remove file | frankiebee | 2017-07-18 | 1 | -4/+0 |
| | |||||
* | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-13 | 1 | -1/+1 |
|\ | |||||
| * | metamask - on rpc err show whole error body | kumavis | 2017-07-12 | 1 | -1/+1 |
| | | |||||
* | | use new nodeify | frankiebee | 2017-07-13 | 1 | -23/+15 |
| | | |||||
* | | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 1 | -2/+10 |
|\| | |||||
| * | metamask - append dapp origin domain to rpc request | kumavis | 2017-07-05 | 1 | -2/+9 |
| | | |||||
| * | Merge pull request #1620 from MetaMask/i1616-AddTokenAdding | Thomas Huang | 2017-06-29 | 1 | -0/+1 |
| |\ | | | | | | | Add ability to add tokens to token list | ||||
| | * | Merge branch 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 1 | -1/+6 |
| | |\ | |||||
| | * | | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Fiex #1616 | ||||
* | | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-28 | 1 | -1/+15 |
|\| | | | |||||
| * | | | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 1 | -1/+14 |
| |\ \ \ | | |_|/ | |/| | | Add Infura Status Information to UI State | ||||
| | * | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 1 | -1/+14 |
| | | | | |||||
| * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-06-20 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | AddTokenList | ||||
| | * | Persist selected account tab | Dan Finlay | 2017-06-15 | 1 | -0/+1 |
| | | | | | | | | | | | | Also improve error handling with token balances. | ||||
* | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-17 | 1 | -1/+6 |
|\| | | |||||
| * | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-17 | 1 | -1/+5 |
| |\ \ | |||||
| | * | | Debounce background updates | Dan Finlay | 2017-06-16 | 1 | -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 tx | frankiebee | 2017-06-16 | 1 | -0/+1 |
| |/ | |||||
* / | transaction controller - use nonce-tracker | kumavis | 2017-06-15 | 1 | -1/+1 |
|/ | |||||
* | include ethQuery in txController | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | |||||
* | Fix for tests | frankiebee | 2017-05-24 | 1 | -2/+1 |
| | |||||
* | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 1 | -37/+5 |
| | |||||
* | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 1 | -16/+16 |
|\ | |||||
| * | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 1 | -16/+16 |
| | | |||||
* | | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 1 | -72/+52 |
|/ | |||||
* | metamask - publicConfig - fix init state | kumavis | 2017-05-05 | 1 | -1/+1 |
| | |||||
* | metamask - selected accounts - dont reveal when locked | kumavis | 2017-05-05 | 1 | -15/+17 |
| | |||||
* | Use loglevel for more logs | Dan Finlay | 2017-05-01 | 1 | -9/+3 |
| | |||||
* | Fix linting warnings | Thomas Huang | 2017-04-27 | 1 | -39/+38 |
| | |||||
* | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 1 | -17/+2 |
| | |||||
* | Merge pull request #1307 from MetaMask/mascara | kumavis | 2017-04-05 | 1 | -1/+0 |
|\ | | | | | Proof of Concept: Mascara | ||||
| * | clean - metamask controller - remove log | kumavis | 2017-04-05 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 1 | -6/+8 |
| |\ | |||||
| * | | WIP: lost enital call from dapp to getAccounts | frankiebee | 2017-03-30 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into mascara | frankiebee | 2017-03-29 | 1 | -1/+5 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into mascara | frankiebee | 2017-03-24 | 1 | -38/+17 |
| |\ \ \ | |||||
| * | | | | WIP: streams->indexdb | frankiebee | 2017-03-24 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Fix faucet to only autoFaucet first account | frankiebee | 2017-04-05 | 1 | -0/+2 |
| |_|_|/ |/| | | | |||||
* | | | | introduce platform api and rename notifications to notification-manager | kumavis | 2017-03-31 | 1 | -6/+8 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1268 from MetaMask/kovan-faucet-instructions | Dan Finlay | 2017-03-29 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Add Kovan faucet instructions | ||||
| * | | | Add link to kovan faucet instructions. | Kevin Serrano | 2017-03-28 | 1 | -0/+4 |
| | |/ | |/| | |||||
* / | | Assure that seed words are placed into state tree upon request. | Kevin Serrano | 2017-03-28 | 1 | -1/+1 |
|/ / | |||||
* | | Remove eth-lightwallet | Dan Finlay | 2017-03-17 | 1 | -37/+1 |
| | | |||||
* | | Merge branch 'master' into i1165-predictive | Kevin Serrano | 2017-03-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | Rename variables to proper currency state variables. | Kevin Serrano | 2017-03-15 | 1 | -1/+1 |
| |/ | |||||
* | | Connect keyring controller to address book to prevent additional duplicates. | Kevin Serrano | 2017-03-11 | 1 | -5/+5 |
| | | |||||
* | | Allow for adding recently used addresses to address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+4 |
| | | |||||
* | | Create persistence address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+11 |
|/ | |||||
* | Nodeify and promisify calls to background. | Kevin Serrano | 2017-03-09 | 1 | -2/+4 |
| | |||||
* | Refactor of code into separate reducers and actions. | Kevin Serrano | 2017-03-08 | 1 | -4/+13 |
| | |||||
* | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 1 | -4/+4 |
|\ | |||||
| * | Fix issue where old txMeta object was being used to pass the txHash to the cb | Frankie | 2017-03-07 | 1 | -4/+4 |
| | | |||||
* | | More conflict resolution. | Kevin Serrano | 2017-03-02 | 1 | -3/+3 |
|\ \ | |||||
| * | | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 1 | -19/+101 |
| |\ \ | |||||
* | \ \ | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 1 | -31/+112 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Add a couple more debug logs | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| | | | |||||
| * | | Use correct action to update and submit tx | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| | | | |||||
| * | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 1 | -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 call | Dan Finlay | 2017-02-28 | 1 | -2/+9 |
| |/ | |||||
| * | Removed redundant personal_recover logic | Dan Finlay | 2017-02-25 | 1 | -7/+0 |
| | | |||||
| * | Mostly fix personal_recover | Dan Finlay | 2017-02-25 | 1 | -0/+1 |
| | | |||||
| * | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 1 | -6/+25 |
| | | |||||
| * | Got personal_sign working | Dan Finlay | 2017-02-24 | 1 | -19/+36 |
| | | | | | | | | Also fixed bug where signing would not close popup. | ||||
| * | Add personal sign actions and template | Dan Finlay | 2017-02-23 | 1 | -0/+5 |
| | | |||||
| * | Allow provider to init before keyringController | Dan Finlay | 2017-02-22 | 1 | -2/+6 |
| | | |||||
| * | Point metamask-controller personalSignRecover method to keyring-controller | Dan Finlay | 2017-02-22 | 1 | -9/+5 |
| | | |||||
| * | Move sigUtil and keyrings to external modules | Dan Finlay | 2017-02-22 | 1 | -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 Serrano | 2017-02-24 | 1 | -1/+1 |
| | | |||||
* | | Fix naming | Kevin Serrano | 2017-02-22 | 1 | -1/+1 |
| | | |||||
* | | Basic infrasture for RPC list added. | Kevin Serrano | 2017-02-22 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'dev' into disclaimer-notify | Kevin Serrano | 2017-02-10 | 1 | -1/+2 |
|\ | |||||
| * | Allowed net_version to be called synchronously | Kevin Serrano | 2017-02-09 | 1 | -1/+2 |
| | | |||||
* | | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 1 | -48/+0 |
|/ | |||||
* | Mostly got shapeshift tx management into its own controller | Dan Finlay | 2017-02-04 | 1 | -3/+12 |
| | | | | Rendering the list is still having issues, so this isn't done yet. | ||||
* | id mgmt - update to latest eth_sign spec | kumavis | 2017-02-04 | 1 | -16/+16 |
| | |||||
* | metamask - add missing diskState and memState subscriptions | kumavis | 2017-02-03 | 1 | -6/+11 |
| | |||||
* | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 1 | -25/+22 |
| | |||||
* | migration #8 - break out NoticeController substate | kumavis | 2017-02-03 | 1 | -2/+2 |
| | |||||
* | eth-store - convert to obs-store subclass | kumavis | 2017-02-03 | 1 | -2/+5 |
| | |||||
* | txManager - depend on preferencesStore | kumavis | 2017-02-03 | 1 | -1/+1 |
| |