@metamask/snaps-controllers 18.0.3 → 19.0.0

package/dist/snaps/SnapController.mjs

@@ -12,14 +12,42 @@ import { nanoid } from "nanoid";
 import { gt, gte } from "semver";
 import { ALLOWED_PERMISSIONS, CLIENT_ONLY_HANDLERS, DYNAMIC_PERMISSION_DEPENDENCIES, INTERFACE_HANDLERS, LEGACY_ENCRYPTION_KEY_DERIVATION_OPTIONS, METAMASK_ORIGIN, STATE_DEBOUNCE_TIMEOUT } from "./constants.mjs";
 import { detectSnapLocation } from "./location/index.mjs";
-import { SnapsRegistryStatus } from "./registry/index.mjs";
+import { SnapRegistryStatus } from "./registry/index.mjs";
 import { getRunnableSnaps } from "./selectors.mjs";
 import { Timer } from "./Timer.mjs";
 import { forceStrict, validateMachine } from "../fsm.mjs";
 import { log } from "../logging.mjs";
 import { debouncePersistState, fetchSnap, hasTimedOut, permissionsDiff, setDiff, throttleTracking, withTimeout, isTrackableHandler, isLocalSnapId } from "../utils.mjs";
 export const 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',
+];
 export const SNAP_APPROVAL_INSTALL = 'wallet_installSnap';
 export const SNAP_APPROVAL_UPDATE = 'wallet_updateSnap';
 export const SNAP_APPROVAL_RESULT = 'wallet_installSnapResult';
@@ -185,7 +213,7 @@ export class SnapController extends BaseController {
             });
         });
         this.messenger.subscribe('KeyringController:lock', this.#handleLock.bind(this));
-        this.messenger.subscribe('SnapsRegistry:stateChange', () => {
+        this.messenger.subscribe('SnapRegistryController:stateChange', () => {
             this.#handleRegistryUpdate().catch((error) => {
                 logError(`Error when processing Snaps registry update: ${getErrorMessage(error)}`);
             });
@@ -194,7 +222,7 @@ export class SnapController extends BaseController {
         this.#registerMessageHandlers();
         Object.values(this.state?.snaps ?? {}).forEach((snap) => this.#setupRuntime(snap.id));
         this.#trackSnapExport = 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',
@@ -221,7 +249,7 @@ export class SnapController extends 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: SnapStatus.Installing,
@@ -279,24 +307,22 @@ export class SnapController extends BaseController {
     #registerMessageHandlers() {
         this.messenger.registerActionHandler(`${controllerName}:init`, async (...args) => this.init(...args));
         this.messenger.registerActionHandler(`${controllerName}:clearSnapState`, (...args) => this.clearSnapState(...args));
-        this.messenger.registerActionHandler(`${controllerName}:get`, (...args) => this.get(...args));
+        this.messenger.registerActionHandler(`${controllerName}:getSnap`, (...args) => this.getSnap(...args));
         this.messenger.registerActionHandler(`${controllerName}:getSnapState`, async (...args) => this.getSnapState(...args));
         this.messenger.registerActionHandler(`${controllerName}:handleRequest`, async (...args) => this.handleRequest(...args));
-        this.messenger.registerActionHandler(`${controllerName}:has`, (...args) => this.has(...args));
+        this.messenger.registerActionHandler(`${controllerName}:hasSnap`, (...args) => this.hasSnap(...args));
         this.messenger.registerActionHandler(`${controllerName}:updateRegistry`, async () => this.updateRegistry());
         this.messenger.registerActionHandler(`${controllerName}:updateSnapState`, async (...args) => this.updateSnapState(...args));
-        this.messenger.registerActionHandler(`${controllerName}:enable`, (...args) => this.enableSnap(...args));
-        this.messenger.registerActionHandler(`${controllerName}:disable`, async (...args) => this.disableSnap(...args));
-        this.messenger.registerActionHandler(`${controllerName}:remove`, async (...args) => this.removeSnap(...args));
-        this.messenger.registerActionHandler(`${controllerName}:getPermitted`, (...args) => this.getPermittedSnaps(...args));
-        this.messenger.registerActionHandler(`${controllerName}:install`, async (...args) => this.installSnaps(...args));
-        this.messenger.registerActionHandler(`${controllerName}:getAll`, (...args) => this.getAllSnaps(...args));
+        this.messenger.registerActionHandler(`${controllerName}:enableSnap`, (...args) => this.enableSnap(...args));
+        this.messenger.registerActionHandler(`${controllerName}:disableSnap`, async (...args) => this.disableSnap(...args));
+        this.messenger.registerActionHandler(`${controllerName}:removeSnap`, async (...args) => this.removeSnap(...args));
+        this.messenger.registerActionHandler(`${controllerName}:getPermittedSnaps`, (...args) => this.getPermittedSnaps(...args));
+        this.messenger.registerActionHandler(`${controllerName}:installSnaps`, async (...args) => this.installSnaps(...args));
+        this.messenger.registerActionHandler(`${controllerName}:getAllSnaps`, (...args) => this.getAllSnaps(...args));
         this.messenger.registerActionHandler(`${controllerName}:getRunnableSnaps`, (...args) => this.getRunnableSnaps(...args));
-        this.messenger.registerActionHandler(`${controllerName}:incrementActiveReferences`, (...args) => this.incrementActiveReferences(...args));
-        this.messenger.registerActionHandler(`${controllerName}:decrementActiveReferences`, (...args) => this.decrementActiveReferences(...args));
-        this.messenger.registerActionHandler(`${controllerName}:disconnectOrigin`, (...args) => this.removeSnapFromSubject(...args));
-        this.messenger.registerActionHandler(`${controllerName}:revokeDynamicPermissions`, (...args) => this.revokeDynamicSnapPermissions(...args));
-        this.messenger.registerActionHandler(`${controllerName}:getFile`, async (...args) => this.getSnapFile(...args));
+        this.messenger.registerActionHandler(`${controllerName}:disconnectOrigin`, (...args) => this.disconnectOrigin(...args));
+        this.messenger.registerActionHandler(`${controllerName}:revokeDynamicSnapPermissions`, (...args) => this.revokeDynamicSnapPermissions(...args));
+        this.messenger.registerActionHandler(`${controllerName}:getSnapFile`, async (...args) => this.getSnapFile(...args));
         this.messenger.registerActionHandler(`${controllerName}:stopAllSnaps`, async (...args) => this.stopAllSnaps(...args));
         this.messenger.registerActionHandler(`${controllerName}:isMinimumPlatformVersion`, (...args) => this.isMinimumPlatformVersion(...args));
         this.messenger.registerActionHandler(`${controllerName}:setClientActive`, (...args) => this.setClientActive(...args));
@@ -331,8 +357,8 @@ export class SnapController extends 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 && gtVersion(manifest.version, existingSnap.version);
             const isPreinstalled = existingSnap?.preinstalled === true;
             const isMissingSource = isAlreadyInstalled &&
@@ -395,10 +421,10 @@ export class SnapController extends BaseController {
             this.#setupRuntime(snapId);
             // Emit events
             if (isUpdate) {
-                this.messenger.publish('SnapController:snapUpdated', this.getTruncatedExpect(snapId), existingSnap.version, METAMASK_ORIGIN, true);
+                this.messenger.publish('SnapController:snapUpdated', this.#getTruncatedSnapExpect(snapId), existingSnap.version, METAMASK_ORIGIN, true);
             }
             else if (!isMissingSource) {
-                this.messenger.publish('SnapController:snapInstalled', this.getTruncatedExpect(snapId), METAMASK_ORIGIN, true);
+                this.messenger.publish('SnapController:snapInstalled', this.#getTruncatedSnapExpect(snapId), METAMASK_ORIGIN, true);
             }
             if (isMissingSource) {
                 logWarning(`The source code for "${snapId}" was missing and has been automatically restored. If you see this message, please file a bug report.`);
@@ -454,7 +480,7 @@ export class SnapController extends 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
@@ -464,7 +490,7 @@ export class SnapController extends 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,
@@ -472,7 +498,7 @@ export class SnapController extends BaseController {
             return blockListArg;
         }, {}));
         await Promise.all(Object.entries(blockedSnaps).map(async ([snapId, { status, reason }]) => {
-            if (status === SnapsRegistryStatus.Blocked) {
+            if (status === SnapRegistryStatus.Blocked) {
                 return this.#blockSnap(snapId, reason);
             }
             return this.#unblockSnap(snapId);
@@ -505,13 +531,13 @@ export class SnapController extends 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 {
@@ -528,13 +554,13 @@ export class SnapController extends 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) => {
@@ -544,18 +570,18 @@ export class SnapController extends BaseController {
         this.messenger.publish(`${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 === SnapsRegistryStatus.Blocked) {
+        if (result.status === 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) => !ALLOWED_PERMISSIONS.includes(permission));
         if (this.#featureFlags.requireAllowlist &&
             isAllowlistingRequired &&
-            result.status !== SnapsRegistryStatus.Verified) {
-            throw new Error(`Cannot install version "${snapInfo.version}" of snap "${snapId}": ${result.status === SnapsRegistryStatus.Unavailable
+            result.status !== SnapRegistryStatus.Verified) {
+            throw new Error(`Cannot install version "${snapInfo.version}" of snap "${snapId}": ${result.status === SnapRegistryStatus.Unavailable
                 ? 'The registry is temporarily unavailable.'
                 : 'The snap is not on the allowlist.'}`);
         }
@@ -589,8 +615,7 @@ export class SnapController extends 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 &&
             timeSince(runtime.lastRequest) > this.#maxIdleTime)
@@ -667,14 +692,14 @@ export class SnapController extends 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.
@@ -683,16 +708,16 @@ export class SnapController extends 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, 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
@@ -717,7 +742,7 @@ export class SnapController extends BaseController {
         const { promise, resolve } = createDeferredPromise();
         runtime.stopPromise = promise;
         try {
-            if (this.isRunning(snapId)) {
+            if (this.isSnapRunning(snapId)) {
                 await this.#terminateSnap(snapId);
             }
         }
@@ -727,7 +752,7 @@ export class SnapController extends BaseController {
             runtime.pendingInboundRequests = [];
             runtime.pendingOutboundRequests = 0;
             runtime.stopPromise = null;
-            if (this.isRunning(snapId)) {
+            if (this.isSnapRunning(snapId)) {
                 this.#transition(snapId, statusEvent);
             }
             resolve();
@@ -741,7 +766,7 @@ export class SnapController extends BaseController {
      * stopped.
      */
     async stopAllSnaps(statusEvent = 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);
     }
@@ -761,7 +786,7 @@ export class SnapController extends 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.
@@ -770,8 +795,8 @@ export class SnapController extends 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.
@@ -779,8 +804,8 @@ export class SnapController extends 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.
@@ -790,22 +815,22 @@ export class SnapController extends 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);
-        assert(snap !== undefined, `Snap "${snapId}" not found.`);
+    getSnapExpect(snapId) {
+        const snap = this.getSnap(snapId);
+        assert(snap !== null, `Snap "${snapId}" not found.`);
         return snap;
     }
     /**
@@ -815,9 +840,8 @@ export class SnapController extends 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;
     }
     /**
@@ -827,8 +851,8 @@ export class SnapController extends 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.
@@ -1059,7 +1083,7 @@ export class SnapController extends BaseController {
      * @returns The file requested in the chosen file encoding or null if the file is not found.
      */
     async getSnapFile(snapId, path, encoding = AuxiliaryFileEncoding.Base64) {
-        const snap = this.getExpect(snapId);
+        const snap = this.getSnapExpect(snapId);
         const normalizedPath = normalizeRelative(path);
         const value = snap.auxiliaryFiles?.find((file) => file.path === normalizedPath)?.value;
         if (!value) {
@@ -1078,7 +1102,7 @@ export class SnapController extends 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;
@@ -1128,12 +1152,12 @@ export class SnapController extends BaseController {
             throw new Error('Expected array of snap ids.');
         }
         snapIds.forEach((snapId) => {
-            const snap = this.getExpect(snapId);
+            const snap = this.getSnapExpect(snapId);
             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.
@@ -1157,7 +1181,7 @@ export class SnapController extends BaseController {
         if (previousInitialConnections) {
             const revokedInitialConnections = 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)) {
@@ -1195,12 +1219,13 @@ export class SnapController extends 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?.[WALLET_SNAP_PERMISSION_KEY]?.caveats?.find((caveat) => caveat.type === SnapCaveatType.SnapIds);
         if (!snapIdsCaveat) {
@@ -1243,7 +1268,7 @@ export class SnapController extends BaseController {
     #removeSnapFromSubjects(snapId) {
         const subjects = this.messenger.call('PermissionController:getSubjectNames');
         for (const subject of subjects) {
-            this.removeSnapFromSubject(subject, snapId);
+            this.disconnectOrigin(subject, snapId);
         }
     }
     /**
@@ -1256,25 +1281,6 @@ export class SnapController extends 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);
-        assert(runtime.activeReferences > 0, 'SnapController reference management is in an invalid state.');
-        runtime.activeReferences -= 1;
-    }
     /**
      * Gets all snaps in their truncated format.
      *
@@ -1301,8 +1307,8 @@ export class SnapController extends BaseController {
         const permissions = this.messenger.call('PermissionController:getPermissions', origin) ?? {};
         const snaps = permissions[WALLET_SNAP_PERMISSION_KEY]?.caveats?.find((caveat) => caveat.type === 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 !== SnapStatus.Installing) {
                 permittedSnaps[snapId] = truncatedSnap;
             }
@@ -1342,9 +1348,9 @@ export class SnapController extends 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) {
@@ -1361,12 +1367,12 @@ export class SnapController extends 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
@@ -1388,7 +1394,7 @@ export class SnapController extends 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 (satisfiesVersionRange(existingSnap.version, versionRange)) {
@@ -1409,7 +1415,7 @@ export class SnapController extends 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, SnapStatusEvents.Stop);
         }
         // Existing snaps that should be re-installed should not maintain their existing permissions
@@ -1433,7 +1439,7 @@ export class SnapController extends BaseController {
                 snapId,
                 sourceCode,
             });
-            const truncated = this.getTruncatedExpect(snapId);
+            const truncated = this.#getTruncatedSnapExpect(snapId);
             this.#updateApproval(pendingApproval.id, {
                 loading: false,
                 type: SNAP_APPROVAL_INSTALL,
@@ -1506,7 +1512,7 @@ export class SnapController extends 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.');
@@ -1568,7 +1574,7 @@ export class SnapController extends BaseController {
                 assert(automaticUpdate);
                 approvedNewPermissions = newPermissions;
             }
-            if (this.isRunning(snapId)) {
+            if (this.isSnapRunning(snapId)) {
                 await this.stopSnap(snapId, SnapStatusEvents.Stop);
             }
             this.#transition(snapId, SnapStatusEvents.Update);
@@ -1608,7 +1614,7 @@ export class SnapController extends 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,
@@ -1632,7 +1638,7 @@ export class SnapController extends 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.
@@ -1690,7 +1696,7 @@ export class SnapController extends BaseController {
     }
     async #startSnap(snapData) {
         const { snapId } = snapData;
-        if (this.isRunning(snapId)) {
+        if (this.isSnapRunning(snapId)) {
             throw new Error(`Snap "${snapId}" is already started.`);
         }
         try {
@@ -1933,7 +1939,7 @@ export class SnapController extends BaseController {
      */
     async handleRequest({ snapId, origin, handler: handlerType, request: rawRequest, }) {
         await this.#ensureCanUsePlatform();
-        const snap = this.get(snapId);
+        const snap = this.getSnap(snapId);
         assert(snap, `The Snap "${snapId}" is not installed. Please install it before invoking it.`);
         assert(origin === METAMASK_ORIGIN || isValidUrl(origin), "'origin' must be a valid URL or 'metamask'.");
         const request = {
@@ -1980,7 +1986,7 @@ export class SnapController extends BaseController {
         if (runtime.stopPromise) {
             await runtime.stopPromise;
         }
-        if (!this.isRunning(snapId)) {
+        if (!this.isSnapRunning(snapId)) {
             if (!runtime.startPromise) {
                 runtime.startPromise = this.startSnap(snapId);
             }
@@ -1999,7 +2005,7 @@ export class SnapController extends BaseController {
         try {
             const result = await withTimeout(handleRpcRequestPromise, timer);
             if (result === 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.`);
@@ -2020,7 +2026,7 @@ export class SnapController extends 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] = unwrapError(error);
-            const stopping = runtime.stopPromise !== null || !this.isRunning(snapId);
+            const stopping = runtime.stopPromise !== null || !this.isSnapRunning(snapId);
             if (!handled) {
                 if (!stopping) {
                     logError(`"${snapId}" crashed due to an unhandled error:`, jsonRpcError);
@@ -2283,7 +2289,7 @@ export class SnapController extends BaseController {
         if (runtime.pendingInboundRequests.length === 0) {
             runtime.lastRequest = Date.now();
         }
-        const snap = this.get(snapId);
+        const snap = this.getSnap(snapId);
         if (isTrackableHandler(handlerType) && !snap?.preinstalled) {
             try {
                 this.#trackSnapExport(snapId, handlerType, success, origin);
@@ -2339,7 +2345,7 @@ export class SnapController extends BaseController {
         }
         await this.stopSnap(snapId, SnapStatusEvents.Stop);
         // Always set to stopped even if it wasn't running initially
-        if (this.get(snapId)?.status !== SnapStatus.Stopped) {
+        if (this.getSnap(snapId)?.status !== SnapStatus.Stopped) {
             this.#transition(snapId, SnapStatusEvents.Stop);
         }
         const { statePatches, permissions, previousInitialConnections, newInitialConnections, previousSourceCode, } = rollbackSnapshot;
@@ -2353,7 +2359,7 @@ export class SnapController extends 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 !== SnapStatus.Stopped) {
+        if (this.getSnap(snapId)?.status !== SnapStatus.Stopped) {
             this.update((state) => {
                 state.snaps[snapId].status = SnapStatus.Stopped;
             });
@@ -2366,7 +2372,7 @@ export class SnapController extends 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);
     }
@@ -2393,7 +2399,7 @@ export class SnapController extends BaseController {
         if (this.#snapsRuntimeData.has(snapId)) {
             return;
         }
-        const snap = this.get(snapId);
+        const snap = this.getSnap(snapId);
         const interpreter = interpret(this.#statusMachine);
         interpreter.start({
             context: { snapId },
@@ -2408,7 +2414,6 @@ export class SnapController extends BaseController {
             installPromise: null,
             encryptionKey: null,
             encryptionSalt: null,
-            activeReferences: 0,
             pendingInboundRequests: [],
             pendingOutboundRequests: 0,
             interpreter,
@@ -2519,7 +2524,7 @@ export class SnapController extends 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 (satisfiesVersionRange(existingSnap.version, newVersionRange)) {
             return false;
         }