diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index d793002e4a07..44435a228376 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1124,8 +1124,8 @@ }, "packages": { "@babel/runtime": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/eth-token-tracker>deep-equal": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, "@metamask/ethjs-contract": true, "@metamask/ethjs-query": true, "@metamask/safe-event-emitter": true, @@ -1133,6 +1133,19 @@ "human-standard-token-abi": true } }, + "@metamask/eth-token-tracker>@metamask/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/eth-token-tracker>deep-equal": { "packages": { "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true, @@ -1221,19 +1234,6 @@ "string.prototype.matchall>get-intrinsic": true } }, - "@metamask/eth-token-tracker>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/eth-trezor-keyring": { "globals": { "setTimeout": true @@ -1669,11 +1669,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>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, @@ -1714,6 +1714,19 @@ "@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 @@ -2361,7 +2374,7 @@ "@metamask/transaction-controller>nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, + "@metamask/network-controller>eth-block-tracker": true, "@metamask/transaction-controller>nonce-tracker>async-mutex": true, "browserify>assert": true } diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index 4feabf609f82..94515faa9fe9 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -1219,8 +1219,8 @@ }, "packages": { "@babel/runtime": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/eth-token-tracker>deep-equal": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, "@metamask/ethjs-contract": true, "@metamask/ethjs-query": true, "@metamask/safe-event-emitter": true, @@ -1228,6 +1228,19 @@ "human-standard-token-abi": true } }, + "@metamask/eth-token-tracker>@metamask/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/eth-token-tracker>deep-equal": { "packages": { "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true, @@ -1316,19 +1329,6 @@ "string.prototype.matchall>get-intrinsic": true } }, - "@metamask/eth-token-tracker>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/eth-trezor-keyring": { "globals": { "setTimeout": true @@ -1764,11 +1764,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>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, @@ -1809,6 +1809,19 @@ "@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, @@ -2647,7 +2660,7 @@ "@metamask/transaction-controller>nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, + "@metamask/network-controller>eth-block-tracker": true, "@metamask/transaction-controller>nonce-tracker>async-mutex": true, "browserify>assert": true } diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 67920ab999d1..f3ff4a11ac67 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1219,8 +1219,8 @@ }, "packages": { "@babel/runtime": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/eth-token-tracker>deep-equal": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, "@metamask/ethjs-contract": true, "@metamask/ethjs-query": true, "@metamask/safe-event-emitter": true, @@ -1228,6 +1228,19 @@ "human-standard-token-abi": true } }, + "@metamask/eth-token-tracker>@metamask/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/eth-token-tracker>deep-equal": { "packages": { "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true, @@ -1316,19 +1329,6 @@ "string.prototype.matchall>get-intrinsic": true } }, - "@metamask/eth-token-tracker>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/eth-trezor-keyring": { "globals": { "setTimeout": true @@ -1764,11 +1764,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>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, @@ -1809,6 +1809,19 @@ "@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, @@ -2699,7 +2712,7 @@ "@metamask/transaction-controller>nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, + "@metamask/network-controller>eth-block-tracker": true, "@metamask/transaction-controller>nonce-tracker>async-mutex": true, "browserify>assert": true } diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index a15b8f58296e..6cfa6fb21e8a 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1124,8 +1124,8 @@ }, "packages": { "@babel/runtime": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/eth-token-tracker>deep-equal": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, "@metamask/ethjs-contract": true, "@metamask/ethjs-query": true, "@metamask/safe-event-emitter": true, @@ -1133,6 +1133,19 @@ "human-standard-token-abi": true } }, + "@metamask/eth-token-tracker>@metamask/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/eth-token-tracker>deep-equal": { "packages": { "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true, @@ -1221,19 +1234,6 @@ "string.prototype.matchall>get-intrinsic": true } }, - "@metamask/eth-token-tracker>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/eth-trezor-keyring": { "globals": { "setTimeout": true @@ -1669,11 +1669,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>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, @@ -1714,6 +1714,19 @@ "@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, @@ -2604,7 +2617,7 @@ "@metamask/transaction-controller>nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, + "@metamask/network-controller>eth-block-tracker": true, "@metamask/transaction-controller>nonce-tracker>async-mutex": true, "browserify>assert": true } diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index eb5710f2a376..1d7434f2866c 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1309,8 +1309,8 @@ }, "packages": { "@babel/runtime": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/eth-token-tracker>deep-equal": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, "@metamask/ethjs-contract": true, "@metamask/ethjs-query": true, "@metamask/safe-event-emitter": true, @@ -1318,6 +1318,19 @@ "human-standard-token-abi": true } }, + "@metamask/eth-token-tracker>@metamask/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/eth-token-tracker>deep-equal": { "packages": { "@metamask/eth-token-tracker>deep-equal>es-get-iterator": true, @@ -1406,19 +1419,6 @@ "string.prototype.matchall>get-intrinsic": true } }, - "@metamask/eth-token-tracker>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/eth-trezor-keyring": { "globals": { "setTimeout": true @@ -1854,11 +1854,11 @@ "@metamask/controller-utils": true, "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, - "@metamask/eth-token-tracker>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, @@ -1899,6 +1899,19 @@ "@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, @@ -2789,7 +2802,7 @@ "@metamask/transaction-controller>nonce-tracker": { "packages": { "@ethersproject/providers": true, - "@metamask/eth-token-tracker>eth-block-tracker": true, + "@metamask/network-controller>eth-block-tracker": true, "@metamask/transaction-controller>nonce-tracker>async-mutex": true, "browserify>assert": true } diff --git a/package.json b/package.json index 418ecbead464..bc9d65df1497 100644 --- a/package.json +++ b/package.json @@ -297,12 +297,12 @@ "@metamask/desktop": "^0.3.0", "@metamask/ens-controller": "^10.0.1", "@metamask/eth-json-rpc-filters": "^7.0.0", - "@metamask/eth-json-rpc-middleware": "^12.1.0", + "@metamask/eth-json-rpc-middleware": "^12.1.1", "@metamask/eth-ledger-bridge-keyring": "^2.0.1", "@metamask/eth-query": "^4.0.0", "@metamask/eth-sig-util": "^7.0.1", "@metamask/eth-snap-keyring": "^2.1.2", - "@metamask/eth-token-tracker": "^7.0.2", + "@metamask/eth-token-tracker": "^8.0.0", "@metamask/eth-trezor-keyring": "^3.1.0", "@metamask/etherscan-link": "^3.0.0", "@metamask/ethjs": "^0.6.0", diff --git a/yarn.lock b/yarn.lock index f2b119eb00f8..3c68a60ca37b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5009,6 +5009,19 @@ __metadata: languageName: node linkType: hard +"@metamask/eth-block-tracker@npm:^9.0.2": + version: 9.0.3 + resolution: "@metamask/eth-block-tracker@npm:9.0.3" + dependencies: + "@metamask/eth-json-rpc-provider": "npm:^3.0.2" + "@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: f49bb158b2c9669e91813a1f34948a6c2a2d1f8507ea0b1afae9a003a4d276d892b5cde4c183f970fcec32f253a14f1abf39b6411beabeb113eeed75cd7e29b8 + languageName: node + linkType: hard + "@metamask/eth-hd-keyring@npm:^7.0.1": version: 7.0.1 resolution: "@metamask/eth-hd-keyring@npm:7.0.1" @@ -5048,20 +5061,20 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-json-rpc-middleware@npm:^12.1.0": - version: 12.1.0 - resolution: "@metamask/eth-json-rpc-middleware@npm:12.1.0" +"@metamask/eth-json-rpc-middleware@npm:^12.1.0, @metamask/eth-json-rpc-middleware@npm:^12.1.1": + version: 12.1.1 + resolution: "@metamask/eth-json-rpc-middleware@npm:12.1.1" dependencies: + "@metamask/eth-block-tracker": "npm:^9.0.2" "@metamask/eth-json-rpc-provider": "npm:^2.1.0" "@metamask/eth-sig-util": "npm:^7.0.0" "@metamask/json-rpc-engine": "npm:^7.1.1" "@metamask/rpc-errors": "npm:^6.0.0" "@metamask/utils": "npm:^8.1.0" - eth-block-tracker: "npm:^8.0.0" klona: "npm:^2.0.6" pify: "npm:^5.0.0" safe-stable-stringify: "npm:^2.4.3" - checksum: 35a34dba839b957068030880328b43aabca615cc9f9fbf2d11fd998f0cc622ff3eec87582861b6cc517ee18cbd652f5c237647d651aa939151ac3f8738abae73 + checksum: 0018da198a4f8fbdeab25aa8184377b3215e365b2a631d0f8d7f0577e281c860a1d19fc58ad310afb6d005291c0797dabfe14bdb4adb16300c7f28b11fb26cbc languageName: node linkType: hard @@ -5183,20 +5196,20 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-token-tracker@npm:^7.0.2": - version: 7.0.2 - resolution: "@metamask/eth-token-tracker@npm:7.0.2" +"@metamask/eth-token-tracker@npm:^8.0.0": + version: 8.0.0 + resolution: "@metamask/eth-token-tracker@npm:8.0.0" dependencies: + "@metamask/eth-block-tracker": "npm:^9.0.2" "@metamask/ethjs-contract": "npm:^0.4.1" "@metamask/ethjs-query": "npm:^0.7.1" "@metamask/safe-event-emitter": "npm:^3.0.0" bn.js: "npm:^5.2.1" deep-equal: "npm:^2.2.0" - eth-block-tracker: "npm:^8.0.0" human-standard-token-abi: "npm:^2.0.0" peerDependencies: "@babel/runtime": ^7.21.0 - checksum: eec5b953de3449344107408ea820f95e95a1921da34259a80a6b6ae201fe0d7a4e87abf028b91aa865e904c88c96e7a39407386d89904076e7f1fd632960a86f + checksum: 036540abaf13cdd5a0037d4f8cb94076b96c1c9b7de432918f2b6cb07e45abd79dff2d50313e870c711f3f408359be6329ba90f29b3ecba74577a9b913fd3e2a languageName: node linkType: hard @@ -25598,12 +25611,12 @@ __metadata: "@metamask/eslint-config-typescript": "npm:^9.0.1" "@metamask/eslint-plugin-design-tokens": "npm:^1.1.0" "@metamask/eth-json-rpc-filters": "npm:^7.0.0" - "@metamask/eth-json-rpc-middleware": "npm:^12.1.0" + "@metamask/eth-json-rpc-middleware": "npm:^12.1.1" "@metamask/eth-ledger-bridge-keyring": "npm:^2.0.1" "@metamask/eth-query": "npm:^4.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" "@metamask/eth-snap-keyring": "npm:^2.1.2" - "@metamask/eth-token-tracker": "npm:^7.0.2" + "@metamask/eth-token-tracker": "npm:^8.0.0" "@metamask/eth-trezor-keyring": "npm:^3.1.0" "@metamask/etherscan-link": "npm:^3.0.0" "@metamask/ethjs": "npm:^0.6.0"