Skip to content

fix: integrate phishing controller actions into NFT messengers cp-13.0.0 #34216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AugmentedMode merged 18 commits into from
Jul 22, 2025
Merged

fix: integrate phishing controller actions into NFT messengers cp-13.0.0 #34216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c33cacd
fix: integrate phishing controller actions into NFT messengers
AugmentedMode Jul 11, 2025
3f84c2f
Merge branch 'main' of https://github.com/MetaMask/metamask-extension…
AugmentedMode Jul 15, 2025
4df08ba
chore: update dependencies for assets and phishing controllers
AugmentedMode Jul 15, 2025
8847e9f
chore: update @metamask/controller-utils to version 11.11.0 in yarn.lock
AugmentedMode Jul 15, 2025
9cfce0f
Merge branch 'main' into fix/bulk-scan-nfts
AugmentedMode Jul 15, 2025
1c8cc9f
Update LavaMoat policies
metamaskbot Jul 16, 2025
2d9c58c
Merge branch 'main' into fix/bulk-scan-nfts
AugmentedMode Jul 16, 2025
7bdba31
Remove unused patch for @metamask/assets-controllers, cleaning up the…
AugmentedMode Jul 16, 2025
e2c97bc
Merge branch 'main' into fix/bulk-scan-nfts
AugmentedMode Jul 16, 2025
880b200
Revert "Remove unused patch for @metamask/assets-controllers, cleanin…
AugmentedMode Jul 16, 2025
6338335
fix: update @metamask/assets-controllers to use a patch version for v…
AugmentedMode Jul 16, 2025
8eb2926
Update LavaMoat policies
metamaskbot Jul 16, 2025
4e55b1b
Merge branch 'main' of https://github.com/MetaMask/metamask-extension…
AugmentedMode Jul 17, 2025
06bfdc3
revert: change in package
AugmentedMode Jul 17, 2025
fb884f9
fix: package
AugmentedMode Jul 17, 2025
8d46f39
Merge branch 'main' of https://github.com/MetaMask/metamask-extension…
AugmentedMode Jul 22, 2025
a0263e3
fix: spacing
AugmentedMode Jul 22, 2025
6d9d5aa
fix: merge conflicts
AugmentedMode Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...s-controllers-npm-70.0.0-59ac13a5ca.patch → ...s-controllers-npm-72.0.0-781cbafc4f.patch
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion app/scripts/controller-init/messengers/assets/nft-controller-messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
AssetsContractControllerGetERC721TokenURIAction,
} from '@metamask/assets-controllers';
import { AddApprovalRequest } from '@metamask/approval-controller';
import { PhishingControllerBulkScanUrlsAction } from '@metamask/phishing-controller';

type Actions =
| AddApprovalRequest
Expand All @@ -30,7 +31,8 @@ type Actions =
| AssetsContractControllerGetERC721OwnerOfAction
| AssetsContractControllerGetERC1155BalanceOfAction
| AssetsContractControllerGetERC1155TokenURIAction
| NetworkControllerFindNetworkClientIdByChainIdAction;
| NetworkControllerFindNetworkClientIdByChainIdAction
| PhishingControllerBulkScanUrlsAction;

type Events =
| PreferencesControllerStateChangeEvent
Expand Down Expand Up @@ -68,6 +70,7 @@ export function getNftControllerMessenger(
'AssetsContractController:getERC1155BalanceOf',
'AssetsContractController:getERC1155TokenURI',
'NetworkController:findNetworkClientIdByChainId',
'PhishingController:bulkScanUrls',
],
});
}
5 changes: 4 additions & 1 deletion app/scripts/controller-init/messengers/assets/nft-detection-controller-messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ import {
import { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
import { PreferencesControllerStateChangeEvent } from '@metamask/preferences-controller';
import { AddApprovalRequest } from '@metamask/approval-controller';
import { PhishingControllerBulkScanUrlsAction } from '@metamask/phishing-controller';

type Actions =
| AddApprovalRequest
| NetworkControllerGetStateAction
| AccountsControllerGetSelectedAccountAction
| NetworkControllerGetNetworkClientByIdAction
| NetworkControllerFindNetworkClientIdByChainIdAction;
| NetworkControllerFindNetworkClientIdByChainIdAction
| PhishingControllerBulkScanUrlsAction;
type Events =
| PreferencesControllerStateChangeEvent
| NetworkControllerStateChangeEvent;
Expand Down Expand Up @@ -45,6 +47,7 @@ export function getNftDetectionControllerMessenger(
'NetworkController:getNetworkClientById',
'AccountsController:getSelectedAccount',
'NetworkController:findNetworkClientIdByChainId',
'PhishingController:bulkScanUrls',
],
});
}
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
"@metamask/address-book-controller": "^6.1.0",
"@metamask/announcement-controller": "^7.0.3",
"@metamask/approval-controller": "^7.0.0",
"@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A70.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-70.0.0-59ac13a5ca.patch",
Copy link
Contributor

@cryptotavares cryptotavares Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just confirming that the patch that existed is no longer needed. And if that is the case we should probably remove it from .yarn/patches - https://github.com/MetaMask/metamask-extension/blob/main/.yarn/patches/%40metamask-assets-controllers-npm-70.0.0-59ac13a5ca.patch

Copy link
Contributor Author

@AugmentedMode AugmentedMode Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this patch is still needed just confirmed with assets team, I have updated the patch to work with the major version bump of assets controller to 72.0.0

"@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A72.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-72.0.0-781cbafc4f.patch",
"@metamask/base-controller": "^8.0.0",
"@metamask/bitcoin-wallet-snap": "^0.17.0",
"@metamask/bridge-controller": "patch:@metamask/bridge-controller@npm%3A34.0.0#~/.yarn/patches/@metamask-bridge-controller-npm-34.0.0-1e7cf1bef5.patch",
Expand Down Expand Up @@ -319,7 +319,7 @@
"@metamask/obs-store": "^9.0.0",
"@metamask/permission-controller": "^11.0.6",
"@metamask/permission-log-controller": "^4.0.0",
"@metamask/phishing-controller": "^12.6.0",
"@metamask/phishing-controller": "^13.1.0",
"@metamask/post-message-stream": "^10.0.0",
"@metamask/ppom-validator": "0.36.0",
"@metamask/preinstalled-example-snap": "^0.6.0",
Expand Down
47 changes: 31 additions & 16 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5433,9 +5433,9 @@ __metadata:
languageName: node
linkType: hard

"@metamask/assets-controllers@npm:70.0.0":
version: 70.0.0
resolution: "@metamask/assets-controllers@npm:70.0.0"
"@metamask/assets-controllers@npm:72.0.0":
version: 72.0.0
resolution: "@metamask/assets-controllers@npm:72.0.0"
dependencies:
"@ethereumjs/util": "npm:^9.1.0"
"@ethersproject/abi": "npm:^5.7.0"
Expand All @@ -5446,15 +5446,15 @@ __metadata:
"@metamask/abi-utils": "npm:^2.0.3"
"@metamask/base-controller": "npm:^8.0.1"
"@metamask/contract-metadata": "npm:^2.4.0"
"@metamask/controller-utils": "npm:^11.10.0"
"@metamask/controller-utils": "npm:^11.11.0"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/keyring-api": "npm:^18.0.0"
"@metamask/metamask-eth-abis": "npm:^3.1.1"
"@metamask/polling-controller": "npm:^14.0.0"
"@metamask/rpc-errors": "npm:^7.0.2"
"@metamask/snaps-sdk": "npm:^9.0.0"
"@metamask/snaps-utils": "npm:^11.0.0"
"@metamask/utils": "npm:^11.2.0"
"@metamask/utils": "npm:^11.4.2"
"@types/bn.js": "npm:^5.1.5"
"@types/uuid": "npm:^8.3.0"
async-mutex: "npm:^0.5.0"
Expand All @@ -5471,19 +5471,19 @@ __metadata:
"@metamask/keyring-controller": ^22.0.0
"@metamask/network-controller": ^24.0.0
"@metamask/permission-controller": ^11.0.0
"@metamask/phishing-controller": ^12.5.0
"@metamask/phishing-controller": ^13.0.0
"@metamask/preferences-controller": ^18.0.0
"@metamask/providers": ^22.0.0
"@metamask/snaps-controllers": ^14.0.0
"@metamask/transaction-controller": ^58.0.0
webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
checksum: 10/14bdb0cd18e7d70bcdf4ab7c105b2cbb1cbb8bbb9b75fcccaa720ae529431817281e439f829e55038e7c20718bd17f83b0b5299f8329c6ea4b96a18248e91e5c
checksum: 10/781cbafc4fcd0e474eba4b8b94f07362b5ffb0452c57e56bf93b1719cb912c8a94060c52428612ae4268451b9f965e8b11430bbfa9f85462274bb492b2bbfb83
languageName: node
linkType: hard

"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A70.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-70.0.0-59ac13a5ca.patch":
version: 70.0.0
resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A70.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-70.0.0-59ac13a5ca.patch::version=70.0.0&hash=98aa24"
"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A72.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-72.0.0-781cbafc4f.patch":
version: 72.0.0
resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A72.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-72.0.0-781cbafc4f.patch::version=72.0.0&hash=98aa24"
dependencies:
"@ethereumjs/util": "npm:^9.1.0"
"@ethersproject/abi": "npm:^5.7.0"
Expand All @@ -5494,15 +5494,15 @@ __metadata:
"@metamask/abi-utils": "npm:^2.0.3"
"@metamask/base-controller": "npm:^8.0.1"
"@metamask/contract-metadata": "npm:^2.4.0"
"@metamask/controller-utils": "npm:^11.10.0"
"@metamask/controller-utils": "npm:^11.11.0"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/keyring-api": "npm:^18.0.0"
"@metamask/metamask-eth-abis": "npm:^3.1.1"
"@metamask/polling-controller": "npm:^14.0.0"
"@metamask/rpc-errors": "npm:^7.0.2"
"@metamask/snaps-sdk": "npm:^9.0.0"
"@metamask/snaps-utils": "npm:^11.0.0"
"@metamask/utils": "npm:^11.2.0"
"@metamask/utils": "npm:^11.4.2"
"@types/bn.js": "npm:^5.1.5"
"@types/uuid": "npm:^8.3.0"
async-mutex: "npm:^0.5.0"
Expand All @@ -5519,13 +5519,13 @@ __metadata:
"@metamask/keyring-controller": ^22.0.0
"@metamask/network-controller": ^24.0.0
"@metamask/permission-controller": ^11.0.0
"@metamask/phishing-controller": ^12.5.0
"@metamask/phishing-controller": ^13.0.0
"@metamask/preferences-controller": ^18.0.0
"@metamask/providers": ^22.0.0
"@metamask/snaps-controllers": ^14.0.0
"@metamask/transaction-controller": ^58.0.0
webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
checksum: 10/756e684180fcffdee9e710c6a7d1962fee081b19ef00a9cbefc73f696b80aeb30b1442bcb288ede6bfe576ddd5108c076d15a97aca8e0170eaddf9cf2ec2c9a3
checksum: 10/061593861bd62be8feed3e0d66165ffa62d1598fb8fe284d61b871fe2b2c0cd9ab81eb0a0b8c48e945ae623ab6033a9b4000b4d36eade995eaf763a90e2fb18a
languageName: node
linkType: hard

Expand Down Expand Up @@ -6951,6 +6951,21 @@ __metadata:
languageName: node
linkType: hard

"@metamask/phishing-controller@npm:^13.1.0":
version: 13.1.0
resolution: "@metamask/phishing-controller@npm:13.1.0"
dependencies:
"@metamask/base-controller": "npm:^8.0.1"
"@metamask/controller-utils": "npm:^11.11.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/c62f71291736dfd635cc69b2d422687d8d610591a5e1cd9a6b4806cdc19221a72fe7699c0cabe0a2a108b49c3cc4dcb88a5b283fba374fe13e54d5813fb77902
languageName: node
linkType: hard

"@metamask/phishing-warning@npm:^5.0.0":
version: 5.0.0
resolution: "@metamask/phishing-warning@npm:5.0.0"
Expand Down Expand Up @@ -31949,7 +31964,7 @@ __metadata:
"@metamask/announcement-controller": "npm:^7.0.3"
"@metamask/api-specs": "npm:^0.13.0"
"@metamask/approval-controller": "npm:^7.0.0"
"@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A70.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-70.0.0-59ac13a5ca.patch"
"@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A72.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-72.0.0-781cbafc4f.patch"
"@metamask/auto-changelog": "npm:^2.1.0"
"@metamask/base-controller": "npm:^8.0.0"
"@metamask/bitcoin-wallet-snap": "npm:^0.17.0"
Expand Down Expand Up @@ -32015,7 +32030,7 @@ __metadata:
"@metamask/obs-store": "npm:^9.0.0"
"@metamask/permission-controller": "npm:^11.0.6"
"@metamask/permission-log-controller": "npm:^4.0.0"
"@metamask/phishing-controller": "npm:^12.6.0"
"@metamask/phishing-controller": "npm:^13.1.0"
"@metamask/phishing-warning": "npm:^5.0.0"
"@metamask/post-message-stream": "npm:^10.0.0"
"@metamask/ppom-validator": "npm:0.36.0"
Expand Down
Loading