From 080d72abed62922a7abcb004a5d106ab5e064f59 Mon Sep 17 00:00:00 2001 From: Nidhi Kumari Date: Mon, 6 Feb 2023 20:41:13 +0530 Subject: [PATCH] updated assets and phishing controller packages (#17569) * updated controller versions * updated policy and lock files --- lavamoat/browserify/beta/policy.json | 43 ++++++++++- lavamoat/browserify/flask/policy.json | 43 ++++++++++- lavamoat/browserify/main/policy.json | 43 ++++++++++- package.json | 4 +- yarn.lock | 101 ++++++++++++++++++-------- 5 files changed, 193 insertions(+), 41 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index cd680dc6f..2d82f5923 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -703,15 +703,16 @@ "setTimeout": true }, "packages": { - "@ethersproject/abi": true, "@ethersproject/contracts": true, "@ethersproject/providers": true, + "@metamask/assets-controllers>@metamask/abi-utils": true, + "@metamask/assets-controllers>@metamask/controller-utils": true, "@metamask/assets-controllers>abort-controller": true, "@metamask/assets-controllers>multiformats": true, "@metamask/base-controller": true, "@metamask/contract-metadata": true, - "@metamask/controller-utils": true, "@metamask/metamask-eth-abis": true, + "@metamask/utils": true, "browserify>events": true, "eth-json-rpc-filters>async-mutex": true, "eth-query": true, @@ -721,6 +722,27 @@ "uuid": true } }, + "@metamask/assets-controllers>@metamask/abi-utils": { + "packages": { + "@metamask/utils": true, + "@metamask/utils>superstruct": true + } + }, + "@metamask/assets-controllers>@metamask/controller-utils": { + "globals": { + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>isomorphic-fetch": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/assets-controllers>abort-controller": { "globals": { "AbortController": true @@ -1204,12 +1226,27 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, "@metamask/controller-utils>isomorphic-fetch": true, + "@metamask/phishing-controller>@metamask/controller-utils": true, "@metamask/phishing-controller>eth-phishing-detect": true, "punycode": true } }, + "@metamask/phishing-controller>@metamask/controller-utils": { + "globals": { + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>isomorphic-fetch": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/phishing-controller>eth-phishing-detect": { "packages": { "eslint>optionator>fast-levenshtein": true diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 1da0ea6fe..eeaeaf3d5 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -703,15 +703,16 @@ "setTimeout": true }, "packages": { - "@ethersproject/abi": true, "@ethersproject/contracts": true, "@ethersproject/providers": true, + "@metamask/assets-controllers>@metamask/abi-utils": true, + "@metamask/assets-controllers>@metamask/controller-utils": true, "@metamask/assets-controllers>abort-controller": true, "@metamask/assets-controllers>multiformats": true, "@metamask/base-controller": true, "@metamask/contract-metadata": true, - "@metamask/controller-utils": true, "@metamask/metamask-eth-abis": true, + "@metamask/utils": true, "browserify>events": true, "eth-json-rpc-filters>async-mutex": true, "eth-query": true, @@ -721,6 +722,27 @@ "uuid": true } }, + "@metamask/assets-controllers>@metamask/abi-utils": { + "packages": { + "@metamask/utils": true, + "@metamask/utils>superstruct": true + } + }, + "@metamask/assets-controllers>@metamask/controller-utils": { + "globals": { + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>isomorphic-fetch": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/assets-controllers>abort-controller": { "globals": { "AbortController": true @@ -1216,12 +1238,27 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, "@metamask/controller-utils>isomorphic-fetch": true, + "@metamask/phishing-controller>@metamask/controller-utils": true, "@metamask/phishing-controller>eth-phishing-detect": true, "punycode": true } }, + "@metamask/phishing-controller>@metamask/controller-utils": { + "globals": { + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>isomorphic-fetch": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/phishing-controller>eth-phishing-detect": { "packages": { "eslint>optionator>fast-levenshtein": true diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index cd680dc6f..2d82f5923 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -703,15 +703,16 @@ "setTimeout": true }, "packages": { - "@ethersproject/abi": true, "@ethersproject/contracts": true, "@ethersproject/providers": true, + "@metamask/assets-controllers>@metamask/abi-utils": true, + "@metamask/assets-controllers>@metamask/controller-utils": true, "@metamask/assets-controllers>abort-controller": true, "@metamask/assets-controllers>multiformats": true, "@metamask/base-controller": true, "@metamask/contract-metadata": true, - "@metamask/controller-utils": true, "@metamask/metamask-eth-abis": true, + "@metamask/utils": true, "browserify>events": true, "eth-json-rpc-filters>async-mutex": true, "eth-query": true, @@ -721,6 +722,27 @@ "uuid": true } }, + "@metamask/assets-controllers>@metamask/abi-utils": { + "packages": { + "@metamask/utils": true, + "@metamask/utils>superstruct": true + } + }, + "@metamask/assets-controllers>@metamask/controller-utils": { + "globals": { + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>isomorphic-fetch": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/assets-controllers>abort-controller": { "globals": { "AbortController": true @@ -1204,12 +1226,27 @@ }, "packages": { "@metamask/base-controller": true, - "@metamask/controller-utils": true, "@metamask/controller-utils>isomorphic-fetch": true, + "@metamask/phishing-controller>@metamask/controller-utils": true, "@metamask/phishing-controller>eth-phishing-detect": true, "punycode": true } }, + "@metamask/phishing-controller>@metamask/controller-utils": { + "globals": { + "console.error": true, + "fetch": true, + "setTimeout": true + }, + "packages": { + "@metamask/controller-utils>isomorphic-fetch": true, + "browserify>buffer": true, + "eslint>fast-deep-equal": true, + "eth-ens-namehash": true, + "ethereumjs-util": true, + "ethjs>ethjs-unit": true + } + }, "@metamask/phishing-controller>eth-phishing-detect": { "packages": { "eslint>optionator>fast-levenshtein": true diff --git a/package.json b/package.json index 97ce5e233..4ebac80c0 100644 --- a/package.json +++ b/package.json @@ -221,7 +221,7 @@ "@metamask/address-book-controller": "^1.0.0", "@metamask/announcement-controller": "^1.0.0", "@metamask/approval-controller": "^1.0.0", - "@metamask/assets-controllers": "^3.0.1", + "@metamask/assets-controllers": "^4.0.1", "@metamask/base-controller": "^1.0.0", "@metamask/contract-metadata": "^2.2.0", "@metamask/controller-utils": "^1.0.0", @@ -238,7 +238,7 @@ "@metamask/notification-controller": "^1.0.0", "@metamask/obs-store": "^5.0.0", "@metamask/permission-controller": "^1.0.0", - "@metamask/phishing-controller": "^1.1.0", + "@metamask/phishing-controller": "^1.1.2", "@metamask/post-message-stream": "^6.0.0", "@metamask/providers": "^10.2.1", "@metamask/rate-limit-controller": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index 7c97d0b2e..a63003e42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3509,6 +3509,16 @@ __metadata: languageName: node linkType: hard +"@metamask/abi-utils@npm:^1.1.0": + version: 1.1.1 + resolution: "@metamask/abi-utils@npm:1.1.1" + dependencies: + "@metamask/utils": ^3.4.1 + superstruct: ^1.0.3 + checksum: 475e6ef5f91daaeed86d757f092623dfb31f492969115a2886e499f7ac91f8cccb33abda3368112f4e4c1de3b124dd8a0f48990293ca25ac1de3978796bd622d + languageName: node + linkType: hard + "@metamask/address-book-controller@npm:^1.0.0": version: 1.0.0 resolution: "@metamask/address-book-controller@npm:1.0.0" @@ -3541,20 +3551,21 @@ __metadata: languageName: node linkType: hard -"@metamask/assets-controllers@npm:^3.0.1": - version: 3.0.1 - resolution: "@metamask/assets-controllers@npm:3.0.1" +"@metamask/assets-controllers@npm:^4.0.1": + version: 4.0.1 + resolution: "@metamask/assets-controllers@npm:4.0.1" dependencies: - "@ethersproject/abi": ^5.7.0 "@ethersproject/bignumber": ^5.7.0 "@ethersproject/contracts": ^5.7.0 "@ethersproject/providers": ^5.7.0 - "@metamask/base-controller": ^1.1.1 + "@metamask/abi-utils": ^1.1.0 + "@metamask/base-controller": ^1.1.2 "@metamask/contract-metadata": ^2.1.0 - "@metamask/controller-utils": ^1.0.0 + "@metamask/controller-utils": ^2.0.0 "@metamask/metamask-eth-abis": 3.0.0 - "@metamask/network-controller": ^2.0.0 - "@metamask/preferences-controller": ^1.0.1 + "@metamask/network-controller": ^4.0.0 + "@metamask/preferences-controller": ^1.0.2 + "@metamask/utils": ^3.3.1 "@types/uuid": ^8.3.0 abort-controller: ^3.0.0 async-mutex: ^0.2.6 @@ -3567,8 +3578,8 @@ __metadata: single-call-balance-checker-abi: ^1.0.0 uuid: ^8.3.2 peerDependencies: - "@metamask/network-controller": ^2.0.0 - checksum: c356a820929738e3ad83a5cfe20993a1e7c4dac6835b308d8cb32efe8542c339664ae3046a1dedce6ee2a4c45cec5528015309366fa96674837dca7ea001998f + "@metamask/network-controller": ^4.0.0 + checksum: 18d3212640a50d2ff56134bceb275718880b80fccddc8b52b325f9119a6fb06919935320b9604550bbda1fc73f13122b3d185330cb423a616daf8f465ace29e8 languageName: node linkType: hard @@ -3586,13 +3597,13 @@ __metadata: languageName: node linkType: hard -"@metamask/base-controller@npm:^1.0.0, @metamask/base-controller@npm:^1.1.1": - version: 1.1.1 - resolution: "@metamask/base-controller@npm:1.1.1" +"@metamask/base-controller@npm:^1.0.0, @metamask/base-controller@npm:^1.1.1, @metamask/base-controller@npm:^1.1.2": + version: 1.1.2 + resolution: "@metamask/base-controller@npm:1.1.2" dependencies: - "@metamask/controller-utils": ^1.0.0 + "@metamask/controller-utils": ^2.0.0 immer: ^9.0.6 - checksum: 676408129710a247e95a0705344aef09f2ed55b05ba516fc2788302e1cc2472b5e85f24866e7111ee667bd9e1311eb8f75da8409131ad9dc9901d6e31131db2a + checksum: 54a114615924a755fe1a1e2d0b9fd7b9f982dee813a9908889e133aec8190f7d52a7903f830d66b020b487c1c4047b1a379ac07e9c80fec67688763bd8a713dd languageName: node linkType: hard @@ -3634,6 +3645,20 @@ __metadata: languageName: node linkType: hard +"@metamask/controller-utils@npm:^2.0.0": + version: 2.0.0 + resolution: "@metamask/controller-utils@npm:2.0.0" + dependencies: + eth-ens-namehash: ^2.0.8 + eth-rpc-errors: ^4.0.0 + ethereumjs-util: ^7.0.10 + ethjs-unit: ^0.1.6 + fast-deep-equal: ^3.1.3 + isomorphic-fetch: ^3.0.0 + checksum: 7e77aad25057b63a62a05058685fc07f78693d737892fc617a23ae06512715ed74a536174396e04cc276999e44c7ca67bd8a0026e5b820455dbf6eb5d0c7c173 + languageName: node + linkType: hard + "@metamask/design-tokens@npm:^1.6.0, @metamask/design-tokens@npm:^1.9.0": version: 1.11.1 resolution: "@metamask/design-tokens@npm:1.11.1" @@ -3894,6 +3919,22 @@ __metadata: languageName: node linkType: hard +"@metamask/network-controller@npm:^4.0.0": + version: 4.0.0 + resolution: "@metamask/network-controller@npm:4.0.0" + dependencies: + "@metamask/base-controller": ^1.1.2 + "@metamask/controller-utils": ^2.0.0 + async-mutex: ^0.2.6 + babel-runtime: ^6.26.0 + eth-json-rpc-infura: ^5.1.0 + eth-query: ^2.1.2 + immer: ^9.0.6 + web3-provider-engine: ^16.0.3 + checksum: 19dfa74cefc435f5205020c68b948956c52689cdfaa153dc37d116e866f61903396b4b19055975d6fc9ab4185b34e87a641eba8aebb864e9161ed5e561b35263 + languageName: node + linkType: hard + "@metamask/network-controller@npm:~1.0.0": version: 1.0.0 resolution: "@metamask/network-controller@npm:1.0.0" @@ -3974,17 +4015,17 @@ __metadata: languageName: node linkType: hard -"@metamask/phishing-controller@npm:^1.1.0": - version: 1.1.0 - resolution: "@metamask/phishing-controller@npm:1.1.0" +"@metamask/phishing-controller@npm:^1.1.2": + version: 1.1.2 + resolution: "@metamask/phishing-controller@npm:1.1.2" dependencies: - "@metamask/base-controller": ^1.1.1 - "@metamask/controller-utils": ^1.0.0 + "@metamask/base-controller": ^1.1.2 + "@metamask/controller-utils": ^2.0.0 "@types/punycode": ^2.1.0 eth-phishing-detect: ^1.2.0 isomorphic-fetch: ^3.0.0 punycode: ^2.1.1 - checksum: bc8c066dd9ed3fff9456ffd2d888c5c78e45a4f4b8e19903caa47b07f42bb298c95956d5df22aef805dbbf2dac6dfb5291f605636fb0725417ae6e0d1c14528a + checksum: a85427c5c0adab2651c9fb0207cae9501597b820d0807c35177615533bba2626a4c2458b4863f0bef987cc5dfbd523d70a60d3c48bd332ebc8bd6b5a8f640c4e languageName: node linkType: hard @@ -4022,13 +4063,13 @@ __metadata: languageName: node linkType: hard -"@metamask/preferences-controller@npm:^1.0.1": - version: 1.0.1 - resolution: "@metamask/preferences-controller@npm:1.0.1" +"@metamask/preferences-controller@npm:^1.0.2": + version: 1.0.2 + resolution: "@metamask/preferences-controller@npm:1.0.2" dependencies: - "@metamask/base-controller": ^1.1.1 - "@metamask/controller-utils": ^1.0.0 - checksum: 3ad7dcf40cc1dc6679d37f705418d4d18da2acce120ce6bd09b0e6755484d193139fd85cf2c0b7374d867ab8a03d7f5bc74ebc8c2cdc003d5872f33d34c1e965 + "@metamask/base-controller": ^1.1.2 + "@metamask/controller-utils": ^2.0.0 + checksum: 466fbe6919da3e9003a7325443fc9c3f609072b6bbfe2216ed66bca04b43cc2bb033a016f4d0f906dc1cf19a8ad0c1abe7e767c02c38684293f5e12423a89f1d languageName: node linkType: hard @@ -4254,7 +4295,7 @@ __metadata: languageName: node linkType: hard -"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.3.0, @metamask/utils@npm:^3.4.0, @metamask/utils@npm:^3.4.1": +"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.3.0, @metamask/utils@npm:^3.3.1, @metamask/utils@npm:^3.4.0, @metamask/utils@npm:^3.4.1": version: 3.4.1 resolution: "@metamask/utils@npm:3.4.1" dependencies: @@ -24062,7 +24103,7 @@ __metadata: "@metamask/address-book-controller": ^1.0.0 "@metamask/announcement-controller": ^1.0.0 "@metamask/approval-controller": ^1.0.0 - "@metamask/assets-controllers": ^3.0.1 + "@metamask/assets-controllers": ^4.0.1 "@metamask/auto-changelog": ^2.1.0 "@metamask/base-controller": ^1.0.0 "@metamask/contract-metadata": ^2.2.0 @@ -24086,7 +24127,7 @@ __metadata: "@metamask/notification-controller": ^1.0.0 "@metamask/obs-store": ^5.0.0 "@metamask/permission-controller": ^1.0.0 - "@metamask/phishing-controller": ^1.1.0 + "@metamask/phishing-controller": ^1.1.2 "@metamask/phishing-warning": ^1.2.1 "@metamask/post-message-stream": ^6.0.0 "@metamask/providers": ^10.2.1