@metamask/snaps-controllers 0.24.1 → 0.25.0

package/dist/snaps/SnapController.js

@@ -21,26 +21,25 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _SnapController_instances, _SnapController_closeAllConnections, _SnapController_environmentEndowmentPermissions, _SnapController_featureFlags, _SnapController_fetchFunction, _SnapController_idleTimeCheckInterval, _SnapController_checkSnapBlockList, _SnapController_maxIdleTime, _SnapController_npmRegistryUrl, _SnapController_getAppKey, _SnapController_timeoutForLastRequestStatus, _SnapController_statusMachine, _SnapController_initializeStateMachine, _SnapController_registerMessageHandlers, _SnapController_pollForLastRequestStatus, _SnapController_blockSnap, _SnapController_unblockSnap, _SnapController_assertIsUnblocked, _SnapController_stopSnapsLastRequestPastMax, _SnapController_transition, _SnapController_terminateSnap, _SnapController_getEncryptionKey, _SnapController_encryptSnapState, _SnapController_decryptSnapState, _SnapController_add, _SnapController_startSnap, _SnapController_getEndowments, _SnapController_set, _SnapController_fetchNpmSnap, _SnapController_fetchLocalSnap, _SnapController_processSnapPermissions, _SnapController_getRpcRequestHandler, _SnapController_executeWithTimeout, _SnapController_recordSnapRpcRequestStart, _SnapController_recordSnapRpcRequestFinish, _SnapController_getRuntime, _SnapController_getRuntimeExpect, _SnapController_setupRuntime, _SnapController_calculatePermissionsChange;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapController = exports.AppKeyType = exports.SNAP_APPROVAL_UPDATE = exports.SNAP_APPROVAL_INSTALL = exports.controllerName = void 0;
-const browser_passworder_1 = __importDefault(require("@metamask/browser-passworder"));
-const controllers_1 = require("@metamask/controllers");
+const base_controller_1 = require("@metamask/base-controller");
+const browser_passworder_1 = require("@metamask/browser-passworder");
+const rpc_methods_1 = require("@metamask/rpc-methods");
 const snaps_utils_1 = require("@metamask/snaps-utils");
+const subject_metadata_controller_1 = require("@metamask/subject-metadata-controller");
 const utils_1 = require("@metamask/utils");
 const fsm_1 = require("@xstate/fsm");
 const eth_rpc_errors_1 = require("eth-rpc-errors");
 const nanoid_1 = require("nanoid");
-const rpc_methods_1 = require("@metamask/rpc-methods");
 const fsm_2 = require("../fsm");
 const utils_2 = require("../utils");
 const endowments_1 = require("./endowments");
+const rpc_1 = require("./endowments/rpc");
 const RequestQueue_1 = require("./RequestQueue");
-const utils_3 = require("./utils");
 const Timer_1 = require("./Timer");
+const utils_3 = require("./utils");
 exports.controllerName = 'SnapController';
 // TODO: Figure out how to name these
 exports.SNAP_APPROVAL_INSTALL = 'wallet_installSnap';
@@ -55,7 +54,7 @@ const TRUNCATED_SNAP_PROPERTIES = new Set([
 ]);
 var AppKeyType;
 (function (AppKeyType) {
-    AppKeyType["stateEncryption"] = "stateEncryption";
+    AppKeyType["StateEncryption"] = "stateEncryption";
 })(AppKeyType = exports.AppKeyType || (exports.AppKeyType = {}));
 const defaultState = {
     snapErrors: {},
@@ -69,12 +68,14 @@ const defaultState = {
  * @returns Object with serializable snap properties.
  */
 function truncateSnap(snap) {
-    return Object.keys(snap).reduce((serialized, key) => {
+    const truncatedSnap = Object.keys(snap).reduce((serialized, key) => {
         if (TRUNCATED_SNAP_PROPERTIES.has(key)) {
             serialized[key] = snap[key];
         }
         return serialized;
     }, {});
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+    return truncatedSnap;
 }
 const name = 'SnapController';
 /*
@@ -83,7 +84,7 @@ const name = 'SnapController';
  * - Authorize: Requests the snap's required permissions from the user.
  * - Start: Initializes the snap in its SES realm with the authorized permissions.
  */
-class SnapController extends controllers_1.BaseControllerV2 {
+class SnapController extends base_controller_1.BaseControllerV2 {
     constructor({ closeAllConnections, messenger, state, getAppKey, environmentEndowmentPermissions = [], npmRegistryUrl, 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 = {}, }) {
         var _a, _b;
         super({
@@ -153,9 +154,11 @@ class SnapController extends controllers_1.BaseControllerV2 {
         this._onOutboundResponse = this._onOutboundResponse.bind(this);
         this.snapsRuntimeData = new Map();
         __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_pollForLastRequestStatus).call(this);
+        /* eslint-disable @typescript-eslint/unbound-method */
         this.messagingSystem.subscribe('ExecutionService:unhandledError', this._onUnhandledSnapError);
         this.messagingSystem.subscribe('ExecutionService:outboundRequest', this._onOutboundRequest);
         this.messagingSystem.subscribe('ExecutionService:outboundResponse', this._onOutboundResponse);
+        /* eslint-enable @typescript-eslint/unbound-method */
         __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_initializeStateMachine).call(this);
         __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_registerMessageHandlers).call(this);
         Object.values((_b = state === null || state === void 0 ? void 0 : state.snaps) !== null && _b !== void 0 ? _b : {}).forEach((snap) => {
@@ -179,7 +182,7 @@ class SnapController extends controllers_1.BaseControllerV2 {
             };
             return blockListArg;
         }, {}));
-        await Promise.all(Object.entries(blockedSnaps).map((_a) => {
+        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);
@@ -200,11 +203,15 @@ class SnapController extends controllers_1.BaseControllerV2 {
         });
         return result[snapId].blocked;
     }
-    async _onUnhandledSnapError(snapId, error) {
-        await this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Crash);
-        this.addSnapError(error);
+    _onUnhandledSnapError(snapId, error) {
+        this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Crash)
+            .then(() => this.addSnapError(error))
+            .catch((stopSnapError) => {
+            // TODO: Decide how to handle errors.
+            console.error(stopSnapError);
+        });
     }
-    async _onOutboundRequest(snapId) {
+    _onOutboundRequest(snapId) {
         const runtime = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRuntimeExpect).call(this, snapId);
         // Ideally we would only pause the pending request that is making the outbound request
         // but right now we don't have a way to know which request initiated the outbound request
@@ -213,7 +220,7 @@ class SnapController extends controllers_1.BaseControllerV2 {
             .forEach((pendingRequest) => pendingRequest.timer.pause());
         runtime.pendingOutboundRequests += 1;
     }
-    async _onOutboundResponse(snapId) {
+    _onOutboundResponse(snapId) {
         const runtime = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRuntimeExpect).call(this, snapId);
         runtime.pendingOutboundRequests -= 1;
         if (runtime.pendingOutboundRequests === 0) {
@@ -260,7 +267,7 @@ class SnapController extends controllers_1.BaseControllerV2 {
      * @param snapId - The id of the Snap to disable.
      * @returns A promise that resolves once the snap has been disabled.
      */
-    disableSnap(snapId) {
+    async disableSnap(snapId) {
         if (!this.has(snapId)) {
             throw new Error(`Snap "${snapId}" not found.`);
         }
@@ -386,7 +393,7 @@ class SnapController extends controllers_1.BaseControllerV2 {
      *
      * @param snapId - The id of the Snap whose state should be cleared.
      */
-    async clearSnapState(snapId) {
+    clearSnapState(snapId) {
         const runtime = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRuntimeExpect).call(this, snapId);
         runtime.state = null;
     }
@@ -402,20 +409,19 @@ class SnapController extends controllers_1.BaseControllerV2 {
         });
     }
     /**
-     * Removes an error by internalID from a the SnapControllers state.
+     * Removes an error by internalID from the SnapControllers state.
      *
      * @param internalID - The internal error ID to remove on the SnapController.
      */
-    async removeSnapError(internalID) {
+    removeSnapError(internalID) {
         this.update((state) => {
             delete state.snapErrors[internalID];
         });
     }
     /**
      * Clears all errors from the SnapControllers state.
-     *
      */
-    async clearSnapErrors() {
+    clearSnapErrors() {
         this.update((state) => {
             state.snapErrors = {};
         });
@@ -436,13 +442,13 @@ class SnapController extends controllers_1.BaseControllerV2 {
      * Completely clear the controller's state: delete all associated data,
      * handlers, event listeners, and permissions; tear down all snap providers.
      */
-    clearState() {
+    async clearState() {
         const snapIds = Object.keys(this.state.snaps);
         snapIds.forEach((snapId) => {
             __classPrivateFieldGet(this, _SnapController_closeAllConnections, "f").call(this, snapId);
         });
-        this.messagingSystem.call('ExecutionService:terminateAllSnaps');
-        snapIds.forEach(this.revokeAllSnapPermissions);
+        await this.messagingSystem.call('ExecutionService:terminateAllSnaps');
+        snapIds.forEach((snapId) => this.revokeAllSnapPermissions(snapId));
         this.update((state) => {
             state.snaps = {};
             state.snapStates = {};
@@ -491,8 +497,8 @@ class SnapController extends controllers_1.BaseControllerV2 {
      *
      * @param snapId - The snap ID.
      */
-    async revokeAllSnapPermissions(snapId) {
-        if (await this.messagingSystem.call('PermissionController:hasPermissions', snapId)) {
+    revokeAllSnapPermissions(snapId) {
+        if (this.messagingSystem.call('PermissionController:hasPermissions', snapId)) {
             this.messagingSystem.call('PermissionController:revokeAllPermissions', snapId);
         }
     }
@@ -529,9 +535,9 @@ class SnapController extends controllers_1.BaseControllerV2 {
      * @param origin - The origin whose permitted snaps to retrieve.
      * @returns The serialized permitted snaps for the origin.
      */
-    async getPermittedSnaps(origin) {
+    getPermittedSnaps(origin) {
         var _a;
-        return Object.values((_a = (await this.messagingSystem.call('PermissionController:getPermissions', origin))) !== null && _a !== void 0 ? _a : {}).reduce((permittedSnaps, perm) => {
+        return Object.values((_a = this.messagingSystem.call('PermissionController:getPermissions', origin)) !== null && _a !== void 0 ? _a : {}).reduce((permittedSnaps, perm) => {
             if (perm.parentCapability.startsWith(snaps_utils_1.SNAP_PREFIX)) {
                 const snapId = perm.parentCapability.replace(snaps_utils_1.SNAP_PREFIX_REGEX, '');
                 const snap = this.get(snapId);
@@ -556,15 +562,15 @@ class SnapController extends controllers_1.BaseControllerV2 {
     async installSnaps(origin, requestedSnaps) {
         const result = {};
         await Promise.all(Object.entries(requestedSnaps).map(async ([snapId, { version: rawVersion }]) => {
-            const version = (0, snaps_utils_1.resolveVersion)(rawVersion);
-            const permissionName = (0, snaps_utils_1.getSnapPermissionName)(snapId);
-            if (!(0, snaps_utils_1.isValidSnapVersionRange)(version)) {
+            const [error, version] = (0, snaps_utils_1.resolveVersionRange)(rawVersion);
+            if (error) {
                 result[snapId] = {
                     error: eth_rpc_errors_1.ethErrors.rpc.invalidParams(`The "version" field must be a valid SemVer version range if specified. Received: "${version}".`),
                 };
                 return;
             }
-            if (await this.messagingSystem.call('PermissionController:hasPermission', origin, permissionName)) {
+            const permissionName = (0, snaps_utils_1.getSnapPermissionName)(snapId);
+            if (this.messagingSystem.call('PermissionController:hasPermission', origin, permissionName)) {
                 // Attempt to install and run the snap, storing any errors that
                 // occur during the process.
                 result[snapId] = Object.assign({}, (await this.processRequestedSnap(origin, snapId, version)));
@@ -591,7 +597,7 @@ class SnapController extends controllers_1.BaseControllerV2 {
         try {
             (0, snaps_utils_1.validateSnapId)(snapId);
         }
-        catch (err) {
+        catch (error) {
             return {
                 error: eth_rpc_errors_1.ethErrors.rpc.invalidParams(`"${snapId}" is not a valid snap id.`),
             };
@@ -612,8 +618,8 @@ class SnapController extends controllers_1.BaseControllerV2 {
                     }
                     return updateResult;
                 }
-                catch (err) {
-                    return { error: (0, eth_rpc_errors_1.serializeError)(err) };
+                catch (error) {
+                    return { error: (0, eth_rpc_errors_1.serializeError)(error) };
                 }
             }
             else {
@@ -641,12 +647,12 @@ class SnapController extends controllers_1.BaseControllerV2 {
             this.messagingSystem.publish(`SnapController:snapInstalled`, truncated);
             return truncated;
         }
-        catch (err) {
-            console.error(`Error when adding snap.`, err);
+        catch (error) {
+            console.error(`Error when adding snap.`, error);
             if (this.has(snapId)) {
-                this.removeSnap(snapId);
+                await this.removeSnap(snapId);
             }
-            return { error: (0, eth_rpc_errors_1.serializeError)(err) };
+            return { error: (0, eth_rpc_errors_1.serializeError)(error) };
         }
     }
     /**
@@ -668,7 +674,7 @@ class SnapController extends controllers_1.BaseControllerV2 {
      */
     async updateSnap(origin, snapId, newVersionRange = snaps_utils_1.DEFAULT_REQUESTED_SNAP_VERSION) {
         const snap = this.getExpect(snapId);
-        if (!(0, snaps_utils_1.isValidSnapVersionRange)(newVersionRange)) {
+        if (!(0, snaps_utils_1.isValidSemVerRange)(newVersionRange)) {
             throw new Error(`Received invalid snap version range: "${newVersionRange}".`);
         }
         const newSnap = await this.fetchSnap(snapId, newVersionRange);
@@ -682,7 +688,7 @@ class SnapController extends controllers_1.BaseControllerV2 {
             shasum: newSnap.manifest.source.shasum,
         });
         const processedPermissions = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_processSnapPermissions).call(this, newSnap.manifest.initialPermissions);
-        const { newPermissions, unusedPermissions, approvedPermissions } = await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_calculatePermissionsChange).call(this, snapId, processedPermissions);
+        const { newPermissions, unusedPermissions, approvedPermissions } = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_calculatePermissionsChange).call(this, snapId, processedPermissions);
         const id = (0, nanoid_1.nanoid)();
         const _a = (await this.messagingSystem.call('ApprovalController:addRequest', {
             origin,
@@ -712,12 +718,12 @@ class SnapController extends controllers_1.BaseControllerV2 {
         });
         const unusedPermissionsKeys = Object.keys(unusedPermissions);
         if ((0, utils_1.isNonEmptyArray)(unusedPermissionsKeys)) {
-            await this.messagingSystem.call('PermissionController:revokePermissions', {
+            this.messagingSystem.call('PermissionController:revokePermissions', {
                 [snapId]: unusedPermissionsKeys,
             });
         }
         if ((0, utils_1.isNonEmptyArray)(Object.keys(approvedNewPermissions))) {
-            await this.messagingSystem.call('PermissionController:grantPermissions', {
+            this.messagingSystem.call('PermissionController:grantPermissions', {
                 approvedPermissions: approvedNewPermissions,
                 subject: { origin: snapId },
                 requestData,
@@ -785,7 +791,7 @@ class SnapController extends controllers_1.BaseControllerV2 {
                 },
             }, true)), { permissions: approvedPermissions } = _a, requestData = __rest(_a, ["permissions"]);
             if ((0, utils_1.isNonEmptyArray)(Object.keys(approvedPermissions))) {
-                await this.messagingSystem.call('PermissionController:grantPermissions', {
+                this.messagingSystem.call('PermissionController:grantPermissions', {
                     approvedPermissions,
                     subject: { origin: snapId },
                     requestData,
@@ -802,9 +808,11 @@ class SnapController extends controllers_1.BaseControllerV2 {
         if (__classPrivateFieldGet(this, _SnapController_timeoutForLastRequestStatus, "f")) {
             clearTimeout(__classPrivateFieldGet(this, _SnapController_timeoutForLastRequestStatus, "f"));
         }
+        /* eslint-disable @typescript-eslint/unbound-method */
         this.messagingSystem.unsubscribe('ExecutionService:unhandledError', this._onUnhandledSnapError);
         this.messagingSystem.unsubscribe('ExecutionService:outboundRequest', this._onOutboundRequest);
         this.messagingSystem.unsubscribe('ExecutionService:outboundResponse', this._onOutboundResponse);
+        /* eslint-enable @typescript-eslint/unbound-method */
     }
     /**
      * Passes a JSON-RPC request object to the RPC handler function of a snap.
@@ -817,6 +825,23 @@ class SnapController extends controllers_1.BaseControllerV2 {
      * @returns The result of the JSON-RPC request.
      */
     async handleRequest({ snapId, origin, handler: handlerType, request, }) {
+        const permissionName = endowments_1.handlerEndowments[handlerType];
+        const hasPermission = this.messagingSystem.call('PermissionController:hasPermission', snapId, permissionName);
+        if (!hasPermission) {
+            throw new Error(`Snap "${snapId}" is not permitted to use "${permissionName}".`);
+        }
+        if (permissionName === endowments_1.SnapEndowments.Rpc) {
+            const subject = this.messagingSystem.call('SubjectMetadataController:getSubjectMetadata', origin);
+            const isSnap = (subject === null || subject === void 0 ? void 0 : subject.subjectType) === subject_metadata_controller_1.SubjectType.Snap;
+            const permissions = this.messagingSystem.call('PermissionController:getPermissions', snapId);
+            const rpcPermission = permissions === null || permissions === void 0 ? void 0 : permissions[endowments_1.SnapEndowments.Rpc];
+            (0, utils_1.assert)(rpcPermission);
+            const origins = (0, rpc_1.getRpcCaveatOrigins)(rpcPermission);
+            (0, utils_1.assert)(origins);
+            if ((isSnap && !origins.snaps) || (!isSnap && !origins.dapps)) {
+                throw new Error(`Snap "${snapId}" is not permitted to handle JSON-RPC requests from "${origin}".`);
+            }
+        }
         const handler = await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRpcRequestHandler).call(this, snapId);
         if (!handler) {
             throw new Error(`Snap RPC message handler not found for snap "${snapId}".`);
@@ -878,23 +903,26 @@ _SnapController_closeAllConnections = new WeakMap(), _SnapController_environment
 }, _SnapController_registerMessageHandlers = function _SnapController_registerMessageHandlers() {
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:clearSnapState`, (...args) => this.clearSnapState(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:get`, (...args) => this.get(...args));
-    this.messagingSystem.registerActionHandler(`${exports.controllerName}:getSnapState`, (...args) => this.getSnapState(...args));
-    this.messagingSystem.registerActionHandler(`${exports.controllerName}:handleRequest`, (...args) => this.handleRequest(...args));
+    this.messagingSystem.registerActionHandler(`${exports.controllerName}:getSnapState`, async (...args) => this.getSnapState(...args));
+    this.messagingSystem.registerActionHandler(`${exports.controllerName}:handleRequest`, async (...args) => this.handleRequest(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:has`, (...args) => this.has(...args));
-    this.messagingSystem.registerActionHandler(`${exports.controllerName}:updateBlockedSnaps`, () => this.updateBlockedSnaps());
-    this.messagingSystem.registerActionHandler(`${exports.controllerName}:updateSnapState`, (...args) => this.updateSnapState(...args));
+    this.messagingSystem.registerActionHandler(`${exports.controllerName}:updateBlockedSnaps`, async () => this.updateBlockedSnaps());
+    this.messagingSystem.registerActionHandler(`${exports.controllerName}:updateSnapState`, async (...args) => this.updateSnapState(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:enable`, (...args) => this.enableSnap(...args));
-    this.messagingSystem.registerActionHandler(`${exports.controllerName}:disable`, (...args) => this.disableSnap(...args));
-    this.messagingSystem.registerActionHandler(`${exports.controllerName}:remove`, (...args) => this.removeSnap(...args));
+    this.messagingSystem.registerActionHandler(`${exports.controllerName}:disable`, async (...args) => this.disableSnap(...args));
+    this.messagingSystem.registerActionHandler(`${exports.controllerName}:remove`, async (...args) => this.removeSnap(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:getPermitted`, (...args) => this.getPermittedSnaps(...args));
-    this.messagingSystem.registerActionHandler(`${exports.controllerName}:install`, (...args) => this.installSnaps(...args));
+    this.messagingSystem.registerActionHandler(`${exports.controllerName}:install`, async (...args) => this.installSnaps(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:removeSnapError`, (...args) => this.removeSnapError(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:getAll`, (...args) => this.getAllSnaps(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:incrementActiveReferences`, (...args) => this.incrementActiveReferences(...args));
     this.messagingSystem.registerActionHandler(`${exports.controllerName}:decrementActiveReferences`, (...args) => this.decrementActiveReferences(...args));
 }, _SnapController_pollForLastRequestStatus = function _SnapController_pollForLastRequestStatus() {
-    __classPrivateFieldSet(this, _SnapController_timeoutForLastRequestStatus, setTimeout(async () => {
-        await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_stopSnapsLastRequestPastMax).call(this);
+    __classPrivateFieldSet(this, _SnapController_timeoutForLastRequestStatus, setTimeout(() => {
+        __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_stopSnapsLastRequestPastMax).call(this).catch((error) => {
+            // TODO: Decide how to handle errors.
+            console.error(error);
+        });
         __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_pollForLastRequestStatus).call(this);
     }, __classPrivateFieldGet(this, _SnapController_idleTimeCheckInterval, "f")), "f");
 }, _SnapController_blockSnap = 
@@ -920,15 +948,7 @@ async function _SnapController_blockSnap(snapId, blockedSnapInfo) {
         console.error(`Encountered error when stopping blocked snap "${snapId}".`, error);
     }
     this.messagingSystem.publish(`${exports.controllerName}:snapBlocked`, snapId, blockedSnapInfo);
-}, _SnapController_unblockSnap = 
-/**
- * Unblocks a snap so that it can be enabled and started again. Emits
- * {@link SnapUnblocked}. Does nothing if the snap is not installed or already
- * unblocked.
- *
- * @param snapId - The id of the snap to unblock.
- */
-async function _SnapController_unblockSnap(snapId) {
+}, _SnapController_unblockSnap = function _SnapController_unblockSnap(snapId) {
     if (!this.has(snapId) || !this.state.snaps[snapId].blocked) {
         return;
     }
@@ -958,7 +978,7 @@ async function _SnapController_assertIsUnblocked(snapId, snapInfo) {
         runtime.lastRequest &&
         __classPrivateFieldGet(this, _SnapController_maxIdleTime, "f") &&
         (0, utils_1.timeSince)(runtime.lastRequest) > __classPrivateFieldGet(this, _SnapController_maxIdleTime, "f"))
-        .map(([snapId]) => this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Stop)));
+        .map(async ([snapId]) => this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Stop)));
 }, _SnapController_transition = function _SnapController_transition(snapId, event) {
     const { interpreter } = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRuntimeExpect).call(this, snapId);
     interpreter.send(event);
@@ -975,16 +995,18 @@ async function _SnapController_terminateSnap(snapId) {
     await this.messagingSystem.call('ExecutionService:terminateSnap', snapId);
     this.messagingSystem.publish('SnapController:snapTerminated', this.getTruncatedExpect(snapId));
 }, _SnapController_getEncryptionKey = async function _SnapController_getEncryptionKey(snapId) {
-    return __classPrivateFieldGet(this, _SnapController_getAppKey, "f").call(this, snapId, AppKeyType.stateEncryption);
+    return __classPrivateFieldGet(this, _SnapController_getAppKey, "f").call(this, snapId, AppKeyType.StateEncryption);
 }, _SnapController_encryptSnapState = async function _SnapController_encryptSnapState(snapId, state) {
     const appKey = await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getEncryptionKey).call(this, snapId);
-    return browser_passworder_1.default.encrypt(appKey, state);
+    return (0, browser_passworder_1.encrypt)(appKey, state);
 }, _SnapController_decryptSnapState = async function _SnapController_decryptSnapState(snapId, encrypted) {
     const appKey = await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getEncryptionKey).call(this, snapId);
     try {
-        return await browser_passworder_1.default.decrypt(appKey, encrypted);
+        const value = await (0, browser_passworder_1.decrypt)(appKey, encrypted);
+        (0, utils_1.assert)((0, utils_1.isValidJson)(value));
+        return value;
     }
-    catch (err) {
+    catch (error) {
         throw new Error('Failed to decrypt snap state, the state must be corrupted.');
     }
 }, _SnapController_add = 
@@ -1044,9 +1066,9 @@ async function _SnapController_add(args) {
         __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_transition).call(this, snapId, snaps_utils_1.SnapStatusEvents.Start);
         return result;
     }
-    catch (err) {
+    catch (error) {
         await __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_terminateSnap).call(this, snapId);
-        throw err;
+        throw error;
     }
 }, _SnapController_getEndowments = 
 /**
@@ -1063,7 +1085,7 @@ async function _SnapController_add(args) {
 async function _SnapController_getEndowments(snapId) {
     let allEndowments = [];
     for (const permissionName of __classPrivateFieldGet(this, _SnapController_environmentEndowmentPermissions, "f")) {
-        if (await this.messagingSystem.call('PermissionController:hasPermission', snapId, permissionName)) {
+        if (this.messagingSystem.call('PermissionController:hasPermission', snapId, permissionName)) {
             const endowments = await this.messagingSystem.call('PermissionController:getEndowments', snapId, permissionName);
             if (endowments) {
                 // We don't have any guarantees about the type of the endowments
@@ -1080,6 +1102,8 @@ async function _SnapController_getEndowments(snapId) {
         ...new Set([...snaps_utils_1.DEFAULT_ENDOWMENTS, ...allEndowments]),
     ];
     if (dedupedEndowments.length <
+        // This is a bug in TypeScript: https://github.com/microsoft/TypeScript/issues/48313
+        // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
         snaps_utils_1.DEFAULT_ENDOWMENTS.length + allEndowments.length) {
         console.error('Duplicate endowments found. Default endowments should not be requested.', allEndowments);
     }
@@ -1131,7 +1155,7 @@ async function _SnapController_getEndowments(snapId) {
     this.messagingSystem.publish(`SnapController:snapAdded`, snap, svgIcon);
     return Object.assign(Object.assign({}, snap), { sourceCode });
 }, _SnapController_fetchNpmSnap = async function _SnapController_fetchNpmSnap(packageName, versionRange) {
-    if (!(0, snaps_utils_1.isValidSnapVersionRange)(versionRange)) {
+    if (!(0, snaps_utils_1.isValidSemVerRange)(versionRange)) {
         throw new Error(`Received invalid Snap version range: "${versionRange}".`);
     }
     const { manifest, sourceCode, svgIcon } = await (0, utils_3.fetchNpmSnap)(packageName, versionRange, __classPrivateFieldGet(this, _SnapController_npmRegistryUrl, "f"), __classPrivateFieldGet(this, _SnapController_fetchFunction, "f"));
@@ -1177,14 +1201,7 @@ async function _SnapController_fetchLocalSnap(localhostUrl) {
         (0, utils_1.assert)(Object.keys(value).length === 0);
         return [initialPermission, {}];
     }));
-}, _SnapController_getRpcRequestHandler = 
-/**
- * Gets the RPC message handler for the given snap.
- *
- * @param snapId - The id of the Snap whose message handler to get.
- * @returns The RPC handler for the given snap.
- */
-async function _SnapController_getRpcRequestHandler(snapId) {
+}, _SnapController_getRpcRequestHandler = function _SnapController_getRpcRequestHandler(snapId) {
     const runtime = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRuntimeExpect).call(this, snapId);
     const existingHandler = runtime.rpcHandler;
     if (existingHandler) {
@@ -1201,7 +1218,7 @@ async function _SnapController_getRpcRequestHandler(snapId) {
         if (this.state.snaps[snapId].status === snaps_utils_1.SnapStatus.Installing) {
             throw new Error(`Snap "${snapId}" is currently being installed. Please try again later.`);
         }
-        if (this.isRunning(snapId) === false) {
+        if (!this.isRunning(snapId)) {
             let localStartPromise = startPromises.get(snapId);
             if (!localStartPromise) {
                 localStartPromise = this.startSnap(snapId);
@@ -1241,9 +1258,9 @@ async function _SnapController_getRpcRequestHandler(snapId) {
             __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_recordSnapRpcRequestFinish).call(this, snapId, request.id);
             return result;
         }
-        catch (err) {
+        catch (error) {
             await this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Crash);
-            throw err;
+            throw error;
         }
     };
     runtime.rpcHandler = rpcHandler;
@@ -1260,7 +1277,7 @@ async function _SnapController_getRpcRequestHandler(snapId) {
  * @template PromiseValue - The value of the Promise.
  */
 async function _SnapController_executeWithTimeout(snapId, promise, timer) {
-    const isLongRunning = await this.messagingSystem.call('PermissionController:hasPermission', snapId, endowments_1.SnapEndowments.LongRunning);
+    const isLongRunning = this.messagingSystem.call('PermissionController:hasPermission', snapId, endowments_1.SnapEndowments.LongRunning);
     // Long running snaps have timeouts disabled
     if (isLongRunning) {
         return promise;
@@ -1276,7 +1293,7 @@ async function _SnapController_executeWithTimeout(snapId, promise, timer) {
     runtime.lastRequest = null;
 }, _SnapController_recordSnapRpcRequestFinish = function _SnapController_recordSnapRpcRequestFinish(snapId, requestId) {
     const runtime = __classPrivateFieldGet(this, _SnapController_instances, "m", _SnapController_getRuntimeExpect).call(this, snapId);
-    runtime.pendingInboundRequests = runtime.pendingInboundRequests.filter((r) => r.requestId !== requestId);
+    runtime.pendingInboundRequests = runtime.pendingInboundRequests.filter((request) => request.requestId !== requestId);
     if (runtime.pendingInboundRequests.length === 0) {
         runtime.lastRequest = Date.now();
     }
@@ -1299,9 +1316,9 @@ async function _SnapController_executeWithTimeout(snapId, promise, timer) {
     });
     (0, fsm_2.forceStrict)(interpreter);
     this.snapsRuntimeData.set(snapId, Object.assign({ lastRequest: null, rpcHandler: null, installPromise: null, activeReferences: 0, pendingInboundRequests: [], pendingOutboundRequests: 0, interpreter }, data));
-}, _SnapController_calculatePermissionsChange = async function _SnapController_calculatePermissionsChange(snapId, desiredPermissionsSet) {
+}, _SnapController_calculatePermissionsChange = function _SnapController_calculatePermissionsChange(snapId, desiredPermissionsSet) {
     var _a;
-    const oldPermissions = (_a = (await this.messagingSystem.call('PermissionController:getPermissions', snapId))) !== null && _a !== void 0 ? _a : {};
+    const oldPermissions = (_a = this.messagingSystem.call('PermissionController:getPermissions', snapId)) !== null && _a !== void 0 ? _a : {};
     const newPermissions = (0, utils_2.setDiff)(desiredPermissionsSet, oldPermissions);
     // TODO(ritave): The assumption that these are unused only holds so long as we do not
     //               permit dynamic permission requests.