diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 183de1fb0..3e4a67eed 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -18,7 +18,7 @@ import createSubscriptionManager from 'eth-json-rpc-filters/subscriptionManager' import { errorCodes as rpcErrorCodes, EthereumRpcError } from 'eth-rpc-errors'; import { Mutex } from 'await-semaphore'; import log from 'loglevel'; -import TrezorKeyring from '@metamask/eth-trezor-keyring'; +import { TrezorKeyring } from '@metamask/eth-trezor-keyring'; import LedgerBridgeKeyring from '@metamask/eth-ledger-bridge-keyring'; import LatticeKeyring from 'eth-lattice-keyring'; import { MetaMaskKeyring as QRHardwareKeyring } from '@keystonehq/metamask-airgapped-keyring'; diff --git a/development/sentry-upload-artifacts.sh b/development/sentry-upload-artifacts.sh index e70989123..9d2fd32b4 100755 --- a/development/sentry-upload-artifacts.sh +++ b/development/sentry-upload-artifacts.sh @@ -31,7 +31,7 @@ function upload_sourcemaps { local release="${1}"; shift local dist_directory="${1}"; shift - sentry-cli releases files "${release}" upload-sourcemaps "${dist_directory}"/chrome/*.js "${dist_directory}"/sourcemaps/ --rewrite --url-prefix '/metamask' + sentry-cli releases files "${release}" upload-sourcemaps "${dist_directory}"/chrome/*.js "${dist_directory}"/sourcemaps/ --rewrite --url-prefix 'metamask' } function main { diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 12cd90e66..533907a83 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1276,6 +1276,7 @@ "packages": { "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@metamask/utils": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, @@ -1283,6 +1284,18 @@ "browserify>events": true } }, + "@metamask/eth-trezor-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { "packages": { "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index 56edb5e32..26fa23a20 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -1404,6 +1404,7 @@ "packages": { "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@metamask/utils": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, @@ -1411,6 +1412,18 @@ "browserify>events": true } }, + "@metamask/eth-trezor-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { "packages": { "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index d56789b6a..19f0b9b7e 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1404,6 +1404,7 @@ "packages": { "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@metamask/utils": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, @@ -1411,6 +1412,18 @@ "browserify>events": true } }, + "@metamask/eth-trezor-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { "packages": { "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 1a6c48c6d..0eaa5467f 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1276,6 +1276,7 @@ "packages": { "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@metamask/utils": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, @@ -1283,6 +1284,18 @@ "browserify>events": true } }, + "@metamask/eth-trezor-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { "packages": { "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 45b960760..21f77e06a 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1417,6 +1417,7 @@ "packages": { "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@metamask/utils": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, @@ -1424,6 +1425,18 @@ "browserify>events": true } }, + "@metamask/eth-trezor-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { "packages": { "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true diff --git a/package.json b/package.json index 680305809..b5650934e 100644 --- a/package.json +++ b/package.json @@ -244,7 +244,7 @@ "@metamask/eth-ledger-bridge-keyring": "^0.15.0", "@metamask/eth-snap-keyring": "^0.1.3", "@metamask/eth-token-tracker": "^4.0.0", - "@metamask/eth-trezor-keyring": "^1.0.0", + "@metamask/eth-trezor-keyring": "^1.1.0", "@metamask/etherscan-link": "^2.2.0", "@metamask/gas-fee-controller": "^6.0.1", "@metamask/jazzicon": "^2.0.0", diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js index e55d16c01..93a6c82c7 100644 --- a/ui/pages/create-account/connect-hardware/index.js +++ b/ui/pages/create-account/connect-hardware/index.js @@ -60,6 +60,7 @@ export const LATTICE_HD_PATHS = [ const TREZOR_TESTNET_PATH = `m/44'/1'/0'/0`; export const TREZOR_HD_PATHS = [ { name: `BIP44 Standard (e.g. MetaMask, Trezor)`, value: BIP44_PATH }, + { name: `Legacy (Ledger / MEW / MyCrypto)`, value: MEW_PATH }, { name: `Trezor Testnets`, value: TREZOR_TESTNET_PATH }, ]; diff --git a/yarn.lock b/yarn.lock index 604271ab0..8afd46255 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4182,17 +4182,18 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-trezor-keyring@npm:^1.0.0": - version: 1.0.0 - resolution: "@metamask/eth-trezor-keyring@npm:1.0.0" +"@metamask/eth-trezor-keyring@npm:^1.1.0": + version: 1.1.0 + resolution: "@metamask/eth-trezor-keyring@npm:1.1.0" dependencies: "@ethereumjs/tx": "npm:^4.0.0" "@ethereumjs/util": "npm:^8.0.0" "@metamask/eth-sig-util": "npm:^5.0.2" + "@metamask/utils": "npm:^4.0.0" "@trezor/connect-plugin-ethereum": "npm:^9.0.1" "@trezor/connect-web": "npm:^9.0.6" hdkey: "npm:0.8.0" - checksum: 421da0ffef37f92d0b16d360acf00317bce32bf1a5471d98cf30b7536df38f111cb894006210997c8c1aa6da2e1b291e22571451cd771a8d2f084da111a2d038 + checksum: eb1ac827d07a6c2d7b0f1f291691b13b1b65db85f4bced5e2af9f5bdf9117a9b725673b069ad67fd57b7c525cbb53755f8b3877a1f2c72e7812b2d8e127a52a9 languageName: node linkType: hard @@ -24214,7 +24215,7 @@ __metadata: "@metamask/eth-ledger-bridge-keyring": "npm:^0.15.0" "@metamask/eth-snap-keyring": "npm:^0.1.3" "@metamask/eth-token-tracker": "npm:^4.0.0" - "@metamask/eth-trezor-keyring": "npm:^1.0.0" + "@metamask/eth-trezor-keyring": "npm:^1.1.0" "@metamask/etherscan-link": "npm:^2.2.0" "@metamask/forwarder": "npm:^1.1.0" "@metamask/gas-fee-controller": "npm:^6.0.1"