aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Remove reload from Share Address button (#6991)Whymarrh Whitby2019-08-101-2/+0
| | | | | | * Update tooltip words for Share Address * Don't forceReload anything on Share Address
* Ensure seed phrase backup only shows up for new users (#6975)Dan J Miller2019-08-081-1/+1
|
* New notification fixes (#6955)Dan J Miller2019-08-031-4/+27
| | | | | | | | | | | | | | | | | | | | * Replace use of backup-notification with use of home notification * Pin notifications relative to window * Remove unneeded isRequired condition on some home.component properties * Refactor rendering of home notifications * UX for multiple notifications * Adds dismissal to provider request notification. * Fix test failures The e2e tests have been updated to reference `home-notification` classnames instead of the removed `background-notification`. The active tab proptypes and default values were updated as well.
* I5849 incremental account security (#6874)Dan J Miller2019-08-021-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | * Implements ability to defer seed phrase backup to later * Adds incremental-security.spec.js, including test dapp that sends signed tx with stand alone localhost provider * Update metamask-responsive-ui for incremental account security changes * Update backup-notification style and fix responsiveness of seed phrase screen * Remove uneeded files from send-eth-with-private-key-test/ * Apply linguist flags in .gitattributes for send-eth-with-private-key-test/ethereumjs-tx.js * Improve docs in controllers/onboarding.js * Clean up metamask-extension/test/e2e/send-eth-with-private-key-test/index.html * Remove unnecessary newlines in a couple first-time-flow/ files * Fix import of backup-notification in home.component * Fix git attrs file
* Default Privacy Mode to ON, allow force sharing address (#6904)Whymarrh Whitby2019-08-012-18/+64
|
* Enable indent linting via ESLint (#6936)Whymarrh Whitby2019-08-019-53/+53
| | | | | | * Enable indent linting via ESLint * yarn run lint:fix
* Remove `seedWords` completely from metamask state (#6920)Mark Stacey2019-07-261-9/+0
| | | | | | | | | | | | | | | | `seedWords` used to be stored on the metamask state temporarily at certain points. This hasn't been the case since #5994, but references to this state remained. All of the logic remained for correctly updating these `seedWords`, handling them during navigation, and scrubbing them from the state. However the state was never updated in practice. The `seedWords` are still returned by `verifySeedPhrase`, and they're still stored in component state in a few places. But they aren't ever set in the Redux metadata state or the Preferences controller. All references to this state have been removed, along with any logic for interacting with this state. A few unused actions were removed as well.
* Check balance before testing it w/ isZero (#6898)Whymarrh Whitby2019-07-241-1/+1
|
* Address resubmit bug (#6886)Dan Finlay2019-07-191-0/+12
| | | | | | | | | | | | * Add some notes * Add explanatory comment and TODO * Typo * Improve verbage * Remove contextual comment
* Version 6.7.2 gas limit fix (#6786)Dan J Miller2019-07-051-0/+18
| | | | | | | | | | | | | | | | | | | | | | * Introduce delay for eth_estimateGas calls with in test * Add test that fails when gas estimates of contract method calls without gas are too high. * Get transaction gas data from unApprovedTxs instead of confirmTransaction * Fix selection of gas data in gas-modal-page-container.container * Lint changes related to Version-6.7.2-gasLimitFix * Fix e2e tests on Version-6.7.2-gasLimitFix * Fix unit and integration tests for changes from Version-6.7.2-gasLimitFix * more e2e fixes * Add assertions for transaction values on confirm screen * Fix display of transaction amount on confirm screen.
* Remove UiMigrationAnnouncement and associated state (#6794)Whymarrh Whitby2019-07-041-9/+0
|
* Validate txParams in TransactionStateManager.addTx (#6713)Akshit Kr Nagpal2019-06-291-6/+20
| | | | | | | | * Normalize and Validate txParams in TransactionStateManager.addTx too * Added Tests * Updated normalizeAndValidateParams to return the new txParams
* transactions - always hexprefix txParams on update; fixes #6724frankiebee2019-06-192-8/+6
|
* feature: integrate gaba/CurrencyRateController (#6570)Paul Bouchon2019-06-012-206/+1
|
* transactions/deps - use broken out nonce-tracker module (#6555)Frankie2019-05-212-162/+1
|
* bugfix: show extension window if locked regardless of approvalbitpshr2019-05-161-1/+2
|
* drop transactions who's nonce is lower then the known network nonce but were ↵Frankie2019-05-162-8/+46
| | | | | | | | | | | | | | | | | | | | | | not included in a block (#6388) * transactions/pending - check nonce against the network and mark as dropped if not included in a block * transactions/pending - unifiy "dropped" txs * transactions/pending - test - fix for new expected behavior * fix comment * transactions/pending - clean up dropped event * fix spelling Co-Authored-By: frankiebee <frankie.diamond@gmail.com> * nit fix * test/tx-pending - clarify test description
* feature: integrate gaba/ShapeShiftController (#6569)Paul Bouchon2019-05-151-180/+0
|
* Set a default value for code in _determineTransactionCategory (#6604)Dan J Miller2019-05-152-13/+13
| | | | | | | | | | * Set a default value for code in _determineTransactionCategory * Adds e2e tests that fail when token txs without gas param are not properly handled. * Adds unit tests for _determineTransactionCategory * Base error throwing and simple gas setting in estimateTxGas on transactionCategory
* Update auto-logout to recognize idle time in background (#6593)Whymarrh Whitby2019-05-141-0/+73
| | | | | | * Fix wording of autoLogoutTimeLimitDescription * AppStateController and update auto-logout functionality
* Merge pull request #6568 from MetaMask/feature/gaba-phishing-controllerThomas Huang2019-05-111-136/+0
|\ | | | | feature: integrate gaba/PhishingController
| * feature: integrate gaba/PhishingControllerbitpshr2019-05-091-136/+0
| |
* | New settings custom rpc form (#6490)Dan J Miller2019-05-102-17/+18
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add networks tab to settings, with header. * Adds network list to settings network tab. * Adds form to settings networks tab and connects it to network list. * Network tab: form adding and editing working * Settings network form properly handles input errors * Add translations for settings network form * Clean up styles of settings network tab. * Add popup-view styles and behaviour to settings network tab. * Fix save button on settings network form * Adds 'Add Network' button and addMode to settings networks tab * Lint fix for settings networks tab addition * Fix navigation in settings networks tab. * Editing an rpcurl in networks tab does not create new network, just changes rpc of old * Fix layout of settings tabs other than network * Networks dropdown 'Custom Rpc' item links to networks tab in settings. * Update settings sidebar networks subheader. * Make networks tab buttons width consistent with input widths in extension view. * Fix settings screen subheader height in popup view * Fix height of add networks button in popup view * Add optional label to chainId and symbol form labels in networks setting tab * Style fixes for networks tab headers * Add ability to customize block explorer used by custom rpc * Stylistic improvements+fixes to custom rpc form. * Hide cancel button. * Highlight and show network form of provider by default. * Standardize network subheader name to 'Networks' * Update e2e tests for new settings network form * Update unit tests for new rpcPrefs prop * Extract blockexplorer url construction into method. * Fix broken styles on non-network tabs in popup mode * Fix block explorer url links for cases when provider in state has not been updated. * Fix vertical spacing of network form * Don't allow click of save button on network form if nothing has changed * Ensure add network button is shown in popup view * Lint fix for networks tab * Fix block explorer url preference setting. * Fix e2e tests for custom blockexplorer in account details modal changes. * Update integration test states to include frequentRpcList property * Fix some capitalizations in en/messages.json * Remove some console.logs added during custom rpc form work * Fix external account link text and url for modal and dropdown. * Documentation, url validation, proptype required additions and lint fixes on network tab and form.
* Check for unused function arguments (#6583)Whymarrh Whitby2019-05-094-7/+7
| | | | | | | | | | * eslint: Check for unused function arguments * eslint: Ignore unused '_' in argument list Also allow any number of '_' e.g., '__' or '___' which is to be used sparingly * Remove and rename unused arguments
* Adds a transactionCategory to txMeta for use in UI (#6567)Dan J Miller2019-05-092-7/+59
| | | | | | * Adds a transactionCategory to txMeta for use in UI * Update transaction controller and tx-gas-util documentation on new code param in multiple functions.
* Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410)kumavis2019-05-046-115/+54
| | | | | | | | | | * Ensure home screen does not render if there are unapproved txs (#6501) * Ensure that the confirm screen renders before the home screen if there are unapproved txs. * Only render confirm screen before home screen on mount. * inpage - revert _metamask api to isEnabled isApproved isUnlocked
* Include token checksum address in prices lookup for token rates (#6526)Thomas Huang2019-05-011-1/+3
|
* Send metrics event from backend for on chain transaction failures (#6500)Dan J Miller2019-04-291-0/+8
| | | | | | * Send metrics event from backend for on chain transaction failures * Passes state object to backEndMetaMetricsEvent, and adds getMetaMetricState selector
* feature: add Goerli support (#6459)Paul Bouchon2019-04-185-2/+19
|
* Merge pull request #6444 from MetaMask/localhost-network-dropdownThomas Huang2019-04-171-2/+2
|\ | | | | Fixes #6321 & #6421 - Add Localhost 8545 for network dropdown names
| * Set rpcTarget, nickname, and ticker when selecting one of the default networksThomas Huang2019-04-171-2/+2
| |
* | feature: switch token pricing to CoinGecko API (#6424)Paul Bouchon2019-04-111-8/+8
|/
* Merge pull request #6406 from MetaMask/remove-user-actions-controllerJenny Pollack2019-04-051-17/+0
|\ | | | | remove user actions controller
| * remove user actions controllerJenny Pollack2019-03-261-17/+0
| |
* | Default to localhost network when running e2e testsDan Miller2019-03-291-2/+10
| |
* | enable privacy mode for first time users (#6347)Thomas Huang2019-03-261-1/+3
|/
* Folder restructure (#6304)Chi Kei Chan2019-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove ui/app/keychains/ * Remove ui/app/img/ (unused images) * Move conversion-util to helpers/utils/ * Move token-util to helpers/utils/ * Move /helpers/*.js inside /helpers/utils/ * Move util tests inside /helpers/utils/ * Renameand move confirm-transaction/util.js to helpers/utils/ * Move higher-order-components to helpers/higher-order-components/ * Move infura-conversion.json to helpers/constants/ * Move all utility functions to helpers/utils/ * Move pages directory to top-level * Move all constants to helpers/constants/ * Move metametrics inside helpers/ * Move app and root inside pages/ * Move routes inside helpers/ * Re-organize ducks/ * Move reducers to ducks/ * Move selectors inside selectors/ * Move test out of test folder * Move action, reducer, store inside store/ * Move ui components inside ui/ * Move UI components inside ui/ * Move connected components inside components/app/ * Move i18n-helper inside helpers/ * Fix unit tests * Fix unit test * Move pages components * Rename routes component * Move reducers to ducks/index * Fix bad path in unit test
* GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-121-98/+0
| | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile
* Metametrics (#6171)Dan J Miller2019-03-051-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add metametrics provider and util. * Add backend api and state for participating in metametrics. * Add frontend action for participating in metametrics. * Add metametrics opt-in screen. * Add metametrics events to first time flow. * Add metametrics events for route changes * Add metametrics events for send and confirm screens * Add metametrics events to dropdowns, transactions, log in and out, settings, sig requests and main screen * Ensures each log in is measured as a new visit by metametrics. * Ensure metametrics is called with an empty string for dimensions params if specified * Adds opt in metametrics modal after unlock for existing users * Adds settings page toggle for opting in and out of MetaMetrics * Switch metametrics dimensions to page level scope * Lint, test and translation fixes for metametrics. * Update design for metametrics opt-in screen * Complete responsive styling of metametrics-opt-in modal * Use new chart image on metrics opt in screens * Incorporate the metametrics opt-in screen into the new onboarding flow * Update e2e tests to accomodate metametrics changes * Mock out metametrics network requests in integration tests * Fix tx-list integration test to support metametrics provider. * Send number of tokens and accounts data with every metametrics event. * Update metametrics event descriptor schema and add new events. * Fix import tos bug and send gas button bug due to metametrics changes. * Various small fixes on the metametrics branch. * Add origin custom variable type to metametrics.util * Fix names of onboarding complete actions (metametrics). * Fix names of Metrics Options actions (metametrics). * Clean up code related to metametrics. * Fix bad merge conflict resolution and improve promise handling in sendMetaMetrics event and confrim tx base * Don't send a second metrics event if user has gone back during first time flow. * Collect metametrics on going back from onboarding create/import. * Add missing custom variable constants for metametrics * Fix metametrics provider * Make height of opt-in modal responsive. * Adjust text content for opt-in modal. * Update metametrics event names and clean up code in opt-in-modal * Put phishing warning step next to last in onboarding flow * Link terms of service on create and import screens of first time flow * Add subtext to options on the onboarding select action screen. * Fix styling of bullet points on end of onboarding screen. * Combine phishing warning and congratulations screens. * Fix placement of users if unlocking after an incomplete onboarding import flow. * Fix capitalization in opt-in screen * Fix last onboarding screen translations * Add link to 'Learn More' on the last screen of onboarding * Code clean up: metametrics branch * Update e2e tests for phishing warning step removal * e2e tests passing on metametrics branch * Different tracking urls for metametrics on development and prod
* Feature Flag + Mobile Sync (#5955)Dan Finlay2019-02-261-1/+12
|
* account tracker - update accounts from balanceChecker contract (#6181)Jenny Pollack2019-02-211-0/+11
| | | | | | * account tracker - update accounts from balanceChecker contract * fall back to getBalance if the contract query fails
* EIP-1193: standard provider API (#6170)Paul Bouchon2019-02-205-13/+33
| | | | | | | | | | | | | | | | * EIP-1193: Implement new provider API * EIP-1193: Updated implementation * Remove test file * Fix tests * Update ping check * Update logic * PR feedback
* fix typofrankiebee2019-02-131-4/+4
|
* recent-blocks - dont listen for block when on infura providersfrankiebee2019-02-122-4/+29
|
* Add announcement for users migrated to the new UIWhymarrh Whitby2019-02-051-1/+1
|
* Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-051-4/+10
|
* Privacy mode fixes (#6087)Bruno Barbieri2019-02-021-13/+15
| | | | | | | | | | * Version 5.3.4 RC1 * fix old ui approval screen * fix error caused by meshtesting iframe * fix linter errors
* EIP-1102 updates (#6006)Paul Bouchon2019-01-311-22/+24
| | | | | | * Update privacy notice * Respond to 1102 messages using tab ID
* I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-301-0/+26
| | | | | | | | | | | | | | * mm-controller - dont overwrite existing rpc settings * ui-networkDropdown - dont pass old network as chainId * add methods preferencesController.updateRpc and metamaskController.updateAndSetCustomRpc * use updateAndSetCustomRpc in settings to allow rpcs to be updated * use new rpc as nickname if no nick name has been supplied * fix update rpc method
* add source for header in create infura client (#6023)Jenny Pollack2019-01-251-1/+1
| | | | | | * add source for header in create infura client * bump eth-json-rpc-infura
* Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-231-0/+10
| | | | | | | | | | | | | | | | | | | | * Refactor and fix styling for first time flow. Remove seed phrase from persisted metamask state * Fix linting and tests * Fix translations, initialization notice routing * Fix drizzle tests * Fix e2e tests * Fix integration tests * Fix styling * Fix migration naming from 030 to 031 * Open extension in browser when user has not completed onboarding
* fix asset detection (#6049)Bruno Barbieri2019-01-231-2/+18
|
* Use Parity on-chain registry only when is needed (#6052)Esteban Miño2019-01-231-0/+14
| | | | | | * add and use knownMethodData to avoid infura requests * dataMethod to methodData and check empty response
* I#5956 fix 1 (#6026)Frankie2019-01-181-1/+5
| | | | | * prevent invalid chainId's when adding cusstom rpcs * migration 30 removes invalid chaids from preferences and networkController for custom rpcs
* Set auto conversion off for token/eth conversion (#6005)Thomas Huang2019-01-111-1/+1
|
* Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-141-1/+3
| | | | | | * transactions - throw an error if a transaction is generated while the network is loading * add tests for failing when netId is loading
* Group transactions by nonce (#5886)Alexander Tseung2018-12-102-2/+6
|
* Fix race condition in network controller lookup() method.Dan Miller2018-12-071-4/+10
|
* Adds createSpeedUpTransaction to txControllerDan Miller2018-12-041-0/+23
|
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-011-0/+83
| | | | | | | | | | | | * Use selector for state.metamask.accounts in all cases. * Default to cached balance when selecting metamask accounts * Adds the cached-balances controller * Documentation and small codes fixes for #5843 Co-Authored-By: danjm <danjm.com@gmail.com>
* bugfix: normalize contract addresss when fetching exchange rates (#5863)Paul Bouchon2018-12-011-1/+3
|
* Fixed Vivek's bug (#5860)Dan Finlay2018-11-301-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed Vivek's bug Fixes #5850 What was happening: It seems that his MetaMask had crashed while some new transactions had been loading defaults. He probably had a network connectivity issue to Infura (which we are working with Infura to address). As a result of this network cutout, his three unapproved transactions were not marked failed, and were not marked as `loadingDefaults = false`, as their gas prices had not yet been estimated. Normally this behavior is supposed to clean itself up when the transaction controller starts up, via the `TransactionController._onBootCleanUp()` function, but in this case, during unlock, that function was unable to do its job because when it requested the transaction list, the current network was in the `loading` state, making it proceed as if there were no pending transactions. To fix this, I am doing two things: - Setting transactions to loadingDefaults = false in more catch blocks. - Calling `onBootCleanUp()` when the network store's status changes, so that it will re-trigger when loading completes. * Fixed reference * Fixed infinite loop bug Was refreshing the tx list on every tx state change instead of just network changes, creating an infinite loop. * Add notes to tx updates to clarify logs
* transactions/tx-gas-utils - add the acctual response for eth_getCode for ↵Frankie2018-11-301-0/+9
| | | | NO_CONTRACT_ERROR's && add a debug object to simulationFailed (#5840)
* Autofill gasPrice for retry attempts with either the recommended gasprice or ↵Frankie2018-11-271-0/+9
| | | | | | | | a %10 bump (#5786) * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump * lint
* transactions - ensure err is defined when setting tx failed (#5801)Frankie2018-11-271-4/+6
|
* Use initState to avoid type-checking providerRequests in stateWhymarrh Whitby2018-11-261-3/+5
|
* Don't announce new UI to users switching backWhymarrh Whitby2018-11-211-0/+1
|
* Default to the new UI for first time usersWhymarrh Whitby2018-11-211-1/+3
|
* ESLint fixes (#5775)Whymarrh Whitby2018-11-172-2/+2
| | | | | | * eslint . --fix * Upgrade all ESLint warnings to errors
* Tx controller now uses safe event emitter (#5769)Frankie2018-11-173-3/+3
| | | | | | | | | | | | * transactions - use safe-event-emitter over events * tests - pass a platform object on init with a noop showTransactionNotification * test - fix for tx-state-history-helper trying to reduce an empty array * deps - safe-event-emitter * lint
* Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-153-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Add beginning of test * Resubmit approved transactions on new block May fix #4343 and related issues, where an error could leave transactions stranded in the approved state. * Remove unused test * Re-approve transactions when retrying approved * Add retry approved test * Include approved in pending tx count * Fix getPendingTxs() * Linted * Only throw hash error in submitted state * Only check submitted txs for block inclusion * Fix test expectations
* Update Balanc3 API (#5744)Paul Bouchon2018-11-141-23/+15
| | | | | | * Update balanc3 API used in TokenRatesController * Remove demo URL and use nativeCurrency when fetching token rates
* EIP-1102: Update publicConfig store concurrently with approvalPaul Bouchon2018-11-101-2/+8
|
* Fix lint errorsbitpshr2018-11-071-1/+1
|
* Clear cached approval after rejectionbitpshr2018-11-071-6/+9
|
* Add experimental RPC method supportbitpshr2018-11-061-4/+4
|
* Update Connect Request screen design (#5644)Whymarrh Whitby2018-11-061-18/+22
| | | | | | | | | | * Parameterize NetworkDisplay background colour * Update design for login request screen * Pass siteTitle, siteImage through for calls to ethereum.enable() * Bring the site images closer together
* Do not modify isApproved when lockedbitpshr2018-11-061-2/+1
|
* Mark origins as unapproved if user explicitly locks MetaMaskbitpshr2018-11-061-2/+4
|
* Enable cachingPaul Bouchon2018-11-061-1/+1
|
* Disable approval cachingbitpshr2018-11-061-3/+17
|
* Differentiate locked and enabledbitpshr2018-11-061-10/+1
|
* Code bathbitpshr2018-11-061-17/+27
|
* Handle logout gracefullybitpshr2018-11-061-10/+15
|
* Fix lint issuesbitpshr2018-11-061-1/+3
|
* Add isUnlocked provider hookbitpshr2018-11-061-1/+9
|
* EIP-1102: add user privacy optionbitpshr2018-11-061-21/+20
|
* EIP-1102: add isEnabled convenience method to providerbitpshr2018-11-061-1/+19
|
* EIP-1102: Add option to force-enable providerbitpshr2018-11-061-3/+16
|
* EIP-1102: updated implementationbitpshr2018-11-062-2/+86
|
* network - infura - hardcode net_version and eth_chainId (#5670)kumavis2018-11-061-0/+33
| | | | | | * network - infura - hardcode net_version and eth_chainId * network - infura - add rinkeby handling * lint fix
* Update watchAsset ERC20 validation (#5653)Esteban Miño2018-11-061-2/+2
| | | | | | * update ERC20 token valodation for watchAsset * update ERC20 validation test descriptions
* Merge pull request #5659 from MetaMask/token-rates-bugfixkumavis2018-11-041-4/+7
|\ | | | | token-rates - protect against bad token data
| * token-rates - protect against bad token datakumavis2018-11-031-4/+7
| |
* | Revert "support eth_chainId"Thomas Huang2018-11-041-14/+4
|/
* Merge pull request #5560 from MetaMask/sentry-enhancements2kumavis2018-10-302-6/+49
|\ | | | | Sentry - various enhancements to help debugging (alternate)
| * Merge branch 'sentry-enhancements2' of ↵kumavis2018-10-301-2/+3
| |\ | | | | | | | | | github.com:MetaMask/metamask-extension into sentry-enhancements2
| | * Merge branch 'develop' into sentry-enhancements2kumavis2018-10-303-32/+132
| | |\
| * | \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-304-31/+138
| |\ \ \ | | |/ / | |/| | | | | | sentry-enhancements2
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-211-26/+25
| |\ \ \ | | | | | | | | | | | | | | | sentry-enhancements2
| * | | | blacklist + currency - report error via log instead of throwkumavis2018-10-192-5/+12
| | | | |
| * | | | lint fixkumavis2018-10-192-3/+1
| | | | |
| * | | | currency - throw errors on failurekumavis2018-10-191-3/+17
| | | | |
| * | | | blacklist - throw errors on request/parse failurekumavis2018-10-191-4/+19
| | | | |
* | | | | Merge pull request #5567 from MetaMask/HowardBraham-developkumavis2018-10-301-9/+26
|\ \ \ \ \ | |_|_|/ / |/| | | | Feature: Warn when attempting to send tx with data to non-contract
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-10-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | HowardBraham-develop
| * | | | | tx-gas-util - set error message when invalidating tx based on tx data but no ↵kumavis2018-10-211-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | contract code
| * | | | | Merge branch 'develop' into developkumavis2018-10-213-27/+98
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | tx-gas-utils - improve format + commentskumavis2018-10-101-12/+18
| | | | | |
| * | | | | ganache-core merged my PR, so I changed some comments to clarify that ↵Howard Braham2018-10-101-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | ganache-core v2.2.1 and below will return the non-standard '0x0'
| * | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contractHoward Braham2018-10-101-7/+16
| | | | | |
* | | | | | Merge pull request #5596 from MetaMask/validateSignTypedDatakumavis2018-10-301-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Validate signTypedData signer/address in eth-json-rpc-middleware
| * | | | | Validate signTypedData in eth-json-rpc-middlewareThomas2018-10-251-0/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #5552 from EthersocialNetwork/eth_chainidkumavis2018-10-301-4/+14
|\ \ \ \ \ | | | | | | | | | | | | network - check eth_chainId and fallback to net_version
| * \ \ \ \ Merge branch 'develop' into eth_chainidhackyminer2018-10-263-49/+135
| |\ \ \ \ \
| * | | | | | Update network.jskumavis2018-10-211-0/+1
| | | | | | |
| * | | | | | network - improve logging and type conversionkumavis2018-10-211-4/+6
| | | | | | |
| * | | | | | support both eth_chainId and net_versionhackyminer2018-10-201-4/+11
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | get the real chainId using eth_chainId and use net_version as a fallback
* | | | | | preferences - fix typokumavis2018-10-301-1/+1
| |/ / / / |/| | | |
* | | | | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-263-28/+115
| |/ / / |/| | |
* | | | Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-211-1/+1
|\ \ \ \ | |_|_|/ |/| | | Support for prefix wallet_watchAsset
| * | | add support for wallet_watchAssetEsteban MIno2018-10-201-1/+1
| |/ /
* / / specific add and remove methods for frequentRpcList (#5554)Esteban Miño2018-10-201-26/+25
|/ /
* | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-171-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add UnitInput component * Add CurrencyInput component * Add UserPreferencedCurrencyInput component * Add UserPreferencedCurrencyDisplay component * Add updatePreferences action * Add styles for CurrencyInput, CurrencyDisplay, and UnitInput * Update SettingsTab page with Primary Currency toggle * Refactor currency displays and inputs to use UserPreferenced displays and inputs * Add TokenInput component * Add UserPreferencedTokenInput component * Use TokenInput in the send screen * Fix unit tests * Fix e2e and integration tests * Remove send/CurrencyDisplay component * Replace diamond unicode character with Eth logo. Fix typos
* | Add txReceipt data to transaction details (#5513)Alexander Tseung2018-10-162-1/+39
| |
* | Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-111-0/+4
| |
* | Revert "transactions - add txReceipt to the txMeta body for confirmed txs ↵Whymarrh Whitby2018-10-111-23/+1
| | | | | | | | | | | | (#5375)" This reverts commit ff67293a8ef61308d602d09f26b163b9b9ec90d3.
* | transactions - add txReceipt to the txMeta body for confirmed txs (#5375)Frankie2018-10-101-1/+23
|/
* Merge pull request #5458 from MetaMask/provider-subsBruno Barbieri2018-10-103-8/+10
|\ | | | | Feature: Subscription support
| * provider - network - restore block-ref-rewrite middleware referenceskumavis2018-10-092-4/+4
| |
| * provider - enable subscription support (newHeads, logs)kumavis2018-10-081-4/+6
| |
* | Fix updating of pending transactionsDan Finlay2018-10-061-0/+1
|/ | | | | | | | | Transaction statuses were not being properly updated when: - MetaMask was unlocked - The network was changed This PR fixes both of those. Fixes #5174
* Add ability to whitelist a blacklisted domain at runtimeWhymarrh Whitby2018-10-021-0/+22
|
* support editable customRPC (#5267)HackyMiner2018-09-291-7/+6
| | | | | | * support editable customRPC #5246 * remove rpcList size restriction
* Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-251-2/+3
|\ | | | | Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
| * Switch existing modals from using Notification to Modal. Remove Notification ↵Alexander Tseung2018-09-201-2/+3
| | | | | | | | component. Add CancelTransaction modal
* | Adds getPendingNonce method to provider initialization options in ↵Dan Miller2018-09-221-1/+1
|/ | | | metamask-controller.
* Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-121-0/+18
|
* Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-112-2/+59
|\ | | | | Add createCancelTransaction method
| * Add createCancelTransaction methodAlexander Tseung2018-09-112-2/+59
| |
* | Attach the RPC error value to txMetaWhymarrh Whitby2018-09-091-0/+1
|/
* fix conflictsEsteban MIno2018-08-291-2/+2
|\
| * updated docs, small improvement of recent RPC renderingEvgeniy Filatov2018-08-231-1/+1
| |
| * implemented improvements to RPC historyEvgeniy Filatov2018-08-231-1/+1
| |
* | watchAsset small changesEsteban MIno2018-08-281-1/+1
| |
* | typo watchAsset imageUrl to imageEsteban MIno2018-08-241-6/+6
| |
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-221-1/+1
|\|
| * bugfix - prevents old blocktracker from getting internal hooks migratedkumavis2018-08-221-1/+1
| |
* | returning error in watchAssetEsteban MIno2018-08-221-4/+12
| |
* | refactor watchToken related functionsEsteban MIno2018-08-211-37/+36
| |
* | watchAsset returns result wether token was added or notEsteban MIno2018-08-211-7/+9
| |
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-2112-188/+285
|\|
| * Merge branch 'develop' into network-remove-provider-engineThomas2018-08-152-17/+79
| |\ | | | | | | | | | Override package-lock and fix merge conflicts
| * \ Merge branch 'network-remove-provider-engine' into ↵frankiebee2018-08-071-1/+1
| |\ \ | | | | | | | | | | | | network-remove-provider-engine-tests
| | * | network - fix blockTracker reference to return the blockTrackerProxy instead ↵frankiebee2018-08-071-1/+1
| | | | | | | | | | | | | | | | of the direct blockTracker reference
| * | | Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-021-7/+3
| |\ \ \
| * \ \ \ Merge branch 'develop' into network-remove-provider-engineThomas2018-07-265-14/+162
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-045-7/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-036-21/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | lint - fix lint for networkkumavis2018-06-133-3/+0
| | | | | | |
| * | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache ↵kumavis2018-06-133-37/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware order
| * | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
| | | | | | |
| * | | | | | lint - controllers - whitepace fixkumavis2018-06-121-5/+5
| | | | | | |
| * | | | | | network - provider - infura - use block-reemit middlewarekumavis2018-06-081-2/+2
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-074-1/+44
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-074-13/+113
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
| | | | | | | | |
| * | | | | | | | controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
| | | | | | | | |
| * | | | | | | | controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
| | | | | | | | |
| * | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-293-96/+55
| | | | | | | | |
| * | | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until ↵kumavis2018-05-261-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block is truthy
| * | | | | | | | tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
| | | | | | | | |
| * | | | | | | | controllers - recent-blocks - guard against empty blockkumavis2018-05-251-3/+3
| | | | | | | | |
| * | | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catchkumavis2018-05-241-1/+7
| | | | | | | | |
| * | | | | | | | Merge branch 'network-remove-provider-engine' of ↵kumavis2018-05-242-9/+24
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into network-remove-provider-engine
| | * \ \ \ \ \ \ \ Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-242-9/+24
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Transactions use new block tracker
| | | * \ \ \ \ \ \ \ Merge branch 'network-remove-provider-engine' of ↵frankiebee2018-05-234-53/+41
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker
| | | * | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-7/+18
| | | | | | | | | | | |
| | | * | | | | | | | | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
| | | | | | | | | | | |
| * | | | | | | | | | | controllers - recent-blocks - ensure full blockskumavis2018-05-241-2/+2
| |/ / / / / / / / / /
| * | / / / / / / / / controllers - recent-blocks - doc updatekumavis2018-05-241-4/+4
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-231-15/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-233-38/+34
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| * | | | | | | | | | recent-blocks - fix backfill blockNumber trackingkumavis2018-05-171-3/+2
| | | | | | | | | | |
| * | | | | | | | | | controllers - recent-blocks - fix pifyd setTimeout argskumavis2018-05-171-1/+1
| | | | | | | | | | |
| * | | | | | | | | | deps - fix incorrect dep paths and versionskumavis2018-05-174-4/+4
| | | | | | | | | | |
| * | | | | | | | | | controllers - balance - update for eth-block-tracker@4kumavis2018-05-171-3/+3
| | | | | | | | | | |
| * | | | | | | | | | recent-blocks - update for eth-block-tracker@4kumavis2018-05-171-27/+14
| | | | | | | | | | |
| * | | | | | | | | | remove unused events-proxy, was replaced with module swappable-obj-proxykumavis2018-05-171-1/+0
| | | | | | | | | | |
| * | | | | | | | | | lint fixkumavis2018-05-175-13/+18
| | | | | | | | | | |
| * | | | | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-177-67/+213
| | | | | | | | | | |
* | | | | | | | | | | delete according image when token added with watchToken deletedEsteban MIno2018-08-171-13/+14
| | | | | | | | | | |
* | | | | | | | | | | correct behavior when notification is closed when popupEsteban MIno2018-08-171-1/+1
| | | | | | | | | | |
* | | | | | | | | | | show watch asset image from hide token modalEsteban MIno2018-08-161-1/+1
| | | | | | | | | | |
* | | | | | | | | | | change watchAsset to new spec for type ERC20Esteban MIno2018-08-161-15/+27
| | | | | | | | | | |
* | | | | | | | | | | add suggested tokens objects in metamask stateEsteban MIno2018-08-161-6/+16
| | | | | | | | | | |
* | | | | | | | | | | watchToken to watchAssetEsteban MIno2018-08-151-1/+1
| | | | | | | | | | |
* | | | | | | | | | | add support for images base64 and urls on new uiEsteban MIno2018-08-151-6/+7
| | | | | | | | | | |
* | | | | | | | | | | update method to metamask_watchTokenEsteban MIno2018-08-151-1/+1
| | | | | | | | | | |
* | | | | | | | | | | refactor unused codeEsteban MIno2018-08-081-2/+4
| | | | | | | | | | |
* | | | | | | | | | | fix mergeEsteban MIno2018-08-081-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop' into WatchTokenFeatureEsteban Miño2018-08-082-17/+79
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | fix doc tagEsteban MIno2018-08-011-1/+1
| | | | | | | | | | |
| * | | | | | | | | | tokens related functions refactorEsteban MIno2018-08-011-15/+22
| | | | | | | | | | |
| * | | | | | | | | | fix undefined for tokens on testsEsteban MIno2018-08-011-1/+3
| | | | | | | | | | |
| * | | | | | | | | | fix double state update when account changedEsteban MIno2018-07-311-5/+3
| | | | | | | | | | |
| * | | | | | | | | | create tokens storage when setadressesEsteban MIno2018-07-311-2/+4
| | | | | | | | | | |
| * | | | | | | | | | isolation of tokens related methods in preferencesEsteban MIno2018-07-311-43/+42
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasisEsteban Miño2018-07-281-7/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | refactor to accountTokensEsteban MIno2018-07-281-53/+47
| | | | | | | | | | |
| * | | | | | | | | | add & delete tokens per networkEsteban MIno2018-07-271-10/+8
| | | | | | | | | | |
| * | | | | | | | | | tokens per network for individual accountEsteban MIno2018-07-271-15/+51
| | | | | | | | | | |
| * | | | | | | | | | preferences test fixes for tokens per accountEsteban MIno2018-07-261-9/+16
| | | | | | | | | | |
| * | | | | | | | | | add & delete tokens per accountEsteban MIno2018-07-262-8/+27
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | add suggested token params validationEsteban MIno2018-08-071-4/+25
| | | | | | | | | |
* | | | | | | | | | eth_watchToken workingEsteban MIno2018-08-041-0/+7
| | | | | | | | | |
* | | | | | | | | | rpc-engine not crashing when eth_watchTokenEsteban MIno2018-08-041-5/+4
| | | | | | | | | |
* | | | | | | | | | merge developEsteban MIno2018-08-0412-35/+182
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gasFrankie2018-07-261-7/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | tx-gas-utils - catch all errors from gas estimation
| | * | | | | | | | tx-gas-utils - catch all errors from gas estimationJenny Pollack2018-07-251-7/+3
| | | | | | | | | |
| * | | | | | | | | network.js: convert rpc protocol to lower case (#4855)pinkiebell2018-07-251-0/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | Fixes #4253
| * | | | | | | | run linterbrunobar792018-07-221-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban Miño2018-07-215-15/+37
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-211-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * detect tokens polling * network store to detect token * tests for spec * passtest-lint * fix lint * improve tests * detect tokens through infura * detect tokens when submit password and new account selected * keyring unlocked detect and unit tests * add changelog
| | * | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-141-13/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | * \ \ \ \ \ \ \ Merge pull request #4669 from MetaMask/removeNonceTrackerFunctionThomas Huang2018-07-131-13/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unsued nonce tracker function
| | | | * \ \ \ \ \ \ \ Merge branch 'develop' into removeNonceTrackerFunctionThomas2018-07-118-14/+14
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | |
| | | | * | | | | | | | Remove unsued nonce tracker functiontmashuang2018-06-261-13/+0
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-132-1/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| | | * | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-121-1/+2
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor and redesign confirm transaction views
| | | | * | | | | | | | Various fixes from PR commentsAlexander Tseung2018-07-071-10/+12
| | | | | | | | | | | |
| | | | * | | | | | | | Use eth-method-registry to get method dataAlexander Tseung2018-07-071-1/+1
| | | | | | | | | | | |
| | | | * | | | | | | | Display newest transactionAlexander Tseung2018-07-071-1/+1
| | | | | | | | | | | |
| | | | * | | | | | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-072-13/+12
| | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵frankiebee2018-07-118-14/+14
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into i#3896
| | | * | | | | | | | trandsactions - remove rejected transactions from historyfrankiebee2018-06-261-0/+6
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | account removal is workingbrunobar792018-07-111-0/+24
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | fix detection on submit passwordEsteban MIno2018-07-211-5/+8
| | | | | | | | |
| * | | | | | | | keyring unlocked detect and unit testsEsteban MIno2018-07-201-12/+16
| | | | | | | | |
| * | | | | | | | detect tokens when submit password and new account selectedEsteban MIno2018-07-201-13/+39
| | | | | | | | |
| * | | | | | | | detect tokens through infuraEsteban MIno2018-07-131-21/+24
| | | | | | | | |
| * | | | | | | | improve testsEsteban MIno2018-07-121-16/+13
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban MIno2018-07-048-14/+14
| |\| | | | | | |
| | * | | | | | | eslint --fix .brunobar792018-07-038-14/+14
| | |/ / / / / /
| * | | | | | | passtest-lintEsteban MIno2018-07-041-6/+0
| | | | | | | |
| * | | | | | | tests for specEsteban MIno2018-06-281-1/+1
| | | | | | | |
| * | | | | | | network store to detect tokenEsteban MIno2018-06-281-8/+10
| | | | | | | |
| * | | | | | | detect tokens pollingEsteban MIno2018-06-281-0/+97
| |/ / / / / /
* | | | | | | Improved rpc-engine usageDan Finlay2018-06-191-5/+1
| | | | | | |
* | | | | | | Get popup appearing when suggesting new tokenDan Finlay2018-06-191-1/+3
| | | | | | |