From 27a194825fdb22b79118a03159602bb76e2cebe3 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Wed, 27 Nov 2024 18:52:27 +0100 Subject: [PATCH 01/13] chore: bump @metamask/user-operation-controller to ^19.0.0 --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 3c63655b9b49..27c9407bce9f 100644 --- a/package.json +++ b/package.json @@ -349,7 +349,7 @@ "@metamask/snaps-utils": "^8.6.0", "@metamask/solana-wallet-snap": "^0.1.9", "@metamask/transaction-controller": "^40.1.0", - "@metamask/user-operation-controller": "^16.0.0", + "@metamask/user-operation-controller": "^19.0.0", "@metamask/utils": "^10.0.1", "@ngraveio/bc-ur": "^1.1.12", "@noble/hashes": "^1.3.3", diff --git a/yarn.lock b/yarn.lock index 027d29f16a3e..7876ea4afd02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6732,28 +6732,28 @@ __metadata: languageName: node linkType: hard -"@metamask/user-operation-controller@npm:^16.0.0": - version: 16.0.0 - resolution: "@metamask/user-operation-controller@npm:16.0.0" +"@metamask/user-operation-controller@npm:^19.0.0": + version: 19.0.0 + resolution: "@metamask/user-operation-controller@npm:19.0.0" dependencies: - "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.3" "@metamask/eth-query": "npm:^4.0.0" - "@metamask/polling-controller": "npm:^11.0.0" - "@metamask/rpc-errors": "npm:^7.0.0" + "@metamask/polling-controller": "npm:^12.0.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" bn.js: "npm:^5.2.1" immer: "npm:^9.0.6" lodash: "npm:^4.17.21" uuid: "npm:^8.3.2" peerDependencies: "@metamask/approval-controller": ^7.0.0 - "@metamask/gas-fee-controller": ^21.0.0 - "@metamask/keyring-controller": ^17.0.0 - "@metamask/network-controller": ^21.0.0 - "@metamask/transaction-controller": ^37.0.0 - checksum: 10/36ef43910f9e94ae7823902113acdaf7d4031423930f0a35fe4dd3b948a00e8088ea590354afbdb507b32712761720727f0ee905ad6d3db83ef3f0f145b8452d + "@metamask/gas-fee-controller": ^22.0.0 + "@metamask/keyring-controller": ^19.0.0 + "@metamask/network-controller": ^22.0.0 + "@metamask/transaction-controller": ^40.0.0 + checksum: 10/ca3d8ee77243eb3bdc455420185d5c41d45cb5520735af0b05c1792d66fdb6a7404c557b053b16b6fded57124da21c3bb0b6b1c943d290e9808164f05453a8d9 languageName: node linkType: hard @@ -26847,7 +26847,7 @@ __metadata: "@metamask/test-bundler": "npm:^1.0.0" "@metamask/test-dapp": "npm:8.13.0" "@metamask/transaction-controller": "npm:^40.1.0" - "@metamask/user-operation-controller": "npm:^16.0.0" + "@metamask/user-operation-controller": "npm:^19.0.0" "@metamask/utils": "npm:^10.0.1" "@ngraveio/bc-ur": "npm:^1.1.12" "@noble/hashes": "npm:^1.3.3" From c9178ad9b81c92f6b7200e5550f3abda329e0c0a Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Wed, 27 Nov 2024 18:40:45 +0000 Subject: [PATCH 02/13] Update LavaMoat policies --- lavamoat/browserify/beta/policy.json | 21 +++++++++------------ lavamoat/browserify/flask/policy.json | 21 +++++++++------------ lavamoat/browserify/main/policy.json | 21 +++++++++------------ lavamoat/browserify/mmi/policy.json | 21 +++++++++------------ 4 files changed, 36 insertions(+), 48 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index bb556da85cf2..7178ae4ccde9 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -2975,10 +2975,10 @@ "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, - "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, - "@metamask/user-operation-controller>@metamask/utils": true, + "@metamask/user-operation-controller>@metamask/polling-controller": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "bn.js": true, "lodash": true, @@ -2986,19 +2986,16 @@ "webpack>events": true } }, - "@metamask/user-operation-controller>@metamask/utils": { + "@metamask/user-operation-controller>@metamask/polling-controller": { "globals": { - "TextDecoder": true, - "TextEncoder": true + "clearTimeout": true, + "console.error": true, + "setTimeout": 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/base-controller": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "uuid": true } }, "@metamask/utils": { diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index bb556da85cf2..7178ae4ccde9 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -2975,10 +2975,10 @@ "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, - "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, - "@metamask/user-operation-controller>@metamask/utils": true, + "@metamask/user-operation-controller>@metamask/polling-controller": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "bn.js": true, "lodash": true, @@ -2986,19 +2986,16 @@ "webpack>events": true } }, - "@metamask/user-operation-controller>@metamask/utils": { + "@metamask/user-operation-controller>@metamask/polling-controller": { "globals": { - "TextDecoder": true, - "TextEncoder": true + "clearTimeout": true, + "console.error": true, + "setTimeout": 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/base-controller": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "uuid": true } }, "@metamask/utils": { diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index bb556da85cf2..7178ae4ccde9 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -2975,10 +2975,10 @@ "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, - "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, - "@metamask/user-operation-controller>@metamask/utils": true, + "@metamask/user-operation-controller>@metamask/polling-controller": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "bn.js": true, "lodash": true, @@ -2986,19 +2986,16 @@ "webpack>events": true } }, - "@metamask/user-operation-controller>@metamask/utils": { + "@metamask/user-operation-controller>@metamask/polling-controller": { "globals": { - "TextDecoder": true, - "TextEncoder": true + "clearTimeout": true, + "console.error": true, + "setTimeout": 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/base-controller": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "uuid": true } }, "@metamask/utils": { diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 58c87b230e73..8d96921d19dd 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -3067,10 +3067,10 @@ "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, - "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, - "@metamask/user-operation-controller>@metamask/utils": true, + "@metamask/user-operation-controller>@metamask/polling-controller": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "bn.js": true, "lodash": true, @@ -3078,19 +3078,16 @@ "webpack>events": true } }, - "@metamask/user-operation-controller>@metamask/utils": { + "@metamask/user-operation-controller>@metamask/polling-controller": { "globals": { - "TextDecoder": true, - "TextEncoder": true + "clearTimeout": true, + "console.error": true, + "setTimeout": 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/base-controller": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "uuid": true } }, "@metamask/utils": { From e7e98a065317231f9b6a35e28e823a814ee9172a Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Fri, 29 Nov 2024 00:48:10 +0100 Subject: [PATCH 03/13] chore: update dependencies to align with core release 244 --- ...ork-controller-npm-21.0.0-559aa8e395.patch | 33 ---- ...ork-controller-npm-22.0.2-6fc65c500a.patch | 26 +++ package.json | 11 +- yarn.lock | 185 +++++------------- 4 files changed, 77 insertions(+), 178 deletions(-) delete mode 100644 .yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch create mode 100644 .yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch diff --git a/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch b/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch deleted file mode 100644 index 5719ae0284f7..000000000000 --- a/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/PATCH.txt b/PATCH.txt -new file mode 100644 -index 0000000000000000000000000000000000000000..78b9156dc2b0bf7c33dadf325cb3ec0bfae71ccb ---- /dev/null -+++ b/PATCH.txt -@@ -0,0 +1,3 @@ -+We remove `lookupNetwork` from `initializeProvider` in the network controller to prevent network requests before user onboarding is completed. -+The network lookup is done after onboarding is completed, and when the extension reloads if onboarding has been completed. -+This patch is part of a temporary fix that will be reverted soon to make way for a more permanent solution. https://github.com/MetaMask/metamask-extension/pull/23005 -diff --git a/dist/chunk-BV3ZGWII.mjs b/dist/chunk-BV3ZGWII.mjs -index 0d1bf3b6348ad4ec7a799083fcadf36f9fc74851..48a09c6e474da9c18115bec88130a88888337044 100644 ---- a/dist/chunk-BV3ZGWII.mjs -+++ b/dist/chunk-BV3ZGWII.mjs -@@ -468,7 +468,6 @@ var NetworkController = class extends BaseController { - */ - async initializeProvider() { - __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this, this.state.selectedNetworkClientId); -- await this.lookupNetwork(); - } - /** - * Refreshes the network meta with EIP-1559 support and the network status -diff --git a/dist/chunk-YOHMQPGM.js b/dist/chunk-YOHMQPGM.js -index ff15cd78ef90b35f86aae9dc64d17d1d2efe352d..14a8bba39c204585164dfb252d0a183844a58d63 100644 ---- a/dist/chunk-YOHMQPGM.js -+++ b/dist/chunk-YOHMQPGM.js -@@ -468,7 +468,6 @@ var NetworkController = class extends _basecontroller.BaseController { - */ - async initializeProvider() { - _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this, this.state.selectedNetworkClientId); -- await this.lookupNetwork(); - } - /** - * Refreshes the network meta with EIP-1559 support and the network status diff --git a/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch b/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch new file mode 100644 index 000000000000..aa4b3eddc664 --- /dev/null +++ b/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch @@ -0,0 +1,26 @@ +diff --git a/dist/NetworkController.cjs b/dist/NetworkController.cjs +index b85de6f29620feecf6f1e395f3d25c96fb10f204..112d61761d000906d4fa7b4ace687ac67f501b9e 100644 +--- a/dist/NetworkController.cjs ++++ b/dist/NetworkController.cjs +@@ -408,7 +408,7 @@ class NetworkController extends base_controller_1.BaseController { + */ + async initializeProvider() { + __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId); +- await this.lookupNetwork(); ++ // await this.lookupNetwork(); + } + /** + * Refreshes the network meta with EIP-1559 support and the network status +diff --git a/dist/NetworkController.mjs b/dist/NetworkController.mjs +index 966da694324513857dc6766590a4c965dedc2e3d..e268f1fa8f5461fc4d00441823eef3dfd3eff7d7 100644 +--- a/dist/NetworkController.mjs ++++ b/dist/NetworkController.mjs +@@ -383,7 +383,7 @@ export class NetworkController extends BaseController { + */ + async initializeProvider() { + __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId); +- await this.lookupNetwork(); ++ // await this.lookupNetwork(); + } + /** + * Refreshes the network meta with EIP-1559 support and the network status diff --git a/package.json b/package.json index f41456385728..72f02d201cb4 100644 --- a/package.json +++ b/package.json @@ -244,6 +244,7 @@ "@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch", "@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch", "@metamask/network-controller@npm:^20.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch", + "@metamask/network-controller@npm:^21.0.0": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch", "path-to-regexp": "1.9.0", "@ledgerhq/cryptoassets-evm-signatures/axios": "^0.28.0", "@ledgerhq/domain-service/axios": "^0.28.0", @@ -294,7 +295,7 @@ "@metamask/contract-metadata": "^2.5.0", "@metamask/controller-utils": "^11.4.0", "@metamask/design-tokens": "^4.0.0", - "@metamask/ens-controller": "^14.0.0", + "@metamask/ens-controller": "^15.0.0", "@metamask/ens-resolver-snap": "^0.1.2", "@metamask/eth-json-rpc-filters": "^9.0.0", "@metamask/eth-json-rpc-middleware": "^15.0.0", @@ -308,7 +309,7 @@ "@metamask/ethjs": "^0.6.0", "@metamask/ethjs-contract": "^0.4.1", "@metamask/ethjs-query": "^0.7.1", - "@metamask/gas-fee-controller": "^21.0.0", + "@metamask/gas-fee-controller": "^22.0.1", "@metamask/jazzicon": "^2.0.0", "@metamask/json-rpc-engine": "^10.0.0", "@metamask/json-rpc-middleware-stream": "^8.0.4", @@ -320,14 +321,14 @@ "@metamask/message-signing-snap": "^0.4.0", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/name-controller": "^8.0.0", - "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch", + "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch", "@metamask/notification-services-controller": "^0.14.0", "@metamask/object-multiplex": "^2.0.0", "@metamask/obs-store": "^9.0.0", "@metamask/permission-controller": "^11.0.0", "@metamask/permission-log-controller": "^3.0.1", "@metamask/phishing-controller": "^12.3.0", - "@metamask/polling-controller": "^11.0.0", + "@metamask/polling-controller": "^12.0.1", "@metamask/post-message-stream": "^8.0.0", "@metamask/ppom-validator": "0.35.1", "@metamask/preinstalled-example-snap": "^0.2.0", @@ -338,7 +339,7 @@ "@metamask/rpc-errors": "^7.0.0", "@metamask/safe-event-emitter": "^3.1.1", "@metamask/scure-bip39": "^2.0.3", - "@metamask/selected-network-controller": "^18.0.2", + "@metamask/selected-network-controller": "^19.0.0", "@metamask/signature-controller": "^23.0.0", "@metamask/smart-transactions-controller": "^15.0.0", "@metamask/snaps-controllers": "^9.14.0", diff --git a/yarn.lock b/yarn.lock index 50edb52dd9de..f0efe6a7556e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5081,18 +5081,18 @@ __metadata: languageName: node linkType: hard -"@metamask/ens-controller@npm:^14.0.0": - version: 14.0.1 - resolution: "@metamask/ens-controller@npm:14.0.1" +"@metamask/ens-controller@npm:^15.0.0": + version: 15.0.0 + resolution: "@metamask/ens-controller@npm:15.0.0" dependencies: "@ethersproject/providers": "npm:^5.7.0" "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/controller-utils": "npm:^11.4.0" + "@metamask/utils": "npm:^10.0.0" punycode: "npm:^2.1.1" peerDependencies: - "@metamask/network-controller": ^21.0.0 - checksum: 10/1b57a781f4c53d7e60afda11b3994e977af1149aa5651c20b4dc56010de597fd9c9ada28847491d3fe862f0a8f08b96b17a759f742e870ca5911609e07f5dc6c + "@metamask/network-controller": ^22.0.0 + checksum: 10/e61a3e469802689c73821faf8c9fce3efee9e52156d07da8afa674f973787a77fb39bc3faad53fe054644a9e4489f7c5ec67e00ce80c6062ce97f68dee20076e languageName: node linkType: hard @@ -5237,38 +5237,6 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-json-rpc-infura@npm:^9.1.0": - version: 9.1.0 - resolution: "@metamask/eth-json-rpc-infura@npm:9.1.0" - dependencies: - "@metamask/eth-json-rpc-provider": "npm:^2.1.0" - "@metamask/json-rpc-engine": "npm:^7.1.1" - "@metamask/rpc-errors": "npm:^6.0.0" - "@metamask/utils": "npm:^8.1.0" - node-fetch: "npm:^2.7.0" - checksum: 10/9e01b3eb76d3f1b4989ba368f11acb124eb846321020e2fba8c7ff77dc5258fa2df1556f40812d736d63ee159a944beab6a761a661f72e722badcb4f78b5f0f6 - languageName: node - linkType: hard - -"@metamask/eth-json-rpc-middleware@npm:^13.0.0": - version: 13.0.0 - resolution: "@metamask/eth-json-rpc-middleware@npm:13.0.0" - dependencies: - "@metamask/eth-block-tracker": "npm:^10.0.0" - "@metamask/eth-json-rpc-provider": "npm:^4.0.0" - "@metamask/eth-sig-util": "npm:^7.0.0" - "@metamask/json-rpc-engine": "npm:^9.0.0" - "@metamask/rpc-errors": "npm:^6.0.0" - "@metamask/utils": "npm:^8.1.0" - "@types/bn.js": "npm:^5.1.5" - bn.js: "npm:^5.2.1" - klona: "npm:^2.0.6" - pify: "npm:^5.0.0" - safe-stable-stringify: "npm:^2.4.3" - checksum: 10/e2b38da46b15e7c3d75fc0a1191ff5e2a0161c847c415640024155bea635016a0c94a4bd352b5aa6aa7e95615cb45c030a0f1cbc90c2dca331de3f5306df3d3a - languageName: node - linkType: hard - "@metamask/eth-json-rpc-middleware@npm:^15.0.0": version: 15.0.0 resolution: "@metamask/eth-json-rpc-middleware@npm:15.0.0" @@ -5288,18 +5256,7 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-json-rpc-provider@npm:^2.1.0": - version: 2.3.2 - resolution: "@metamask/eth-json-rpc-provider@npm:2.3.2" - dependencies: - "@metamask/json-rpc-engine": "npm:^7.3.2" - "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^8.3.0" - checksum: 10/e6731271aad3b972d85b9230c26d35a9b88722f3bd3024675ad2f568e634e9fdfef4717ef2892f3cc512d381cf17a4e20dbd5eb808ced765082bea3379ad6ddc - languageName: node - linkType: hard - -"@metamask/eth-json-rpc-provider@npm:^4.0.0, @metamask/eth-json-rpc-provider@npm:^4.1.3, @metamask/eth-json-rpc-provider@npm:^4.1.5, @metamask/eth-json-rpc-provider@npm:^4.1.6": +"@metamask/eth-json-rpc-provider@npm:^4.0.0, @metamask/eth-json-rpc-provider@npm:^4.1.5, @metamask/eth-json-rpc-provider@npm:^4.1.6": version: 4.1.6 resolution: "@metamask/eth-json-rpc-provider@npm:4.1.6" dependencies: @@ -5336,7 +5293,7 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-sig-util@npm:^7.0.0, @metamask/eth-sig-util@npm:^7.0.1, @metamask/eth-sig-util@npm:^7.0.3": +"@metamask/eth-sig-util@npm:^7.0.1, @metamask/eth-sig-util@npm:^7.0.3": version: 7.0.3 resolution: "@metamask/eth-sig-util@npm:7.0.3" dependencies: @@ -5560,23 +5517,23 @@ __metadata: languageName: node linkType: hard -"@metamask/gas-fee-controller@npm:^21.0.0": - version: 21.0.0 - resolution: "@metamask/gas-fee-controller@npm:21.0.0" +"@metamask/gas-fee-controller@npm:^22.0.1": + version: 22.0.1 + resolution: "@metamask/gas-fee-controller@npm:22.0.1" dependencies: - "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.3" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-unit": "npm:^0.3.0" - "@metamask/polling-controller": "npm:^11.0.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/polling-controller": "npm:^12.0.1" + "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" "@types/uuid": "npm:^8.3.0" bn.js: "npm:^5.2.1" uuid: "npm:^8.3.2" peerDependencies: - "@metamask/network-controller": ^21.0.0 - checksum: 10/8b41c7257f7dc17deb3f550cfdde0288da142d11536bb55c998bec8267fa62243e36fb6468a44224cd90ed2f49ba3ba1dbe93c2b0834a725752c5a66ae283303 + "@metamask/network-controller": ^22.0.0 + checksum: 10/c52d4bb6359824198fe3169114a685fd8f881feb580eb7b9c9c1ba383e02664f0e7d65e9fcbb0ec1508acb55bd3b273b28b516ad134e9a273b00ed562b771140 languageName: node linkType: hard @@ -5601,18 +5558,7 @@ __metadata: languageName: node linkType: hard -"@metamask/json-rpc-engine@npm:^7.1.1, @metamask/json-rpc-engine@npm:^7.3.2": - version: 7.3.3 - resolution: "@metamask/json-rpc-engine@npm:7.3.3" - dependencies: - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^8.3.0" - checksum: 10/116664c974c522d280335d9a02cba731e4f08562c2980415f7535513cd308c7e612e52618086996e5ac2b67db7f1e6ac1bd8201aba7825163db17a25f2874cc9 - languageName: node - linkType: hard - -"@metamask/json-rpc-engine@npm:^9.0.0, @metamask/json-rpc-engine@npm:^9.0.2, @metamask/json-rpc-engine@npm:^9.0.3": +"@metamask/json-rpc-engine@npm:^9.0.3": version: 9.0.3 resolution: "@metamask/json-rpc-engine@npm:9.0.3" dependencies: @@ -5789,32 +5735,7 @@ __metadata: languageName: node linkType: hard -"@metamask/network-controller@npm:21.0.0": - version: 21.0.0 - resolution: "@metamask/network-controller@npm:21.0.0" - dependencies: - "@metamask/base-controller": "npm:^7.0.0" - "@metamask/controller-utils": "npm:^11.2.0" - "@metamask/eth-block-tracker": "npm:^10.0.0" - "@metamask/eth-json-rpc-infura": "npm:^9.1.0" - "@metamask/eth-json-rpc-middleware": "npm:^13.0.0" - "@metamask/eth-json-rpc-provider": "npm:^4.1.3" - "@metamask/eth-query": "npm:^4.0.0" - "@metamask/json-rpc-engine": "npm:^9.0.2" - "@metamask/rpc-errors": "npm:^6.3.1" - "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^9.1.0" - async-mutex: "npm:^0.5.0" - immer: "npm:^9.0.6" - loglevel: "npm:^1.8.1" - reselect: "npm:^5.1.1" - uri-js: "npm:^4.4.1" - uuid: "npm:^8.3.2" - checksum: 10/b44804720a7338a89edfc4e82c5652d429f6e3589de4fe1ebbba921d1d9af6c82a78c79591c0c8a6cb9b4439dbd77ede5b6aa8a72d24996ccedd8a7854fc7d46 - languageName: node - linkType: hard - -"@metamask/network-controller@npm:^22.0.2": +"@metamask/network-controller@npm:22.0.2, @metamask/network-controller@npm:^22.0.2": version: 22.0.2 resolution: "@metamask/network-controller@npm:22.0.2" dependencies: @@ -5839,28 +5760,28 @@ __metadata: languageName: node linkType: hard -"@metamask/network-controller@patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch": - version: 21.0.0 - resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch::version=21.0.0&hash=1a5039" +"@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch": + version: 22.0.2 + resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch::version=22.0.2&hash=cc3267" dependencies: - "@metamask/base-controller": "npm:^7.0.0" - "@metamask/controller-utils": "npm:^11.2.0" - "@metamask/eth-block-tracker": "npm:^10.0.0" - "@metamask/eth-json-rpc-infura": "npm:^9.1.0" - "@metamask/eth-json-rpc-middleware": "npm:^13.0.0" - "@metamask/eth-json-rpc-provider": "npm:^4.1.3" + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/eth-block-tracker": "npm:^11.0.2" + "@metamask/eth-json-rpc-infura": "npm:^10.0.0" + "@metamask/eth-json-rpc-middleware": "npm:^15.0.0" + "@metamask/eth-json-rpc-provider": "npm:^4.1.6" "@metamask/eth-query": "npm:^4.0.0" - "@metamask/json-rpc-engine": "npm:^9.0.2" - "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/json-rpc-engine": "npm:^10.0.1" + "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" async-mutex: "npm:^0.5.0" immer: "npm:^9.0.6" loglevel: "npm:^1.8.1" reselect: "npm:^5.1.1" uri-js: "npm:^4.4.1" uuid: "npm:^8.3.2" - checksum: 10/6c3fdf78360df8bf39a0045f7d5e6d0b7fd8984eaee7a3348bd688ee2740669c654803790dbf2429f8559b69d88101de0add0cc76e5c42661cf2eec14b263cb0 + checksum: 10/63137f7f847cb59309a8f71831bd3deef0ebd2236c2f8759f9b078adf47559b0928fce2e8762b91cf4a8ff0a4e078bead3de286fa91b99d683bb6bda190581a3 languageName: node linkType: hard @@ -5985,22 +5906,6 @@ __metadata: languageName: node linkType: hard -"@metamask/polling-controller@npm:^11.0.0": - version: 11.0.0 - resolution: "@metamask/polling-controller@npm:11.0.0" - dependencies: - "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.3.0" - "@metamask/utils": "npm:^9.1.0" - "@types/uuid": "npm:^8.3.0" - fast-json-stable-stringify: "npm:^2.1.0" - uuid: "npm:^8.3.2" - peerDependencies: - "@metamask/network-controller": ^21.0.0 - checksum: 10/67b563a5d1ce02dc9c2db25ad4ad1fb9f75d5578cf380cce85176ff2cd136addce612c3982653254647b9d8c535374e93d96abb6e500e42076bf3a524a72e75f - languageName: node - linkType: hard - "@metamask/polling-controller@npm:^12.0.0, @metamask/polling-controller@npm:^12.0.1": version: 12.0.1 resolution: "@metamask/polling-controller@npm:12.0.1" @@ -6139,7 +6044,7 @@ __metadata: languageName: node linkType: hard -"@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0, @metamask/rpc-errors@npm:^6.3.1": +"@metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0, @metamask/rpc-errors@npm:^6.3.1": version: 6.4.0 resolution: "@metamask/rpc-errors@npm:6.4.0" dependencies: @@ -6176,18 +6081,18 @@ __metadata: languageName: node linkType: hard -"@metamask/selected-network-controller@npm:^18.0.2": - version: 18.0.2 - resolution: "@metamask/selected-network-controller@npm:18.0.2" +"@metamask/selected-network-controller@npm:^19.0.0": + version: 19.0.0 + resolution: "@metamask/selected-network-controller@npm:19.0.0" dependencies: "@metamask/base-controller": "npm:^7.0.1" "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^9.1.0" + "@metamask/utils": "npm:^10.0.0" peerDependencies: - "@metamask/network-controller": ^21.0.0 + "@metamask/network-controller": ^22.0.0 "@metamask/permission-controller": ^11.0.0 - checksum: 10/cf46a1a7d4ca19d6327aeb5918b2e904933b3ae6959184a2d5773be294d1b0dbe4d16189c46bfcbd83f33d95fe0c6e5cb64e4745fa0c75243db4c8304ab6ec8e + checksum: 10/738a1c749f442b732c279c7446e0db2cc7d72fa03fd485da15121559077bb6ffeaa3233435a028f4ea69015a40ca35ba66972dc0fd3a7f61a7ea5eee43df30a6 languageName: node linkType: hard @@ -26501,7 +26406,7 @@ __metadata: "@metamask/contract-metadata": "npm:^2.5.0" "@metamask/controller-utils": "npm:^11.4.0" "@metamask/design-tokens": "npm:^4.0.0" - "@metamask/ens-controller": "npm:^14.0.0" + "@metamask/ens-controller": "npm:^15.0.0" "@metamask/ens-resolver-snap": "npm:^0.1.2" "@metamask/eslint-config": "npm:^9.0.0" "@metamask/eslint-config-jest": "npm:^9.0.0" @@ -26523,7 +26428,7 @@ __metadata: "@metamask/ethjs-contract": "npm:^0.4.1" "@metamask/ethjs-query": "npm:^0.7.1" "@metamask/forwarder": "npm:^1.1.0" - "@metamask/gas-fee-controller": "npm:^21.0.0" + "@metamask/gas-fee-controller": "npm:^22.0.1" "@metamask/jazzicon": "npm:^2.0.0" "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/json-rpc-middleware-stream": "npm:^8.0.4" @@ -26535,7 +26440,7 @@ __metadata: "@metamask/message-signing-snap": "npm:^0.4.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/name-controller": "npm:^8.0.0" - "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch" + "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch" "@metamask/notification-services-controller": "npm:^0.14.0" "@metamask/object-multiplex": "npm:^2.0.0" "@metamask/obs-store": "npm:^9.0.0" @@ -26543,7 +26448,7 @@ __metadata: "@metamask/permission-log-controller": "npm:^3.0.1" "@metamask/phishing-controller": "npm:^12.3.0" "@metamask/phishing-warning": "npm:^4.1.0" - "@metamask/polling-controller": "npm:^11.0.0" + "@metamask/polling-controller": "npm:^12.0.1" "@metamask/post-message-stream": "npm:^8.0.0" "@metamask/ppom-validator": "npm:0.35.1" "@metamask/preferences-controller": "npm:^14.0.0" @@ -26555,7 +26460,7 @@ __metadata: "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/safe-event-emitter": "npm:^3.1.1" "@metamask/scure-bip39": "npm:^2.0.3" - "@metamask/selected-network-controller": "npm:^18.0.2" + "@metamask/selected-network-controller": "npm:^19.0.0" "@metamask/signature-controller": "npm:^23.0.0" "@metamask/smart-transactions-controller": "npm:^15.0.0" "@metamask/snaps-controllers": "npm:^9.14.0" From eca9f2c650979206cbf6af09644ff72ad5684981 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Fri, 29 Nov 2024 00:08:46 +0000 Subject: [PATCH 04/13] Update LavaMoat policies --- lavamoat/browserify/beta/policy.json | 162 ++++---------------------- lavamoat/browserify/flask/policy.json | 162 ++++---------------------- lavamoat/browserify/main/policy.json | 162 ++++---------------------- lavamoat/browserify/mmi/policy.json | 162 ++++---------------------- 4 files changed, 88 insertions(+), 560 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index e40ae20f3b4c..1459a7013d1a 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -675,13 +675,13 @@ "@ethersproject/contracts": true, "@ethersproject/providers": true, "@metamask/abi-utils": true, - "@metamask/assets-controllers>@metamask/polling-controller": true, "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/name-controller>async-mutex": true, + "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/utils": true, "bn.js": true, @@ -692,18 +692,6 @@ "uuid": true } }, - "@metamask/assets-controllers>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/base-controller": { "globals": { "setTimeout": true @@ -796,25 +784,10 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/ens-controller>@metamask/utils": true, + "@metamask/utils": true, "punycode": true } }, - "@metamask/ens-controller>@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-json-rpc-filters": { "globals": { "console.error": true @@ -1737,54 +1710,35 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, + "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, + "@metamask/json-rpc-engine": true, + "@metamask/network-controller>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true, - "@metamask/network-controller>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>@metamask/utils": true, "@metamask/network-controller>reselect": true, + "@metamask/rpc-errors": true, + "@metamask/utils": true, "browserify>assert": true, "browserify>util": true, "uri-js": true, "uuid": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura": { + "@metamask/network-controller>@metamask/eth-block-tracker": { "globals": { + "clearTimeout": true, + "console.error": true, "setTimeout": true }, "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, - "node-fetch": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": true, - "@metamask/rpc-errors>fast-safe-stringify": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": { + "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": { "globals": { "TextDecoder": true, "TextEncoder": true @@ -1799,67 +1753,19 @@ "semver": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@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/network-controller>@metamask/eth-json-rpc-middleware": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura": { "globals": { - "URL": true, - "console.error": true, + "fetch": true, "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>klona": true, - "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, - "@metamask/eth-sig-util": true, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": true, - "@metamask/network-controller>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/rpc-errors": true, - "bn.js": true, - "pify": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@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/network-controller>@metamask/json-rpc-engine": { - "packages": { - "@metamask/network-controller>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/utils": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/network-controller>@metamask/rpc-errors": { - "packages": { - "@metamask/network-controller>@metamask/utils": true, - "@metamask/rpc-errors>fast-safe-stringify": true + "@metamask/eth-json-rpc-provider": true, + "@metamask/json-rpc-engine": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/rpc-errors": true } }, - "@metamask/network-controller>@metamask/utils": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, "TextEncoder": true @@ -2439,9 +2345,9 @@ "@ethersproject/bytes": true, "@metamask/controller-utils": true, "@metamask/eth-query": true, + "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, - "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2473,18 +2379,6 @@ "crypto.getRandomValues": true } }, - "@metamask/smart-transactions-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2784,9 +2678,9 @@ "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, + "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, - "@metamask/user-operation-controller>@metamask/polling-controller": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "bn.js": true, @@ -2795,18 +2689,6 @@ "webpack>events": true } }, - "@metamask/user-operation-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index e40ae20f3b4c..1459a7013d1a 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -675,13 +675,13 @@ "@ethersproject/contracts": true, "@ethersproject/providers": true, "@metamask/abi-utils": true, - "@metamask/assets-controllers>@metamask/polling-controller": true, "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/name-controller>async-mutex": true, + "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/utils": true, "bn.js": true, @@ -692,18 +692,6 @@ "uuid": true } }, - "@metamask/assets-controllers>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/base-controller": { "globals": { "setTimeout": true @@ -796,25 +784,10 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/ens-controller>@metamask/utils": true, + "@metamask/utils": true, "punycode": true } }, - "@metamask/ens-controller>@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-json-rpc-filters": { "globals": { "console.error": true @@ -1737,54 +1710,35 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, + "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, + "@metamask/json-rpc-engine": true, + "@metamask/network-controller>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true, - "@metamask/network-controller>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>@metamask/utils": true, "@metamask/network-controller>reselect": true, + "@metamask/rpc-errors": true, + "@metamask/utils": true, "browserify>assert": true, "browserify>util": true, "uri-js": true, "uuid": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura": { + "@metamask/network-controller>@metamask/eth-block-tracker": { "globals": { + "clearTimeout": true, + "console.error": true, "setTimeout": true }, "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, - "node-fetch": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": true, - "@metamask/rpc-errors>fast-safe-stringify": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": { + "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": { "globals": { "TextDecoder": true, "TextEncoder": true @@ -1799,67 +1753,19 @@ "semver": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@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/network-controller>@metamask/eth-json-rpc-middleware": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura": { "globals": { - "URL": true, - "console.error": true, + "fetch": true, "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>klona": true, - "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, - "@metamask/eth-sig-util": true, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": true, - "@metamask/network-controller>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/rpc-errors": true, - "bn.js": true, - "pify": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@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/network-controller>@metamask/json-rpc-engine": { - "packages": { - "@metamask/network-controller>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/utils": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/network-controller>@metamask/rpc-errors": { - "packages": { - "@metamask/network-controller>@metamask/utils": true, - "@metamask/rpc-errors>fast-safe-stringify": true + "@metamask/eth-json-rpc-provider": true, + "@metamask/json-rpc-engine": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/rpc-errors": true } }, - "@metamask/network-controller>@metamask/utils": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, "TextEncoder": true @@ -2439,9 +2345,9 @@ "@ethersproject/bytes": true, "@metamask/controller-utils": true, "@metamask/eth-query": true, + "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, - "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2473,18 +2379,6 @@ "crypto.getRandomValues": true } }, - "@metamask/smart-transactions-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2784,9 +2678,9 @@ "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, + "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, - "@metamask/user-operation-controller>@metamask/polling-controller": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "bn.js": true, @@ -2795,18 +2689,6 @@ "webpack>events": true } }, - "@metamask/user-operation-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index e40ae20f3b4c..1459a7013d1a 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -675,13 +675,13 @@ "@ethersproject/contracts": true, "@ethersproject/providers": true, "@metamask/abi-utils": true, - "@metamask/assets-controllers>@metamask/polling-controller": true, "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/name-controller>async-mutex": true, + "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/utils": true, "bn.js": true, @@ -692,18 +692,6 @@ "uuid": true } }, - "@metamask/assets-controllers>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/base-controller": { "globals": { "setTimeout": true @@ -796,25 +784,10 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/ens-controller>@metamask/utils": true, + "@metamask/utils": true, "punycode": true } }, - "@metamask/ens-controller>@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-json-rpc-filters": { "globals": { "console.error": true @@ -1737,54 +1710,35 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, + "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, + "@metamask/json-rpc-engine": true, + "@metamask/network-controller>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true, - "@metamask/network-controller>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>@metamask/utils": true, "@metamask/network-controller>reselect": true, + "@metamask/rpc-errors": true, + "@metamask/utils": true, "browserify>assert": true, "browserify>util": true, "uri-js": true, "uuid": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura": { + "@metamask/network-controller>@metamask/eth-block-tracker": { "globals": { + "clearTimeout": true, + "console.error": true, "setTimeout": true }, "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, - "node-fetch": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": true, - "@metamask/rpc-errors>fast-safe-stringify": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": { + "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": { "globals": { "TextDecoder": true, "TextEncoder": true @@ -1799,67 +1753,19 @@ "semver": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@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/network-controller>@metamask/eth-json-rpc-middleware": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura": { "globals": { - "URL": true, - "console.error": true, + "fetch": true, "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>klona": true, - "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, - "@metamask/eth-sig-util": true, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": true, - "@metamask/network-controller>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/rpc-errors": true, - "bn.js": true, - "pify": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@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/network-controller>@metamask/json-rpc-engine": { - "packages": { - "@metamask/network-controller>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/utils": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/network-controller>@metamask/rpc-errors": { - "packages": { - "@metamask/network-controller>@metamask/utils": true, - "@metamask/rpc-errors>fast-safe-stringify": true + "@metamask/eth-json-rpc-provider": true, + "@metamask/json-rpc-engine": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/rpc-errors": true } }, - "@metamask/network-controller>@metamask/utils": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, "TextEncoder": true @@ -2439,9 +2345,9 @@ "@ethersproject/bytes": true, "@metamask/controller-utils": true, "@metamask/eth-query": true, + "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, - "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2473,18 +2379,6 @@ "crypto.getRandomValues": true } }, - "@metamask/smart-transactions-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2784,9 +2678,9 @@ "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, + "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, - "@metamask/user-operation-controller>@metamask/polling-controller": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "bn.js": true, @@ -2795,18 +2689,6 @@ "webpack>events": true } }, - "@metamask/user-operation-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 4dcc3fb7c8f5..621f2ac9acf3 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -767,13 +767,13 @@ "@ethersproject/contracts": true, "@ethersproject/providers": true, "@metamask/abi-utils": true, - "@metamask/assets-controllers>@metamask/polling-controller": true, "@metamask/base-controller": true, "@metamask/contract-metadata": true, "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/metamask-eth-abis": true, "@metamask/name-controller>async-mutex": true, + "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/utils": true, "bn.js": true, @@ -784,18 +784,6 @@ "uuid": true } }, - "@metamask/assets-controllers>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/base-controller": { "globals": { "setTimeout": true @@ -888,25 +876,10 @@ "@ethersproject/providers": true, "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/ens-controller>@metamask/utils": true, + "@metamask/utils": true, "punycode": true } }, - "@metamask/ens-controller>@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-json-rpc-filters": { "globals": { "console.error": true @@ -1829,54 +1802,35 @@ "packages": { "@metamask/base-controller": true, "@metamask/controller-utils": true, + "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-json-rpc-provider": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, + "@metamask/json-rpc-engine": true, + "@metamask/network-controller>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true, - "@metamask/network-controller>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/rpc-errors": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>@metamask/utils": true, "@metamask/network-controller>reselect": true, + "@metamask/rpc-errors": true, + "@metamask/utils": true, "browserify>assert": true, "browserify>util": true, "uri-js": true, "uuid": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura": { + "@metamask/network-controller>@metamask/eth-block-tracker": { "globals": { + "clearTimeout": true, + "console.error": true, "setTimeout": true }, "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, - "node-fetch": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors": { - "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": true, - "@metamask/rpc-errors>fast-safe-stringify": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/rpc-errors>@metamask/utils": { + "@metamask/network-controller>@metamask/eth-block-tracker>@metamask/utils": { "globals": { "TextDecoder": true, "TextEncoder": true @@ -1891,67 +1845,19 @@ "semver": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@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/network-controller>@metamask/eth-json-rpc-middleware": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura": { "globals": { - "URL": true, - "console.error": true, + "fetch": true, "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>klona": true, - "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, - "@metamask/eth-sig-util": true, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/utils": true, - "@metamask/network-controller>@metamask/json-rpc-engine": true, - "@metamask/network-controller>@metamask/rpc-errors": true, - "bn.js": true, - "pify": true - } - }, - "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@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/network-controller>@metamask/json-rpc-engine": { - "packages": { - "@metamask/network-controller>@metamask/rpc-errors": true, - "@metamask/network-controller>@metamask/utils": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/network-controller>@metamask/rpc-errors": { - "packages": { - "@metamask/network-controller>@metamask/utils": true, - "@metamask/rpc-errors>fast-safe-stringify": true + "@metamask/eth-json-rpc-provider": true, + "@metamask/json-rpc-engine": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/rpc-errors": true } }, - "@metamask/network-controller>@metamask/utils": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, "TextEncoder": true @@ -2531,9 +2437,9 @@ "@ethersproject/bytes": true, "@metamask/controller-utils": true, "@metamask/eth-query": true, + "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, - "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2565,18 +2471,6 @@ "crypto.getRandomValues": true } }, - "@metamask/smart-transactions-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2876,9 +2770,9 @@ "@metamask/controller-utils": true, "@metamask/eth-query": true, "@metamask/gas-fee-controller": true, + "@metamask/polling-controller": true, "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, - "@metamask/user-operation-controller>@metamask/polling-controller": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "bn.js": true, @@ -2887,18 +2781,6 @@ "webpack>events": true } }, - "@metamask/user-operation-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, From cb52f52de521258344030fb700c6b5401ab4c855 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Fri, 29 Nov 2024 01:48:34 +0100 Subject: [PATCH 05/13] fix: network controller patch --- ...ork-controller-npm-22.0.2-6fc65c500a.patch | 21 +++++++++++++------ package.json | 4 +--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch b/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch index aa4b3eddc664..bebf56fe73dd 100644 --- a/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch +++ b/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch @@ -1,26 +1,35 @@ +diff --git a/PATCH.txt b/PATCH.txt +new file mode 100644 +index 0000000000000000000000000000000000000000..ce3b18534f055ee00aa5821793f855fd300fb72c +--- /dev/null ++++ b/PATCH.txt +@@ -0,0 +1,4 @@ ++We remove lookupNetwork from initializeProvider in the network controller to prevent network requests before user onboarding is completed. ++The network lookup is done after onboarding is completed, and when the extension reloads if onboarding has been completed. ++This patch is part of a temporary fix that will be reverted soon to make way for a more permanent solution. https://github.com/MetaMask/metamask-extension/pull/23005 ++You can see the changes before compilation on this branch: https://github.com/MetaMask/core/compare/pnf/ext-23622-review?expand=1 +\ No newline at end of file diff --git a/dist/NetworkController.cjs b/dist/NetworkController.cjs -index b85de6f29620feecf6f1e395f3d25c96fb10f204..112d61761d000906d4fa7b4ace687ac67f501b9e 100644 +index b85de6f29620feecf6f1e395f3d25c96fb10f204..68c894de3975ab917e8320b5937b19a9b3ddd4ca 100644 --- a/dist/NetworkController.cjs +++ b/dist/NetworkController.cjs -@@ -408,7 +408,7 @@ class NetworkController extends base_controller_1.BaseController { +@@ -408,7 +408,6 @@ class NetworkController extends base_controller_1.BaseController { */ async initializeProvider() { __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId); - await this.lookupNetwork(); -+ // await this.lookupNetwork(); } /** * Refreshes the network meta with EIP-1559 support and the network status diff --git a/dist/NetworkController.mjs b/dist/NetworkController.mjs -index 966da694324513857dc6766590a4c965dedc2e3d..e268f1fa8f5461fc4d00441823eef3dfd3eff7d7 100644 +index 966da694324513857dc6766590a4c965dedc2e3d..eb2fe95f9d77fa781d2bce97b7007d4676a3bede 100644 --- a/dist/NetworkController.mjs +++ b/dist/NetworkController.mjs -@@ -383,7 +383,7 @@ export class NetworkController extends BaseController { +@@ -383,7 +383,6 @@ export class NetworkController extends BaseController { */ async initializeProvider() { __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId); - await this.lookupNetwork(); -+ // await this.lookupNetwork(); } /** * Refreshes the network meta with EIP-1559 support and the network status diff --git a/package.json b/package.json index 72f02d201cb4..d02d6a1faf47 100644 --- a/package.json +++ b/package.json @@ -241,9 +241,7 @@ "@expo/config-plugins/glob": "^10.3.10", "@solana/web3.js/rpc-websockets": "^8.0.1", "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch", - "@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch", - "@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch", - "@metamask/network-controller@npm:^20.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch", + "@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch", "@metamask/network-controller@npm:^21.0.0": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch", "path-to-regexp": "1.9.0", "@ledgerhq/cryptoassets-evm-signatures/axios": "^0.28.0", From 7746123205b62b48bfeb4bb2c1591a564ee08cce Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Fri, 29 Nov 2024 01:59:21 +0100 Subject: [PATCH 06/13] fix: lock file --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index f0efe6a7556e..9661a4cc39bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5762,7 +5762,7 @@ __metadata: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch": version: 22.0.2 - resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch::version=22.0.2&hash=cc3267" + resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch::version=22.0.2&hash=5eb093" dependencies: "@metamask/base-controller": "npm:^7.0.2" "@metamask/controller-utils": "npm:^11.4.3" @@ -5781,7 +5781,7 @@ __metadata: reselect: "npm:^5.1.1" uri-js: "npm:^4.4.1" uuid: "npm:^8.3.2" - checksum: 10/63137f7f847cb59309a8f71831bd3deef0ebd2236c2f8759f9b078adf47559b0928fce2e8762b91cf4a8ff0a4e078bead3de286fa91b99d683bb6bda190581a3 + checksum: 10/2daf9a8e1c35608e720b4bb611d84a90da58881c5b7483894dd18fc9850ceb144646314cef32c80889ac1fb71f37ed333d06e837bdb3daa0a234bc2c3af1e2dd languageName: node linkType: hard From ecf6ac8041af42a08fd9e3895c0f8b7dd8b21a0a Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Fri, 29 Nov 2024 02:40:05 +0100 Subject: [PATCH 07/13] fix: package json remove unused network controller resolution --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index d02d6a1faf47..0d8f78d72bf4 100644 --- a/package.json +++ b/package.json @@ -241,7 +241,6 @@ "@expo/config-plugins/glob": "^10.3.10", "@solana/web3.js/rpc-websockets": "^8.0.1", "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch", - "@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch", "@metamask/network-controller@npm:^21.0.0": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch", "path-to-regexp": "1.9.0", "@ledgerhq/cryptoassets-evm-signatures/axios": "^0.28.0", From 8aa00c3806d80851db6208b459e13c43a5647427 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Tue, 3 Dec 2024 22:46:58 +0100 Subject: [PATCH 08/13] chore: update packages up to release 262 --- ...ts-controllers-npm-45.1.0-d914c453f0.patch | 59 --- ...ts-controllers-npm-45.1.1-247f8b5019.patch | 21 + ...rk-controller-npm-22.1.0-621c281f70.patch} | 8 +- app/scripts/metamask-controller.js | 13 +- package.json | 49 +-- yarn.lock | 406 +++++++++++------- 6 files changed, 303 insertions(+), 253 deletions(-) delete mode 100644 .yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch create mode 100644 .yarn/patches/@metamask-assets-controllers-npm-45.1.1-247f8b5019.patch rename .yarn/patches/{@metamask-network-controller-npm-22.0.2-6fc65c500a.patch => @metamask-network-controller-npm-22.1.0-621c281f70.patch} (84%) diff --git a/.yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch b/.yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch deleted file mode 100644 index 5dec24d6e625..000000000000 --- a/.yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/dist/assetsUtil.cjs b/dist/assetsUtil.cjs -index 48571b8c1b78e94d88e1837e986b5f8735ac651b..61246f51500c8cab48f18296a73629fb73454caa 100644 ---- a/dist/assetsUtil.cjs -+++ b/dist/assetsUtil.cjs -@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; - }; - Object.defineProperty(exports, "__esModule", { value: true }); -+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } - exports.fetchTokenContractExchangeRates = exports.reduceInBatchesSerially = exports.divideIntoBatches = exports.ethersBigNumberToBN = exports.addUrlProtocolPrefix = exports.getFormattedIpfsUrl = exports.getIpfsCIDv1AndPath = exports.removeIpfsProtocolPrefix = exports.isTokenListSupportedForNetwork = exports.isTokenDetectionSupportedForNetwork = exports.SupportedStakedBalanceNetworks = exports.SupportedTokenDetectionNetworks = exports.formatIconUrlWithProxy = exports.formatAggregatorNames = exports.hasNewCollectionFields = exports.compareNftMetadata = exports.TOKEN_PRICES_BATCH_SIZE = void 0; - const controller_utils_1 = require("@metamask/controller-utils"); - const utils_1 = require("@metamask/utils"); -@@ -233,7 +234,7 @@ async function getIpfsCIDv1AndPath(ipfsUrl) { - const index = url.indexOf('/'); - const cid = index !== -1 ? url.substring(0, index) : url; - const path = index !== -1 ? url.substring(index) : undefined; -- const { CID } = await import("multiformats"); -+ const { CID } = _interopRequireWildcard(require("multiformats")); - // We want to ensure that the CID is v1 (https://docs.ipfs.io/concepts/content-addressing/#identifier-formats) - // because most cid v0s appear to be incompatible with IPFS subdomains - return { -diff --git a/dist/token-prices-service/codefi-v2.mjs b/dist/token-prices-service/codefi-v2.mjs -index a13403446a2376d4d905a9ef733941798da89c88..3c8229f9ea40f4c1ee760a22884e1066dac82ec7 100644 ---- a/dist/token-prices-service/codefi-v2.mjs -+++ b/dist/token-prices-service/codefi-v2.mjs -@@ -12,8 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function ( - var _CodefiTokenPricesServiceV2_tokenPricePolicy; - import { handleFetch } from "@metamask/controller-utils"; - import { hexToNumber } from "@metamask/utils"; --import $cockatiel from "cockatiel"; --const { circuitBreaker, ConsecutiveBreaker, ExponentialBackoff, handleAll, retry, wrap, CircuitState } = $cockatiel; -+import { circuitBreaker, ConsecutiveBreaker, ExponentialBackoff, handleAll, retry, wrap, CircuitState } from "cockatiel"; - /** - * The list of currencies that can be supplied as the `vsCurrency` parameter to - * the `/spot-prices` endpoint, in lowercase form. -diff --git a/dist/TokensController.cjs b/dist/TokensController.cjs -index 343b343b8300136756d96acac77aab8140efc95a..69d8e2ea84d6303a3af02bd95458ef3060c76f2b 100644 ---- a/dist/TokensController.cjs -+++ b/dist/TokensController.cjs -@@ -270,13 +270,16 @@ class TokensController extends base_controller_1.BaseController { - * @param networkClientId - Optional network client ID used to determine interacting chain ID. - */ - ignoreTokens(tokenAddressesToIgnore, networkClientId) { -- const { ignoredTokens, detectedTokens, tokens } = this.state; -- const ignoredTokensMap = {}; -- let newIgnoredTokens = [...ignoredTokens]; - let interactingChainId; - if (networkClientId) { - interactingChainId = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId; - } -+ const { allTokens, allDetectedTokens, allIgnoredTokens } = this.state; -+ const ignoredTokensMap = {}; -+ const ignoredTokens = allIgnoredTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || []; -+ let newIgnoredTokens = [...ignoredTokens]; -+ const tokens = allTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || []; -+ const detectedTokens = allDetectedTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || []; - const checksummedTokenAddresses = tokenAddressesToIgnore.map((address) => { - const checksumAddress = (0, controller_utils_1.toChecksumHexAddress)(address); - ignoredTokensMap[address.toLowerCase()] = true; diff --git a/.yarn/patches/@metamask-assets-controllers-npm-45.1.1-247f8b5019.patch b/.yarn/patches/@metamask-assets-controllers-npm-45.1.1-247f8b5019.patch new file mode 100644 index 000000000000..7061e73b4572 --- /dev/null +++ b/.yarn/patches/@metamask-assets-controllers-npm-45.1.1-247f8b5019.patch @@ -0,0 +1,21 @@ +diff --git a/dist/assetsUtil.cjs b/dist/assetsUtil.cjs +index 48571b8c1b78e94d88e1837e986b5f8735ac651b..61246f51500c8cab48f18296a73629fb73454caa 100644 +--- a/dist/assetsUtil.cjs ++++ b/dist/assetsUtil.cjs +@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; + Object.defineProperty(exports, "__esModule", { value: true }); ++function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } + exports.fetchTokenContractExchangeRates = exports.reduceInBatchesSerially = exports.divideIntoBatches = exports.ethersBigNumberToBN = exports.addUrlProtocolPrefix = exports.getFormattedIpfsUrl = exports.getIpfsCIDv1AndPath = exports.removeIpfsProtocolPrefix = exports.isTokenListSupportedForNetwork = exports.isTokenDetectionSupportedForNetwork = exports.SupportedStakedBalanceNetworks = exports.SupportedTokenDetectionNetworks = exports.formatIconUrlWithProxy = exports.formatAggregatorNames = exports.hasNewCollectionFields = exports.compareNftMetadata = exports.TOKEN_PRICES_BATCH_SIZE = void 0; + const controller_utils_1 = require("@metamask/controller-utils"); + const utils_1 = require("@metamask/utils"); +@@ -233,7 +234,7 @@ async function getIpfsCIDv1AndPath(ipfsUrl) { + const index = url.indexOf('/'); + const cid = index !== -1 ? url.substring(0, index) : url; + const path = index !== -1 ? url.substring(index) : undefined; +- const { CID } = await import("multiformats"); ++ const { CID } = _interopRequireWildcard(require("multiformats")); + // We want to ensure that the CID is v1 (https://docs.ipfs.io/concepts/content-addressing/#identifier-formats) + // because most cid v0s appear to be incompatible with IPFS subdomains + return { diff --git a/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch b/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch similarity index 84% rename from .yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch rename to .yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch index bebf56fe73dd..027c44b96395 100644 --- a/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch +++ b/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch @@ -10,10 +10,10 @@ index 0000000000000000000000000000000000000000..ce3b18534f055ee00aa5821793f855fd +You can see the changes before compilation on this branch: https://github.com/MetaMask/core/compare/pnf/ext-23622-review?expand=1 \ No newline at end of file diff --git a/dist/NetworkController.cjs b/dist/NetworkController.cjs -index b85de6f29620feecf6f1e395f3d25c96fb10f204..68c894de3975ab917e8320b5937b19a9b3ddd4ca 100644 +index cc9793f576eb39a51ab141b7d03de57cf99e5570..c573b5134d40f522217a6ab6df129040d02e9660 100644 --- a/dist/NetworkController.cjs +++ b/dist/NetworkController.cjs -@@ -408,7 +408,6 @@ class NetworkController extends base_controller_1.BaseController { +@@ -422,7 +422,6 @@ class NetworkController extends base_controller_1.BaseController { */ async initializeProvider() { __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId); @@ -22,10 +22,10 @@ index b85de6f29620feecf6f1e395f3d25c96fb10f204..68c894de3975ab917e8320b5937b19a9 /** * Refreshes the network meta with EIP-1559 support and the network status diff --git a/dist/NetworkController.mjs b/dist/NetworkController.mjs -index 966da694324513857dc6766590a4c965dedc2e3d..eb2fe95f9d77fa781d2bce97b7007d4676a3bede 100644 +index 806f32edeffaad9f7eb1cafa4184368ec95f63e7..9268947cbed4bf717729ca6ac8ea83a8b91b6e8a 100644 --- a/dist/NetworkController.mjs +++ b/dist/NetworkController.mjs -@@ -383,7 +383,6 @@ export class NetworkController extends BaseController { +@@ -397,7 +397,6 @@ export class NetworkController extends BaseController { */ async initializeProvider() { __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_applyNetworkSelection).call(this, this.state.selectedNetworkClientId); diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 1eaf354b4caf..765dde956c0c 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1313,14 +1313,6 @@ export default class MetamaskController extends EventEmitter { ], }), state: initState.SelectedNetworkController, - useRequestQueuePreference: - this.preferencesController.state.useRequestQueue, - onPreferencesStateChange: (listener) => { - preferencesMessenger.subscribe( - 'PreferencesController:stateChange', - listener, - ); - }, domainProxyMap: new WeakRefObjectMap(), }); @@ -1635,12 +1627,17 @@ export default class MetamaskController extends EventEmitter { 'NotificationServicesController:selectIsNotificationServicesEnabled', 'AccountsController:listAccounts', 'AccountsController:updateAccountMetadata', + 'NetworkController:getState', + 'NetworkController:addNetwork', + 'NetworkController:removeNetwork', + 'NetworkController:updateNetwork', ], allowedEvents: [ 'KeyringController:lock', 'KeyringController:unlock', 'AccountsController:accountAdded', 'AccountsController:accountRenamed', + 'NetworkController:networkRemoved', ], }), }); diff --git a/package.json b/package.json index c3b256940df1..65f4294e7c26 100644 --- a/package.json +++ b/package.json @@ -241,7 +241,8 @@ "@expo/config-plugins/glob": "^10.3.10", "@solana/web3.js/rpc-websockets": "^8.0.1", "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch", - "@metamask/network-controller@npm:^21.0.0": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch", + "@metamask/network-controller@npm:^21.0.0": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch", + "@metamask/network-controller@npm:^22.0.0": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch", "path-to-regexp": "1.9.0", "@ledgerhq/cryptoassets-evm-signatures/axios": "^0.28.0", "@ledgerhq/domain-service/axios": "^0.28.0", @@ -281,18 +282,18 @@ "@metamask-institutional/types": "^1.2.0", "@metamask/abi-utils": "^2.0.2", "@metamask/account-watcher": "^4.1.1", - "@metamask/accounts-controller": "^20.0.0", - "@metamask/address-book-controller": "^6.0.0", - "@metamask/announcement-controller": "^7.0.0", - "@metamask/approval-controller": "^7.0.0", - "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A45.1.0#~/.yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch", + "@metamask/accounts-controller": "^20.0.1", + "@metamask/address-book-controller": "^6.0.2", + "@metamask/announcement-controller": "^7.0.2", + "@metamask/approval-controller": "^7.0.4", + "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A45.1.1#~/.yarn/patches/@metamask-assets-controllers-npm-45.1.1-247f8b5019.patch", "@metamask/base-controller": "^7.0.0", "@metamask/bitcoin-wallet-snap": "^0.8.2", "@metamask/browser-passworder": "^4.3.0", "@metamask/contract-metadata": "^2.5.0", - "@metamask/controller-utils": "^11.4.0", + "@metamask/controller-utils": "^11.4.4", "@metamask/design-tokens": "^4.0.0", - "@metamask/ens-controller": "^15.0.0", + "@metamask/ens-controller": "^15.0.1", "@metamask/ens-resolver-snap": "^0.1.2", "@metamask/eth-json-rpc-filters": "^9.0.0", "@metamask/eth-json-rpc-middleware": "^15.0.0", @@ -306,38 +307,38 @@ "@metamask/ethjs": "^0.6.0", "@metamask/ethjs-contract": "^0.4.1", "@metamask/ethjs-query": "^0.7.1", - "@metamask/gas-fee-controller": "^22.0.1", + "@metamask/gas-fee-controller": "^22.0.2", "@metamask/jazzicon": "^2.0.0", "@metamask/json-rpc-engine": "^10.0.0", "@metamask/json-rpc-middleware-stream": "^8.0.4", "@metamask/keyring-api": "^10.1.0", - "@metamask/keyring-controller": "^19.0.0", - "@metamask/logging-controller": "^6.0.0", + "@metamask/keyring-controller": "^19.0.1", + "@metamask/logging-controller": "^6.0.3", "@metamask/logo": "^3.1.2", "@metamask/message-manager": "^11.0.0", "@metamask/message-signing-snap": "^0.4.0", "@metamask/metamask-eth-abis": "^3.1.1", - "@metamask/name-controller": "^8.0.0", - "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch", - "@metamask/notification-services-controller": "^0.14.0", + "@metamask/name-controller": "^8.0.2", + "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch", + "@metamask/notification-services-controller": "^0.15.0", "@metamask/object-multiplex": "^2.0.0", "@metamask/obs-store": "^9.0.0", - "@metamask/permission-controller": "^11.0.0", - "@metamask/permission-log-controller": "^3.0.1", - "@metamask/phishing-controller": "^12.3.0", - "@metamask/polling-controller": "^12.0.1", + "@metamask/permission-controller": "^11.0.4", + "@metamask/permission-log-controller": "^3.0.2", + "@metamask/phishing-controller": "^12.3.1", + "@metamask/polling-controller": "^12.0.2", "@metamask/post-message-stream": "^8.0.0", "@metamask/ppom-validator": "0.35.1", "@metamask/preinstalled-example-snap": "^0.2.0", - "@metamask/profile-sync-controller": "^2.0.0", + "@metamask/profile-sync-controller": "^3.0.0", "@metamask/providers": "^18.2.0", - "@metamask/queued-request-controller": "^7.0.1", + "@metamask/queued-request-controller": "^8.0.1", "@metamask/rate-limit-controller": "^6.0.0", "@metamask/rpc-errors": "^7.0.0", "@metamask/safe-event-emitter": "^3.1.1", "@metamask/scure-bip39": "^2.0.3", "@metamask/selected-network-controller": "^19.0.0", - "@metamask/signature-controller": "^23.0.0", + "@metamask/signature-controller": "^23.0.1", "@metamask/smart-transactions-controller": "^15.0.0", "@metamask/snaps-controllers": "^9.14.0", "@metamask/snaps-execution-environments": "^6.10.0", @@ -345,8 +346,8 @@ "@metamask/snaps-sdk": "^6.12.0", "@metamask/snaps-utils": "^8.6.0", "@metamask/solana-wallet-snap": "^0.1.9", - "@metamask/transaction-controller": "^41.0.0", - "@metamask/user-operation-controller": "^19.0.0", + "@metamask/transaction-controller": "^41.1.0", + "@metamask/user-operation-controller": "^20.0.1", "@metamask/utils": "^10.0.1", "@ngraveio/bc-ur": "^1.1.12", "@noble/hashes": "^1.3.3", @@ -465,7 +466,7 @@ "@metamask/eth-json-rpc-provider": "^4.1.6", "@metamask/forwarder": "^1.1.0", "@metamask/phishing-warning": "^4.1.0", - "@metamask/preferences-controller": "^14.0.0", + "@metamask/preferences-controller": "^15.0.1", "@metamask/test-bundler": "^1.0.0", "@metamask/test-dapp": "8.13.0", "@octokit/core": "^3.6.0", diff --git a/yarn.lock b/yarn.lock index 3963e3ad2ba4..9f4bd51cd8e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4850,9 +4850,9 @@ __metadata: languageName: node linkType: hard -"@metamask/accounts-controller@npm:^20.0.0": - version: 20.0.0 - resolution: "@metamask/accounts-controller@npm:20.0.0" +"@metamask/accounts-controller@npm:^20.0.1": + version: 20.0.1 + resolution: "@metamask/accounts-controller@npm:20.0.1" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@metamask/base-controller": "npm:^7.0.2" @@ -4867,28 +4867,30 @@ __metadata: uuid: "npm:^8.3.2" peerDependencies: "@metamask/keyring-controller": ^19.0.0 + "@metamask/providers": ^18.1.0 "@metamask/snaps-controllers": ^9.7.0 - checksum: 10/36f42d5d7db47c15eef4a7b72d8b19bcd08579a26db452974e76b527e47ef71e63bea47a4f1992fd2eadce44be4020f596dc7049f59766d6aa1b857c4518664f + webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 + checksum: 10/1a7820ec2c8535da2f8a4c95462b6a26b9b7c57329146669fc632a75b8c69baeb9bf0ca25ee8484c2dca1258c1a6ecad06597b8faa864e3daa8fead3da85a72d languageName: node linkType: hard -"@metamask/address-book-controller@npm:^6.0.0": - version: 6.0.0 - resolution: "@metamask/address-book-controller@npm:6.0.0" +"@metamask/address-book-controller@npm:^6.0.2": + version: 6.0.2 + resolution: "@metamask/address-book-controller@npm:6.0.2" dependencies: - "@metamask/base-controller": "npm:^7.0.0" - "@metamask/controller-utils": "npm:^11.2.0" - "@metamask/utils": "npm:^9.1.0" - checksum: 10/e699b97fc798a363390d673b766737dc10f82a1eefcf119823d8f4370846d6708b3b2eadd177c8b2cb826afa7e38b51cf978a0d55cd51e92e7a9ffe83f5f0803 + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.4" + "@metamask/utils": "npm:^10.0.0" + checksum: 10/5b80b11f904aa2fa5962610382670f5bc220ebb6696dc409e93d747a78fe2d22223986b036137fa5a2d170d4899fd66c26ba0afdde3760a4b75b950de609685e languageName: node linkType: hard -"@metamask/announcement-controller@npm:^7.0.0": - version: 7.0.0 - resolution: "@metamask/announcement-controller@npm:7.0.0" +"@metamask/announcement-controller@npm:^7.0.2": + version: 7.0.2 + resolution: "@metamask/announcement-controller@npm:7.0.2" dependencies: - "@metamask/base-controller": "npm:^6.0.0" - checksum: 10/0f8c9112a6514fd2dc4c135d1ab0445f627451d0583ef2eb92f52f133a448fd97b67d5aa615b7409f4380a01590546376ccc6b728d94cf32a4b62686e18c0a4d + "@metamask/base-controller": "npm:^7.0.2" + checksum: 10/1d6e4abf49970564348f481fdc188925f9c283a223235fe9bb6d9dfad0028b9f6e3f0f136a27fbdef3ebc617d84c9a7a56a4b411069e1e23377067fd4ff909fa languageName: node linkType: hard @@ -4899,7 +4901,7 @@ __metadata: languageName: node linkType: hard -"@metamask/approval-controller@npm:^7.0.0, @metamask/approval-controller@npm:^7.1.1": +"@metamask/approval-controller@npm:^7.0.4, @metamask/approval-controller@npm:^7.1.1": version: 7.1.1 resolution: "@metamask/approval-controller@npm:7.1.1" dependencies: @@ -4911,9 +4913,9 @@ __metadata: languageName: node linkType: hard -"@metamask/assets-controllers@npm:45.1.0": - version: 45.1.0 - resolution: "@metamask/assets-controllers@npm:45.1.0" +"@metamask/assets-controllers@npm:45.1.1": + version: 45.1.1 + resolution: "@metamask/assets-controllers@npm:45.1.1" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@ethersproject/abi": "npm:^5.7.0" @@ -4924,10 +4926,10 @@ __metadata: "@metamask/abi-utils": "npm:^2.0.3" "@metamask/base-controller": "npm:^7.0.2" "@metamask/contract-metadata": "npm:^2.4.0" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-query": "npm:^4.0.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/polling-controller": "npm:^12.0.1" + "@metamask/polling-controller": "npm:^12.0.2" "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" @@ -4946,13 +4948,15 @@ __metadata: "@metamask/keyring-controller": ^19.0.0 "@metamask/network-controller": ^22.0.0 "@metamask/preferences-controller": ^15.0.0 - checksum: 10/7e366739c2b3fc8000aaa8cd302d3e2c3958e29e7c88f3e7e188c4ec46454cf9e894c1e230a84092bba8e6c5274b301dfdb4e55a0ba4322bdcb9e7325ad5a5e5 + "@metamask/providers": ^18.1.0 + webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 + checksum: 10/68619a1884cdb8a510d94c60913465809a9cc52ab8188fd1fff4b4dc7635b7566e3fae84de8520939d450f73169987fdc09cb7990b1f7a34102c07660469b94b languageName: node linkType: hard -"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A45.1.0#~/.yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch": - version: 45.1.0 - resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A45.1.0#~/.yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch::version=45.1.0&hash=cfcadc" +"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A45.1.1#~/.yarn/patches/@metamask-assets-controllers-npm-45.1.1-247f8b5019.patch": + version: 45.1.1 + resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A45.1.1#~/.yarn/patches/@metamask-assets-controllers-npm-45.1.1-247f8b5019.patch::version=45.1.1&hash=b8da7c" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@ethersproject/abi": "npm:^5.7.0" @@ -4963,10 +4967,10 @@ __metadata: "@metamask/abi-utils": "npm:^2.0.3" "@metamask/base-controller": "npm:^7.0.2" "@metamask/contract-metadata": "npm:^2.4.0" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-query": "npm:^4.0.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/polling-controller": "npm:^12.0.1" + "@metamask/polling-controller": "npm:^12.0.2" "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" @@ -4985,7 +4989,9 @@ __metadata: "@metamask/keyring-controller": ^19.0.0 "@metamask/network-controller": ^22.0.0 "@metamask/preferences-controller": ^15.0.0 - checksum: 10/d2f7d5bb07feceb5b972beda019f411cd073ece3ed682b21373fc6d4c06812ec10245b40c78ce6316c5fb1718278fd269b73e13d37c2ff07b5bb3ecdfd8278f7 + "@metamask/providers": ^18.1.0 + webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 + checksum: 10/39e47939062571123e2a9151633879baea4f679ad5f13cee7c670c2ef04c0f41b098be88804143571e0d4cb9ca2f5c4fb6ab64d467fff476b83c388a3d7740d4 languageName: node linkType: hard @@ -5056,7 +5062,7 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1, @metamask/controller-utils@npm:^11.4.2, @metamask/controller-utils@npm:^11.4.3": +"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1, @metamask/controller-utils@npm:^11.4.2": version: 11.4.3 resolution: "@metamask/controller-utils@npm:11.4.3" dependencies: @@ -5074,6 +5080,26 @@ __metadata: languageName: node linkType: hard +"@metamask/controller-utils@npm:^11.4.4": + version: 11.4.4 + resolution: "@metamask/controller-utils@npm:11.4.4" + dependencies: + "@ethereumjs/util": "npm:^8.1.0" + "@metamask/eth-query": "npm:^4.0.0" + "@metamask/ethjs-unit": "npm:^0.3.0" + "@metamask/utils": "npm:^10.0.0" + "@spruceid/siwe-parser": "npm:2.1.0" + "@types/bn.js": "npm:^5.1.5" + bignumber.js: "npm:^9.1.2" + bn.js: "npm:^5.2.1" + eth-ens-namehash: "npm:^2.0.8" + fast-deep-equal: "npm:^3.1.3" + peerDependencies: + "@babel/runtime": ^7.0.0 + checksum: 10/0833800d4733f52fbf232efedc97ce66603430fd20ec10e71e6dc4c23295b3b59cc3c8109b86b8039b9ae0c0d2428815428924c367b88f9ea6013152a86d862b + languageName: node + linkType: hard + "@metamask/design-tokens@npm:^4.0.0": version: 4.0.0 resolution: "@metamask/design-tokens@npm:4.0.0" @@ -5081,18 +5107,18 @@ __metadata: languageName: node linkType: hard -"@metamask/ens-controller@npm:^15.0.0": - version: 15.0.0 - resolution: "@metamask/ens-controller@npm:15.0.0" +"@metamask/ens-controller@npm:^15.0.1": + version: 15.0.1 + resolution: "@metamask/ens-controller@npm:15.0.1" dependencies: "@ethersproject/providers": "npm:^5.7.0" - "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.4.0" + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/utils": "npm:^10.0.0" punycode: "npm:^2.1.1" peerDependencies: "@metamask/network-controller": ^22.0.0 - checksum: 10/e61a3e469802689c73821faf8c9fce3efee9e52156d07da8afa674f973787a77fb39bc3faad53fe054644a9e4489f7c5ec67e00ce80c6062ce97f68dee20076e + checksum: 10/a1597183ef9076f236dae67b25b59ba3caa0a960432ac36587e3412b3912a9bab90b15f8552199b340bbebe1d8a99a13b942ae3de0baca9bc84815e6dbe195ea languageName: node linkType: hard @@ -5517,23 +5543,24 @@ __metadata: languageName: node linkType: hard -"@metamask/gas-fee-controller@npm:^22.0.1": - version: 22.0.1 - resolution: "@metamask/gas-fee-controller@npm:22.0.1" +"@metamask/gas-fee-controller@npm:^22.0.2": + version: 22.0.2 + resolution: "@metamask/gas-fee-controller@npm:22.0.2" dependencies: "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-unit": "npm:^0.3.0" - "@metamask/polling-controller": "npm:^12.0.1" + "@metamask/polling-controller": "npm:^12.0.2" "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" "@types/uuid": "npm:^8.3.0" bn.js: "npm:^5.2.1" uuid: "npm:^8.3.2" peerDependencies: + "@babel/runtime": ^7.0.0 "@metamask/network-controller": ^22.0.0 - checksum: 10/c52d4bb6359824198fe3169114a685fd8f881feb580eb7b9c9c1ba383e02664f0e7d65e9fcbb0ec1508acb55bd3b273b28b516ad134e9a273b00ed562b771140 + checksum: 10/5acf2871c54be1c3bfaa91e314c90b813e095cf7b66d72e52fcb5eb1c45af5b58d5c402b3020dd11f484c2165042e33deb4f8780443ece63526122fb95d10340 languageName: node linkType: hard @@ -5558,17 +5585,6 @@ __metadata: languageName: node linkType: hard -"@metamask/json-rpc-engine@npm:^9.0.3": - version: 9.0.3 - resolution: "@metamask/json-rpc-engine@npm:9.0.3" - dependencies: - "@metamask/rpc-errors": "npm:^6.3.1" - "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^9.1.0" - checksum: 10/23a3cafb5869f6d5867105e3570ac4e214a72dda0b4b428cde6bae8856ec838c822b174f8cea054108122531d662cf93a65e92e1ee07da0485d5d0c0e5a1fca6 - languageName: node - linkType: hard - "@metamask/json-rpc-middleware-stream@npm:^8.0.4, @metamask/json-rpc-middleware-stream@npm:^8.0.5": version: 8.0.5 resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.5" @@ -5644,9 +5660,9 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-controller@npm:^19.0.0": - version: 19.0.0 - resolution: "@metamask/keyring-controller@npm:19.0.0" +"@metamask/keyring-controller@npm:^19.0.1": + version: 19.0.1 + resolution: "@metamask/keyring-controller@npm:19.0.1" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@keystonehq/metamask-airgapped-keyring": "npm:^0.14.1" @@ -5656,23 +5672,26 @@ __metadata: "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/eth-simple-keyring": "npm:^6.0.5" "@metamask/keyring-api": "npm:^10.1.0" - "@metamask/message-manager": "npm:^11.0.1" + "@metamask/message-manager": "npm:^11.0.2" "@metamask/utils": "npm:^10.0.0" async-mutex: "npm:^0.5.0" ethereumjs-wallet: "npm:^1.0.1" immer: "npm:^9.0.6" - checksum: 10/4614b53f9dd053edcc470e1d949a57ee5982b544c3ea9c6635b6a2d40fef5f2bd606aa8a45d3a5c519e93dc60c45ba5a5efafefb2c9843c85522477335d208a2 + peerDependencies: + "@metamask/providers": ^18.1.0 + webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 + checksum: 10/09aa13bbb7d85b155122763d12a8fd409d4ebe9612093b2c303da8077ecdbeb32d93acc32db2f29911e8dcbc35fb17463b0e467cf5795f019798b9466de009a2 languageName: node linkType: hard -"@metamask/logging-controller@npm:^6.0.0": - version: 6.0.0 - resolution: "@metamask/logging-controller@npm:6.0.0" +"@metamask/logging-controller@npm:^6.0.3": + version: 6.0.3 + resolution: "@metamask/logging-controller@npm:6.0.3" dependencies: - "@metamask/base-controller": "npm:^7.0.0" - "@metamask/controller-utils": "npm:^11.1.0" + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.4" uuid: "npm:^8.3.2" - checksum: 10/945dd0a4ab30cba39f46dcd962fd49a7e6c044b953d6896a1c4240de4c8f05baffd24de90de4cd9a9c6ab6e425db0a301b992091280916b8598d8411e1a91868 + checksum: 10/2e50f1e36f38244f72268b4ffbeab9790d8798273c8da47af68287dab593c72e08826f87b6e326d31dca519a6f14884b4998b1f689f1e5ed72920d4530b0a07c languageName: node linkType: hard @@ -5686,7 +5705,7 @@ __metadata: languageName: node linkType: hard -"@metamask/message-manager@npm:^11.0.0, @metamask/message-manager@npm:^11.0.1": +"@metamask/message-manager@npm:^11.0.0": version: 11.0.1 resolution: "@metamask/message-manager@npm:11.0.1" dependencies: @@ -5701,6 +5720,21 @@ __metadata: languageName: node linkType: hard +"@metamask/message-manager@npm:^11.0.2": + version: 11.0.2 + resolution: "@metamask/message-manager@npm:11.0.2" + dependencies: + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.4" + "@metamask/eth-sig-util": "npm:^8.0.0" + "@metamask/utils": "npm:^10.0.0" + "@types/uuid": "npm:^8.3.0" + jsonschema: "npm:^1.2.4" + uuid: "npm:^8.3.2" + checksum: 10/a1e324645944c61a3a677603f0478e316a6c76924c672fb6bf526d67a3c52ec95654403e8693e2e5873e4762a57d73adcb4106557afeecd6d8e7593ce8db217c + languageName: node + linkType: hard + "@metamask/message-signing-snap@npm:^0.4.0": version: 0.4.0 resolution: "@metamask/message-signing-snap@npm:0.4.0" @@ -5723,24 +5757,24 @@ __metadata: languageName: node linkType: hard -"@metamask/name-controller@npm:^8.0.0": - version: 8.0.0 - resolution: "@metamask/name-controller@npm:8.0.0" +"@metamask/name-controller@npm:^8.0.2": + version: 8.0.2 + resolution: "@metamask/name-controller@npm:8.0.2" dependencies: - "@metamask/base-controller": "npm:^6.0.0" - "@metamask/controller-utils": "npm:^11.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.4" + "@metamask/utils": "npm:^10.0.0" async-mutex: "npm:^0.5.0" - checksum: 10/c467c31a8a6d651b10bda62a24883356b0ebc9dfd56dbd550dc88c75fbd209be68d7f2dc0f85885db13b9af011d59ac67104b19d327fb4460599e4f182903f9b + checksum: 10/5b8c5dbc96e6d5e9d378f3f5ef5ef8561b083cd79c46e07654d714e4632a392478136603e0e55ddade06fb462c684ca55d46886b6e00f16142dfccaa52fe61e0 languageName: node linkType: hard -"@metamask/network-controller@npm:22.0.2, @metamask/network-controller@npm:^22.0.2": - version: 22.0.2 - resolution: "@metamask/network-controller@npm:22.0.2" +"@metamask/network-controller@npm:22.1.0, @metamask/network-controller@npm:^22.1.0": + version: 22.1.0 + resolution: "@metamask/network-controller@npm:22.1.0" dependencies: "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-block-tracker": "npm:^11.0.2" "@metamask/eth-json-rpc-infura": "npm:^10.0.0" "@metamask/eth-json-rpc-middleware": "npm:^15.0.0" @@ -5751,21 +5785,22 @@ __metadata: "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^10.0.0" async-mutex: "npm:^0.5.0" + fast-deep-equal: "npm:^3.1.3" immer: "npm:^9.0.6" loglevel: "npm:^1.8.1" reselect: "npm:^5.1.1" uri-js: "npm:^4.4.1" uuid: "npm:^8.3.2" - checksum: 10/9da27189a4263ef7fa4596ada2000d7f944bc3f4dea63a77cf6f8b2ea89412d499068cf0542785088d19437263bd0b3b3bb3299533f87439729ccd8ecee2b625 + checksum: 10/587ad3eba45e898d83a06c800c1649c1dc1ae708c53114a2e8a82bb18fc3773eaca2abc9b8f2afd46106aa96e22a28e79d2d5bd620d9de1606e5180b5a8996df languageName: node linkType: hard -"@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch": - version: 22.0.2 - resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch::version=22.0.2&hash=5eb093" +"@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch": + version: 22.1.0 + resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch::version=22.1.0&hash=93e992" dependencies: "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-block-tracker": "npm:^11.0.2" "@metamask/eth-json-rpc-infura": "npm:^10.0.0" "@metamask/eth-json-rpc-middleware": "npm:^15.0.0" @@ -5776,12 +5811,13 @@ __metadata: "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^10.0.0" async-mutex: "npm:^0.5.0" + fast-deep-equal: "npm:^3.1.3" immer: "npm:^9.0.6" loglevel: "npm:^1.8.1" reselect: "npm:^5.1.1" uri-js: "npm:^4.4.1" uuid: "npm:^8.3.2" - checksum: 10/2daf9a8e1c35608e720b4bb611d84a90da58881c5b7483894dd18fc9850ceb144646314cef32c80889ac1fb71f37ed333d06e837bdb3daa0a234bc2c3af1e2dd + checksum: 10/21427a6bc57fa318dadd223342d3eda07c077705ef641c3448fb4dc438fb9f87e730e0bd5f7c9fc3f785bfce87c6a52f9b4ae5e17d933ecb5792e0bdc5ea4746 languageName: node linkType: hard @@ -5797,13 +5833,13 @@ __metadata: languageName: node linkType: hard -"@metamask/notification-services-controller@npm:^0.14.0": - version: 0.14.0 - resolution: "@metamask/notification-services-controller@npm:0.14.0" +"@metamask/notification-services-controller@npm:^0.15.0": + version: 0.15.0 + resolution: "@metamask/notification-services-controller@npm:0.15.0" dependencies: "@contentful/rich-text-html-renderer": "npm:^16.5.2" "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/utils": "npm:^10.0.0" bignumber.js: "npm:^9.1.2" firebase: "npm:^10.11.0" @@ -5811,8 +5847,8 @@ __metadata: uuid: "npm:^8.3.2" peerDependencies: "@metamask/keyring-controller": ^19.0.0 - "@metamask/profile-sync-controller": ^2.0.0 - checksum: 10/9cc467eb0d5f3ece77c77480d301fe7322545b4826b06c3a15345376ad77923f79155d3276febe044f46d3d91166ca67660f23dc486ce24fce6727e42f35b78a + "@metamask/profile-sync-controller": ^3.0.0 + checksum: 10/03df3672d059e6a678855a61d324d5a2671b2a7e17c384f4208304009b52663c6b5ffbf780d2d6389bfad6e395d426c91862163fdd1445372e31ea8bfe2fe592 languageName: node linkType: hard @@ -5846,7 +5882,7 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-controller@npm:^11.0.0, @metamask/permission-controller@npm:^11.0.3": +"@metamask/permission-controller@npm:^11.0.3": version: 11.0.3 resolution: "@metamask/permission-controller@npm:11.0.3" dependencies: @@ -5865,18 +5901,37 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-log-controller@npm:^3.0.1": - version: 3.0.1 - resolution: "@metamask/permission-log-controller@npm:3.0.1" +"@metamask/permission-controller@npm:^11.0.4": + version: 11.0.4 + resolution: "@metamask/permission-controller@npm:11.0.4" dependencies: - "@metamask/base-controller": "npm:^7.0.1" - "@metamask/json-rpc-engine": "npm:^9.0.3" - "@metamask/utils": "npm:^9.1.0" - checksum: 10/90ca40c0c3da705db907ad9c6d1ffaf2ad3ca080313b9d114c1b449635f774d0781a1d9505c607b63c219e5fd3d1fe20c973cf0c7bcc038735a84275d01110a4 + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.4" + "@metamask/json-rpc-engine": "npm:^10.0.1" + "@metamask/rpc-errors": "npm:^7.0.1" + "@metamask/utils": "npm:^10.0.0" + "@types/deep-freeze-strict": "npm:^1.1.0" + deep-freeze-strict: "npm:^1.1.1" + immer: "npm:^9.0.6" + nanoid: "npm:^3.1.31" + peerDependencies: + "@metamask/approval-controller": ^7.0.0 + checksum: 10/89bc5c3ffbcddca8cd3a8fa1e73d4196544223b59f69ece549f7459198960e8068fd96412ee3b28353b2a53ea38d8c370bd14df937aebddceed6a87cb5652f8c languageName: node linkType: hard -"@metamask/phishing-controller@npm:^12.0.2, @metamask/phishing-controller@npm:^12.3.0": +"@metamask/permission-log-controller@npm:^3.0.2": + version: 3.0.2 + resolution: "@metamask/permission-log-controller@npm:3.0.2" + dependencies: + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/json-rpc-engine": "npm:^10.0.1" + "@metamask/utils": "npm:^10.0.0" + checksum: 10/09fe61b9a94ea9882d8fd3b3595850fd4ac91a8e0a4676de3c40bcc359b06c379109e6da6f521070f7881403dc66957b1c6c4f18639b33cb19cc7af02bb04917 + languageName: node + linkType: hard + +"@metamask/phishing-controller@npm:^12.0.2": version: 12.3.0 resolution: "@metamask/phishing-controller@npm:12.3.0" dependencies: @@ -5891,6 +5946,21 @@ __metadata: languageName: node linkType: hard +"@metamask/phishing-controller@npm:^12.3.1": + version: 12.3.1 + resolution: "@metamask/phishing-controller@npm:12.3.1" + dependencies: + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.4" + "@noble/hashes": "npm:^1.4.0" + "@types/punycode": "npm:^2.1.0" + ethereum-cryptography: "npm:^2.1.2" + fastest-levenshtein: "npm:^1.0.16" + punycode: "npm:^2.1.1" + checksum: 10/b8060e7277239ea5ebeddb7589e26b7fb49114b8dc4b48e72393ea0efae28ff3eff17160585429ef33e9022ea146637c78b7cea6d927d62708dfdc0c0c544d5d + languageName: node + linkType: hard + "@metamask/phishing-warning@npm:^4.1.0": version: 4.1.0 resolution: "@metamask/phishing-warning@npm:4.1.0" @@ -5906,7 +5976,7 @@ __metadata: languageName: node linkType: hard -"@metamask/polling-controller@npm:^12.0.0, @metamask/polling-controller@npm:^12.0.1": +"@metamask/polling-controller@npm:^12.0.0": version: 12.0.1 resolution: "@metamask/polling-controller@npm:12.0.1" dependencies: @@ -5922,6 +5992,22 @@ __metadata: languageName: node linkType: hard +"@metamask/polling-controller@npm:^12.0.2": + version: 12.0.2 + resolution: "@metamask/polling-controller@npm:12.0.2" + dependencies: + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/controller-utils": "npm:^11.4.4" + "@metamask/utils": "npm:^10.0.0" + "@types/uuid": "npm:^8.3.0" + fast-json-stable-stringify: "npm:^2.1.0" + uuid: "npm:^8.3.2" + peerDependencies: + "@metamask/network-controller": ^22.0.0 + checksum: 10/15bb6c087b506e15474d4d3555a37a540389c47674ac14052f7877bbf2be29e3bf78f2ea34a10d1ed21696bc0f45525cb2916e020a1b87e74ad695cb98ae4a94 + languageName: node + linkType: hard + "@metamask/post-message-stream@npm:^8.0.0, @metamask/post-message-stream@npm:^8.1.1": version: 8.1.1 resolution: "@metamask/post-message-stream@npm:8.1.1" @@ -5950,15 +6036,15 @@ __metadata: languageName: node linkType: hard -"@metamask/preferences-controller@npm:^14.0.0": - version: 14.0.0 - resolution: "@metamask/preferences-controller@npm:14.0.0" +"@metamask/preferences-controller@npm:^15.0.1": + version: 15.0.1 + resolution: "@metamask/preferences-controller@npm:15.0.1" dependencies: "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" peerDependencies: - "@metamask/keyring-controller": ^18.0.0 - checksum: 10/cc1fdfe4dc6f4c058c518b59f13b7badd0de92e04e143aec6787be3a8807364d545dcb26172dd005e0d6865b06614b963385f0863a3e2a04d234bd6d33474942 + "@metamask/keyring-controller": ^19.0.0 + checksum: 10/d31d998e3778f108787115cec73a8ad2a455b50c0f80b386f39287e9799e36ec49554e0071aca505039ab982df42ce7db0af50b8e26bcb34926beab9ba54578d languageName: node linkType: hard @@ -5971,14 +6057,14 @@ __metadata: languageName: node linkType: hard -"@metamask/profile-sync-controller@npm:^2.0.0": - version: 2.0.0 - resolution: "@metamask/profile-sync-controller@npm:2.0.0" +"@metamask/profile-sync-controller@npm:^3.0.0": + version: 3.0.0 + resolution: "@metamask/profile-sync-controller@npm:3.0.0" dependencies: "@metamask/base-controller": "npm:^7.0.2" "@metamask/keyring-api": "npm:^10.1.0" - "@metamask/keyring-controller": "npm:^19.0.0" - "@metamask/network-controller": "npm:^22.0.2" + "@metamask/keyring-controller": "npm:^19.0.1" + "@metamask/network-controller": "npm:^22.1.0" "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/snaps-utils": "npm:^8.3.0" "@noble/ciphers": "npm:^0.5.2" @@ -5990,8 +6076,10 @@ __metadata: "@metamask/accounts-controller": ^20.0.0 "@metamask/keyring-controller": ^19.0.0 "@metamask/network-controller": ^22.0.0 + "@metamask/providers": ^18.1.0 "@metamask/snaps-controllers": ^9.10.0 - checksum: 10/72c3cb3ea4148960c7eb4615a10f0f508fda285e6786906f2b0d95cfaca624425973bce47e5478c86de0f9ad3cb44a9637bbe3d9e43e4d75fe6d867d63aa0342 + webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 + checksum: 10/5329492b4fd92801807e1c657c8ec9e8822d9ab32feba8d23714f8f0e88dffddc860c600a2c5f7a48f6ee358cdf536e2f39a6659f6ab68a8fee579ccf24da57a languageName: node linkType: hard @@ -6016,20 +6104,20 @@ __metadata: languageName: node linkType: hard -"@metamask/queued-request-controller@npm:^7.0.1": - version: 7.0.1 - resolution: "@metamask/queued-request-controller@npm:7.0.1" +"@metamask/queued-request-controller@npm:^8.0.1": + version: 8.0.1 + resolution: "@metamask/queued-request-controller@npm:8.0.1" dependencies: "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.2" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/json-rpc-engine": "npm:^10.0.1" "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^10.0.0" peerDependencies: "@metamask/network-controller": ^22.0.0 - "@metamask/selected-network-controller": ^19.0.0 - checksum: 10/e5b16b3dc2fa0dcf74a81b5046abb65bc05da3802ee891b5a59a80b980301c790cf949d72adba00ead6f5b3d2eaac40694308297f7dc08eb5e5f05b5a68bbf57 + "@metamask/selected-network-controller": ^20.0.0 + checksum: 10/189c484af925397a506b304bd351cdca3759fe2cd893ad7c4c687d759416b1aa47aba91af40b6523401e0be05b4cef2ea1a8164980f15b4a7ee41930df0d0599 languageName: node linkType: hard @@ -6044,7 +6132,7 @@ __metadata: languageName: node linkType: hard -"@metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0, @metamask/rpc-errors@npm:^6.3.1": +"@metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.0": version: 6.4.0 resolution: "@metamask/rpc-errors@npm:6.4.0" dependencies: @@ -6096,12 +6184,12 @@ __metadata: languageName: node linkType: hard -"@metamask/signature-controller@npm:^23.0.0": - version: 23.0.0 - resolution: "@metamask/signature-controller@npm:23.0.0" +"@metamask/signature-controller@npm:^23.0.1": + version: 23.0.1 + resolution: "@metamask/signature-controller@npm:23.0.1" dependencies: "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/utils": "npm:^10.0.0" jsonschema: "npm:^1.2.4" @@ -6112,7 +6200,7 @@ __metadata: "@metamask/keyring-controller": ^19.0.0 "@metamask/logging-controller": ^6.0.0 "@metamask/network-controller": ^22.0.0 - checksum: 10/5e2fda2d89dd3433f00028da0fa7743a6934b72f33fc0e4803dafa98702b9bdd9d093a326060d5480e6eb065c6b4cc1dc3e39382c00702f28b5a6061e8f105bf + checksum: 10/9281b66a4bf18e9f06c350c1298730dddef8a918649ce0d41d01c1a8655345c2b5d07db1c51ca33b0c39a3509768aba5b325ab7add350a74fda4d36067427552 languageName: node linkType: hard @@ -6336,9 +6424,9 @@ __metadata: languageName: node linkType: hard -"@metamask/transaction-controller@npm:^41.0.0": - version: 41.0.0 - resolution: "@metamask/transaction-controller@npm:41.0.0" +"@metamask/transaction-controller@npm:^41.1.0": + version: 41.1.0 + resolution: "@metamask/transaction-controller@npm:41.1.0" dependencies: "@ethereumjs/common": "npm:^3.2.0" "@ethereumjs/tx": "npm:^4.2.0" @@ -6347,7 +6435,7 @@ __metadata: "@ethersproject/contracts": "npm:^5.7.0" "@ethersproject/providers": "npm:^5.7.0" "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-query": "npm:^4.0.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/nonce-tracker": "npm:^6.0.0" @@ -6360,23 +6448,24 @@ __metadata: lodash: "npm:^4.17.21" uuid: "npm:^8.3.2" peerDependencies: - "@babel/runtime": ^7.23.9 + "@babel/runtime": ^7.0.0 "@metamask/accounts-controller": ^20.0.0 "@metamask/approval-controller": ^7.0.0 + "@metamask/eth-block-tracker": ">=9" "@metamask/gas-fee-controller": ^22.0.0 "@metamask/network-controller": ^22.0.0 - checksum: 10/67a00b2eade35fc4e635a6bcbbcd847b3986b3bdcc9730ff2c8f81234df18ed11149203c13d6bad616e859f7e25879efab36b6dc4be05a4e747b4280ae2f300d + checksum: 10/254a46b29559dc8e8faacdd164f1cbf3387296321ae2a1d8cb953717c28e8ec0532f7507e79c19ebb498bd5ff1fd979c9526cc9e3dadaca857a6707fa60b29e2 languageName: node linkType: hard -"@metamask/user-operation-controller@npm:^19.0.0": - version: 19.0.0 - resolution: "@metamask/user-operation-controller@npm:19.0.0" +"@metamask/user-operation-controller@npm:^20.0.1": + version: 20.0.1 + resolution: "@metamask/user-operation-controller@npm:20.0.1" dependencies: "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.3" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-query": "npm:^4.0.0" - "@metamask/polling-controller": "npm:^12.0.1" + "@metamask/polling-controller": "npm:^12.0.2" "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^10.0.0" @@ -6386,11 +6475,12 @@ __metadata: uuid: "npm:^8.3.2" peerDependencies: "@metamask/approval-controller": ^7.0.0 + "@metamask/eth-block-tracker": ">=9" "@metamask/gas-fee-controller": ^22.0.0 "@metamask/keyring-controller": ^19.0.0 "@metamask/network-controller": ^22.0.0 - "@metamask/transaction-controller": ^40.0.0 - checksum: 10/ca3d8ee77243eb3bdc455420185d5c41d45cb5520735af0b05c1792d66fdb6a7404c557b053b16b6fded57124da21c3bb0b6b1c943d290e9808164f05453a8d9 + "@metamask/transaction-controller": ^41.0.0 + checksum: 10/a241dbe783d5666521401b09e052ac485842f9e17c08aa5644ef1b01d2cfc5ac27943c7db96037429ddbc65bab594202121c3caff692a67f85d5add74ae0630d languageName: node linkType: hard @@ -26392,21 +26482,21 @@ __metadata: "@metamask-institutional/types": "npm:^1.2.0" "@metamask/abi-utils": "npm:^2.0.2" "@metamask/account-watcher": "npm:^4.1.1" - "@metamask/accounts-controller": "npm:^20.0.0" - "@metamask/address-book-controller": "npm:^6.0.0" - "@metamask/announcement-controller": "npm:^7.0.0" + "@metamask/accounts-controller": "npm:^20.0.1" + "@metamask/address-book-controller": "npm:^6.0.2" + "@metamask/announcement-controller": "npm:^7.0.2" "@metamask/api-specs": "npm:^0.9.3" - "@metamask/approval-controller": "npm:^7.0.0" - "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A45.1.0#~/.yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch" + "@metamask/approval-controller": "npm:^7.0.4" + "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A45.1.1#~/.yarn/patches/@metamask-assets-controllers-npm-45.1.1-247f8b5019.patch" "@metamask/auto-changelog": "npm:^2.1.0" "@metamask/base-controller": "npm:^7.0.0" "@metamask/bitcoin-wallet-snap": "npm:^0.8.2" "@metamask/browser-passworder": "npm:^4.3.0" "@metamask/build-utils": "npm:^3.0.0" "@metamask/contract-metadata": "npm:^2.5.0" - "@metamask/controller-utils": "npm:^11.4.0" + "@metamask/controller-utils": "npm:^11.4.4" "@metamask/design-tokens": "npm:^4.0.0" - "@metamask/ens-controller": "npm:^15.0.0" + "@metamask/ens-controller": "npm:^15.0.1" "@metamask/ens-resolver-snap": "npm:^0.1.2" "@metamask/eslint-config": "npm:^9.0.0" "@metamask/eslint-config-jest": "npm:^9.0.0" @@ -26428,40 +26518,40 @@ __metadata: "@metamask/ethjs-contract": "npm:^0.4.1" "@metamask/ethjs-query": "npm:^0.7.1" "@metamask/forwarder": "npm:^1.1.0" - "@metamask/gas-fee-controller": "npm:^22.0.1" + "@metamask/gas-fee-controller": "npm:^22.0.2" "@metamask/jazzicon": "npm:^2.0.0" "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/json-rpc-middleware-stream": "npm:^8.0.4" "@metamask/keyring-api": "npm:^10.1.0" - "@metamask/keyring-controller": "npm:^19.0.0" - "@metamask/logging-controller": "npm:^6.0.0" + "@metamask/keyring-controller": "npm:^19.0.1" + "@metamask/logging-controller": "npm:^6.0.3" "@metamask/logo": "npm:^3.1.2" "@metamask/message-manager": "npm:^11.0.0" "@metamask/message-signing-snap": "npm:^0.4.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/name-controller": "npm:^8.0.0" - "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.0.2#~/.yarn/patches/@metamask-network-controller-npm-22.0.2-6fc65c500a.patch" - "@metamask/notification-services-controller": "npm:^0.14.0" + "@metamask/name-controller": "npm:^8.0.2" + "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A22.1.0#~/.yarn/patches/@metamask-network-controller-npm-22.1.0-621c281f70.patch" + "@metamask/notification-services-controller": "npm:^0.15.0" "@metamask/object-multiplex": "npm:^2.0.0" "@metamask/obs-store": "npm:^9.0.0" - "@metamask/permission-controller": "npm:^11.0.0" - "@metamask/permission-log-controller": "npm:^3.0.1" - "@metamask/phishing-controller": "npm:^12.3.0" + "@metamask/permission-controller": "npm:^11.0.4" + "@metamask/permission-log-controller": "npm:^3.0.2" + "@metamask/phishing-controller": "npm:^12.3.1" "@metamask/phishing-warning": "npm:^4.1.0" - "@metamask/polling-controller": "npm:^12.0.1" + "@metamask/polling-controller": "npm:^12.0.2" "@metamask/post-message-stream": "npm:^8.0.0" "@metamask/ppom-validator": "npm:0.35.1" - "@metamask/preferences-controller": "npm:^14.0.0" + "@metamask/preferences-controller": "npm:^15.0.1" "@metamask/preinstalled-example-snap": "npm:^0.2.0" - "@metamask/profile-sync-controller": "npm:^2.0.0" + "@metamask/profile-sync-controller": "npm:^3.0.0" "@metamask/providers": "npm:^18.2.0" - "@metamask/queued-request-controller": "npm:^7.0.1" + "@metamask/queued-request-controller": "npm:^8.0.1" "@metamask/rate-limit-controller": "npm:^6.0.0" "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/safe-event-emitter": "npm:^3.1.1" "@metamask/scure-bip39": "npm:^2.0.3" "@metamask/selected-network-controller": "npm:^19.0.0" - "@metamask/signature-controller": "npm:^23.0.0" + "@metamask/signature-controller": "npm:^23.0.1" "@metamask/smart-transactions-controller": "npm:^15.0.0" "@metamask/snaps-controllers": "npm:^9.14.0" "@metamask/snaps-execution-environments": "npm:^6.10.0" @@ -26471,8 +26561,8 @@ __metadata: "@metamask/solana-wallet-snap": "npm:^0.1.9" "@metamask/test-bundler": "npm:^1.0.0" "@metamask/test-dapp": "npm:8.13.0" - "@metamask/transaction-controller": "npm:^41.0.0" - "@metamask/user-operation-controller": "npm:^19.0.0" + "@metamask/transaction-controller": "npm:^41.1.0" + "@metamask/user-operation-controller": "npm:^20.0.1" "@metamask/utils": "npm:^10.0.1" "@ngraveio/bc-ur": "npm:^1.1.12" "@noble/hashes": "npm:^1.3.3" From 8bf06b57f6c45febc87051fdd093ddf6c501cab6 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Tue, 3 Dec 2024 22:58:59 +0100 Subject: [PATCH 09/13] chore: add missing bump for selected-network-client --- package.json | 2 +- yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 0cb725eafa63..e45263e8c584 100644 --- a/package.json +++ b/package.json @@ -339,7 +339,7 @@ "@metamask/rpc-errors": "^7.0.0", "@metamask/safe-event-emitter": "^3.1.1", "@metamask/scure-bip39": "^2.0.3", - "@metamask/selected-network-controller": "^19.0.0", + "@metamask/selected-network-controller": "^20.0.1", "@metamask/signature-controller": "^23.0.1", "@metamask/smart-transactions-controller": "^15.0.0", "@metamask/snaps-controllers": "^9.14.0", diff --git a/yarn.lock b/yarn.lock index 5f51962718ef..a41394c05d78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6180,18 +6180,18 @@ __metadata: languageName: node linkType: hard -"@metamask/selected-network-controller@npm:^19.0.0": - version: 19.0.0 - resolution: "@metamask/selected-network-controller@npm:19.0.0" +"@metamask/selected-network-controller@npm:^20.0.1": + version: 20.0.1 + resolution: "@metamask/selected-network-controller@npm:20.0.1" dependencies: - "@metamask/base-controller": "npm:^7.0.1" - "@metamask/json-rpc-engine": "npm:^10.0.0" + "@metamask/base-controller": "npm:^7.0.2" + "@metamask/json-rpc-engine": "npm:^10.0.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^10.0.0" peerDependencies: "@metamask/network-controller": ^22.0.0 "@metamask/permission-controller": ^11.0.0 - checksum: 10/738a1c749f442b732c279c7446e0db2cc7d72fa03fd485da15121559077bb6ffeaa3233435a028f4ea69015a40ca35ba66972dc0fd3a7f61a7ea5eee43df30a6 + checksum: 10/3e99db1a7b2390624ac953bd7195e4010cf61e21f20a2c36449a6cca2abcfb5280b6c0e3ac3a365f8b6281ea7f115b19be95fb55ddfc4e37ba6a5a71089a75c9 languageName: node linkType: hard @@ -26562,7 +26562,7 @@ __metadata: "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/safe-event-emitter": "npm:^3.1.1" "@metamask/scure-bip39": "npm:^2.0.3" - "@metamask/selected-network-controller": "npm:^19.0.0" + "@metamask/selected-network-controller": "npm:^20.0.1" "@metamask/signature-controller": "npm:^23.0.1" "@metamask/smart-transactions-controller": "npm:^15.0.0" "@metamask/snaps-controllers": "npm:^9.14.0" From bd81360779b0addacbaf6c1e7257bc7e71ed8a0c Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Tue, 3 Dec 2024 22:00:27 +0000 Subject: [PATCH 10/13] Update LavaMoat policies --- lavamoat/browserify/beta/policy.json | 274 +++++++++++++++++++++----- lavamoat/browserify/flask/policy.json | 274 +++++++++++++++++++++----- lavamoat/browserify/main/policy.json | 274 +++++++++++++++++++++----- lavamoat/browserify/mmi/policy.json | 274 +++++++++++++++++++++----- 4 files changed, 888 insertions(+), 208 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 10eb2aa4e0e5..f061341afbe6 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -629,7 +629,7 @@ }, "@metamask/announcement-controller": { "packages": { - "@metamask/announcement-controller>@metamask/base-controller": true + "@metamask/base-controller": true } }, "@metamask/announcement-controller>@metamask/base-controller": { @@ -1625,13 +1625,31 @@ "@metamask/message-manager": { "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/message-manager>@metamask/controller-utils": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, + "@metamask/message-manager>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, "@metamask/message-manager>jsonschema": { "packages": { "browserify>url": true @@ -1663,33 +1681,10 @@ "fetch": true }, "packages": { + "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/name-controller>@metamask/base-controller": true, - "@metamask/name-controller>@metamask/utils": true, - "@metamask/name-controller>async-mutex": true - } - }, - "@metamask/name-controller>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, - "@metamask/name-controller>@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/name-controller>async-mutex": true, + "@metamask/utils": true } }, "@metamask/name-controller>async-mutex": { @@ -1720,8 +1715,7 @@ "@metamask/network-controller>reselect": true, "@metamask/rpc-errors": true, "@metamask/utils": true, - "browserify>assert": true, - "browserify>util": true, + "eslint>fast-deep-equal": true, "uri-js": true, "uuid": true } @@ -1981,22 +1975,7 @@ "@metamask/permission-log-controller": { "packages": { "@metamask/base-controller": true, - "@metamask/permission-log-controller>@metamask/utils": true - } - }, - "@metamask/permission-log-controller>@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/utils": true } }, "@metamask/phishing-controller": { @@ -2066,14 +2045,47 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>@metamask/controller-utils": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, "await-semaphore": true, "browserify>buffer": true } }, + "@metamask/ppom-validator>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/ppom-validator>@metamask/controller-utils>@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/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2137,6 +2149,7 @@ "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/message-signing-snap>@noble/ciphers": true, + "@metamask/network-controller": true, "@metamask/profile-sync-controller>siwe": true, "@noble/hashes": true, "browserify>buffer": true, @@ -2349,11 +2362,11 @@ }, "packages": { "@ethersproject/bytes": true, - "@metamask/controller-utils": true, "@metamask/eth-query": true, - "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils": true, + "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2380,11 +2393,59 @@ "webpack>events": true } }, + "@metamask/smart-transactions-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": { + "globals": { + "console.warn": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": true, + "browserify>buffer": true, + "browserify>insert-module-globals>is-buffer": true, + "webpack>events": true + } + }, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": { "globals": { "crypto.getRandomValues": true } }, + "@metamask/smart-transactions-controller>@metamask/polling-controller": { + "globals": { + "clearTimeout": true, + "console.error": true, + "setTimeout": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "uuid": true + } + }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2405,9 +2466,9 @@ "@metamask/json-rpc-engine": true, "@metamask/json-rpc-middleware-stream": true, "@metamask/object-multiplex": true, - "@metamask/permission-controller": true, "@metamask/post-message-stream": true, "@metamask/rpc-errors": true, + "@metamask/snaps-controllers>@metamask/permission-controller": true, "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>get-npm-tarball-url": true, @@ -2431,6 +2492,39 @@ "crypto.getRandomValues": true } }, + "@metamask/snaps-controllers>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true, + "@metamask/snaps-controllers>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, "@metamask/snaps-controllers>concat-stream": { "packages": { "browserify>buffer": true, @@ -2488,8 +2582,8 @@ }, "@metamask/snaps-rpc-methods": { "packages": { - "@metamask/permission-controller": true, "@metamask/rpc-errors": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, @@ -2498,6 +2592,44 @@ "@noble/hashes": true } }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": { + "globals": { + "crypto.getRandomValues": true + } + }, "@metamask/snaps-sdk": { "globals": { "fetch": true @@ -2548,10 +2680,10 @@ "fetch": true }, "packages": { - "@metamask/permission-controller": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, + "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, @@ -2567,6 +2699,44 @@ "semver": true } }, + "@metamask/snaps-utils>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true, + "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/snaps-utils>@metamask/permission-controller>nanoid": { + "globals": { + "crypto.getRandomValues": true + } + }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { "@metamask/message-signing-snap>@noble/curves": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 10eb2aa4e0e5..f061341afbe6 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -629,7 +629,7 @@ }, "@metamask/announcement-controller": { "packages": { - "@metamask/announcement-controller>@metamask/base-controller": true + "@metamask/base-controller": true } }, "@metamask/announcement-controller>@metamask/base-controller": { @@ -1625,13 +1625,31 @@ "@metamask/message-manager": { "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/message-manager>@metamask/controller-utils": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, + "@metamask/message-manager>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, "@metamask/message-manager>jsonschema": { "packages": { "browserify>url": true @@ -1663,33 +1681,10 @@ "fetch": true }, "packages": { + "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/name-controller>@metamask/base-controller": true, - "@metamask/name-controller>@metamask/utils": true, - "@metamask/name-controller>async-mutex": true - } - }, - "@metamask/name-controller>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, - "@metamask/name-controller>@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/name-controller>async-mutex": true, + "@metamask/utils": true } }, "@metamask/name-controller>async-mutex": { @@ -1720,8 +1715,7 @@ "@metamask/network-controller>reselect": true, "@metamask/rpc-errors": true, "@metamask/utils": true, - "browserify>assert": true, - "browserify>util": true, + "eslint>fast-deep-equal": true, "uri-js": true, "uuid": true } @@ -1981,22 +1975,7 @@ "@metamask/permission-log-controller": { "packages": { "@metamask/base-controller": true, - "@metamask/permission-log-controller>@metamask/utils": true - } - }, - "@metamask/permission-log-controller>@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/utils": true } }, "@metamask/phishing-controller": { @@ -2066,14 +2045,47 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>@metamask/controller-utils": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, "await-semaphore": true, "browserify>buffer": true } }, + "@metamask/ppom-validator>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/ppom-validator>@metamask/controller-utils>@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/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2137,6 +2149,7 @@ "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/message-signing-snap>@noble/ciphers": true, + "@metamask/network-controller": true, "@metamask/profile-sync-controller>siwe": true, "@noble/hashes": true, "browserify>buffer": true, @@ -2349,11 +2362,11 @@ }, "packages": { "@ethersproject/bytes": true, - "@metamask/controller-utils": true, "@metamask/eth-query": true, - "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils": true, + "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2380,11 +2393,59 @@ "webpack>events": true } }, + "@metamask/smart-transactions-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": { + "globals": { + "console.warn": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": true, + "browserify>buffer": true, + "browserify>insert-module-globals>is-buffer": true, + "webpack>events": true + } + }, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": { "globals": { "crypto.getRandomValues": true } }, + "@metamask/smart-transactions-controller>@metamask/polling-controller": { + "globals": { + "clearTimeout": true, + "console.error": true, + "setTimeout": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "uuid": true + } + }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2405,9 +2466,9 @@ "@metamask/json-rpc-engine": true, "@metamask/json-rpc-middleware-stream": true, "@metamask/object-multiplex": true, - "@metamask/permission-controller": true, "@metamask/post-message-stream": true, "@metamask/rpc-errors": true, + "@metamask/snaps-controllers>@metamask/permission-controller": true, "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>get-npm-tarball-url": true, @@ -2431,6 +2492,39 @@ "crypto.getRandomValues": true } }, + "@metamask/snaps-controllers>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true, + "@metamask/snaps-controllers>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, "@metamask/snaps-controllers>concat-stream": { "packages": { "browserify>buffer": true, @@ -2488,8 +2582,8 @@ }, "@metamask/snaps-rpc-methods": { "packages": { - "@metamask/permission-controller": true, "@metamask/rpc-errors": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, @@ -2498,6 +2592,44 @@ "@noble/hashes": true } }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": { + "globals": { + "crypto.getRandomValues": true + } + }, "@metamask/snaps-sdk": { "globals": { "fetch": true @@ -2548,10 +2680,10 @@ "fetch": true }, "packages": { - "@metamask/permission-controller": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, + "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, @@ -2567,6 +2699,44 @@ "semver": true } }, + "@metamask/snaps-utils>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true, + "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/snaps-utils>@metamask/permission-controller>nanoid": { + "globals": { + "crypto.getRandomValues": true + } + }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { "@metamask/message-signing-snap>@noble/curves": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 10eb2aa4e0e5..f061341afbe6 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -629,7 +629,7 @@ }, "@metamask/announcement-controller": { "packages": { - "@metamask/announcement-controller>@metamask/base-controller": true + "@metamask/base-controller": true } }, "@metamask/announcement-controller>@metamask/base-controller": { @@ -1625,13 +1625,31 @@ "@metamask/message-manager": { "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/message-manager>@metamask/controller-utils": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, + "@metamask/message-manager>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, "@metamask/message-manager>jsonschema": { "packages": { "browserify>url": true @@ -1663,33 +1681,10 @@ "fetch": true }, "packages": { + "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/name-controller>@metamask/base-controller": true, - "@metamask/name-controller>@metamask/utils": true, - "@metamask/name-controller>async-mutex": true - } - }, - "@metamask/name-controller>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, - "@metamask/name-controller>@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/name-controller>async-mutex": true, + "@metamask/utils": true } }, "@metamask/name-controller>async-mutex": { @@ -1720,8 +1715,7 @@ "@metamask/network-controller>reselect": true, "@metamask/rpc-errors": true, "@metamask/utils": true, - "browserify>assert": true, - "browserify>util": true, + "eslint>fast-deep-equal": true, "uri-js": true, "uuid": true } @@ -1981,22 +1975,7 @@ "@metamask/permission-log-controller": { "packages": { "@metamask/base-controller": true, - "@metamask/permission-log-controller>@metamask/utils": true - } - }, - "@metamask/permission-log-controller>@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/utils": true } }, "@metamask/phishing-controller": { @@ -2066,14 +2045,47 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>@metamask/controller-utils": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, "await-semaphore": true, "browserify>buffer": true } }, + "@metamask/ppom-validator>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/ppom-validator>@metamask/controller-utils>@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/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2137,6 +2149,7 @@ "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/message-signing-snap>@noble/ciphers": true, + "@metamask/network-controller": true, "@metamask/profile-sync-controller>siwe": true, "@noble/hashes": true, "browserify>buffer": true, @@ -2349,11 +2362,11 @@ }, "packages": { "@ethersproject/bytes": true, - "@metamask/controller-utils": true, "@metamask/eth-query": true, - "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils": true, + "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2380,11 +2393,59 @@ "webpack>events": true } }, + "@metamask/smart-transactions-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": { + "globals": { + "console.warn": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": true, + "browserify>buffer": true, + "browserify>insert-module-globals>is-buffer": true, + "webpack>events": true + } + }, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": { "globals": { "crypto.getRandomValues": true } }, + "@metamask/smart-transactions-controller>@metamask/polling-controller": { + "globals": { + "clearTimeout": true, + "console.error": true, + "setTimeout": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "uuid": true + } + }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2405,9 +2466,9 @@ "@metamask/json-rpc-engine": true, "@metamask/json-rpc-middleware-stream": true, "@metamask/object-multiplex": true, - "@metamask/permission-controller": true, "@metamask/post-message-stream": true, "@metamask/rpc-errors": true, + "@metamask/snaps-controllers>@metamask/permission-controller": true, "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>get-npm-tarball-url": true, @@ -2431,6 +2492,39 @@ "crypto.getRandomValues": true } }, + "@metamask/snaps-controllers>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true, + "@metamask/snaps-controllers>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, "@metamask/snaps-controllers>concat-stream": { "packages": { "browserify>buffer": true, @@ -2488,8 +2582,8 @@ }, "@metamask/snaps-rpc-methods": { "packages": { - "@metamask/permission-controller": true, "@metamask/rpc-errors": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, @@ -2498,6 +2592,44 @@ "@noble/hashes": true } }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": { + "globals": { + "crypto.getRandomValues": true + } + }, "@metamask/snaps-sdk": { "globals": { "fetch": true @@ -2548,10 +2680,10 @@ "fetch": true }, "packages": { - "@metamask/permission-controller": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, + "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, @@ -2567,6 +2699,44 @@ "semver": true } }, + "@metamask/snaps-utils>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true, + "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/snaps-utils>@metamask/permission-controller>nanoid": { + "globals": { + "crypto.getRandomValues": true + } + }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { "@metamask/message-signing-snap>@noble/curves": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index e5b0e245fb1e..217310b39814 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -721,7 +721,7 @@ }, "@metamask/announcement-controller": { "packages": { - "@metamask/announcement-controller>@metamask/base-controller": true + "@metamask/base-controller": true } }, "@metamask/announcement-controller>@metamask/base-controller": { @@ -1717,13 +1717,31 @@ "@metamask/message-manager": { "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, + "@metamask/message-manager>@metamask/controller-utils": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, + "@metamask/message-manager>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, "@metamask/message-manager>jsonschema": { "packages": { "browserify>url": true @@ -1755,33 +1773,10 @@ "fetch": true }, "packages": { + "@metamask/base-controller": true, "@metamask/controller-utils": true, - "@metamask/name-controller>@metamask/base-controller": true, - "@metamask/name-controller>@metamask/utils": true, - "@metamask/name-controller>async-mutex": true - } - }, - "@metamask/name-controller>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, - "@metamask/name-controller>@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/name-controller>async-mutex": true, + "@metamask/utils": true } }, "@metamask/name-controller>async-mutex": { @@ -1812,8 +1807,7 @@ "@metamask/network-controller>reselect": true, "@metamask/rpc-errors": true, "@metamask/utils": true, - "browserify>assert": true, - "browserify>util": true, + "eslint>fast-deep-equal": true, "uri-js": true, "uuid": true } @@ -2073,22 +2067,7 @@ "@metamask/permission-log-controller": { "packages": { "@metamask/base-controller": true, - "@metamask/permission-log-controller>@metamask/utils": true - } - }, - "@metamask/permission-log-controller>@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/utils": true } }, "@metamask/phishing-controller": { @@ -2158,14 +2137,47 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, "@metamask/eth-query>json-rpc-random-id": true, + "@metamask/ppom-validator>@metamask/controller-utils": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, "await-semaphore": true, "browserify>buffer": true } }, + "@metamask/ppom-validator>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/ppom-validator>@metamask/controller-utils>@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/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2229,6 +2241,7 @@ "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/message-signing-snap>@noble/ciphers": true, + "@metamask/network-controller": true, "@metamask/profile-sync-controller>siwe": true, "@noble/hashes": true, "browserify>buffer": true, @@ -2441,11 +2454,11 @@ }, "packages": { "@ethersproject/bytes": true, - "@metamask/controller-utils": true, "@metamask/eth-query": true, - "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils": true, + "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2472,11 +2485,59 @@ "webpack>events": true } }, + "@metamask/smart-transactions-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": { + "globals": { + "console.warn": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": true, + "browserify>buffer": true, + "browserify>insert-module-globals>is-buffer": true, + "webpack>events": true + } + }, + "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": { "globals": { "crypto.getRandomValues": true } }, + "@metamask/smart-transactions-controller>@metamask/polling-controller": { + "globals": { + "clearTimeout": true, + "console.error": true, + "setTimeout": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "uuid": true + } + }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2497,9 +2558,9 @@ "@metamask/json-rpc-engine": true, "@metamask/json-rpc-middleware-stream": true, "@metamask/object-multiplex": true, - "@metamask/permission-controller": true, "@metamask/post-message-stream": true, "@metamask/rpc-errors": true, + "@metamask/snaps-controllers>@metamask/permission-controller": true, "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>get-npm-tarball-url": true, @@ -2523,6 +2584,39 @@ "crypto.getRandomValues": true } }, + "@metamask/snaps-controllers>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true, + "@metamask/snaps-controllers>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, "@metamask/snaps-controllers>concat-stream": { "packages": { "browserify>buffer": true, @@ -2580,8 +2674,8 @@ }, "@metamask/snaps-rpc-methods": { "packages": { - "@metamask/permission-controller": true, "@metamask/rpc-errors": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, @@ -2590,6 +2684,44 @@ "@noble/hashes": true } }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": { + "globals": { + "crypto.getRandomValues": true + } + }, "@metamask/snaps-sdk": { "globals": { "fetch": true @@ -2640,10 +2772,10 @@ "fetch": true }, "packages": { - "@metamask/permission-controller": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, + "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, @@ -2659,6 +2791,44 @@ "semver": true } }, + "@metamask/snaps-utils>@metamask/permission-controller": { + "globals": { + "console.error": true + }, + "packages": { + "@metamask/base-controller": true, + "@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true, + "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, + "@metamask/utils": true, + "deep-freeze-strict": true, + "immer": true + } + }, + "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": { + "globals": { + "URL": true, + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/controller-utils>@spruceid/siwe-parser": true, + "@metamask/ethjs>@metamask/ethjs-unit": true, + "@metamask/utils": true, + "bn.js": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true + } + }, + "@metamask/snaps-utils>@metamask/permission-controller>nanoid": { + "globals": { + "crypto.getRandomValues": true + } + }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { "@metamask/message-signing-snap>@noble/curves": true, From 692fdd950148e9a4442dcaa0b5233abac66a6c4b Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Tue, 3 Dec 2024 23:05:46 +0100 Subject: [PATCH 11/13] chore: dedupe deps --- yarn.lock | 93 +++---------------------------------------------------- 1 file changed, 5 insertions(+), 88 deletions(-) diff --git a/yarn.lock b/yarn.lock index a41394c05d78..e2109a04cd94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5062,25 +5062,7 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1, @metamask/controller-utils@npm:^11.4.2": - version: 11.4.3 - resolution: "@metamask/controller-utils@npm:11.4.3" - dependencies: - "@ethereumjs/util": "npm:^8.1.0" - "@metamask/eth-query": "npm:^4.0.0" - "@metamask/ethjs-unit": "npm:^0.3.0" - "@metamask/utils": "npm:^10.0.0" - "@spruceid/siwe-parser": "npm:2.1.0" - "@types/bn.js": "npm:^5.1.5" - bignumber.js: "npm:^9.1.2" - bn.js: "npm:^5.2.1" - eth-ens-namehash: "npm:^2.0.8" - fast-deep-equal: "npm:^3.1.3" - checksum: 10/5703b0721daf679cf44affc690f2b313e40893b64b0aafaf203e69ee51438197cc3634ef7094145f580a8a8aaadcb79026b2fbd4065c1bb4a8c26627a2c4c69a - languageName: node - linkType: hard - -"@metamask/controller-utils@npm:^11.4.4": +"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.4": version: 11.4.4 resolution: "@metamask/controller-utils@npm:11.4.4" dependencies: @@ -5705,22 +5687,7 @@ __metadata: languageName: node linkType: hard -"@metamask/message-manager@npm:^11.0.0": - version: 11.0.1 - resolution: "@metamask/message-manager@npm:11.0.1" - dependencies: - "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.2" - "@metamask/eth-sig-util": "npm:^8.0.0" - "@metamask/utils": "npm:^10.0.0" - "@types/uuid": "npm:^8.3.0" - jsonschema: "npm:^1.2.4" - uuid: "npm:^8.3.2" - checksum: 10/a63a79bbddfd06ca729ca1ca2a1f2fd9b5c930efaaee1d8bc077f7352ae058ff7f99c9b6bdfd7f7d3df4328a3c3606922d961d45c8d39c2b7afb4a893ec1cf6b - languageName: node - linkType: hard - -"@metamask/message-manager@npm:^11.0.2": +"@metamask/message-manager@npm:^11.0.0, @metamask/message-manager@npm:^11.0.2": version: 11.0.2 resolution: "@metamask/message-manager@npm:11.0.2" dependencies: @@ -5882,26 +5849,7 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-controller@npm:^11.0.3": - version: 11.0.3 - resolution: "@metamask/permission-controller@npm:11.0.3" - dependencies: - "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.1" - "@metamask/json-rpc-engine": "npm:^10.0.1" - "@metamask/rpc-errors": "npm:^7.0.1" - "@metamask/utils": "npm:^10.0.0" - "@types/deep-freeze-strict": "npm:^1.1.0" - deep-freeze-strict: "npm:^1.1.1" - immer: "npm:^9.0.6" - nanoid: "npm:^3.1.31" - peerDependencies: - "@metamask/approval-controller": ^7.0.0 - checksum: 10/e90411ae34410176945e79c8e863ff2d78a12c01e98837a7298dc94d4815c65fec2cd338d4ae0026f91899acfe21bfe8b857a3b2f12c3d96719e5afb68df0e68 - languageName: node - linkType: hard - -"@metamask/permission-controller@npm:^11.0.4": +"@metamask/permission-controller@npm:^11.0.3, @metamask/permission-controller@npm:^11.0.4": version: 11.0.4 resolution: "@metamask/permission-controller@npm:11.0.4" dependencies: @@ -5931,22 +5879,7 @@ __metadata: languageName: node linkType: hard -"@metamask/phishing-controller@npm:^12.0.2": - version: 12.3.0 - resolution: "@metamask/phishing-controller@npm:12.3.0" - dependencies: - "@metamask/base-controller": "npm:^7.0.1" - "@metamask/controller-utils": "npm:^11.4.0" - "@noble/hashes": "npm:^1.4.0" - "@types/punycode": "npm:^2.1.0" - ethereum-cryptography: "npm:^2.1.2" - fastest-levenshtein: "npm:^1.0.16" - punycode: "npm:^2.1.1" - checksum: 10/15e64adff57996486c36d0c73747a76543e8f7ad79020fc2746726f81f3858251b2e256c04e8d9caf1daf71c41f7ddf575c901d2a46174a5884d2836c60a3b2d - languageName: node - linkType: hard - -"@metamask/phishing-controller@npm:^12.3.1": +"@metamask/phishing-controller@npm:^12.0.2, @metamask/phishing-controller@npm:^12.3.1": version: 12.3.1 resolution: "@metamask/phishing-controller@npm:12.3.1" dependencies: @@ -5976,23 +5909,7 @@ __metadata: languageName: node linkType: hard -"@metamask/polling-controller@npm:^12.0.0": - version: 12.0.1 - resolution: "@metamask/polling-controller@npm:12.0.1" - dependencies: - "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.2" - "@metamask/utils": "npm:^10.0.0" - "@types/uuid": "npm:^8.3.0" - fast-json-stable-stringify: "npm:^2.1.0" - uuid: "npm:^8.3.2" - peerDependencies: - "@metamask/network-controller": ^22.0.0 - checksum: 10/eac9ed2fcc9697a2aa55e9746d4eac8d762dd6948b00d77cd2d4894b8c3e1a8e6ed5d0df4d01a69d9a7e2b3c09d9d7c1ffc6f9504023388dd7452d45b5d87065 - languageName: node - linkType: hard - -"@metamask/polling-controller@npm:^12.0.2": +"@metamask/polling-controller@npm:^12.0.0, @metamask/polling-controller@npm:^12.0.2": version: 12.0.2 resolution: "@metamask/polling-controller@npm:12.0.2" dependencies: From 01839031bd8a05c4195a9a7e1cdeb9b846ff0392 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Tue, 3 Dec 2024 22:17:27 +0000 Subject: [PATCH 12/13] Update LavaMoat policies --- lavamoat/browserify/beta/policy.json | 222 +------------------------- lavamoat/browserify/flask/policy.json | 222 +------------------------- lavamoat/browserify/main/policy.json | 222 +------------------------- lavamoat/browserify/mmi/policy.json | 222 +------------------------- 4 files changed, 28 insertions(+), 860 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index f061341afbe6..50a462f5fec6 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1625,31 +1625,13 @@ "@metamask/message-manager": { "packages": { "@metamask/base-controller": true, - "@metamask/message-manager>@metamask/controller-utils": true, + "@metamask/controller-utils": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, - "@metamask/message-manager>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, "@metamask/message-manager>jsonschema": { "packages": { "browserify>url": true @@ -2045,47 +2027,14 @@ }, "packages": { "@metamask/base-controller": true, + "@metamask/controller-utils": true, "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/ppom-validator>@metamask/controller-utils": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, "await-semaphore": true, "browserify>buffer": true } }, - "@metamask/ppom-validator>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/ppom-validator>@metamask/controller-utils>@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/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2362,11 +2311,11 @@ }, "packages": { "@ethersproject/bytes": true, + "@metamask/controller-utils": true, "@metamask/eth-query": true, + "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils": true, - "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2393,59 +2342,11 @@ "webpack>events": true } }, - "@metamask/smart-transactions-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": { - "globals": { - "console.warn": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true, - "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "webpack>events": true - } - }, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": { "globals": { "crypto.getRandomValues": true } }, - "@metamask/smart-transactions-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2466,9 +2367,9 @@ "@metamask/json-rpc-engine": true, "@metamask/json-rpc-middleware-stream": true, "@metamask/object-multiplex": true, + "@metamask/permission-controller": true, "@metamask/post-message-stream": true, "@metamask/rpc-errors": true, - "@metamask/snaps-controllers>@metamask/permission-controller": true, "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>get-npm-tarball-url": true, @@ -2492,39 +2393,6 @@ "crypto.getRandomValues": true } }, - "@metamask/snaps-controllers>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true, - "@metamask/snaps-controllers>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, "@metamask/snaps-controllers>concat-stream": { "packages": { "browserify>buffer": true, @@ -2582,8 +2450,8 @@ }, "@metamask/snaps-rpc-methods": { "packages": { + "@metamask/permission-controller": true, "@metamask/rpc-errors": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, @@ -2592,44 +2460,6 @@ "@noble/hashes": true } }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": { - "globals": { - "crypto.getRandomValues": true - } - }, "@metamask/snaps-sdk": { "globals": { "fetch": true @@ -2680,10 +2510,10 @@ "fetch": true }, "packages": { + "@metamask/permission-controller": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, @@ -2699,44 +2529,6 @@ "semver": true } }, - "@metamask/snaps-utils>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true, - "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/snaps-utils>@metamask/permission-controller>nanoid": { - "globals": { - "crypto.getRandomValues": true - } - }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { "@metamask/message-signing-snap>@noble/curves": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index f061341afbe6..50a462f5fec6 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1625,31 +1625,13 @@ "@metamask/message-manager": { "packages": { "@metamask/base-controller": true, - "@metamask/message-manager>@metamask/controller-utils": true, + "@metamask/controller-utils": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, - "@metamask/message-manager>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, "@metamask/message-manager>jsonschema": { "packages": { "browserify>url": true @@ -2045,47 +2027,14 @@ }, "packages": { "@metamask/base-controller": true, + "@metamask/controller-utils": true, "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/ppom-validator>@metamask/controller-utils": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, "await-semaphore": true, "browserify>buffer": true } }, - "@metamask/ppom-validator>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/ppom-validator>@metamask/controller-utils>@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/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2362,11 +2311,11 @@ }, "packages": { "@ethersproject/bytes": true, + "@metamask/controller-utils": true, "@metamask/eth-query": true, + "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils": true, - "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2393,59 +2342,11 @@ "webpack>events": true } }, - "@metamask/smart-transactions-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": { - "globals": { - "console.warn": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true, - "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "webpack>events": true - } - }, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": { "globals": { "crypto.getRandomValues": true } }, - "@metamask/smart-transactions-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2466,9 +2367,9 @@ "@metamask/json-rpc-engine": true, "@metamask/json-rpc-middleware-stream": true, "@metamask/object-multiplex": true, + "@metamask/permission-controller": true, "@metamask/post-message-stream": true, "@metamask/rpc-errors": true, - "@metamask/snaps-controllers>@metamask/permission-controller": true, "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>get-npm-tarball-url": true, @@ -2492,39 +2393,6 @@ "crypto.getRandomValues": true } }, - "@metamask/snaps-controllers>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true, - "@metamask/snaps-controllers>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, "@metamask/snaps-controllers>concat-stream": { "packages": { "browserify>buffer": true, @@ -2582,8 +2450,8 @@ }, "@metamask/snaps-rpc-methods": { "packages": { + "@metamask/permission-controller": true, "@metamask/rpc-errors": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, @@ -2592,44 +2460,6 @@ "@noble/hashes": true } }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": { - "globals": { - "crypto.getRandomValues": true - } - }, "@metamask/snaps-sdk": { "globals": { "fetch": true @@ -2680,10 +2510,10 @@ "fetch": true }, "packages": { + "@metamask/permission-controller": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, @@ -2699,44 +2529,6 @@ "semver": true } }, - "@metamask/snaps-utils>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true, - "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/snaps-utils>@metamask/permission-controller>nanoid": { - "globals": { - "crypto.getRandomValues": true - } - }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { "@metamask/message-signing-snap>@noble/curves": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index f061341afbe6..50a462f5fec6 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1625,31 +1625,13 @@ "@metamask/message-manager": { "packages": { "@metamask/base-controller": true, - "@metamask/message-manager>@metamask/controller-utils": true, + "@metamask/controller-utils": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, - "@metamask/message-manager>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, "@metamask/message-manager>jsonschema": { "packages": { "browserify>url": true @@ -2045,47 +2027,14 @@ }, "packages": { "@metamask/base-controller": true, + "@metamask/controller-utils": true, "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/ppom-validator>@metamask/controller-utils": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, "await-semaphore": true, "browserify>buffer": true } }, - "@metamask/ppom-validator>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/ppom-validator>@metamask/controller-utils>@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/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2362,11 +2311,11 @@ }, "packages": { "@ethersproject/bytes": true, + "@metamask/controller-utils": true, "@metamask/eth-query": true, + "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils": true, - "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2393,59 +2342,11 @@ "webpack>events": true } }, - "@metamask/smart-transactions-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": { - "globals": { - "console.warn": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true, - "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "webpack>events": true - } - }, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": { "globals": { "crypto.getRandomValues": true } }, - "@metamask/smart-transactions-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2466,9 +2367,9 @@ "@metamask/json-rpc-engine": true, "@metamask/json-rpc-middleware-stream": true, "@metamask/object-multiplex": true, + "@metamask/permission-controller": true, "@metamask/post-message-stream": true, "@metamask/rpc-errors": true, - "@metamask/snaps-controllers>@metamask/permission-controller": true, "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>get-npm-tarball-url": true, @@ -2492,39 +2393,6 @@ "crypto.getRandomValues": true } }, - "@metamask/snaps-controllers>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true, - "@metamask/snaps-controllers>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, "@metamask/snaps-controllers>concat-stream": { "packages": { "browserify>buffer": true, @@ -2582,8 +2450,8 @@ }, "@metamask/snaps-rpc-methods": { "packages": { + "@metamask/permission-controller": true, "@metamask/rpc-errors": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, @@ -2592,44 +2460,6 @@ "@noble/hashes": true } }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": { - "globals": { - "crypto.getRandomValues": true - } - }, "@metamask/snaps-sdk": { "globals": { "fetch": true @@ -2680,10 +2510,10 @@ "fetch": true }, "packages": { + "@metamask/permission-controller": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, @@ -2699,44 +2529,6 @@ "semver": true } }, - "@metamask/snaps-utils>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true, - "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/snaps-utils>@metamask/permission-controller>nanoid": { - "globals": { - "crypto.getRandomValues": true - } - }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { "@metamask/message-signing-snap>@noble/curves": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 217310b39814..c886ee3c2172 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1717,31 +1717,13 @@ "@metamask/message-manager": { "packages": { "@metamask/base-controller": true, - "@metamask/message-manager>@metamask/controller-utils": true, + "@metamask/controller-utils": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, - "@metamask/message-manager>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, "@metamask/message-manager>jsonschema": { "packages": { "browserify>url": true @@ -2137,47 +2119,14 @@ }, "packages": { "@metamask/base-controller": true, + "@metamask/controller-utils": true, "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/ppom-validator>@metamask/controller-utils": true, "@metamask/ppom-validator>crypto-js": true, "@metamask/ppom-validator>elliptic": true, "await-semaphore": true, "browserify>buffer": true } }, - "@metamask/ppom-validator>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/ppom-validator>@metamask/controller-utils>@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/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2454,11 +2403,11 @@ }, "packages": { "@ethersproject/bytes": true, + "@metamask/controller-utils": true, "@metamask/eth-query": true, + "@metamask/polling-controller": true, "@metamask/smart-transactions-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@ethereumjs/util": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils": true, - "@metamask/smart-transactions-controller>@metamask/polling-controller": true, "@metamask/smart-transactions-controller>bignumber.js": true, "@metamask/transaction-controller": true, "browserify>buffer": true, @@ -2485,59 +2434,11 @@ "webpack>events": true } }, - "@metamask/smart-transactions-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": { - "globals": { - "console.warn": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util>micro-ftch": true, - "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "webpack>events": true - } - }, - "@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": { "globals": { "crypto.getRandomValues": true } }, - "@metamask/smart-transactions-controller>@metamask/polling-controller": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/snaps-utils>fast-json-stable-stringify": true, - "uuid": true - } - }, "@metamask/smart-transactions-controller>bignumber.js": { "globals": { "crypto": true, @@ -2558,9 +2459,9 @@ "@metamask/json-rpc-engine": true, "@metamask/json-rpc-middleware-stream": true, "@metamask/object-multiplex": true, + "@metamask/permission-controller": true, "@metamask/post-message-stream": true, "@metamask/rpc-errors": true, - "@metamask/snaps-controllers>@metamask/permission-controller": true, "@metamask/snaps-controllers>@xstate/fsm": true, "@metamask/snaps-controllers>concat-stream": true, "@metamask/snaps-controllers>get-npm-tarball-url": true, @@ -2584,39 +2485,6 @@ "crypto.getRandomValues": true } }, - "@metamask/snaps-controllers>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true, - "@metamask/snaps-controllers>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, "@metamask/snaps-controllers>concat-stream": { "packages": { "browserify>buffer": true, @@ -2674,8 +2542,8 @@ }, "@metamask/snaps-rpc-methods": { "packages": { + "@metamask/permission-controller": true, "@metamask/rpc-errors": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, @@ -2684,44 +2552,6 @@ "@noble/hashes": true } }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": { - "globals": { - "crypto.getRandomValues": true - } - }, "@metamask/snaps-sdk": { "globals": { "fetch": true @@ -2772,10 +2602,10 @@ "fetch": true }, "packages": { + "@metamask/permission-controller": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, @@ -2791,44 +2621,6 @@ "semver": true } }, - "@metamask/snaps-utils>@metamask/permission-controller": { - "globals": { - "console.error": true - }, - "packages": { - "@metamask/base-controller": true, - "@metamask/json-rpc-engine": true, - "@metamask/rpc-errors": true, - "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true, - "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, - "@metamask/utils": true, - "deep-freeze-strict": true, - "immer": true - } - }, - "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": { - "globals": { - "URL": true, - "console.error": true, - "fetch": true, - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx>@ethereumjs/util": true, - "@metamask/controller-utils>@spruceid/siwe-parser": true, - "@metamask/ethjs>@metamask/ethjs-unit": true, - "@metamask/utils": true, - "bn.js": true, - "browserify>buffer": true, - "eslint>fast-deep-equal": true, - "eth-ens-namehash": true - } - }, - "@metamask/snaps-utils>@metamask/permission-controller>nanoid": { - "globals": { - "crypto.getRandomValues": true - } - }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { "@metamask/message-signing-snap>@noble/curves": true, From d84c743b6c8f6def0aff18e064e96a8a86149ab9 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Wed, 4 Dec 2024 00:16:33 +0100 Subject: [PATCH 13/13] chore: rollback queued-request-controller and selected-network-controller bumps --- app/scripts/metamask-controller.js | 8 ++++++++ package.json | 4 ++-- yarn.lock | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 142d754b4e05..31a9e85b278b 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1332,6 +1332,14 @@ export default class MetamaskController extends EventEmitter { ], }), state: initState.SelectedNetworkController, + useRequestQueuePreference: + this.preferencesController.state.useRequestQueue, + onPreferencesStateChange: (listener) => { + preferencesMessenger.subscribe( + 'PreferencesController:stateChange', + listener, + ); + }, domainProxyMap: new WeakRefObjectMap(), }); diff --git a/package.json b/package.json index e45263e8c584..2a035c95bd7a 100644 --- a/package.json +++ b/package.json @@ -333,13 +333,13 @@ "@metamask/preinstalled-example-snap": "^0.2.0", "@metamask/profile-sync-controller": "^3.0.0", "@metamask/providers": "^18.2.0", - "@metamask/queued-request-controller": "^8.0.1", + "@metamask/queued-request-controller": "^7.0.1", "@metamask/rate-limit-controller": "^6.0.0", "@metamask/remote-feature-flag-controller": "^1.1.0", "@metamask/rpc-errors": "^7.0.0", "@metamask/safe-event-emitter": "^3.1.1", "@metamask/scure-bip39": "^2.0.3", - "@metamask/selected-network-controller": "^20.0.1", + "@metamask/selected-network-controller": "^19.0.0", "@metamask/signature-controller": "^23.0.1", "@metamask/smart-transactions-controller": "^15.0.0", "@metamask/snaps-controllers": "^9.14.0", diff --git a/yarn.lock b/yarn.lock index e2109a04cd94..ff0e3fdcd2ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5062,7 +5062,7 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.4": +"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.2, @metamask/controller-utils@npm:^11.4.4": version: 11.4.4 resolution: "@metamask/controller-utils@npm:11.4.4" dependencies: @@ -6021,20 +6021,20 @@ __metadata: languageName: node linkType: hard -"@metamask/queued-request-controller@npm:^8.0.1": - version: 8.0.1 - resolution: "@metamask/queued-request-controller@npm:8.0.1" +"@metamask/queued-request-controller@npm:^7.0.1": + version: 7.0.1 + resolution: "@metamask/queued-request-controller@npm:7.0.1" dependencies: "@metamask/base-controller": "npm:^7.0.2" - "@metamask/controller-utils": "npm:^11.4.4" + "@metamask/controller-utils": "npm:^11.4.2" "@metamask/json-rpc-engine": "npm:^10.0.1" "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^10.0.0" peerDependencies: "@metamask/network-controller": ^22.0.0 - "@metamask/selected-network-controller": ^20.0.0 - checksum: 10/189c484af925397a506b304bd351cdca3759fe2cd893ad7c4c687d759416b1aa47aba91af40b6523401e0be05b4cef2ea1a8164980f15b4a7ee41930df0d0599 + "@metamask/selected-network-controller": ^19.0.0 + checksum: 10/e5b16b3dc2fa0dcf74a81b5046abb65bc05da3802ee891b5a59a80b980301c790cf949d72adba00ead6f5b3d2eaac40694308297f7dc08eb5e5f05b5a68bbf57 languageName: node linkType: hard @@ -6097,18 +6097,18 @@ __metadata: languageName: node linkType: hard -"@metamask/selected-network-controller@npm:^20.0.1": - version: 20.0.1 - resolution: "@metamask/selected-network-controller@npm:20.0.1" +"@metamask/selected-network-controller@npm:^19.0.0": + version: 19.0.0 + resolution: "@metamask/selected-network-controller@npm:19.0.0" dependencies: - "@metamask/base-controller": "npm:^7.0.2" - "@metamask/json-rpc-engine": "npm:^10.0.1" + "@metamask/base-controller": "npm:^7.0.1" + "@metamask/json-rpc-engine": "npm:^10.0.0" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^10.0.0" peerDependencies: "@metamask/network-controller": ^22.0.0 "@metamask/permission-controller": ^11.0.0 - checksum: 10/3e99db1a7b2390624ac953bd7195e4010cf61e21f20a2c36449a6cca2abcfb5280b6c0e3ac3a365f8b6281ea7f115b19be95fb55ddfc4e37ba6a5a71089a75c9 + checksum: 10/738a1c749f442b732c279c7446e0db2cc7d72fa03fd485da15121559077bb6ffeaa3233435a028f4ea69015a40ca35ba66972dc0fd3a7f61a7ea5eee43df30a6 languageName: node linkType: hard @@ -26473,13 +26473,13 @@ __metadata: "@metamask/preinstalled-example-snap": "npm:^0.2.0" "@metamask/profile-sync-controller": "npm:^3.0.0" "@metamask/providers": "npm:^18.2.0" - "@metamask/queued-request-controller": "npm:^8.0.1" + "@metamask/queued-request-controller": "npm:^7.0.1" "@metamask/rate-limit-controller": "npm:^6.0.0" "@metamask/remote-feature-flag-controller": "npm:^1.1.0" "@metamask/rpc-errors": "npm:^7.0.0" "@metamask/safe-event-emitter": "npm:^3.1.1" "@metamask/scure-bip39": "npm:^2.0.3" - "@metamask/selected-network-controller": "npm:^20.0.1" + "@metamask/selected-network-controller": "npm:^19.0.0" "@metamask/signature-controller": "npm:^23.0.1" "@metamask/smart-transactions-controller": "npm:^15.0.0" "@metamask/snaps-controllers": "npm:^9.14.0"