From 9cca3e90035c51d64d67a47ae6b326eac5f7215a Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 15 Jan 2025 18:24:28 +0800 Subject: [PATCH 1/8] fix: use preview build of library to do the testing. --- package.json | 1 + yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 632665e1b805..b12aa91b0c68 100644 --- a/package.json +++ b/package.json @@ -257,6 +257,7 @@ "tslib@npm:^2.1.0": "~2.6.0", "tslib@npm:^2.3.0": "~2.6.0", "tslib@npm:^2.3.1": "~2.6.0", + "@metamask/eth-ledger-bridge-keyring@^8.0.1": "npm:@metamask-previews/eth-ledger-bridge-keyring@8.0.1-515dc3a", "tslib@npm:^2.4.0": "~2.6.0", "tslib@npm:^2.6.2": "~2.6.0" }, diff --git a/yarn.lock b/yarn.lock index 8d47d88e4930..05053ae79957 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5353,17 +5353,17 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-ledger-bridge-keyring@npm:^8.0.1": - version: 8.0.1 - resolution: "@metamask/eth-ledger-bridge-keyring@npm:8.0.1" +"@metamask/eth-ledger-bridge-keyring@npm:@metamask-previews/eth-ledger-bridge-keyring@8.0.1-515dc3a": + version: 8.0.1-515dc3a + resolution: "@metamask-previews/eth-ledger-bridge-keyring@npm:8.0.1-515dc3a" 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" + "@metamask/eth-sig-util": "npm:^8.1.2" hdkey: "npm:^2.1.0" - checksum: 10/1fe3782ab224cd55e825c41226451ec52141b12387e23a49f9786b4d1edbb1e16be02e13ec07ed26547c8d9651a9951060b72432d8adefd7975d3a313d701f2f + checksum: 10/c68eb7fb6eefc6aa4c3e2acc83eb5d291b0615a6c631c11a3b69af75ab010b74e5b90cff0233b8a54f448f5832189ab6b4568efa29345af79a97df533826afdb languageName: node linkType: hard From 43fbe5495879f028bb9e36c722f07b2a8417669f Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 15 Jan 2025 18:43:39 +0800 Subject: [PATCH 2/8] fix: policy update --- lavamoat/browserify/beta/policy.json | 1 - lavamoat/browserify/flask/policy.json | 1 - lavamoat/browserify/main/policy.json | 1 - lavamoat/browserify/mmi/policy.json | 1 - lavamoat/build-system/policy.json | 8 ++++++++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index d185c5d9d322..17fed8c7e8f6 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1088,7 +1088,6 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index d185c5d9d322..17fed8c7e8f6 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1088,7 +1088,6 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index d185c5d9d322..17fed8c7e8f6 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1088,7 +1088,6 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 5ff913fcc0e8..b9cb53a05631 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1180,7 +1180,6 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 545922814d1f..5c9dbd68b17c 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -1795,6 +1795,7 @@ "chokidar>anymatch": true, "chokidar>braces": true, "chokidar>fsevents": true, + "tsx>fsevents": true, "eslint>glob-parent": true, "chokidar>is-binary-path": true, "del>is-glob": true, @@ -3364,6 +3365,13 @@ "gulp-watch>chokidar>fsevents>node-pre-gyp": true } }, + "tsx>fsevents": { + "globals": { + "console.assert": true, + "process.platform": true + }, + "native": true + }, "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": { "builtin": { "util.format": true From aa7b152c3760fee847fca84796394b100e2cfa1e Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Wed, 15 Jan 2025 10:47:20 +0000 Subject: [PATCH 3/8] Update LavaMoat policies --- lavamoat/build-system/policy.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 5c9dbd68b17c..545922814d1f 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -1795,7 +1795,6 @@ "chokidar>anymatch": true, "chokidar>braces": true, "chokidar>fsevents": true, - "tsx>fsevents": true, "eslint>glob-parent": true, "chokidar>is-binary-path": true, "del>is-glob": true, @@ -3365,13 +3364,6 @@ "gulp-watch>chokidar>fsevents>node-pre-gyp": true } }, - "tsx>fsevents": { - "globals": { - "console.assert": true, - "process.platform": true - }, - "native": true - }, "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": { "builtin": { "util.format": true From 326cd27772ffed8cee4a1db87b637bf169182fdb Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 15 Jan 2025 23:30:24 +0800 Subject: [PATCH 4/8] fix: update package.json to use latest @metamask/eth-ledger-keyring-bridge library. --- lavamoat/build-system/policy.json | 8 ++++++++ package.json | 3 +-- yarn.lock | 10 +++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 545922814d1f..5c9dbd68b17c 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -1795,6 +1795,7 @@ "chokidar>anymatch": true, "chokidar>braces": true, "chokidar>fsevents": true, + "tsx>fsevents": true, "eslint>glob-parent": true, "chokidar>is-binary-path": true, "del>is-glob": true, @@ -3364,6 +3365,13 @@ "gulp-watch>chokidar>fsevents>node-pre-gyp": true } }, + "tsx>fsevents": { + "globals": { + "console.assert": true, + "process.platform": true + }, + "native": true + }, "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": { "builtin": { "util.format": true diff --git a/package.json b/package.json index b12aa91b0c68..42da940aa4a2 100644 --- a/package.json +++ b/package.json @@ -257,7 +257,6 @@ "tslib@npm:^2.1.0": "~2.6.0", "tslib@npm:^2.3.0": "~2.6.0", "tslib@npm:^2.3.1": "~2.6.0", - "@metamask/eth-ledger-bridge-keyring@^8.0.1": "npm:@metamask-previews/eth-ledger-bridge-keyring@8.0.1-515dc3a", "tslib@npm:^2.4.0": "~2.6.0", "tslib@npm:^2.6.2": "~2.6.0" }, @@ -306,7 +305,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.1", + "@metamask/eth-ledger-bridge-keyring": "^8.0.2", "@metamask/eth-query": "^4.0.0", "@metamask/eth-sig-util": "^7.0.1", "@metamask/eth-snap-keyring": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index 05053ae79957..ada9aff1943c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5353,9 +5353,9 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-ledger-bridge-keyring@npm:@metamask-previews/eth-ledger-bridge-keyring@8.0.1-515dc3a": - version: 8.0.1-515dc3a - resolution: "@metamask-previews/eth-ledger-bridge-keyring@npm:8.0.1-515dc3a" +"@metamask/eth-ledger-bridge-keyring@npm:^8.0.2": + version: 8.0.2 + resolution: "@metamask/eth-ledger-bridge-keyring@npm:8.0.2" dependencies: "@ethereumjs/rlp": "npm:^5.0.2" "@ethereumjs/tx": "npm:^4.2.0" @@ -5363,7 +5363,7 @@ __metadata: "@ledgerhq/hw-app-eth": "npm:^6.39.0" "@metamask/eth-sig-util": "npm:^8.1.2" hdkey: "npm:^2.1.0" - checksum: 10/c68eb7fb6eefc6aa4c3e2acc83eb5d291b0615a6c631c11a3b69af75ab010b74e5b90cff0233b8a54f448f5832189ab6b4568efa29345af79a97df533826afdb + checksum: 10/702d833a1a3a702d128b831f5cba157b14c414fdf0e9a6796e9f0cb866ea71da8673fb46494608cd05044387bc4bd99dbec0ac7bd98f24c2b11b61298288cae8 languageName: node linkType: hard @@ -26636,7 +26636,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.1" + "@metamask/eth-ledger-bridge-keyring": "npm:^8.0.2" "@metamask/eth-query": "npm:^4.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" "@metamask/eth-snap-keyring": "npm:^7.0.0" From 5069673b0e6a2e0d9216b9c410758d03c16b80ff Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 15 Jan 2025 23:39:32 +0800 Subject: [PATCH 5/8] fix: fix the conflict during rebase from main. also update the policy files. --- lavamoat/browserify/beta/policy.json | 24 ++++++++++++------------ lavamoat/browserify/flask/policy.json | 24 ++++++++++++------------ lavamoat/browserify/main/policy.json | 24 ++++++++++++------------ lavamoat/browserify/mmi/policy.json | 24 ++++++++++++------------ yarn.lock | 1 - 5 files changed, 48 insertions(+), 49 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index e21fd0baaf99..17fed8c7e8f6 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -895,7 +895,7 @@ "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, @@ -998,7 +998,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/ppom-validator>json-rpc-random-id": true, + "@metamask/eth-query>json-rpc-random-id": true, "pify": true } }, @@ -1011,7 +1011,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/ppom-validator>json-rpc-random-id": true + "@metamask/eth-query>json-rpc-random-id": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1032,7 +1032,7 @@ "console.error": true }, "packages": { - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/safe-event-emitter": true, "@metamask/name-controller>async-mutex": true, @@ -1094,9 +1094,9 @@ "@metamask/eth-trezor-keyring>hdkey": true } }, - "@metamask/controller-utils>@metamask/eth-query": { + "@metamask/eth-query": { "packages": { - "@metamask/ppom-validator>json-rpc-random-id": true, + "@metamask/eth-query>json-rpc-random-id": true, "watchify>xtend": true } }, @@ -1298,7 +1298,7 @@ }, "packages": { "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/polling-controller": true, "bn.js": true, "uuid": true @@ -1449,7 +1449,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, @@ -1586,7 +1586,7 @@ "browserify>buffer": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, - "@metamask/ppom-validator>json-rpc-random-id": true + "@metamask/eth-query>json-rpc-random-id": true } }, "@metamask/preferences-controller": { @@ -1713,7 +1713,7 @@ "@metamask/smart-transactions-controller>@ethereumjs/util": true, "@ethersproject/bytes": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/polling-controller": true, "@metamask/transaction-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, @@ -1848,7 +1848,7 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/metamask-eth-abis": true, "@metamask/network-controller": true, @@ -1872,7 +1872,7 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index e21fd0baaf99..17fed8c7e8f6 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -895,7 +895,7 @@ "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, @@ -998,7 +998,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/ppom-validator>json-rpc-random-id": true, + "@metamask/eth-query>json-rpc-random-id": true, "pify": true } }, @@ -1011,7 +1011,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/ppom-validator>json-rpc-random-id": true + "@metamask/eth-query>json-rpc-random-id": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1032,7 +1032,7 @@ "console.error": true }, "packages": { - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/safe-event-emitter": true, "@metamask/name-controller>async-mutex": true, @@ -1094,9 +1094,9 @@ "@metamask/eth-trezor-keyring>hdkey": true } }, - "@metamask/controller-utils>@metamask/eth-query": { + "@metamask/eth-query": { "packages": { - "@metamask/ppom-validator>json-rpc-random-id": true, + "@metamask/eth-query>json-rpc-random-id": true, "watchify>xtend": true } }, @@ -1298,7 +1298,7 @@ }, "packages": { "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/polling-controller": true, "bn.js": true, "uuid": true @@ -1449,7 +1449,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, @@ -1586,7 +1586,7 @@ "browserify>buffer": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, - "@metamask/ppom-validator>json-rpc-random-id": true + "@metamask/eth-query>json-rpc-random-id": true } }, "@metamask/preferences-controller": { @@ -1713,7 +1713,7 @@ "@metamask/smart-transactions-controller>@ethereumjs/util": true, "@ethersproject/bytes": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/polling-controller": true, "@metamask/transaction-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, @@ -1848,7 +1848,7 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/metamask-eth-abis": true, "@metamask/network-controller": true, @@ -1872,7 +1872,7 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index e21fd0baaf99..17fed8c7e8f6 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -895,7 +895,7 @@ "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, @@ -998,7 +998,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/ppom-validator>json-rpc-random-id": true, + "@metamask/eth-query>json-rpc-random-id": true, "pify": true } }, @@ -1011,7 +1011,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/ppom-validator>json-rpc-random-id": true + "@metamask/eth-query>json-rpc-random-id": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1032,7 +1032,7 @@ "console.error": true }, "packages": { - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/safe-event-emitter": true, "@metamask/name-controller>async-mutex": true, @@ -1094,9 +1094,9 @@ "@metamask/eth-trezor-keyring>hdkey": true } }, - "@metamask/controller-utils>@metamask/eth-query": { + "@metamask/eth-query": { "packages": { - "@metamask/ppom-validator>json-rpc-random-id": true, + "@metamask/eth-query>json-rpc-random-id": true, "watchify>xtend": true } }, @@ -1298,7 +1298,7 @@ }, "packages": { "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/polling-controller": true, "bn.js": true, "uuid": true @@ -1449,7 +1449,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, @@ -1586,7 +1586,7 @@ "browserify>buffer": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, - "@metamask/ppom-validator>json-rpc-random-id": true + "@metamask/eth-query>json-rpc-random-id": true } }, "@metamask/preferences-controller": { @@ -1713,7 +1713,7 @@ "@metamask/smart-transactions-controller>@ethereumjs/util": true, "@ethersproject/bytes": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/polling-controller": true, "@metamask/transaction-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, @@ -1848,7 +1848,7 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/metamask-eth-abis": true, "@metamask/network-controller": true, @@ -1872,7 +1872,7 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index cc04f67605a5..b9cb53a05631 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -987,7 +987,7 @@ "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, @@ -1090,7 +1090,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/ppom-validator>json-rpc-random-id": true, + "@metamask/eth-query>json-rpc-random-id": true, "pify": true } }, @@ -1103,7 +1103,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/ppom-validator>json-rpc-random-id": true + "@metamask/eth-query>json-rpc-random-id": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1124,7 +1124,7 @@ "console.error": true }, "packages": { - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/safe-event-emitter": true, "@metamask/name-controller>async-mutex": true, @@ -1186,9 +1186,9 @@ "@metamask/eth-trezor-keyring>hdkey": true } }, - "@metamask/controller-utils>@metamask/eth-query": { + "@metamask/eth-query": { "packages": { - "@metamask/ppom-validator>json-rpc-random-id": true, + "@metamask/eth-query>json-rpc-random-id": true, "watchify>xtend": true } }, @@ -1390,7 +1390,7 @@ }, "packages": { "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/polling-controller": true, "bn.js": true, "uuid": true @@ -1541,7 +1541,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, @@ -1678,7 +1678,7 @@ "browserify>buffer": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, - "@metamask/ppom-validator>json-rpc-random-id": true + "@metamask/eth-query>json-rpc-random-id": true } }, "@metamask/preferences-controller": { @@ -1805,7 +1805,7 @@ "@metamask/smart-transactions-controller>@ethereumjs/util": true, "@ethersproject/bytes": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/polling-controller": true, "@metamask/transaction-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, @@ -1940,7 +1940,7 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/metamask-eth-abis": true, "@metamask/network-controller": true, @@ -1964,7 +1964,7 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/controller-utils>@metamask/eth-query": true, + "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, diff --git a/yarn.lock b/yarn.lock index 8b28a7bbbcf0..ada9aff1943c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26638,7 +26638,6 @@ __metadata: "@metamask/eth-json-rpc-provider": "npm:^4.1.6" "@metamask/eth-ledger-bridge-keyring": "npm:^8.0.2" "@metamask/eth-query": "npm:^4.0.0" - "@metamask/eth-ledger-bridge-keyring": "npm:^8.0.1" "@metamask/eth-sig-util": "npm:^7.0.1" "@metamask/eth-snap-keyring": "npm:^7.0.0" "@metamask/eth-token-tracker": "npm:^9.0.0" From 61c8876c4b833743499c724554ed2cdc4bff3b87 Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Wed, 15 Jan 2025 23:47:48 +0800 Subject: [PATCH 6/8] fix: fix the conflict during rebase from main. also update the policy files. --- lavamoat/browserify/beta/policy.json | 24 ++++++++++++------------ lavamoat/browserify/flask/policy.json | 24 ++++++++++++------------ lavamoat/browserify/main/policy.json | 24 ++++++++++++------------ lavamoat/browserify/mmi/policy.json | 24 ++++++++++++------------ package.json | 1 - yarn.lock | 1 - 6 files changed, 48 insertions(+), 50 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 17fed8c7e8f6..e21fd0baaf99 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -895,7 +895,7 @@ "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, @@ -998,7 +998,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>json-rpc-random-id": true, "pify": true } }, @@ -1011,7 +1011,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-query>json-rpc-random-id": true + "@metamask/ppom-validator>json-rpc-random-id": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1032,7 +1032,7 @@ "console.error": true }, "packages": { - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/safe-event-emitter": true, "@metamask/name-controller>async-mutex": true, @@ -1094,9 +1094,9 @@ "@metamask/eth-trezor-keyring>hdkey": true } }, - "@metamask/eth-query": { + "@metamask/controller-utils>@metamask/eth-query": { "packages": { - "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>json-rpc-random-id": true, "watchify>xtend": true } }, @@ -1298,7 +1298,7 @@ }, "packages": { "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/polling-controller": true, "bn.js": true, "uuid": true @@ -1449,7 +1449,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, @@ -1586,7 +1586,7 @@ "browserify>buffer": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, - "@metamask/eth-query>json-rpc-random-id": true + "@metamask/ppom-validator>json-rpc-random-id": true } }, "@metamask/preferences-controller": { @@ -1713,7 +1713,7 @@ "@metamask/smart-transactions-controller>@ethereumjs/util": true, "@ethersproject/bytes": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/polling-controller": true, "@metamask/transaction-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, @@ -1848,7 +1848,7 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/metamask-eth-abis": true, "@metamask/network-controller": true, @@ -1872,7 +1872,7 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 17fed8c7e8f6..e21fd0baaf99 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -895,7 +895,7 @@ "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, @@ -998,7 +998,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>json-rpc-random-id": true, "pify": true } }, @@ -1011,7 +1011,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-query>json-rpc-random-id": true + "@metamask/ppom-validator>json-rpc-random-id": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1032,7 +1032,7 @@ "console.error": true }, "packages": { - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/safe-event-emitter": true, "@metamask/name-controller>async-mutex": true, @@ -1094,9 +1094,9 @@ "@metamask/eth-trezor-keyring>hdkey": true } }, - "@metamask/eth-query": { + "@metamask/controller-utils>@metamask/eth-query": { "packages": { - "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>json-rpc-random-id": true, "watchify>xtend": true } }, @@ -1298,7 +1298,7 @@ }, "packages": { "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/polling-controller": true, "bn.js": true, "uuid": true @@ -1449,7 +1449,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, @@ -1586,7 +1586,7 @@ "browserify>buffer": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, - "@metamask/eth-query>json-rpc-random-id": true + "@metamask/ppom-validator>json-rpc-random-id": true } }, "@metamask/preferences-controller": { @@ -1713,7 +1713,7 @@ "@metamask/smart-transactions-controller>@ethereumjs/util": true, "@ethersproject/bytes": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/polling-controller": true, "@metamask/transaction-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, @@ -1848,7 +1848,7 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/metamask-eth-abis": true, "@metamask/network-controller": true, @@ -1872,7 +1872,7 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 17fed8c7e8f6..e21fd0baaf99 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -895,7 +895,7 @@ "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, @@ -998,7 +998,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>json-rpc-random-id": true, "pify": true } }, @@ -1011,7 +1011,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-query>json-rpc-random-id": true + "@metamask/ppom-validator>json-rpc-random-id": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1032,7 +1032,7 @@ "console.error": true }, "packages": { - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/safe-event-emitter": true, "@metamask/name-controller>async-mutex": true, @@ -1094,9 +1094,9 @@ "@metamask/eth-trezor-keyring>hdkey": true } }, - "@metamask/eth-query": { + "@metamask/controller-utils>@metamask/eth-query": { "packages": { - "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>json-rpc-random-id": true, "watchify>xtend": true } }, @@ -1298,7 +1298,7 @@ }, "packages": { "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/polling-controller": true, "bn.js": true, "uuid": true @@ -1449,7 +1449,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, @@ -1586,7 +1586,7 @@ "browserify>buffer": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, - "@metamask/eth-query>json-rpc-random-id": true + "@metamask/ppom-validator>json-rpc-random-id": true } }, "@metamask/preferences-controller": { @@ -1713,7 +1713,7 @@ "@metamask/smart-transactions-controller>@ethereumjs/util": true, "@ethersproject/bytes": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/polling-controller": true, "@metamask/transaction-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, @@ -1848,7 +1848,7 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/metamask-eth-abis": true, "@metamask/network-controller": true, @@ -1872,7 +1872,7 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index b9cb53a05631..cc04f67605a5 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -987,7 +987,7 @@ "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, @@ -1090,7 +1090,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>json-rpc-random-id": true, "pify": true } }, @@ -1103,7 +1103,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-query>json-rpc-random-id": true + "@metamask/ppom-validator>json-rpc-random-id": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1124,7 +1124,7 @@ "console.error": true }, "packages": { - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/safe-event-emitter": true, "@metamask/name-controller>async-mutex": true, @@ -1186,9 +1186,9 @@ "@metamask/eth-trezor-keyring>hdkey": true } }, - "@metamask/eth-query": { + "@metamask/controller-utils>@metamask/eth-query": { "packages": { - "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>json-rpc-random-id": true, "watchify>xtend": true } }, @@ -1390,7 +1390,7 @@ }, "packages": { "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/polling-controller": true, "bn.js": true, "uuid": true @@ -1541,7 +1541,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, @@ -1678,7 +1678,7 @@ "browserify>buffer": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, - "@metamask/eth-query>json-rpc-random-id": true + "@metamask/ppom-validator>json-rpc-random-id": true } }, "@metamask/preferences-controller": { @@ -1805,7 +1805,7 @@ "@metamask/smart-transactions-controller>@ethereumjs/util": true, "@ethersproject/bytes": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/polling-controller": true, "@metamask/transaction-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, @@ -1940,7 +1940,7 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/metamask-eth-abis": true, "@metamask/network-controller": true, @@ -1964,7 +1964,7 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/eth-query": true, + "@metamask/controller-utils>@metamask/eth-query": true, "@metamask/gas-fee-controller": true, "@metamask/polling-controller": true, "@metamask/rpc-errors": true, diff --git a/package.json b/package.json index db0c7c23b958..38a5f7967fd4 100644 --- a/package.json +++ b/package.json @@ -304,7 +304,6 @@ "@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-query": "^4.0.0", "@metamask/eth-sig-util": "^7.0.1", "@metamask/eth-snap-keyring": "^7.0.0", "@metamask/eth-token-tracker": "^9.0.0", diff --git a/yarn.lock b/yarn.lock index ada9aff1943c..2a7a1e751190 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26637,7 +26637,6 @@ __metadata: "@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-query": "npm:^4.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" "@metamask/eth-snap-keyring": "npm:^7.0.0" "@metamask/eth-token-tracker": "npm:^9.0.0" From b74f6f31ee5ca87b5d7114cad504d07b211e574a Mon Sep 17 00:00:00 2001 From: Xiaoming Wang Date: Thu, 16 Jan 2025 00:00:29 +0800 Subject: [PATCH 7/8] fix: revert policy files back to `main` branch version. --- lavamoat/browserify/beta/policy.json | 3 ++- lavamoat/browserify/flask/policy.json | 3 ++- lavamoat/browserify/main/policy.json | 3 ++- lavamoat/browserify/mmi/policy.json | 3 ++- lavamoat/build-system/policy.json | 10 +--------- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index e21fd0baaf99..2166e6a75210 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1088,6 +1088,7 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, + "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, @@ -5620,4 +5621,4 @@ } } } -} \ No newline at end of file +} diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index e21fd0baaf99..2166e6a75210 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1088,6 +1088,7 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, + "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, @@ -5620,4 +5621,4 @@ } } } -} \ No newline at end of file +} diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index e21fd0baaf99..2166e6a75210 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1088,6 +1088,7 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, + "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, @@ -5620,4 +5621,4 @@ } } } -} \ No newline at end of file +} diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index cc04f67605a5..9e97d850ba30 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1180,6 +1180,7 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, + "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, @@ -5712,4 +5713,4 @@ } } } -} \ No newline at end of file +} diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 5c9dbd68b17c..19323f210b56 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -1795,7 +1795,6 @@ "chokidar>anymatch": true, "chokidar>braces": true, "chokidar>fsevents": true, - "tsx>fsevents": true, "eslint>glob-parent": true, "chokidar>is-binary-path": true, "del>is-glob": true, @@ -3365,13 +3364,6 @@ "gulp-watch>chokidar>fsevents>node-pre-gyp": true } }, - "tsx>fsevents": { - "globals": { - "console.assert": true, - "process.platform": true - }, - "native": true - }, "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": { "builtin": { "util.format": true @@ -9239,4 +9231,4 @@ } } } -} \ No newline at end of file +} From af22850d40b1460b380780b183e6e08bde4e0a3b Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Wed, 15 Jan 2025 16:08:01 +0000 Subject: [PATCH 8/8] Update LavaMoat policies --- lavamoat/browserify/beta/policy.json | 3 +-- lavamoat/browserify/flask/policy.json | 3 +-- lavamoat/browserify/main/policy.json | 3 +-- lavamoat/browserify/mmi/policy.json | 3 +-- lavamoat/build-system/policy.json | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 2166e6a75210..e21fd0baaf99 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1088,7 +1088,6 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, @@ -5621,4 +5620,4 @@ } } } -} +} \ No newline at end of file diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 2166e6a75210..e21fd0baaf99 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1088,7 +1088,6 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, @@ -5621,4 +5620,4 @@ } } } -} +} \ No newline at end of file diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 2166e6a75210..e21fd0baaf99 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1088,7 +1088,6 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, @@ -5621,4 +5620,4 @@ } } } -} +} \ No newline at end of file diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 9e97d850ba30..cc04f67605a5 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1180,7 +1180,6 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth": true, - "@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/types-live": true, "@metamask/eth-ledger-bridge-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "webpack>events": true, @@ -5713,4 +5712,4 @@ } } } -} +} \ No newline at end of file diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 19323f210b56..545922814d1f 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -9231,4 +9231,4 @@ } } } -} +} \ No newline at end of file