m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Code
9,612 Commits 2 Branches 0 Tags 265 MiB
056e8cdf7e
Commit Graph

2410 Commits

Author SHA1 Message Date
bitpshr
84874a639d Add isUnlocked provider hook 2018-11-05 15:07:09 -08:00
bitpshr
573139b935 Differentiate isEnabled and isApproved hook 2018-11-05 15:07:09 -08:00
bitpshr
3a2ade4e84 Update isEnabled check 2018-11-05 15:07:09 -08:00
bitpshr
226601a956 EIP-1102: add user privacy option 2018-11-05 15:07:09 -08:00
bitpshr
bfcb73ad53 EIP-1102: add isEnabled convenience method to provider 2018-11-05 15:07:09 -08:00
bitpshr
89b4aa5d62 EIP-1102: Add option to force-enable provider 2018-11-05 15:07:09 -08:00
bitpshr
c76c9ca2c8 EIP-1102: updated implementation 2018-11-05 15:07:09 -08:00
kumavis
86f09e6bb5 network - infura - hardcode net_version and eth_chainId (#5670) 
* network - infura - hardcode net_version and eth_chainId
* network - infura - add rinkeby handling
* lint fix
 2018-11-05 14:13:37 -05:00
Esteban Miño
4489a57f2f Update watchAsset ERC20 validation (#5653) 
* update ERC20 token valodation for watchAsset

* update ERC20 validation test descriptions
 2018-11-05 15:36:34 -03:30
kumavis
14852669ac
Merge pull request #5659 from MetaMask/token-rates-bugfix 
token-rates - protect against bad token data
 2018-11-03 21:57:21 -04:00
Thomas Huang
ed4f612bdc Revert "support eth_chainId" 2018-11-03 14:21:41 -07:00
kumavis
2c1bca1ab0 token-rates - protect against bad token data 2018-11-02 22:14:40 -04:00
kumavis
73eeeda215
Merge pull request #5560 from MetaMask/sentry-enhancements2 
Sentry - various enhancements to help debugging (alternate)
 2018-10-29 21:57:51 -04:00
kumavis
310229d22e
Merge pull request #5567 from MetaMask/HowardBraham-develop 
Feature: Warn when attempting to send tx with data to non-contract
 2018-10-29 21:47:07 -04:00
kumavis
7ae5a23b6c Merge branch 'sentry-enhancements2' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-29 20:28:02 -04:00
kumavis
ccbc233282 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-29 20:25:05 -04:00
kumavis
1bb4a8428c
Merge pull request #5596 from MetaMask/validateSignTypedData 
Validate signTypedData signer/address in eth-json-rpc-middleware
 2018-10-29 20:11:04 -04:00
kumavis
ad009a4606
Merge branch 'develop' into sentry-enhancements2 2018-10-29 19:49:53 -04:00
kumavis
18e530221b
Merge pull request #5552 from EthersocialNetwork/eth_chainid 
network - check eth_chainId and fallback to net_version
 2018-10-29 19:43:25 -04:00
kumavis
986f8b4c21
preferences - fix typo 2018-10-29 18:56:29 -04:00
hackyminer
bc7f8d0a5b
Merge branch 'develop' into eth_chainid 2018-10-26 20:37:35 +09:00
HackyMiner
54a8ade266 Add support for RPC endpoints with custom chain IDs (#5134) 2018-10-26 10:26:43 +02:00
kumavis
9b42416fc0 Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardBraham-develop 2018-10-25 22:24:30 -04:00
Thomas
8c0e5e97e5 Add version to unapprovedMessage 2018-10-24 20:24:42 -07:00
Thomas
95b92a1ddc Remove commented out/unused methods 2018-10-24 20:13:40 -07:00
Thomas
1d65687ce4 Validate signTypedData in eth-json-rpc-middleware 2018-10-24 20:03:55 -07:00
Vimal
82b11b69a5 Adding CoinSwitch exchange 2018-10-22 16:44:21 +05:30
kumavis
6d09f60bbf
ens-ipfs - refactor for readability (#5568) 
* ens-ipfs - refactor for readability

* ens-ipfs - use official ipfs gateway for better performance

* lint - remove unused code

* ens-ipfs - support path and search

* lint - gotta love that linter

* ens-ipfs - improve loading page formatting

* ens-ipfs - loading - redirect to 404 after 1 min timeout

* ens-ipfs - destructure for cleaner code
 2018-10-21 05:48:15 -04:00
kumavis
b62d07f3a5
Update network.js 2018-10-21 04:32:07 -04:00
brunobar79
9c1b2108f6 fix merge conflicts 2018-10-21 01:59:53 -04:00
kumavis
b0c649a4e3
Merge pull request #5555 from MetaMask/support-wallet-watch-asset 
Support for prefix wallet_watchAsset
 2018-10-21 01:27:08 -04:00
kumavis
61c7bbb1c1
network - improve logging and type conversion 2018-10-21 01:20:08 -04:00
kumavis
31e5cad1e3 tx-gas-util - set error message when invalidating tx based on tx data but no contract code 2018-10-21 01:01:21 -04:00
kumavis
f0602ca354 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-20 23:51:00 -04:00
kumavis
3b46478024
Merge branch 'develop' into develop 2018-10-20 23:48:10 -04:00
kumavis
73ec4e66cb sentry - include app state in ui errors 2018-10-20 03:14:59 -04:00
kumavis
e3fda83ab2 sentry - replace raven-js with sentry/browser 2018-10-20 02:22:50 -04:00
Esteban Miño
7c4f98ffd6 specific add and remove methods for frequentRpcList (#5554) 2018-10-19 17:50:54 -02:30
Esteban MIno
75661673e5 add support for wallet_watchAsset 2018-10-19 13:57:11 -03:00
hackyminer
2f6530a494
support both eth_chainId and net_version 
get the real chainId using eth_chainId and use net_version as a fallback
 2018-10-20 01:08:46 +09:00
kumavis
31175dcb24 blacklist + currency - report error via log instead of throw 2018-10-19 07:18:16 -04:00
kumavis
a57d267dcb lint fix 2018-10-19 07:08:04 -04:00
kumavis
b85ae55cd5 fetch debugger - only append source stack if no stack is present 2018-10-19 06:42:53 -04:00
kumavis
3e3d4b9dde sentry - failed txs - namespace txMeta for better readability 2018-10-19 05:30:21 -04:00
kumavis
2394881511 currency - throw errors on failure 2018-10-19 04:58:19 -04:00
kumavis
65aa0a1d14 blacklist - throw errors on request/parse failure 2018-10-19 04:51:03 -04:00
kumavis
26b30a031d sentry - move isBrave decoration to insides of try-catch 2018-10-19 04:36:36 -04:00
kumavis
fa36dbf981 inpage - increase provider max listeners to avoid warnings 2018-10-17 19:17:39 -04:00
kumavis
c289baa17a
Merge pull request #5127 from MetaMask/account-tracker-network-change 
Bug Fix: Force AccountTracker to update balances on network change
 2018-10-17 18:56:54 -04:00
Whymarrh Whitby
0d0bb4afd7
Merge pull request #5522 from MetaMask/fetch-debugging 
debugging - enable fetch debugging
 2018-10-17 17:38:55 -02:30
Alexander Tseung
badebe017f
Adds toggle for primary currency (#5421) 
* 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
 2018-10-17 07:03:29 +08:00
brunobar79
13820b6cc1 fix conflicts 2018-10-16 14:01:54 -04:00
Whymarrh Whitby
d44b7ef3da Fix document extension check when injecting web3 2018-10-16 11:08:48 -02:30
Alexander Tseung
c821a8354c
Add txReceipt data to transaction details (#5513) 2018-10-16 06:00:47 +08:00
kumavis
70c45ae8be enable fetch debugging 2018-10-15 01:14:25 -04:00
Whymarrh Whitby
af43b7d6c9 Ensure that new transactions added are using the selected address 2018-10-10 16:16:20 -02:30
Whymarrh Whitby
428a7cacdf Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5375)" 
This reverts commit ff67293a8e.
 2018-10-10 15:30:12 -02:30
Frankie
ff67293a8e transactions - add txReceipt to the txMeta body for confirmed txs (#5375) 2018-10-10 10:26:38 -04:00
Bruno Barbieri
ccab4ee1a4 tests - integration - Add Drizzle tests (#5467) 
* added drizzle app for testing

* working

* clean up

* clean up script

* make build step required

* add drizzle-tests to .eslintignore

* clean up drizzle run script

* lint

* use truffle unbox

* undo eslintignore changes

* revert change

* dont use global

* dont need this steps

* use the new account flow

* restore package-lock.json
 2018-10-10 01:12:43 -04:00
kumavis
600f755dbf
tx-gas-utils - improve format + comments 2018-10-09 23:17:05 -04:00
Howard Braham
4cc0b1ef01 ganache-core merged my PR, so I changed some comments to clarify that ganache-core v2.2.1 and below will return the non-standard '0x0' 2018-10-09 15:31:25 -07:00
Howard Braham
222e62d7f1 Bug Fix: #1789 and #4525 eth.getCode() with no contract 2018-10-09 15:31:25 -07:00
Bruno Barbieri
17b9f4c0db
Merge pull request #5458 from MetaMask/provider-subs 
Feature: Subscription support
 2018-10-09 13:25:13 -04:00
Noel Yoo
ebdefe81a1 Refactor buffer constructor (#5468) 2018-10-09 09:32:48 -02:30
kumavis
45feb43f30 workaround - fix for drizzle 2018-10-08 16:54:13 -04:00
Eduardo Antuña Díez
8279916ee4 Added webRequest.RequestFilter to filter main_frame .eth requests 2018-10-08 21:50:15 +02:00
kumavis
fe82c4a9fb provider - network - restore block-ref-rewrite middleware references 2018-10-08 12:39:18 -04:00
kumavis
354f8c0d7d provider - enable subscription support (newHeads, logs) 2018-10-08 11:55:07 -04:00
Dan Finlay
a909af92aa
Merge branch 'develop' into update-balance-on-unlock 2018-10-05 10:46:48 -07:00
Dan Finlay
507397f6c3 Fix updating of pending transactions 
Transaction statuses were not being properly updated when:

- MetaMask was unlocked
- The network was changed

This PR fixes both of those. Fixes #5174
 2018-10-05 10:35:14 -07:00
Dan Finlay
bc6d32e51e Update all balances on password unlock 2018-10-05 10:32:28 -07:00
Dan Finlay
c49d854b55 Increase suggested gas percentile to 65 (#5359) 
* Increase suggested gas percentile to 65

I keep submitting transactions then waiting a long time. Apparently 50th percentile isn't enough.

* Update test for getGasPrice
 2018-10-04 18:38:05 -02:30
Whymarrh Whitby
b2939e8627
Merge pull request #5412 from whymarrh/after-install-steps 
Don't open MetaMask website after install
 2018-10-04 08:28:17 -02:30
Whymarrh Whitby
ba39fbeb49 Don't open metamask.io after install anymore 2018-10-02 11:42:09 -02:30
Whymarrh Whitby
c92fee7771 Hook MetaMaskController up with phishing detection page 2018-10-02 10:45:39 -02:30
Whymarrh Whitby
58d856bd84 Add domain whitelist method to MetaMaskController 2018-10-02 10:43:46 -02:30
Whymarrh Whitby
4dd6c8168f Add ability to whitelist a blacklisted domain at runtime 2018-10-02 10:43:46 -02:30
HackyMiner
13a1d46720 support editable customRPC (#5267) 
* support editable customRPC #5246

* remove rpcList size restriction
 2018-09-28 17:23:58 -02:30
kumavis
59ab595b5e
Merge branch 'develop' into account-tracker-network-change 2018-09-28 02:45:16 -04:00
Whymarrh Whitby
83666e8d28 Update extension badge with correct signTypedData count 2018-09-27 08:33:50 -07:00
Phyrex Tsai
386110ef0f fix tld bug (#5250) 2018-09-27 12:51:50 -02:30
Thomas Huang
8c3091aa7a
Merge pull request #5053 from hahnmichaelf/esdb-support 
Link to ESDB in local phishing.html
 2018-09-27 10:19:06 -05:00
Paul Bouchon
9359fc875d
EIP-1102: Add deprecation message (#5353) 2018-09-26 10:48:17 -04:00
bitpshr
c4caba1317 bugfix: update eth_signTypedData_v3 parameter order 2018-09-26 10:00:12 -04:00
Esteban Miño
4d82df6995
Fix MetaMask web3 version (#5352) 2018-09-25 16:14:37 -03:00
Alexander Tseung
5d57c7c4fd
Merge pull request #5282 from MetaMask/tx-cancel-ui 
Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
 2018-09-24 11:34:12 -07:00
Dan Miller
19d72c9b0b Adds getPendingNonce method to provider initialization options in metamask-controller. 2018-09-21 15:29:42 -02:30
Alexander Tseung
5a6c333506 Switch existing modals from using Notification to Modal. Remove Notification component. Add CancelTransaction modal 2018-09-19 14:31:10 -07:00
Paul Bouchon
daca7f9b41
Merge branch 'develop' into eip-712 2018-09-17 12:11:10 -04:00
Paul Bouchon
2ec09362c5
EIP-1102: Transitionary API (#5256) 2018-09-14 19:26:03 -04:00
bitpshr
42fdcf6239 Update new method namespace from v2 to v3 2018-09-13 15:42:27 -04:00
bitpshr
68c2554296 Update error message for chainId mis-match 2018-09-13 15:40:57 -04:00
bitpshr
36dd0354e7 Implement latest EIP-712 protocol 2018-09-13 15:40:57 -04:00
Dan Finlay
ce1975fbb4
Merge pull request #5240 from MetaMask/i5238-account-balance-update 
Ensure account-tracker currentBlockNumber is set on first block update.
 2018-09-11 14:31:10 -07:00
Whymarrh Whitby
13bc46d824 Default NoticeController ctor opts to empty obj 2018-09-11 12:12:35 -07:00
Whymarrh Whitby
d60991ec88 Delete ConfigManager, replacing its usages with PreferencesController 2018-09-11 09:39:16 -07:00
Dan Miller
eb32ccb0c7 Ensure account-tracker currentBlockNumber is set on first block update. 2018-09-11 12:51:49 -02:30
Frankie
1552fe1c3e
Merge pull request #5216 from MetaMask/tx-cancel 
Add createCancelTransaction method
 2018-09-10 13:29:29 -10:00
Frankie
a43e71693f
Merge pull request #5223 from whymarrh/tx-error-tooltips 
Show transaction error message tooltips for statuses
 2018-09-10 13:25:59 -10:00
Alexander Tseung
43de189d06 Add createCancelTransaction method 2018-09-10 12:48:01 -07:00
Connor Christie
ee568d5f5a Upgrade obs-store and fix memory leaks 2018-09-09 19:33:51 -05:00
Whymarrh Whitby
7c3b69e1e4 Attach the RPC error value to txMeta 2018-09-08 19:59:50 -02:30
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
Esteban MIno
e743f44150 fix conflicts 2018-08-28 15:20:30 -03:00
Esteban MIno
3106374cc3 watchAsset small changes 2018-08-27 22:10:14 -03:00
bitpshr
803a79f836 Do not resolve .test domains using ENS 2018-08-24 12:40:37 -04:00
Esteban MIno
053e262ae7 delete web3.metamassk.watchAsset 2018-08-23 16:32:04 -03:00
Esteban MIno
b59a1e91b8 typo watchAsset imageUrl to image 2018-08-23 15:54:40 -03:00
Evgeniy Filatov
9a80d6e859 updated docs, small improvement of recent RPC rendering 2018-08-23 01:26:30 +03:00
Evgeniy Filatov
b23cca1469 implemented improvements to RPC history 2018-08-23 01:18:13 +03:00
Esteban MIno
56bed3f1bc expose web3.metamask.watchAsset 2018-08-22 18:14:10 -03:00
Dan Finlay
f30b726df7
Merge pull request #5122 from MetaMask/lazy-account-tracker 
Network IO Optimization: Lazy AccountTracker
 2018-08-22 13:31:42 -07:00
Dan Finlay
bf6d624e76 Add todo to dedupe UI tracking in background 2018-08-22 12:05:41 -07:00
kumavis
cb0af67f74 metamask controller - force account tracker to update balances on network change 2018-08-22 11:23:54 -07:00
Whymarrh Whitby
003d445a98 Update unlock logic to not overwrite existing selected address 2018-08-22 15:38:34 -02:30
brunobar79
b208ce7234 add port names blacklist 2018-08-22 14:04:26 -04:00
kumavis
a2654108be account-tracker - only track blocks when there are activeControllerConnections 2018-08-21 16:49:24 -07:00
kumavis
3ac2b40dcf metamask controller - track active controller connections 2018-08-21 16:30:11 -07:00
Esteban MIno
4e6c71e969 Merge branch 'develop' into WatchTokenFeature 2018-08-21 20:14:49 -03:00
Dan Finlay
babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider 
Move inpage-provider and port-stream outside
 2018-08-21 14:38:47 -07:00
Dan Finlay
a485516488
Merge pull request #5118 from MetaMask/provider2-bugfix 
bugfix - prevents old blocktracker from getting internal hooks migrated
 2018-08-21 14:27:34 -07:00
kumavis
13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 2018-08-21 14:13:23 -07:00
Esteban MIno
3a3732eb24 returning error in watchAsset 2018-08-21 13:12:45 -03:00
Esteban MIno
6fa889abcb refactor watchToken related functions 2018-08-21 12:59:42 -03:00
brunobar79
cee5783283 fix hardware wallets account name 2018-08-21 00:04:30 -04:00
brunobar79
34e3ec6092 fix account removal 2018-08-21 00:04:07 -04:00
Esteban MIno
68c1b4c170 watchAsset returns result wether token was added or not 2018-08-20 22:32:14 -03:00
Dan Finlay
6ce119d1fb Move inpage-provider and port-stream outside 
With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream.

To reduce the size of its dependencies, I have moved the
[metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream).

This allows them to be more easily depended & iterated on by external
projects.
 2018-08-20 15:45:50 -07:00
Esteban MIno
81cd29df43 Merge branch 'develop' into WatchTokenFeature 2018-08-20 19:35:38 -03:00
Bruno Barbieri
bd904c86f6
Merge branch 'develop' into ledger-support 2018-08-17 13:45:46 -04:00
brunobar79
992e7f1b5a fix merge conflicts 2018-08-17 12:56:07 -04:00
Dan Matthews
df799d7fd6 Restores accounts until one with a zero balance is found 2018-08-17 10:26:47 -04:00
Esteban MIno
dbab9a007f delete according image when token added with watchToken deleted 2018-08-16 21:17:02 -03:00
Esteban MIno
bb868f5834 correct behavior when notification is closed when popup 2018-08-16 20:19:19 -03:00
Esteban MIno
a36ea0e232 show watch asset image from hide token modal 2018-08-16 12:04:43 -03:00
Esteban MIno
5289a36664 change watchAsset to new spec for type ERC20 2018-08-15 20:01:59 -03:00
Esteban MIno
b766104c8d add suggested tokens objects in metamask state 2018-08-15 18:34:57 -03:00
brunobar79
82a5ed1e03 remove console logs 2018-08-14 22:40:29 -04:00
brunobar79
fdf202efb0 fixed unit tests 2018-08-14 21:19:01 -04:00
Esteban MIno
a4b6b2357a watchToken to watchAsset 2018-08-14 20:09:56 -03:00
Esteban MIno
a4c3f6b65c add support for images base64 and urls on new ui 2018-08-14 20:08:12 -03:00
Thomas
96d789d2cf Merge branch 'develop' into network-remove-provider-engine 
Override package-lock and fix merge conflicts
 2018-08-14 10:44:42 -07:00
Esteban MIno
8f5b80a0fe update method to metamask_watchToken 2018-08-14 13:58:47 -03:00
brunobar79
b77cc3d969 fix tx tests 2018-08-14 03:42:23 -04:00
brunobar79
61a279204a legacy and new hd path working 2018-08-14 01:26:18 -04:00
brunobar79
4e1d8ba19d good progress adding paths 2018-08-13 19:29:43 -04:00
hahnmichaelf
e19eb7bc03 additional lint-test fix 2018-08-13 13:21:18 -04:00
hahnmichaelf
4808ce25eb fix for lint-test 2018-08-13 13:16:37 -04:00
hahnmichaelf
7d2d71bcbc change name 2018-08-13 12:40:16 -04:00
hahnmichaelf
9666eaba66 base - working. fixes #4774 2018-08-12 18:57:58 -04:00
brunobar79
8f9a0a535c clean up 2018-08-12 01:43:41 -04:00
brunobar79
0b9b892c6b this should be ready to go 2018-08-12 01:34:01 -04:00
brunobar79
2355573340 clean up 2018-08-12 00:06:36 -04:00
brunobar79
e6d64cecf8 message signing works 2018-08-11 20:26:34 -04:00
brunobar79
068bf43615 working 2018-08-11 19:27:24 -04:00
brunobar79
12b41b8fc2 tx signature is valid 2018-08-11 18:20:50 -04:00
brunobar79
011cc141b3 tx signing should work 2018-08-11 16:00:29 -04:00
brunobar79
aa6a42e3de rename keyring 2018-08-11 05:11:21 -04:00
brunobar79
8e842a8947 able to add accounts 2018-08-11 05:02:02 -04:00
brunobar79
78a1cd3314 iframe communication working 2018-08-11 02:35:20 -04:00
brunobar79
5ef80495cf refactor to support multiple hw wallets 2018-08-10 21:54:34 -04:00
Bruno Barbieri
e2be22a4b7
Merge pull request #4897 from MetaMask/qr-code-scan 
QR Code Scanner
 2018-08-10 13:40:06 -04:00
Dan Finlay
be1d5a7dd9
Merge pull request #5020 from MetaMask/FixMigration28 
Fixes migration 28
 2018-08-09 14:24:38 -07:00
Jenny Pollack
00a2ab21ae sentry - change releaseVersion to release 2018-08-09 13:49:40 -07:00
Esteban MIno
8df3f2696c fix migration 28 2018-08-09 16:15:56 -04:00
Eduardo Antuña Díez
a2082bae5c Avoid overwriting a domain that can be resolved by DNS 
According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it.
changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.
 2018-08-09 12:20:51 +02:00
Eduardo Antuña Díez
543207b5af Fixed ENS to IPFS functionality in Firefox 
`tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`
 2018-08-09 12:14:09 +02:00
brunobar79
c6b7e460b5 code review changes 2018-08-08 03:00:39 -04:00
brunobar79
2e0916d8ff fix merge conflicts 2018-08-08 02:32:35 -04:00
Esteban MIno
33357e3538 refactor unused code 2018-08-07 19:12:16 -04:00
Esteban MIno
15ea8c04b2 fix merge 2018-08-07 17:53:36 -04:00
Esteban Miño
3f57d5f66b
Merge branch 'develop' into WatchTokenFeature 2018-08-07 17:50:58 -04:00
Esteban MIno
c0cdda8321 Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:17:40 -04:00
frankiebee
115d3c9aaf Merge branch 'network-remove-provider-engine' into network-remove-provider-engine-tests 2018-08-07 01:38:32 -07:00
frankiebee
c2d4b237eb network - fix blockTracker reference to return the blockTrackerProxy instead of the direct blockTracker reference 2018-08-07 01:35:30 -07:00
Esteban MIno
78ad3c38e2 add suggested token params validation 2018-08-06 18:28:47 -04:00
Esteban MIno
9ac9f53a73 eth_watchToken working 2018-08-03 19:24:12 -04:00
Esteban MIno
081884bd80 rpc-engine not crashing when eth_watchToken 2018-08-03 16:42:13 -04:00
Esteban MIno
21a61f2987 merge develop 2018-08-03 14:56:02 -04:00
Thomas Huang
024ebe07e0 Merge branch 'develop' into network-remove-provider-engine-tests 2018-08-01 10:40:31 -07:00
Esteban MIno
d8817b2646 fix doc tag 2018-07-31 16:18:06 -04:00
Esteban MIno
3124e8c612 tokens related functions refactor 2018-07-31 15:59:19 -04:00
Esteban MIno
ccae79d392 fix undefined for tokens on tests 2018-07-31 13:07:28 -04:00
brunobar79
edb154749d send to fullscreen if no permission from popup 2018-07-30 22:57:05 -04:00
Esteban MIno
22cf5a1391 improve comments 2018-07-30 20:44:22 -04:00
Esteban MIno
822c1734d6 fix double state update when account changed 2018-07-30 20:36:31 -04:00
Esteban MIno
fbcba8f019 create tokens storage when setadresses 2018-07-30 19:09:17 -04:00
Esteban MIno
31286673c3 isolation of tokens related methods in preferences 2018-07-30 18:43:34 -04:00
brunobar79
4339f04e80 use existing modals 2018-07-30 17:50:05 -04:00
Esteban MIno
0757f47e84 passing tokens to all accounts in migration 2018-07-30 11:41:31 -04:00
Esteban MIno
e687bc5a47 fix migration for preferences controller tokens 2018-07-27 16:17:28 -04:00
Dan Finlay
9dc5d0cee0
Merge pull request #4905 from MetaMask/eip-712-deprecation 
EIP-712: deprecation message
 2018-07-27 13:16:44 -07:00
Esteban Miño
228f48c6e5
Merge branch 'develop' into TokensPerAccountBasis 2018-07-27 16:07:08 -04:00
Esteban MIno
5b9725d1f1 refactor to accountTokens 2018-07-27 16:05:12 -04:00
bitpshr
642ae25073 Add deprecation message for eth_signTypedData 2018-07-27 15:23:05 -04:00
Esteban MIno
f5107fa12e migration for preferences controller tokens 2018-07-27 14:56:03 -04:00
Esteban MIno
2827e13caa add & delete tokens per network 2018-07-26 19:28:12 -04:00
Esteban MIno
1d3ad7cfbb tokens per network for individual account 2018-07-26 18:04:34 -04:00
Kelvin Tan
7ca402147d add phishing html page, and redirect to bundled page in-window 2018-07-27 00:03:39 +08:00
Thomas
138858647e Merge branch 'develop' into network-remove-provider-engine 2018-07-25 22:38:44 -07:00
Frankie
b5e3aafe2e
Merge pull request #4871 from MetaMask/3519-new-contract-gas 
tx-gas-utils -  catch all errors from gas estimation
 2018-07-25 15:33:17 -10:00
Esteban MIno
adee549c43 preferences test fixes for tokens per account 2018-07-25 17:46:31 -04:00
frankiebee
527b62ee8e migrations - fix to include 27 2018-07-25 14:11:07 -07:00
Esteban MIno
2770df80e3 add & delete tokens per account 2018-07-25 16:14:10 -04:00
William Morriss
5782926c28
Merge pull request #4825 from MetaMask/no-inject-ani-gamer 
Do not inject on ani.gamer.com.tw
 2018-07-24 19:48:10 -07:00
pinkiebell
3667f3cb85 network.js: convert rpc protocol to lower case (#4855) 
Fixes #4253
 2018-07-24 19:33:36 -02:30
Jenny Pollack
00bae74475 tx-gas-utils - catch all errors from gas estimation 2018-07-24 14:16:37 -07:00
Kevin Serrano
1d241bef76
Merge branch 'develop' into no-inject-ani-gamer 2018-07-24 12:27:18 -07:00
Dan Miller
a61227f224 Remove unneeded code from i4829-close-notifications-from-ui branch. 2018-07-24 15:01:03 -02:30
Dan Miller
64a82fd3da Uncomment closePopupIfOpen code. 2018-07-24 11:45:36 -02:30
Dan Miller
2359062b62 UI confirm screen closes confirmation window on submit or cancel of a tx 2018-07-23 22:20:06 -02:30
brunobar79
5ebefc0e50 run linter 2018-07-21 16:03:31 -04:00
Esteban MIno
9be22775c3 fix merge 2018-07-20 20:15:33 -04:00
Esteban Miño
110efa9ec1
Merge branch 'develop' into detectTokenFeature 2018-07-20 20:09:37 -04:00
Esteban MIno
9c95554933 fix detection on submit password 2018-07-20 19:58:03 -04:00
Csaba S
c11dea9afc
Merge branch 'develop' into transaction-notifications 2018-07-20 20:09:57 +02:00
Csaba Solya
72591d4f41 remove dropped handler 2018-07-20 19:58:26 +02:00
Esteban Miño
cb045fd8fe
Auto-detect tokens #3034 (#4683) 
* 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
 2018-07-20 12:36:24 -04:00
Csaba Solya
a3822b4680 add notifications 2018-07-20 13:20:40 +02:00
Esteban MIno
009b1cefbe keyring unlocked detect and unit tests 2018-07-19 19:46:46 -04:00
Csaba Solya
6921f94bfe initial test 2018-07-19 22:34:06 +02:00
Esteban MIno
3b97d816ff detect tokens when submit password and new account selected 2018-07-19 15:56:38 -04:00
Bruno Barbieri
9be2248d7a
Merge pull request #4625 from MetaMask/initial-trezor-support 
Initial trezor support
 2018-07-19 15:00:59 -04:00
Dan Finlay
3784a7e2c8
Merge pull request #4656 from MetaMask/portal-metamask-ens-test 
Add support for .test ENS domains
 2018-07-19 09:41:28 -07:00
Jenny Pollack
ae811628d9
Merge pull request #4833 from MetaMask/brave-flag-sentry 
sentry - add detection for Brave Browser
 2018-07-19 11:58:59 -04:00
Jenny Pollack
16fc7efef1 remove local tests 2018-07-19 09:59:58 -04:00
bitpshr
d24b5b76fd Update variable name 2018-07-19 08:04:17 -04:00
bitpshr
d02c160db5 Updates for linting 2018-07-19 08:04:17 -04:00
bitpshr
94f99b6ed0 Updates 2018-07-19 08:04:17 -04:00
bitpshr
8df433ca84 Add support for .test Ropsten ENS domains 2018-07-19 08:04:17 -04:00
Jenny Pollack
1a9748667d sentry - add detection for Brave Browser 2018-07-19 02:22:56 -04:00
Dan Finlay
dd9e3587d4
Do not inject on ani.gamer.com.tw 
Fixes #4799
 2018-07-18 15:23:32 -07:00
brunobar79
aa5a987765 added some e2e tests 2018-07-17 21:54:04 -04:00
brunobar79
e89350b19f added tests for removeAccount 2018-07-17 01:44:28 -04:00
brunobar79
de4265c629 added more unit tests 2018-07-17 01:17:18 -04:00
brunobar79
e5512c306d added unit tests for metamaskcontroller 2018-07-16 19:36:08 -04:00
Dan Finlay
6be6b9ef29
Do not inject on blueskybooking.com 
Per zendesk 2312.
 2018-07-16 15:39:35 -07:00
brunobar79
d21d408d64 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-13 20:53:22 -04:00
Esteban MIno
2fffe09873 detect tokens through infura 2018-07-12 20:43:43 -04:00
Dan Finlay
c4ae399577
Add harbourair.com to injection block list 
This site was getting unexpected results when MetaMask was installed.

https://consensys.zendesk.com/agent/tickets/2312
 2018-07-12 14:21:32 -07:00
Thomas Huang
5a45df72c6
Merge pull request #4669 from MetaMask/removeNonceTrackerFunction 
Remove unsued nonce tracker function
 2018-07-12 11:48:05 -07:00
brunobar79
07d8bfaec5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-12 12:54:08 -04:00
Alexander Tseung
0d4dbbec2a
Merge pull request #4691 from MetaMask/i4404-confirm-refactor 
Refactor and redesign confirm transaction views
 2018-07-11 15:31:50 -10:00
brunobar79
80e875308b forget device and autiload account features added 2018-07-11 21:21:36 -04:00
brunobar79
89cc48789a update to temp dependencies 2018-07-11 20:01:44 -04:00
Esteban MIno
910713c6b3 improve tests 2018-07-11 15:59:05 -04:00
brunobar79
523cf9ad33 account removal is working 2018-07-11 00:20:40 -04:00
Thomas
5188b727d4 Merge branch 'develop' into removeNonceTrackerFunction 2018-07-10 11:34:00 -07:00
frankiebee
28c509914b Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896 2018-07-10 11:32:05 -07:00
brunobar79
85a4e39b05 fix trezor label 2018-07-09 20:54:47 -04:00
brunobar79
d3f793a44a added label for trezor accounts 2018-07-09 19:04:30 -04:00
brunobar79
2de3039b6b fix account duplication 2018-07-09 17:55:37 -04:00
brunobar79
7cca7ace2e fix all the account related bugs 2018-07-09 17:24:52 -04:00
Alexander Tseung
a2d9c43fba Various fixes from PR comments 2018-07-06 16:27:08 -07:00
Alexander Tseung
9cde5ab11b Use eth-method-registry to get method data 2018-07-06 16:27:08 -07:00
Alexander Tseung
7732cd4100 Display newest transaction 2018-07-06 16:27:08 -07:00
Alexander Tseung
ea9d51e427 Refactor and redesign confirm transaction views 2018-07-06 16:27:08 -07:00
brunobar79
7c9d942ba1 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-06 19:21:18 -04:00
brunobar79
6b2511f94f UI refactor 2018-07-05 20:59:31 -04:00
Dan J Miller
46cda26f3b
Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui 
Use background gas price estimation method in new ui.
 2018-07-05 08:01:03 -02:30
brunobar79
9d3f2435e5 lint fix 2018-07-03 15:46:15 -04:00
kumavis
77daed5c74 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-07-03 12:42:14 -07:00
brunobar79
3837c2ddd7 fix merge conflicts 2018-07-03 15:41:18 -04:00
brunobar79
13b03ec090 fix lint errors 2018-07-03 14:29:36 -04:00
brunobar79
595447ccac Merge remote-tracking branch 'upstream/develop' into HEAD 2018-07-03 14:21:17 -04:00
bitpshr
badf0ce314 Conditionally use Promise-based extension API when creating windows 2018-07-03 13:33:13 -04:00
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
Esteban MIno
0494b2fc8a Merge branch 'develop' into detectTokenFeature 2018-07-03 13:23:15 -04:00
Esteban MIno
03fd4355af passtest-lint 2018-07-03 12:53:06 -04:00
brunobar79
a8f745f9fe eslint --fix . 2018-07-02 18:49:33 -04:00
kumavis
a89902c170 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-07-02 13:54:05 -07:00
brunobar79
317c3084df allow to open specific route in fullscreen mode 2018-07-02 15:14:31 -04:00
brunobar79
451c05bcbb fix environment detection regex 2018-07-02 15:14:05 -04:00
brunobar79
1494cc5e6c fix merge conflicts 2018-07-01 11:41:34 -10:00
PhyrexTsai
11736e6318
Update to support pathnames on IPFS hash 
As @Georgi87 mentioned about pathnames on the domain like `http://phyrextsai.eth/home` will pass to IPFS hash and append `/home` on redirection url.

You can try the example below: 
http://phyrextsai.eth/index.html
http://phyrextsai.eth/images/phyrex.jpg
 2018-06-29 13:57:41 +08:00
Dan
de01a6f112 Use background gas price estimation method in new ui. 2018-06-28 21:28:59 -02:30
Esteban MIno
6284e66481 tests for spec 2018-06-27 22:18:06 -04:00
Esteban MIno
0e863d5fab network store to detect token 2018-06-27 19:54:43 -04:00
Esteban MIno
bfac9c2c2d detect tokens polling 2018-06-27 16:29:24 -04:00
frankiebee
9b92ba4c47 trandsactions - remove rejected transactions from history 2018-06-25 15:07:54 -07:00
tmashuang
dd18684a5d Remove unsued nonce tracker function 2018-06-25 15:01:14 -07:00
frankiebee
7d3da0ae96 migration 27 - remove rejected transactions from state 2018-06-25 11:45:00 -07:00
brunobar79
87dfca0767 fixes 2018-06-23 02:52:11 -04:00
Thomas Huang
46b2f1df11
Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553 
set an id to the metamask notification popup
 2018-06-20 15:50:07 -07:00
Dan Finlay
0481335dda Improved rpc-engine usage 2018-06-18 15:50:27 -07:00
Dan Finlay
5e4f3e430a Get popup appearing when suggesting new token 2018-06-18 15:37:37 -07:00
Dan Finlay
f14ed32980 Begin letting UI show suggested tokens 2018-06-18 15:33:50 -07:00
Dan Finlay
5d7c2810a7 Begin adding eth_watchToken 2018-06-18 15:07:08 -07:00
kumavis
356cc50095 notice controller - properly show new notices for non-new users 2018-06-18 12:10:35 -07:00
kumavis
9a7f363c2a
Merge pull request #4586 from MetaMask/block-idex-phisher 
Add apparent phishing address to block list
 2018-06-18 11:26:19 -07:00
vittominacori
ff3c262621 set the popup id returned by create promise 2018-06-17 19:16:30 +02:00
vittominacori
4c1b526137 set an id to the metamask notification popup 2018-06-16 18:51:01 +02:00
kumavis
33cb0a8cb2 lint - fix recipient-blacklist.js 2018-06-15 11:07:56 -07:00
kumavis
83c02f90cf blacklist - recipient blacklist as js for inline comments 2018-06-15 10:47:42 -07:00
kumavis
753743e746
Update recipient-blacklist-config.json 2018-06-15 10:32:09 -07:00
Dan Finlay
a42299aab7
Add apparent phishing address to block list 
In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money.
 2018-06-15 08:55:39 -07:00
Dan Finlay
3a6cc3c8fd Re-enable dapp reload on network change 
We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform.

Makes it easy to re-implement the change.
 2018-06-14 15:15:23 -07:00
kumavis
d9ef72cb7e
Merge branch 'develop' into save-brave 2018-06-14 10:11:35 -07:00
Dan Finlay
11bfdf444d Handle brave throws 2018-06-14 10:09:45 -07:00
Dan Finlay
d814bee578
Merge pull request #4571 from MetaMask/disable-diagnostics 
diagnostics - temporarily disable
 2018-06-14 10:03:53 -07:00