1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 11:46:13 +02:00
Commit Graph

9729 Commits

Author SHA1 Message Date
Dan Finlay
a8aca0a326 Merge remote-tracking branch 'upstream/develop' into routeTypedSignaturesToKeyrings 2019-10-22 14:51:21 -07:00
Mark Stacey
27d67558fc
Update superagent-proxy to address security advisory (#7301)
Security advisory: https://www.npmjs.com/advisories/1184

This advisory was already addressed in #7289 but subsequent releases
have made this simpler resolution possible.
2019-10-22 16:29:21 -03:00
Dan Finlay
4b4bee77c7 Move signTypedData signing out to keyrings
This simplifies the logic of signing and improves security:
- Private keys are never moved to the base controller.
- Hardware wallets are abstracted in the same way as local keys.

This also paves the way for allowing even more modular accounts,
provided by plugins:
https://github.com/MetaMask/metamask-plugin-beta/pull/63

Fixes #7075.
2019-10-22 11:37:04 -07:00
Dan Finlay
06dc3b260a
Merge pull request #7299 from MetaMask/Version-v7.3.1
Version v7.3.1 RC
2019-10-22 10:08:46 -07:00
Dan J Miller
55bc9936c6 Turn off full screen vs popup a/b test (#7298) 2019-10-21 20:59:02 -03:00
MetaMask Bot
6bdf6e07db Version v7.3.1 2019-10-21 23:10:57 +00:00
Dan Miller
225b6a98e0 Update changelog for v7.3.1 2019-10-21 20:40:03 -02:30
Dan Miller
51cc2faf56 Turn off full screen vs popup a/b test 2019-10-21 20:38:55 -02:30
tmashuang
2a81083f14 MM controller additions, balance controller, typedMessageManager, and addtional actions tests 2019-10-21 12:47:36 -07:00
Dan Finlay
4f9ea17185
Merge pull request #7295 from MetaMask/master
Sync develop with master
2019-10-22 03:08:55 +09:00
Dan Finlay
32f20587ac
Merge pull request #7223 from MetaMask/Version-v7.3.0
Version v7.3.0 RC
2019-10-22 01:57:53 +09:00
Dan J Miller
994a8a3167
Add metrics events for clicking and saving tx speed ups (#7275) 2019-10-21 14:23:26 -02:30
Mark Stacey
ebc876454e Update v7.3.0 changelog 2019-10-21 09:22:32 -03:00
MetaMask Bot
a5035d49fc Version v7.3.0 2019-10-21 09:21:27 -03:00
Mark Stacey
4d4126d470 Update https-proxy-agent as per security advisory (#7289)
Security advisory: https://www.npmjs.com/advisories/1184

The package `pac-proxy-agent` (which we use via `pubnub`) hasn't
released an update yet, so we're forced to use a resolution for the
time being. The updated version appears to be compatible.
2019-10-21 09:21:27 -03:00
Mark Stacey
4ad42d8374
Update https-proxy-agent as per security advisory (#7289)
Security advisory: https://www.npmjs.com/advisories/1184

The package `pac-proxy-agent` (which we use via `pubnub`) hasn't
released an update yet, so we're forced to use a resolution for the
time being. The updated version appears to be compatible.
2019-10-21 09:16:21 -03:00
Whymarrh Whitby
06536b1d0f
Fix phishing detect script (#7287) 2019-10-18 13:35:32 -02:30
Thomas Huang
a646bfb506 Lessen the length of ENS validation to 3 (#7285) 2019-10-17 13:03:14 -03:00
Thomas Huang
9d9f3685bb Prevent Logout Timer that's longer than a week. (#7253) 2019-10-17 12:25:37 -03:00
Whymarrh Whitby
3d1f214cb0
Remove trailing commas from JSON files (#7284) 2019-10-16 22:01:19 -02:30
Dan J Miller
f1c774d8f3 Handle empty fetch response (#7111) 2019-10-09 11:41:18 -03:00
Mark O'Sullivan
ee913edf9f fix issue of xyz ens not resolving (#7266) 2019-10-09 09:30:48 -03:00
Mark Stacey
4a7292ad54
Merge pull request #7269 from MetaMask/master-parity
Master => develop
2019-10-08 21:15:37 -03:00
Mark Stacey
08a7308b04 Merge branch 'master' into develop
* master: (34 commits)
  Update changelog for v7.2.3
  Fix e2e tests and gas default (#7267)
  Do not transate on seed phrases
  test:integration - fix renamed test data file
  lint fix
  test:e2e - fix bail condition
  test:e2e - fix responsie argument
  test:e2e - refactor missed spec file
  test:e2e - only overwrite window.fetch once per session
  test:e2e - rework fetch-mocks
  test:e2e - add extra delay before closing popups
  test:e2e - factor out prepareExtensionForTesting
  test - e2e - dedupe fetchMocking + compose script as fn
  Ensure correct tx category when sending to contracts without tx data (#7252)
  Version v7.2.3
  Add v7.2.2 to changelog
  Update minimum Firefox verison to 56.0 (#7213)
  Version v7.2.2
  Update changelog for v7.2.1, v7.2.0, and v7.1.1
  Add `appName` message to each locale
  ...
2019-10-08 20:26:21 -03:00
Dan Finlay
bafcbc90af
Merge pull request #7251 from MetaMask/Version-v7.2.3
Version v7.2.3 RC
2019-10-09 07:43:45 +09:00
Dan Miller
a8bd527d72 Update changelog for v7.2.3 2019-10-08 14:17:51 -03:00
Dan J Miller
4ed452e6ed Fix e2e tests and gas default (#7267)
* Add extra delay after second send3eth.click() in the 'adds multiple transactions' test

* Remove use of ARBITRARY_HIGH_BLOCK_GAS_LIMIT as fallback
2019-10-08 14:16:23 -03:00
Thomas
e7bf250eab Do not transate on seed phrases 2019-10-08 14:16:23 -03:00
kumavis
4a7c7dcda6 test:integration - fix renamed test data file 2019-10-08 14:16:23 -03:00
kumavis
e6b4f88d17 lint fix 2019-10-08 14:16:23 -03:00
kumavis
e283ff181e test:e2e - fix bail condition 2019-10-08 14:16:23 -03:00
kumavis
cd62cc1901 test:e2e - fix responsie argument 2019-10-08 14:16:23 -03:00
kumavis
7e3f1263f2 test:e2e - refactor missed spec file 2019-10-08 14:16:23 -03:00
kumavis
133ba76785 test:e2e - only overwrite window.fetch once per session 2019-10-08 14:16:23 -03:00
kumavis
11e1c3b95d test:e2e - rework fetch-mocks 2019-10-08 14:16:23 -03:00
kumavis
56dae017a9 test:e2e - add extra delay before closing popups 2019-10-08 14:16:23 -03:00
kumavis
d43a78432f test:e2e - factor out prepareExtensionForTesting 2019-10-08 14:16:23 -03:00
kumavis
54491974ec test - e2e - dedupe fetchMocking + compose script as fn 2019-10-08 14:16:23 -03:00
Dan J Miller
b884cd573c Ensure correct tx category when sending to contracts without tx data (#7252)
* Ensure correct transaction category when sending to contracts but there is no txParams data

* Update gas when pasting address in send

* Gracefully fall back is send.util/estimateGas when blockGasLimit from background is falsy

* Remove network request frontend fallback for blockGasLimit

* Add some needed slow downs to e2e tests
2019-10-08 14:16:23 -03:00
Dan J Miller
1a0b0ce7c7 Fix e2e tests and gas default (#7267)
* Add extra delay after second send3eth.click() in the 'adds multiple transactions' test

* Remove use of ARBITRARY_HIGH_BLOCK_GAS_LIMIT as fallback
2019-10-08 14:14:20 -03:00
Dan J Miller
38df64783d Ensure correct tx category when sending to contracts without tx data (#7252)
* Ensure correct transaction category when sending to contracts but there is no txParams data

* Update gas when pasting address in send

* Gracefully fall back is send.util/estimateGas when blockGasLimit from background is falsy

* Remove network request frontend fallback for blockGasLimit

* Add some needed slow downs to e2e tests
2019-10-08 04:29:37 +09:00
MetaMask Bot
f94c3b96ed Version v7.2.3 2019-10-07 16:28:17 -03:00
Thomas Huang
d7a4dfebeb
Merge pull request #7260 from MetaMask/notranslate-seed-phrases
Do not transate on seed phrases
2019-10-07 11:08:22 -07:00
ryanml
3383eabc9d Use translated string for state log (#7255) 2019-10-07 14:54:44 -03:00
Thomas
aa95e5a4c8 Do not transate on seed phrases 2019-10-07 10:45:12 -07:00
Mark Stacey
8b5ac9340b Fix custom nonce placeholder type (#7243)
The placeholder for the custom nonce needed to be converted into a
string. The placeholder is omitted if `nextNonce` isn't set, as may be
the case for the initial render.
2019-10-02 18:12:52 -02:30
Thomas Huang
93b473d46d
Merge pull request #7244 from MetaMask/mark-3Box-sync-as-experimental
Mark 3Box sync as experimental
2019-10-02 13:35:17 -07:00
Mark Stacey
1369d0280d Mark 3Box sync as experimental
The initial release of the 3Box sync will be marked as experimental.
This is to allow us time to test the 3Box sync and reduce the load on
3Box's infrastructure.
2019-10-02 17:11:20 -03:00
Mark Stacey
9541d1e281
Don't wait for 3Box initialization during login (#7242)
The 3Box initialization is triggered by login, but it no longer blocks
the login from finishing. The 3Box initialization is designed to run in
the background, so there's no reason to block on it.
2019-10-02 16:12:20 -03:00
Dan J Miller
e6e8897434
Custom nonce fixes (#7240)
* Allow default nextNonce to be the custom nonce in cases where highest locally pending is higher than nextNonce

* Reset custom nonce in cases of transaction submission failures

* Make the recommended nonce in the custom nonce field the true 'nextNonce'

* Revert automatic setting of custom nonce to nextNonce

* Make the nextNonce the default placeholder value

* Fix getNextNonce

* Remove unused nonceFieldPlaceholder message

* Fix nits in getPendingNonce and getNextNonce

* Properly handle errors in getNextNonce

* Improve placeholder and value defaults in custom nonce field

* Remove custom error message from getNextNonce
2019-10-02 15:42:04 -02:30