From 70c702d71534f5003553390dcc71e4a660c64278 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Fri, 31 May 2024 20:31:30 +0000 Subject: [PATCH 1/5] sync yarn.lock --- yarn.lock | 86 ++++++++++++------------------------------------------- 1 file changed, 19 insertions(+), 67 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2fa690649d51..0e06af8f4960 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4782,7 +4782,7 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^9.0.1, @metamask/controller-utils@npm:^9.0.2, @metamask/controller-utils@npm:^9.1.0": +"@metamask/controller-utils@npm:^9.0.1, @metamask/controller-utils@npm:^9.1.0": version: 9.1.0 resolution: "@metamask/controller-utils@npm:9.1.0" dependencies: @@ -4965,7 +4965,7 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-json-rpc-middleware@npm:^12.1.0, @metamask/eth-json-rpc-middleware@npm:^12.1.1": +"@metamask/eth-json-rpc-middleware@npm:^12.1.1": version: 12.1.1 resolution: "@metamask/eth-json-rpc-middleware@npm:12.1.1" dependencies: @@ -4993,7 +4993,7 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-json-rpc-provider@npm:^3.0.1, @metamask/eth-json-rpc-provider@npm:^3.0.2": +"@metamask/eth-json-rpc-provider@npm:^3.0.2": version: 3.0.2 resolution: "@metamask/eth-json-rpc-provider@npm:3.0.2" dependencies: @@ -5502,69 +5502,25 @@ __metadata: languageName: node linkType: hard -"@metamask/network-controller@npm:18.1.0": - version: 18.1.0 - resolution: "@metamask/network-controller@npm:18.1.0" - dependencies: - "@metamask/base-controller": "npm:^5.0.1" - "@metamask/controller-utils": "npm:^9.0.2" - "@metamask/eth-json-rpc-infura": "npm:^9.1.0" - "@metamask/eth-json-rpc-middleware": "npm:^12.1.0" - "@metamask/eth-json-rpc-provider": "npm:^3.0.1" - "@metamask/eth-query": "npm:^4.0.0" - "@metamask/json-rpc-engine": "npm:^8.0.1" - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^8.3.0" - async-mutex: "npm:^0.2.6" - eth-block-tracker: "npm:^8.0.0" - immer: "npm:^9.0.6" - uuid: "npm:^8.3.2" - checksum: 10/cc3751205de1514333a99a638fc6fa7bdaa7fac505e32531fb1a71af5e9839e994de79c59ab91b08bdc8d3fbb4bb17330a677adf75754e5f56745d6d68e56515 - languageName: node - linkType: hard - -"@metamask/network-controller@npm:^18.1.1": - version: 18.1.1 - resolution: "@metamask/network-controller@npm:18.1.1" +"@metamask/network-controller@npm:@metamask-previews/network-controller@18.1.1-preview-ff0abae": + version: 18.1.1-preview-ff0abae + resolution: "@metamask-previews/network-controller@npm:18.1.1-preview-ff0abae" dependencies: "@metamask/base-controller": "npm:^5.0.2" "@metamask/controller-utils": "npm:^9.1.0" + "@metamask/eth-block-tracker": "npm:^9.0.2" "@metamask/eth-json-rpc-infura": "npm:^9.1.0" - "@metamask/eth-json-rpc-middleware": "npm:^12.1.0" + "@metamask/eth-json-rpc-middleware": "npm:^12.1.1" "@metamask/eth-json-rpc-provider": "npm:^3.0.2" "@metamask/eth-query": "npm:^4.0.0" "@metamask/json-rpc-engine": "npm:^8.0.2" "@metamask/rpc-errors": "npm:^6.2.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^8.3.0" - async-mutex: "npm:^0.2.6" - eth-block-tracker: "npm:^8.0.0" + async-mutex: "npm:^0.5.0" immer: "npm:^9.0.6" uuid: "npm:^8.3.2" - checksum: 10/1542b223851df1b316e5c5387712356dbbd84b6acd10b221d9802e5699a5d6baf6f1065da784fe0a2663b3843f82ce92270f94244e1d68f83aa3978e6c7ed76d - languageName: node - linkType: hard - -"@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch": - version: 18.1.0 - resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch::version=18.1.0&hash=da1bba" - dependencies: - "@metamask/base-controller": "npm:^5.0.1" - "@metamask/controller-utils": "npm:^9.0.2" - "@metamask/eth-json-rpc-infura": "npm:^9.1.0" - "@metamask/eth-json-rpc-middleware": "npm:^12.1.0" - "@metamask/eth-json-rpc-provider": "npm:^3.0.1" - "@metamask/eth-query": "npm:^4.0.0" - "@metamask/json-rpc-engine": "npm:^8.0.1" - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^8.3.0" - async-mutex: "npm:^0.2.6" - eth-block-tracker: "npm:^8.0.0" - immer: "npm:^9.0.6" - uuid: "npm:^8.3.2" - checksum: 10/184466aab692b52285124784e8d3c377deda590363644e3127785a645f538251ed8358f9037631d5a26f39b9400fa728bb74009b00bfd8b23a1e6c22cf54e0ad + checksum: 10/bb4de428a2863ffff8f6183ca9fd203160adf0414b07e7a3714c8be94fe138a3a2559d67970d494ef6dde631116d37303553f6f3c2e539ce86f773c023b64d10 languageName: node linkType: hard @@ -12046,6 +12002,15 @@ __metadata: languageName: node linkType: hard +"async-mutex@npm:^0.5.0": + version: 0.5.0 + resolution: "async-mutex@npm:0.5.0" + dependencies: + tslib: "npm:^2.4.0" + checksum: 10/4c6bfce1cc9cd43f723c4d96403ac5f4757f885c953b839cde6956ec8817ff39623b82d67614de10c7933e21626925882fb9bac367db7d15d7cb4f84228722c9 + languageName: node + linkType: hard + "async-settle@npm:^1.0.0": version: 1.0.0 resolution: "async-settle@npm:1.0.0" @@ -17388,19 +17353,6 @@ __metadata: languageName: node linkType: hard -"eth-block-tracker@npm:^8.0.0": - version: 8.1.0 - resolution: "eth-block-tracker@npm:8.1.0" - dependencies: - "@metamask/eth-json-rpc-provider": "npm:^2.1.0" - "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^8.1.0" - json-rpc-random-id: "npm:^1.0.1" - pify: "npm:^5.0.0" - checksum: 10/94d81a0f5ed62bb7fd70b99a3a6172f416a574dc9fcaa96c9bdedb4d98c52b257ee505957d4a5b248ce73220b96083420acdd2dd702a0330d016018a59bd0b2e - languageName: node - linkType: hard - "eth-eip712-util-browser@npm:^0.0.3": version: 0.0.3 resolution: "eth-eip712-util-browser@npm:0.0.3" From 305f1bc19df2cd58bd348fe38409eef2b10e6548 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Tue, 28 May 2024 22:13:30 +0000 Subject: [PATCH 2/5] deps: @metamask/network-controller@^18.1.1->^18.1.2 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index cb33679b90d5..4c88945c71fa 100644 --- a/package.json +++ b/package.json @@ -124,6 +124,7 @@ "update-mock-cdn": "node test/e2e/mock-cdn/update-mock-cdn-files.js" }, "resolutions": { + "@metamask/network-controller": "npm:@metamask-previews/network-controller@18.1.1-preview-ff0abae", "simple-update-notifier@^1.0.0": "^2.0.0", "@babel/core": "patch:@babel/core@npm%3A7.23.2#~/.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch", "@types/react": "^16.9.53", From 54a58b8f930fb9e61f0bc1323afbe8c7d2a344fe Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Wed, 29 May 2024 13:28:27 +0000 Subject: [PATCH 3/5] fix(deps): @metamask/transaction-controller@^29.1.0->^30.0.0 for nonce-tracker/block-tracker bump --- ...rk-controller-npm-18.1.2-1bcb8d8610.patch} | 28 +++--- package.json | 14 +-- yarn.lock | 94 +++++++++++++++---- 3 files changed, 95 insertions(+), 41 deletions(-) rename .yarn/patches/{@metamask-network-controller-npm-18.1.0-680908c29a.patch => @metamask-network-controller-npm-18.1.2-1bcb8d8610.patch} (69%) diff --git a/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch b/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch similarity index 69% rename from .yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch rename to .yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch index 581382429ebb..f4c01d448364 100644 --- a/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch +++ b/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch @@ -1,23 +1,23 @@ -diff --git a/dist/chunk-AJED3H6M.mjs b/dist/chunk-AJED3H6M.mjs -index c7f9903611ccf8f0bb01bea786177efc1a915f7f..26d559fe80f193288badd737cfb8f9d91eb3fa67 100644 ---- a/dist/chunk-AJED3H6M.mjs -+++ b/dist/chunk-AJED3H6M.mjs -@@ -341,7 +341,6 @@ var NetworkController = class extends BaseController { +diff --git a/dist/chunk-4ZD3DTQ7.js b/dist/chunk-4ZD3DTQ7.js +index e172d15715b3cb4f26c42e51f8c7ff7394075bfe..148c802bac1d79f784618d18fa61d9de3330cae7 100644 +--- a/dist/chunk-4ZD3DTQ7.js ++++ b/dist/chunk-4ZD3DTQ7.js +@@ -341,7 +341,6 @@ var NetworkController = class extends _basecontroller.BaseController { async initializeProvider() { - __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this); - __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this); + _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this); + _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this); - await this.lookupNetwork(); } /** * Refreshes the network meta with EIP-1559 support and the network status -diff --git a/dist/chunk-UEWIYOS6.js b/dist/chunk-UEWIYOS6.js -index 05e09914e085ed2fb67106bc750b8bb46882c80e..16eb520b7658625e411c9c6e35f86bd49fcce52f 100644 ---- a/dist/chunk-UEWIYOS6.js -+++ b/dist/chunk-UEWIYOS6.js -@@ -341,7 +341,6 @@ var NetworkController = class extends _basecontroller.BaseController { +diff --git a/dist/chunk-UG2NYGJD.mjs b/dist/chunk-UG2NYGJD.mjs +index c39eb49a4a1d2b4ddb78aadb4fb03446b1705528..cd7ce41f31434e66b56f584c177d4952e334e212 100644 +--- a/dist/chunk-UG2NYGJD.mjs ++++ b/dist/chunk-UG2NYGJD.mjs +@@ -341,7 +341,6 @@ var NetworkController = class extends BaseController { async initializeProvider() { - _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this); - _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this); + __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this); + __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this); - await this.lookupNetwork(); } /** diff --git a/package.json b/package.json index 4c88945c71fa..bf98136d6445 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,6 @@ "update-mock-cdn": "node test/e2e/mock-cdn/update-mock-cdn-files.js" }, "resolutions": { - "@metamask/network-controller": "npm:@metamask-previews/network-controller@18.1.1-preview-ff0abae", "simple-update-notifier@^1.0.0": "^2.0.0", "@babel/core": "patch:@babel/core@npm%3A7.23.2#~/.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch", "@types/react": "^16.9.53", @@ -241,12 +240,6 @@ "@babel/runtime@npm:^7.18.3": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", "@babel/runtime@npm:^7.8.3": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", "@babel/runtime@npm:^7.8.4": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", - "@metamask/network-controller@npm:^17.2.0": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch", - "@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch", - "@metamask/network-controller@npm:^15.0.0": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch", - "@metamask/network-controller@npm:^18.0.1": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch", - "@metamask/network-controller@npm:^17.2.1": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch", - "@metamask/network-controller@npm:^18.1.0": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch", "@metamask/keyring-controller@npm:^13.0.0": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch", "@metamask/keyring-controller@npm:^12.2.0": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch", "@metamask/keyring-controller@npm:^14.0.1": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch", @@ -256,7 +249,8 @@ "ts-mixer@npm:^6.0.3": "patch:ts-mixer@npm%3A6.0.4#~/.yarn/patches/ts-mixer-npm-6.0.4-5d9747bdf5.patch", "sucrase@npm:3.34.0": "^3.35.0", "@expo/config/glob": "^10.3.10", - "@expo/config-plugins/glob": "^10.3.10" + "@expo/config-plugins/glob": "^10.3.10", + "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch" }, "dependencies": { "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", @@ -318,7 +312,7 @@ "@metamask/message-signing-snap": "^0.3.3", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/name-controller": "^6.0.1", - "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch", + "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch", "@metamask/notification-controller": "^3.0.0", "@metamask/object-multiplex": "^2.0.0", "@metamask/obs-store": "^9.0.0", @@ -340,7 +334,7 @@ "@metamask/snaps-rpc-methods": "^9.1.0", "@metamask/snaps-sdk": "^4.3.0", "@metamask/snaps-utils": "^7.4.0", - "@metamask/transaction-controller": "^29.1.0", + "@metamask/transaction-controller": "^30.0.0", "@metamask/user-operation-controller": "^10.0.0", "@metamask/utils": "^8.2.1", "@ngraveio/bc-ur": "^1.1.12", diff --git a/yarn.lock b/yarn.lock index 0e06af8f4960..33fa5d797d63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5502,9 +5502,9 @@ __metadata: languageName: node linkType: hard -"@metamask/network-controller@npm:@metamask-previews/network-controller@18.1.1-preview-ff0abae": - version: 18.1.1-preview-ff0abae - resolution: "@metamask-previews/network-controller@npm:18.1.1-preview-ff0abae" +"@metamask/network-controller@npm:18.1.2": + version: 18.1.2 + resolution: "@metamask/network-controller@npm:18.1.2" dependencies: "@metamask/base-controller": "npm:^5.0.2" "@metamask/controller-utils": "npm:^9.1.0" @@ -5517,10 +5517,44 @@ __metadata: "@metamask/rpc-errors": "npm:^6.2.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^8.3.0" - async-mutex: "npm:^0.5.0" + async-mutex: "npm:^0.2.6" immer: "npm:^9.0.6" uuid: "npm:^8.3.2" - checksum: 10/bb4de428a2863ffff8f6183ca9fd203160adf0414b07e7a3714c8be94fe138a3a2559d67970d494ef6dde631116d37303553f6f3c2e539ce86f773c023b64d10 + checksum: 10/546829c5d24fa64aa2cae2e7b5f29edf4acb12e1367d7ae92ca30e2b1f56b79d53c4d069bc671029d06b0105eec3581204bcedcdf88896aacb38f7cc0e014cf8 + languageName: node + linkType: hard + +"@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch": + version: 18.1.2 + resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch::version=18.1.2&hash=b6da0e" + dependencies: + "@metamask/base-controller": "npm:^5.0.2" + "@metamask/controller-utils": "npm:^9.1.0" + "@metamask/eth-block-tracker": "npm:^9.0.2" + "@metamask/eth-json-rpc-infura": "npm:^9.1.0" + "@metamask/eth-json-rpc-middleware": "npm:^12.1.1" + "@metamask/eth-json-rpc-provider": "npm:^3.0.2" + "@metamask/eth-query": "npm:^4.0.0" + "@metamask/json-rpc-engine": "npm:^8.0.2" + "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/swappable-obj-proxy": "npm:^2.2.0" + "@metamask/utils": "npm:^8.3.0" + async-mutex: "npm:^0.2.6" + immer: "npm:^9.0.6" + uuid: "npm:^8.3.2" + checksum: 10/f34e01544573763be68b5e7833b98bc136366a2e8b192ac242e5ee965d3e6ada734c93a5abb32670c75de60c929ad4e922e539918fef9991663b6a13aa697b5b + languageName: node + linkType: hard + +"@metamask/nonce-tracker@npm:^5.0.0": + version: 5.0.0 + resolution: "@metamask/nonce-tracker@npm:5.0.0" + dependencies: + "@ethersproject/providers": "npm:^5.7.2" + async-mutex: "npm:^0.3.1" + peerDependencies: + "@metamask/eth-block-tracker": ">=9" + checksum: 10/72bce31702c5575b6dd583dd772312994103ff25389643526284d0e4320588cb0c7b389739fbdb1828f3e6ab387deddfc8cf2b674aa65bf3054db089cafce1db languageName: node linkType: hard @@ -6091,7 +6125,7 @@ __metadata: languageName: node linkType: hard -"@metamask/transaction-controller@npm:^29.0.0, @metamask/transaction-controller@npm:^29.1.0": +"@metamask/transaction-controller@npm:^29.0.0": version: 29.1.0 resolution: "@metamask/transaction-controller@npm:29.1.0" dependencies: @@ -6126,6 +6160,41 @@ __metadata: languageName: node linkType: hard +"@metamask/transaction-controller@npm:^30.0.0": + version: 30.0.0 + resolution: "@metamask/transaction-controller@npm:30.0.0" + dependencies: + "@ethereumjs/common": "npm:^3.2.0" + "@ethereumjs/tx": "npm:^4.2.0" + "@ethereumjs/util": "npm:^8.1.0" + "@ethersproject/abi": "npm:^5.7.0" + "@ethersproject/contracts": "npm:^5.7.0" + "@ethersproject/providers": "npm:^5.7.0" + "@metamask/approval-controller": "npm:^6.0.2" + "@metamask/base-controller": "npm:^5.0.2" + "@metamask/controller-utils": "npm:^9.1.0" + "@metamask/eth-query": "npm:^4.0.0" + "@metamask/gas-fee-controller": "npm:^15.1.2" + "@metamask/metamask-eth-abis": "npm:^3.1.1" + "@metamask/network-controller": "npm:^18.1.2" + "@metamask/nonce-tracker": "npm:^5.0.0" + "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/utils": "npm:^8.3.0" + async-mutex: "npm:^0.2.6" + bn.js: "npm:^5.2.1" + eth-method-registry: "npm:^4.0.0" + fast-json-patch: "npm:^3.1.1" + lodash: "npm:^4.17.21" + uuid: "npm:^8.3.2" + peerDependencies: + "@babel/runtime": ^7.23.9 + "@metamask/approval-controller": ^6.0.0 + "@metamask/gas-fee-controller": ^15.0.0 + "@metamask/network-controller": ^18.1.2 + checksum: 10/549dd7c703993a23edc0cb711f7684c98b75bf187ecfd1f7bcc3b4fe038116a06e4385a2f6e03b1556703ce0d0e4c9ba9787250c016a746778ebdbb52e0331ea + languageName: node + linkType: hard + "@metamask/user-operation-controller@npm:^10.0.0": version: 10.0.0 resolution: "@metamask/user-operation-controller@npm:10.0.0" @@ -12002,15 +12071,6 @@ __metadata: languageName: node linkType: hard -"async-mutex@npm:^0.5.0": - version: 0.5.0 - resolution: "async-mutex@npm:0.5.0" - dependencies: - tslib: "npm:^2.4.0" - checksum: 10/4c6bfce1cc9cd43f723c4d96403ac5f4757f885c953b839cde6956ec8817ff39623b82d67614de10c7933e21626925882fb9bac367db7d15d7cb4f84228722c9 - languageName: node - linkType: hard - "async-settle@npm:^1.0.0": version: 1.0.0 resolution: "async-settle@npm:1.0.0" @@ -24755,7 +24815,7 @@ __metadata: "@metamask/message-signing-snap": "npm:^0.3.3" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/name-controller": "npm:^6.0.1" - "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch" + "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch" "@metamask/notification-controller": "npm:^3.0.0" "@metamask/object-multiplex": "npm:^2.0.0" "@metamask/obs-store": "npm:^9.0.0" @@ -24780,7 +24840,7 @@ __metadata: "@metamask/snaps-utils": "npm:^7.4.0" "@metamask/test-bundler": "npm:^1.0.0" "@metamask/test-dapp": "npm:^8.4.0" - "@metamask/transaction-controller": "npm:^29.1.0" + "@metamask/transaction-controller": "npm:^30.0.0" "@metamask/user-operation-controller": "npm:^10.0.0" "@metamask/utils": "npm:^8.2.1" "@ngraveio/bc-ur": "npm:^1.1.12" From bc18c0e3538486048123c7d048ce83b99fead4c6 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Wed, 29 May 2024 13:37:16 +0000 Subject: [PATCH 4/5] fix: force @metamask/transaction-controller to ^30.0.0 The currently replaced versions are verified compatible. Fixes nonce-tracker issue --- .../nonce-tracker-npm-3.0.0-c5e9a93f9d.patch | 37 -------- package.json | 2 +- yarn.lock | 92 +------------------ 3 files changed, 2 insertions(+), 129 deletions(-) delete mode 100644 .yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch diff --git a/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch b/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch deleted file mode 100644 index 6f5616994ab0..000000000000 --- a/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/dist/NonceTracker.js b/dist/NonceTracker.js -index c97fdc381df0920d862492d41c670d57d5c75941..f7f86019ff0809889a63ef4d9865dafa53651a74 100644 ---- a/dist/NonceTracker.js -+++ b/dist/NonceTracker.js -@@ -14,7 +14,6 @@ class NonceTracker { - constructor(opts) { - this.provider = opts.provider; - this.blockTracker = opts.blockTracker; -- this.web3 = new Web3Provider(opts.provider); - this.getPendingTransactions = opts.getPendingTransactions; - this.getConfirmedTransactions = opts.getConfirmedTransactions; - this.lockMap = {}; -@@ -98,7 +97,7 @@ class NonceTracker { - // we need to make sure our base count - // and pending count are from the same block - const blockNumber = await this.blockTracker.getLatestBlock(); -- const baseCount = await this.web3.getTransactionCount(address, blockNumber); -+ const baseCount = await new Web3Provider(this.provider).getTransactionCount(address, blockNumber); - assert_1.default(Number.isInteger(baseCount), `nonce-tracker - baseCount is not an integer - got: (${typeof baseCount}) "${baseCount}"`); - return { - name: 'network', -diff --git a/dist/NonceTracker.js.map b/dist/NonceTracker.js.map -deleted file mode 100644 -index a34cfe0d83f0c2b176d3edf86f1d17e29cc2ef26..0000000000000000000000000000000000000000 ---- a/dist/NonceTracker.js.map -+++ /dev/null -@@ -1 +0,0 @@ --{"version":3,"file":"NonceTracker.js","sourceRoot":"","sources":["../src/NonceTracker.ts"],"names":[],"mappings":"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"} -\ No newline at end of file -diff --git a/dist/index.js.map b/dist/index.js.map -deleted file mode 100644 -index 3507fe142e8e1fccbea8950950f80ca391a4b293..0000000000000000000000000000000000000000 ---- a/dist/index.js.map -+++ /dev/null -@@ -1 +0,0 @@ --{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAArC,4GAAA,YAAY,OAAA"} -\ No newline at end of file diff --git a/package.json b/package.json index bf98136d6445..fe291fb7dc54 100644 --- a/package.json +++ b/package.json @@ -216,10 +216,10 @@ "request@^2.85.0": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch", "semver@7.3.7": "^7.5.4", "semver@7.3.8": "^7.5.4", - "nonce-tracker@npm:^3.0.0": "patch:nonce-tracker@npm%3A3.0.0#~/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch", "@trezor/schema-utils@npm:1.0.2": "patch:@trezor/schema-utils@npm%3A1.0.2#~/.yarn/patches/@trezor-schema-utils-npm-1.0.2-7dd48689b2.patch", "lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch", "@metamask/snaps-sdk": "^4.3.0", + "@metamask/transaction-controller": "^30.0.0", "@babel/runtime@npm:^7.7.6": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", "@babel/runtime@npm:^7.9.2": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", "@babel/runtime@npm:^7.12.5": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", diff --git a/yarn.lock b/yarn.lock index 33fa5d797d63..593b4a1e3b1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5246,7 +5246,7 @@ __metadata: languageName: node linkType: hard -"@metamask/gas-fee-controller@npm:^15.1.0, @metamask/gas-fee-controller@npm:^15.1.1, @metamask/gas-fee-controller@npm:^15.1.2": +"@metamask/gas-fee-controller@npm:^15.1.1, @metamask/gas-fee-controller@npm:^15.1.2": version: 15.1.2 resolution: "@metamask/gas-fee-controller@npm:15.1.2" dependencies: @@ -6090,76 +6090,6 @@ __metadata: languageName: node linkType: hard -"@metamask/transaction-controller@npm:^28.1.0": - version: 28.1.1 - resolution: "@metamask/transaction-controller@npm:28.1.1" - dependencies: - "@ethereumjs/common": "npm:^3.2.0" - "@ethereumjs/tx": "npm:^4.2.0" - "@ethereumjs/util": "npm:^8.1.0" - "@ethersproject/abi": "npm:^5.7.0" - "@ethersproject/contracts": "npm:^5.7.0" - "@ethersproject/providers": "npm:^5.7.0" - "@metamask/approval-controller": "npm:^6.0.1" - "@metamask/base-controller": "npm:^5.0.1" - "@metamask/controller-utils": "npm:^9.1.0" - "@metamask/eth-query": "npm:^4.0.0" - "@metamask/gas-fee-controller": "npm:^15.1.0" - "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^18.1.0" - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" - async-mutex: "npm:^0.2.6" - bn.js: "npm:^5.2.1" - eth-method-registry: "npm:^4.0.0" - fast-json-patch: "npm:^3.1.1" - lodash: "npm:^4.17.21" - nonce-tracker: "npm:^3.0.0" - uuid: "npm:^8.3.2" - peerDependencies: - "@babel/runtime": ^7.23.9 - "@metamask/approval-controller": ^6.0.0 - "@metamask/gas-fee-controller": ^15.0.0 - "@metamask/network-controller": ^18.0.0 - checksum: 10/01e6f0e1431e56cc0ef986cbfa99cf37e0a44aade14419c69d815be77847bb33b43049b90c6e6961bb5070ecfe1420c893db8a68c0fd6977d5ec28d9853d6554 - languageName: node - linkType: hard - -"@metamask/transaction-controller@npm:^29.0.0": - version: 29.1.0 - resolution: "@metamask/transaction-controller@npm:29.1.0" - dependencies: - "@ethereumjs/common": "npm:^3.2.0" - "@ethereumjs/tx": "npm:^4.2.0" - "@ethereumjs/util": "npm:^8.1.0" - "@ethersproject/abi": "npm:^5.7.0" - "@ethersproject/contracts": "npm:^5.7.0" - "@ethersproject/providers": "npm:^5.7.0" - "@metamask/approval-controller": "npm:^6.0.2" - "@metamask/base-controller": "npm:^5.0.2" - "@metamask/controller-utils": "npm:^9.1.0" - "@metamask/eth-query": "npm:^4.0.0" - "@metamask/gas-fee-controller": "npm:^15.1.2" - "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^18.1.1" - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" - async-mutex: "npm:^0.2.6" - bn.js: "npm:^5.2.1" - eth-method-registry: "npm:^4.0.0" - fast-json-patch: "npm:^3.1.1" - lodash: "npm:^4.17.21" - nonce-tracker: "npm:^3.0.0" - uuid: "npm:^8.3.2" - peerDependencies: - "@babel/runtime": ^7.23.9 - "@metamask/approval-controller": ^6.0.0 - "@metamask/gas-fee-controller": ^15.0.0 - "@metamask/network-controller": ^18.0.0 - checksum: 10/4b96d17d0bcc0f13ac72a94a3b4f3c3dd0f31a13aa6ae74b343ebe2d77e9aeb636b28c14ab23f08c6d8c6b66158c93f34243cf551f4c12d06b4ea8e87ae4ae64 - languageName: node - linkType: hard - "@metamask/transaction-controller@npm:^30.0.0": version: 30.0.0 resolution: "@metamask/transaction-controller@npm:30.0.0" @@ -26495,26 +26425,6 @@ __metadata: languageName: node linkType: hard -"nonce-tracker@npm:3.0.0": - version: 3.0.0 - resolution: "nonce-tracker@npm:3.0.0" - dependencies: - "@ethersproject/providers": "npm:^5.7.2" - async-mutex: "npm:^0.3.1" - checksum: 10/6e295845f70c2be1285cff42833104d70c0959d88a94163d1db98f8aa6cb925f1004e5b0e4a8248c2d5b93ee6103133c5e97293d89e6d95e9a860d3b60ed54ea - languageName: node - linkType: hard - -"nonce-tracker@patch:nonce-tracker@npm%3A3.0.0#~/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch": - version: 3.0.0 - resolution: "nonce-tracker@patch:nonce-tracker@npm%3A3.0.0#~/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch::version=3.0.0&hash=8c505e" - dependencies: - "@ethersproject/providers": "npm:^5.7.2" - async-mutex: "npm:^0.3.1" - checksum: 10/f8556fb19d07cac7818affaf0478876ed475bc600276e6cae4e2bffc8116e5dec78b64951c0c4e360a7f4ae07f91f86d25beb6f03e81144d4679443bf19f4d1f - languageName: node - linkType: hard - "nopt@npm:^4.0.1": version: 4.0.1 resolution: "nopt@npm:4.0.1" From d06eb7cc8084da7c8ed1eaa553f8c9991b9e304a Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Wed, 29 May 2024 13:54:45 +0000 Subject: [PATCH 5/5] update lavamoat policies --- lavamoat/browserify/beta/policy.json | 47 +++++++------------------ lavamoat/browserify/desktop/policy.json | 47 +++++++------------------ lavamoat/browserify/flask/policy.json | 47 +++++++------------------ lavamoat/browserify/main/policy.json | 47 +++++++------------------ lavamoat/browserify/mmi/policy.json | 47 +++++++------------------ 5 files changed, 65 insertions(+), 170 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index c88fe81c8157..d2d33794b42e 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1034,19 +1034,6 @@ "sass-loader>klona": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/providers>@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true - } - }, "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { "packages": { "@metamask/providers>@metamask/rpc-errors": true, @@ -1684,11 +1671,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>eth-block-tracker": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, @@ -1709,13 +1696,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@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/providers>@metamask/rpc-errors": true, "@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/providers>@metamask/rpc-errors": true, @@ -1729,19 +1722,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/network-controller>eth-block-tracker": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true, - "pify": true - } - }, "@metamask/notification-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2082,7 +2062,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2339,7 +2319,7 @@ "@metamask/network-controller": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/base-controller": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2358,15 +2338,14 @@ "immer": true } }, - "@metamask/transaction-controller>nonce-tracker": { + "@metamask/transaction-controller>@metamask/nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/network-controller>eth-block-tracker": true, - "@metamask/transaction-controller>nonce-tracker>async-mutex": true, + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true, "browserify>assert": true } }, - "@metamask/transaction-controller>nonce-tracker>async-mutex": { + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": { "globals": { "clearTimeout": true, "setTimeout": true diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index 7c5d7ecd3dae..f8783008cb8f 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -1179,19 +1179,6 @@ "sass-loader>klona": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/providers>@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true - } - }, "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { "packages": { "@metamask/providers>@metamask/rpc-errors": true, @@ -1829,11 +1816,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>eth-block-tracker": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, @@ -1854,13 +1841,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@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/providers>@metamask/rpc-errors": true, "@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/providers>@metamask/rpc-errors": true, @@ -1874,19 +1867,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/network-controller>eth-block-tracker": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true, - "pify": true - } - }, "@metamask/notification-controller": { "packages": { "@metamask/notification-controller>@metamask/base-controller": true, @@ -2272,7 +2252,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2630,7 +2610,7 @@ "@metamask/network-controller": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/base-controller": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2649,15 +2629,14 @@ "immer": true } }, - "@metamask/transaction-controller>nonce-tracker": { + "@metamask/transaction-controller>@metamask/nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/network-controller>eth-block-tracker": true, - "@metamask/transaction-controller>nonce-tracker>async-mutex": true, + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true, "browserify>assert": true } }, - "@metamask/transaction-controller>nonce-tracker>async-mutex": { + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": { "globals": { "clearTimeout": true, "setTimeout": true diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 95538eded218..3819cdaa0407 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1179,19 +1179,6 @@ "sass-loader>klona": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/providers>@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true - } - }, "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { "packages": { "@metamask/providers>@metamask/rpc-errors": true, @@ -1829,11 +1816,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>eth-block-tracker": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, @@ -1854,13 +1841,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@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/providers>@metamask/rpc-errors": true, "@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/providers>@metamask/rpc-errors": true, @@ -1874,19 +1867,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/network-controller>eth-block-tracker": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true, - "pify": true - } - }, "@metamask/notification-controller": { "packages": { "@metamask/notification-controller>@metamask/base-controller": true, @@ -2324,7 +2304,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2682,7 +2662,7 @@ "@metamask/network-controller": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/base-controller": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2701,15 +2681,14 @@ "immer": true } }, - "@metamask/transaction-controller>nonce-tracker": { + "@metamask/transaction-controller>@metamask/nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/network-controller>eth-block-tracker": true, - "@metamask/transaction-controller>nonce-tracker>async-mutex": true, + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true, "browserify>assert": true } }, - "@metamask/transaction-controller>nonce-tracker>async-mutex": { + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": { "globals": { "clearTimeout": true, "setTimeout": true diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 1a3958cffba7..c0d371a59a36 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1034,19 +1034,6 @@ "sass-loader>klona": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/providers>@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true - } - }, "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { "packages": { "@metamask/providers>@metamask/rpc-errors": true, @@ -1684,11 +1671,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>eth-block-tracker": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, @@ -1709,13 +1696,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@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/providers>@metamask/rpc-errors": true, "@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/providers>@metamask/rpc-errors": true, @@ -1729,19 +1722,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/network-controller>eth-block-tracker": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true, - "pify": true - } - }, "@metamask/notification-controller": { "packages": { "@metamask/notification-controller>@metamask/base-controller": true, @@ -2179,7 +2159,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2537,7 +2517,7 @@ "@metamask/network-controller": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/base-controller": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2556,15 +2536,14 @@ "immer": true } }, - "@metamask/transaction-controller>nonce-tracker": { + "@metamask/transaction-controller>@metamask/nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/network-controller>eth-block-tracker": true, - "@metamask/transaction-controller>nonce-tracker>async-mutex": true, + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true, "browserify>assert": true } }, - "@metamask/transaction-controller>nonce-tracker>async-mutex": { + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": { "globals": { "clearTimeout": true, "setTimeout": true diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 44e91993d391..dcbe1d079ca4 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1319,19 +1319,6 @@ "sass-loader>klona": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/providers>@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true - } - }, "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { "packages": { "@metamask/providers>@metamask/rpc-errors": true, @@ -1969,11 +1956,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, - "@metamask/network-controller>eth-block-tracker": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, @@ -1994,13 +1981,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@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/providers>@metamask/rpc-errors": true, "@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/providers>@metamask/rpc-errors": true, @@ -2014,19 +2007,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/network-controller>eth-block-tracker": { - "globals": { - "clearTimeout": true, - "console.error": true, - "setTimeout": true - }, - "packages": { - "@metamask/eth-query>json-rpc-random-id": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true, - "pify": true - } - }, "@metamask/notification-controller": { "packages": { "@metamask/notification-controller>@metamask/base-controller": true, @@ -2464,7 +2444,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2822,7 +2802,7 @@ "@metamask/network-controller": true, "@metamask/providers>@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/base-controller": true, - "@metamask/transaction-controller>nonce-tracker": true, + "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, @@ -2841,15 +2821,14 @@ "immer": true } }, - "@metamask/transaction-controller>nonce-tracker": { + "@metamask/transaction-controller>@metamask/nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/network-controller>eth-block-tracker": true, - "@metamask/transaction-controller>nonce-tracker>async-mutex": true, + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true, "browserify>assert": true } }, - "@metamask/transaction-controller>nonce-tracker>async-mutex": { + "@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": { "globals": { "clearTimeout": true, "setTimeout": true