Skip to content

Commit 6992e4e

Browse files
mikespositomikesposito
authored
fix: use @metamask-previews/permission-controller (#3697)
1 parent 68c50b9 commit 6992e4e

File tree

9 files changed

+789
-19
lines changed

9 files changed

+789
-19
lines changed

‎.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch‎

Lines changed: 749 additions & 0 deletions
Large diffs are not rendered by default.

‎packages/snaps-controllers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@metamask/key-tree": "^10.1.1",
8787
"@metamask/messenger": "^0.3.0",
8888
"@metamask/object-multiplex": "^2.1.0",
89-
"@metamask/permission-controller": "^11.0.6",
89+
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch",
9090
"@metamask/phishing-controller": "^13.1.0",
9191
"@metamask/post-message-stream": "^10.0.0",
9292
"@metamask/rpc-errors": "^7.0.3",

‎packages/snaps-rpc-methods/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
},
5757
"dependencies": {
5858
"@metamask/key-tree": "^10.1.1",
59-
"@metamask/permission-controller": "^11.0.6",
59+
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch",
6060
"@metamask/rpc-errors": "^7.0.3",
6161
"@metamask/snaps-sdk": "workspace:^",
6262
"@metamask/snaps-utils": "workspace:^",

‎packages/snaps-rpc-methods/src/restricted/invokeSnap.test.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ describe('handleSnapInstall', () => {
119119

120120
const sideEffectMessenger = new Messenger<
121121
'PermissionController',
122-
InstallSnaps | GetPermittedSnaps
122+
InstallSnaps | GetPermittedSnaps,
123+
never,
124+
any
123125
>({ namespace: 'PermissionController', parent: messenger });
124126

125127
messenger.delegate({
@@ -160,7 +162,7 @@ describe('handleSnapInstall', () => {
160162

161163
const result = await handleSnapInstall({
162164
requestData,
163-
messagingSystem: sideEffectMessenger,
165+
messenger: sideEffectMessenger,
164166
});
165167

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

181183
const sideEffectMessenger = new Messenger<
182184
'PermissionController',
183-
InstallSnaps | GetPermittedSnaps
185+
InstallSnaps | GetPermittedSnaps,
186+
never,
187+
any
184188
>({ namespace: 'PermissionController', parent: messenger });
185189

186190
messenger.delegate({
@@ -224,7 +228,7 @@ describe('handleSnapInstall', () => {
224228

225229
const result = await handleSnapInstall({
226230
requestData,
227-
messagingSystem: sideEffectMessenger,
231+
messenger: sideEffectMessenger,
228232
});
229233

230234
expect(sideEffectMessenger.call).toHaveBeenCalledWith(

‎packages/snaps-rpc-methods/src/restricted/invokeSnap.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ export type InvokeSnapParams = {
7171
*
7272
* @param params - The side-effect params.
7373
* @param params.requestData - The request data associated to the requested permission.
74-
* @param params.messagingSystem - The messenger to call an action.
74+
* @param params.messenger - The messenger to call an action.
7575
* @returns The result of the Snap installation.
7676
*/
7777
export const handleSnapInstall: PermissionSideEffect<
7878
AllowedActions,
7979
never
80-
>['onPermitted'] = async ({ requestData, messagingSystem }) => {
80+
>['onPermitted'] = async ({ requestData, messenger }) => {
8181
const snaps = requestData.permissions[WALLET_SNAP_PERMISSION_KEY].caveats?.[0]
8282
.value as RequestSnapsParams;
8383

84-
const permittedSnaps = messagingSystem.call(
84+
const permittedSnaps = messenger.call(
8585
`SnapController:getPermitted`,
8686
requestData.metadata.origin,
8787
);
@@ -96,7 +96,7 @@ export const handleSnapInstall: PermissionSideEffect<
9696
{},
9797
);
9898

99-
return messagingSystem.call(
99+
return messenger.call(
100100
`SnapController:install`,
101101
requestData.metadata.origin,
102102
dedupedSnaps,

‎packages/snaps-simulation/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@metamask/json-rpc-middleware-stream": "^8.0.8",
6161
"@metamask/key-tree": "^10.1.1",
6262
"@metamask/messenger": "^0.3.0",
63-
"@metamask/permission-controller": "^11.0.6",
63+
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch",
6464
"@metamask/phishing-controller": "^13.1.0",
6565
"@metamask/snaps-controllers": "workspace:^",
6666
"@metamask/snaps-execution-environments": "workspace:^",

‎packages/snaps-simulation/src/controllers.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export type Controllers = {
7373
export function getControllers(options: GetControllersOptions): Controllers {
7474
const { controllerMessenger } = options;
7575
const subjectMetadataController = new SubjectMetadataController({
76-
// @ts-expect-error Incompatible messenger types until migrated.
7776
messenger: new Messenger({
7877
namespace: 'SubjectMetadataController',
7978
parent: controllerMessenger,
@@ -143,7 +142,6 @@ function getPermissionController(options: GetControllersOptions) {
143142
});
144143

145144
return new PermissionController({
146-
// @ts-expect-error Incompatible messenger types until migrated.
147145
messenger,
148146
caveatSpecifications: {
149147
...snapsCaveatsSpecifications,

‎packages/snaps-utils/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"@babel/types": "^7.23.0",
8383
"@metamask/key-tree": "^10.1.1",
8484
"@metamask/messenger": "^0.3.0",
85-
"@metamask/permission-controller": "^11.0.6",
85+
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch",
8686
"@metamask/rpc-errors": "^7.0.3",
8787
"@metamask/slip44": "^4.3.0",
8888
"@metamask/snaps-registry": "^3.2.3",

‎yarn.lock‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3905,7 +3905,7 @@ __metadata:
39053905
languageName: node
39063906
linkType: hard
39073907

3908-
"@metamask/permission-controller@npm:^11.0.6":
3908+
"@metamask/permission-controller@npm:11.0.6":
39093909
version: 11.0.6
39103910
resolution: "@metamask/permission-controller@npm:11.0.6"
39113911
dependencies:
@@ -3924,6 +3924,25 @@ __metadata:
39243924
languageName: node
39253925
linkType: hard
39263926

3927+
"@metamask/permission-controller@patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch":
3928+
version: 11.0.6
3929+
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"
3930+
dependencies:
3931+
"@metamask/base-controller": "npm:^8.0.0"
3932+
"@metamask/controller-utils": "npm:^11.5.0"
3933+
"@metamask/json-rpc-engine": "npm:^10.0.3"
3934+
"@metamask/rpc-errors": "npm:^7.0.2"
3935+
"@metamask/utils": "npm:^11.1.0"
3936+
"@types/deep-freeze-strict": "npm:^1.1.0"
3937+
deep-freeze-strict: "npm:^1.1.1"
3938+
immer: "npm:^9.0.6"
3939+
nanoid: "npm:^3.3.8"
3940+
peerDependencies:
3941+
"@metamask/approval-controller": ^7.0.0
3942+
checksum: 10/5cfa060c6583f3f3a5b135892c92364d1502873c11a392d9cc72c5009ff0f7d1919dd4fbf815e168189eda8ff263e184d7dff252d6eed98faeec9717326a5b44
3943+
languageName: node
3944+
linkType: hard
3945+
39273946
"@metamask/phishing-controller@npm:^13.1.0":
39283947
version: 13.1.0
39293948
resolution: "@metamask/phishing-controller@npm:13.1.0"
@@ -4252,7 +4271,7 @@ __metadata:
42524271
"@metamask/key-tree": "npm:^10.1.1"
42534272
"@metamask/messenger": "npm:^0.3.0"
42544273
"@metamask/object-multiplex": "npm:^2.1.0"
4255-
"@metamask/permission-controller": "npm:^11.0.6"
4274+
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch"
42564275
"@metamask/phishing-controller": "npm:^13.1.0"
42574276
"@metamask/post-message-stream": "npm:^10.0.0"
42584277
"@metamask/rpc-errors": "npm:^7.0.3"
@@ -4453,7 +4472,7 @@ __metadata:
44534472
"@metamask/json-rpc-engine": "npm:^10.1.0"
44544473
"@metamask/key-tree": "npm:^10.1.1"
44554474
"@metamask/messenger": "npm:^0.3.0"
4456-
"@metamask/permission-controller": "npm:^11.0.6"
4475+
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch"
44574476
"@metamask/rpc-errors": "npm:^7.0.3"
44584477
"@metamask/snaps-sdk": "workspace:^"
44594478
"@metamask/snaps-utils": "workspace:^"
@@ -4546,7 +4565,7 @@ __metadata:
45464565
"@metamask/json-rpc-middleware-stream": "npm:^8.0.8"
45474566
"@metamask/key-tree": "npm:^10.1.1"
45484567
"@metamask/messenger": "npm:^0.3.0"
4549-
"@metamask/permission-controller": "npm:^11.0.6"
4568+
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch"
45504569
"@metamask/phishing-controller": "npm:^13.1.0"
45514570
"@metamask/snaps-controllers": "workspace:^"
45524571
"@metamask/snaps-execution-environments": "workspace:^"
@@ -4589,7 +4608,7 @@ __metadata:
45894608
"@metamask/auto-changelog": "npm:^5.0.2"
45904609
"@metamask/key-tree": "npm:^10.1.1"
45914610
"@metamask/messenger": "npm:^0.3.0"
4592-
"@metamask/permission-controller": "npm:^11.0.6"
4611+
"@metamask/permission-controller": "patch:@metamask/permission-controller@npm%3A11.0.6#~/.yarn/patches/@metamask-permission-controller-npm-11.0.6-5b7ce789d2.patch"
45934612
"@metamask/post-message-stream": "npm:^10.0.0"
45944613
"@metamask/rpc-errors": "npm:^7.0.3"
45954614
"@metamask/slip44": "npm:^4.3.0"

0 commit comments

Comments
 (0)