@metamask/snaps-controllers 0.27.1 → 0.28.0

package/dist/services/offscreen/index.d.ts

@@ -0,0 +1,2 @@
+export * from './OffscreenExecutionService';
+export * from './OffscreenPostMessageStream';

package/dist/services/offscreen/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./OffscreenExecutionService"), exports);
+__exportStar(require("./OffscreenPostMessageStream"), exports);
+//# sourceMappingURL=index.js.map

package/dist/services/offscreen/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/offscreen/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA4C;AAC5C,+DAA6C","sourcesContent":["export * from './OffscreenExecutionService';\nexport * from './OffscreenPostMessageStream';\n"]}

package/dist/snaps/SnapController.d.ts

@@ -1,13 +1,15 @@
 import { AddApprovalRequest } from '@metamask/approval-controller';
 import { BaseControllerV2 as BaseController, RestrictedControllerMessenger } from '@metamask/base-controller';
 import { GetEndowments, GetPermissions, GrantPermissions, HasPermission, HasPermissions, RevokeAllPermissions, RevokePermissionForAllSubjects, RevokePermissions } from '@metamask/permission-controller';
-import { BlockedSnapInfo, InstallSnapsResult, PersistedSnap, RequestedSnapPermissions, Snap, SnapId, SnapRpcHook, SnapRpcHookArgs, SnapStatusEvents, StatusContext, StatusEvents, StatusStates, TruncatedSnap, ValidatedSnapId } from '@metamask/snaps-utils';
+import { BlockReason } from '@metamask/snaps-registry';
+import { InstallSnapsResult, PersistedSnap, RequestedSnapPermissions, Snap, SnapId, SnapRpcHook, SnapRpcHookArgs, SnapStatusEvents, StatusContext, StatusEvents, StatusStates, TruncatedSnap, ValidatedSnapId } from '@metamask/snaps-utils';
 import { GetSubjectMetadata } from '@metamask/subject-metadata-controller';
 import { Json } from '@metamask/utils';
 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 } from './registry';
 import { Timer } from './Timer';
 export declare const controllerName = "SnapController";
 export declare const SNAP_APPROVAL_INSTALL = "wallet_installSnap";
@@ -185,7 +187,7 @@ export declare type SnapAdded = {
  */
 export declare type SnapBlocked = {
     type: `${typeof controllerName}:snapBlocked`;
-    payload: [snapId: string, blockedSnapInfo: BlockedSnapInfo];
+    payload: [snapId: string, blockedSnapInfo?: BlockReason];
 };
 /**
  * Emitted when a snap has been started after being added and authorized during
@@ -244,24 +246,9 @@ declare type FeatureFlags = {
      * @see {SnapController.processRequestedSnap}
      */
     dappsCanUpdateSnaps?: true;
+    requireAllowlist?: true;
+    allowLocalSnaps?: true;
 };
-declare type SemVerVersion = string;
-declare type SnapInfo = {
-    version: SemVerVersion;
-    shasum: string;
-};
-export declare type CheckSnapBlockListArg = Record<SnapId, SnapInfo>;
-export declare type CheckSnapBlockListResult = Record<SnapId, {
-    blocked: true;
-    reason?: string;
-    infoUrl?: string;
-} | {
-    blocked: false;
-}>;
-/**
- * Checks whether a version of a snap is blocked.
- */
-export declare type CheckSnapBlockList = (snapsToCheck: CheckSnapBlockListArg) => Promise<CheckSnapBlockListResult>;
 declare type SnapControllerArgs = {
     /**
      * A teardown function that allows the host to clean up its instrumentation
@@ -273,6 +260,10 @@ declare type SnapControllerArgs = {
      * APIs that will be added to the snap execution environment at runtime.
      */
     environmentEndowmentPermissions: string[];
+    /**
+     * Excluded permissions with its associated error message used to forbid certain permssions.
+     */
+    excludedPermissions: Record<string, string>;
     /**
      * The function that will be used by the controller fo make network requests.
      * Should be compatible with {@link fetch}.
@@ -288,9 +279,9 @@ declare type SnapControllerArgs = {
      */
     idleTimeCheckInterval?: number;
     /**
-     * A function that checks whether the specified snap and version is blocked.
+     * A registry implementation used for checking for verified and blocked snaps.
      */
-    checkBlockList: CheckSnapBlockList;
+    registry: SnapsRegistry;
     /**
      * The maximum amount of time that a snap may be idle.
      */
@@ -323,21 +314,13 @@ export declare class SnapController extends BaseController<string, SnapControlle
     #private;
     private readonly maxRequestTime;
     private readonly snapsRuntimeData;
-    constructor({ closeAllConnections, messenger, state, environmentEndowmentPermissions, idleTimeCheckInterval, checkBlockList, maxIdleTime, maxRequestTime, fetchFunction, featureFlags, detectSnapLocation: detectSnapLocationFunction, }: SnapControllerArgs);
+    constructor({ closeAllConnections, messenger, state, environmentEndowmentPermissions, excludedPermissions, idleTimeCheckInterval, registry, 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}
      * for more information.
      */
     updateBlockedSnaps(): Promise<void>;
-    /**
-     * Checks the block list to determine whether a version of a snap is blocked.
-     *
-     * @param snapId - The snap id to check.
-     * @param snapInfo - Snap information containing version and shasum.
-     * @returns Whether the version of the snap is blocked or not.
-     */
-    isBlocked(snapId: ValidatedSnapId, snapInfo: SnapInfo): Promise<boolean>;
     _onUnhandledSnapError(snapId: SnapId, error: SnapErrorJson): void;
     _onOutboundRequest(snapId: SnapId): void;
     _onOutboundResponse(snapId: SnapId): void;
@@ -548,11 +531,11 @@ export declare class SnapController extends BaseController<string, SnapControlle
      *
      * @param origin - The origin requesting the snap update.
      * @param snapId - The id of the Snap to be updated.
-     * @param newVersionRange - A semver version range in which the maximum version will be chosen.
      * @param location - Optional location that was already used during installation flow.
+     * @param newVersionRange - A semver version range in which the maximum version will be chosen.
      * @returns The snap metadata if updated, `null` otherwise.
      */
-    updateSnap(origin: string, snapId: ValidatedSnapId, newVersionRange?: string, location?: SnapLocation): Promise<TruncatedSnap | null>;
+    updateSnap(origin: string, snapId: ValidatedSnapId, location: SnapLocation, newVersionRange?: string): Promise<TruncatedSnap | null>;
     /**
      * Initiates a request for the given snap's initial permissions.
      * Must be called in order. See processRequestedSnap.

package/dist/snaps/SnapController.js

@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _SnapController_instances, _SnapController_closeAllConnections, _SnapController_environmentEndowmentPermissions, _SnapController_featureFlags, _SnapController_fetchFunction, _SnapController_idleTimeCheckInterval, _SnapController_checkSnapBlockList, _SnapController_maxIdleTime, _SnapController_detectSnapLocation, _SnapController_rollbackSnapshots, _SnapController_timeoutForLastRequestStatus, _SnapController_statusMachine, _SnapController_initializeStateMachine, _SnapController_registerMessageHandlers, _SnapController_pollForLastRequestStatus, _SnapController_blockSnap, _SnapController_unblockSnap, _SnapController_assertIsUnblocked, _SnapController_stopSnapsLastRequestPastMax, _SnapController_transition, _SnapController_terminateSnap, _SnapController_add, _SnapController_startSnap, _SnapController_getEndowments, _SnapController_set, _SnapController_fetchSnap, _SnapController_processSnapPermissions, _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_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_add, _SnapController_startSnap, _SnapController_getEndowments, _SnapController_set, _SnapController_fetchSnap, _SnapController_processSnapPermissions, _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_UPDATE = exports.SNAP_APPROVAL_INSTALL = exports.controllerName = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -37,6 +37,7 @@ const utils_2 = require("../utils");
 const endowments_1 = require("./endowments");
 const rpc_1 = require("./endowments/rpc");
 const location_1 = require("./location");
+const registry_1 = require("./registry");
 const RequestQueue_1 = require("./RequestQueue");
 const Timer_1 = require("./Timer");
 exports.controllerName = 'SnapController';
@@ -80,7 +81,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 = [], idleTimeCheckInterval = (0, utils_1.inMilliseconds)(5, utils_1.Duration.Second), checkBlockList, 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), 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, }) {
         var _a, _b;
         super({
             messenger,
@@ -125,10 +126,11 @@ class SnapController extends base_controller_1.BaseControllerV2 {
         _SnapController_instances.add(this);
         _SnapController_closeAllConnections.set(this, void 0);
         _SnapController_environmentEndowmentPermissions.set(this, void 0);
+        _SnapController_excludedPermissions.set(this, void 0);
         _SnapController_featureFlags.set(this, void 0);
         _SnapController_fetchFunction.set(this, void 0);
         _SnapController_idleTimeCheckInterval.set(this, void 0);
-        _SnapController_checkSnapBlockList.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);
@@ -136,10 +138,11 @@ class SnapController extends base_controller_1.BaseControllerV2 {
         _SnapController_statusMachine.set(this, void 0);
         __classPrivateFieldSet(this, _SnapController_closeAllConnections, closeAllConnections, "f");
         __classPrivateFieldSet(this, _SnapController_environmentEndowmentPermissions, environmentEndowmentPermissions, "f");
+        __classPrivateFieldSet(this, _SnapController_excludedPermissions, excludedPermissions, "f");
         __classPrivateFieldSet(this, _SnapController_featureFlags, featureFlags, "f");
         __classPrivateFieldSet(this, _SnapController_fetchFunction, fetchFunction, "f");
         __classPrivateFieldSet(this, _SnapController_idleTimeCheckInterval, idleTimeCheckInterval, "f");
-        __classPrivateFieldSet(this, _SnapController_checkSnapBlockList, checkBlockList, "f");
+        __classPrivateFieldSet(this, _SnapController_registry, registry, "f");
         __classPrivateFieldSet(this, _SnapController_maxIdleTime, maxIdleTime, "f");
         this.maxRequestTime = maxRequestTime;
         __classPrivateFieldSet(this, _SnapController_detectSnapLocation, detectSnapLocationFunction, "f");
@@ -170,34 +173,20 @@ class SnapController extends base_controller_1.BaseControllerV2 {
      * for more information.
      */
     async updateBlockedSnaps() {
-        const blockedSnaps = await __classPrivateFieldGet(this, _SnapController_checkSnapBlockList, "f").call(this, Object.values(this.state.snaps).reduce((blockListArg, snap) => {
+        const blockedSnaps = await __classPrivateFieldGet(this, _SnapController_registry, "f").get(Object.values(this.state.snaps).reduce((blockListArg, snap) => {
             blockListArg[snap.id] = {
                 version: snap.version,
-                shasum: snap.manifest.source.shasum,
+                checksum: snap.manifest.source.shasum,
             };
             return blockListArg;
         }, {}));
-        await Promise.all(Object.entries(blockedSnaps).map(async (_a) => {
-            var [snapId, _b] = _a, { blocked } = _b, blockData = __rest(_b, ["blocked"]);
-            if (blocked) {
-                return __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_blockSnap).call(this, snapId, blockData);
+        await Promise.all(Object.entries(blockedSnaps).map(async ([snapId, { status, reason }]) => {
+            if (status === registry_1.SnapsRegistryStatus.Blocked) {
+                return __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_blockSnap).call(this, snapId, reason);
             }
             return __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_unblockSnap).call(this, snapId);
         }));
     }
-    /**
-     * Checks the block list to determine whether a version of a snap is blocked.
-     *
-     * @param snapId - The snap id to check.
-     * @param snapInfo - Snap information containing version and shasum.
-     * @returns Whether the version of the snap is blocked or not.
-     */
-    async isBlocked(snapId, snapInfo) {
-        const result = await __classPrivateFieldGet(this, _SnapController_checkSnapBlockList, "f").call(this, {
-            [snapId]: snapInfo,
-        });
-        return result[snapId].blocked;
-    }
     _onUnhandledSnapError(snapId, error) {
         this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Crash)
             .then(() => this.addSnapError(error))
@@ -611,15 +600,16 @@ class SnapController extends base_controller_1.BaseControllerV2 {
         const location = __classPrivateFieldGet(this, _SnapController_detectSnapLocation, "f").call(this, snapId, {
             versionRange,
             fetch: __classPrivateFieldGet(this, _SnapController_fetchFunction, "f"),
+            allowLocal: __classPrivateFieldGet(this, _SnapController_featureFlags, "f").allowLocalSnaps,
         });
         const existingSnap = this.getTruncated(snapId);
         // For devX we always re-install local snaps.
         if (existingSnap && !location.shouldAlwaysReload) {
-            if ((0, snaps_utils_1.satisfiesVersionRange)(existingSnap.version, versionRange)) {
+            if ((0, utils_1.satisfiesVersionRange)(existingSnap.version, versionRange)) {
                 return existingSnap;
             }
             if (__classPrivateFieldGet(this, _SnapController_featureFlags, "f").dappsCanUpdateSnaps === true) {
-                const updateResult = await this.updateSnap(origin, snapId, versionRange, location);
+                const updateResult = await this.updateSnap(origin, snapId, location, versionRange);
                 if (updateResult === null) {
                     throw eth_rpc_errors_1.ethErrors.rpc.invalidParams(`Snap "${snapId}@${existingSnap.version}" is already installed. Couldn't update to a version inside requested "${versionRange}" range.`);
                 }
@@ -665,25 +655,25 @@ class SnapController extends base_controller_1.BaseControllerV2 {
      *
      * @param origin - The origin requesting the snap update.
      * @param snapId - The id of the Snap to be updated.
-     * @param newVersionRange - A semver version range in which the maximum version will be chosen.
      * @param location - Optional location that was already used during installation flow.
+     * @param newVersionRange - A semver version range in which the maximum version will be chosen.
      * @returns The snap metadata if updated, `null` otherwise.
      */
-    async updateSnap(origin, snapId, newVersionRange = snaps_utils_1.DEFAULT_REQUESTED_SNAP_VERSION, location) {
+    async updateSnap(origin, snapId, location, newVersionRange = snaps_utils_1.DEFAULT_REQUESTED_SNAP_VERSION) {
         var _a;
         const snap = this.getExpect(snapId);
-        if (!(0, snaps_utils_1.isValidSemVerRange)(newVersionRange)) {
+        if (!(0, utils_1.isValidSemVerRange)(newVersionRange)) {
             throw new Error(`Received invalid snap version range: "${newVersionRange}".`);
         }
-        const newSnap = await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_fetchSnap).call(this, snapId, location !== null && location !== void 0 ? location : __classPrivateFieldGet(this, _SnapController_detectSnapLocation, "f").call(this, snapId, { versionRange: newVersionRange }));
+        const newSnap = await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_fetchSnap).call(this, snapId, location);
         const newVersion = newSnap.manifest.result.version;
-        if (!(0, snaps_utils_1.gtVersion)(newVersion, snap.version)) {
+        if (!(0, utils_1.gtVersion)(newVersion, snap.version)) {
             console.warn(`Tried updating snap "${snapId}" within "${newVersionRange}" version range, but newer version "${snap.version}" is already installed`);
             return null;
         }
-        await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_assertIsUnblocked).call(this, snapId, {
+        await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_assertIsInstallAllowed).call(this, snapId, {
             version: newVersion,
-            shasum: newSnap.manifest.result.source.shasum,
+            checksum: newSnap.manifest.result.source.shasum,
         });
         const processedPermissions = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_processSnapPermissions).call(this, newSnap.manifest.result.initialPermissions);
         const { newPermissions, unusedPermissions, approvedPermissions } = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_calculatePermissionsChange).call(this, snapId, processedPermissions);
@@ -764,6 +754,13 @@ class SnapController extends base_controller_1.BaseControllerV2 {
         const { initialPermissions } = snap;
         try {
             const processedPermissions = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_processSnapPermissions).call(this, initialPermissions);
+            const excludedPermissionErrors = Object.keys(processedPermissions).reduce((errors, permission) => {
+                if ((0, utils_1.hasProperty)(__classPrivateFieldGet(this, _SnapController_excludedPermissions, "f"), permission)) {
+                    errors.push(__classPrivateFieldGet(this, _SnapController_excludedPermissions, "f")[permission]);
+                }
+                return errors;
+            }, []);
+            (0, utils_1.assert)(excludedPermissionErrors.length === 0, `One or more permissions are not allowed:\n${excludedPermissionErrors.join('\n')}`);
             const id = (0, nanoid_1.nanoid)();
             const _a = (await this.messagingSystem.call('ApprovalController:addRequest', {
                 origin,
@@ -836,7 +833,7 @@ class SnapController extends base_controller_1.BaseControllerV2 {
     }
 }
 exports.SnapController = SnapController;
-_SnapController_closeAllConnections = new WeakMap(), _SnapController_environmentEndowmentPermissions = new WeakMap(), _SnapController_featureFlags = new WeakMap(), _SnapController_fetchFunction = new WeakMap(), _SnapController_idleTimeCheckInterval = new WeakMap(), _SnapController_checkSnapBlockList = 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_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() {
     const disableGuard = ({ snapId }) => {
         return this.getExpect(snapId).enabled;
     };
@@ -880,6 +877,7 @@ _SnapController_closeAllConnections = new WeakMap(), _SnapController_environment
                         target: snaps_utils_1.SnapStatus.Running,
                         cond: disableGuard,
                     },
+                    [snaps_utils_1.SnapStatusEvents.Update]: snaps_utils_1.SnapStatus.Updating,
                 },
             },
         },
@@ -943,17 +941,18 @@ async function _SnapController_blockSnap(snapId, blockedSnapInfo) {
         delete state.snaps[snapId].blockInformation;
     });
     this.messagingSystem.publish(`${exports.controllerName}:snapUnblocked`, snapId);
-}, _SnapController_assertIsUnblocked = 
-/**
- * Asserts that a version of a snap is not blocked. Succeeds automatically
- * if {@link SnapController._checkSnapBlockList} is undefined.
- *
- * @param snapId - The id of the snap to check.
- * @param snapInfo - Snap information containing version and shasum.
- */
-async function _SnapController_assertIsUnblocked(snapId, snapInfo) {
-    if (await this.isBlocked(snapId, snapInfo)) {
-        throw new Error(`Cannot install version "${snapInfo.version}" of snap "${snapId}": the version is blocked.`);
+}, _SnapController_assertIsInstallAllowed = async function _SnapController_assertIsInstallAllowed(snapId, snapInfo) {
+    var _a, _b;
+    const results = await __classPrivateFieldGet(this, _SnapController_registry, "f").get({
+        [snapId]: snapInfo,
+    });
+    const result = results[snapId];
+    if (result.status === registry_1.SnapsRegistryStatus.Blocked) {
+        throw new Error(`Cannot install version "${snapInfo.version}" of snap "${snapId}": The version is blocked. ${(_b = (_a = result.reason) === null || _a === void 0 ? void 0 : _a.explanation) !== null && _b !== void 0 ? _b : ''}`);
+    }
+    else if (__classPrivateFieldGet(this, _SnapController_featureFlags, "f").requireAllowlist &&
+        result.status !== registry_1.SnapsRegistryStatus.Verified) {
+        throw new Error(`Cannot install version "${snapInfo.version}" of snap "${snapId}": The snap is not on the allow list.`);
     }
 }, _SnapController_stopSnapsLastRequestPastMax = async function _SnapController_stopSnapsLastRequestPastMax() {
     const entries = [...this.snapsRuntimeData.entries()];
@@ -1001,9 +1000,9 @@ 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);
-            await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_assertIsUnblocked).call(this, snapId, {
+            await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_assertIsInstallAllowed).call(this, snapId, {
                 version: fetchedSnap.manifest.result.version,
-                shasum: fetchedSnap.manifest.result.source.shasum,
+                checksum: fetchedSnap.manifest.result.source.shasum,
             });
             return __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_set).call(this, Object.assign(Object.assign(Object.assign({}, args), fetchedSnap), { id: snapId }));
         })();
@@ -1074,7 +1073,7 @@ async function _SnapController_getEndowments(snapId) {
     const { id: snapId, origin, manifest, files, versionRange = snaps_utils_1.DEFAULT_REQUESTED_SNAP_VERSION, isUpdate = false, } = args;
     (0, snaps_utils_1.assertIsSnapManifest)(manifest.result);
     const { version } = manifest.result;
-    if (!(0, snaps_utils_1.satisfiesVersionRange)(version, versionRange)) {
+    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 sourceCode = (_a = files
@@ -1245,6 +1244,7 @@ async function _SnapController_executeWithTimeout(snapId, promise, timer) {
     const isLongRunning = this.messagingSystem.call('PermissionController:hasPermission', snapId, endowments_1.SnapEndowments.LongRunning);
     // Long running snaps have timeouts disabled
     if (isLongRunning) {
+        console.warn(`${endowments_1.SnapEndowments.LongRunning} will soon be deprecated. For more information please see https://github.com/MetaMask/snaps-monorepo/issues/945.`);
         return promise;
     }
     const result = await (0, utils_2.withTimeout)(promise, timer !== null && timer !== void 0 ? timer : this.maxRequestTime);
@@ -1360,10 +1360,10 @@ async function _SnapController_rollbackSnaps(snapIds) {
     return { newPermissions, unusedPermissions, approvedPermissions };
 }, _SnapController_isValidUpdate = function _SnapController_isValidUpdate(snapId, newVersionRange) {
     const existingSnap = this.getExpect(snapId);
-    if ((0, snaps_utils_1.satisfiesVersionRange)(existingSnap.version, newVersionRange)) {
+    if ((0, utils_1.satisfiesVersionRange)(existingSnap.version, newVersionRange)) {
         return false;
     }
-    if ((0, snaps_utils_1.gtRange)(existingSnap.version, newVersionRange)) {
+    if ((0, utils_1.gtRange)(existingSnap.version, newVersionRange)) {
         return false;
     }
     return true;