From fae2903239e3ba9f58e3b4e4625a9c0d73d3a5f0 Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Tue, 26 Nov 2024 10:21:05 +0800 Subject: [PATCH 01/11] feat: make a backup of ledger clear signing implementation, need to wait for lib upgrade a release. --- .../lib/offscreen-bridge/ledger-offscreen-bridge.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts b/app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts index 608d1ee8156b..e73b634af794 100644 --- a/app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts +++ b/app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts @@ -1,4 +1,8 @@ import { LedgerBridge } from '@metamask/eth-ledger-bridge-keyring'; +import { + LedgerSignTypedDataParams, + LedgerSignTypedDataResponse, +} from '@metamask/eth-ledger-bridge-keyring/dist/ledger-bridge'; import { LedgerAction, OffscreenCommunicationEvents, @@ -161,11 +165,9 @@ export class LedgerOffscreenBridge }); } - deviceSignTypedData(params: { - hdPath: string; - domainSeparatorHex: string; - hashStructMessageHex: string; - }) { + deviceSignTypedData( + params: LedgerSignTypedDataParams, + ): Promise { return new Promise<{ v: number; s: string; From a09ca8ebe150da2a54bb071f8e3b2833d84b192a Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 27 Nov 2024 16:14:58 +0800 Subject: [PATCH 02/11] feat: add code for clear signing in metamask extension. will require patch to work before library upgrade. --- lavamoat/build-system/policy.json | 10 +++++++++- offscreen/scripts/ledger.ts | 2 +- shared/constants/offscreen-communication.ts | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 59a807e7313f..7be527ca37e7 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -2040,7 +2040,8 @@ "chokidar>normalize-path": true, "chokidar>readdirp": true, "del>is-glob": true, - "eslint>glob-parent": true + "eslint>glob-parent": true, + "tsx>fsevents": true } }, "chokidar>anymatch": { @@ -8788,6 +8789,13 @@ "typescript": true } }, + "tsx>fsevents": { + "globals": { + "console.assert": true, + "process.platform": true + }, + "native": true + }, "typescript": { "builtin": { "buffer.Buffer": true, diff --git a/offscreen/scripts/ledger.ts b/offscreen/scripts/ledger.ts index c08fdc6ac85a..9edb0b520a90 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/eth-ledger-bridge-keyring'; + iframe.src = 'https://localhost:5173'; iframe.allow = 'hid'; iframe.onload = () => { setupMessageListeners(iframe); diff --git a/shared/constants/offscreen-communication.ts b/shared/constants/offscreen-communication.ts index 881a02560b2d..dea7d01bd19a 100644 --- a/shared/constants/offscreen-communication.ts +++ b/shared/constants/offscreen-communication.ts @@ -55,5 +55,5 @@ export enum LedgerAction { */ export enum KnownOrigins { lattice = 'https://lattice.gridplus.io', - ledger = 'https://metamask.github.io', + ledger = 'https://localhost:5173', } From d34e35c7bee27e3b1a69208ce3d0a082eda150d3 Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Fri, 29 Nov 2024 11:09:41 +0800 Subject: [PATCH 03/11] feat: update URL to use custom github page to test clear signing. --- offscreen/scripts/ledger.ts | 2 +- privacy-snapshot.json | 1 + shared/constants/offscreen-communication.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/offscreen/scripts/ledger.ts b/offscreen/scripts/ledger.ts index 9edb0b520a90..1468b5cfcfc7 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://localhost:5173'; + iframe.src = 'https://dawnseeker8.github.io/eth-ledger-bridge-keyring'; iframe.allow = 'hid'; iframe.onload = () => { setupMessageListeners(iframe); diff --git a/privacy-snapshot.json b/privacy-snapshot.json index fc5dafb7333c..e7ffbc9593f8 100644 --- a/privacy-snapshot.json +++ b/privacy-snapshot.json @@ -38,6 +38,7 @@ "metamask-sdk.api.cx.metamask.io", "metamask.eth", "metamask.github.io", + "dawnseeker8.github.io", "metametrics.metamask.test", "min-api.cryptocompare.com", "nft.api.cx.metamask.io", diff --git a/shared/constants/offscreen-communication.ts b/shared/constants/offscreen-communication.ts index dea7d01bd19a..4119bbfe9efe 100644 --- a/shared/constants/offscreen-communication.ts +++ b/shared/constants/offscreen-communication.ts @@ -55,5 +55,5 @@ export enum LedgerAction { */ export enum KnownOrigins { lattice = 'https://lattice.gridplus.io', - ledger = 'https://localhost:5173', + ledger = 'https://dawnseeker8.github.io', } From e2bfb72466661cd0782415d329fee710adef231c Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 4 Dec 2024 09:29:47 +0800 Subject: [PATCH 04/11] feat: use preview build for eth-ledger-bridge-keyring to test. --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0359c83c1da9..017c9d76a354 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5298,17 +5298,17 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-ledger-bridge-keyring@npm:^5.0.1": - version: 5.0.1 - resolution: "@metamask/eth-ledger-bridge-keyring@npm:5.0.1" +"@metamask/eth-ledger-bridge-keyring@npm:@metamask-previews/eth-ledger-bridge-keyring@7.0.0-e345222": + version: 7.0.0-e345222 + resolution: "@metamask-previews/eth-ledger-bridge-keyring@npm:7.0.0-e345222" 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" - "@metamask/eth-sig-util": "npm:^7.0.3" + "@metamask/eth-sig-util": "npm:^8.0.0" hdkey: "npm:^2.1.0" - checksum: 10/5ac967d7c88c2f1f2853118cfe65ee081a90c2633fb468eae8049c3a78a4985f03130bff3071e9fb893e4c97bc55aeb2196e2b6e9e363ac6235379b80e7cfc7e + checksum: 10/76b883d0fe5d55716635a99564be1ad96597d21e98ad524fca5961e3d342ee26ccb51633c3ca807db90fef9a0b969b77a8451f34e01f875afe1916299a05dedc languageName: node linkType: hard @@ -26546,7 +26546,7 @@ __metadata: "@metamask/eth-json-rpc-filters": "npm:^9.0.0" "@metamask/eth-json-rpc-middleware": "npm:^15.0.0" "@metamask/eth-json-rpc-provider": "npm:^4.1.6" - "@metamask/eth-ledger-bridge-keyring": "npm:^5.0.1" + "@metamask/eth-ledger-bridge-keyring": "npm:^7.0.0" "@metamask/eth-query": "npm:^4.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" "@metamask/eth-snap-keyring": "npm:^5.0.1" From d23ba3318267063ae47c388fbf5aaa6e76df5e15 Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Fri, 6 Dec 2024 16:35:40 +0800 Subject: [PATCH 05/11] feat: upgrade preview build version. --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 017c9d76a354..3dc51ba3658b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5298,9 +5298,9 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-ledger-bridge-keyring@npm:@metamask-previews/eth-ledger-bridge-keyring@7.0.0-e345222": - version: 7.0.0-e345222 - resolution: "@metamask-previews/eth-ledger-bridge-keyring@npm:7.0.0-e345222" +"@metamask/eth-ledger-bridge-keyring@npm:@metamask-previews/eth-ledger-bridge-keyring@7.0.0-dde1dbb": + version: 7.0.0-dde1dbb + resolution: "@metamask-previews/eth-ledger-bridge-keyring@npm:7.0.0-dde1dbb" dependencies: "@ethereumjs/rlp": "npm:^5.0.2" "@ethereumjs/tx": "npm:^4.2.0" @@ -5308,7 +5308,7 @@ __metadata: "@ledgerhq/hw-app-eth": "npm:^6.39.0" "@metamask/eth-sig-util": "npm:^8.0.0" hdkey: "npm:^2.1.0" - checksum: 10/76b883d0fe5d55716635a99564be1ad96597d21e98ad524fca5961e3d342ee26ccb51633c3ca807db90fef9a0b969b77a8451f34e01f875afe1916299a05dedc + checksum: 10/0f17efca4e42354170a5119757f86a103a0f0713b97718121c4a132a4a3803abb9749058ec9aef2c0fbcc50a78ef468f0c287e177480cd9362335ae47513350b languageName: node linkType: hard From 9a630ea276bc6fc4db6154b8f3644c6c26b099bd Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Tue, 10 Dec 2024 15:23:13 +0800 Subject: [PATCH 06/11] feat: upgrade to use latest eth-ledger-bridge-keyring --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3dc51ba3658b..4e40957cbd08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5298,9 +5298,9 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-ledger-bridge-keyring@npm:@metamask-previews/eth-ledger-bridge-keyring@7.0.0-dde1dbb": - version: 7.0.0-dde1dbb - resolution: "@metamask-previews/eth-ledger-bridge-keyring@npm:7.0.0-dde1dbb" +"@metamask/eth-ledger-bridge-keyring@npm:^8.0.0": + version: 8.0.0 + resolution: "@metamask/eth-ledger-bridge-keyring@npm:8.0.0" dependencies: "@ethereumjs/rlp": "npm:^5.0.2" "@ethereumjs/tx": "npm:^4.2.0" @@ -5308,7 +5308,7 @@ __metadata: "@ledgerhq/hw-app-eth": "npm:^6.39.0" "@metamask/eth-sig-util": "npm:^8.0.0" hdkey: "npm:^2.1.0" - checksum: 10/0f17efca4e42354170a5119757f86a103a0f0713b97718121c4a132a4a3803abb9749058ec9aef2c0fbcc50a78ef468f0c287e177480cd9362335ae47513350b + checksum: 10/665769f368dcfa18532e67691a2aaa44a330c0bbbf8a0371f4f7e82e85f58e8c95a7a0004439f04db5306b4e60bcb6be82ee6b256834047fd8514adccc3ed525 languageName: node linkType: hard @@ -26546,7 +26546,7 @@ __metadata: "@metamask/eth-json-rpc-filters": "npm:^9.0.0" "@metamask/eth-json-rpc-middleware": "npm:^15.0.0" "@metamask/eth-json-rpc-provider": "npm:^4.1.6" - "@metamask/eth-ledger-bridge-keyring": "npm:^7.0.0" + "@metamask/eth-ledger-bridge-keyring": "npm:^8.0.0" "@metamask/eth-query": "npm:^4.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" "@metamask/eth-snap-keyring": "npm:^5.0.1" From a7acabf054c9805854b3e7bee426bffbf8a9cbc4 Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 11 Dec 2024 07:55:21 +0800 Subject: [PATCH 07/11] feat: merge from `main` --- app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts b/app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts index e73b634af794..1ff85111f54a 100644 --- a/app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts +++ b/app/scripts/lib/offscreen-bridge/ledger-offscreen-bridge.ts @@ -1,8 +1,8 @@ -import { LedgerBridge } from '@metamask/eth-ledger-bridge-keyring'; import { + LedgerBridge, LedgerSignTypedDataParams, LedgerSignTypedDataResponse, -} from '@metamask/eth-ledger-bridge-keyring/dist/ledger-bridge'; +} from '@metamask/eth-ledger-bridge-keyring'; import { LedgerAction, OffscreenCommunicationEvents, From 1aef785799141173bac75fe30c024841917e8b17 Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 4 Dec 2024 09:29:47 +0800 Subject: [PATCH 08/11] feat: use preview build for eth-ledger-bridge-keyring to test. --- yarn.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4e40957cbd08..492fbbbc5f5f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5310,11 +5310,6 @@ __metadata: hdkey: "npm:^2.1.0" checksum: 10/665769f368dcfa18532e67691a2aaa44a330c0bbbf8a0371f4f7e82e85f58e8c95a7a0004439f04db5306b4e60bcb6be82ee6b256834047fd8514adccc3ed525 languageName: node - linkType: hard - -"@metamask/eth-query@npm:^4.0.0": - version: 4.0.0 - resolution: "@metamask/eth-query@npm:4.0.0" dependencies: json-rpc-random-id: "npm:^1.0.0" xtend: "npm:^4.0.1" From d1df9ac353bfa5fdc2e93c6aaec9ed736d1984cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Van=20Eyck?= Date: Tue, 17 Dec 2024 11:26:18 +0100 Subject: [PATCH 09/11] feat: switch to v8.0.0 released version --- offscreen/scripts/ledger.ts | 2 +- package.json | 2 +- privacy-snapshot.json | 1 - shared/constants/offscreen-communication.ts | 2 +- yarn.lock | 212 ++------------------ 5 files changed, 15 insertions(+), 204 deletions(-) diff --git a/offscreen/scripts/ledger.ts b/offscreen/scripts/ledger.ts index 1468b5cfcfc7..4cff2f3a6748 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://dawnseeker8.github.io/eth-ledger-bridge-keyring'; + iframe.src = 'https://metamask.github.io/ledger-iframe-bridge/8.0.0/'; iframe.allow = 'hid'; iframe.onload = () => { setupMessageListeners(iframe); diff --git a/package.json b/package.json index cca9f509c9b5..f07f6b6c9304 100644 --- a/package.json +++ b/package.json @@ -297,7 +297,7 @@ "@metamask/ens-resolver-snap": "^0.1.2", "@metamask/eth-json-rpc-filters": "^9.0.0", "@metamask/eth-json-rpc-middleware": "^15.0.0", - "@metamask/eth-ledger-bridge-keyring": "^5.0.1", + "@metamask/eth-ledger-bridge-keyring": "^8.0.0", "@metamask/eth-query": "^4.0.0", "@metamask/eth-sig-util": "^7.0.1", "@metamask/eth-snap-keyring": "^5.0.1", diff --git a/privacy-snapshot.json b/privacy-snapshot.json index e7ffbc9593f8..fc5dafb7333c 100644 --- a/privacy-snapshot.json +++ b/privacy-snapshot.json @@ -38,7 +38,6 @@ "metamask-sdk.api.cx.metamask.io", "metamask.eth", "metamask.github.io", - "dawnseeker8.github.io", "metametrics.metamask.test", "min-api.cryptocompare.com", "nft.api.cx.metamask.io", diff --git a/shared/constants/offscreen-communication.ts b/shared/constants/offscreen-communication.ts index 4119bbfe9efe..881a02560b2d 100644 --- a/shared/constants/offscreen-communication.ts +++ b/shared/constants/offscreen-communication.ts @@ -55,5 +55,5 @@ export enum LedgerAction { */ export enum KnownOrigins { lattice = 'https://lattice.gridplus.io', - ledger = 'https://dawnseeker8.github.io', + ledger = 'https://metamask.github.io', } diff --git a/yarn.lock b/yarn.lock index 492fbbbc5f5f..609f865759ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2735,7 +2735,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: @@ -4300,168 +4300,6 @@ __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" - dependencies: - "@ledgerhq/live-env": "npm:^2.3.0" - axios: "npm:1.7.7" - checksum: 10/ce6e3343fdf60255ede1d784a2fb47c8c5f49e8257559947e2678fac250700140695c85ae06bef777ccc4bb37577db813a4b3d031f3b0b84cbcd6e139613fbf9 - languageName: node - linkType: hard - -"@ledgerhq/devices@npm:^8.4.4": - version: 8.4.4 - resolution: "@ledgerhq/devices@npm:8.4.4" - dependencies: - "@ledgerhq/errors": "npm:^6.19.1" - "@ledgerhq/logs": "npm:^6.12.0" - rxjs: "npm:^7.8.1" - semver: "npm:^7.3.5" - checksum: 10/57136fc45ae2fa42b3cf93eb7cc3542fd84010390b3d0a536d342c7e92f90e475d608b1774f17a547419edddd7df0d0b1b1dbd6d2c778009ebab0fc3ec313f67 - languageName: node - linkType: hard - -"@ledgerhq/domain-service@npm:^1.2.6": - version: 1.2.6 - resolution: "@ledgerhq/domain-service@npm:1.2.6" - dependencies: - "@ledgerhq/errors": "npm:^6.19.1" - "@ledgerhq/logs": "npm:^6.12.0" - "@ledgerhq/types-live": "npm:^6.52.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 - languageName: node - linkType: hard - -"@ledgerhq/errors@npm:^6.19.1": - version: 6.19.1 - resolution: "@ledgerhq/errors@npm:6.19.1" - checksum: 10/8265c6d73c314a4aabbe060ec29e2feebb4e904fe811bf7a9c53cde08e713dcbceded9d927ebb2f0ffc47a7b16524379d4a7e9aa3d61945b8a832be7cd5cf69b - languageName: node - linkType: hard - -"@ledgerhq/evm-tools@npm:1.2.3": - version: 1.2.3 - resolution: "@ledgerhq/evm-tools@npm:1.2.3" - dependencies: - "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0" - "@ledgerhq/live-env": "npm:^2.3.0" - axios: "npm:1.7.7" - crypto-js: "npm:4.2.0" - ethers: "npm:5.7.2" - checksum: 10/956a0a3ac26454ac350c5e34b5cfb911ed3a0f3f724bec1ce2c56f2de344635b582f977e4901841c353d98c50b076e40bfb03d865eed3a82e328744043e00ee7 - 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" - dependencies: - "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0" - "@ledgerhq/live-env": "npm:^2.3.0" - axios: "npm:1.7.7" - crypto-js: "npm:4.2.0" - ethers: "npm:5.7.2" - checksum: 10/c7d79c691f681376efc6c44d16a00f6349301091a82a7a8ad264475562896bf8a9b4e922080f4f6f541bb62483ad9efeeec87910fa6f15d9db3e1d22820548c8 - 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" - 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" - "@ledgerhq/errors": "npm:^6.19.1" - "@ledgerhq/evm-tools": "npm:^1.2.3" - "@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" - axios: "npm:1.7.7" - bignumber.js: "npm:^9.1.2" - semver: "npm:^7.3.5" - checksum: 10/5b50aac35989e09704557523efe5b6b29a1f31f5279088ecceb90164e32e05860f3ff20c32a084003a69723ed08165ae140c2987424657245f088c3f9a908cd6 - 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" - 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" - "@ledgerhq/errors": "npm:^6.19.1" - "@ledgerhq/evm-tools": "npm:^1.2.3" - "@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" - axios: "npm:1.7.7" - bignumber.js: "npm:^9.1.2" - semver: "npm:^7.3.5" - checksum: 10/fb270eee2b2d0886462908b4c511262da0c884f0b72ab50225407608d197ece71b05b4fdc07e628c75ab3ae573e49ed5c3ccf3b2f40a28e4663a28788d46b4dd - languageName: node - linkType: hard - -"@ledgerhq/hw-transport-mocker@npm:^6.29.4": - version: 6.29.4 - resolution: "@ledgerhq/hw-transport-mocker@npm:6.29.4" - dependencies: - "@ledgerhq/hw-transport": "npm:^6.31.4" - "@ledgerhq/logs": "npm:^6.12.0" - rxjs: "npm:^7.8.1" - checksum: 10/6f1568b1723ee6964872b09b712714bacf33c87e83413a33420b7ba11e3c30fa6786f02d2cf7b8bc9b3560f4b5c3b166017d5e0a960267a7824a153687fe32ed - languageName: node - linkType: hard - -"@ledgerhq/hw-transport@npm:^6.31.4": - version: 6.31.4 - resolution: "@ledgerhq/hw-transport@npm:6.31.4" - dependencies: - "@ledgerhq/devices": "npm:^8.4.4" - "@ledgerhq/errors": "npm:^6.19.1" - "@ledgerhq/logs": "npm:^6.12.0" - events: "npm:^3.3.0" - checksum: 10/cf101e5b818e95e59031241d556dbec24658f54104910e414be493bc4b90b0aea50f5d4b3339a237dd0b12845bb2683c845f3a82f2ea9da4e077b68d1e1f7e48 - languageName: node - linkType: hard - -"@ledgerhq/live-env@npm:^2.3.0": - version: 2.3.0 - resolution: "@ledgerhq/live-env@npm:2.3.0" - dependencies: - rxjs: "npm:^7.8.1" - utility-types: "npm:^3.10.0" - checksum: 10/757ff834d6b94dce0487d60ab0efa45ef206ebbdfd29053c232b4c0fdce1594016531340c1603695b37f17deb1639dcb98078a9629eeb36c835a19f4180834ce - languageName: node - linkType: hard - -"@ledgerhq/logs@npm:^6.12.0": - version: 6.12.0 - resolution: "@ledgerhq/logs@npm:6.12.0" - checksum: 10/a0a01f5d6edb0c14e7a42d24ab67ce362219517f6a50d0572c917f4f7988a1e2e9363e3d0fb170fe267f054e1e30a111564de44276e01c538b258d902c546421 - languageName: node - linkType: hard - -"@ledgerhq/types-live@npm:^6.52.0": - version: 6.52.0 - resolution: "@ledgerhq/types-live@npm:6.52.0" - dependencies: - bignumber.js: "npm:^9.1.2" - rxjs: "npm:^7.8.1" - checksum: 10/c410f02159538d66f59956512fc5bab2cb17edee7f6a15a517c31d89d6c730e52691666bb2e1d98718c701e94306dd7498544ea3d7772ff0b5ad6522fb2c335c - languageName: node - linkType: hard - "@leichtgewicht/ip-codec@npm:^2.0.1": version: 2.0.4 resolution: "@leichtgewicht/ip-codec@npm:2.0.4" @@ -5302,14 +5140,15 @@ __metadata: version: 8.0.0 resolution: "@metamask/eth-ledger-bridge-keyring@npm:8.0.0" 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" - "@metamask/eth-sig-util": "npm:^8.0.0" - hdkey: "npm:^2.1.0" + json-rpc-random-id: "npm:^1.0.0" + xtend: "npm:^4.0.1" checksum: 10/665769f368dcfa18532e67691a2aaa44a330c0bbbf8a0371f4f7e82e85f58e8c95a7a0004439f04db5306b4e60bcb6be82ee6b256834047fd8514adccc3ed525 languageName: node + linkType: hard + +"@metamask/eth-query@npm:^4.0.0": + version: 4.0.0 + resolution: "@metamask/eth-query@npm:4.0.0" dependencies: json-rpc-random-id: "npm:^1.0.0" xtend: "npm:^4.0.1" @@ -13186,17 +13025,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.28.0": - version: 0.28.1 - resolution: "axios@npm:0.28.1" - dependencies: - follow-redirects: "npm:^1.15.0" - form-data: "npm:^4.0.0" - proxy-from-env: "npm:^1.1.0" - checksum: 10/3eb6799ce716de877c3015ddc2cbb5d5176c914d777c36076e097157792f2bc6d0a491156a9239bf32e8dfe1c138ec008d6bd31f4c5602d8e7b915111c10b635 - languageName: node - linkType: hard - "axios@npm:^1.1.3": version: 1.7.7 resolution: "axios@npm:1.7.7" @@ -15947,7 +15775,7 @@ __metadata: languageName: node linkType: hard -"crypto-js@npm:4.2.0, crypto-js@npm:^4.2.0": +"crypto-js@npm:^4.2.0": version: 4.2.0 resolution: "crypto-js@npm:4.2.0" checksum: 10/c7bcc56a6e01c3c397e95aa4a74e4241321f04677f9a618a8f48a63b5781617248afb9adb0629824792e7ec20ca0d4241a49b6b2938ae6f973ec4efc5c53c924 @@ -17439,15 +17267,6 @@ __metadata: languageName: node linkType: hard -"eip55@npm:^2.1.1": - version: 2.1.1 - resolution: "eip55@npm:2.1.1" - dependencies: - keccak: "npm:^3.0.3" - checksum: 10/512d319e4f91ab0c33b514f371206956521dcdcdd23e8eb4d6f9c21e3be9f72287c0b82feb854d3a1eec91805804d13c31e7a1a7dafd37f69eb9994a9c6c8f32 - languageName: node - linkType: hard - "ejs@npm:^3.1.5, ejs@npm:^3.1.8": version: 3.1.9 resolution: "ejs@npm:3.1.9" @@ -18877,7 +18696,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: @@ -20001,7 +19820,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0, follow-redirects@npm:^1.15.6": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.6": version: 1.15.9 resolution: "follow-redirects@npm:1.15.9" peerDependenciesMeta: @@ -24945,7 +24764,7 @@ __metadata: languageName: node linkType: hard -"keccak@npm:^3.0.0, keccak@npm:^3.0.3": +"keccak@npm:^3.0.0": version: 3.0.4 resolution: "keccak@npm:3.0.4" dependencies: @@ -36744,13 +36563,6 @@ __metadata: languageName: node linkType: hard -"utility-types@npm:^3.10.0": - version: 3.11.0 - resolution: "utility-types@npm:3.11.0" - checksum: 10/a3c51463fc807ed04ccc8b5d0fa6e31f3dcd7a4cbd30ab4bc6d760ce5319dd493d95bf04244693daf316f97e9ab2a37741edfed8748ad38572a595398ad0fdaf - languageName: node - linkType: hard - "utils-merge@npm:1.0.1": version: 1.0.1 resolution: "utils-merge@npm:1.0.1" From aec3d120fd1019c9b3231fa04f421058bea796d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Van=20Eyck?= Date: Wed, 18 Dec 2024 09:31:25 +0100 Subject: [PATCH 10/11] build: update yarn.lock and policies --- lavamoat/browserify/beta/policy.json | 29 +++- lavamoat/browserify/flask/policy.json | 29 +++- lavamoat/browserify/main/policy.json | 29 +++- lavamoat/browserify/mmi/policy.json | 29 +++- yarn.lock | 213 ++++++++++++++++++++++++-- 5 files changed, 315 insertions(+), 14 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 42c0b3ff7385..19996bfdbac4 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -844,7 +844,8 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-sig-util": true, + "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "@metamask/eth-trezor-keyring>hdkey": true, "browserify>buffer": true, "webpack>events": true @@ -1001,6 +1002,32 @@ "define": true } }, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/abi-utils": true, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util>@metamask/utils": true, + "@metamask/eth-sig-util>tweetnacl": true, + "@metamask/utils>@scure/base": true, + "browserify>buffer": true + } + }, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-query": { "packages": { "@metamask/eth-query>json-rpc-random-id": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 42c0b3ff7385..19996bfdbac4 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -844,7 +844,8 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-sig-util": true, + "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "@metamask/eth-trezor-keyring>hdkey": true, "browserify>buffer": true, "webpack>events": true @@ -1001,6 +1002,32 @@ "define": true } }, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/abi-utils": true, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util>@metamask/utils": true, + "@metamask/eth-sig-util>tweetnacl": true, + "@metamask/utils>@scure/base": true, + "browserify>buffer": true + } + }, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-query": { "packages": { "@metamask/eth-query>json-rpc-random-id": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 42c0b3ff7385..19996bfdbac4 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -844,7 +844,8 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-sig-util": true, + "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "@metamask/eth-trezor-keyring>hdkey": true, "browserify>buffer": true, "webpack>events": true @@ -1001,6 +1002,32 @@ "define": true } }, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/abi-utils": true, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util>@metamask/utils": true, + "@metamask/eth-sig-util>tweetnacl": true, + "@metamask/utils>@scure/base": true, + "browserify>buffer": true + } + }, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-query": { "packages": { "@metamask/eth-query>json-rpc-random-id": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index cd8c3a1c7396..88dbf88db76a 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -936,7 +936,8 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ethereumjs/rlp": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-sig-util": true, + "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "@metamask/eth-trezor-keyring>hdkey": true, "browserify>buffer": true, "webpack>events": true @@ -1093,6 +1094,32 @@ "define": true } }, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/abi-utils": true, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util>@metamask/utils": true, + "@metamask/eth-sig-util>tweetnacl": true, + "@metamask/utils>@scure/base": true, + "browserify>buffer": true + } + }, + "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-query": { "packages": { "@metamask/eth-query>json-rpc-random-id": true, diff --git a/yarn.lock b/yarn.lock index 609f865759ae..afcb83922eca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2735,7 +2735,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: @@ -4300,6 +4300,168 @@ __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" + dependencies: + "@ledgerhq/live-env": "npm:^2.3.0" + axios: "npm:1.7.7" + checksum: 10/ce6e3343fdf60255ede1d784a2fb47c8c5f49e8257559947e2678fac250700140695c85ae06bef777ccc4bb37577db813a4b3d031f3b0b84cbcd6e139613fbf9 + languageName: node + linkType: hard + +"@ledgerhq/devices@npm:^8.4.4": + version: 8.4.4 + resolution: "@ledgerhq/devices@npm:8.4.4" + dependencies: + "@ledgerhq/errors": "npm:^6.19.1" + "@ledgerhq/logs": "npm:^6.12.0" + rxjs: "npm:^7.8.1" + semver: "npm:^7.3.5" + checksum: 10/57136fc45ae2fa42b3cf93eb7cc3542fd84010390b3d0a536d342c7e92f90e475d608b1774f17a547419edddd7df0d0b1b1dbd6d2c778009ebab0fc3ec313f67 + languageName: node + linkType: hard + +"@ledgerhq/domain-service@npm:^1.2.6": + version: 1.2.6 + resolution: "@ledgerhq/domain-service@npm:1.2.6" + dependencies: + "@ledgerhq/errors": "npm:^6.19.1" + "@ledgerhq/logs": "npm:^6.12.0" + "@ledgerhq/types-live": "npm:^6.52.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 + languageName: node + linkType: hard + +"@ledgerhq/errors@npm:^6.19.1": + version: 6.19.1 + resolution: "@ledgerhq/errors@npm:6.19.1" + checksum: 10/8265c6d73c314a4aabbe060ec29e2feebb4e904fe811bf7a9c53cde08e713dcbceded9d927ebb2f0ffc47a7b16524379d4a7e9aa3d61945b8a832be7cd5cf69b + languageName: node + linkType: hard + +"@ledgerhq/evm-tools@npm:1.2.3": + version: 1.2.3 + resolution: "@ledgerhq/evm-tools@npm:1.2.3" + dependencies: + "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0" + "@ledgerhq/live-env": "npm:^2.3.0" + axios: "npm:1.7.7" + crypto-js: "npm:4.2.0" + ethers: "npm:5.7.2" + checksum: 10/956a0a3ac26454ac350c5e34b5cfb911ed3a0f3f724bec1ce2c56f2de344635b582f977e4901841c353d98c50b076e40bfb03d865eed3a82e328744043e00ee7 + 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" + dependencies: + "@ledgerhq/cryptoassets-evm-signatures": "npm:^13.5.0" + "@ledgerhq/live-env": "npm:^2.3.0" + axios: "npm:1.7.7" + crypto-js: "npm:4.2.0" + ethers: "npm:5.7.2" + checksum: 10/c7d79c691f681376efc6c44d16a00f6349301091a82a7a8ad264475562896bf8a9b4e922080f4f6f541bb62483ad9efeeec87910fa6f15d9db3e1d22820548c8 + 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" + 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" + "@ledgerhq/errors": "npm:^6.19.1" + "@ledgerhq/evm-tools": "npm:^1.2.3" + "@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" + axios: "npm:1.7.7" + bignumber.js: "npm:^9.1.2" + semver: "npm:^7.3.5" + checksum: 10/5b50aac35989e09704557523efe5b6b29a1f31f5279088ecceb90164e32e05860f3ff20c32a084003a69723ed08165ae140c2987424657245f088c3f9a908cd6 + 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" + 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" + "@ledgerhq/errors": "npm:^6.19.1" + "@ledgerhq/evm-tools": "npm:^1.2.3" + "@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" + axios: "npm:1.7.7" + bignumber.js: "npm:^9.1.2" + semver: "npm:^7.3.5" + checksum: 10/fb270eee2b2d0886462908b4c511262da0c884f0b72ab50225407608d197ece71b05b4fdc07e628c75ab3ae573e49ed5c3ccf3b2f40a28e4663a28788d46b4dd + languageName: node + linkType: hard + +"@ledgerhq/hw-transport-mocker@npm:^6.29.4": + version: 6.29.4 + resolution: "@ledgerhq/hw-transport-mocker@npm:6.29.4" + dependencies: + "@ledgerhq/hw-transport": "npm:^6.31.4" + "@ledgerhq/logs": "npm:^6.12.0" + rxjs: "npm:^7.8.1" + checksum: 10/6f1568b1723ee6964872b09b712714bacf33c87e83413a33420b7ba11e3c30fa6786f02d2cf7b8bc9b3560f4b5c3b166017d5e0a960267a7824a153687fe32ed + languageName: node + linkType: hard + +"@ledgerhq/hw-transport@npm:^6.31.4": + version: 6.31.4 + resolution: "@ledgerhq/hw-transport@npm:6.31.4" + dependencies: + "@ledgerhq/devices": "npm:^8.4.4" + "@ledgerhq/errors": "npm:^6.19.1" + "@ledgerhq/logs": "npm:^6.12.0" + events: "npm:^3.3.0" + checksum: 10/cf101e5b818e95e59031241d556dbec24658f54104910e414be493bc4b90b0aea50f5d4b3339a237dd0b12845bb2683c845f3a82f2ea9da4e077b68d1e1f7e48 + languageName: node + linkType: hard + +"@ledgerhq/live-env@npm:^2.3.0": + version: 2.3.0 + resolution: "@ledgerhq/live-env@npm:2.3.0" + dependencies: + rxjs: "npm:^7.8.1" + utility-types: "npm:^3.10.0" + checksum: 10/757ff834d6b94dce0487d60ab0efa45ef206ebbdfd29053c232b4c0fdce1594016531340c1603695b37f17deb1639dcb98078a9629eeb36c835a19f4180834ce + languageName: node + linkType: hard + +"@ledgerhq/logs@npm:^6.12.0": + version: 6.12.0 + resolution: "@ledgerhq/logs@npm:6.12.0" + checksum: 10/a0a01f5d6edb0c14e7a42d24ab67ce362219517f6a50d0572c917f4f7988a1e2e9363e3d0fb170fe267f054e1e30a111564de44276e01c538b258d902c546421 + languageName: node + linkType: hard + +"@ledgerhq/types-live@npm:^6.52.0": + version: 6.52.0 + resolution: "@ledgerhq/types-live@npm:6.52.0" + dependencies: + bignumber.js: "npm:^9.1.2" + rxjs: "npm:^7.8.1" + checksum: 10/c410f02159538d66f59956512fc5bab2cb17edee7f6a15a517c31d89d6c730e52691666bb2e1d98718c701e94306dd7498544ea3d7772ff0b5ad6522fb2c335c + languageName: node + linkType: hard + "@leichtgewicht/ip-codec@npm:^2.0.1": version: 2.0.4 resolution: "@leichtgewicht/ip-codec@npm:2.0.4" @@ -5137,12 +5299,16 @@ __metadata: linkType: hard "@metamask/eth-ledger-bridge-keyring@npm:^8.0.0": - version: 8.0.0 - resolution: "@metamask/eth-ledger-bridge-keyring@npm:8.0.0" + version: 8.0.1 + resolution: "@metamask/eth-ledger-bridge-keyring@npm:8.0.1" dependencies: - json-rpc-random-id: "npm:^1.0.0" - xtend: "npm:^4.0.1" - checksum: 10/665769f368dcfa18532e67691a2aaa44a330c0bbbf8a0371f4f7e82e85f58e8c95a7a0004439f04db5306b4e60bcb6be82ee6b256834047fd8514adccc3ed525 + "@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" + "@metamask/eth-sig-util": "npm:^8.0.0" + hdkey: "npm:^2.1.0" + checksum: 10/1fe3782ab224cd55e825c41226451ec52141b12387e23a49f9786b4d1edbb1e16be02e13ec07ed26547c8d9651a9951060b72432d8adefd7975d3a313d701f2f languageName: node linkType: hard @@ -13025,6 +13191,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^0.28.0": + version: 0.28.1 + resolution: "axios@npm:0.28.1" + dependencies: + follow-redirects: "npm:^1.15.0" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 10/3eb6799ce716de877c3015ddc2cbb5d5176c914d777c36076e097157792f2bc6d0a491156a9239bf32e8dfe1c138ec008d6bd31f4c5602d8e7b915111c10b635 + languageName: node + linkType: hard + "axios@npm:^1.1.3": version: 1.7.7 resolution: "axios@npm:1.7.7" @@ -15775,7 +15952,7 @@ __metadata: languageName: node linkType: hard -"crypto-js@npm:^4.2.0": +"crypto-js@npm:4.2.0, crypto-js@npm:^4.2.0": version: 4.2.0 resolution: "crypto-js@npm:4.2.0" checksum: 10/c7bcc56a6e01c3c397e95aa4a74e4241321f04677f9a618a8f48a63b5781617248afb9adb0629824792e7ec20ca0d4241a49b6b2938ae6f973ec4efc5c53c924 @@ -17267,6 +17444,15 @@ __metadata: languageName: node linkType: hard +"eip55@npm:^2.1.1": + version: 2.1.1 + resolution: "eip55@npm:2.1.1" + dependencies: + keccak: "npm:^3.0.3" + checksum: 10/512d319e4f91ab0c33b514f371206956521dcdcdd23e8eb4d6f9c21e3be9f72287c0b82feb854d3a1eec91805804d13c31e7a1a7dafd37f69eb9994a9c6c8f32 + languageName: node + linkType: hard + "ejs@npm:^3.1.5, ejs@npm:^3.1.8": version: 3.1.9 resolution: "ejs@npm:3.1.9" @@ -18696,7 +18882,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^5.7.0": +"ethers@npm:5.7.2, ethers@npm:^5.7.0": version: 5.7.2 resolution: "ethers@npm:5.7.2" dependencies: @@ -19820,7 +20006,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.6": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0, follow-redirects@npm:^1.15.6": version: 1.15.9 resolution: "follow-redirects@npm:1.15.9" peerDependenciesMeta: @@ -24764,7 +24950,7 @@ __metadata: languageName: node linkType: hard -"keccak@npm:^3.0.0": +"keccak@npm:^3.0.0, keccak@npm:^3.0.3": version: 3.0.4 resolution: "keccak@npm:3.0.4" dependencies: @@ -36563,6 +36749,13 @@ __metadata: languageName: node linkType: hard +"utility-types@npm:^3.10.0": + version: 3.11.0 + resolution: "utility-types@npm:3.11.0" + checksum: 10/a3c51463fc807ed04ccc8b5d0fa6e31f3dcd7a4cbd30ab4bc6d760ce5319dd493d95bf04244693daf316f97e9ab2a37741edfed8748ad38572a595398ad0fdaf + languageName: node + linkType: hard + "utils-merge@npm:1.0.1": version: 1.0.1 resolution: "utils-merge@npm:1.0.1" From 32e5e57c4986ce8cb98e7916666057d4fb055c97 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Wed, 18 Dec 2024 12:22:59 +0000 Subject: [PATCH 11/11] Update LavaMoat policies --- lavamoat/build-system/policy.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 7be527ca37e7..59a807e7313f 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -2040,8 +2040,7 @@ "chokidar>normalize-path": true, "chokidar>readdirp": true, "del>is-glob": true, - "eslint>glob-parent": true, - "tsx>fsevents": true + "eslint>glob-parent": true } }, "chokidar>anymatch": { @@ -8789,13 +8788,6 @@ "typescript": true } }, - "tsx>fsevents": { - "globals": { - "console.assert": true, - "process.platform": true - }, - "native": true - }, "typescript": { "builtin": { "buffer.Buffer": true,