Skip to content

fix: use @metamask-previews/permission-controller #3697

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
mikesposito merged 1 commit into from
Oct 24, 2025
Merged

fix: use @metamask-previews/permission-controller #3697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
749 changes: 749 additions & 0 deletions .yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/snaps-controllers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"@metamask/key-tree": "^10.1.1",
"@metamask/messenger": "^0.3.0",
"@metamask/object-multiplex": "^2.1.0",
"@metamask/permission-controller": "^11.0.6",
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch",
"@metamask/phishing-controller": "^13.1.0",
"@metamask/post-message-stream": "^10.0.0",
"@metamask/rpc-errors": "^7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-rpc-methods/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"dependencies": {
"@metamask/key-tree": "^10.1.1",
"@metamask/permission-controller": "^11.0.6",
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch",
"@metamask/rpc-errors": "^7.0.3",
"@metamask/snaps-sdk": "workspace:^",
"@metamask/snaps-utils": "workspace:^",
Expand Down
12 changes: 8 additions & 4 deletions packages/snaps-rpc-methods/src/restricted/invokeSnap.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ describe('handleSnapInstall', () => {

const sideEffectMessenger = new Messenger<
'PermissionController',
InstallSnaps | GetPermittedSnaps
InstallSnaps | GetPermittedSnaps,
never,
any
>({ namespace: 'PermissionController', parent: messenger });

messenger.delegate({
Expand Down Expand Up @@ -160,7 +162,7 @@ describe('handleSnapInstall', () => {

const result = await handleSnapInstall({
requestData,
messagingSystem: sideEffectMessenger,
messenger: sideEffectMessenger,
});

expect(sideEffectMessenger.call).toHaveBeenCalledWith(
Expand All @@ -180,7 +182,9 @@ describe('handleSnapInstall', () => {

const sideEffectMessenger = new Messenger<
'PermissionController',
InstallSnaps | GetPermittedSnaps
InstallSnaps | GetPermittedSnaps,
never,
any
>({ namespace: 'PermissionController', parent: messenger });

messenger.delegate({
Expand Down Expand Up @@ -224,7 +228,7 @@ describe('handleSnapInstall', () => {

const result = await handleSnapInstall({
requestData,
messagingSystem: sideEffectMessenger,
messenger: sideEffectMessenger,
});

expect(sideEffectMessenger.call).toHaveBeenCalledWith(
Expand Down
8 changes: 4 additions & 4 deletions packages/snaps-rpc-methods/src/restricted/invokeSnap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ export type InvokeSnapParams = {
*
* @param params - The side-effect params.
* @param params.requestData - The request data associated to the requested permission.
* @param params.messagingSystem - The messenger to call an action.
* @param params.messenger - The messenger to call an action.
* @returns The result of the Snap installation.
*/
export const handleSnapInstall: PermissionSideEffect<
AllowedActions,
never
>['onPermitted'] = async ({ requestData, messagingSystem }) => {
>['onPermitted'] = async ({ requestData, messenger }) => {
const snaps = requestData.permissions[WALLET_SNAP_PERMISSION_KEY].caveats?.[0]
.value as RequestSnapsParams;

const permittedSnaps = messagingSystem.call(
const permittedSnaps = messenger.call(
`SnapController:getPermitted`,
requestData.metadata.origin,
);
Expand All @@ -96,7 +96,7 @@ export const handleSnapInstall: PermissionSideEffect<
{},
);

return messagingSystem.call(
return messenger.call(
`SnapController:install`,
requestData.metadata.origin,
dedupedSnaps,
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-simulation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@metamask/json-rpc-middleware-stream": "^8.0.8",
"@metamask/key-tree": "^10.1.1",
"@metamask/messenger": "^0.3.0",
"@metamask/permission-controller": "^11.0.6",
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch",
"@metamask/phishing-controller": "^13.1.0",
"@metamask/snaps-controllers": "workspace:^",
"@metamask/snaps-execution-environments": "workspace:^",
Expand Down
2 changes: 0 additions & 2 deletions packages/snaps-simulation/src/controllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ export type Controllers = {
export function getControllers(options: GetControllersOptions): Controllers {
const { controllerMessenger } = options;
const subjectMetadataController = new SubjectMetadataController({
// @ts-expect-error Incompatible messenger types until migrated.
messenger: new Messenger({
namespace: 'SubjectMetadataController',
parent: controllerMessenger,
Expand Down Expand Up @@ -143,7 +142,6 @@ function getPermissionController(options: GetControllersOptions) {
});

return new PermissionController({
// @ts-expect-error Incompatible messenger types until migrated.
messenger,
caveatSpecifications: {
...snapsCaveatsSpecifications,
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@babel/types": "^7.23.0",
"@metamask/key-tree": "^10.1.1",
"@metamask/messenger": "^0.3.0",
"@metamask/permission-controller": "^11.0.6",
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch",
"@metamask/rpc-errors": "^7.0.3",
"@metamask/slip44": "^4.3.0",
"@metamask/snaps-registry": "^3.2.3",
Expand Down
29 changes: 24 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3905,7 +3905,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/permission-controller@npm:^11.0.6":
"@metamask/permission-controller@npm:11.0.6":
version: 11.0.6
resolution: "@metamask/permission-controller@npm:11.0.6"
dependencies:
Expand All @@ -3924,6 +3924,25 @@ __metadata:
languageName: node
linkType: hard

"@metamask/permission-controller@patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch":
version: 11.0.6
resolution: "@metamask/permission-controller@patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch::version=11.0.6&hash=89cdfc"
dependencies:
"@metamask/base-controller": "npm:^8.0.0"
"@metamask/controller-utils": "npm:^11.5.0"
"@metamask/json-rpc-engine": "npm:^10.0.3"
"@metamask/rpc-errors": "npm:^7.0.2"
"@metamask/utils": "npm:^11.1.0"
"@types/deep-freeze-strict": "npm:^1.1.0"
deep-freeze-strict: "npm:^1.1.1"
immer: "npm:^9.0.6"
nanoid: "npm:^3.3.8"
peerDependencies:
"@metamask/approval-controller": ^7.0.0
checksum: 10/5cfa060c6583f3f3a5b135892c92364d1502873c11a392d9cc72c5009ff0f7d1919dd4fbf815e168189eda8ff263e184d7dff252d6eed98faeec9717326a5b44
languageName: node
linkType: hard

"@metamask/phishing-controller@npm:^13.1.0":
version: 13.1.0
resolution: "@metamask/phishing-controller@npm:13.1.0"
Expand Down Expand Up @@ -4252,7 +4271,7 @@ __metadata:
"@metamask/key-tree": "npm:^10.1.1"
"@metamask/messenger": "npm:^0.3.0"
"@metamask/object-multiplex": "npm:^2.1.0"
"@metamask/permission-controller": "npm:^11.0.6"
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch"
"@metamask/phishing-controller": "npm:^13.1.0"
"@metamask/post-message-stream": "npm:^10.0.0"
"@metamask/rpc-errors": "npm:^7.0.3"
Expand Down Expand Up @@ -4453,7 +4472,7 @@ __metadata:
"@metamask/json-rpc-engine": "npm:^10.1.0"
"@metamask/key-tree": "npm:^10.1.1"
"@metamask/messenger": "npm:^0.3.0"
"@metamask/permission-controller": "npm:^11.0.6"
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch"
"@metamask/rpc-errors": "npm:^7.0.3"
"@metamask/snaps-sdk": "workspace:^"
"@metamask/snaps-utils": "workspace:^"
Expand Down Expand Up @@ -4546,7 +4565,7 @@ __metadata:
"@metamask/json-rpc-middleware-stream": "npm:^8.0.8"
"@metamask/key-tree": "npm:^10.1.1"
"@metamask/messenger": "npm:^0.3.0"
"@metamask/permission-controller": "npm:^11.0.6"
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch"
"@metamask/phishing-controller": "npm:^13.1.0"
"@metamask/snaps-controllers": "workspace:^"
"@metamask/snaps-execution-environments": "workspace:^"
Expand Down Expand Up @@ -4589,7 +4608,7 @@ __metadata:
"@metamask/auto-changelog": "npm:^5.0.2"
"@metamask/key-tree": "npm:^10.1.1"
"@metamask/messenger": "npm:^0.3.0"
"@metamask/permission-controller": "npm:^11.0.6"
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch"
"@metamask/post-message-stream": "npm:^10.0.0"
"@metamask/rpc-errors": "npm:^7.0.3"
"@metamask/slip44": "npm:^4.3.0"
Expand Down
Loading