@metamask/snaps-controllers 0.31.0 → 0.32.1

package/dist/services/node/NodeProcessExecutionService.js

@@ -6,7 +6,7 @@ const child_process_1 = require("child_process");
 const __1 = require("..");
 class NodeProcessExecutionService extends __1.AbstractExecutionService {
     async initEnvStream() {
-        const worker = (0, child_process_1.fork)(require.resolve('@metamask/snaps-execution-environments/dist/webpack/node-process/bundle.js'));
+        const worker = (0, child_process_1.fork)(require.resolve('@metamask/snaps-execution-environments/dist/browserify/node-process/bundle.js'));
         const stream = new post_message_stream_1.ProcessParentMessageStream({ process: worker });
         return Promise.resolve({ worker, stream });
     }

package/dist/services/node/NodeProcessExecutionService.js.map

@@ -1 +1 @@
-{"version":3,"file":"NodeProcessExecutionService.js","sourceRoot":"","sources":["../../../src/services/node/NodeProcessExecutionService.ts"],"names":[],"mappings":";;;AAAA,uEAGuC;AACvC,iDAAmD;AAEnD,0BAAmD;AAEnD,MAAa,2BAA4B,SAAQ,4BAAsC;IAC3E,KAAK,CAAC,aAAa;QAI3B,MAAM,MAAM,GAAG,IAAA,oBAAI,EACjB,OAAO,CAAC,OAAO,CACb,4EAA4E,CAC7E,CACF,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,gDAA0B,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAES,YAAY,CAAC,UAA6B;QAClD,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF;AAlBD,kEAkBC","sourcesContent":["import {\n  ProcessParentMessageStream,\n  BasePostMessageStream,\n} from '@metamask/post-message-stream';\nimport { ChildProcess, fork } from 'child_process';\n\nimport { AbstractExecutionService, Job } from '..';\n\nexport class NodeProcessExecutionService extends AbstractExecutionService<ChildProcess> {\n  protected async initEnvStream(): Promise<{\n    worker: ChildProcess;\n    stream: BasePostMessageStream;\n  }> {\n    const worker = fork(\n      require.resolve(\n        '@metamask/snaps-execution-environments/dist/webpack/node-process/bundle.js',\n      ),\n    );\n\n    const stream = new ProcessParentMessageStream({ process: worker });\n    return Promise.resolve({ worker, stream });\n  }\n\n  protected terminateJob(jobWrapper: Job<ChildProcess>): void {\n    jobWrapper.worker.kill();\n  }\n}\n"]}
+{"version":3,"file":"NodeProcessExecutionService.js","sourceRoot":"","sources":["../../../src/services/node/NodeProcessExecutionService.ts"],"names":[],"mappings":";;;AAAA,uEAGuC;AACvC,iDAAmD;AAEnD,0BAAmD;AAEnD,MAAa,2BAA4B,SAAQ,4BAAsC;IAC3E,KAAK,CAAC,aAAa;QAI3B,MAAM,MAAM,GAAG,IAAA,oBAAI,EACjB,OAAO,CAAC,OAAO,CACb,+EAA+E,CAChF,CACF,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,gDAA0B,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAES,YAAY,CAAC,UAA6B;QAClD,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF;AAlBD,kEAkBC","sourcesContent":["import {\n  ProcessParentMessageStream,\n  BasePostMessageStream,\n} from '@metamask/post-message-stream';\nimport { ChildProcess, fork } from 'child_process';\n\nimport { AbstractExecutionService, Job } from '..';\n\nexport class NodeProcessExecutionService extends AbstractExecutionService<ChildProcess> {\n  protected async initEnvStream(): Promise<{\n    worker: ChildProcess;\n    stream: BasePostMessageStream;\n  }> {\n    const worker = fork(\n      require.resolve(\n        '@metamask/snaps-execution-environments/dist/browserify/node-process/bundle.js',\n      ),\n    );\n\n    const stream = new ProcessParentMessageStream({ process: worker });\n    return Promise.resolve({ worker, stream });\n  }\n\n  protected terminateJob(jobWrapper: Job<ChildProcess>): void {\n    jobWrapper.worker.kill();\n  }\n}\n"]}

package/dist/services/node/NodeThreadExecutionService.js

@@ -7,7 +7,7 @@ const worker_threads_1 = require("worker_threads");
 const __1 = require("..");
 class NodeThreadExecutionService extends __1.AbstractExecutionService {
     async initEnvStream() {
-        const worker = new worker_threads_1.Worker(require.resolve('@metamask/snaps-execution-environments/dist/webpack/node-thread/bundle.js'));
+        const worker = new worker_threads_1.Worker(require.resolve('@metamask/snaps-execution-environments/dist/browserify/node-thread/bundle.js'));
         const stream = new post_message_stream_1.ThreadParentMessageStream({ thread: worker });
         return Promise.resolve({ worker, stream });
     }

package/dist/services/node/NodeThreadExecutionService.js.map

@@ -1 +1 @@
-{"version":3,"file":"NodeThreadExecutionService.js","sourceRoot":"","sources":["../../../src/services/node/NodeThreadExecutionService.ts"],"names":[],"mappings":";;;AAAA,uEAGuC;AACvC,wDAAwD;AACxD,mDAAwC;AAExC,0BAAmD;AAEnD,MAAa,0BAA2B,SAAQ,4BAAgC;IACpE,KAAK,CAAC,aAAa;QAI3B,MAAM,MAAM,GAAG,IAAI,uBAAM,CACvB,OAAO,CAAC,OAAO,CACb,2EAA2E,CAC5E,CACF,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,+CAAyB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,UAAuB;QAClD,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IACtC,CAAC;CACF;AAjBD,gEAiBC","sourcesContent":["import {\n  ThreadParentMessageStream,\n  BasePostMessageStream,\n} from '@metamask/post-message-stream';\n// eslint-disable-next-line @typescript-eslint/no-shadow\nimport { Worker } from 'worker_threads';\n\nimport { AbstractExecutionService, Job } from '..';\n\nexport class NodeThreadExecutionService extends AbstractExecutionService<Worker> {\n  protected async initEnvStream(): Promise<{\n    worker: Worker;\n    stream: BasePostMessageStream;\n  }> {\n    const worker = new Worker(\n      require.resolve(\n        '@metamask/snaps-execution-environments/dist/webpack/node-thread/bundle.js',\n      ),\n    );\n    const stream = new ThreadParentMessageStream({ thread: worker });\n    return Promise.resolve({ worker, stream });\n  }\n\n  protected async terminateJob(jobWrapper: Job<Worker>): Promise<void> {\n    await jobWrapper.worker.terminate();\n  }\n}\n"]}
+{"version":3,"file":"NodeThreadExecutionService.js","sourceRoot":"","sources":["../../../src/services/node/NodeThreadExecutionService.ts"],"names":[],"mappings":";;;AAAA,uEAGuC;AACvC,wDAAwD;AACxD,mDAAwC;AAExC,0BAAmD;AAEnD,MAAa,0BAA2B,SAAQ,4BAAgC;IACpE,KAAK,CAAC,aAAa;QAI3B,MAAM,MAAM,GAAG,IAAI,uBAAM,CACvB,OAAO,CAAC,OAAO,CACb,8EAA8E,CAC/E,CACF,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,+CAAyB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,UAAuB;QAClD,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IACtC,CAAC;CACF;AAjBD,gEAiBC","sourcesContent":["import {\n  ThreadParentMessageStream,\n  BasePostMessageStream,\n} from '@metamask/post-message-stream';\n// eslint-disable-next-line @typescript-eslint/no-shadow\nimport { Worker } from 'worker_threads';\n\nimport { AbstractExecutionService, Job } from '..';\n\nexport class NodeThreadExecutionService extends AbstractExecutionService<Worker> {\n  protected async initEnvStream(): Promise<{\n    worker: Worker;\n    stream: BasePostMessageStream;\n  }> {\n    const worker = new Worker(\n      require.resolve(\n        '@metamask/snaps-execution-environments/dist/browserify/node-thread/bundle.js',\n      ),\n    );\n    const stream = new ThreadParentMessageStream({ thread: worker });\n    return Promise.resolve({ worker, stream });\n  }\n\n  protected async terminateJob(jobWrapper: Job<Worker>): Promise<void> {\n    await jobWrapper.worker.terminate();\n  }\n}\n"]}

package/dist/snaps/SnapController.d.ts

@@ -9,7 +9,7 @@ import { StateMachine } from '@xstate/fsm';
 import type { Patch } from 'immer';
 import { ExecuteSnapAction, ExecutionServiceEvents, HandleRpcRequestAction, SnapErrorJson, TerminateAllSnapsAction, TerminateSnapAction } from '../services';
 import { detectSnapLocation, SnapLocation } from './location';
-import { SnapsRegistry, SnapsRegistryMetadata } from './registry';
+import { GetMetadata, GetResult, SnapsRegistryMetadata } from './registry';
 import { Timer } from './Timer';
 export declare const controllerName = "SnapController";
 export declare const SNAP_APPROVAL_INSTALL = "wallet_installSnap";
@@ -239,7 +239,7 @@ export declare type SnapTerminated = {
     payload: [snap: TruncatedSnap];
 };
 export declare type SnapControllerEvents = SnapAdded | SnapBlocked | SnapInstalled | SnapRemoved | SnapStateChange | SnapUnblocked | SnapUpdated | SnapRolledback | SnapTerminated;
-export declare type AllowedActions = GetEndowments | GetPermissions | GetSubjects | GetSubjectMetadata | HasPermission | HasPermissions | RevokePermissions | RevokeAllPermissions | RevokePermissionForAllSubjects | GrantPermissions | AddApprovalRequest | HandleRpcRequestAction | ExecuteSnapAction | TerminateAllSnapsAction | TerminateSnapAction | UpdateCaveat | UpdateRequestState;
+export declare type AllowedActions = GetEndowments | GetPermissions | GetSubjects | GetSubjectMetadata | HasPermission | HasPermissions | RevokePermissions | RevokeAllPermissions | RevokePermissionForAllSubjects | GrantPermissions | AddApprovalRequest | HandleRpcRequestAction | ExecuteSnapAction | TerminateAllSnapsAction | TerminateSnapAction | UpdateCaveat | UpdateRequestState | GetResult | GetMetadata;
 export declare type AllowedEvents = ExecutionServiceEvents;
 declare type SnapControllerMessenger = RestrictedControllerMessenger<typeof controllerName, SnapControllerActions | AllowedActions, SnapControllerEvents | AllowedEvents, AllowedActions['type'], AllowedEvents['type']>;
 declare type FeatureFlags = {
@@ -283,10 +283,6 @@ declare type SnapControllerArgs = {
      * How frequently to check whether a snap is idle.
      */
     idleTimeCheckInterval?: number;
-    /**
-     * A registry implementation used for checking for verified and blocked snaps.
-     */
-    registry: SnapsRegistry;
     /**
      * The maximum amount of time that a snap may be idle.
      */
@@ -319,7 +315,7 @@ export declare class SnapController extends BaseController<string, SnapControlle
     #private;
     private readonly maxRequestTime;
     private readonly snapsRuntimeData;
-    constructor({ closeAllConnections, messenger, state, environmentEndowmentPermissions, excludedPermissions, idleTimeCheckInterval, registry, maxIdleTime, maxRequestTime, fetchFunction, featureFlags, detectSnapLocation: detectSnapLocationFunction, }: SnapControllerArgs);
+    constructor({ closeAllConnections, messenger, state, environmentEndowmentPermissions, excludedPermissions, idleTimeCheckInterval, maxIdleTime, maxRequestTime, fetchFunction, featureFlags, detectSnapLocation: detectSnapLocationFunction, }: SnapControllerArgs);
     /**
      * Checks all installed snaps against the block list and
      * blocks/unblocks snaps as appropriate. See {@link SnapController.blockSnap}

package/dist/snaps/SnapController.js

@@ -10,7 +10,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _SnapController_instances, _SnapController_closeAllConnections, _SnapController_environmentEndowmentPermissions, _SnapController_excludedPermissions, _SnapController_featureFlags, _SnapController_fetchFunction, _SnapController_idleTimeCheckInterval, _SnapController_registry, _SnapController_maxIdleTime, _SnapController_detectSnapLocation, _SnapController_rollbackSnapshots, _SnapController_timeoutForLastRequestStatus, _SnapController_statusMachine, _SnapController_initializeStateMachine, _SnapController_registerMessageHandlers, _SnapController_pollForLastRequestStatus, _SnapController_blockSnap, _SnapController_unblockSnap, _SnapController_assertIsInstallAllowed, _SnapController_stopSnapsLastRequestPastMax, _SnapController_transition, _SnapController_terminateSnap, _SnapController_removeSnapFromSubjects, _SnapController_createApproval, _SnapController_updateApproval, _SnapController_add, _SnapController_startSnap, _SnapController_getEndowments, _SnapController_set, _SnapController_fetchSnap, _SnapController_processSnapPermissions, _SnapController_validateSnapPermissions, _SnapController_getRpcRequestHandler, _SnapController_executeWithTimeout, _SnapController_recordSnapRpcRequestStart, _SnapController_recordSnapRpcRequestFinish, _SnapController_getRollbackSnapshot, _SnapController_createRollbackSnapshot, _SnapController_rollbackSnap, _SnapController_rollbackSnaps, _SnapController_getRuntime, _SnapController_getRuntimeExpect, _SnapController_setupRuntime, _SnapController_calculatePermissionsChange, _SnapController_isValidUpdate;
+var _SnapController_instances, _SnapController_closeAllConnections, _SnapController_environmentEndowmentPermissions, _SnapController_excludedPermissions, _SnapController_featureFlags, _SnapController_fetchFunction, _SnapController_idleTimeCheckInterval, _SnapController_maxIdleTime, _SnapController_detectSnapLocation, _SnapController_rollbackSnapshots, _SnapController_timeoutForLastRequestStatus, _SnapController_statusMachine, _SnapController_initializeStateMachine, _SnapController_registerMessageHandlers, _SnapController_pollForLastRequestStatus, _SnapController_blockSnap, _SnapController_unblockSnap, _SnapController_assertIsInstallAllowed, _SnapController_stopSnapsLastRequestPastMax, _SnapController_transition, _SnapController_terminateSnap, _SnapController_removeSnapFromSubjects, _SnapController_createApproval, _SnapController_updateApproval, _SnapController_add, _SnapController_startSnap, _SnapController_getEndowments, _SnapController_set, _SnapController_fetchSnap, _SnapController_processSnapPermissions, _SnapController_validateSnapPermissions, _SnapController_getRpcRequestHandler, _SnapController_executeWithTimeout, _SnapController_recordSnapRpcRequestStart, _SnapController_recordSnapRpcRequestFinish, _SnapController_getRollbackSnapshot, _SnapController_createRollbackSnapshot, _SnapController_rollbackSnap, _SnapController_rollbackSnaps, _SnapController_getRuntime, _SnapController_getRuntimeExpect, _SnapController_setupRuntime, _SnapController_calculatePermissionsChange, _SnapController_isValidUpdate;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapController = exports.SNAP_APPROVAL_RESULT = exports.SNAP_APPROVAL_UPDATE = exports.SNAP_APPROVAL_INSTALL = exports.controllerName = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -71,7 +71,7 @@ const name = 'SnapController';
  * - Start: Initializes the snap in its SES realm with the authorized permissions.
  */
 class SnapController extends base_controller_1.BaseControllerV2 {
-    constructor({ closeAllConnections, messenger, state, environmentEndowmentPermissions = [], excludedPermissions = {}, idleTimeCheckInterval = (0, utils_1.inMilliseconds)(5, utils_1.Duration.Second), registry = new registry_1.JsonSnapsRegistry(), maxIdleTime = (0, utils_1.inMilliseconds)(30, utils_1.Duration.Second), maxRequestTime = (0, utils_1.inMilliseconds)(60, utils_1.Duration.Second), fetchFunction = globalThis.fetch.bind(globalThis), featureFlags = {}, detectSnapLocation: detectSnapLocationFunction = location_1.detectSnapLocation, }) {
+    constructor({ closeAllConnections, messenger, state, environmentEndowmentPermissions = [], excludedPermissions = {}, idleTimeCheckInterval = (0, utils_1.inMilliseconds)(5, utils_1.Duration.Second), maxIdleTime = (0, utils_1.inMilliseconds)(30, utils_1.Duration.Second), maxRequestTime = (0, utils_1.inMilliseconds)(60, utils_1.Duration.Second), fetchFunction = globalThis.fetch.bind(globalThis), featureFlags = {}, detectSnapLocation: detectSnapLocationFunction = location_1.detectSnapLocation, }) {
         super({
             messenger,
             metadata: {
@@ -128,7 +128,6 @@ class SnapController extends base_controller_1.BaseControllerV2 {
         _SnapController_featureFlags.set(this, void 0);
         _SnapController_fetchFunction.set(this, void 0);
         _SnapController_idleTimeCheckInterval.set(this, void 0);
-        _SnapController_registry.set(this, void 0);
         _SnapController_maxIdleTime.set(this, void 0);
         _SnapController_detectSnapLocation.set(this, void 0);
         _SnapController_rollbackSnapshots.set(this, void 0);
@@ -140,7 +139,6 @@ class SnapController extends base_controller_1.BaseControllerV2 {
         __classPrivateFieldSet(this, _SnapController_featureFlags, featureFlags, "f");
         __classPrivateFieldSet(this, _SnapController_fetchFunction, fetchFunction, "f");
         __classPrivateFieldSet(this, _SnapController_idleTimeCheckInterval, idleTimeCheckInterval, "f");
-        __classPrivateFieldSet(this, _SnapController_registry, registry, "f");
         __classPrivateFieldSet(this, _SnapController_maxIdleTime, maxIdleTime, "f");
         this.maxRequestTime = maxRequestTime;
         __classPrivateFieldSet(this, _SnapController_detectSnapLocation, detectSnapLocationFunction, "f");
@@ -168,7 +166,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
      * for more information.
      */
     async updateBlockedSnaps() {
-        const blockedSnaps = await __classPrivateFieldGet(this, _SnapController_registry, "f").get(Object.values(this.state.snaps).reduce((blockListArg, snap) => {
+        const blockedSnaps = await this.messagingSystem.call('SnapsRegistry:get', Object.values(this.state.snaps).reduce((blockListArg, snap) => {
             blockListArg[snap.id] = {
                 version: snap.version,
                 checksum: snap.manifest.source.shasum,
@@ -548,10 +546,6 @@ class SnapController extends base_controller_1.BaseControllerV2 {
                 if (error) {
                     throw eth_rpc_errors_1.ethErrors.rpc.invalidParams(`The "version" field must be a valid SemVer version range if specified. Received: "${rawVersion}".`);
                 }
-                const permissions = this.messagingSystem.call('PermissionController:getPermissions', origin);
-                if (!(0, snaps_utils_1.isSnapPermitted)(permissions, snapId)) {
-                    throw eth_rpc_errors_1.ethErrors.provider.unauthorized(`Not authorized to install snap "${snapId}". Request the permission for the snap before attempting to install it.`);
-                }
                 const location = __classPrivateFieldGet(this, _SnapController_detectSnapLocation, "f").call(this, snapId, {
                     versionRange: version,
                     fetch: __classPrivateFieldGet(this, _SnapController_fetchFunction, "f"),
@@ -630,6 +624,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
                 origin,
                 id: snapId,
                 location,
+                versionRange,
             });
             await this.authorize(snapId, pendingApproval);
             pendingApproval = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_createApproval).call(this, {
@@ -642,7 +637,10 @@ class SnapController extends base_controller_1.BaseControllerV2 {
                 sourceCode,
             });
             const truncated = this.getTruncatedExpect(snapId);
-            __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_updateApproval).call(this, pendingApproval.id, { loading: false });
+            __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_updateApproval).call(this, pendingApproval.id, {
+                loading: false,
+                type: exports.SNAP_APPROVAL_INSTALL,
+            });
             this.messagingSystem.publish(`SnapController:snapInstalled`, truncated);
             return truncated;
         }
@@ -650,6 +648,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
             (0, snaps_utils_1.logError)(`Error when adding snap.`, error);
             __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_updateApproval).call(this, pendingApproval.id, {
                 loading: false,
+                type: exports.SNAP_APPROVAL_INSTALL,
                 error: error instanceof Error ? error.message : error.toString(),
             });
             throw error;
@@ -689,6 +688,9 @@ class SnapController extends base_controller_1.BaseControllerV2 {
             if (!(0, utils_1.gtVersion)(newVersion, snap.version)) {
                 throw eth_rpc_errors_1.ethErrors.rpc.invalidParams(`Snap "${snapId}@${snap.version}" is already installed. Couldn't update to a version inside requested "${newVersionRange}" range.`);
             }
+            if (!(0, utils_1.satisfiesVersionRange)(newVersion, newVersionRange)) {
+                throw new Error(`Version mismatch. Manifest for "${snapId}" specifies version "${newVersion}" which doesn't satisfy requested version range "${newVersionRange}".`);
+            }
             await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_assertIsInstallAllowed).call(this, snapId, {
                 version: newVersion,
                 checksum: newSnap.manifest.result.source.shasum,
@@ -719,7 +721,6 @@ class SnapController extends base_controller_1.BaseControllerV2 {
                 id: snapId,
                 manifest: newSnap.manifest,
                 files: newSnap.files,
-                versionRange: newVersionRange,
                 isUpdate: true,
             });
             const unusedPermissionsKeys = Object.keys(unusedPermissions);
@@ -754,7 +755,10 @@ class SnapController extends base_controller_1.BaseControllerV2 {
             }
             const truncatedSnap = this.getTruncatedExpect(snapId);
             this.messagingSystem.publish('SnapController:snapUpdated', truncatedSnap, snap.version);
-            __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_updateApproval).call(this, pendingApproval.id, { loading: false });
+            __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_updateApproval).call(this, pendingApproval.id, {
+                loading: false,
+                type: exports.SNAP_APPROVAL_UPDATE,
+            });
             return truncatedSnap;
         }
         catch (error) {
@@ -762,6 +766,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
             __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_updateApproval).call(this, pendingApproval.id, {
                 loading: false,
                 error: error instanceof Error ? error.message : error.toString(),
+                type: exports.SNAP_APPROVAL_UPDATE,
             });
             throw error;
         }
@@ -774,7 +779,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
      * verified.
      */
     async getRegistryMetadata(snapId) {
-        return await __classPrivateFieldGet(this, _SnapController_registry, "f").getMetadata(snapId);
+        return await this.messagingSystem.call('SnapsRegistry:getMetadata', snapId);
     }
     /**
      * Initiates a request for the given snap's initial permissions.
@@ -859,7 +864,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
     }
 }
 exports.SnapController = SnapController;
-_SnapController_closeAllConnections = new WeakMap(), _SnapController_environmentEndowmentPermissions = new WeakMap(), _SnapController_excludedPermissions = new WeakMap(), _SnapController_featureFlags = new WeakMap(), _SnapController_fetchFunction = new WeakMap(), _SnapController_idleTimeCheckInterval = new WeakMap(), _SnapController_registry = new WeakMap(), _SnapController_maxIdleTime = new WeakMap(), _SnapController_detectSnapLocation = new WeakMap(), _SnapController_rollbackSnapshots = new WeakMap(), _SnapController_timeoutForLastRequestStatus = new WeakMap(), _SnapController_statusMachine = new WeakMap(), _SnapController_instances = new WeakSet(), _SnapController_initializeStateMachine = function _SnapController_initializeStateMachine() {
+_SnapController_closeAllConnections = new WeakMap(), _SnapController_environmentEndowmentPermissions = new WeakMap(), _SnapController_excludedPermissions = new WeakMap(), _SnapController_featureFlags = new WeakMap(), _SnapController_fetchFunction = new WeakMap(), _SnapController_idleTimeCheckInterval = new WeakMap(), _SnapController_maxIdleTime = new WeakMap(), _SnapController_detectSnapLocation = new WeakMap(), _SnapController_rollbackSnapshots = new WeakMap(), _SnapController_timeoutForLastRequestStatus = new WeakMap(), _SnapController_statusMachine = new WeakMap(), _SnapController_instances = new WeakSet(), _SnapController_initializeStateMachine = function _SnapController_initializeStateMachine() {
     const disableGuard = ({ snapId }) => {
         return this.getExpect(snapId).enabled;
     };
@@ -880,6 +885,7 @@ _SnapController_closeAllConnections = new WeakMap(), _SnapController_environment
                         target: snaps_utils_1.SnapStatus.Running,
                         cond: disableGuard,
                     },
+                    [snaps_utils_1.SnapStatusEvents.Stop]: snaps_utils_1.SnapStatus.Stopped,
                 },
             },
             [snaps_utils_1.SnapStatus.Running]: {
@@ -969,7 +975,7 @@ async function _SnapController_blockSnap(snapId, blockedSnapInfo) {
     });
     this.messagingSystem.publish(`${exports.controllerName}:snapUnblocked`, snapId);
 }, _SnapController_assertIsInstallAllowed = async function _SnapController_assertIsInstallAllowed(snapId, snapInfo) {
-    const results = await __classPrivateFieldGet(this, _SnapController_registry, "f").get({
+    const results = await this.messagingSystem.call('SnapsRegistry:get', {
         [snapId]: snapInfo,
     });
     const result = results[snapId];
@@ -1064,7 +1070,7 @@ async function _SnapController_terminateSnap(snapId) {
  * @returns The resulting snap object.
  */
 async function _SnapController_add(args) {
-    const { id: snapId, location } = args;
+    const { id: snapId, location, versionRange } = args;
     __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_setupRuntime).call(this, snapId, { sourceCode: null, state: null });
     const runtime = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRuntimeExpect).call(this, snapId);
     if (!runtime.installPromise) {
@@ -1073,9 +1079,14 @@ async function _SnapController_add(args) {
         // to null in the authorize() method.
         runtime.installPromise = (async () => {
             const fetchedSnap = await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_fetchSnap).call(this, snapId, location);
+            const manifest = fetchedSnap.manifest.result;
+            (0, snaps_utils_1.assertIsSnapManifest)(manifest);
+            if (!(0, utils_1.satisfiesVersionRange)(manifest.version, versionRange)) {
+                throw new Error(`Version mismatch. Manifest for "${snapId}" specifies version "${manifest.version}" which doesn't satisfy requested version range "${versionRange}".`);
+            }
             await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_assertIsInstallAllowed).call(this, snapId, {
-                version: fetchedSnap.manifest.result.version,
-                checksum: fetchedSnap.manifest.result.source.shasum,
+                version: manifest.version,
+                checksum: manifest.source.shasum,
             });
             return __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_set).call(this, {
                 ...args,
@@ -1149,12 +1160,9 @@ async function _SnapController_getEndowments(snapId) {
     }
     return dedupedEndowments;
 }, _SnapController_set = function _SnapController_set(args) {
-    const { id: snapId, origin, manifest, files, versionRange = snaps_utils_1.DEFAULT_REQUESTED_SNAP_VERSION, isUpdate = false, } = args;
+    const { id: snapId, origin, manifest, files, isUpdate = false } = args;
     (0, snaps_utils_1.assertIsSnapManifest)(manifest.result);
     const { version } = manifest.result;
-    if (!(0, utils_1.satisfiesVersionRange)(version, versionRange)) {
-        throw new Error(`Version mismatch. Manifest for "${snapId}" specifies version "${version}" which doesn't satisfy requested version range "${versionRange}"`);
-    }
     const normalizedSourcePath = (0, snaps_utils_1.normalizeRelative)(manifest.result.source.location.npm.filePath);
     const { iconPath } = manifest.result.source.location.npm;
     const normalizedIconPath = iconPath && (0, snaps_utils_1.normalizeRelative)(iconPath);
@@ -1255,7 +1263,10 @@ async function _SnapController_fetchSnap(snapId, location) {
         ];
     }));
 }, _SnapController_validateSnapPermissions = function _SnapController_validateSnapPermissions(processedPermissions) {
-    const excludedPermissionErrors = Object.keys(processedPermissions).reduce((errors, permission) => {
+    const permissionKeys = Object.keys(processedPermissions);
+    const handlerPermissions = Object.values(endowments_1.handlerEndowments);
+    (0, utils_1.assert)(permissionKeys.some((key) => handlerPermissions.includes(key)), `A snap must request at least one of the following permissions: ${handlerPermissions.join(', ')}.`);
+    const excludedPermissionErrors = permissionKeys.reduce((errors, permission) => {
         if ((0, utils_1.hasProperty)(__classPrivateFieldGet(this, _SnapController_excludedPermissions, "f"), permission)) {
             errors.push(__classPrivateFieldGet(this, _SnapController_excludedPermissions, "f")[permission]);
         }
@@ -1390,10 +1401,21 @@ async function _SnapController_rollbackSnap(snapId) {
         throw new Error('A snapshot does not exist for this snap.');
     }
     await this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Stop);
+    // Always set to stopped even if it wasn't running initially
+    if (this.get(snapId)?.status !== snaps_utils_1.SnapStatus.Stopped) {
+        __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_transition).call(this, snapId, snaps_utils_1.SnapStatusEvents.Stop);
+    }
     const { statePatches, sourceCode, permissions } = rollbackSnapshot;
     if (statePatches?.length) {
         this.applyPatches(statePatches);
     }
+    // Reset snap status, as we may have been in another state when we stored state patches
+    // But now we are 100% in a stopped state
+    if (this.get(snapId)?.status !== snaps_utils_1.SnapStatus.Stopped) {
+        this.update((state) => {
+            state.snaps[snapId].status = snaps_utils_1.SnapStatus.Stopped;
+        });
+    }
     if (sourceCode) {
         const runtime = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRuntimeExpect).call(this, snapId);
         runtime.sourceCode = sourceCode;