@metamask/snaps-controllers 18.0.4 → 19.0.1

package/dist/snaps/SnapController.cjs

@@ -22,7 +22,35 @@ const fsm_2 = require("../fsm.cjs");
 const logging_1 = require("../logging.cjs");
 const utils_2 = require("../utils.cjs");
 exports.controllerName = 'SnapController';
-// TODO: Figure out how to name these
+// This is used by the `generate-method-action-types` script.
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const MESSENGER_EXPOSED_METHODS = [
+    'init',
+    'updateRegistry',
+    'enableSnap',
+    'disableSnap',
+    'stopSnap',
+    'stopAllSnaps',
+    'isSnapRunning',
+    'hasSnap',
+    'getSnap',
+    'updateSnapState',
+    'clearSnapState',
+    'getSnapState',
+    'getSnapFile',
+    'isMinimumPlatformVersion',
+    'clearState',
+    'removeSnap',
+    'removeSnaps',
+    'disconnectOrigin',
+    'revokeDynamicSnapPermissions',
+    'getAllSnaps',
+    'getRunnableSnaps',
+    'getPermittedSnaps',
+    'installSnaps',
+    'handleRequest',
+    'setClientActive',
+];
 exports.SNAP_APPROVAL_INSTALL = 'wallet_installSnap';
 exports.SNAP_APPROVAL_UPDATE = 'wallet_updateSnap';
 exports.SNAP_APPROVAL_RESULT = 'wallet_installSnapResult';
@@ -188,7 +216,7 @@ class SnapController extends base_controller_1.BaseController {
             });
         });
         this.messenger.subscribe('KeyringController:lock', this.#handleLock.bind(this));
-        this.messenger.subscribe('SnapsRegistry:stateChange', () => {
+        this.messenger.subscribe('SnapRegistryController:stateChange', () => {
             this.#handleRegistryUpdate().catch((error) => {
                 (0, snaps_utils_1.logError)(`Error when processing Snaps registry update: ${(0, snaps_sdk_1.getErrorMessage)(error)}`);
             });
@@ -197,7 +225,7 @@ class SnapController extends base_controller_1.BaseController {
         this.#registerMessageHandlers();
         Object.values(this.state?.snaps ?? {}).forEach((snap) => this.#setupRuntime(snap.id));
         this.#trackSnapExport = (0, utils_2.throttleTracking)((snapId, handler, success, origin) => {
-            const snapMetadata = this.messenger.call('SnapsRegistry:getMetadata', snapId);
+            const snapMetadata = this.messenger.call('SnapRegistryController:getMetadata', snapId);
             this.#trackEvent({
                 event: 'Snap Export Used',
                 category: 'Snaps',
@@ -224,7 +252,7 @@ class SnapController extends base_controller_1.BaseController {
     // In the future, side-effects could be added to the machine during transitions.
     #initializeStateMachine() {
         const disableGuard = ({ snapId }) => {
-            return this.getExpect(snapId).enabled;
+            return this.getSnapExpect(snapId).enabled;
         };
         const statusConfig = {
             initial: snaps_utils_1.SnapStatus.Installing,
@@ -282,24 +310,22 @@ class SnapController extends base_controller_1.BaseController {
     #registerMessageHandlers() {
         this.messenger.registerActionHandler(`${exports.controllerName}:init`, async (...args) => this.init(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:clearSnapState`, (...args) => this.clearSnapState(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:get`, (...args) => this.get(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:getSnap`, (...args) => this.getSnap(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:getSnapState`, async (...args) => this.getSnapState(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:handleRequest`, async (...args) => this.handleRequest(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:has`, (...args) => this.has(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:hasSnap`, (...args) => this.hasSnap(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:updateRegistry`, async () => this.updateRegistry());
         this.messenger.registerActionHandler(`${exports.controllerName}:updateSnapState`, async (...args) => this.updateSnapState(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:enable`, (...args) => this.enableSnap(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:disable`, async (...args) => this.disableSnap(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:remove`, async (...args) => this.removeSnap(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:getPermitted`, (...args) => this.getPermittedSnaps(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:install`, async (...args) => this.installSnaps(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:getAll`, (...args) => this.getAllSnaps(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:enableSnap`, (...args) => this.enableSnap(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:disableSnap`, async (...args) => this.disableSnap(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:removeSnap`, async (...args) => this.removeSnap(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:getPermittedSnaps`, (...args) => this.getPermittedSnaps(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:installSnaps`, async (...args) => this.installSnaps(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:getAllSnaps`, (...args) => this.getAllSnaps(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:getRunnableSnaps`, (...args) => this.getRunnableSnaps(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:incrementActiveReferences`, (...args) => this.incrementActiveReferences(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:decrementActiveReferences`, (...args) => this.decrementActiveReferences(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:disconnectOrigin`, (...args) => this.removeSnapFromSubject(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:revokeDynamicPermissions`, (...args) => this.revokeDynamicSnapPermissions(...args));
-        this.messenger.registerActionHandler(`${exports.controllerName}:getFile`, async (...args) => this.getSnapFile(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:disconnectOrigin`, (...args) => this.disconnectOrigin(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:revokeDynamicSnapPermissions`, (...args) => this.revokeDynamicSnapPermissions(...args));
+        this.messenger.registerActionHandler(`${exports.controllerName}:getSnapFile`, async (...args) => this.getSnapFile(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:stopAllSnaps`, async (...args) => this.stopAllSnaps(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:isMinimumPlatformVersion`, (...args) => this.isMinimumPlatformVersion(...args));
         this.messenger.registerActionHandler(`${exports.controllerName}:setClientActive`, (...args) => this.setClientActive(...args));
@@ -334,8 +360,8 @@ class SnapController extends base_controller_1.BaseController {
     }
     async #handlePreinstalledSnaps(preinstalledSnaps) {
         for (const { snapId, manifest, files, removable, hidden, hideSnapBranding, } of preinstalledSnaps) {
-            const existingSnap = this.get(snapId);
-            const isAlreadyInstalled = existingSnap !== undefined;
+            const existingSnap = this.getSnap(snapId);
+            const isAlreadyInstalled = existingSnap !== null;
             const isUpdate = isAlreadyInstalled && (0, utils_1.gtVersion)(manifest.version, existingSnap.version);
             const isPreinstalled = existingSnap?.preinstalled === true;
             const isMissingSource = isAlreadyInstalled &&
@@ -398,10 +424,10 @@ class SnapController extends base_controller_1.BaseController {
             this.#setupRuntime(snapId);
             // Emit events
             if (isUpdate) {
-                this.messenger.publish('SnapController:snapUpdated', this.getTruncatedExpect(snapId), existingSnap.version, constants_1.METAMASK_ORIGIN, true);
+                this.messenger.publish('SnapController:snapUpdated', this.#getTruncatedSnapExpect(snapId), existingSnap.version, constants_1.METAMASK_ORIGIN, true);
             }
             else if (!isMissingSource) {
-                this.messenger.publish('SnapController:snapInstalled', this.getTruncatedExpect(snapId), constants_1.METAMASK_ORIGIN, true);
+                this.messenger.publish('SnapController:snapInstalled', this.#getTruncatedSnapExpect(snapId), constants_1.METAMASK_ORIGIN, true);
             }
             if (isMissingSource) {
                 (0, snaps_utils_1.logWarning)(`The source code for "${snapId}" was missing and has been automatically restored. If you see this message, please file a bug report.`);
@@ -457,7 +483,7 @@ class SnapController extends base_controller_1.BaseController {
      */
     async updateRegistry() {
         await this.#ensureCanUsePlatform();
-        await this.messenger.call('SnapsRegistry:update');
+        await this.messenger.call('SnapRegistryController:requestUpdate');
     }
     /**
      * Checks all installed Snaps against the blocklist and
@@ -467,7 +493,7 @@ class SnapController extends base_controller_1.BaseController {
      * Also updates any preinstalled Snaps to the latest allowlisted version.
      */
     async #handleRegistryUpdate() {
-        const blockedSnaps = await this.messenger.call('SnapsRegistry:get', Object.values(this.state.snaps).reduce((blockListArg, snap) => {
+        const blockedSnaps = await this.messenger.call('SnapRegistryController:get', Object.values(this.state.snaps).reduce((blockListArg, snap) => {
             blockListArg[snap.id] = {
                 version: snap.version,
                 checksum: snap.manifest.source.shasum,
@@ -475,7 +501,7 @@ class SnapController extends base_controller_1.BaseController {
             return blockListArg;
         }, {}));
         await Promise.all(Object.entries(blockedSnaps).map(async ([snapId, { status, reason }]) => {
-            if (status === registry_1.SnapsRegistryStatus.Blocked) {
+            if (status === registry_1.SnapRegistryStatus.Blocked) {
                 return this.#blockSnap(snapId, reason);
             }
             return this.#unblockSnap(snapId);
@@ -508,13 +534,13 @@ class SnapController extends base_controller_1.BaseController {
     }
     /**
      * Blocks an installed snap and prevents it from being started again. Emits
-     * {@link SnapBlocked}. Does nothing if the snap is not installed.
+     * {@link SnapControllerSnapBlockedEvent}. Does nothing if the snap is not installed.
      *
      * @param snapId - The snap to block.
      * @param blockedSnapInfo - Information detailing why the snap is blocked.
      */
     async #blockSnap(snapId, blockedSnapInfo) {
-        if (!this.has(snapId)) {
+        if (!this.hasSnap(snapId)) {
             return;
         }
         try {
@@ -531,13 +557,13 @@ class SnapController extends base_controller_1.BaseController {
     }
     /**
      * 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
+     * {@link SnapControllerSnapUnblockedEvent}. Does nothing if the snap is not installed or already
      * unblocked.
      *
      * @param snapId - The id of the snap to unblock.
      */
     #unblockSnap(snapId) {
-        if (!this.has(snapId) || !this.state.snaps[snapId].blocked) {
+        if (!this.hasSnap(snapId) || !this.state.snaps[snapId].blocked) {
             return;
         }
         this.update((state) => {
@@ -547,18 +573,18 @@ class SnapController extends base_controller_1.BaseController {
         this.messenger.publish(`${exports.controllerName}:snapUnblocked`, snapId);
     }
     async #assertIsInstallAllowed(snapId, { platformVersion, ...snapInfo }) {
-        const results = await this.messenger.call('SnapsRegistry:get', {
+        const results = await this.messenger.call('SnapRegistryController:get', {
             [snapId]: snapInfo,
         });
         const result = results[snapId];
-        if (result.status === registry_1.SnapsRegistryStatus.Blocked) {
+        if (result.status === registry_1.SnapRegistryStatus.Blocked) {
             throw new Error(`Cannot install version "${snapInfo.version}" of snap "${snapId}": The version is blocked. ${result.reason?.explanation ?? ''}`);
         }
         const isAllowlistingRequired = Object.keys(snapInfo.permissions).some((permission) => !constants_1.ALLOWED_PERMISSIONS.includes(permission));
         if (this.#featureFlags.requireAllowlist &&
             isAllowlistingRequired &&
-            result.status !== registry_1.SnapsRegistryStatus.Verified) {
-            throw new Error(`Cannot install version "${snapInfo.version}" of snap "${snapId}": ${result.status === registry_1.SnapsRegistryStatus.Unavailable
+            result.status !== registry_1.SnapRegistryStatus.Verified) {
+            throw new Error(`Cannot install version "${snapInfo.version}" of snap "${snapId}": ${result.status === registry_1.SnapRegistryStatus.Unavailable
                 ? 'The registry is temporarily unavailable.'
                 : 'The snap is not on the allowlist.'}`);
         }
@@ -592,8 +618,7 @@ class SnapController extends base_controller_1.BaseController {
     async #stopSnapsLastRequestPastMax() {
         const entries = [...this.#snapsRuntimeData.entries()];
         return Promise.all(entries
-            .filter(([_snapId, runtime]) => runtime.activeReferences === 0 &&
-            runtime.pendingInboundRequests.length === 0 &&
+            .filter(([_snapId, runtime]) => runtime.pendingInboundRequests.length === 0 &&
             runtime.lastRequest &&
             this.#maxIdleTime &&
             (0, utils_1.timeSince)(runtime.lastRequest) > this.#maxIdleTime)
@@ -670,14 +695,14 @@ class SnapController extends base_controller_1.BaseController {
      * @param snapId - The id of the Snap to enable.
      */
     enableSnap(snapId) {
-        this.getExpect(snapId);
+        this.getSnapExpect(snapId);
         if (this.state.snaps[snapId].blocked) {
             throw new Error(`Snap "${snapId}" is blocked and cannot be enabled.`);
         }
         this.update((state) => {
             state.snaps[snapId].enabled = true;
         });
-        this.messenger.publish('SnapController:snapEnabled', this.getTruncatedExpect(snapId));
+        this.messenger.publish('SnapController:snapEnabled', this.#getTruncatedSnapExpect(snapId));
     }
     /**
      * Disables the given snap. A snap can only be started if it is enabled.
@@ -686,16 +711,16 @@ class SnapController extends base_controller_1.BaseController {
      * @returns A promise that resolves once the snap has been disabled.
      */
     async disableSnap(snapId) {
-        if (!this.has(snapId)) {
+        if (!this.hasSnap(snapId)) {
             throw new Error(`Snap "${snapId}" not found.`);
         }
         this.update((state) => {
             state.snaps[snapId].enabled = false;
         });
-        if (this.isRunning(snapId)) {
+        if (this.isSnapRunning(snapId)) {
             await this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Stop);
         }
-        this.messenger.publish('SnapController:snapDisabled', this.getTruncatedExpect(snapId));
+        this.messenger.publish('SnapController:snapDisabled', this.#getTruncatedSnapExpect(snapId));
     }
     /**
      * Stops the given snap, removes all hooks, closes all connections, and
@@ -720,7 +745,7 @@ class SnapController extends base_controller_1.BaseController {
         const { promise, resolve } = (0, utils_1.createDeferredPromise)();
         runtime.stopPromise = promise;
         try {
-            if (this.isRunning(snapId)) {
+            if (this.isSnapRunning(snapId)) {
                 await this.#terminateSnap(snapId);
             }
         }
@@ -730,7 +755,7 @@ class SnapController extends base_controller_1.BaseController {
             runtime.pendingInboundRequests = [];
             runtime.pendingOutboundRequests = 0;
             runtime.stopPromise = null;
-            if (this.isRunning(snapId)) {
+            if (this.isSnapRunning(snapId)) {
                 this.#transition(snapId, statusEvent);
             }
             resolve();
@@ -744,7 +769,7 @@ class SnapController extends base_controller_1.BaseController {
      * stopped.
      */
     async stopAllSnaps(statusEvent = snaps_utils_1.SnapStatusEvents.Stop) {
-        const snaps = Object.values(this.state.snaps).filter((snap) => this.isRunning(snap.id));
+        const snaps = Object.values(this.state.snaps).filter((snap) => this.isSnapRunning(snap.id));
         const promises = snaps.map(async (snap) => this.stopSnap(snap.id, statusEvent));
         await Promise.allSettled(promises);
     }
@@ -764,7 +789,7 @@ class SnapController extends base_controller_1.BaseController {
             .forEach((pendingRequest) => pendingRequest.timer.finish());
         // Hack to give up execution for a bit to let timed out requests return.
         await new Promise((resolve) => setTimeout(resolve, 1));
-        this.messenger.publish('SnapController:snapTerminated', this.getTruncatedExpect(snapId));
+        this.messenger.publish('SnapController:snapTerminated', this.#getTruncatedSnapExpect(snapId));
     }
     /**
      * Returns whether the given snap is running.
@@ -773,8 +798,8 @@ class SnapController extends base_controller_1.BaseController {
      * @param snapId - The id of the Snap to check.
      * @returns `true` if the snap is running, otherwise `false`.
      */
-    isRunning(snapId) {
-        return this.getExpect(snapId).status === 'running';
+    isSnapRunning(snapId) {
+        return this.getSnapExpect(snapId).status === 'running';
     }
     /**
      * Returns whether the given snap has been added to state.
@@ -782,8 +807,8 @@ class SnapController extends base_controller_1.BaseController {
      * @param snapId - The id of the Snap to check for.
      * @returns `true` if the snap exists in the controller state, otherwise `false`.
      */
-    has(snapId) {
-        return Boolean(this.get(snapId));
+    hasSnap(snapId) {
+        return Boolean(this.getSnap(snapId));
     }
     /**
      * Gets the snap with the given id if it exists, including all data.
@@ -793,22 +818,22 @@ class SnapController extends base_controller_1.BaseController {
      * @param snapId - The id of the Snap to get.
      * @returns The entire snap object from the controller state.
      */
-    get(snapId) {
-        return this.state.snaps[snapId];
+    getSnap(snapId) {
+        return this.state.snaps[snapId] ?? null;
     }
     /**
      * Gets the snap with the given id, throws if doesn't.
      * This should not be used if the snap is to be serializable, as e.g.
      * the snap sourceCode may be quite large.
      *
-     * @see {@link SnapController.get}
+     * @see {@link SnapController.getSnap}
      * @throws {@link Error}. If the snap doesn't exist
      * @param snapId - The id of the snap to get.
      * @returns The entire snap object.
      */
-    getExpect(snapId) {
-        const snap = this.get(snapId);
-        (0, utils_1.assert)(snap !== undefined, `Snap "${snapId}" not found.`);
+    getSnapExpect(snapId) {
+        const snap = this.getSnap(snapId);
+        (0, utils_1.assert)(snap !== null, `Snap "${snapId}" not found.`);
         return snap;
     }
     /**
@@ -818,9 +843,8 @@ class SnapController extends base_controller_1.BaseController {
      * @param snapId - The id of the Snap to get.
      * @returns A truncated version of the snap state, that is less expensive to serialize.
      */
-    // TODO(ritave): this.get returns undefined, this.getTruncated returns null
-    getTruncated(snapId) {
-        const snap = this.get(snapId);
+    #getTruncatedSnap(snapId) {
+        const snap = this.getSnap(snapId);
         return snap ? truncateSnap(snap) : null;
     }
     /**
@@ -830,8 +854,8 @@ class SnapController extends base_controller_1.BaseController {
      * @param snapId - The id of the snap to get.
      * @returns A truncated version of the snap state, that is less expensive to serialize.
      */
-    getTruncatedExpect(snapId) {
-        return truncateSnap(this.getExpect(snapId));
+    #getTruncatedSnapExpect(snapId) {
+        return truncateSnap(this.getSnapExpect(snapId));
     }
     /**
      * Check if a given Snap has a cached encryption key stored in the runtime.
@@ -1062,7 +1086,7 @@ class SnapController extends base_controller_1.BaseController {
      * @returns The file requested in the chosen file encoding or null if the file is not found.
      */
     async getSnapFile(snapId, path, encoding = snaps_sdk_1.AuxiliaryFileEncoding.Base64) {
-        const snap = this.getExpect(snapId);
+        const snap = this.getSnapExpect(snapId);
         const normalizedPath = (0, snaps_utils_1.normalizeRelative)(path);
         const value = snap.auxiliaryFiles?.find((file) => file.path === normalizedPath)?.value;
         if (!value) {
@@ -1081,7 +1105,7 @@ class SnapController extends base_controller_1.BaseController {
      * @returns True if the platform version is equal or greater to the passed version, false otherwise.
      */
     isMinimumPlatformVersion(snapId, version) {
-        const snap = this.getExpect(snapId);
+        const snap = this.getSnapExpect(snapId);
         const { platformVersion } = snap.manifest;
         if (!platformVersion) {
             return false;
@@ -1131,12 +1155,12 @@ class SnapController extends base_controller_1.BaseController {
             throw new Error('Expected array of snap ids.');
         }
         snapIds.forEach((snapId) => {
-            const snap = this.getExpect(snapId);
+            const snap = this.getSnapExpect(snapId);
             (0, utils_1.assert)(snap.removable !== false, `${snapId} is not removable.`);
         });
         await Promise.all(snapIds.map(async (snapId) => {
-            const snap = this.getExpect(snapId);
-            const truncated = this.getTruncatedExpect(snapId);
+            const snap = this.getSnapExpect(snapId);
+            const truncated = this.#getTruncatedSnapExpect(snapId);
             // Disable the snap and revoke all of its permissions before deleting
             // it. This ensures that the snap will not be restarted or otherwise
             // affect the host environment while we are deleting it.
@@ -1160,7 +1184,7 @@ class SnapController extends base_controller_1.BaseController {
         if (previousInitialConnections) {
             const revokedInitialConnections = (0, utils_2.setDiff)(previousInitialConnections, initialConnections);
             for (const origin of Object.keys(revokedInitialConnections)) {
-                this.removeSnapFromSubject(origin, snapId);
+                this.disconnectOrigin(origin, snapId);
             }
         }
         for (const origin of Object.keys(initialConnections)) {
@@ -1198,12 +1222,13 @@ class SnapController extends base_controller_1.BaseController {
         });
     }
     /**
-     * Removes a snap's permission (caveat) from the specified subject.
+     * Disconnect the Snap from the given origin, meaning the origin can no longer
+     * interact with the Snap until it is reconnected.
      *
-     * @param origin - The origin from which to remove the snap.
+     * @param origin - The origin from which to remove the Snap.
      * @param snapId - The id of the snap to remove.
      */
-    removeSnapFromSubject(origin, snapId) {
+    disconnectOrigin(origin, snapId) {
         const subjectPermissions = this.messenger.call('PermissionController:getPermissions', origin);
         const snapIdsCaveat = subjectPermissions?.[snaps_rpc_methods_1.WALLET_SNAP_PERMISSION_KEY]?.caveats?.find((caveat) => caveat.type === snaps_utils_1.SnapCaveatType.SnapIds);
         if (!snapIdsCaveat) {
@@ -1246,7 +1271,7 @@ class SnapController extends base_controller_1.BaseController {
     #removeSnapFromSubjects(snapId) {
         const subjects = this.messenger.call('PermissionController:getSubjectNames');
         for (const subject of subjects) {
-            this.removeSnapFromSubject(subject, snapId);
+            this.disconnectOrigin(subject, snapId);
         }
     }
     /**
@@ -1259,25 +1284,6 @@ class SnapController extends base_controller_1.BaseController {
             this.messenger.call('PermissionController:revokeAllPermissions', snapId);
         }
     }
-    /**
-     * Handles incrementing the activeReferences counter.
-     *
-     * @param snapId - The snap id of the snap that was referenced.
-     */
-    incrementActiveReferences(snapId) {
-        const runtime = this.#getRuntimeExpect(snapId);
-        runtime.activeReferences += 1;
-    }
-    /**
-     * Handles decrement the activeReferences counter.
-     *
-     * @param snapId - The snap id of the snap that was referenced..
-     */
-    decrementActiveReferences(snapId) {
-        const runtime = this.#getRuntimeExpect(snapId);
-        (0, utils_1.assert)(runtime.activeReferences > 0, 'SnapController reference management is in an invalid state.');
-        runtime.activeReferences -= 1;
-    }
     /**
      * Gets all snaps in their truncated format.
      *
@@ -1304,8 +1310,8 @@ class SnapController extends base_controller_1.BaseController {
         const permissions = this.messenger.call('PermissionController:getPermissions', origin) ?? {};
         const snaps = permissions[snaps_rpc_methods_1.WALLET_SNAP_PERMISSION_KEY]?.caveats?.find((caveat) => caveat.type === snaps_utils_1.SnapCaveatType.SnapIds)?.value ?? {};
         return Object.keys(snaps).reduce((permittedSnaps, snapId) => {
-            const snap = this.get(snapId);
-            const truncatedSnap = this.getTruncated(snapId);
+            const snap = this.getSnap(snapId);
+            const truncatedSnap = this.#getTruncatedSnap(snapId);
             if (truncatedSnap && snap?.status !== snaps_utils_1.SnapStatus.Installing) {
                 permittedSnaps[snapId] = truncatedSnap;
             }
@@ -1345,9 +1351,9 @@ class SnapController extends base_controller_1.BaseController {
                 });
                 // Existing snaps may need to be updated, unless they should be re-installed (e.g. local snaps)
                 // Everything else is treated as an install
-                const isUpdate = this.has(snapId) && !location.shouldAlwaysReload;
+                const isUpdate = this.hasSnap(snapId) && !location.shouldAlwaysReload;
                 if (isUpdate && this.#isValidUpdate(snapId, version)) {
-                    const existingSnap = this.getExpect(snapId);
+                    const existingSnap = this.getSnapExpect(snapId);
                     pendingUpdates.push({ snapId, oldVersion: existingSnap.version });
                     let rollbackSnapshot = this.#getRollbackSnapshot(snapId);
                     if (rollbackSnapshot === undefined) {
@@ -1364,12 +1370,12 @@ class SnapController extends base_controller_1.BaseController {
                 result[snapId] = await this.#processRequestedSnap(origin, snapId, location, version);
             }
             // Once we finish all installs / updates, emit events.
-            pendingInstalls.forEach((snapId) => this.messenger.publish(`SnapController:snapInstalled`, this.getTruncatedExpect(snapId), origin, false));
-            pendingUpdates.forEach(({ snapId, oldVersion }) => this.messenger.publish(`SnapController:snapUpdated`, this.getTruncatedExpect(snapId), oldVersion, origin, false));
+            pendingInstalls.forEach((snapId) => this.messenger.publish(`SnapController:snapInstalled`, this.#getTruncatedSnapExpect(snapId), origin, false));
+            pendingUpdates.forEach(({ snapId, oldVersion }) => this.messenger.publish(`SnapController:snapUpdated`, this.#getTruncatedSnapExpect(snapId), oldVersion, origin, false));
             snapIds.forEach((snapId) => this.#rollbackSnapshots.delete(snapId));
         }
         catch (error) {
-            const installed = pendingInstalls.filter((snapId) => this.has(snapId));
+            const installed = pendingInstalls.filter((snapId) => this.hasSnap(snapId));
             await this.removeSnaps(installed);
             const snapshottedSnaps = [...this.#rollbackSnapshots.keys()];
             const snapsToRollback = pendingUpdates
@@ -1391,7 +1397,7 @@ class SnapController extends base_controller_1.BaseController {
      * @returns The resulting snap object, or an error if something went wrong.
      */
     async #processRequestedSnap(origin, snapId, location, versionRange) {
-        const existingSnap = this.getTruncated(snapId);
+        const existingSnap = this.#getTruncatedSnap(snapId);
         // For devX we always re-install local snaps.
         if (existingSnap && !location.shouldAlwaysReload) {
             if ((0, utils_1.satisfiesVersionRange)(existingSnap.version, versionRange)) {
@@ -1412,7 +1418,7 @@ class SnapController extends base_controller_1.BaseController {
         });
         this.messenger.publish('SnapController:snapInstallStarted', snapId, origin, false);
         // Existing snaps must be stopped before overwriting
-        if (existingSnap && this.isRunning(snapId)) {
+        if (existingSnap && this.isSnapRunning(snapId)) {
             await this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Stop);
         }
         // Existing snaps that should be re-installed should not maintain their existing permissions
@@ -1436,7 +1442,7 @@ class SnapController extends base_controller_1.BaseController {
                 snapId,
                 sourceCode,
             });
-            const truncated = this.getTruncatedExpect(snapId);
+            const truncated = this.#getTruncatedSnapExpect(snapId);
             this.#updateApproval(pendingApproval.id, {
                 loading: false,
                 type: exports.SNAP_APPROVAL_INSTALL,
@@ -1509,7 +1515,7 @@ class SnapController extends base_controller_1.BaseController {
             this.#assertCanInstallSnaps();
         }
         await this.#ensureCanUsePlatform();
-        const snap = this.getExpect(snapId);
+        const snap = this.getSnapExpect(snapId);
         const { preinstalled, removable, hidden, hideSnapBranding } = snap;
         if (preinstalled && !automaticUpdate) {
             throw new Error('Preinstalled Snaps cannot be manually updated.');
@@ -1571,7 +1577,7 @@ class SnapController extends base_controller_1.BaseController {
                 (0, utils_1.assert)(automaticUpdate);
                 approvedNewPermissions = newPermissions;
             }
-            if (this.isRunning(snapId)) {
+            if (this.isSnapRunning(snapId)) {
                 await this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Stop);
             }
             this.#transition(snapId, snaps_utils_1.SnapStatusEvents.Update);
@@ -1611,7 +1617,7 @@ class SnapController extends base_controller_1.BaseController {
             catch {
                 throw new Error(`Snap ${snapId} crashed with updated source code.`);
             }
-            const truncatedSnap = this.getTruncatedExpect(snapId);
+            const truncatedSnap = this.#getTruncatedSnapExpect(snapId);
             if (pendingApproval) {
                 this.#updateApproval(pendingApproval.id, {
                     loading: false,
@@ -1635,7 +1641,7 @@ class SnapController extends base_controller_1.BaseController {
         }
     }
     async #resolveAllowlistVersion(snapId, versionRange) {
-        return await this.messenger.call('SnapsRegistry:resolveVersion', snapId, versionRange);
+        return await this.messenger.call('SnapRegistryController:resolveVersion', snapId, versionRange);
     }
     /**
      * Returns a promise representing the complete installation of the requested snap.
@@ -1693,7 +1699,7 @@ class SnapController extends base_controller_1.BaseController {
     }
     async #startSnap(snapData) {
         const { snapId } = snapData;
-        if (this.isRunning(snapId)) {
+        if (this.isSnapRunning(snapId)) {
             throw new Error(`Snap "${snapId}" is already started.`);
         }
         try {
@@ -1936,7 +1942,7 @@ class SnapController extends base_controller_1.BaseController {
      */
     async handleRequest({ snapId, origin, handler: handlerType, request: rawRequest, }) {
         await this.#ensureCanUsePlatform();
-        const snap = this.get(snapId);
+        const snap = this.getSnap(snapId);
         (0, utils_1.assert)(snap, `The Snap "${snapId}" is not installed. Please install it before invoking it.`);
         (0, utils_1.assert)(origin === constants_1.METAMASK_ORIGIN || (0, snaps_utils_1.isValidUrl)(origin), "'origin' must be a valid URL or 'metamask'.");
         const request = {
@@ -1983,7 +1989,7 @@ class SnapController extends base_controller_1.BaseController {
         if (runtime.stopPromise) {
             await runtime.stopPromise;
         }
-        if (!this.isRunning(snapId)) {
+        if (!this.isSnapRunning(snapId)) {
             if (!runtime.startPromise) {
                 runtime.startPromise = this.startSnap(snapId);
             }
@@ -2002,7 +2008,7 @@ class SnapController extends base_controller_1.BaseController {
         try {
             const result = await (0, utils_2.withTimeout)(handleRpcRequestPromise, timer);
             if (result === utils_2.hasTimedOut) {
-                const stopping = runtime.stopPromise !== null || !this.isRunning(snapId);
+                const stopping = runtime.stopPromise !== null || !this.isSnapRunning(snapId);
                 throw new Error(stopping
                     ? `${snapId} was stopped and the request was cancelled. This is likely because the Snap crashed.`
                     : `${snapId} failed to respond to the request in time.`);
@@ -2023,7 +2029,7 @@ class SnapController extends base_controller_1.BaseController {
             // We flag the RPC request as finished early since termination may affect pending requests
             this.#recordSnapRpcRequestFinish(snapId, transformedRequest.id, handlerType, origin, false);
             const [jsonRpcError, handled] = (0, snaps_utils_1.unwrapError)(error);
-            const stopping = runtime.stopPromise !== null || !this.isRunning(snapId);
+            const stopping = runtime.stopPromise !== null || !this.isSnapRunning(snapId);
             if (!handled) {
                 if (!stopping) {
                     (0, snaps_utils_1.logError)(`"${snapId}" crashed due to an unhandled error:`, jsonRpcError);
@@ -2286,7 +2292,7 @@ class SnapController extends base_controller_1.BaseController {
         if (runtime.pendingInboundRequests.length === 0) {
             runtime.lastRequest = Date.now();
         }
-        const snap = this.get(snapId);
+        const snap = this.getSnap(snapId);
         if ((0, utils_2.isTrackableHandler)(handlerType) && !snap?.preinstalled) {
             try {
                 this.#trackSnapExport(snapId, handlerType, success, origin);
@@ -2342,7 +2348,7 @@ class SnapController extends base_controller_1.BaseController {
         }
         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) {
+        if (this.getSnap(snapId)?.status !== snaps_utils_1.SnapStatus.Stopped) {
             this.#transition(snapId, snaps_utils_1.SnapStatusEvents.Stop);
         }
         const { statePatches, permissions, previousInitialConnections, newInitialConnections, previousSourceCode, } = rollbackSnapshot;
@@ -2356,7 +2362,7 @@ class SnapController extends base_controller_1.BaseController {
         }
         // 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) {
+        if (this.getSnap(snapId)?.status !== snaps_utils_1.SnapStatus.Stopped) {
             this.update((state) => {
                 state.snaps[snapId].status = snaps_utils_1.SnapStatus.Stopped;
             });
@@ -2369,7 +2375,7 @@ class SnapController extends base_controller_1.BaseController {
         });
         // Calling this in reverse order to undo the changes
         this.#handleInitialConnections(snapId, newInitialConnections ?? null, previousInitialConnections ?? {});
-        const truncatedSnap = this.getTruncatedExpect(snapId);
+        const truncatedSnap = this.#getTruncatedSnapExpect(snapId);
         this.messenger.publish('SnapController:snapRolledback', truncatedSnap, rollbackSnapshot.newVersion);
         this.#rollbackSnapshots.delete(snapId);
     }
@@ -2396,7 +2402,7 @@ class SnapController extends base_controller_1.BaseController {
         if (this.#snapsRuntimeData.has(snapId)) {
             return;
         }
-        const snap = this.get(snapId);
+        const snap = this.getSnap(snapId);
         const interpreter = (0, fsm_1.interpret)(this.#statusMachine);
         interpreter.start({
             context: { snapId },
@@ -2411,7 +2417,6 @@ class SnapController extends base_controller_1.BaseController {
             installPromise: null,
             encryptionKey: null,
             encryptionSalt: null,
-            activeReferences: 0,
             pendingInboundRequests: [],
             pendingOutboundRequests: 0,
             interpreter,
@@ -2522,7 +2527,7 @@ class SnapController extends base_controller_1.BaseController {
      * @returns `true` if validation checks pass and `false` if they do not.
      */
     #isValidUpdate(snapId, newVersionRange) {
-        const existingSnap = this.getExpect(snapId);
+        const existingSnap = this.getSnapExpect(snapId);
         if ((0, utils_1.satisfiesVersionRange)(existingSnap.version, newVersionRange)) {
             return false;
         }