diff --git a/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch b/.yarn/patches/@ledgerhq-evm-tools-npm-1.3.0-57435278f6.patch similarity index 73% rename from .yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch rename to .yarn/patches/@ledgerhq-evm-tools-npm-1.3.0-57435278f6.patch index 15335a88e494..19002b9ed7ab 100644 --- a/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch +++ b/.yarn/patches/@ledgerhq-evm-tools-npm-1.3.0-57435278f6.patch @@ -1,11 +1,11 @@ diff --git a/lib/message/EIP712/index.js b/lib/message/EIP712/index.js -index 5443ac06d4ef29028e3acce98210949da2ef9263..57ec8615340a9285290ad5d2c2522ed19af2d0fc 100644 +index a5c677ebf53ab6c22987cebf1c92b21c6245b5db..f5a5580df74100d5e1725bb783038c4c60ae1dbc 100644 --- a/lib/message/EIP712/index.js +++ b/lib/message/EIP712/index.js -@@ -28,8 +28,8 @@ const ethers_1 = require("ethers"); - const axios_1 = __importDefault(require("axios")); - const sha224_1 = __importDefault(require("crypto-js/sha224")); +@@ -29,8 +29,8 @@ const sha224_1 = __importDefault(require("crypto-js/sha224")); const live_env_1 = require("@ledgerhq/live-env"); + const constants_1 = require("@ethersproject/constants"); + const hash_1 = require("@ethersproject/hash"); -const eip712_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/data/eip712")); -const eip712_v2_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/data/eip712_v2")); +const eip712_1 = __importDefault(require("@ledgerhq/cryptoassets-evm-signatures/lib/data/eip712")); diff --git a/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch b/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.42.2-46a44bfbf5.patch similarity index 74% rename from .yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch rename to .yarn/patches/@ledgerhq-hw-app-eth-npm-6.42.2-46a44bfbf5.patch index cfefcca767a7..bc0e13b93194 100644 --- a/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch +++ b/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.42.2-46a44bfbf5.patch @@ -1,5 +1,5 @@ diff --git a/lib/modules/EIP712/index.js b/lib/modules/EIP712/index.js -index bbca23c9a596b2b300aca0f323bad277a4190def..c85cb18c3d6ff049c442d358b4d834c04a49951f 100644 +index 24251b4584b04fd138b8892f027ccad60b14fc9e..4b99b94cf2327042b53687b4e2b076bd0cb8fba1 100644 --- a/lib/modules/EIP712/index.js +++ b/lib/modules/EIP712/index.js @@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); @@ -12,7 +12,7 @@ index bbca23c9a596b2b300aca0f323bad277a4190def..c85cb18c3d6ff049c442d358b4d834c0 const utils_1 = require("../../utils"); const loadConfig_1 = require("../../services/ledger/loadConfig"); diff --git a/lib/modules/EIP712/utils.js b/lib/modules/EIP712/utils.js -index 4f09ea8a24ae4f175f1a4d2d40999d36ffa2a915..1cc7de0d5ffd2b980741ad6d85a75792085c031b 100644 +index 4f09ea8a24ae4f175f1a4d2d40999d36ffa2a915..38225b98bc124d8648d1ff110570293f165bd2a6 100644 --- a/lib/modules/EIP712/utils.js +++ b/lib/modules/EIP712/utils.js @@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { @@ -25,7 +25,7 @@ index 4f09ea8a24ae4f175f1a4d2d40999d36ffa2a915..1cc7de0d5ffd2b980741ad6d85a75792 /** * @ignore for the README diff --git a/lib/services/ledger/erc20.js b/lib/services/ledger/erc20.js -index 8fdedf8037b2684ab6d48fd279a0c014b074b676..c10cea22504a4d3cd72bfac51463e5664639d20e 100644 +index 8fdedf8037b2684ab6d48fd279a0c014b074b676..90ce6589407c1b8719550c21251f3f247fcef085 100644 --- a/lib/services/ledger/erc20.js +++ b/lib/services/ledger/erc20.js @@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); @@ -38,26 +38,26 @@ index 8fdedf8037b2684ab6d48fd279a0c014b074b676..c10cea22504a4d3cd72bfac51463e566 const asContractAddress = (addr) => { const a = addr.toLowerCase(); diff --git a/lib/services/ledger/index.js b/lib/services/ledger/index.js -index 8385537236dfc98902376b29f712e9f7b605091a..6641b951b0c7e477fe5622c724ee22b9e5272213 100644 +index 86db9973e63e1ac7c0e7f67e53ca8f05aa809805..29ebceeab40cdad75092d8af747d770411f8a605 100644 --- a/lib/services/ledger/index.js +++ b/lib/services/ledger/index.js @@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); - // This implements the resolution of a Transaction using Ledger's own API - const logs_1 = require("@ledgerhq/logs"); + const transactions_1 = require("@ethersproject/transactions"); const abi_1 = require("@ethersproject/abi"); + const logs_1 = require("@ledgerhq/logs"); -const index_1 = require("@ledgerhq/domain-service/signers/index"); +const index_1 = require("@ledgerhq/domain-service/lib/signers/index"); + const constants_1 = require("../../modules/Uniswap/constants"); const erc20_1 = require("./erc20"); - const contracts_1 = require("./contracts"); - const nfts_1 = require("./nfts"); + const Uniswap_1 = require("../../modules/Uniswap"); diff --git a/lib/utils.js b/lib/utils.js -index 027089bf09c047b34af79e3dea253d5335d336f3..1c5da628db47a33099532973de9ea634a1ee65df 100644 +index 6c5f58439116b2c6b5844f5e17d0eb876a436f41..e719e9840d33721ef79bb12232991621c828b501 100644 --- a/lib/utils.js +++ b/lib/utils.js -@@ -2,7 +2,7 @@ - Object.defineProperty(exports, "__esModule", { value: true }); - exports.mergeResolutions = exports.nftSelectors = exports.tokenSelectors = exports.intAsHexBytes = exports.decodeTxInfo = exports.maybeHexBuffer = exports.hexBuffer = exports.splitPath = exports.padHexString = exports.ERC1155_CLEAR_SIGNED_SELECTORS = exports.ERC721_CLEAR_SIGNED_SELECTORS = exports.ERC20_CLEAR_SIGNED_SELECTORS = void 0; +@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); + exports.safeChunkTransaction = exports.getV = exports.getChainIdAsUint32 = exports.getParity = exports.mergeResolutions = exports.nftSelectors = exports.tokenSelectors = exports.intAsHexBytes = exports.maybeHexBuffer = exports.hexBuffer = exports.splitPath = exports.padHexString = exports.ERC1155_CLEAR_SIGNED_SELECTORS = exports.ERC721_CLEAR_SIGNED_SELECTORS = exports.ERC20_CLEAR_SIGNED_SELECTORS = void 0; const bignumber_js_1 = require("bignumber.js"); + const rlp = __importStar(require("@ethersproject/rlp")); -const index_1 = require("@ledgerhq/evm-tools/selectors/index"); +const index_1 = require("@ledgerhq/evm-tools/lib/selectors/index"); Object.defineProperty(exports, "ERC20_CLEAR_SIGNED_SELECTORS", { enumerable: true, get: function () { return index_1.ERC20_CLEAR_SIGNED_SELECTORS; } }); diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index c448644fda44..95bdd11206cb 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -4820,7 +4820,7 @@ export default class MetamaskController extends EventEmitter { async attemptLedgerTransportCreation() { return await this.#withKeyringForDevice( - HardwareDeviceNames.ledger, + { name: HardwareDeviceNames.ledger }, async (keyring) => keyring.attemptMakeApp(), ); } diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index b36f23e654bb..676578cd53c2 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -693,11 +693,12 @@ }, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": { "packages": { + "ethers>@ethersproject/constants": true, + "@ethersproject/hash": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true, - "@metamask/ppom-validator>crypto-js": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true + "@metamask/ppom-validator>crypto-js": true } }, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": { @@ -707,6 +708,7 @@ "packages": { "@ethersproject/abi": true, "ethers>@ethersproject/rlp": true, + "ethers>@ethersproject/transactions": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true, @@ -4043,37 +4045,6 @@ "ethers>@ethersproject/wordlists": true } }, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": { - "packages": { - "@ethersproject/abi": true, - "ethers>@ethersproject/abstract-signer": true, - "ethers>@ethersproject/address": true, - "ethers>@ethersproject/base64": true, - "ethers>@ethersproject/basex": true, - "@ethersproject/bignumber": true, - "@ethersproject/bytes": true, - "ethers>@ethersproject/constants": true, - "@ethersproject/contracts": true, - "@ethersproject/hash": true, - "@ethersproject/hdnode": true, - "ethers>@ethersproject/json-wallets": true, - "ethers>@ethersproject/keccak256": true, - "ethers>@ethersproject/logger": true, - "ethers>@ethersproject/properties": true, - "@ethersproject/providers": true, - "ethers>@ethersproject/random": true, - "ethers>@ethersproject/rlp": true, - "ethers>@ethersproject/sha2": true, - "ethers>@ethersproject/signing-key": true, - "ethers>@ethersproject/solidity": true, - "ethers>@ethersproject/strings": true, - "ethers>@ethersproject/transactions": true, - "ethers>@ethersproject/units": true, - "@ethersproject/wallet": true, - "@ethersproject/providers>@ethersproject/web": true, - "ethers>@ethersproject/wordlists": true - } - }, "eth-method-registry>@metamask/ethjs-contract>ethjs-abi": { "packages": { "bn.js": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 7bed64327dde..3ff601c92a90 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -693,11 +693,12 @@ }, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": { "packages": { + "ethers>@ethersproject/constants": true, + "@ethersproject/hash": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true, - "@metamask/ppom-validator>crypto-js": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true + "@metamask/ppom-validator>crypto-js": true } }, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": { @@ -707,6 +708,7 @@ "packages": { "@ethersproject/abi": true, "ethers>@ethersproject/rlp": true, + "ethers>@ethersproject/transactions": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true, @@ -4056,37 +4058,6 @@ "ethers>@ethersproject/wordlists": true } }, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": { - "packages": { - "@ethersproject/abi": true, - "ethers>@ethersproject/abstract-signer": true, - "ethers>@ethersproject/address": true, - "ethers>@ethersproject/base64": true, - "ethers>@ethersproject/basex": true, - "@ethersproject/bignumber": true, - "@ethersproject/bytes": true, - "ethers>@ethersproject/constants": true, - "@ethersproject/contracts": true, - "@ethersproject/hash": true, - "@ethersproject/hdnode": true, - "ethers>@ethersproject/json-wallets": true, - "ethers>@ethersproject/keccak256": true, - "ethers>@ethersproject/logger": true, - "ethers>@ethersproject/properties": true, - "@ethersproject/providers": true, - "ethers>@ethersproject/random": true, - "ethers>@ethersproject/rlp": true, - "ethers>@ethersproject/sha2": true, - "ethers>@ethersproject/signing-key": true, - "ethers>@ethersproject/solidity": true, - "ethers>@ethersproject/strings": true, - "ethers>@ethersproject/transactions": true, - "ethers>@ethersproject/units": true, - "@ethersproject/wallet": true, - "@ethersproject/providers>@ethersproject/web": true, - "ethers>@ethersproject/wordlists": true - } - }, "eth-method-registry>@metamask/ethjs-contract>ethjs-abi": { "packages": { "bn.js": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index b36f23e654bb..676578cd53c2 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -693,11 +693,12 @@ }, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": { "packages": { + "ethers>@ethersproject/constants": true, + "@ethersproject/hash": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true, - "@metamask/ppom-validator>crypto-js": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true + "@metamask/ppom-validator>crypto-js": true } }, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": { @@ -707,6 +708,7 @@ "packages": { "@ethersproject/abi": true, "ethers>@ethersproject/rlp": true, + "ethers>@ethersproject/transactions": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true, @@ -4043,37 +4045,6 @@ "ethers>@ethersproject/wordlists": true } }, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": { - "packages": { - "@ethersproject/abi": true, - "ethers>@ethersproject/abstract-signer": true, - "ethers>@ethersproject/address": true, - "ethers>@ethersproject/base64": true, - "ethers>@ethersproject/basex": true, - "@ethersproject/bignumber": true, - "@ethersproject/bytes": true, - "ethers>@ethersproject/constants": true, - "@ethersproject/contracts": true, - "@ethersproject/hash": true, - "@ethersproject/hdnode": true, - "ethers>@ethersproject/json-wallets": true, - "ethers>@ethersproject/keccak256": true, - "ethers>@ethersproject/logger": true, - "ethers>@ethersproject/properties": true, - "@ethersproject/providers": true, - "ethers>@ethersproject/random": true, - "ethers>@ethersproject/rlp": true, - "ethers>@ethersproject/sha2": true, - "ethers>@ethersproject/signing-key": true, - "ethers>@ethersproject/solidity": true, - "ethers>@ethersproject/strings": true, - "ethers>@ethersproject/transactions": true, - "ethers>@ethersproject/units": true, - "@ethersproject/wallet": true, - "@ethersproject/providers>@ethersproject/web": true, - "ethers>@ethersproject/wordlists": true - } - }, "eth-method-registry>@metamask/ethjs-contract>ethjs-abi": { "packages": { "bn.js": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 5dad2a30d37e..196886976e59 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -693,11 +693,12 @@ }, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools": { "packages": { + "ethers>@ethersproject/constants": true, + "@ethersproject/hash": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>@ledgerhq/live-env": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>axios": true, - "@metamask/ppom-validator>crypto-js": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": true + "@metamask/ppom-validator>crypto-js": true } }, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": { @@ -707,6 +708,7 @@ "packages": { "@ethersproject/abi": true, "ethers>@ethersproject/rlp": true, + "ethers>@ethersproject/transactions": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/cryptoassets-evm-signatures": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/errors": true, @@ -4135,37 +4137,6 @@ "ethers>@ethersproject/wordlists": true } }, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/evm-tools>ethers": { - "packages": { - "@ethersproject/abi": true, - "ethers>@ethersproject/abstract-signer": true, - "ethers>@ethersproject/address": true, - "ethers>@ethersproject/base64": true, - "ethers>@ethersproject/basex": true, - "@ethersproject/bignumber": true, - "@ethersproject/bytes": true, - "ethers>@ethersproject/constants": true, - "@ethersproject/contracts": true, - "@ethersproject/hash": true, - "@ethersproject/hdnode": true, - "ethers>@ethersproject/json-wallets": true, - "ethers>@ethersproject/keccak256": true, - "ethers>@ethersproject/logger": true, - "ethers>@ethersproject/properties": true, - "@ethersproject/providers": true, - "ethers>@ethersproject/random": true, - "ethers>@ethersproject/rlp": true, - "ethers>@ethersproject/sha2": true, - "ethers>@ethersproject/signing-key": true, - "ethers>@ethersproject/solidity": true, - "ethers>@ethersproject/strings": true, - "ethers>@ethersproject/transactions": true, - "ethers>@ethersproject/units": true, - "@ethersproject/wallet": true, - "@ethersproject/providers>@ethersproject/web": true, - "ethers>@ethersproject/wordlists": true - } - }, "eth-method-registry>@metamask/ethjs-contract>ethjs-abi": { "packages": { "bn.js": true, diff --git a/offscreen/scripts/ledger.ts b/offscreen/scripts/ledger.ts index 4cff2f3a6748..4e03def36068 100644 --- a/offscreen/scripts/ledger.ts +++ b/offscreen/scripts/ledger.ts @@ -96,7 +96,7 @@ function setupMessageListeners(iframe: HTMLIFrameElement) { export default async function init() { return new Promise((resolve) => { const iframe = document.createElement('iframe'); - iframe.src = 'https://metamask.github.io/ledger-iframe-bridge/8.0.0/'; + iframe.src = 'https://metamask.github.io/ledger-iframe-bridge/8.0.3/'; iframe.allow = 'hid'; iframe.onload = () => { setupMessageListeners(iframe); diff --git a/package.json b/package.json index 42ac548b4cb7..1ceba0156a64 100644 --- a/package.json +++ b/package.json @@ -238,8 +238,8 @@ "@ledgerhq/domain-service/axios": "^0.28.0", "@ledgerhq/evm-tools/axios": "^0.28.0", "@ledgerhq/hw-app-eth/axios": "^0.28.0", - "@ledgerhq/hw-app-eth@npm:^6.39.0": "patch:@ledgerhq/hw-app-eth@npm%3A6.39.0#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch", - "@ledgerhq/evm-tools@npm:^1.2.3": "patch:@ledgerhq/evm-tools@npm%3A1.2.3#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch", + "@ledgerhq/hw-app-eth@npm:^6.42.0": "patch:@ledgerhq/hw-app-eth@npm%3A6.42.2#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.42.2-46a44bfbf5.patch", + "@ledgerhq/evm-tools@npm:^1.3.0": "patch:@ledgerhq/evm-tools@npm%3A1.3.0#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.3.0-57435278f6.patch", "cross-spawn@npm:^5.0.1": "^7.0.6", "@solana/web3.js@npm:^1.95.0": "^1.95.8", "secp256k1@npm:^4.0.0": "4.0.4", @@ -301,7 +301,7 @@ "@metamask/ens-resolver-snap": "^0.1.2", "@metamask/eth-json-rpc-filters": "^9.0.0", "@metamask/eth-json-rpc-middleware": "^15.1.2", - "@metamask/eth-ledger-bridge-keyring": "^8.0.2", + "@metamask/eth-ledger-bridge-keyring": "^8.0.3", "@metamask/eth-sig-util": "^7.0.1", "@metamask/eth-snap-keyring": "^8.1.1", "@metamask/eth-token-tracker": "^10.0.2", diff --git a/yarn.lock b/yarn.lock index a899bf3cc6d6..a9a983a2f260 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2725,7 +2725,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.5.0, @ethersproject/rlp@npm:^5.7.0": +"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/rlp@npm:5.7.0" dependencies: @@ -4321,13 +4321,13 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/cryptoassets-evm-signatures@npm:^13.5.0": - version: 13.5.0 - resolution: "@ledgerhq/cryptoassets-evm-signatures@npm:13.5.0" +"@ledgerhq/cryptoassets-evm-signatures@npm:^13.5.2": + version: 13.5.2 + resolution: "@ledgerhq/cryptoassets-evm-signatures@npm:13.5.2" dependencies: - "@ledgerhq/live-env": "npm:^2.3.0" + "@ledgerhq/live-env": "npm:^2.4.1" axios: "npm:1.7.7" - checksum: 10/ce6e3343fdf60255ede1d784a2fb47c8c5f49e8257559947e2678fac250700140695c85ae06bef777ccc4bb37577db813a4b3d031f3b0b84cbcd6e139613fbf9 + checksum: 10/2cf692c111523fa634a6eeadfbe1e9eca29fd9e8c03a04dac00f0c191becdc0300bf90d1a5a0190b6ac8cf1436bb14009b50039e3611c55dd6843a6ec45230ec languageName: node linkType: hard @@ -4343,18 +4343,18 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/domain-service@npm:^1.2.6": - version: 1.2.6 - resolution: "@ledgerhq/domain-service@npm:1.2.6" +"@ledgerhq/domain-service@npm:^1.2.15": + version: 1.2.15 + resolution: "@ledgerhq/domain-service@npm:1.2.15" dependencies: "@ledgerhq/errors": "npm:^6.19.1" "@ledgerhq/logs": "npm:^6.12.0" - "@ledgerhq/types-live": "npm:^6.52.0" + "@ledgerhq/types-live": "npm:^6.56.0" axios: "npm:1.7.7" eip55: "npm:^2.1.1" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" - checksum: 10/0b680af9deff24f608446cb7026b06e09ea693a367a5ef5e71068c70fabfbb98019cb618daefed278ed875a0ff5d296735fb743746ac0edee1357ae12fd58d99 + checksum: 10/04585a2558512fa0bf07df89d608449cb184c3ae61d33364e67701b42353bd28c922c2bd5e8b6f843beffa3ae5667f3bc7bc9802a5c6a977ddf75a15f10e3895 languageName: node linkType: hard @@ -4365,71 +4365,75 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/evm-tools@npm:1.2.3": - version: 1.2.3 - resolution: "@ledgerhq/evm-tools@npm:1.2.3" +"@ledgerhq/evm-tools@npm:1.3.0": + version: 1.3.0 + resolution: "@ledgerhq/evm-tools@npm:1.3.0" dependencies: - "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0" - "@ledgerhq/live-env": "npm:^2.3.0" + "@ethersproject/constants": "npm:^5.7.0" + "@ethersproject/hash": "npm:^5.7.0" + "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.2" + "@ledgerhq/live-env": "npm:^2.4.1" axios: "npm:1.7.7" crypto-js: "npm:4.2.0" - ethers: "npm:5.7.2" - checksum: 10/956a0a3ac26454ac350c5e34b5cfb911ed3a0f3f724bec1ce2c56f2de344635b582f977e4901841c353d98c50b076e40bfb03d865eed3a82e328744043e00ee7 + checksum: 10/e4394a3065391d44efe958a043df6fade68e789f18386d2a22f51574eb6b723151c8e631af2bce21b951b1908930145181cf8db41fe546e4a06c34a81cb3ff6b languageName: node linkType: hard -"@ledgerhq/evm-tools@patch:@ledgerhq/evm-tools@npm%3A1.2.3#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch": - version: 1.2.3 - resolution: "@ledgerhq/evm-tools@patch:@ledgerhq/evm-tools@npm%3A1.2.3#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.2.3-414f44baa9.patch::version=1.2.3&hash=1deaa9" +"@ledgerhq/evm-tools@patch:@ledgerhq/evm-tools@npm%3A1.3.0#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.3.0-57435278f6.patch": + version: 1.3.0 + resolution: "@ledgerhq/evm-tools@patch:@ledgerhq/evm-tools@npm%3A1.3.0#~/.yarn/patches/@ledgerhq-evm-tools-npm-1.3.0-57435278f6.patch::version=1.3.0&hash=2f2218" dependencies: - "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0" - "@ledgerhq/live-env": "npm:^2.3.0" + "@ethersproject/constants": "npm:^5.7.0" + "@ethersproject/hash": "npm:^5.7.0" + "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.2" + "@ledgerhq/live-env": "npm:^2.4.1" axios: "npm:1.7.7" crypto-js: "npm:4.2.0" - ethers: "npm:5.7.2" - checksum: 10/c7d79c691f681376efc6c44d16a00f6349301091a82a7a8ad264475562896bf8a9b4e922080f4f6f541bb62483ad9efeeec87910fa6f15d9db3e1d22820548c8 + checksum: 10/c3a98a0de38be7f1ee7484b62031f4382dc2691c9a4385d79a2a20cbbf7748a3c84bf19b00ec6aa487464d8d8d8debf529fdc286a4678d16912dce8a07ce3c4d languageName: node linkType: hard -"@ledgerhq/hw-app-eth@npm:6.39.0": - version: 6.39.0 - resolution: "@ledgerhq/hw-app-eth@npm:6.39.0" +"@ledgerhq/hw-app-eth@npm:6.42.2": + version: 6.42.2 + resolution: "@ledgerhq/hw-app-eth@npm:6.42.2" dependencies: - "@ethersproject/abi": "npm:^5.5.0" - "@ethersproject/rlp": "npm:^5.5.0" - "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0" - "@ledgerhq/domain-service": "npm:^1.2.6" + "@ethersproject/abi": "npm:^5.7.0" + "@ethersproject/rlp": "npm:^5.7.0" + "@ethersproject/transactions": "npm:^5.7.0" + "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.2" + "@ledgerhq/domain-service": "npm:^1.2.15" "@ledgerhq/errors": "npm:^6.19.1" - "@ledgerhq/evm-tools": "npm:^1.2.3" + "@ledgerhq/evm-tools": "npm:^1.3.0" "@ledgerhq/hw-transport": "npm:^6.31.4" "@ledgerhq/hw-transport-mocker": "npm:^6.29.4" "@ledgerhq/logs": "npm:^6.12.0" - "@ledgerhq/types-live": "npm:^6.52.0" + "@ledgerhq/types-live": "npm:^6.56.0" axios: "npm:1.7.7" bignumber.js: "npm:^9.1.2" semver: "npm:^7.3.5" - checksum: 10/5b50aac35989e09704557523efe5b6b29a1f31f5279088ecceb90164e32e05860f3ff20c32a084003a69723ed08165ae140c2987424657245f088c3f9a908cd6 + checksum: 10/58a80daa4a1d6881fc0188ee68f6d3ff76c753e558e9b299cc0ae04859a111881c372445c06bc7c68f25b03aa51a31c335cc3fc4188c25552fc490c7da85fcdc languageName: node linkType: hard -"@ledgerhq/hw-app-eth@patch:@ledgerhq/hw-app-eth@npm%3A6.39.0#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch": - version: 6.39.0 - resolution: "@ledgerhq/hw-app-eth@patch:@ledgerhq/hw-app-eth@npm%3A6.39.0#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.39.0-866309bbbe.patch::version=6.39.0&hash=f5404c" +"@ledgerhq/hw-app-eth@patch:@ledgerhq/hw-app-eth@npm%3A6.42.2#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.42.2-46a44bfbf5.patch": + version: 6.42.2 + resolution: "@ledgerhq/hw-app-eth@patch:@ledgerhq/hw-app-eth@npm%3A6.42.2#~/.yarn/patches/@ledgerhq-hw-app-eth-npm-6.42.2-46a44bfbf5.patch::version=6.42.2&hash=5d4d32" dependencies: - "@ethersproject/abi": "npm:^5.5.0" - "@ethersproject/rlp": "npm:^5.5.0" - "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0" - "@ledgerhq/domain-service": "npm:^1.2.6" + "@ethersproject/abi": "npm:^5.7.0" + "@ethersproject/rlp": "npm:^5.7.0" + "@ethersproject/transactions": "npm:^5.7.0" + "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.2" + "@ledgerhq/domain-service": "npm:^1.2.15" "@ledgerhq/errors": "npm:^6.19.1" - "@ledgerhq/evm-tools": "npm:^1.2.3" + "@ledgerhq/evm-tools": "npm:^1.3.0" "@ledgerhq/hw-transport": "npm:^6.31.4" "@ledgerhq/hw-transport-mocker": "npm:^6.29.4" "@ledgerhq/logs": "npm:^6.12.0" - "@ledgerhq/types-live": "npm:^6.52.0" + "@ledgerhq/types-live": "npm:^6.56.0" axios: "npm:1.7.7" bignumber.js: "npm:^9.1.2" semver: "npm:^7.3.5" - checksum: 10/fb270eee2b2d0886462908b4c511262da0c884f0b72ab50225407608d197ece71b05b4fdc07e628c75ab3ae573e49ed5c3ccf3b2f40a28e4663a28788d46b4dd + checksum: 10/9f62c5eea23fddef9b67c9a70e9f0a7147eb05cd43a7579067d31a4899f0ef6d155cb0591736702e101794322cd0c496214c0121045e1ebf53e618a0ec2ee215 languageName: node linkType: hard @@ -4456,13 +4460,13 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/live-env@npm:^2.3.0": - version: 2.3.0 - resolution: "@ledgerhq/live-env@npm:2.3.0" +"@ledgerhq/live-env@npm:^2.4.1": + version: 2.4.1 + resolution: "@ledgerhq/live-env@npm:2.4.1" dependencies: rxjs: "npm:^7.8.1" utility-types: "npm:^3.10.0" - checksum: 10/757ff834d6b94dce0487d60ab0efa45ef206ebbdfd29053c232b4c0fdce1594016531340c1603695b37f17deb1639dcb98078a9629eeb36c835a19f4180834ce + checksum: 10/e8f5f13d77619f0e2b83907fa2a4e80f9e1ed18aeba0cfb2dcafe4d505ed4dd811a1b508ca752a4fd3782f8e5cf651a9daea0cb17d57e9159f915042b94b867d languageName: node linkType: hard @@ -4473,13 +4477,13 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/types-live@npm:^6.52.0": - version: 6.52.0 - resolution: "@ledgerhq/types-live@npm:6.52.0" +"@ledgerhq/types-live@npm:^6.56.0": + version: 6.56.0 + resolution: "@ledgerhq/types-live@npm:6.56.0" dependencies: bignumber.js: "npm:^9.1.2" rxjs: "npm:^7.8.1" - checksum: 10/c410f02159538d66f59956512fc5bab2cb17edee7f6a15a517c31d89d6c730e52691666bb2e1d98718c701e94306dd7498544ea3d7772ff0b5ad6522fb2c335c + checksum: 10/a3cdf2acc6b4fa41aa34993f8790d44aa4fa937378b0bce29a69889b43e5229662803530b948206fe9fe02498d25058e71db2b14f22dc53445df7f53e547c308 languageName: node linkType: hard @@ -5334,17 +5338,17 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-ledger-bridge-keyring@npm:^8.0.2": - version: 8.0.2 - resolution: "@metamask/eth-ledger-bridge-keyring@npm:8.0.2" +"@metamask/eth-ledger-bridge-keyring@npm:^8.0.3": + version: 8.0.3 + resolution: "@metamask/eth-ledger-bridge-keyring@npm:8.0.3" dependencies: "@ethereumjs/rlp": "npm:^5.0.2" "@ethereumjs/tx": "npm:^4.2.0" "@ethereumjs/util": "npm:^8.1.0" - "@ledgerhq/hw-app-eth": "npm:^6.39.0" + "@ledgerhq/hw-app-eth": "npm:^6.42.0" "@metamask/eth-sig-util": "npm:^8.1.2" hdkey: "npm:^2.1.0" - checksum: 10/702d833a1a3a702d128b831f5cba157b14c414fdf0e9a6796e9f0cb866ea71da8673fb46494608cd05044387bc4bd99dbec0ac7bd98f24c2b11b61298288cae8 + checksum: 10/5b5c9f72eec882638985b11198350ace3647fa0ec92facbac3a9c1a67543a8270017c583d2d1464e2ec96cb93ff8b64509c0c8ebc395f8ce7de5ffd8f483ca63 languageName: node linkType: hard @@ -19015,7 +19019,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:5.7.2, ethers@npm:^5.7.0": +"ethers@npm:^5.7.0": version: 5.7.2 resolution: "ethers@npm:5.7.2" dependencies: @@ -26695,7 +26699,7 @@ __metadata: "@metamask/eth-json-rpc-filters": "npm:^9.0.0" "@metamask/eth-json-rpc-middleware": "npm:^15.1.2" "@metamask/eth-json-rpc-provider": "npm:^4.1.6" - "@metamask/eth-ledger-bridge-keyring": "npm:^8.0.2" + "@metamask/eth-ledger-bridge-keyring": "npm:^8.0.3" "@metamask/eth-sig-util": "npm:^7.0.1" "@metamask/eth-snap-keyring": "npm:^8.1.1" "@metamask/eth-token-tracker": "npm:^10.0.2"