Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions packages/snaps-controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,21 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@metamask/approval-controller": "^9.0.0",
"@metamask/base-controller": "^9.0.0",
"@metamask/approval-controller": "^9.0.1",
"@metamask/base-controller": "^9.0.1",
"@metamask/json-rpc-engine": "^10.2.4",
"@metamask/json-rpc-middleware-stream": "^8.0.8",
"@metamask/key-tree": "^10.1.1",
"@metamask/messenger": "^0.3.0",
"@metamask/messenger": "^1.0.0",
"@metamask/object-multiplex": "^2.1.0",
"@metamask/permission-controller": "^12.2.1",
"@metamask/permission-controller": "^12.3.0",
"@metamask/post-message-stream": "^10.0.0",
"@metamask/rpc-errors": "^7.0.3",
"@metamask/snaps-registry": "^4.0.0",
"@metamask/snaps-rpc-methods": "workspace:^",
"@metamask/snaps-sdk": "workspace:^",
"@metamask/snaps-utils": "workspace:^",
"@metamask/storage-service": "^1.0.0",
"@metamask/storage-service": "^1.0.1",
"@metamask/superstruct": "^3.2.1",
"@metamask/utils": "^11.10.0",
"@xstate/fsm": "^2.0.0",
Expand Down
6 changes: 4 additions & 2 deletions packages/snaps-controllers/src/cronjob/CronjobController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
} from '@metamask/base-controller';
import { BaseController } from '@metamask/base-controller';
import type { Messenger } from '@metamask/messenger';
import type { GetPermissions } from '@metamask/permission-controller';
import type { PermissionControllerGetPermissionsAction } from '@metamask/permission-controller';
import {
getCronjobCaveatJobs,
SnapEndowments,
Expand Down Expand Up @@ -50,7 +50,9 @@ export type CronjobControllerActions =

export type CronjobControllerEvents = CronjobControllerStateChangeEvent;

type AllowedActions = GetPermissions | SnapControllerHandleRequestAction;
type AllowedActions =
| PermissionControllerGetPermissionsAction
| SnapControllerHandleRequestAction;

type AllowedEvents =
| SnapControllerSnapInstalledEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { BaseController } from '@metamask/base-controller';
import type { Messenger } from '@metamask/messenger';
import type {
Caveat,
GetPermissions,
PermissionControllerGetPermissionsAction,
ValidPermission,
} from '@metamask/permission-controller';
import {
Expand Down Expand Up @@ -35,7 +35,7 @@ import type {
const controllerName = 'SnapInsightsController';

type AllowedActions =
| GetPermissions
| PermissionControllerGetPermissionsAction
| SnapControllerGetRunnableSnapsAction
| SnapControllerHandleRequestAction
| SnapInterfaceControllerDeleteInterfaceAction;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type {
} from '@metamask/base-controller';
import { BaseController } from '@metamask/base-controller';
import type { Messenger } from '@metamask/messenger';
import type { HasPermission } from '@metamask/permission-controller';
import type { PermissionControllerHasPermissionAction } from '@metamask/permission-controller';
import type {
InterfaceState,
SnapId,
Expand Down Expand Up @@ -102,7 +102,7 @@ type AllowedActions =
| AccountsControllerGetSelectedMultichainAccountAction
| AccountsControllerGetAccountByAddressAction
| AccountsControllerListMultichainAccountsAction
| HasPermission;
| PermissionControllerHasPermissionAction;

export type SnapInterfaceControllerActions =
| SnapInterfaceControllerGetStateAction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Messenger } from '@metamask/messenger';
import type { GetPermissions } from '@metamask/permission-controller';
import type { PermissionControllerGetPermissionsAction } from '@metamask/permission-controller';
import { rpcErrors } from '@metamask/rpc-errors';
import {
getProtocolCaveatScopes,
Expand Down Expand Up @@ -54,7 +54,7 @@ export type MultichainRoutingServiceActions =
type AllowedActions =
| SnapControllerGetRunnableSnapsAction
| SnapControllerHandleRequestAction
| GetPermissions
| PermissionControllerGetPermissionsAction
| AccountsControllerListMultichainAccountsAction;

export type MultichainRoutingServiceEvents = never;
Expand Down
48 changes: 24 additions & 24 deletions packages/snaps-controllers/src/snaps/SnapController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ import type { CryptographicFunctions } from '@metamask/key-tree';
import type { Messenger } from '@metamask/messenger';
import type {
Caveat,
GetEndowments,
GetPermissions,
GetSubjectMetadata,
AddSubjectMetadata,
GetSubjects,
GrantPermissions,
HasPermission,
HasPermissions,
PermissionControllerGetEndowmentsAction,
PermissionControllerGetPermissionsAction,
SubjectMetadataControllerGetSubjectMetadataAction,
SubjectMetadataControllerAddSubjectMetadataAction,
PermissionControllerGetSubjectNamesAction,
PermissionControllerGrantPermissionsAction,
PermissionControllerHasPermissionAction,
PermissionControllerHasPermissionsAction,
PermissionConstraint,
PermissionsRequest,
RequestedPermissions,
RevokeAllPermissions,
RevokePermissionForAllSubjects,
RevokePermissions,
PermissionControllerRevokeAllPermissionsAction,
PermissionControllerRevokePermissionForAllSubjectsAction,
PermissionControllerRevokePermissionsAction,
SubjectPermissions,
UpdateCaveat,
PermissionControllerUpdateCaveatAction,
ValidPermission,
} from '@metamask/permission-controller';
import { SubjectType } from '@metamask/permission-controller';
Expand Down Expand Up @@ -513,22 +513,22 @@ export type SnapControllerEvents =
| SnapControllerStateChangeEvent;

type AllowedActions =
| GetEndowments
| GetPermissions
| GetSubjects
| GetSubjectMetadata
| AddSubjectMetadata
| HasPermission
| HasPermissions
| RevokePermissions
| RevokeAllPermissions
| RevokePermissionForAllSubjects
| GrantPermissions
| PermissionControllerGetEndowmentsAction
| PermissionControllerGetPermissionsAction
| PermissionControllerGetSubjectNamesAction
| SubjectMetadataControllerGetSubjectMetadataAction
| SubjectMetadataControllerAddSubjectMetadataAction
| PermissionControllerHasPermissionAction
| PermissionControllerHasPermissionsAction
| PermissionControllerRevokePermissionsAction
| PermissionControllerRevokeAllPermissionsAction
| PermissionControllerRevokePermissionForAllSubjectsAction
| PermissionControllerGrantPermissionsAction
| PermissionControllerUpdateCaveatAction
| ApprovalControllerAddRequestAction
| ExecutionServiceHandleRpcRequestAction
| ExecutionServiceExecuteSnapAction
| ExecutionServiceTerminateSnapAction
| UpdateCaveat
| ApprovalControllerUpdateRequestStateAction
| SnapRegistryControllerGetAction
| SnapRegistryControllerGetMetadataAction
Expand Down
4 changes: 2 additions & 2 deletions packages/snaps-rpc-methods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"dependencies": {
"@metamask/key-tree": "^10.1.1",
"@metamask/permission-controller": "^12.2.1",
"@metamask/permission-controller": "^12.3.0",
"@metamask/rpc-errors": "^7.0.3",
"@metamask/snaps-sdk": "workspace:^",
"@metamask/snaps-utils": "workspace:^",
Expand All @@ -71,7 +71,7 @@
"@lavamoat/allow-scripts": "^4.0.0",
"@metamask/auto-changelog": "^5.3.2",
"@metamask/json-rpc-engine": "^10.2.4",
"@metamask/messenger": "^0.3.0",
"@metamask/messenger": "^1.0.0",
"@swc/core": "1.11.31",
"@swc/jest": "^0.2.38",
"@ts-bridge/cli": "^0.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/snaps-simulation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
"@metamask/json-rpc-engine": "^10.2.4",
"@metamask/json-rpc-middleware-stream": "^8.0.8",
"@metamask/key-tree": "^10.1.1",
"@metamask/messenger": "^0.3.0",
"@metamask/permission-controller": "^12.2.1",
"@metamask/messenger": "^1.0.0",
"@metamask/permission-controller": "^12.3.0",
"@metamask/rpc-errors": "^7.0.3",
"@metamask/snaps-controllers": "workspace:^",
"@metamask/snaps-execution-environments": "workspace:^",
Expand Down
11 changes: 2 additions & 9 deletions packages/snaps-simulation/src/controllers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ import type {
MockAnyNamespace,
} from '@metamask/messenger';
import { Messenger } from '@metamask/messenger';
import type {
CaveatSpecificationConstraint,
PermissionControllerMessenger,
PermissionSpecificationConstraint,
} from '@metamask/permission-controller';
import type { PermissionControllerMessenger } from '@metamask/permission-controller';
import {
PermissionController,
SubjectMetadataController,
Expand Down Expand Up @@ -67,10 +63,7 @@ export type GetControllersOptions = {
};

export type Controllers = {
permissionController: PermissionController<
PermissionSpecificationConstraint,
CaveatSpecificationConstraint
>;
permissionController: PermissionController;
subjectMetadataController: SubjectMetadataController;
interfaceController: SnapInterfaceController;
};
Expand Down
4 changes: 2 additions & 2 deletions packages/snaps-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
"@babel/core": "^7.23.2",
"@babel/types": "^7.23.0",
"@metamask/key-tree": "^10.1.1",
"@metamask/messenger": "^0.3.0",
"@metamask/permission-controller": "^12.2.1",
"@metamask/messenger": "^1.0.0",
"@metamask/permission-controller": "^12.3.0",
"@metamask/rpc-errors": "^7.0.3",
"@metamask/slip44": "^4.4.0",
"@metamask/snaps-registry": "^4.0.0",
Expand Down
Loading
Loading