1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-14 21:57:12 +01:00
Commit Graph

3105 Commits

Author SHA1 Message Date
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
Dan Finlay
3a5089da6f
Merge pull request #4566 from MetaMask/notice-phishing
Push new notice on recent phishing incidents
2018-06-14 09:49:38 -07:00
kumavis
722c5ae821 notice-controller - update memStore on boot 2018-06-14 00:23:01 -07:00
kumavis
4b8a4fd5fe test - e2e - check for phishing warning 2018-06-13 23:52:51 -07:00
kumavis
44a8e48a04 notices - replace getLatestNotice with getNextNotice 2018-06-13 23:30:31 -07:00
kumavis
ac8b56a00d notices - notices collection is now manually edited 2018-06-13 22:56:46 -07:00
kumavis
e9cb650832 Merge branch 'develop' of github.com:MetaMask/metamask-extension into ValidateEmptyKey 2018-06-13 21:11:04 -07:00
kumavis
691ac5d288 account-import-strategies - ensure privateKey is prefixed before converting to buffer 2018-06-13 21:06:33 -07:00
kumavis
43e805805e diagnostics - temporarily disable 2018-06-13 17:40:28 -07:00
kumavis
7b414f3ed0 background - persistence pipeline - fix persistence bug 2018-06-13 16:45:18 -07:00
Bruno
704e2a21f8 clean up 2018-06-13 02:09:25 -04:00
Bruno
bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -04:00
Bruno
8763ea898e move TrezorKeyring to its own package 2018-06-13 01:32:13 -04:00
Bruno
d4201ae1cc added support for signPersonalMessage 2018-06-13 00:22:04 -04:00
Erik Marks
bb201d7c4a
Merge branch 'develop' into stop-reload-on-network-change 2018-06-12 13:39:21 -07:00
kumavis
604289c96c controllers - transaction - prefer log over console 2018-06-12 12:08:06 -07:00
kumavis
177cc3f280 metamask - ensure all nonce locks are released 2018-06-12 11:51:35 -07:00
kumavis
8f93e34175 nonce-tracker - wrap nonce calculations in try-catch and release lock on error 2018-06-12 11:31:26 -07:00
kumavis
055346843b lint - fix lint for network 2018-06-12 11:27:32 -07:00
kumavis
6a2649a90f network - import createBlockTrackerInspectorMiddleware and rearrange cache middleware order 2018-06-12 11:12:32 -07:00
Erik Marks
b982961381 removed auto-reload.js, moved global web3 export to inpage.js 2018-06-12 11:04:37 -07:00
kumavis
c86f935889 nonce-tracker - wrap nonce calculations in try-catch and release lock on error 2018-06-12 10:55:54 -07:00
Erik Marks
f461bd8812 wip 2018-06-12 09:28:50 -07:00
Dan Finlay
b24efcb1cd Make account import tests much more specific
However, they no longer seem to work. I'm unclear why this test is
failing. The private key being provided should be valid.
2018-06-11 14:58:05 -07:00
kumavis
ebb9447593 test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST_CONFIG 2018-06-11 14:25:49 -07:00
kumavis
02f5502e16 test - e2e - inject metamask config to point at localhost 2018-06-11 11:04:28 -07:00
kumavis
0db776c3cc lint - controllers - whitepace fix 2018-06-11 10:17:09 -07:00
Bruno
999b6bd24a clean up 2018-06-11 01:58:19 -04:00
Bruno
68d97211ff sign transactions is pretty close 2018-06-11 01:52:41 -04:00
Bruno
d1880073f6 balances working 2018-06-10 21:10:22 -04:00
Bruno
f6b27fa9eb add account working 2018-06-10 19:02:54 -04:00
Bruno
f5f66f59d7 clean up 2018-06-10 18:48:42 -04:00
Bruno
8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
Jenny Pollack
e7c2710a55 Merge branch 'develop' into save-brave 2018-06-07 14:10:56 -07:00
kumavis
3ce83570ee network - provider - infura - use block-reemit middleware 2018-06-07 12:26:37 -07:00
Dan Finlay
c0d2dab28b
Merge pull request #4523 from MetaMask/i4462-FixResetBug
Fix bug where reset account would not work.
2018-06-07 10:47:34 -07:00
kumavis
66b703b1a4 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-06-07 10:07:36 -07:00
Jenny Pollack
fd8bcc9cb1 lint 2018-06-06 22:08:32 -07:00
Jenny Pollack
01a1eff8a8 remove loglevel 2018-06-06 18:35:41 -07:00
Jenny Pollack
7edde61c12 preferred first languauge - check for Brave 2018-06-06 18:24:45 -07:00
Jenny Pollack
275c31855d first language - add check for brave browser on getAcceptLanguages 2018-06-06 18:10:05 -07:00
Dan
11f5fdc927 Merge branch 'develop' into i3725-refactor-send-component- 2018-06-06 21:55:20 -02:30
Dan Finlay
c53c5d5c9e Fix bug where reset account would not work.
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.
2018-06-06 16:46:39 -07:00
kumavis
aea9491f6a
Merge pull request #4477 from MetaMask/i3073-block-gravityforms
Block gravityforms.com from web3 injection
2018-06-06 12:24:05 -07:00
Dan
ae55e8a3c1 Merge branch 'develop' into i3725-refactor-send-component- 2018-06-06 16:40:43 -02:30
kumavis
2198276bd5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-06-06 12:05:38 -07:00
kumavis
d30f03dcbf
Merge pull request #4414 from scsaba/recipient-blacklist
Disallow sending to ganache default accounts on main net
2018-06-06 11:54:01 -07:00
kumavis
ffb8fa1649 lint - remove unused require 2018-06-06 11:17:52 -07:00
kumavis
9d77b0a196 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-06-06 11:08:29 -07:00
Whymarrh Whitby
3cc85c219e Add account type assertion to PreferencesController#setAccountLabel 2018-06-05 14:06:56 -07:00
Dan Finlay
d61c979de6 Add validation for importing empty private key
Previously importing an empty string would result in a new empty Keyring
object to be constructed, with no notification to the user.

Now we render a clear error explaining the mistake.
2018-06-05 13:44:03 -07:00
kumavis
60e61e6834 diagnostics - fix reportMultipleKeyrings call 2018-06-05 12:36:15 -07:00
kumavis
36a0574f56 diagnostics - minor fixes 2018-06-05 12:20:24 -07:00
kumavis
ece5cfc785 lint - fix diagnostics reporter 2018-06-05 11:53:21 -07:00
kumavis
20bdba3d17 diagnostics - rewrite bug-notifier as diagnostics-reporter 2018-06-05 11:51:27 -07:00
kumavis
6247e54fcc add multivault detection to diagnostics reporting 2018-06-05 11:15:58 -07:00
Dan
aee9247faa Merge branch 'develop' into i3725-refactor-send-component- 2018-06-04 22:32:30 -02:30
Dan Finlay
41f292437d Record identity before deleting it 2018-06-04 15:34:38 -07:00
Dan Finlay
ae156e1087 Mock notifier in test 2018-06-04 15:26:01 -07:00
Dan Finlay
f07ca73e07 Add comment 2018-06-04 15:18:12 -07:00
Dan Finlay
415ab2d534 Do not alert to user 2018-06-04 15:17:03 -07:00
Dan Finlay
22754e3e1f Linted 2018-06-04 15:10:51 -07:00
Dan Finlay
7b87afb4b7 Add bug info under metadata key 2018-06-04 15:06:21 -07:00
Dan Finlay
0eacee8e45 Add first time info to bug report 2018-06-04 15:03:31 -07:00
Dan Finlay
3bfc40c284 Add version to report 2018-06-04 14:59:46 -07:00
Dan Finlay
d07c664b2c Fine tune error posting 2018-06-04 14:30:24 -07:00
Dan Finlay
b858cc4b1b Only notify first time lost ids are detected 2018-06-04 14:24:45 -07:00
Dan Finlay
f3b385cb09 Add reporting uri 2018-06-04 14:22:34 -07:00
Dan Finlay
fd1ce4d741 Begin adding unconfigured notifier 2018-06-04 14:21:46 -07:00
Dan Finlay
8fcaa2cf56 Persist lost identities to storage for later analysis 2018-06-04 14:05:56 -07:00
Dan Finlay
f5d4acf53b Add minimal user notification of issue. 2018-06-04 14:01:05 -07:00
Dan Finlay
7382bd0847 Add identity synchronizing code
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.
2018-06-04 13:43:26 -07:00
Dan Finlay
764643ed5f
Block gravityforms.com from web3 injection
Fixes #3073
2018-06-03 19:38:47 -07:00
kumavis
eb3241ccba metamask-controller - clear account labels on restore from seed phrase 2018-06-03 12:02:35 -07:00
kumavis
54a9c62fd6 preferences controller - jsdoc fix 2018-06-03 11:30:11 -07:00
kumavis
d4cdd1a0f3 metamask - update preferences controller identities on keyring controller update 2018-06-03 11:27:25 -07:00
kumavis
a08e58f0fd
Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix
sentry - message rewrite - guard against missing message
2018-06-03 10:50:05 -07:00
kumavis
72dde75e58
Merge pull request #4425 from MetaMask/master
Merge Master into Develop
2018-06-01 17:06:30 -07:00
Dan Finlay
b1b90a6bb9 Version 4.7.1 2018-06-01 15:48:16 -07:00
Whymarrh Whitby
1a18f03e2f
Fix return value of migration 26 when missing KC or PC 2018-06-01 15:46:31 -07:00
bitpshr
ccae937f41 Properly end the middleware stack on RPC error 2018-06-01 12:57:57 -04:00
PhyrexTsai
f90d070190
Merge branch 'develop' into portal-metamask 2018-06-01 15:41:18 +08:00
Yung chieh Tsai
77d17f2d55 Update ipfs to infura 2018-06-01 11:27:05 +08:00
Dan
701611e317 Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-estimation 2018-05-31 15:39:24 -02:30
kumavis
e2e4496c87 sentry - message rewrite - guard against missing message 2018-05-30 17:42:41 -07:00
Dan
0f20fce9b7 Auto update gas estimate when to changes. 2018-05-30 20:54:31 -02:30
Csaba Solya
1dda0c6469 remove generating blocked accounts and use a config file instead 2018-05-30 21:15:59 +02:00
Csaba Solya
3e489ea165 fix documentation 2018-05-30 17:42:41 +02:00
Csaba Solya
cf73581c0e adding tests for recipient blacklist checker 2018-05-30 17:38:27 +02:00
Csaba Solya
6affd8f949 adding transaction controller tests 2018-05-30 16:24:40 +02:00
Csaba Solya
afb5788861 initial implementation 2018-05-30 15:53:18 +02:00
Yung chieh Tsai
181a11eae2 Update default provider 2018-05-30 09:57:31 +08:00
kumavis
4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
kumavis
39069710d1
Merge pull request #4390 from MetaMask/i18n-brave-fix
i18n - getFirstPreferredLangCode - guard against missing i18n api
2018-05-29 11:05:12 -07:00
Yung chieh Tsai
384cb126dd Update lib 2018-05-29 19:29:12 +08:00
kumavis
58de5671cc controllers - transactions - fix tx status update on boot 2018-05-29 00:53:44 -07:00
kumavis
16d0db15e0 controllers - transactions - fix tx confirmation 2018-05-29 00:41:28 -07:00
kumavis
c9f3404ca5 metamask-controller - lint fix 2018-05-28 23:25:48 -07:00
kumavis
7e87600042
metamask-controller - lint fix 2018-05-28 23:14:38 -07:00
kumavis
09601439e3 metamask-controller - update preferences controller addresses after import account 2018-05-28 23:00:22 -07:00
kumavis
fe42de4642 metamask-controller - update preferences controller addresses after import account 2018-05-28 22:58:14 -07:00
kumavis
e3ecc94a52
i18n - getFirstPreferredLangCode - guard against missing i18n api
fix for brave
2018-05-28 21:50:23 -07:00
Yung chieh Tsai
829deacb57 Rename files 2018-05-29 12:44:37 +08:00
MikeCheng1208
8b8cc94f6f Intergrate ENS with IPFS 2018-05-29 12:38:32 +08:00
MikeCheng1208
88a6b4edc7 setTimeout bug fix 2018-05-29 12:38:32 +08:00
MikeCheng1208
695b157e7b Intergrate ENS with IPFS 2018-05-29 12:38:25 +08:00
kumavis
1b3fedd10d controllers - transaction - pending-tx-tracker - lint fix 2018-05-28 15:54:47 -07:00
kumavis
5be154ea20 controllers - transactions - merge @frankiebee's work with mine 2018-05-28 14:29:31 -07:00
Anton
71a6e97327 cleanErrorStack moved to separate library module
more errors traces cleaned up
2018-05-28 22:57:08 +02:00
Anton
1d23a5c81b error message fix 2018-05-28 18:08:33 +02:00
Anton
62dc6e20eb Clean up user rejection error message 2018-05-28 17:57:45 +02:00
kumavis
9f8d5f0547 controllers - transactions - pending-tx-tracker - _getBlock - poll until block is truthy 2018-05-25 13:30:26 -07:00
kumavis
61ef4f1f29 tx-gas-utils - query for block without tx bodies 2018-05-25 13:21:42 -07:00
kumavis
76cfb10864 metamask-controller - wrap txController.addUnapprovedTx for wallet middleware reference before txController is instantiated 2018-05-24 16:05:07 -07:00
kumavis
aab9691c42 provider - update wallet hooks for new wallet middleware 2018-05-24 15:51:46 -07:00
kumavis
66a62dfd0c metamask-controller - fix account lookup hook 2018-05-24 13:44:33 -07:00
kumavis
91accee2c6 account-tracker - guard against empty block 2018-05-24 13:43:36 -07:00
kumavis
49ef93b991 controllers - recent-blocks - guard against empty block 2018-05-24 13:43:16 -07:00
kumavis
ee800de025 controllers - recent-blocks - wrap block-tracker event in try-catch 2018-05-23 22:46:20 -07:00
kumavis
dc96b1eb93 Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-23 22:34:00 -07:00
kumavis
f41198fbb6 sentry - setupRaven - ensure message is truthy 2018-05-23 22:33:02 -07:00
kumavis
22e59af741 controllers - recent-blocks - ensure full blocks 2018-05-23 22:32:33 -07:00
kumavis
3d8f41e912
Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker
Transactions use new block tracker
2018-05-23 16:33:02 -07:00
kumavis
eb2423799d controllers - account-tracker - refactor + update for eth-block-tracker@4 2018-05-23 16:22:40 -07:00
kumavis
53b946362a controllers - recent-blocks - doc update 2018-05-23 16:20:35 -07:00
frankiebee
61caee9d94 Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker 2018-05-22 16:45:20 -07:00
frankiebee
c4b09da34e transactions - update pending-tx-tracker to use the new block tracker 2018-05-22 16:42:06 -07:00
frankiebee
10aecf4922 remove dependance on the even tx:confirmed 2018-05-22 16:40:01 -07:00
kumavis
145016be4c Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-22 16:22:10 -07:00
kumavis
3a80f3dd83 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-22 13:20:04 -07:00
kumavis
fa37ba3992 controllers - recent-blocks - pull first historical blocks in parallel 2018-05-22 01:58:36 -07:00
Frankie
e8b2e11c56 Reveal get filtered tx list (#4332)
* add getFilteredTxList from txController to getApi

* transactions - remove dead code (isNonceTaken)
2018-05-21 16:00:44 -07:00
kumavis
7a65c22a02
Merge branch 'develop' into ci-publish-release 2018-05-21 14:58:37 -07:00
kumavis
f19d8a5905 Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into Trigalti-develop 2018-05-21 14:14:03 -07:00
kumavis
08d95bbafa
Merge pull request #4034 from whymarrh/account-nicknames
Move account names out of KeyringController
2018-05-21 13:44:07 -07:00
kumavis
e447438504
Merge pull request #3997 from jakubsta/master
Allow other extensions to connect
2018-05-21 13:41:09 -07:00
Dan Finlay
713c77db54
Merge pull request #4199 from MetaMask/i3487-provider-errors
RPC error middleware for json-rpc-engine
2018-05-18 11:57:29 -07:00
kumavis
2d4d77b17d docs - jsdoc - fix syntax 2018-05-18 11:52:28 -07:00
simon
22753d96fd Added trailing comma for eslint 2018-05-18 16:11:46 +02:00
simon
41502cb384 Added adyen.com to blacklisted domains because postMessages are blocking card encryption 2018-05-18 15:43:27 +02:00
Whymarrh Whitby
67310e151e Fix migration 026 to produce the correct shape for state.identities 2018-05-17 13:35:38 -02:30
Whymarrh Whitby
2d13fac476 Add migration to move identities from KeyringController 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
c54e4c7191 Add PreferencesController#setAddresses to update ids 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
cbe4d0d88c Update AddressBookController to read from preferences store 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
kumavis
3084dc47d1 recent-blocks - fix backfill blockNumber tracking 2018-05-17 00:13:20 -07:00
kumavis
41c04ef721 controllers - recent-blocks - fix pifyd setTimeout args 2018-05-16 23:13:25 -07:00
kumavis
08dc238c9f deps - fix incorrect dep paths and versions 2018-05-16 22:46:11 -07:00
kumavis
32b3b8f2a7 controllers - balance - update for eth-block-tracker@4 2018-05-16 21:16:05 -07:00
kumavis
623533ab15 recent-blocks - update for eth-block-tracker@4 2018-05-16 21:13:53 -07:00
kumavis
3e04840a71 remove unused events-proxy, was replaced with module swappable-obj-proxy 2018-05-16 21:10:41 -07:00
kumavis
b6eff15bd2 lint fix 2018-05-16 21:08:19 -07:00
kumavis
088d7930e0 network - create provider and block-tracker via json-rpc-engine 2018-05-16 20:46:34 -07:00
kumavis
44f31f9a7e Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps 2018-05-16 13:56:32 -07:00
kumavis
76c8cb3d7b
Merge pull request #4146 from MetaMask/sentry-error-like2
sentry - add helper to fully rewrite all error messages
2018-05-16 13:54:15 -07:00
kumavis
8e1cad5ff6
tx-state-history-helper - use more readable Date.now method 2018-05-16 13:05:07 -07:00
kumavis
d62fc22611 network - remove debugging console.log 2018-05-16 11:59:50 -07:00
kumavis
c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
bitpshr
ce2834400c Add new json-rpc-engine middleware for improved error handling 2018-05-14 08:33:47 -04:00
Csaba Solya
2081768fc5 fix lint issues 2018-05-10 13:43:31 +02:00
Csaba Solya
3642810584 remove unnecessary lib 2018-05-10 13:34:56 +02:00
Csaba Solya
349fb9e0bc revert unnecessary change in state manager 2018-05-10 13:33:40 +02:00
Csaba Solya
9026651224 add time stamps to transaction history log entries 2018-05-10 13:26:02 +02:00
bitpshr
6351b7bb88 Fix documentation typo 2018-05-07 15:08:43 -04:00
kumavis
a1d13d45cf lint - cleanup some unused variables 2018-05-02 18:23:55 -07:00
kumavis
fec4c50657 controllers - network - move default config out of first-time-state 2018-05-02 18:03:59 -07:00
frankiebee
a45cb75435 transactions - add a nonce check utility for ui use 2018-05-01 13:57:43 -07:00
frankiebee
62bf76db53 fix - getTxsByMetaData check if the key is in the object not if the value is truthy 2018-05-01 13:57:14 -07:00
kumavis
53caa49666 network - refactor to remove unnecesary code 2018-04-30 17:59:53 -07:00
kumavis
6f316ca450 network - remove setNetworkEndpoints 2018-04-30 16:36:17 -07:00
kumavis
bfedd2776d controllers - network - more semantic assert 2018-04-30 16:23:16 -07:00
kumavis
84275456e4
Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframe
Blacklist problematic shopify iFrame
2018-04-30 17:06:19 -06:00
kumavis
93a9ef284e sentry - add helper to fully rewrite all error messages 2018-04-30 16:05:01 -07:00
Thomas Huang
3180b69b97
Merge pull request #4140 from MetaMask/v4.6.1
Version 4.6.1
2018-04-30 14:37:22 -07:00
Bryce Neal
18a8a21179 Blacklist problematic shopify iFrame 2018-04-30 14:35:47 -07:00
kumavis
e881ea7aaf sentry - report error-like messages using the obj message 2018-04-30 12:10:15 -07:00
kumavis
2a8d3ea450 sentry - wrap report modifiers in a try-catch 2018-04-30 12:07:48 -07:00
kumavis
5f3f8c85fc
Merge pull request #4059 from MetaMask/i-4033-seed-words
Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
2018-04-30 12:04:53 -06:00
frankiebee
98ae853b6c require log 2018-04-30 09:57:36 -07:00
kumavis
755d4945f7
Merge pull request #4132 from MetaMask/master
Master
2018-04-30 09:38:12 -06:00
frankiebee
706647785c log emitter errors 2018-04-29 16:35:08 -07:00
frankiebee
7eb735651b transactions - run event emitters outside context of _setTxStatus 2018-04-29 16:32:16 -07:00
frankiebee
873f85d996 guard adainst raven erroring 2018-04-29 13:46:07 -07:00
kumavis
2b9925a9e4
Merge pull request #4110 from MetaMask/master
Develop - Add commits to develop that are already in Master
2018-04-27 16:17:46 -06:00
bitpshr
8c5994abc9 Return 0 for token rate fetch failures 2018-04-26 18:31:54 -04:00
Thomas Huang
4e7b0ff15c
Merge pull request #4095 from MetaMask/v4.6.0
Version 4.6.0
2018-04-26 14:16:35 -07:00
kumavis
dcd04091cc
Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3
docs and file organization for txController
2018-04-25 16:52:46 -06:00
kumavis
1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
frankiebee
8ffce8b59d transactions - more docs and clean ups 2018-04-25 11:13:51 -07:00
Dan Finlay
f6653b9f94
Merge pull request #4069 from MetaMask/i4056-LatestPriceApi
Use latest balanc3 api for prices
2018-04-25 10:42:03 -07:00
Dan Finlay
7ec775d614 Use latest balanc3 api for prices 2018-04-24 14:12:57 -07:00
Dan
0fbd389a50 lint fix 2018-04-24 13:18:34 -02:30
Dan
ed264d3479 Merge branch 'master' into dm-docs-2 2018-04-24 12:36:30 -02:30
Dan
020824f3c7 Remove accidentally added code in message-manager. 2018-04-24 12:36:26 -02:30
Dan
016d492414 Remove unnecessary doc comment. 2018-04-24 12:20:38 -02:30
Dan Finlay
a833f02f33 Use the metamask balanc3 dev price api
Fixes #4056
2018-04-23 16:39:33 -07:00
Dan Finlay
9dd8158b1d
Merge pull request #4029 from MetaMask/DocumentMetaMaskController
Added docs to MM-controller
2018-04-23 15:49:47 -07:00
Dan Finlay
4289f813e9
Merge pull request #3968 from MetaMask/gh-3653
Clean up network config
2018-04-23 15:49:17 -07:00
Dan Finlay
9679cdae02
Merge pull request #4041 from MetaMask/DocumentBackground
Document Background Script
2018-04-23 14:49:01 -07:00
Dan Finlay
5abb0256a9 Linted docs 2018-04-23 14:47:11 -07:00
Alexander Tseung
9e41f58af2 Clean up network config 2018-04-23 10:18:05 -07:00
Dan Finlay
621e9334bc Cleaned up some typos and JSDocs in Transactions
Nonce tracker is not fully documented yet.
Have not yet touched:
- tx-state-manager
- tx-state-history-helper
- util
- tx-gas-utils
- pending-tx-tracker
2018-04-23 09:43:18 -07:00
Dan
0c26df9653 Fix nits. 2018-04-23 14:11:02 -02:30
Alexander Tseung
1d2d9798cb Merge branch 'master' of https://github.com/MetaMask/metamask-extension into i-4033-seed-words 2018-04-22 09:28:29 -07:00
Alexander Tseung
477b74124d Revert "Fix UI getting stuck in Reveal Seed screen"
This reverts commit 2c8156ebe9.
2018-04-21 22:23:45 -07:00
Dan Finlay
74c419f9b6
Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr
Documentation
2018-04-20 14:10:05 -07:00
Dan
69920045e9 Minor fixes in a number of docs. 2018-04-20 15:48:58 -02:30
Dan
3ec22dc7e1 Notification manager method docs. 2018-04-20 15:48:44 -02:30
Dan Finlay
327ec03d6f Remove wrong chars 2018-04-20 10:45:06 -07:00
Dan Finlay
357582cc52 Add ui note to background docs 2018-04-20 10:41:41 -07:00
Dan Finlay
17afe922d4 Lint background docs 2018-04-20 10:40:53 -07:00
Dan Finlay
ff689748a7 Document MetaMaskState and TransactionMeta 2018-04-20 10:39:31 -07:00
Dan Finlay
fad8afb7d1 Linted jsdocs 2018-04-20 09:26:24 -07:00
Dan
71b0de76ff Merge branch 'master' into dm-docs-2 2018-04-20 13:23:17 -02:30
bitpshr
8636f3bae5 Clean up JSDoc for background scripts 2018-04-19 15:14:00 -04:00
frankiebee
e862a5091e transactions - fix refernces 2018-04-19 12:07:45 -07:00
frankiebee
c20c97ce62 Merge branch 'master' into tx-controller-rewrite-v3 2018-04-19 11:49:11 -07:00
frankiebee
eeb9390de8 meta - transactions - docs yo! 2018-04-19 11:46:15 -07:00
bitpshr
9c7eafc86f Add more documentation to computed balances controller 2018-04-19 14:37:08 -04:00
Dan Finlay
16434776a4 Document Background Script 2018-04-19 11:27:53 -07:00
Dan
9f12c26d44 Even more documentation for various controllers and libs. 2018-04-19 13:08:56 -02:30
bitpshr
1ef6528921 Add JSDoc to various background scripts 2018-04-18 21:30:13 -04:00
Dan Finlay
f78d2f5e0b Added docs to MM-controller 2018-04-18 17:54:50 -07:00
Dan Finlay
4544d57f26
Merge pull request #3984 from whymarrh/3941-jsdoc
Add a few docblocks to background files
2018-04-18 15:37:50 -07:00
bitpshr
6dbdc87713 Add generated docs 2018-04-18 17:24:36 -04:00
bitpshr
c9f83fe8bc Add JSDoc to various background scripts 2018-04-18 17:02:08 -04:00
Dan Finlay
6742a5b272
Merge pull request #3987 from MetaMask/dm-docs-1
Documentation for various controllers and and lib utils
2018-04-18 13:39:31 -07:00
Whymarrh Whitby
603c1310ff Add a few missing docblocks to background files 2018-04-18 18:00:22 -02:30
Dan
164f9c4662 Missing bracket in docblock. 2018-04-18 16:17:06 -02:30
Dan
649d2f8b22 Merge branch 'master' into dm-docs-1 2018-04-18 16:15:48 -02:30
Dan
e80bd230b9 NO MIXED TABS AND SPACES 2018-04-18 16:11:39 -02:30
Dan
6d96b1a2ab Documentation fix: @constant -> @property 2018-04-18 16:08:08 -02:30
Alexander Tseung
2c8156ebe9 Fix UI getting stuck in Reveal Seed screen 2018-04-18 10:18:24 -07:00
Jakub Stasiak
ad7d38c0dc Update: allow other extension to connect 2018-04-17 21:49:40 +02:00
Alexander Tseung
b0a105ce80 Fix confirmation popup not always opening 2018-04-17 08:58:37 -07:00
Dan
6da00c4061 Add missing descriptions in util.js 2018-04-17 00:56:46 -02:30
Dan
7b5d506cec Document async function as returning a promise. 2018-04-17 00:55:10 -02:30
Dan
128cb1af46 Improve documentation of promises that return undefined. 2018-04-17 00:54:16 -02:30
Dan
e9ca7199ab Typo fixes, type fixes on the return clauses of the buyEthUrl and getPrefferedLangCode functions. 2018-04-16 21:23:29 -02:30
Dan Finlay
0668976514
Merge branch 'master' into i3981-contract-rates 2018-04-16 16:32:56 -07:00
Dan
cc7e71488e Spell deprecated correctly. 2018-04-16 19:47:52 -02:30
Dan
23acddf8f6 @params -> @param fix 2018-04-16 19:45:27 -02:30
bitpshr
b4912f29cd Disable token price polling when no client is active 2018-04-16 18:12:05 -04:00
Dan
20a075657f Documentation for various controllers and libs 2018-04-16 14:38:04 -02:30
bitpshr
d0447f9058 Maintain token prices using a background service 2018-04-16 11:47:06 -04:00
bitpshr
7129d7c0f3 Require loglevel singleton in each module that uses it 2018-04-13 17:56:28 -04:00
frankiebee
943eea043c fix up - more docs 2018-04-13 13:18:45 -07:00
frankiebee
88f4212363 meta - transactions - code clean up and jsDoc 2018-04-13 12:38:07 -07:00
bitpshr
8974f933fc Add tests for ComposableObservableStore 2018-04-13 14:32:58 -04:00
bitpshr
4780f825b1 Add ComposableObservableStore for subscription management 2018-04-13 10:20:44 -04:00
frankiebee
3aaa28531e transactions - code cleanup 2018-04-12 12:24:16 -07:00
Dan
8fb1237d64 Documentation for environemnt-type.js 2018-04-12 13:17:46 -02:30
frankiebee
5494aa4f9c transactions - lint fixes 2018-04-10 14:54:30 -07:00
frankiebee
2d7c3c2b00 meta - transactions - create a transactions dir in controller and move relevant files into it 2018-04-10 14:28:05 -07:00
kumavis
4cae3d3b0d
Merge pull request #3921 from MetaMask/gh-3736-react-router
Add react-router integration
2018-04-09 10:55:46 -07:00
kumavis
2511a9e634
Merge pull request #3922 from MetaMask/empty-vault-fix
Empty vault - attempt recovery
2018-04-06 13:18:48 -07:00
kumavis
f9a6feb263 metamask - never persist if state is missing 2018-04-06 12:10:39 -07:00
kumavis
6f4dbd6d4a metamask - never persist if state is missing data 2018-04-06 12:09:26 -07:00
kumavis
0685381fdc metamask - attempt recovery from empty vault 2018-04-06 12:05:24 -07:00
kumavis
26fe638377
tx-state-manager - dont remove old tx history if candidate is not found 2018-04-06 10:18:00 -07:00
Alexander Tseung
4c15c0d3ba Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-05 23:17:22 -07:00
frankiebee
d4e30040a2 migrations - back fixes 2018-04-05 19:33:10 -07:00
frankiebee
7d243aacf9 create migration 25 2018-04-05 18:05:03 -07:00
frankiebee
b9243cd8b9 meta - create a migration template 2018-04-05 16:25:13 -07:00
kumavis
79932b7e17
Merge pull request #3857 from MetaMask/match-local-localecodes
Ensure get-first-preferred-lang-code.js matches locale codes from loc…
2018-04-05 15:08:19 -07:00
kumavis
741c6097a2
Merge pull request #3887 from MetaMask/i#3886
transactions - remove unnecessary keys on txParams
2018-04-05 15:06:29 -07:00
Frankie
2dfa8a2e50
Merge pull request #3900 from MetaMask/migration-error-report
migrations - report migrations errors to sentry with vault structure
2018-04-05 15:03:53 -07:00
kumavis
17931698a8
Merge pull request #3892 from alextsg/gh-3891
Fix populating txParams with undefined data
2018-04-05 15:02:35 -07:00
kumavis
ffc71ff7d2 migrator - dont overwrite error stack and warn to console 2018-04-05 13:38:34 -07:00
kumavis
7fdf663ea7 migrator - fix typo 2018-04-05 13:21:00 -07:00
kumavis
2b880dd4e0 migrations - report migrations errors to sentry with vault structure 2018-04-05 13:15:08 -07:00
frankiebee
c02da0f27c transactions - _normalizeTxParams will now return a new object for txParams 2018-04-05 12:12:02 -07:00
frankiebee
4efc718074 make migration-24 compat with first-time-state 2018-04-05 11:28:25 -07:00
Alexander Tseung
418926ffdf Fix populating txParams with undefined data 2018-04-05 09:54:41 -07:00
frankiebee
343f0e9e80 transactions - remove unnecessary keys on txParams 2018-04-04 22:29:43 -07:00
Alexander Tseung
5b2ace3b80 Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-04 18:21:35 -07:00
frankiebee
245c01bc0f transactions - make #_validateTxParams not async and "linting" wink wink nudge nudge 2018-04-04 14:57:27 -07:00
frankiebee
6ab938546c Merge branch 'master' of https://github.com/MetaMask/metamask-extension into normalize-transactions 2018-04-04 14:28:25 -07:00
frankiebee
8243824c6a hot-fix - migrate unaproved txParams so that the from is lowercase 2018-04-04 14:27:28 -07:00
frankiebee
457a47bf62 transactions - normalize txParams 2018-04-04 14:27:20 -07:00
kumavis
502011019a tx - txParams - allow chainId to be a hex string 2018-04-04 08:59:03 -07:00
Dan Finlay
86693af156
Add webby awards to web3 block list. 2018-04-03 20:33:19 -07:00
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
Dan
3c4b72bf2c Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-first-preferred-lang-code.js 2018-04-03 20:52:17 -02:30
Dan
5aff114001 Ensure get-first-preferred-lang-code.js matches locale codes from local directory names and chrome extension api. 2018-04-03 20:34:28 -02:30
kumavis
83df8b58ba tx-state-manager - validateTxParams - validate chainId is Number 2018-04-03 13:55:20 -07:00
frankiebee
3b1e4c74f5 transactions - dont throw if chain id is not a string 2018-04-03 12:17:53 -07:00
kumavis
038ad91454 app - currency - fix typo + prefer log over console 2018-04-03 10:39:23 -07:00
kumavis
79d63332ee app - currency - fix typo 2018-04-03 10:35:41 -07:00
kumavis
ecbab14cae app - warn on fetch errors instead of spamming sentry 2018-04-03 10:33:10 -07:00
kumavis
00657e14a8 build - correctly set METAMASK_ENV via envify 2018-04-03 09:51:33 -07:00
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
frankiebee
ab126b8c78 transactions gasLimit - use the block gasLimit if getCode fails 2018-04-02 15:43:32 -07:00
frankiebee
e8a480aac4 transactions validationt - valdate from field on txParams 2018-04-02 13:17:54 -07:00
Alexander Tseung
51ad2b03c8 Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-03-30 16:34:57 -07:00
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
frankiebee
3def45004a transactions#newUnapprovedTransaction - dont default origin to metamask 2018-03-30 16:00:11 -07:00
frankiebee
03b123a85d transactions - put the origing on the txMeta to help with debugging 2018-03-30 15:48:39 -07:00
kumavis
b49ad750dd Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-29 16:54:00 -07:00
Alexander Tseung
ef61ef2ce8 Fix i18n merge conflicts 2018-03-29 09:37:29 -07:00
kumavis
253abd60fc build - extension - move js files to toplevel 2018-03-28 21:29:57 -07:00
Frankie
650b716f55
Merge pull request #3782 from MetaMask/i3670-FixNonceBug
Add test for suspected nonce bug
2018-03-28 14:38:40 -07:00
Dan Finlay
f50a7a8fe8 Rename variable to be more understandable 2018-03-28 14:18:03 -07:00
kumavis
bedc1d1a47 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-28 14:12:20 -07:00
kumavis
5815de33fb build - rename 'popup.js' to 'ui.js' 2018-03-28 14:04:33 -07:00
Frankie
8766420f19
Merge pull request #3777 from MetaMask/etc-fixes
Sentry spam fix and etc fixes
2018-03-28 12:57:01 -07:00
Frankie
06112b3e30
Merge pull request #3765 from MetaMask/sentry-error-simplify
sentry - simplify error message 'Transaction Failed: known transaction'
2018-03-28 12:55:52 -07:00
kumavis
c4c459c8d7 controllers - currency - warn currency and encountered error 2018-03-28 09:41:25 -07:00
kumavis
21fbaed97c tx controller - explode on non-hex txParams + dont add chainId to txParams + sign with chainId as number 2018-03-27 23:55:18 -07:00
kumavis
97e1fcd331 sentry - simplify error message 'Transaction Failed: known transaction' 2018-03-27 20:41:10 -07:00
Frankie
76e83365ca
Merge pull request #3752 from MetaMask/sentry-error-fix
sentry - simplify all ethjs errors for better batching
2018-03-27 19:13:42 -07:00
kumavis
f7a2dc984e
Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset
Fix bug where resetAccount does not clear network cache
2018-03-27 19:10:31 -07:00
kumavis
d8357413ac
metamask-controller - fix typo 2018-03-27 19:04:28 -07:00
Dan Finlay
729a473210 Fix bug where resetAccount does not clear network cache
Fixes #3439
2018-03-27 18:07:51 -07:00
kumavis
165ae7d193 i18n - derrive locale codes from index 2018-03-27 18:07:24 -07:00
kumavis
5290570c8f Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-27 17:17:04 -07:00
frankiebee
fefbf40a06 Merge branch 'master' into i#3731 2018-03-27 16:50:57 -07:00
frankiebee
f0f45e6fe1 migration for removing unnecessary transactions from state 2018-03-27 16:49:13 -07:00
kumavis
651e48dbd6 sentry - simplify all ethjs errors for better batching 2018-03-27 12:37:30 -07:00
Dan
f74e802026 Undo unnecessary line removals. 2018-03-27 10:52:19 -02:30
Dan
be2254b880 Remove comments and console.logs 2018-03-27 10:37:45 -02:30
Dan
d2bd5687e8 Merge branch 'master' into i18n-translator-redux 2018-03-27 10:17:48 -02:30
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
frankiebee
0a2616a37f include migration 22 2018-03-26 18:12:16 -07:00
frankiebee
43dde3cbde transactions - only save up to 40 txs totall across all networks 2018-03-26 15:58:36 -07:00
Dan Finlay
e196b6dcb7 Fix bug where full localStorage would crash on start 2018-03-26 15:25:26 -07:00
Frankie
5a61a6d57a migration for adding submittedTime to the txMeta (#3727)
* test for migration 022

* write migration 022 adding submittedTime to txMetas whove been submitted
2018-03-26 14:24:12 -07:00
Dan
4f0881e41b Merge branch 'master' into i18n-translator-redux 2018-03-26 16:13:49 -02:30
kumavis
46e8781e41 lint - fix 2018-03-23 18:45:58 -07:00
kumavis
2eaac897bf sentry - namespace files under metamask dir 2018-03-23 18:37:41 -07:00
kumavis
e3d7062e9b sentry - rewrite report urls + use raven-js from npm 2018-03-23 17:22:44 -07:00
Dan
b9309f689b Use extension api to get initial locale. 2018-03-22 12:49:19 -02:30
Dan
be845fd190 Merge branch 'master' into i18n-translator-redux 2018-03-21 22:28:58 -02:30
kumavis
5d3246c836 Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into trigun0x2-master 2018-03-21 11:55:09 -07:00
kumavis
112a9443ee
Merge pull request #3585 from lazaridiscom/laz/i3568
[WIP] document/rearrange metamask-controller.js, re #3568
2018-03-20 16:47:04 -07:00
kumavis
1a60094d50
Merge pull request #3504 from lazaridiscom/laz/i3427
adds READMEs to folders, re #3427
2018-03-20 16:28:47 -07:00
kumavis
29cc2f8ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-20 13:01:08 -07:00
Jeffrey Tong
93495b2809 fix for lint 2018-03-20 12:18:48 -07:00
Dan
2ddc2cc1fb Lint fixes. 2018-03-19 16:53:06 -02:30
Dan
d8788af9b8 Merge branch 'master' into retry-tx-refractor 2018-03-19 15:30:47 -02:30
Dan
5733820024 Merge branch 'master' into i18n-translator-redux 2018-03-19 14:39:04 -02:30
Dan
a51e8f6a16 Fetch localeMessages in front end only. 2018-03-19 13:36:16 -02:30
Saptak Sengupta
6174c00c10
Inject Script: Blacklist domains where not to inject script
Put a blacklist domain check where if the page url is in the list
of blacklisted domains, we shouldn't inject script in that web page.
2018-03-17 01:02:08 +05:30
Lazaridis
e1d6398b0f moves setup-related code towads end of file, re #3568 2018-03-16 18:37:56 +02:00
Lazaridis
bb6af25e20 add ESLint exceptions for //= and //-, re #3568 2018-03-16 03:22:10 +02:00
Lazaridis
904f00e8ac group all vault/keyring related methods together, re #3568 2018-03-16 02:29:53 +02:00
Dan
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
Lazaridis
d8f5150aa5 adds initial documentation, re #3568 2018-03-16 00:27:10 +02:00
frankiebee
cd721f52cb Merge branch 'master' into retry-tx-refractor 2018-03-15 08:07:16 -07:00
kumavis
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -07:00
kumavis
6aef2ed0b2 local-store - fix class syntax 2018-03-14 10:59:47 -07:00
kumavis
c4e90c9359 local-store - check for error from extension.runtime 2018-03-14 10:49:54 -07:00
kumavis
481983aae8 local-store - fix promisification of methods 2018-03-14 10:31:25 -07:00
frankiebee
b609924125 fix destructuring of variables 2018-03-14 08:21:50 -07:00
frankiebee
bc987a1129 fix destructuring of variables 2018-03-14 08:20:54 -07:00
Dan
106ce091a9 Fix TransactionStateManager spelling. 2018-03-14 11:45:04 -02:30
Lazaridis
2d3763d709 add READMEs to folders, re #3427 2018-03-14 15:33:22 +02:00
Dan
798988597b Merge branch 'master' into retry-tx-refractor 2018-03-14 00:02:27 -02:30
kumavis
dc5fbf5eb2
Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-13 15:43:37 -07:00
kumavis
22cd788203
tx-gas-utils - fix code style 2018-03-13 15:39:33 -07:00
frankiebee
e5a83d3f1a transactions move validation of the to field to validateRecipient 2018-03-13 15:32:03 -07:00
frankiebee
a2c14ad02b Merge remote-tracking branch 'origin/i#3509' into i#3509 2018-03-13 15:27:26 -07:00
frankiebee
c465d510b1 fix error message 2018-03-13 15:26:45 -07:00
Frankie
c83a9ceb04
Merge branch 'master' into i#3509 2018-03-13 15:23:46 -07:00
frankiebee
d195cfab50 transactions - insure if a to field in tx params has a truthy valu that it is a valid addres and if it is falsy that it is not null to fix issue #3509 2018-03-13 15:13:05 -07:00
frankiebee
9d7640996a transactions - return the txMeta in retryTransaction 2018-03-13 14:42:26 -07:00
frankiebee
9fd349d740 transactions:state - add a submittedTime stamp so the ui has a better grasp of the time of submission 2018-03-13 09:51:37 -07:00
Jeffrey Tong
4f853bbd3c remove console log 2018-03-11 10:18:55 -07:00
Jeffrey Tong
bda493dc9d add comments that need clarification on naming convention 2018-03-11 10:17:08 -07:00
Dan
81e72147ef Merge branch 'master' into retry-tx-refractor 2018-03-09 02:07:27 -03:30
kumavis
a88e436b7d lint fix 2018-03-08 14:55:35 -08:00
kumavis
455faece9e Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-08 14:14:49 -08:00
kumavis
98efca0a97 background - storage - cleanup storage wiring 2018-03-08 14:10:28 -08:00
frankiebee
5572345b78 fix marking of confirmed transaction as dropped 2018-03-08 10:37:47 -08:00
frankiebee
4a3288fec9 transactions - make _markNonceDuplicatesDropped 2018-03-07 22:01:14 -08:00
Jeffrey Tong
aaef2aeefd fixed multiple notification windows when executing batch 2018-03-07 20:09:40 -08:00
frankiebee
8adb03074c Merge branch 'master' into retry-tx-refractor 2018-03-07 17:16:35 -08:00
frankiebee
62febac876 refactor retrytx with higher gas price:
- create a new tx instead of overwriting the tx hash
- add a new state 'dropped' to the txStateManager
- mark duplicate txs as dropped when one gets confirmed in a block
2018-03-07 17:16:16 -08:00
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification
Add seed phrase verification script into background process
2018-03-07 16:47:13 -08:00
Dan Finlay
64fcd27102 Tighten up data loading code 2018-03-07 14:42:59 -08:00
Dan Finlay
b97ac5106f Add clarifying comment 2018-03-07 14:38:26 -08:00
Dan Finlay
d58e47edec Some fixes for new storage strategy
- Don't persist undefined data
- Write to new storage strategy without waiting for completion.
- Continue writing to localStorage as fallback.
2018-03-07 14:23:31 -08:00
Jeffrey Tong
40b1688c67 removed check for width & height on multiple popup windows 2018-03-07 14:19:27 -08:00
Dan Finlay
ab55c184c7 Increase storage debounce to 2s 2018-03-07 13:50:22 -08:00
Dan Finlay
d0ba2d2d94 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-07 13:39:44 -08:00
Jeffrey Tong
cad5f5f000 fix typo in tests and tx-state-manager 2018-03-07 10:24:36 -08:00
Jeffrey Tong
57dc5a6e9b fix typo in transaction.js 2018-03-06 20:37:26 -08:00
Dan Finlay
423f084cb4 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-06 14:59:09 -08:00
Dan Finlay
dd9cac69ae
Merge pull request #3309 from scsaba/edge-support
Add Edge Support
2018-03-06 09:39:57 -08:00
Csaba Solya
59007a6c36 modify verifySeedPhrase to async and call it from addNewAccount also 2018-03-06 15:56:27 +01:00
Csaba Solya
f7d4a1080d add documentation 2018-03-04 08:47:46 +01:00
Csaba Solya
2b86d65d0c verify seedwords on log in 2018-03-03 22:08:10 +01:00
Csaba Solya
3e05b693db verify addresses regardless case 2018-03-03 14:11:02 +01:00
Csaba Solya
4bd7f1a37a fix lint issues 2018-03-03 00:40:40 +01:00
Csaba Solya
92453f8715 seed phrase verifier 2018-03-03 00:32:57 +01:00
kumavis
c3bd27c965 sentry - extractErrorMessage - fix comment formatting 2018-02-28 10:57:54 -08:00
kumavis
8e5bcf8935 sentry - failed tx - improve ethjs-rpc error formating 2018-02-28 10:53:54 -08:00
kumavis
fca2cbc8ef sentry - clean - move setupRaven to lib 2018-02-28 10:37:53 -08:00
Dan Finlay
fe21f8a952
Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch
sentry - report failed tx with more specific message
2018-02-27 10:15:18 -08:00
Csaba Solya
73d9bfc52c make keyFromPassword private 2018-02-23 10:09:16 +01:00
Csaba S
2f34630486
Merge branch 'master' into edge-support 2018-02-22 14:55:46 +01:00
Csaba Solya
5ec311ba3e add edge support 2018-02-22 14:39:32 +01:00
Thomas Huang
e27a3823ba
Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix
[NewUI] Prevents new tx from active tab from opening popup
2018-02-21 12:50:45 -08:00
Dan Finlay
716acc088e Merge branch 'master' into uat-master 2018-02-21 10:56:23 -08:00
Dan
a4ed6af2ad Prevents new transaction from generating popup when metamask is open in an active tab. 2018-02-21 15:04:04 -03:30
Dan Finlay
98d3fba3ef Fix promise construction 2018-02-20 15:45:48 -08:00
kumavis
06838774fa sentry - report failed tx with more specific message 2018-02-16 10:21:06 -08:00
kumavis
c0893f2bcc
Merge pull request #3250 from MetaMask/i#3136
fix - hex prefix estimatedGas on txMeta
2018-02-16 15:59:20 +00:00
Dan Finlay
73e5ae6e29 Fix incorrect promise instantiation 2018-02-15 15:32:48 -08:00
Dan Finlay
58871cb146
Merge pull request #3222 from MetaMask/mesh-test
metamask mesh - inject mesh testing container
2018-02-15 12:08:06 -08:00
frankiebee
dc3f3e79ca fix - hex prefix estimatedGas on txMeta 2018-02-14 14:37:02 -08:00
Lazaridis
58a554b168 use the providers initial _blocktracker. fixes #2393 2018-02-11 05:09:27 +02:00
kumavis
94cd5b9df4 metamask mesh - inject mesh testing container 2018-02-10 19:33:33 +00:00
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan J Miller
7f151b861c
[NewUI] Opens to full screen when restoring from seed. (#3201)
* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
2018-02-07 21:08:55 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Frankie
201e0579a5
Merge branch 'master' into localStorage-clean-up 2018-01-31 11:57:38 -08:00
frankiebee
c3adbda5f5 remove RecentBlocks from disk 2018-01-31 10:49:58 -08:00
Bruno Barbieri
c1b7cfe91d preserve other networks TXs 2018-01-31 13:29:02 -05:00
Bruno Barbieri
7dc1b09f94 use txMeta.txParams 2018-01-31 04:40:32 -05:00
Bruno Barbieri
03d17c75ae wipe only transactions for current account 2018-01-31 04:25:32 -05:00
Bruno Barbieri
5f39844382 clean up 2018-01-31 03:36:04 -05:00
Bruno Barbieri
e6fda855a5 added reset account feature 2018-01-31 03:33:15 -05:00
frankiebee
28ee0aae91 creater migration to remove BlacklistController 2018-01-30 14:07:32 -08:00
frankiebee
f13ad6bd6a remove BlacklistController from disk state 2018-01-30 14:07:32 -08:00
Alexander Tseung
ecc39c5a7a Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 2018-01-29 18:22:52 -08:00
Dan Finlay
8ba64c657f Increase storage debounce value 2018-01-25 15:38:43 -08:00
Dan Finlay
ceebc6caa4 Debounce storage to avoid crashing pump 2018-01-25 13:01:03 -08:00
Kevin Serrano
19a379edba
Bump limit for event emitter warning. 2018-01-25 12:28:11 -08:00
Dan Finlay
2f13790653 Remove local storage writes, add log 2018-01-24 15:28:15 -08:00
Dan Finlay
76521cf739 Fix retrieval of object 2018-01-24 15:03:16 -08:00
Dan Finlay
cd5eaa4393 Remove redundant async modifiers 2018-01-24 13:05:13 -08:00
Dan
b281a52759 Remove already handled TODO comment. 2018-01-24 16:49:12 -03:30
Dan Finlay
f09d72fa2a Remove extension-store since we aren't using it yet 2018-01-24 11:36:42 -08:00
Dan
b7ae77f57a Check that extension.storage exists before attempting to call methods on it. 2018-01-24 09:43:20 -03:30
Dan
0164030e56 Handle errors when getting and setting to localStore. 2018-01-24 09:41:32 -03:30
Dan Finlay
7c4a9c32fa Merge branch 'UseStorageLocal' into i3076-UseStorageLocalInstead 2018-01-23 16:33:37 -08:00
Dan Finlay
456dfdb9fd Modify @heyellieday's work to use storage.local to replace main storage 2018-01-23 16:26:50 -08:00
Thomas
97ca86733c Merge branch 'master' into uat 2018-01-23 01:12:50 -08:00
kumavis
b91e2b5eb1 sentry - report failed txs 2018-01-22 15:54:26 -08:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
Dan Finlay
59d0fa2637
Merge pull request #3016 from MetaMask/sentry
Stability - Add Sentry Remote Error Reporting
2018-01-18 13:11:15 -08:00
kumavis
d7c8ec22a4 test - tx controller - fix txGasUtil reference 2018-01-17 20:09:13 -08:00
kumavis
96fc916024
Update transactions.js 2018-01-17 17:56:31 -08:00
frankiebee
234c2417ca transactions - transtion approved transactions to failed transactions on boot 2018-01-17 16:49:38 -08:00
frankiebee
be8d924432 transactions - fail txs on boot who fail addTxDefaults 2018-01-17 15:48:37 -08:00
frankiebee
9f19fea8e0 transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on boot if they did not complete 2018-01-17 15:42:01 -08:00
kumavis
1f5325804b sentry - dedupe raven vendor 2018-01-17 15:38:25 -08:00
kumavis
daa62b507a sentry - breakout raven setup and add release config 2018-01-17 14:59:15 -08:00
kumavis
52a1c954f1 sentry - update raven and add to ui 2018-01-17 14:28:37 -08:00
kumavis
7d1554b1c1 sentry - add raven + sentry reporting config 2018-01-17 14:04:37 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Dan Finlay
8fb62b97c5 Create new flag for simple sends to avoid overloading other flag 2018-01-16 11:05:11 -08:00
kumavis
6cfaf03b3d
Merge branch 'master' into i2907-NoCodeGasLimit 2018-01-16 09:59:32 -08:00
Frankie
f18ed8bfd4
Merge branch 'master' into open-popup 2018-01-15 15:25:14 -08:00
Dan Finlay
845917b2d5
Merge branch 'master' into i2907-NoCodeGasLimit 2018-01-15 15:10:50 -08:00
Dan Finlay
cd7eaaa735 Set gas limit to 21k for recipients with no code
Fixes #2907
2018-01-15 15:08:07 -08:00
Dan Finlay
582634d9fa
Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation
Improve gas price estimation by backfilling recent-blocks
2018-01-15 14:35:59 -08:00
Dan J Miller
aa833a0928 [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)
* Place all users of extension into old UI (disable auto adding).

* Fix lint errors.
2018-01-15 13:23:44 -08:00
frankiebee
f0dd4f1923 transactions - emit 'newUnapprovedTx' before estimateGas finishes 2018-01-14 14:00:17 -08:00
Alexander Tseung
bdcee058dc Fix styling in initialization 2018-01-12 13:39:26 -08:00
Dan Finlay
7cb66ce4cb Prefer passing a provider over an ethQuery instance 2018-01-12 10:25:36 -08:00
Dan Finlay
4a9dad7c40 Improve gas price estimation by backfilling recent-blocks
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
2018-01-11 15:04:54 -08:00
kumavis
cf60b23eec
Merge branch 'master' into infura-rest-api 2018-01-11 11:40:56 -08:00
Dan Finlay
d829fb91b8 Default to 1 gwei for empty blocks 2018-01-08 15:41:57 -08:00
Dan Finlay
0275231e13 Default gas estimate to 1 gwei for networks with no block activity 2018-01-08 15:08:05 -08:00
kumavis
ab7701efb3 provider - infura - use infura REST api 2018-01-08 14:57:57 -08:00
kumavis
63ae7fb589 bugfix - transactions controller - breakout logic and fix order of operations bug 2018-01-08 13:20:38 -08:00
kumavis
9a8670309d bugfix - transactions controller - breakout logic and fix order of operations bug 2018-01-08 13:19:18 -08:00
Thomas Huang
0fbecb9f7c
Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress
Account for 0x/empty string recipient
2018-01-08 11:47:47 -08:00
Kevin Serrano
0cf5c22178
Merge pull request #2851 from MetaMask/i2812-seedworderrorfix
Fix condition where failing seed word checks would infinite-spin future attempts.
2018-01-08 11:43:43 -08:00
Dan Finlay
d11ec81f49
Merge branch 'master' into i2621-0xRecipientAddress 2018-01-08 11:21:41 -08:00
Thomas
39b700bf87 Account for 0x/empty string address and contract creation 2018-01-08 03:16:20 -08:00
Dan Finlay
aec24ec81e Fix feature to work 2018-01-05 22:08:03 -08:00
Dan Finlay
447682d1fb Linted 2018-01-05 21:34:35 -08:00
Dan Finlay
4bca98d588 Derive gas price estimate from previous transactions
Return the 50th percentile lowest gas price of the previous 20 blocks.
2018-01-05 21:24:20 -08:00
Kevin Serrano
20aa135ad8
Add fix for infinite spinner for incorrect seed phrase. 2018-01-03 16:06:46 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
Ellie Day
3c6a5b16ad conditionally use extension store if supported or enabled 2018-01-02 21:53:11 -08:00
Ellie Day
7184db7632 handle situation where storage.sync is disabled in certain versions of firefox 2018-01-02 21:31:17 -08:00
kumavis
313b3c087a
Merge pull request #2783 from MetaMask/tx-param-vaalidation
transactions - throw error if txParams.value contains a decimal
2018-01-02 14:30:39 -08:00
kumavis
3f6cef0b3f
tx-gas-utils - tx-param-validation - use more intuitive check 2018-01-02 14:22:44 -08:00
Frankie
b2e4f913ba
Merge pull request #2817 from MetaMask/i#2810
only check nonces of transactions who's from address match the txMeta
2017-12-28 16:34:24 -08:00
Kevin Serrano
414f89668e
Fix some silly linting issues. 2017-12-27 17:27:48 -08:00
frankiebee
5efb0044d8 transactions:pending - only check nonces of transactions who's from adress match the txMeta 2017-12-27 16:50:15 -08:00
Ellie Day
a76324f6d3 Add ExtensionStore and add basic store instance syncing to main controller 2017-12-23 08:23:34 -06:00
Alexander Tseung
06410381d4 Merge branch 'NewUI-flat' into merge-master 2017-12-22 11:00:46 -08:00
Alexander Tseung
a218008adf
Track usage of old and new UI (#2794)
[NewUI] Track usage of old and new UI
2017-12-22 10:43:02 -08:00
Dan Finlay
33dbee3db9 Remove retryTimePeriod from tx controller 2017-12-21 14:15:17 -08:00
Dan Finlay
75b8baafb6 Stop failing pending transactions after any period of time 2017-12-21 13:41:08 -08:00
Frankie
9940ea71df
Merge branch 'master' into tx-param-vaalidation 2017-12-21 11:37:37 -08:00
Chi Kei Chan
9959aea598
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 2017-12-20 17:38:28 -08:00
Dan
bf4043c59b Adds updateTransaction to background and used it to update after editing in send-v2. 2017-12-20 17:37:18 -08:00
Dan
1f1fc2c49e Canceled, edited transactions show edited amount. 2017-12-20 17:37:18 -08:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
frankiebee
f47e81e493 transactions - throw error if dapp provides txParams whos value has a decimal 2017-12-20 14:09:59 -08:00
Thomas Huang
d3f5ad874e
Merge pull request #2763 from MetaMask/AddRecentBlocksController
Add Recent Blocks controller
2017-12-20 13:07:34 -05:00
Dan Finlay
30b45c8a38 Do not log whole txs in recent block controller.
Only record gas prices, because that has a current use.
2017-12-19 12:23:59 -08:00
Dan Finlay
975f7279c7 Allow updating token details
Fixes #2173
2017-12-18 15:57:04 -08:00
Dan Finlay
10ff77477c Add Recent Blocks controller
Tracks recent blocks, useful for estimating recent successful gas
prices.
2017-12-17 16:36:55 -08:00
frankiebee
0daeaeb4a8 Merge branch 'master' into i#2720 2017-12-15 12:59:43 -08:00
Thomas Huang
fb8744771a Change console.log for opts in _configureInfuraProvider 2017-12-15 14:43:55 -06:00
frankiebee
828734b977 transactions:gas-utils - handle new type of estimateGas error 2017-12-15 01:31:48 -08:00
Alexander Tseung
e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
Thomas Huang
fb5edfe69e
Merge pull request #2662 from williamchong007/master
fix #1398, prevent injecting xml without xml suffix
2017-12-14 14:34:21 -05:00
kumavis
161aa66cb4 Revert "Revert "network - for infura networks use the infura block tracker provider""
This reverts commit 5df7dcd758.
2017-12-13 18:57:27 -08:00
Frankie
5df7dcd758
Revert "network - for infura networks use the infura block tracker provider" 2017-12-13 17:46:56 -08:00
Frankie
0935e22d30
Merge pull request #2741 from MetaMask/infura-block-tracker
network - for infura networks use the infura block tracker provider
2017-12-13 17:15:26 -08:00
kumavis
33e6befdaa network - for infura networks use the infura block tracker provider 2017-12-13 13:51:36 -08:00
frankiebee
da209a9cfd dont aggresively query account data 2017-12-13 11:19:18 -08:00
Dan
05c6789030 Adds button for opening app in main browser window in extension. 2017-12-12 12:14:40 -08:00
Dan Finlay
542e0035dd Pass polling interval to zero client provider 2017-12-09 19:58:47 -05:00
kumavis
a91200fd08 tx-controller - failed state is a finished state 2017-12-07 18:04:14 -05:00
Dan Finlay
950ec9596c Do not allow nonces larger than the next valid nonce
To avoid situations where a user signs a transaction that will become
surprisingly valid in the future.
2017-12-07 16:13:40 -05:00
Dan Finlay
89e640afcb Merge branch 'master' into patch-2 2017-12-07 16:05:17 -05:00
Chi Kei Chan
845aec82b9
Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI 2017-12-07 09:46:28 -08:00
vicnaum
553d713636
A more expressive way
replaced ifs with ? :
2017-12-07 15:30:05 +01:00
Chi Kei Chan
373f8b72d0
Merge branch 'master' into NewUI-flat 2017-12-06 21:13:29 -08:00
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Dan Finlay
0e25129028 Enforce retry tx at minimum gas of previous tx 2017-12-06 23:42:47 -05:00
Dan Finlay
31564e0a86 Fix retry action 2017-12-06 23:20:15 -05:00
Dan Finlay
6ff580584a Add retry background method and action 2017-12-06 22:20:58 -05:00
vicnaum
7854321fae
Fix for #2644 - Specified Nonce isn't used
Added nonceSpecified.
And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.
2017-12-06 22:49:24 +01:00
Dan
f58aae3f2b firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in _resubmitTx 2017-12-06 13:21:09 -03:30
Dan
ea23da9e75 Correct note for updateTx after block-update event in transaction.js 2017-12-06 13:07:31 -03:30
Dan
871d9fd9fb Fix undefined latestBlockNumber in _resubmitTx 2017-12-06 13:02:38 -03:30
Dan
ae2a4d78e8 Exponentional backoff on transaction retry in pending-tx-tracker 2017-12-05 17:21:14 -03:30
William Chong
03f86acd60 fix #1398, prevent injecting xml without xml suffix 2017-12-05 19:53:01 +08:00
Dan
84321b2d9b Lint fix 2017-12-04 23:08:23 -03:30
Dan
db06e7e649 Css selected in background based on betaUI state. 2017-12-04 23:08:23 -03:30
Dan
7f79524070 Add UI selection 2017-12-04 23:08:23 -03:30
Thomas Huang
c30b543a80
Merge pull request #2630 from MetaMask/i2624-VersionedNotices
Versioned notices
2017-11-29 17:25:10 -06:00
Dan Finlay
8192c0b58c Fix migration comment 2017-11-29 11:51:27 -08:00
kumavis
327651e7fb Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix 2017-11-29 08:27:47 -10:00
Dan Finlay
ab35a76a24 Migrate old data to include firstVersion info 2017-11-28 16:56:45 -08:00
Dan Finlay
bd82b17310 Linted 2017-11-28 15:35:20 -08:00
Dan Finlay
049ec52a95 Add seed phrase bounty award notice
Only shows to people who installed before or equal to MetaMask 3.12.1
2017-11-28 15:31:49 -08:00
Dan Finlay
f0f6bb28e0 Get notice version filtering working nicely 2017-11-28 15:16:04 -08:00
kumavis
f64bc3c01a deps - obs-store@3 + migrate stream plumbing 2017-11-28 11:09:18 -10:00
Dan Finlay
ec4b7de962 Add firstVersion field to notices selector 2017-11-28 11:22:09 -08:00
Dan Finlay
e89f82399f Add optional version field to notices
Allows notices to only show to users who are on a certain version.
2017-11-28 11:14:57 -08:00
Dan Finlay
725277dbdb
Merge pull request #2441 from MetaMask/kumavis-patch-3
NetworkController - add warning when aborting lookupNetwork
2017-11-27 16:21:25 -08:00
kumavis
634102df63
network controller - warn via log.warn 2017-11-27 13:59:32 -10:00
Jason Clark
a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Jason Clark
abefcc9612 more eslint fixes 2017-11-25 15:57:54 -07:00
Jason Clark
fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
Dan Finlay
65cb970487 Prevent creation of multiple vaults
Fixes #2577 by ensuring only one seed phrase can be set for a new vault.

Also cleans up logs and reproduction logic.
2017-11-20 14:03:12 -08:00
Dan Finlay
c0aa7ce857 Add reproduction and mutex code 2017-11-20 13:27:29 -08:00
Thomas Huang
408bbe726f
Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error
Add useful error when duplicate web3 is detected.
2017-11-20 11:38:41 -06:00
Chi Kei Chan
e61ba93194 Merge branch 'master' into merge-master 2017-11-15 12:03:13 -08:00
Dora E. Mondrian
41fea44af3 newUnaprovedTx => newUnapprovedTx
This typo tripped me up when I was reading through the code and trying to understand what's going on.
2017-11-06 04:35:51 -08:00
Dan
5a94775b3f Lint fixes for NewUI-flat. 2017-11-02 00:00:33 -02:30
Dan Finlay
5ce94e69b3 Add useful error when duplicate web3 is detected.
Fixes #2507
2017-10-31 09:59:26 -07:00
Kevin Serrano
e0030a8bf8
Merge pull request #2291 from MetaMask/gasPriceSpecified
Add boolean for specified gas price
2017-10-27 14:01:08 -07:00
Kevin Serrano
1e9c0a9db2
Resolve merge conflicts 2017-10-26 16:22:08 -07:00
Chi Kei Chan
5aecce908f Merge branch 'master' into NewUI-flat 2017-10-25 18:49:02 -07:00
Chi Kei Chan
fa95303e1e Sign Typed Request styling fixes 2017-10-25 18:05:52 -07:00
Dan
ddf11011c9 Signature request fixes. 2017-10-25 17:40:48 -07:00
Kevin Serrano
b9bbf8f329
Resolving that ugly merge. 2017-10-25 15:45:26 -07:00
Chi Kei Chan
301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Kevin Serrano
1767dceba4 Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
2017-10-24 16:53:54 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
kumavis
b17a799de6 Update network.js 2017-10-23 12:10:49 -07:00
Dan Finlay
6d05238469 Try to fix intermittent test failure in NonceTracker tests 2017-10-22 22:24:50 -07:00
Daijiro Wachi
43b1cb9100 Fix lint warnings
Fixed warnings:
```md
app/scripts/controllers/computed-balances.js
+ 35:27  warning  Missing space before function parentheses            space-before-function-paren
+ 41:14  warning  'address' is never reassigned. Use 'const' instead   prefer-const
+ 61:9   warning  'updater' is never reassigned. Use 'const' instead   prefer-const
+ 68:11  warning  'newState' is never reassigned. Use 'const' instead  prefer-const

app/scripts/controllers/network.js
+ 104:29  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/createLoggerMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 15:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createOriginMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 9:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createProviderMiddleware.js
+ 5:34  warning  Missing space before function parentheses      space-before-function-paren
+ 13:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/events-proxy.js
+ 1:50  warning  Missing space before function parentheses      space-before-function-paren
+ 31:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/nodeify.js
+ 2:22  warning  Missing space before function parentheses  space-before-function-paren
+ 2:24  warning  Missing space before opening brace         space-before-blocks
+ 5:18  warning  Missing space before function parentheses  space-before-function-paren
+ 5:20  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/pending-balance-calculator.js
+ 16:19  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/pending-tx-tracker.js
+ 85:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 87:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 88:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 90:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 91:11  warning  '||' should be placed at the end of the line  operator-linebreak

app/scripts/lib/port-stream.js
+ 3:22  warning  Missing space before function parentheses  space-before-function-paren
+ 3:24  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/tx-gas-utils.js
+ 84:2  warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-history-helper.js
+ 12:37  warning  Missing space before function parentheses      space-before-function-paren
+ 23:30  warning  Missing space before function parentheses      space-before-function-paren
+ 30:23  warning  Missing space before function parentheses      space-before-function-paren
+ 35:28  warning  Missing space before function parentheses      space-before-function-paren
+ 41:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-manager.js
+ 94:13  warning  'value' is never reassigned. Use 'const' instead  prefer-const

ui/app/reducers.js
+ 45:7  warning  'state' is never reassigned. Use 'const' instead        prefer-const
+ 53:7  warning  'stateString' is never reassigned. Use 'const' instead  prefer-const

ui/lib/tx-helper.js
+ 27:2  warning  Newline required at end of file but not found  eol-last

ui/app/components/account-dropdowns.js
+ 163:1  warning  More than 2 blank lines not allowed  no-multiple-empty-lines

ui/app/components/menu-droppo.js
+ 22:7  warning  'style' is never reassigned. Use 'const' instead  prefer-const

ui/app/components/shapeshift-form.js
+ 135:11  warning  '&&' should be placed at the end of the line  operator-linebreak

ui/app/components/typed-message-renderer.js
+ 35:25  warning  Missing space before function parentheses      space-before-function-paren
+ 42:2   warning  Newline required at end of file but not found  eol-last

mascara/server/index.js
+ 11:42  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 12:36  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 13:33  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 14:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 20:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 21:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 26:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
```
2017-10-21 21:06:39 +02:00
Chi Kei Chan
344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Dan Finlay
a10a600cce Linted 2017-10-19 12:33:43 -07:00
Dan Finlay
3b4c679ffc Fix bug where new account was not immediately selected 2017-10-19 12:15:26 -07:00
Dan Finlay
0ae406e489 Allow computed balances to enumerate its own view 2017-10-19 09:59:57 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan Finlay
21bde66e16 Remove account-tracker from keyringController 2017-10-18 17:14:26 -07:00
Dan Finlay
bbe2c9f48d Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault 2017-10-18 17:07:25 -07:00
Dan Finlay
d89394a7c9 Make account tracking much more reactive 2017-10-18 17:07:22 -07:00
kumavis
8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Dan Finlay
75177ce34c Make account tracking more reactive
We were doing a lot of conditional observation & updating.
Pulled out a bunch of that for generic observer/syncers.
2017-10-18 15:08:34 -07:00
Dan Finlay
9cc1e8a6d8 Refresh computed balances controller when restoring vault 2017-10-18 14:22:04 -07:00
Dan Finlay
ea79eca8eb Add validation to balance constructor 2017-10-18 12:21:22 -07:00
Dan Finlay
7032edf32b Stop tracking old account balances after restore vault
Per @kgserrano note
2017-10-18 11:13:14 -07:00
Dan Finlay
50e8599988 Promisify metamask-controller vault creating methods 2017-10-17 13:25:27 -07:00
Dan Finlay
d7f384485d Select first account when restoring seed
Fixes #2348
2017-10-17 13:19:57 -07:00
Dan Finlay
ab31eb6a17 Select first account on new vault creation 2017-10-17 13:09:41 -07:00
kumavis
53a360b65d contentscript - fix inpage require and bundling 2017-10-12 12:51:48 -07:00
Dan Finlay
c9a984a237 Break up inpage file read into multiple lines 2017-10-12 14:16:40 -04:00
Dan Finlay
d0d082d70c Merge branch 'master' into i1340-SynchronousInjection 2017-10-12 13:25:19 -04:00
kumavis
dcf10f3d75 nonce-tracker - use blockTracker directly 2017-10-11 18:33:36 -07:00
kumavis
0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00
kumavis
7d50a56198 util - add obj-proxy 2017-10-10 17:15:52 -07:00
kumavis
e32d75965f events-proxy - clean up 2017-10-10 17:15:14 -07:00
kumavis
4d273d3cea lint fixes 2017-10-10 14:14:43 -07:00
kumavis
efa92a7fc5 network controller - refactor to use eth-rpc-client 2017-10-10 14:13:12 -07:00
kumavis
ff4e9a0d11 metamask controller - define this.newTransaction to ease instantiation order 2017-10-10 10:50:45 -07:00
kumavis
f7c1bc804d metamask controller - simplify provider init 2017-10-10 10:39:31 -07:00
kumavis
e79037261e metamask controller - breakout getAccounts method 2017-10-10 10:26:59 -07:00
Kevin Serrano
1816eca914
Merge branch 'master' into version-debugging 2017-10-10 08:38:27 -07:00
Kevin Serrano
24a55cf777
Make the function callback friendly. 2017-10-10 08:36:15 -07:00
Dan Finlay
7f70c866c3 Merge pull request #2223 from ukstv/master
Add eth_signTypedData handler
2017-10-09 12:18:43 -07:00
Dan
bbe893a0d8 UI for send screen container without form rows. 2017-10-08 17:48:09 -07:00
Sergey Ukustov
a1696f89a8 Validate data format for eth_signTypedData 2017-10-07 00:38:13 +03:00
Frankie
4a4338c1f4 Merge pull request #2305 from MetaMask/nodeify
nodeify - allow callback to be optional
2017-10-06 14:08:58 -07:00
Dan Finlay
0c61695656 Merge branch 'master' into SignTypedData 2017-10-06 14:03:04 -07:00
kumavis
fa11bbf996 Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit
Update status of pending transactions on startup
2017-10-06 13:40:43 -07:00
kumavis
bc396a7417 lint fix - nodeify 2017-10-06 13:02:34 -07:00
Dan Finlay
a417fab0eb When checking pending txs, check for successful txs with same nonce.
If a successful tx with the same nonce exists, transition tx to the failed state.

Fixes #2294
2017-10-06 12:51:13 -07:00
Dan Finlay
94513cae7b Provide method for tx tracker to refer to all txs 2017-10-06 12:50:33 -07:00
kumavis
be4f7b33f4 nodeify - allow callback to be optional 2017-10-06 12:36:08 -07:00
Dan Finlay
0146b55d6d Check status of pending transactions on startup
Fixes #1531
2017-10-06 11:41:28 -07:00
Kevin Serrano
f6821781d2
Simplify try catch 2017-10-05 17:17:34 -07:00
Kevin Serrano
106af9ec5b
Catch an error if this is not defined. 2017-10-05 17:13:58 -07:00
Kevin Serrano
b9012a62e5
Merge branch 'master' into version-debugging 2017-10-05 17:06:55 -07:00
Dan Finlay
cf178341c1 Merge branch 'master' into SignTypedData 2017-10-05 14:50:19 -07:00
Dan Finlay
9bc80d998e Add signTypedData input validations 2017-10-05 14:39:35 -07:00
Dan Finlay
c5b7880f05 Merge branch 'master' into SignTypedData 2017-10-05 11:55:23 -07:00
frankiebee
3cb9da2ae5 "fix" hours for message 2017-10-05 11:42:01 -07:00
frankiebee
ec9c528313 pending-tx - check time stamp instead of block number for resubmit 2017-10-05 11:07:22 -07:00
Kevin Serrano
15809894ff
Add indicator for specified gas price 2017-10-05 09:58:04 -07:00
Dan Finlay
1cba6543a4 Begin implementing sync injection idea 2017-10-04 15:35:04 -07:00
Kevin Serrano
3d80565339
Configured for callback-required function.' 2017-10-04 10:55:10 -07:00
Kevin Serrano
147b81068a
Include OS version 2017-10-04 09:56:18 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Dan
ac4868170f Enables remove token and ensures add/remove update the list without need for refresh. 2017-10-03 15:46:01 -07:00
Frankie
948a0b1078 Merge pull request #2250 from interfect/master
Don't pass origin as an HTTP header
2017-10-03 10:36:39 -07:00
Sergey Ukustov
e11ca12890 Merge remote-tracking branch 'upstream/master' 2017-10-03 02:10:47 +03:00
kumavis
062eaa6a82 pending tx tracker - on tx:warn append error message instead of error obj 2017-10-02 15:39:11 -07:00
kumavis
ed77304e73 pending tx tracker - tx:warning event includes err obj 2017-10-02 15:20:01 -07:00
kumavis
22eaf92ec2 pending tx tracker - resubmit - warn dont error on unknown error 2017-10-02 15:00:23 -07:00
kumavis
7af696bfbe pending tx tracker - dont throw on load failure 2017-10-02 14:56:59 -07:00
kumavis
167ad729fd Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes 2017-10-02 13:45:47 -07:00
frankiebee
e08a727d44 Merge branch 'master' into history-notes 2017-10-02 13:44:15 -07:00
kumavis
df59ef9942 tx state history - append note to first op of diff 2017-10-02 13:44:11 -07:00
frankiebee
833da191c3 transaction - provide notes for history 2017-10-02 13:41:29 -07:00
kumavis
d29b5f10ef tx state history - fix bug where initial snapshot was mutated on updateTx 2017-10-02 13:14:42 -07:00
Adam Novak
8cc8fecdac Don't pass origin as an HTTP header
Requests with this nonstandard header are being blocked by CORS when
made against Parity.

Not sending it ought to fix #1779.
2017-10-01 18:55:52 -07:00
Dan Finlay
d5b0d8af4f Version 3.10.8 - Fix Currency Conversion
In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API.

Fixes the first part of #2240
2017-09-29 20:57:15 -07:00
kumavis
7bdf73b1dd Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions
pending-tx - dont check the balance to rebrodcast
2017-09-29 17:36:49 -07:00
kumavis
1ad8a9a0ff network - make network controller internal network switching explicit 2017-09-29 17:10:34 -07:00
kumavis
d6ea2fa425 network - convert localhost from custom rpc to network type 2017-09-29 16:35:58 -07:00
kumavis
b88d11f86e network controller - small refactor 2017-09-29 16:09:38 -07:00
frankiebee
ac80eaca1f pending-tx - dont check the balance to rebrodcast 2017-09-29 12:54:05 -07:00
Dan Finlay
861bd877f3 Ensure selected account is always set if possible
Fixes #2218

Subscribes to keyringController, and if only one account exists, sets it as selected.
2017-09-29 11:19:54 -07:00
Sergey Ukustov
c2b8dada91 Add eth_signTypedData handler 2017-09-29 19:40:46 +03:00
Chi Kei Chan
5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis
cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00
frankiebee
b24e16d346 re-enabled x-metamask-origin for mascara 2017-09-27 16:14:58 -07:00
kumavis
15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
kumavis
ecf909e140 Merge pull request #2194 from MetaMask/network-controller-refactor
Network controller refactor
2017-09-27 15:56:23 -07:00
Dan Finlay
a246770866 Commit to the eth-keyring-controller module 2017-09-27 14:55:34 -07:00
Dan Finlay
aefd17ef94 Remove dead reference 2017-09-27 14:45:24 -07:00
kumavis
06b5dd2096 network controller - move _setProvider to bottom 2017-09-27 14:44:54 -07:00
kumavis
f2d9b75e94 network controller - refactor to use _setProvider 2017-09-27 14:44:13 -07:00
Dan Finlay
96ebbde634 Fix Account Selection
Do not select accounts on restore, only on creation and deliberate selection.

Fixes #2164
2017-09-27 14:43:34 -07:00
kumavis
7d499df8e3 account-tracker - remove unused import 2017-09-27 14:12:45 -07:00
kumavis
c781e11c7a network - remove getter/setter 2017-09-27 14:10:58 -07:00
kumavis
7e9c6e96a1 metamask - improve comment 2017-09-27 14:10:17 -07:00
kumavis
4404dfc5d3 Merge branch 'master' into direct-block-tracker 2017-09-27 13:58:54 -07:00
kumavis
5bbea78306 Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
kumavis
b41aad6d1a style - small whitespace nitpick 2017-09-27 12:33:46 -07:00
kumavis
89e690fc79 account-tracker - use new block-tracker block format 2017-09-27 12:33:00 -07:00
Dan Finlay
1983e161c6 Fix accountTracker store references 2017-09-27 12:29:09 -07:00
Dan Finlay
8d3fec42d0 Fix bug where block gas limit was incorrectly parsed. 2017-09-27 12:09:32 -07:00
Dan Finlay
e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
frankiebee
0a94ec41d3 pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker 2017-09-26 22:42:59 -07:00
kumavis
1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
frankiebee
508696f71d transactions: reveal #getFilteredTxList from txStateManage and fix accountTracker.store reference 2017-09-26 18:12:53 -07:00
frankiebee
80c98b1653 transactions: make evnt names pretty and eaiser to read 2017-09-26 16:55:11 -07:00
frankiebee
9fd5458112 transactions: lint fixes and reveal status-update event for balance controller 2017-09-26 16:54:04 -07:00
frankiebee
8ab23c713d Merge branch 'master' into transactionControllerRefractorPt3 2017-09-26 16:24:43 -07:00
Dan Finlay
651098c70d Remove duplicate instantiation of account-tracker 2017-09-26 14:30:29 -07:00
Dan Finlay
2eca5455c0 Move obs store into account-tracker instead of inheriting 2017-09-26 14:15:16 -07:00
frankiebee
9d1cb0f76d network contoller - clean up unused code 2017-09-26 13:56:09 -07:00
frankiebee
2ed8d579da listen for the blocke event on the block tracker instead of rawBlock on the provider 2017-09-26 13:38:27 -07:00
frankiebee
b654eb9b1f wrap block tracker in events proxy 2017-09-26 13:38:27 -07:00
Dan Finlay
3bedcd3582 Restore blockGasLimit to account-tracker 2017-09-26 13:36:41 -07:00
Dan Finlay
9e3648c668 Pass blocktracker to balances controller 2017-09-26 11:33:36 -07:00
Kevin Serrano
16ba2e6a30
Merge branch 'master' into new-currency-test 2017-09-26 09:51:20 -07:00
Dan Finlay
1968d61431 Make encryptor configurable for keyring-controller 2017-09-25 15:23:37 -07:00
Dan Finlay
674aac83ce Make blockTracker an independent param 2017-09-25 14:39:54 -07:00
Dan Finlay
d9c92cdbd1 Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController 2017-09-25 14:37:11 -07:00
Dan Finlay
8cd7329c91 Implemented feedback 2017-09-25 14:36:49 -07:00
Dan Finlay
dfbdb99858 Merge branch 'master' into AddBalanceController 2017-09-25 11:49:38 -07:00
Dan Finlay
40f1d08684 Made some requested changes 2017-09-25 11:42:08 -07:00
Dan Finlay
443b1a8eb7 Remove keyring controller from project 2017-09-22 14:38:40 -07:00
Dan Finlay
aa2abc00eb Merge branch 'AddBalanceController' into BreakOutKeyringController 2017-09-22 14:30:31 -07:00
kumavis
dd45592641 metamask - use provider-engines block tracker 2017-09-22 14:22:07 -07:00
Dan Finlay
128cf40f91 Fix accont-tracker merge bug 2017-09-22 14:16:19 -07:00
Dan Finlay
f01b0a818b Fix account-tracker references 2017-09-22 14:13:56 -07:00
Dan Finlay
f9d2f523c6 Merge branch 'master' into AddBalanceController 2017-09-22 14:12:41 -07:00
Dan Finlay
d2a747e57e Fix computed-balances controller reference 2017-09-22 14:06:54 -07:00
Dan Finlay
11c8c07bfc Refactor eth-store into account-tracker
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.
2017-09-22 13:59:25 -07:00
Dan Finlay
977405fc7d Remove dead code from eth-store 2017-09-22 13:33:53 -07:00
Dan Finlay
08b36b9b58 Allow metamaskController to define keyring types 2017-09-22 13:29:13 -07:00
Dan Finlay
4c971ebfd1 Define encryptor in constructor params instead of platform object 2017-09-22 13:25:08 -07:00
kumavis
0a5ae39509 bug - fix event emitter mem leak warning 2017-09-21 17:37:30 -07:00
Dan Finlay
bd117d6b71 Merge branch 'master' into ConfigurableEncryption 2017-09-21 15:56:24 -07:00
Dan Finlay
e9043f22df Allow custom encryptor to be passed to MetaMaskController and KeyringControllers. 2017-09-21 15:47:25 -07:00
frankiebee
14b9d16ece platforms: put context for extension in platform extension class 2017-09-21 11:12:04 -07:00
Kevin Serrano
b22783a223
Merge branch 'master' into new-currency-test 2017-09-20 09:40:33 -07:00
frankiebee
90482934f1 Merge branch 'master' into breakout-mascara 2017-09-19 10:45:51 -07:00
frankiebee
bfd75107f1 add context to platform to not have X-Metamask-Origin in mascara 2017-09-19 10:45:32 -07:00
Chi Kei Chan
a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
Kevin Serrano
bd8428e9ed
Comply with current currency API and add additional styling. 2017-09-18 16:09:01 -07:00
Dan Finlay
2b7b1db851 Do not mark a retry tx failed that has been broadcast successfully
Fixes #2115

If a tx has been braodcast, the only failures we should accept are:
- Never mined
- On chain failure

We had a section of code that would mark a tx failed during any unknown error during a retry.

Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined.
2017-09-18 14:34:25 -07:00
Kevin Serrano
51f0911f87
Merge branch 'master' into new-currency-test 2017-09-18 11:46:10 -07:00
Chi Kei Chan
6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
Kevin Serrano
cb8856597c
Merge branch 'master' into new-currency-test 2017-09-14 08:35:48 -07:00
kumavis
d7097db022 createOriginMiddleware - fix var name 2017-09-13 15:29:44 -07:00
kumavis
765ef64061 metamask controller - destroy filter polyfill on disconnect 2017-09-13 15:19:44 -07:00
kumavis
245c0f0c27 metamask controller - move middleware into seperate files 2017-09-13 15:17:26 -07:00
Dan Finlay
a01921758b Add computed balance to account detail view 2017-09-13 15:06:04 -07:00
Dan Finlay
86cd4e4fed Got pending balance updating correctly 2017-09-13 14:28:51 -07:00
frankiebee
77a48fb0b1 ensure that values written to txParams are hex strings 2017-09-13 14:27:27 -07:00
Dan Finlay
e4d7fb2447 Add state-labeled events to allow subscribing to any transaction's state change 2017-09-13 11:39:39 -07:00
kumavis
96d1175834 debug - prefer logger over console 2017-09-13 10:28:29 -07:00
kumavis
a265144176 metamask cont - standardize multiplex stream naming 2017-09-13 10:21:00 -07:00
Chi Kei Chan
8b5f2a95df Improve styling in Confirmation Screen; Show decoded send token data 2017-09-12 23:04:01 -07:00
Dan Finlay
53a467cd1e Some progress 2017-09-12 15:06:19 -07:00
frankiebee
9e0c0745ab linting && format fixing 2017-09-12 12:19:26 -07:00
frankiebee
3ad67d1b14 match other controller patterns 2017-09-12 09:59:59 -07:00
Chi Kei Chan
7eb6dae418 Added signTokenTx; Adding token confirmation screen 2017-09-12 02:22:23 -07:00
Dan Finlay
4738746968 Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController 2017-09-11 15:19:17 -07:00
kumavis
8545453a9d contentscript - fix obj-multiplex instantiation and use pump for streams 2017-09-11 14:30:30 -07:00
kumavis
41164f61db Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix 2017-09-11 14:21:09 -07:00
frankiebee
62f26c5ba8 fix miss type 2017-09-08 15:02:36 -07:00
frankiebee
9b9df41724 more tests and craete a getPendingTransactions function 2017-09-08 14:24:40 -07:00
kumavis
5fa0b992a7 Merge pull request #2057 from MetaMask/Version-3.9.13
Version 3.9.13
2017-09-08 13:06:59 -07:00
kumavis
d03b0547bb inpage provider - define sendAsync on the prototype 2017-09-08 11:52:00 -07:00
kumavis
ef3bf810bf inpage - use obj-multiplex module 2017-09-07 22:47:08 -07:00
kumavis
671dafea9e Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix 2017-09-07 22:37:44 -07:00
kumavis
70401626e2 lint - remove dead code 2017-09-07 22:35:38 -07:00
kumavis
9d4c02e57f metamask - add jsonrpc filter middleware on per-connection engine 2017-09-07 21:26:25 -07:00
kumavis
0e8e655fdb inpage - distinguish pump vs pipe 2017-09-07 21:19:24 -07:00
kumavis
57e4805c62 streams - use pump and published obj-multiplex 2017-09-07 21:17:49 -07:00
Dan Finlay
d4d7c6d89e Linted 2017-09-07 12:54:28 -07:00
Dan Finlay
fadc0617df Make tx calculations account for gas prices 2017-09-07 12:52:49 -07:00
Dan Finlay
c616581001 Remove logs 2017-09-07 12:47:52 -07:00
Dan Finlay
a95a3c7e4f Fix balance calc test 2017-09-07 12:47:27 -07:00
Dan Finlay
74c6de7d23 Add constructor comment 2017-09-07 12:45:00 -07:00
Dan Finlay
7b92268428 Fix valueFor test 2017-09-07 12:43:10 -07:00
Dan Finlay
4058574436 Add basic test for valueFor 2017-09-07 12:30:25 -07:00
Dan Finlay
b6e8791bc2 test not passing 2017-09-07 11:59:15 -07:00
kumavis
440a42bbc3 inpage - add idRemapMiddleware 2017-09-07 10:08:07 -07:00
frankiebee
50075c6df5 fix messy merge 2017-09-07 00:55:21 -07:00
frankiebee
00fca4f1f2 remove unused variable 2017-09-06 14:38:39 -07:00
Dan Finlay
74f7fc4613 Check balances in parallel 2017-09-06 14:37:46 -07:00
Dan Finlay
f9a052deed Add first passing balance calc test 2017-09-06 14:36:15 -07:00
frankiebee
a73aecc796 fix merge and errors disaperaing on update 2017-09-06 14:01:07 -07:00
Kevin Serrano
0217984a40
Merge branch 'master' into readd-loose 2017-09-06 13:59:52 -07:00
Kevin Serrano
b5f48730cd
Properly update keyring state on new account addition. 2017-09-06 13:59:41 -07:00
frankiebee
6c83ba762e Merge branch 'master' into transactionControllerRefractorPt3 2017-09-06 13:45:03 -07:00
frankiebee
15c12ca4bb add better comments 2017-09-05 21:50:36 -07:00
frankiebee
00bd5b143f rename tx-utils.js -> tx-gas-utils.js 2017-09-05 20:33:50 -07:00
frankiebee
4c554f32ec remove #buildEthTxFromParams 2017-09-05 20:13:43 -07:00
kumavis
ea7e46ed38 inpage - bug fix
prevents mutation of original message object which causes problems with web3 1.0
2017-09-05 16:46:21 -07:00
Dan Finlay
70a61f8712 Make web3 deprecation notice more useful
Linking to a descriptive & precriptive article on a path forward.
2017-09-05 11:35:33 -07:00
Kevin Serrano
ae8486d5cf
Merge branch 'master' into new-currency-test 2017-08-29 16:36:19 -07:00
Kevin Serrano
056276af02
integrate infura currency 2017-08-29 16:36:05 -07:00
kumavis
76de053b0b Merge branch 'master' into inpage-provider-fixes 2017-08-28 11:29:47 -07:00
kumavis
e294aa7e0d inpage - lint fix 2017-08-28 10:41:01 -07:00
kumavis
cc56d0d2f6 inpage - use json-rpc-engine for inpage-provider 2017-08-24 15:44:40 -07:00
kumavis
9ce82640f2 Merge pull request #1973 from MetaMask/hotfix-migration019
hotfix - fail submitted txs whos nonce is out of bound
2017-08-24 00:15:24 -07:00
frankiebee
c2624dd1a0 fall back to latest if blockNumber is null 2017-08-24 00:02:06 -07:00
Dan Finlay
803e696cdc Make method return a number 2017-08-23 23:24:01 -07:00
Dan Finlay
17a71a9b4c Only cancel pending txs with non continuously high nonces 2017-08-23 23:13:42 -07:00
frankiebee
f42687d25f fix description 2017-08-23 22:53:29 -07:00
frankiebee
dadee1ed79 hotfix - fail submitted txs whos nonce is out of bound 2017-08-23 22:50:40 -07:00
Dan Finlay
0ad310e096 Fail transactions after a day of retries 2017-08-23 22:29:08 -07:00
Dan Finlay
c620123fab Enforce nonces as type string 2017-08-23 21:50:28 -07:00
Dan Finlay
a122ec1f8b Use toNumber method 2017-08-23 21:37:07 -07:00
Dan Finlay
55c1a259b1 Fix network nonce parsing 2017-08-23 21:14:46 -07:00
Dan Finlay
855f4eeacb Pass nonce tests 2017-08-23 20:43:47 -07:00
Dan Finlay
04d40b114d Got all tests but one passing 2017-08-23 20:11:37 -07:00
Dan Finlay
221575a191 Fix new test, break an older maybe wrong one 2017-08-23 20:04:03 -07:00
Dan Finlay
c4ab7a5779 Linted 2017-08-23 19:35:49 -07:00
Dan Finlay
1f0223d0a0 Simplify nonce calculation 2017-08-23 19:34:20 -07:00
kumavis
4019f318fe inpage provider - autoreload - improve readability 2017-08-23 16:44:57 -07:00
kumavis
44dc2ba712 inpage provider - only warn web3 usage once per session 2017-08-23 16:26:55 -07:00
kumavis
53e410167b inpage provider - sync rpc - default to null values 2017-08-23 16:13:33 -07:00
Dan Finlay
b3b62d97a3 Merge branch 'master' into useLocalNonce 2017-08-23 11:12:46 -07:00
kumavis
247965ebbe nonce-tracker - more debugging numbers for nonceDetails 2017-08-22 15:34:30 -07:00
kumavis
0a93b65a3d remove unused code 2017-08-22 15:06:54 -07:00
kumavis
fb2c6cc8ac nonce-tracker - use ethjs-query 2017-08-22 14:33:54 -07:00
kumavis
dc3e8d60ef nonce-tracker - fix var name 2017-08-22 14:24:09 -07:00
kumavis
6d596bd9e6 nonce-tracker - getlocalNextNonce - add entry to nonceDetails 2017-08-22 14:17:00 -07:00
kumavis
a7e3dc8327 nonce-tracker - simplify _getlocalNextNonce 2017-08-22 14:15:56 -07:00
kumavis
e43da3e4aa nonce-tracker - simplify getHighestNonce 2017-08-22 14:04:31 -07:00
kumavis
b191649ef5 nonce-tracker - getHighestNonce doesnt need uniqued input 2017-08-22 13:58:26 -07:00
kumavis
98bc9b6656 nonce-tracker - make nonce strategy api and naming more symmetical 2017-08-22 13:52:15 -07:00
frankiebee
604c91f7b2 nonce-tracker - pass tests 2017-08-21 18:04:05 -07:00
frankiebee
7d34b22d78 clean up code 2017-08-21 17:04:47 -07:00
frankiebee
5c74f316a8 nonce-tracker - pass tests 2017-08-21 16:45:10 -07:00
frankiebee
fbba3a1ac8 Merge branch 'master' into transactionControllerRefractorPt3 2017-08-21 11:35:22 -07:00
frankiebee
7ea83b6bae Create TxStateManager 2017-08-21 10:29:10 -07:00
frankiebee
1ffb406480 break out network nonce calc. 2017-08-18 16:05:21 -07:00
frankiebee
37f86e874f fix 0x0 nonce calc. 2017-08-18 15:44:32 -07:00
frankiebee
f8eca95ca5 include pendingTxs in localNonce 2017-08-18 15:01:05 -07:00
frankiebee
e9712a13ec Create tests for TxStateManager 2017-08-18 14:11:18 -07:00
frankiebee
a5a32f3d57 use "localNonce" when the network returns a nonce that is lower then a known confirmed tx 2017-08-18 13:54:16 -07:00
kumavis
588b8f0d39 migration 18 - activate 2017-08-14 20:06:15 -07:00
kumavis
ac2b572c34 migration 18 - fix an oops 2017-08-14 20:05:57 -07:00
kumavis
1af797b1b3 tx controller - tx state history various small fixes 2017-08-14 19:15:36 -07:00
kumavis
accd057b1a migration 18 - move to diff-based history 2017-08-14 18:46:18 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
sdtsui
dbc539ac55 Merge remote-tracking branch 'mm/master' into NewUI-flat 2017-08-14 11:06:14 +02:00
frankiebee
66a012550e fix wording 2017-08-11 15:54:52 -07:00
frankiebee
ac9e84ff40 add deprecation warning for web3 2017-08-11 15:52:03 -07:00
Thomas Huang
1071a35f7b Merge pull request #1883 from MetaMask/estimateGas-fix
tx utils - detect estimateGas err and set simulationFailed
2017-08-09 14:03:02 -07:00
kumavis
245125eb18 ui - buy eth - formatting and moved network names to config 2017-08-09 12:25:38 -07:00
kumavis
b4052cd5e6 tx utils - detect estimateGas err and set simulationFailed 2017-08-08 23:34:18 -07:00
kumavis
0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
kumavis
25f9746dab tx controller - fix error serialization 2017-08-08 21:09:28 -07:00
kumavis
5e6962342d tx controller - fix getBalance fn 2017-08-08 21:08:30 -07:00
kumavis
5418813ed1 util - sufficientBalance - validate input 2017-08-08 21:05:59 -07:00
Frankie
d40bd9a726 Merge pull request #1880 from MetaMask/pendingFix
fix getPendingTransactions function for pendingTxTracker
2017-08-08 22:00:17 -04:00
frankiebee
9c9165e930 filter by network for pending txs 2017-08-08 21:54:26 -04:00
frankiebee
5bb84f6e21 fix getPendingTransactions function for pendingTxTracker 2017-08-08 21:49:48 -04:00
kumavis
922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
frankiebee
a13643bdb5 fix class names 2017-08-08 18:30:49 -04:00
frankiebee
3a2190ec3c fix the bind on pending tx watchers 2017-08-07 16:58:38 -04:00
frankiebee
f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
frankiebee
59124eb6fd remove logging of the message and log the error 2017-08-07 14:45:43 -04:00
frankiebee
a54c26382e remove unnecessary if statment for error message 2017-08-07 14:40:07 -04:00
frankiebee
fb9866b4e1 fix spelling 2017-08-07 14:37:20 -04:00
kumavis
78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
sdtsui
02c2106c3b Merge branch 'master' into feat/mm-ui-5 2017-08-06 19:55:34 -07:00
kumavis
1be8053cca blacklist - update phishing on boot and speed up polling to 4 min 2017-08-04 13:51:48 -07:00
frankiebee
08f49ab35f rename PendingTransactionUtils -> PendingTransactionWatchers 2017-08-04 14:50:34 -04:00
frankiebee
89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee
087cd9fb1a break out tx status pendding watchers 2017-08-04 14:41:35 -04:00
frankiebee
caee2a9e35 move util functions to util.js 2017-08-04 13:55:00 -04:00
kumavis
c4cb371ce8 Merge pull request #1857 from MetaMask/hotFixCancleTx
fix cancelTransaction not receiving a callback
2017-08-03 21:01:13 -07:00
frankiebee
7de58c8709 fix cancelTransaction not reciving a callback 2017-08-03 21:22:08 -04:00
kumavis
da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
kumavis
da7471e095 lint fixes 2017-08-03 14:48:19 -07:00
kumavis
34b1e80088 Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-refactor2 2017-08-03 14:28:48 -07:00
kumavis
d4877cb4e2 blacklist - use module eth-phishing-detect 2017-08-03 14:25:02 -07:00
frankiebee
dce593fd7b remove stack from txs 2017-08-03 15:39:55 -04:00
kumavis
8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
sdtsui
dd4586ee84 Adjust sidebar transition using @cjeria\'s feedback 2017-08-02 19:26:46 -07:00
sdtsui
61b4b1f947 Ensure app-header is rendered in responsive layout 2017-08-02 19:13:17 -07:00
frankiebee
b471afcdb3 use error for #approveTransaction when setting failed 2017-08-02 19:24:34 -04:00
frankiebee
340dbe75fc use async with #publishTransaction 2017-08-02 19:09:37 -04:00
frankiebee
b80c7e417b move newUnapprovedTransaction to transactions.js 2017-08-02 18:59:34 -04:00
kumavis
8c6f01b910 blacklist controller - breakout from metamask and infura controllers 2017-08-02 15:54:59 -07:00
kumavis
ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
kumavis
aea5735b29 obj-multiplex - missing name error + prefer const over var 2017-08-02 14:25:28 -07:00
frankiebee
25bc15ba17 lint fixes 2017-08-02 11:47:13 -04:00
frankiebee
25cffd21f8 Merge branch 'master' into transactionControllerRefractor 2017-08-02 11:41:29 -04:00
frankiebee
ece9200c72 fix spelling mistake 2017-08-02 11:36:07 -04:00
frankiebee
3a4726018e fix addTxDefaults 2017-08-02 11:35:35 -04:00
frankiebee
432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00
Dan Finlay
6675241fa9 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 16:46:59 -07:00
Dan Finlay
8b1726cc55 Live update blacklist from Infura 2017-07-26 16:30:54 -07:00
Dan Finlay
f147b928b2 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 15:32:19 -07:00
Kevin Serrano
aa282b4e3a
Give credit where it is due 2017-07-26 15:31:16 -07:00
Kevin Serrano
66f6d5a4e0
Add levenshtein logic to blacklister. 2017-07-26 15:25:30 -07:00
Dan Finlay
3d8ebf2265 Begin implementing live-updating blacklist, not working yet 2017-07-26 12:27:16 -07:00
kumavis
35a128db1e nonce-tracker - hotfix for provider proxying 2017-07-26 11:37:00 -07:00
kumavis
b15a2baaf3 nonce-tracker - add raw baseNonceHex to nonceDetails 2017-07-26 11:09:02 -07:00
kumavis
7e2e4948a6 tx cont - dont recursively store history 2017-07-26 10:57:47 -07:00
kumavis
de2cf4e9cd Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterErrorsOnTx 2017-07-26 10:43:36 -07:00
kumavis
0ef90fb1f0 tx controller + nonce tracker - record nonce components on txMeta 2017-07-26 10:40:08 -07:00
kumavis
39d28922de nonce-tracker - validation - add validation failing value type to error message 2017-07-26 10:16:08 -07:00
kumavis
f16802e2d4 nonce-tracker - validation - add validation failing value to error message 2017-07-26 10:15:35 -07:00
frankiebee
30cbe74ba6 Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-extension into betterErrorsOnTx 2017-07-25 18:33:52 -04:00
frankiebee
ba88f7b8dd fix typo 2017-07-25 18:29:02 -04:00
Frankie
a929fb2387 Merge branch 'master' into betterErrorsOnTx 2017-07-25 18:26:41 -04:00
frankiebee
b81f883150 fix stack wording 2017-07-25 18:23:26 -04:00
frankiebee
1df833bee8 use clone 2017-07-25 18:21:40 -04:00
frankiebee
e0a626da3b remove line numbers 2017-07-25 18:02:21 -04:00
kumavis
4445ba1569 tx cont - add argument for provider constructor 2017-07-25 14:36:19 -07:00
kumavis
5b9a6bd367 tx cont - remove old cb from async fn 2017-07-25 13:16:46 -07:00
frankiebee
ab01358a48 Add stack traces both in errors and as a way to track txMetas 2017-07-25 16:08:31 -04:00
kumavis
12d6f21627 transactions - block nonce-tracker while updating pending transactions 2017-07-18 15:27:15 -07:00
kumavis
aa48ed34c4 nonce-tracker - fix lock mechanism to be a real mutex 2017-07-18 15:11:29 -07:00
kumavis
67fdba5e42 transaction - promisify _checkPendingTxs 2017-07-18 14:00:43 -07:00
kumavis
d249da77d7 nonce-tracker - return nonce as integer 2017-07-18 13:59:56 -07:00
kumavis
4f9fc8014a nonce-tracker - validate nonce calc components 2017-07-18 12:48:16 -07:00
frankiebee
948f3880a3 turn off auto faucet and remove file 2017-07-17 17:37:01 -04:00
tmashuang
bda52f7cba Infura Network response tests 2017-07-14 10:34:03 -07:00
Frankie
9d3207fb73 Merge pull request #1617 from MetaMask/nonce-tracker
transaction controller - use nonce-tracker
2017-07-13 15:48:50 -04:00
frankiebee
7eccf5905a make publishTransaction and signTransaction async methods 2017-07-13 15:25:43 -04:00
kumavis
3d082203ec Merge pull request #1771 from MetaMask/addNonceErrToErrLIst
Add nonce err to err list
2017-07-12 23:41:26 -07:00
frankiebee
6086bcdf0d limit the range for retryCount 2017-07-12 20:01:07 -07:00
frankiebee
de0cd6e663 write a migration for resubmit tx's to get put back into a submitted state 2017-07-12 19:03:35 -07:00
frankiebee
27cb02bc58 add "nonce too low" to the ignored errs list for tx retrys 2017-07-12 19:03:34 -07:00
frankiebee
751103d948 Merge branch 'master' into nonce-tracker 2017-07-12 15:10:58 -07:00
frankiebee
aeefcbd75b Fix test to match behavior 2017-07-12 15:10:52 -07:00
frankiebee
bd26ec46aa mv updateAndApproveTx to txController 2017-07-12 15:07:56 -07:00
frankiebee
da35f6744e use new nodeify 2017-07-12 15:06:49 -07:00
Dan Finlay
52b92fbe40 Add first version of phishing site warning
Links to my own blacklist for now, since I added a package.json for easy importing.

We can point at the main 408H repository once this is merged:
https://github.com/409H/EtherAddressLookup/pull/24

Redirects detected phishing sites [here](https://metamask.io/phishing.html).
2017-07-12 13:09:20 -07:00
kumavis
9f46984fee metamask - on rpc err show whole error body 2017-07-11 14:17:47 -07:00
frankiebee
231ad48564 Use txParams 2017-07-11 12:52:56 -07:00
frankiebee
971d25a8ab Merge branch 'master' into nonce-tracker 2017-07-11 12:41:03 -07:00
kumavis
a1fd9bc6be Merge pull request #1762 from MetaMask/ImproveRetryLogic
Improve retry logic
2017-07-11 12:29:20 -07:00
Dan Finlay
c7b9e3fb18 Improve insufficient balance checking in retry loop 2017-07-11 12:19:01 -07:00
frankiebee
a670e54973 Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin into nonce-tracker 2017-07-11 12:18:44 -07:00
frankiebee
c121ac21ec remove irrelevan code 2017-07-11 12:16:08 -07:00
frankiebee
611338c4e0 use .includes 2017-07-11 12:01:59 -07:00
Dan Finlay
d97c6533b8 Remove local nonce error setting. 2017-07-11 12:00:17 -07:00
frankiebee
11d57adc5c add "Gateway timeout" to ignored errors when resubmiting and use .includes over .startsWith 2017-07-11 11:57:42 -07:00
kumavis
512b6cae81 migration 16 - move resubmit warning back to submitted state 2017-07-07 19:31:27 -07:00
kumavis
c425ad4ec7 tx controller - resubmit - correctly set error on bad nonce/balance 2017-07-07 19:13:06 -07:00
kumavis
c53aac398a tx controller - correctly set error message on resubmit error 2017-07-07 19:09:32 -07:00
kumavis
4fa999e4de tx controller - resubmit - recognize parity known hash message 2017-07-07 19:02:34 -07:00