diff --git a/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch b/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch deleted file mode 100644 index 786d5cd1b226..000000000000 --- a/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/dist/ledger-keyring.js b/dist/ledger-keyring.js -index 2386b2e7fe36d1e65ef74f0a19d3b41450dcfa48..f999a0ab465cce7a450a5812f1d7aa6e39b74aed 100644 ---- a/dist/ledger-keyring.js -+++ b/dist/ledger-keyring.js -@@ -150,7 +150,12 @@ class LedgerKeyring extends events_1.EventEmitter { - }); - } - catch (error) { -- throw error instanceof Error ? error : new Error('Unknown error'); -+ -+ /** -+ * For Fixing issue 22837, when ledger is locked and didnt open the ethereum app in ledger, -+ * The extension will always show `unknown error`, below change will transform the error to something meaningful. -+ */ -+ throw error instanceof Error ? error : new Error('Unlock your Ledger device and open the ETH app'); - } - if (updateHdk && payload.chainCode) { - this.hdk.publicKey = buffer_1.Buffer.from(payload.publicKey, 'hex'); diff --git a/package.json b/package.json index b956c03ec007..e7df6a6fd711 100644 --- a/package.json +++ b/package.json @@ -301,7 +301,7 @@ "@metamask/ens-controller": "^10.0.1", "@metamask/eth-json-rpc-filters": "^7.0.0", "@metamask/eth-json-rpc-middleware": "^12.1.1", - "@metamask/eth-ledger-bridge-keyring": "patch:@metamask/eth-ledger-bridge-keyring@npm%3A2.0.1#~/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch", + "@metamask/eth-ledger-bridge-keyring": "^4.1.0", "@metamask/eth-query": "^4.0.0", "@metamask/eth-sig-util": "^7.0.1", "@metamask/eth-snap-keyring": "^4.3.1", diff --git a/yarn.lock b/yarn.lock index 8f782362993e..552eebc3148a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2738,7 +2738,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.7.0": +"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.5.0, @ethersproject/rlp@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/rlp@npm:5.7.0" dependencies: @@ -4409,6 +4409,69 @@ __metadata: languageName: node linkType: hard +"@ledgerhq/cryptoassets@npm:^6.26.1": + version: 6.37.0 + resolution: "@ledgerhq/cryptoassets@npm:6.37.0" + dependencies: + invariant: "npm:2" + checksum: 10/21aae9701aad83dc16d51ffe2d9e90bd66a54b2f9bf099fe2fa4ce85635f192881c6d3644661a4d63f897e456501ceaa320cab3b2d66e3d80b1ba2b865fd2cc6 + languageName: node + linkType: hard + +"@ledgerhq/devices@npm:^8.4.0": + version: 8.4.0 + resolution: "@ledgerhq/devices@npm:8.4.0" + dependencies: + "@ledgerhq/errors": "npm:^6.17.0" + "@ledgerhq/logs": "npm:^6.12.0" + rxjs: "npm:^7.8.1" + semver: "npm:^7.3.5" + checksum: 10/2e1f6a95b4a5fe74eb50bbc2451ba121fe43818c2f77a5cb8b9dd61f113938c423b37ed32b5c35af70f4880af7d3f78e1f24d397da28ab62efa28ad1cd3f0594 + languageName: node + linkType: hard + +"@ledgerhq/errors@npm:^6.10.0, @ledgerhq/errors@npm:^6.17.0": + version: 6.17.0 + resolution: "@ledgerhq/errors@npm:6.17.0" + checksum: 10/97f746a7a57144b93ce914b2dd89e5c430b2fe743fc4ce26ead498a5dca36096c7a1a39258c7ee1837e4a17c4eaf31047c606828e059b089275605da6bd8a6ec + languageName: node + linkType: hard + +"@ledgerhq/hw-app-eth@npm:6.26.1": + version: 6.26.1 + resolution: "@ledgerhq/hw-app-eth@npm:6.26.1" + dependencies: + "@ethersproject/abi": "npm:^5.5.0" + "@ethersproject/rlp": "npm:^5.5.0" + "@ledgerhq/cryptoassets": "npm:^6.26.1" + "@ledgerhq/errors": "npm:^6.10.0" + "@ledgerhq/hw-transport": "npm:^6.24.1" + "@ledgerhq/logs": "npm:^6.10.0" + axios: "npm:^0.26.0" + bignumber.js: "npm:^9.0.2" + checksum: 10/be0abffa7a1daae8ce6dfac29b5f4313ae5a79d2811dcc32720f9dcf6856a51475decaea148ff71a05d3ff512775c409c888ff87f8e9f937bb92c88ff0001b18 + languageName: node + linkType: hard + +"@ledgerhq/hw-transport@npm:^6.24.1": + version: 6.31.0 + resolution: "@ledgerhq/hw-transport@npm:6.31.0" + dependencies: + "@ledgerhq/devices": "npm:^8.4.0" + "@ledgerhq/errors": "npm:^6.17.0" + "@ledgerhq/logs": "npm:^6.12.0" + events: "npm:^3.3.0" + checksum: 10/aceae60c98515696d08007d9c54a5f85b04fe1d14362cd672997a7fcd24422bcbf19ef1bed1ac4cc2d0b164b2226d1b3420250389f9694f2e77c7395da97982b + languageName: node + linkType: hard + +"@ledgerhq/logs@npm:^6.10.0, @ledgerhq/logs@npm:^6.12.0": + version: 6.12.0 + resolution: "@ledgerhq/logs@npm:6.12.0" + checksum: 10/a0a01f5d6edb0c14e7a42d24ab67ce362219517f6a50d0572c917f4f7988a1e2e9363e3d0fb170fe267f054e1e30a111564de44276e01c538b258d902c546421 + languageName: node + linkType: hard + "@lgbot/madge@npm:^6.2.0": version: 6.2.0 resolution: "@lgbot/madge@npm:6.2.0" @@ -5218,29 +5281,17 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-ledger-bridge-keyring@npm:2.0.1": - version: 2.0.1 - resolution: "@metamask/eth-ledger-bridge-keyring@npm:2.0.1" - dependencies: - "@ethereumjs/rlp": "npm:^4.0.0" - "@ethereumjs/tx": "npm:^4.1.1" - "@ethereumjs/util": "npm:^8.0.0" - "@metamask/eth-sig-util": "npm:^7.0.0" - hdkey: "npm:^2.1.0" - checksum: 10/1320b6587e021a9c81697104f3accafcb3d3fc8d616a82bf8be6a4a945965dd0546a82b81fd3dbbcaab24b0eafe7d91bfbbe6081c70a78ba89035a87494fe4d8 - languageName: node - linkType: hard - -"@metamask/eth-ledger-bridge-keyring@patch:@metamask/eth-ledger-bridge-keyring@npm%3A2.0.1#~/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch": - version: 2.0.1 - resolution: "@metamask/eth-ledger-bridge-keyring@patch:@metamask/eth-ledger-bridge-keyring@npm%3A2.0.1#~/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch::version=2.0.1&hash=322aa0" +"@metamask/eth-ledger-bridge-keyring@npm:^4.1.0": + version: 4.1.0 + resolution: "@metamask/eth-ledger-bridge-keyring@npm:4.1.0" dependencies: "@ethereumjs/rlp": "npm:^4.0.0" - "@ethereumjs/tx": "npm:^4.1.1" + "@ethereumjs/tx": "npm:^4.2.0" "@ethereumjs/util": "npm:^8.0.0" - "@metamask/eth-sig-util": "npm:^7.0.0" + "@ledgerhq/hw-app-eth": "npm:6.26.1" + "@metamask/eth-sig-util": "npm:^7.0.1" hdkey: "npm:^2.1.0" - checksum: 10/0f8c86d1b4c323b8a79fa82e3df300034f8dea928569cc3560d1b3352e09e9397844b75b8642ca57866ef5e241b49bd190b8ba7d1b08efa248d9ca909485a674 + checksum: 10/0e58208642f83a23f772fa38e9592b4821588d30afdb12e28f34e18f45f1a237269005ccbd22441e6cc673f64d1ca865d8a690d1429b5acdd150b219dba2d134 languageName: node linkType: hard @@ -12702,6 +12753,15 @@ __metadata: languageName: node linkType: hard +"axios@npm:^0.26.0": + version: 0.26.1 + resolution: "axios@npm:0.26.1" + dependencies: + follow-redirects: "npm:^1.14.8" + checksum: 10/02863f4a4fd4e43ad6e0c8bc9d1359a0863c43cc57bda42ea21dfce34681e3211df193b2bf2e8ee10b2c3870ab8d6bed38a3cf80cd6e8ee17749b7d73ccd4752 + languageName: node + linkType: hard + "axios@npm:^0.27.2": version: 0.27.2 resolution: "axios@npm:0.27.2" @@ -13094,7 +13154,7 @@ __metadata: languageName: node linkType: hard -"bignumber.js@npm:^9.0.0, bignumber.js@npm:^9.0.1, bignumber.js@npm:^9.1.1, bignumber.js@npm:^9.1.2": +"bignumber.js@npm:^9.0.0, bignumber.js@npm:^9.0.1, bignumber.js@npm:^9.0.2, bignumber.js@npm:^9.1.1, bignumber.js@npm:^9.1.2": version: 9.1.2 resolution: "bignumber.js@npm:9.1.2" checksum: 10/d89b8800a987225d2c00dcbf8a69dc08e92aa0880157c851c287b307d31ceb2fc2acb0c62c3e3a3d42b6c5fcae9b004035f13eb4386e56d529d7edac18d5c9d8 @@ -19110,7 +19170,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.6": +"follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.6": version: 1.15.6 resolution: "follow-redirects@npm:1.15.6" peerDependenciesMeta: @@ -21319,7 +21379,7 @@ __metadata: languageName: node linkType: hard -"invariant@npm:2.2.4, invariant@npm:^2.2.4": +"invariant@npm:2, invariant@npm:2.2.4, invariant@npm:^2.2.4": version: 2.2.4 resolution: "invariant@npm:2.2.4" dependencies: @@ -25241,7 +25301,7 @@ __metadata: "@metamask/eslint-plugin-design-tokens": "npm:^1.1.0" "@metamask/eth-json-rpc-filters": "npm:^7.0.0" "@metamask/eth-json-rpc-middleware": "npm:^12.1.1" - "@metamask/eth-ledger-bridge-keyring": "patch:@metamask/eth-ledger-bridge-keyring@npm%3A2.0.1#~/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch" + "@metamask/eth-ledger-bridge-keyring": "npm:^4.1.0" "@metamask/eth-query": "npm:^4.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" "@metamask/eth-snap-keyring": "npm:^4.3.1"