@metamask/snaps-controllers 14.2.2 → 15.0.1

package/dist/snaps/SnapController.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapController = exports.SNAP_APPROVAL_RESULT = exports.SNAP_APPROVAL_UPDATE = exports.SNAP_APPROVAL_INSTALL = exports.controllerName = void 0;
+const approval_controller_1 = require("@metamask/approval-controller");
 const base_controller_1 = require("@metamask/base-controller");
 const permission_controller_1 = require("@metamask/permission-controller");
 const rpc_errors_1 = require("@metamask/rpc-errors");
@@ -87,14 +88,28 @@ class SnapController extends base_controller_1.BaseController {
             messenger,
             metadata: {
                 snapStates: {
+                    includeInStateLogs: false,
                     persist: true,
                     anonymous: false,
+                    usedInUi: false,
                 },
                 unencryptedSnapStates: {
+                    includeInStateLogs: false,
                     persist: true,
                     anonymous: false,
+                    usedInUi: false,
                 },
                 snaps: {
+                    includeInStateLogs: (snaps) => {
+                        // Delete larger snap properties
+                        return Object.values(snaps).reduce((acc, snap) => {
+                            const snapCopy = { ...snap };
+                            delete snapCopy.sourceCode;
+                            delete snapCopy.auxiliaryFiles;
+                            acc[snap.id] = snapCopy;
+                            return acc;
+                        }, {});
+                    },
                     persist: (snaps) => {
                         return (Object.values(snaps)
                             // We should not persist snaps that are in the installing state,
@@ -113,6 +128,9 @@ class SnapController extends base_controller_1.BaseController {
                         }, {}));
                     },
                     anonymous: false,
+                    // TODO: Ensure larger snap properties are not sent to the UI
+                    // Currently these are stripped out manually in the extension
+                    usedInUi: true,
                 },
             },
             name: exports.controllerName,
@@ -255,7 +273,7 @@ class SnapController extends base_controller_1.BaseController {
         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`, async () => this.updateBlockedSnaps());
+        this.messagingSystem.registerActionHandler(`${exports.controllerName}:updateRegistry`, async () => this.updateRegistry());
         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`, async (...args) => this.disableSnap(...args));
@@ -361,8 +379,10 @@ class SnapController extends base_controller_1.BaseController {
      * Checks all installed snaps against the block list and
      * blocks/unblocks snaps as appropriate. See {@link SnapController.blockSnap}
      * for more information.
+     *
+     * Also updates any preinstalled Snaps to the latest allowlisted version.
      */
-    async updateBlockedSnaps() {
+    async updateRegistry() {
         this.#assertCanUsePlatform();
         await this.messagingSystem.call('SnapsRegistry:update');
         const blockedSnaps = await this.messagingSystem.call('SnapsRegistry:get', Object.values(this.state.snaps).reduce((blockListArg, snap) => {
@@ -378,6 +398,30 @@ class SnapController extends base_controller_1.BaseController {
             }
             return this.#unblockSnap(snapId);
         }));
+        if (!this.#featureFlags.autoUpdatePreinstalledSnaps) {
+            return;
+        }
+        const preinstalledVersionRange = '*';
+        await Promise.allSettled(Object.values(this.state.snaps)
+            .filter((snap) => snap.preinstalled)
+            .map(async (snap) => {
+            const resolvedVersion = await this.#resolveAllowlistVersion(snap.id, preinstalledVersionRange);
+            if (resolvedVersion !== preinstalledVersionRange &&
+                (0, utils_1.gtVersion)(resolvedVersion, snap.version)) {
+                const location = this.#detectSnapLocation(snap.id, {
+                    versionRange: resolvedVersion,
+                    fetch: this.#fetchFunction,
+                    allowLocal: false,
+                });
+                await this.#updateSnap({
+                    origin: approval_controller_1.ORIGIN_METAMASK,
+                    snapId: snap.id,
+                    location,
+                    versionRange: resolvedVersion,
+                    automaticUpdate: true,
+                });
+            }
+        }));
     }
     /**
      * Blocks an installed snap and prevents it from being started again. Emits
@@ -669,7 +713,7 @@ class SnapController extends base_controller_1.BaseController {
      */
     getExpect(snapId) {
         const snap = this.get(snapId);
-        (0, utils_1.assert)(snap !== undefined, new Error(`Snap "${snapId}" not found.`));
+        (0, utils_1.assert)(snap !== undefined, `Snap "${snapId}" not found.`);
         return snap;
     }
     /**
@@ -1219,7 +1263,7 @@ class SnapController extends base_controller_1.BaseController {
                 else if (!isUpdate) {
                     pendingInstalls.push(snapId);
                 }
-                result[snapId] = await this.processRequestedSnap(origin, snapId, location, version);
+                result[snapId] = await this.#processRequestedSnap(origin, snapId, location, version);
             }
             // Once we finish all installs / updates, emit events.
             pendingInstalls.forEach((snapId) => this.messagingSystem.publish(`SnapController:snapInstalled`, this.getTruncatedExpect(snapId), origin, false));
@@ -1248,23 +1292,19 @@ class SnapController extends base_controller_1.BaseController {
      * @param versionRange - The semver range of the snap to install.
      * @returns The resulting snap object, or an error if something went wrong.
      */
-    // TODO: Either fix this lint violation or explain why it's necessary to
-    //  ignore.
-    // eslint-disable-next-line no-restricted-syntax
-    async processRequestedSnap(origin, snapId, location, versionRange) {
+    async #processRequestedSnap(origin, snapId, location, versionRange) {
         const existingSnap = this.getTruncated(snapId);
         // For devX we always re-install local snaps.
         if (existingSnap && !location.shouldAlwaysReload) {
             if ((0, utils_1.satisfiesVersionRange)(existingSnap.version, versionRange)) {
                 return existingSnap;
             }
-            return await this.updateSnap(origin, snapId, location, versionRange, 
-            // Since we are requesting an update from within processRequestedSnap,
-            // we disable the emitting of the snapUpdated event and rely on the caller
-            // to publish this event after the update is complete.
-            // This is necessary as installSnaps may be installing multiple snaps
-            // and we don't want to emit events prematurely.
-            false);
+            return await this.#updateSnap({
+                origin,
+                snapId,
+                location,
+                versionRange,
+            });
         }
         this.#assertCanInstallSnaps();
         let pendingApproval = this.#createApproval({
@@ -1288,7 +1328,7 @@ class SnapController extends base_controller_1.BaseController {
                 location,
                 versionRange,
             });
-            await this.authorize(snapId, pendingApproval);
+            await this.#authorize(snapId, pendingApproval);
             pendingApproval = this.#createApproval({
                 origin,
                 snapId,
@@ -1357,28 +1397,30 @@ class SnapController extends base_controller_1.BaseController {
      * If the original version of the snap was blocked and the update succeeded,
      * the snap will be unblocked and enabled before it is restarted.
      *
-     * @param origin - The origin requesting the snap update.
-     * @param snapId - The id of the Snap to be updated.
-     * @param location - The location implementation of the snap.
-     * @param newVersionRange - A semver version range in which the maximum version will be chosen.
-     * @param emitEvent - An optional boolean flag to indicate whether this update should emit an event.
+     * @param options - An options bag.
+     * @param options.origin - The origin requesting the snap update.
+     * @param options.snapId - The id of the Snap to be updated.
+     * @param options.location - The location implementation of the snap.
+     * @param options.versionRange - A semver version range in which the maximum version will be chosen.
+     * @param options.automaticUpdate - An optional boolean flag to indicate whether this update should be done
+     * automatically.
      * @returns The snap metadata if updated, `null` otherwise.
      */
-    async updateSnap(origin, snapId, location, newVersionRange = snaps_utils_1.DEFAULT_REQUESTED_SNAP_VERSION, emitEvent = true) {
+    async #updateSnap({ origin, snapId, location, versionRange, automaticUpdate = false, }) {
         this.#assertCanInstallSnaps();
         this.#assertCanUsePlatform();
         const snap = this.getExpect(snapId);
-        if (snap.preinstalled) {
+        const { preinstalled, removable, hidden, hideSnapBranding } = snap;
+        if (preinstalled && !automaticUpdate) {
             throw new Error('Preinstalled Snaps cannot be manually updated.');
         }
-        if (!(0, utils_1.isValidSemVerRange)(newVersionRange)) {
-            throw new Error(`Received invalid snap version range: "${newVersionRange}".`);
-        }
-        let pendingApproval = this.#createApproval({
-            origin,
-            snapId,
-            type: exports.SNAP_APPROVAL_UPDATE,
-        });
+        let pendingApproval = automaticUpdate
+            ? null
+            : this.#createApproval({
+                origin,
+                snapId,
+                type: exports.SNAP_APPROVAL_UPDATE,
+            });
         try {
             this.messagingSystem.publish('SnapController:snapInstallStarted', snapId, origin, true);
             const oldManifest = snap.manifest;
@@ -1387,10 +1429,10 @@ class SnapController extends base_controller_1.BaseController {
             const manifest = manifestFile.result;
             const newVersion = manifest.version;
             if (!(0, utils_1.gtVersion)(newVersion, snap.version)) {
-                throw rpc_errors_1.rpcErrors.invalidParams(`Snap "${snapId}@${snap.version}" is already installed. Couldn't update to a version inside requested "${newVersionRange}" range.`);
+                throw rpc_errors_1.rpcErrors.invalidParams(`Snap "${snapId}@${snap.version}" is already installed. Couldn't update to a version inside requested "${versionRange}" range.`);
             }
-            if (!(0, utils_1.satisfiesVersionRange)(newVersion, newVersionRange)) {
-                throw new Error(`Version mismatch. Manifest for "${snapId}" specifies version "${newVersion}" which doesn't satisfy requested version range "${newVersionRange}".`);
+            if (!(0, utils_1.satisfiesVersionRange)(newVersion, versionRange)) {
+                throw new Error(`Version mismatch. Manifest for "${snapId}" specifies version "${newVersion}" which doesn't satisfy requested version range "${versionRange}".`);
             }
             await this.#assertIsInstallAllowed(snapId, {
                 version: newVersion,
@@ -1402,23 +1444,33 @@ class SnapController extends base_controller_1.BaseController {
             this.#validateSnapPermissions(processedPermissions);
             const { newPermissions, unusedPermissions, approvedPermissions } = this.#calculatePermissionsChange(snapId, processedPermissions);
             const { newConnections, unusedConnections, approvedConnections } = this.#calculateConnectionsChange(snapId, oldManifest.initialConnections ?? {}, manifest.initialConnections ?? {});
-            this.#updateApproval(pendingApproval.id, {
-                permissions: newPermissions,
-                newVersion: manifest.version,
-                newPermissions,
-                approvedPermissions,
-                unusedPermissions,
-                newConnections,
-                unusedConnections,
-                approvedConnections,
-                loading: false,
-            });
-            const { permissions: approvedNewPermissions, ...requestData } = (await pendingApproval.promise);
-            pendingApproval = this.#createApproval({
-                origin,
-                snapId,
-                type: exports.SNAP_APPROVAL_RESULT,
-            });
+            let approvedNewPermissions;
+            let requestData;
+            if (pendingApproval) {
+                this.#updateApproval(pendingApproval.id, {
+                    permissions: newPermissions,
+                    newVersion: manifest.version,
+                    newPermissions,
+                    approvedPermissions,
+                    unusedPermissions,
+                    newConnections,
+                    unusedConnections,
+                    approvedConnections,
+                    loading: false,
+                });
+                const { permissions, ...rest } = (await pendingApproval.promise);
+                approvedNewPermissions = permissions;
+                requestData = rest;
+                pendingApproval = this.#createApproval({
+                    origin,
+                    snapId,
+                    type: exports.SNAP_APPROVAL_RESULT,
+                });
+            }
+            else {
+                (0, utils_1.assert)(automaticUpdate);
+                approvedNewPermissions = newPermissions;
+            }
             if (this.isRunning(snapId)) {
                 await this.stopSnap(snapId, snaps_utils_1.SnapStatusEvents.Stop);
             }
@@ -1427,6 +1479,10 @@ class SnapController extends base_controller_1.BaseController {
                 origin,
                 id: snapId,
                 files: newSnap,
+                removable,
+                preinstalled,
+                hidden,
+                hideSnapBranding,
                 isUpdate: true,
             });
             this.#updatePermissions({
@@ -1435,14 +1491,17 @@ class SnapController extends base_controller_1.BaseController {
                 newPermissions: approvedNewPermissions,
                 requestData,
             });
-            if (manifest.initialConnections) {
-                this.#handleInitialConnections(snapId, oldManifest.initialConnections ?? null, manifest.initialConnections);
-            }
+            const previousInitialConnections = oldManifest.initialConnections ?? null;
+            const newInitialConnections = manifest.initialConnections ?? {};
+            this.#handleInitialConnections(snapId, previousInitialConnections, newInitialConnections);
             const rollbackSnapshot = this.#getRollbackSnapshot(snapId);
             if (rollbackSnapshot !== undefined) {
                 rollbackSnapshot.permissions.revoked = unusedPermissions;
                 rollbackSnapshot.permissions.granted = approvedNewPermissions;
                 rollbackSnapshot.permissions.requestData = requestData;
+                rollbackSnapshot.previousInitialConnections =
+                    previousInitialConnections;
+                rollbackSnapshot.newInitialConnections = newInitialConnections;
             }
             const sourceCode = sourceCodeFile.toString();
             (0, utils_1.assert)(typeof sourceCode === 'string' && sourceCode.length > 0, `Invalid source code for snap "${snapId}".`);
@@ -1453,23 +1512,24 @@ class SnapController extends base_controller_1.BaseController {
                 throw new Error(`Snap ${snapId} crashed with updated source code.`);
             }
             const truncatedSnap = this.getTruncatedExpect(snapId);
-            if (emitEvent) {
-                this.messagingSystem.publish('SnapController:snapUpdated', truncatedSnap, snap.version, origin, false);
+            if (pendingApproval) {
+                this.#updateApproval(pendingApproval.id, {
+                    loading: false,
+                    type: exports.SNAP_APPROVAL_UPDATE,
+                });
             }
-            this.#updateApproval(pendingApproval.id, {
-                loading: false,
-                type: exports.SNAP_APPROVAL_UPDATE,
-            });
             return truncatedSnap;
         }
         catch (error) {
             (0, snaps_utils_1.logError)(`Error when updating ${snapId},`, error);
             const errorString = error instanceof Error ? error.message : error.toString();
-            this.#updateApproval(pendingApproval.id, {
-                loading: false,
-                error: errorString,
-                type: exports.SNAP_APPROVAL_UPDATE,
-            });
+            if (pendingApproval) {
+                this.#updateApproval(pendingApproval.id, {
+                    loading: false,
+                    error: errorString,
+                    type: exports.SNAP_APPROVAL_UPDATE,
+                });
+            }
             this.messagingSystem.publish('SnapController:snapInstallFailed', snapId, origin, true, errorString);
             throw error;
         }
@@ -1715,14 +1775,11 @@ class SnapController extends base_controller_1.BaseController {
      * Initiates a request for the given snap's initial permissions.
      * Must be called in order. See processRequestedSnap.
      *
-     * This function is not hash private yet because of tests.
-     *
      * @param snapId - The id of the Snap.
      * @param pendingApproval - Pending approval to update.
      * @returns The snap's approvedPermissions.
      */
-    // eslint-disable-next-line no-restricted-syntax
-    async authorize(snapId, pendingApproval) {
+    async #authorize(snapId, pendingApproval) {
         (0, logging_1.log)(`Authorizing snap: ${snapId}`);
         const snapsState = this.state.snaps;
         const snap = snapsState[snapId];
@@ -2144,14 +2201,14 @@ class SnapController extends base_controller_1.BaseController {
      * @returns A `RollbackSnapshot`.
      */
     #createRollbackSnapshot(snapId) {
-        (0, utils_1.assert)(this.#rollbackSnapshots.get(snapId) === undefined, new Error(`Snap "${snapId}" rollback snapshot already exists.`));
+        (0, utils_1.assert)(this.#rollbackSnapshots.get(snapId) === undefined, `Snap "${snapId}" rollback snapshot already exists.`);
         this.#rollbackSnapshots.set(snapId, {
             statePatches: [],
             permissions: {},
             newVersion: '',
         });
         const newRollbackSnapshot = this.#rollbackSnapshots.get(snapId);
-        (0, utils_1.assert)(newRollbackSnapshot !== undefined, new Error(`Snapshot creation failed for ${snapId}.`));
+        (0, utils_1.assert)(newRollbackSnapshot !== undefined, `Snapshot creation failed for ${snapId}.`);
         return newRollbackSnapshot;
     }
     /**
@@ -2175,7 +2232,7 @@ class SnapController extends base_controller_1.BaseController {
         if (this.get(snapId)?.status !== snaps_utils_1.SnapStatus.Stopped) {
             this.#transition(snapId, snaps_utils_1.SnapStatusEvents.Stop);
         }
-        const { statePatches, permissions } = rollbackSnapshot;
+        const { statePatches, permissions, previousInitialConnections, newInitialConnections, } = rollbackSnapshot;
         if (statePatches?.length) {
             this.applyPatches(statePatches);
         }
@@ -2192,6 +2249,8 @@ class SnapController extends base_controller_1.BaseController {
             newPermissions: permissions.revoked,
             requestData: permissions.requestData,
         });
+        // Calling this in reverse order to undo the changes
+        this.#handleInitialConnections(snapId, newInitialConnections ?? null, previousInitialConnections ?? {});
         const truncatedSnap = this.getTruncatedExpect(snapId);
         this.messagingSystem.publish('SnapController:snapRolledback', truncatedSnap, rollbackSnapshot.newVersion);
         this.#rollbackSnapshots.delete(snapId);
@@ -2212,7 +2271,7 @@ class SnapController extends base_controller_1.BaseController {
     }
     #getRuntimeExpect(snapId) {
         const runtime = this.#getRuntime(snapId);
-        (0, utils_1.assert)(runtime !== undefined, new Error(`Snap "${snapId}" runtime data not found`));
+        (0, utils_1.assert)(runtime !== undefined, `Snap "${snapId}" runtime data not found`);
         return runtime;
     }
     #setupRuntime(snapId) {
@@ -2283,8 +2342,7 @@ class SnapController extends base_controller_1.BaseController {
      * @returns The permissions to grant to the Snap.
      */
     #getPermissionsToGrant(snapId, newPermissions) {
-        if (this.#featureFlags.useCaip25Permission &&
-            Object.keys(newPermissions).includes(snaps_rpc_methods_1.SnapEndowments.EthereumProvider)) {
+        if (Object.keys(newPermissions).includes(snaps_rpc_methods_1.SnapEndowments.EthereumProvider)) {
             // This will return the globally selected network if the Snap doesn't have
             // one set.
             const networkClientId = this.messagingSystem.call('SelectedNetworkController:getNetworkClientIdForDomain', snapId);