@metamask-previews/snap-account-service 0.2.0-preview-9fb8d00e7 → 0.2.0-preview-e43dfcb

package/CHANGELOG.md

@@ -7,23 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Changed
-
-- Faster `:getLegacySnapKeyring` ([#8865](https://github.com/MetaMask/core/pull/8865))
-  - We now check if the keyring exists with `:withKeyringUnsafe` and returns it right away.
-  - If the keyring does not exist yet, we do create it with `:withController` (next calls will then be faster thanks to `:withKeyringUnsafe` pre-check).
-
-### Fixed
-
-- Prevent double-lock in `:handleKeyringSnapMessage` for some events/methods ([#8860](https://github.com/MetaMask/core/pull/8860))
-  - The service messenger now requires the `KeyringController:withKeyringUnsafe` action.
-  - We now check if the keyring is available before delegating those messages.
-  - We still auto-create the keyring in some specific calls (e.g `notify:accountCreated`).
-
-## Removed
-
-- Removed `init` in favor of synchronous initialization when constructing the service ([#8877](https://github.com/MetaMask/core/pull/8877))
-
 ## [0.2.0]
 
 ### Added

package/dist/SnapAccountService.cjs

@@ -10,13 +10,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SnapAccountService_instances, _SnapAccountService_messenger, _SnapAccountService_watcher, _SnapAccountService_tracker, _SnapAccountService_handleSelectedAccountGroupChange, _SnapAccountService_handleUnlock, _SnapAccountService_handleAccountGroupCreatedOrUpdated, _SnapAccountService_handleAccountGroupRemoved, _SnapAccountService_getLegacySnapKeyringIfAvailable, _SnapAccountService_forwardSelectedAccounts, _SnapAccountService_getAccountGroup, _SnapAccountService_getSelectedAccountGroupId;
+var _SnapAccountService_instances, _SnapAccountService_messenger, _SnapAccountService_watcher, _SnapAccountService_tracker, _SnapAccountService_handleSelectedAccountGroupChange, _SnapAccountService_handleUnlock, _SnapAccountService_handleAccountGroupCreatedOrUpdated, _SnapAccountService_handleAccountGroupRemoved, _SnapAccountService_forwardSelectedAccounts, _SnapAccountService_getAccountGroup, _SnapAccountService_getSelectedAccountGroupId;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapAccountService = exports.serviceName = void 0;
-const eth_snap_keyring_1 = require("@metamask/eth-snap-keyring");
-const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_controller_1 = require("@metamask/keyring-controller");
-const keyring_snap_sdk_1 = require("@metamask/keyring-snap-sdk");
 const logger_1 = require("./logger.cjs");
 const SnapPlatformWatcher_1 = require("./SnapPlatformWatcher.cjs");
 const SnapTracker_1 = require("./SnapTracker.cjs");
@@ -72,6 +69,16 @@ class SnapAccountService {
         __classPrivateFieldGet(this, _SnapAccountService_messenger, "f").subscribe('AccountTreeController:accountGroupRemoved', (groupId) => __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_handleAccountGroupRemoved).call(this, groupId));
         __classPrivateFieldGet(this, _SnapAccountService_messenger, "f").subscribe('KeyringController:unlock', () => __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_handleUnlock).call(this));
     }
+    /**
+     * Initializes the snap account service.
+     *
+     * Seeds the internal set of account-management Snaps from
+     * `SnapController:getRunnableSnaps`, then starts processing lifecycle
+     * events.
+     */
+    async init() {
+        await __classPrivateFieldGet(this, _SnapAccountService_tracker, "f").init();
+    }
     /**
      * Returns the IDs of all currently tracked account-management Snaps —
      * Snaps that are installed, enabled, not blocked, and have the
@@ -107,14 +114,6 @@ class SnapAccountService {
      * @returns The existing or newly-created Snap keyring instance.
      */
     async getLegacySnapKeyring() {
-        // This is a fast-path for the common case where the keyring already exists, to avoid the
-        // overhead of acquiring the `KeyringController` mutex if we don't need to.
-        // NOTE: If it doesn't exist, we'll create it **safely** with `:withController` (which was
-        // not the case with the previous client's implementation).
-        const exists = await __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_getLegacySnapKeyringIfAvailable).call(this);
-        if (exists) {
-            return exists;
-        }
         // `KeyringController:withController` forbids returning a direct keyring
         // reference (it checks the result via `Object.is`), so we smuggle the
         // instance out wrapped in an object and unwrap it after the call.
@@ -145,31 +144,7 @@ class SnapAccountService {
      * @returns The execution result.
      */
     async handleKeyringSnapMessage(snapId, message) {
-        let snapKeyring = await __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_getLegacySnapKeyringIfAvailable).call(this);
-        // Handle specific methods first.
-        if (message.method === keyring_snap_sdk_1.SnapManageAccountsMethod.GetSelectedAccounts) {
-            if (snapKeyring) {
-                // The legacy Snap keyring already maintain a local list of selected accounts per Snaps, so we
-                // just delegate the call.
-                return snapKeyring.handleKeyringSnapMessage(snapId, message);
-            }
-            // Some Snaps might be using `getSelectedAccounts` early in their lifecycle, before the keyring is created. So we
-            // do not throw in that case to avoid messing up their lifecycle.
-            return [];
-        }
-        const event = message.method; // We assume the Snap platform always sends a valid `KeyringEvent` here.
-        (0, logger_1.projectLogger)(`Forwarding message "${event}" from Snap "${snapId}" to its keyring...`);
-        // We can create a new keyring if the message is an AccountCreated event.
-        const isAccountCreatedMessage = event === keyring_api_1.KeyringEvent.AccountCreated;
-        // Create the Snap keyring if it doesn't exist yet (in an atomic way). We cannot assume
-        // the keyring exists (e.g for the MMI Snap).
-        // NOTE: We only auto-create it for v1 account creation flows.
-        if (isAccountCreatedMessage && !snapKeyring) {
-            snapKeyring = await this.getLegacySnapKeyring();
-        }
-        if (!snapKeyring) {
-            throw new Error(`Legacy Snap keyring does not exist yet for snap "${snapId}".`);
-        }
+        const snapKeyring = await this.getLegacySnapKeyring();
         return snapKeyring.handleKeyringSnapMessage(snapId, message);
     }
 }
@@ -187,27 +162,6 @@ _SnapAccountService_messenger = new WeakMap(), _SnapAccountService_watcher = new
     if (groupId === __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_getSelectedAccountGroupId).call(this)) {
         __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_forwardSelectedAccounts).call(this, groupId, []);
     }
-}, _SnapAccountService_getLegacySnapKeyringIfAvailable = 
-/**
- * Gets the legacy (v1) Snap keyring but do not auto-create it if it doesn't exist.
- *
- * @returns The existing Snap keyring instance, or undefined if it doesn't exist.
- */
-async function _SnapAccountService_getLegacySnapKeyringIfAvailable() {
-    try {
-        const result = await __classPrivateFieldGet(this, _SnapAccountService_messenger, "f").call('KeyringController:withKeyringUnsafe', { filter: isLegacySnapKeyring }, async ({ keyring }) => {
-            // The legacy Snap keyring is not compatible with `EthKeyring`, so we need to cast here.
-            return { snapKeyring: keyring };
-        });
-        return result.snapKeyring;
-    }
-    catch (error) {
-        if ((0, keyring_controller_1.isKeyringNotFoundError)(error)) {
-            (0, logger_1.projectLogger)('Legacy Snap keyring not available yet.');
-            return undefined;
-        }
-        throw error;
-    }
 }, _SnapAccountService_forwardSelectedAccounts = function _SnapAccountService_forwardSelectedAccounts(groupId, accounts) {
     if (!groupId) {
         (0, logger_1.projectLogger)('No selected account group, skipping forwarding selected accounts to Snap keyring.');
@@ -224,11 +178,7 @@ async function _SnapAccountService_getLegacySnapKeyringIfAvailable() {
         else {
             (0, logger_1.projectLogger)(`Clearing selected accounts (from "${groupId}")`);
         }
-        const snapKeyring = await __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_getLegacySnapKeyringIfAvailable).call(this);
-        if (!snapKeyring) {
-            (0, logger_1.projectLogger)('No legacy Snap keyring available, skipping forwarding selected accounts.');
-            return;
-        }
+        const snapKeyring = await this.getLegacySnapKeyring();
         await snapKeyring.setSelectedAccounts(accounts);
     };
     // There is nothing we can do if forwarding fails. This will auto-recover on the next relevant event.

package/dist/SnapAccountService.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SnapAccountService.cjs","sourceRoot":"","sources":["../src/SnapAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import { AccountGroupId } from '@metamask/account-api';\nimport {\n  SnapKeyring as LegacySnapKeyring,\n  SnapMessage,\n} from '@metamask/eth-snap-keyring';\nimport { KeyringEvent } from '@metamask/keyring-api';\nimport type {\n  KeyringControllerGetStateAction,\n  KeyringControllerStateChangeEvent,\n  KeyringControllerUnlockEvent,\n  KeyringControllerWithControllerAction,\n  KeyringEntry,\n} from '@metamask/keyring-controller';\nimport {\n  isKeyringNotFoundError,\n  KeyringTypes,\n} from '@metamask/keyring-controller';\nimport { KeyringControllerWithKeyringUnsafeAction } from '@metamask/keyring-controller';\nimport { SnapManageAccountsMethod } from '@metamask/keyring-snap-sdk';\nimport type { AccountId, BaseKeyring } from '@metamask/keyring-utils';\nimport type { Messenger } from '@metamask/messenger';\nimport type {\n  SnapControllerGetRunnableSnapsAction,\n  SnapControllerGetSnapAction,\n  SnapControllerGetStateAction,\n  SnapControllerSnapBlockedEvent,\n  SnapControllerSnapDisabledEvent,\n  SnapControllerSnapEnabledEvent,\n  SnapControllerSnapInstalledEvent,\n  SnapControllerSnapUnblockedEvent,\n  SnapControllerSnapUninstalledEvent,\n  SnapControllerStateChangeEvent,\n} from '@metamask/snaps-controllers';\nimport { SnapId } from '@metamask/snaps-sdk';\nimport type { Json } from '@metamask/utils';\n\nimport { projectLogger as log } from './logger';\nimport type {\n  SnapAccountServiceEnsureReadyAction,\n  SnapAccountServiceGetLegacySnapKeyringAction,\n  SnapAccountServiceGetSnapsAction,\n  SnapAccountServiceHandleKeyringSnapMessageAction,\n} from './SnapAccountService-method-action-types';\nimport { SnapPlatformWatcher } from './SnapPlatformWatcher';\nimport type { SnapPlatformWatcherConfig } from './SnapPlatformWatcher';\nimport { SnapTracker } from './SnapTracker';\nimport type {\n  AccountTreeControllerGetAccountGroupObjectAction,\n  AccountTreeControllerGetSelectedAccountGroupAction,\n  AccountTreeControllerSelectedAccountGroupChangeEvent,\n  AccountTreeControllerAccountGroupCreatedEvent,\n  AccountTreeControllerAccountGroupUpdatedEvent,\n  AccountTreeControllerAccountGroupRemovedEvent,\n  AccountGroupObject,\n} from './types';\n\n/**\n * The name of the {@link SnapAccountService}, used to namespace the service's\n * actions and events.\n */\nexport const serviceName = 'SnapAccountService';\n\n/**\n * All of the methods within {@link SnapAccountService} that are exposed via\n * the messenger.\n */\nconst MESSENGER_EXPOSED_METHODS = [\n  'ensureReady',\n  'getSnaps',\n  'getLegacySnapKeyring',\n  'handleKeyringSnapMessage',\n] as const;\n\n/**\n * Actions that {@link SnapAccountService} exposes to other consumers.\n */\nexport type SnapAccountServiceActions =\n  | SnapAccountServiceEnsureReadyAction\n  | SnapAccountServiceGetSnapsAction\n  | SnapAccountServiceGetLegacySnapKeyringAction\n  | SnapAccountServiceHandleKeyringSnapMessageAction;\n\n/**\n * Actions from other messengers that {@link SnapAccountService} calls.\n */\ntype AllowedActions =\n  | SnapControllerGetStateAction\n  | SnapControllerGetSnapAction\n  | SnapControllerGetRunnableSnapsAction\n  | KeyringControllerGetStateAction\n  | KeyringControllerWithControllerAction\n  | KeyringControllerWithKeyringUnsafeAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetSelectedAccountGroupAction;\n\n/**\n * Events that {@link SnapAccountService} exposes to other consumers.\n */\nexport type SnapAccountServiceEvents = never;\n\n/**\n * Events from other messengers that {@link SnapAccountService} subscribes to.\n */\ntype AllowedEvents =\n  | SnapControllerStateChangeEvent\n  | SnapControllerSnapInstalledEvent\n  | SnapControllerSnapEnabledEvent\n  | SnapControllerSnapDisabledEvent\n  | SnapControllerSnapBlockedEvent\n  | SnapControllerSnapUnblockedEvent\n  | SnapControllerSnapUninstalledEvent\n  | KeyringControllerStateChangeEvent\n  | KeyringControllerUnlockEvent\n  | AccountTreeControllerSelectedAccountGroupChangeEvent\n  | AccountTreeControllerAccountGroupCreatedEvent\n  | AccountTreeControllerAccountGroupUpdatedEvent\n  | AccountTreeControllerAccountGroupRemovedEvent;\n\n/**\n * The messenger which is restricted to actions and events accessed by\n * {@link SnapAccountService}.\n */\nexport type SnapAccountServiceMessenger = Messenger<\n  typeof serviceName,\n  SnapAccountServiceActions | AllowedActions,\n  SnapAccountServiceEvents | AllowedEvents\n>;\n\n/**\n * Configuration for the {@link SnapAccountService}.\n */\nexport type SnapAccountServiceConfig = {\n  snapPlatformWatcher?: SnapPlatformWatcherConfig;\n};\n\n/**\n * The options that {@link SnapAccountService} takes.\n */\nexport type SnapAccountServiceOptions = {\n  messenger: SnapAccountServiceMessenger;\n  config?: SnapAccountServiceConfig;\n};\n\n/**\n * Checks if a given keyring is a Snap keyring (v2).\n *\n * @param keyring - The keyring to check.\n * @param keyring.type - The type of the keyring.\n * @returns `true` if the keyring is a Snap keyring (v2), `false` otherwise.\n */\nfunction isLegacySnapKeyring(keyring: {\n  type: BaseKeyring['type'];\n}): keyring is LegacySnapKeyring {\n  return keyring.type === KeyringTypes.snap;\n}\n\n/**\n * Service responsible for managing account management snaps.\n */\nexport class SnapAccountService {\n  /**\n   * The name of the service.\n   */\n  readonly name: typeof serviceName;\n\n  readonly #messenger: SnapAccountServiceMessenger;\n\n  readonly #watcher: SnapPlatformWatcher;\n\n  readonly #tracker: SnapTracker;\n\n  /**\n   * Constructs a new {@link SnapAccountService}.\n   *\n   * @param args - The constructor arguments.\n   * @param args.messenger - The messenger suited for this service.\n   * @param args.config - Optional service configuration.\n   */\n  constructor({ messenger, config }: SnapAccountServiceOptions) {\n    this.name = serviceName;\n    this.#messenger = messenger;\n    this.#watcher = new SnapPlatformWatcher(\n      messenger,\n      config?.snapPlatformWatcher,\n    );\n    this.#tracker = new SnapTracker(messenger);\n\n    this.#messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:selectedAccountGroupChange',\n      (groupId) => this.#handleSelectedAccountGroupChange(groupId),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupCreated',\n      (group) => this.#handleAccountGroupCreatedOrUpdated(group),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupUpdated',\n      (group) => this.#handleAccountGroupCreatedOrUpdated(group),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupRemoved',\n      (groupId) => this.#handleAccountGroupRemoved(groupId),\n    );\n\n    this.#messenger.subscribe('KeyringController:unlock', () =>\n      this.#handleUnlock(),\n    );\n  }\n\n  /**\n   * Handles changes to the selected account group by forwarding the new\n   * group's accounts to the Snap keyring.\n   *\n   * @param groupId - The ID of the newly selected account group.\n   */\n  #handleSelectedAccountGroupChange(groupId: AccountGroupId | ''): void {\n    this.#forwardSelectedAccounts(\n      groupId,\n      this.#getAccountGroup(groupId)?.accounts,\n    );\n  }\n\n  /**\n   * Handles the keyring controller unlock event by forwarding the currently\n   * selected account group's accounts to the Snap keyring.\n   */\n  #handleUnlock(): void {\n    const groupId = this.#getSelectedAccountGroupId();\n    this.#forwardSelectedAccounts(\n      groupId,\n      this.#getAccountGroup(groupId)?.accounts,\n    );\n  }\n\n  /**\n   * Handles created or updated account groups by forwarding the accounts of the currently\n   * selected account group to the Snap keyring, if the created/updated group is currently selected.\n   *\n   * @param group - The account group being created or updated.\n   */\n  #handleAccountGroupCreatedOrUpdated(group: AccountGroupObject): void {\n    if (group.id === this.#getSelectedAccountGroupId()) {\n      this.#forwardSelectedAccounts(group.id, group.accounts);\n    }\n  }\n\n  /**\n   * Handles removed account groups by forwarding the accounts of the currently\n   * selected account group to the Snap keyring, if the removed group is currently selected.\n   *\n   * @param groupId - The ID of the account group being removed.\n   */\n  #handleAccountGroupRemoved(groupId: AccountGroupId): void {\n    if (groupId === this.#getSelectedAccountGroupId()) {\n      this.#forwardSelectedAccounts(\n        groupId,\n        [], // Clearing accounts since the group is removed\n      );\n    }\n  }\n\n  /**\n   * Returns the IDs of all currently tracked account-management Snaps —\n   * Snaps that are installed, enabled, not blocked, and have the\n   * `endowment:keyring` permission.\n   *\n   * @returns The IDs of tracked account-management Snaps.\n   */\n  getSnaps(): SnapId[] {\n    return this.#tracker.getSnaps();\n  }\n\n  /**\n   * Ensures everything is ready to use Snap accounts for the given Snap.\n   * 1. Validates that `snapId` is a tracked account-management Snap.\n   * 2. Waits for the Snap platform to be fully started.\n   *\n   * Safe to call concurrently — each step is idempotent or mutex-protected.\n   *\n   * @param snapId - ID of the Snap to ensure readiness for.\n   * @throws If `snapId` is not a tracked account-management Snap.\n   */\n  async ensureReady(snapId: SnapId): Promise<void> {\n    if (!this.#tracker.canUse(snapId)) {\n      throw new Error(`Unknown snap: \"${snapId}\"`);\n    }\n    // Before doing anything with our Snap, we need to make sure the platform\n    // is ready to process requests.\n    await this.#watcher.ensureCanUseSnapPlatform();\n  }\n\n  /**\n   * Atomically gets-or-creates the legacy (v1) Snap keyring — the keyring\n   * associated with {@link KeyringTypes.snap}.\n   *\n   * @returns The existing or newly-created Snap keyring instance.\n   */\n  async getLegacySnapKeyring(): Promise<LegacySnapKeyring> {\n    type Result = {\n      snapKeyring: LegacySnapKeyring;\n    };\n\n    // This is a fast-path for the common case where the keyring already exists, to avoid the\n    // overhead of acquiring the `KeyringController` mutex if we don't need to.\n    // NOTE: If it doesn't exist, we'll create it **safely** with `:withController` (which was\n    // not the case with the previous client's implementation).\n    const exists = await this.#getLegacySnapKeyringIfAvailable();\n    if (exists) {\n      return exists;\n    }\n\n    // `KeyringController:withController` forbids returning a direct keyring\n    // reference (it checks the result via `Object.is`), so we smuggle the\n    // instance out wrapped in an object and unwrap it after the call.\n    // NOTE: This violates the abstraction of `KeyringController:withController`, but this\n    // is how we currently interact with the legacy Snap keyring. Once we migrate it to\n    // the Snap keyring v2, we won't be using the same pattern.\n    const result = await this.#messenger.call(\n      'KeyringController:withController',\n      async (controller): Promise<Result> => {\n        let snapKeyring: KeyringEntry['keyring'] | undefined;\n\n        const found = controller.keyrings.find(({ keyring }) =>\n          isLegacySnapKeyring(keyring),\n        );\n        if (found) {\n          snapKeyring = found.keyring;\n        }\n\n        if (!snapKeyring) {\n          const {\n            keyring: newSnapKeyring,\n            metadata: { id },\n          } = await controller.addNewKeyring(KeyringTypes.snap);\n          snapKeyring = newSnapKeyring;\n\n          log(`Legacy Snap keyring created. (\"${id}\")`);\n        }\n\n        // The legacy Snap keyring is not compatible with `EthKeyring`, so we need to cast here.\n        return { snapKeyring } as unknown as Result;\n      },\n    );\n\n    return (result as Result).snapKeyring;\n  }\n\n  /**\n   * Gets the legacy (v1) Snap keyring but do not auto-create it if it doesn't exist.\n   *\n   * @returns The existing Snap keyring instance, or undefined if it doesn't exist.\n   */\n  async #getLegacySnapKeyringIfAvailable(): Promise<\n    LegacySnapKeyring | undefined\n  > {\n    type Result = {\n      snapKeyring: LegacySnapKeyring;\n    };\n\n    try {\n      const result = await this.#messenger.call(\n        'KeyringController:withKeyringUnsafe',\n        { filter: isLegacySnapKeyring },\n        async ({ keyring }): Promise<Result> => {\n          // The legacy Snap keyring is not compatible with `EthKeyring`, so we need to cast here.\n          return { snapKeyring: keyring } as unknown as Result;\n        },\n      );\n\n      return (result as Result).snapKeyring;\n    } catch (error) {\n      if (isKeyringNotFoundError(error)) {\n        log('Legacy Snap keyring not available yet.');\n        return undefined;\n      }\n\n      throw error;\n    }\n  }\n\n  /**\n   * Handle a message from a Snap.\n   *\n   * @param snapId - ID of the Snap.\n   * @param message - Message sent by the Snap.\n   * @returns The execution result.\n   */\n  async handleKeyringSnapMessage(\n    snapId: SnapId,\n    message: SnapMessage,\n  ): Promise<Json> {\n    let snapKeyring: LegacySnapKeyring | undefined =\n      await this.#getLegacySnapKeyringIfAvailable();\n\n    // Handle specific methods first.\n    if (message.method === SnapManageAccountsMethod.GetSelectedAccounts) {\n      if (snapKeyring) {\n        // The legacy Snap keyring already maintain a local list of selected accounts per Snaps, so we\n        // just delegate the call.\n        return snapKeyring.handleKeyringSnapMessage(snapId, message);\n      }\n\n      // Some Snaps might be using `getSelectedAccounts` early in their lifecycle, before the keyring is created. So we\n      // do not throw in that case to avoid messing up their lifecycle.\n      return [];\n    }\n\n    const event = message.method as KeyringEvent; // We assume the Snap platform always sends a valid `KeyringEvent` here.\n    log(\n      `Forwarding message \"${event}\" from Snap \"${snapId}\" to its keyring...`,\n    );\n\n    // We can create a new keyring if the message is an AccountCreated event.\n    const isAccountCreatedMessage = event === KeyringEvent.AccountCreated;\n\n    // Create the Snap keyring if it doesn't exist yet (in an atomic way). We cannot assume\n    // the keyring exists (e.g for the MMI Snap).\n    // NOTE: We only auto-create it for v1 account creation flows.\n    if (isAccountCreatedMessage && !snapKeyring) {\n      snapKeyring = await this.getLegacySnapKeyring();\n    }\n\n    if (!snapKeyring) {\n      throw new Error(\n        `Legacy Snap keyring does not exist yet for snap \"${snapId}\".`,\n      );\n    }\n\n    return snapKeyring.handleKeyringSnapMessage(snapId, message);\n  }\n\n  /**\n   * Forwards the accounts of the given account group to the Snap keyring.\n   *\n   * @param groupId - The ID of the account group whose accounts should be\n   * forwarded. If empty, this is a no-op.\n   * @param accounts - The accounts to forward. If not defined, this is a no-op.\n   */\n  #forwardSelectedAccounts(\n    groupId: AccountGroupId | '',\n    accounts: AccountId[] | undefined,\n  ): void {\n    if (!groupId) {\n      log(\n        'No selected account group, skipping forwarding selected accounts to Snap keyring.',\n      );\n      return;\n    }\n\n    if (!accounts) {\n      log(\n        `Account group (\"${groupId}\") has no accounts, skipping forwarding selected accounts to Snap keyring.`,\n      );\n      return;\n    }\n\n    const forwardSelectedAccounts = async (): Promise<void> => {\n      if (accounts.length) {\n        log(\n          `Forwarding selected accounts (from \"${groupId}\"): ${accounts.join(', ')}`,\n        );\n      } else {\n        log(`Clearing selected accounts (from \"${groupId}\")`);\n      }\n\n      const snapKeyring = await this.#getLegacySnapKeyringIfAvailable();\n      if (!snapKeyring) {\n        log(\n          'No legacy Snap keyring available, skipping forwarding selected accounts.',\n        );\n        return;\n      }\n\n      await snapKeyring.setSelectedAccounts(accounts);\n    };\n\n    // There is nothing we can do if forwarding fails. This will auto-recover on the next relevant event.\n    forwardSelectedAccounts().catch((error) => {\n      console.error('Error forwarding selected accounts:', error);\n    });\n  }\n\n  /**\n   * Gets the account group object for the given group ID.\n   *\n   * @param groupId - The ID of the account group.\n   * @returns The account group object, or undefined if the group ID is empty or the group does not exist.\n   */\n  #getAccountGroup(\n    groupId: AccountGroupId | '',\n  ): AccountGroupObject | undefined {\n    if (!groupId) {\n      return undefined;\n    }\n\n    return this.#messenger.call(\n      'AccountTreeController:getAccountGroupObject',\n      groupId,\n    );\n  }\n\n  /**\n   * Gets the currently selected account group ID.\n   *\n   * @returns The currently selected account group ID, or an empty string if\n   * there is no selected account group.\n   */\n  #getSelectedAccountGroupId(): AccountGroupId | '' {\n    return this.#messenger.call(\n      'AccountTreeController:getSelectedAccountGroup',\n    );\n  }\n}\n"]}
+{"version":3,"file":"SnapAccountService.cjs","sourceRoot":"","sources":["../src/SnapAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import { AccountGroupId } from '@metamask/account-api';\nimport type {\n  SnapKeyring as LegacySnapKeyring,\n  SnapMessage,\n} from '@metamask/eth-snap-keyring';\nimport type {\n  KeyringControllerGetStateAction,\n  KeyringControllerStateChangeEvent,\n  KeyringControllerUnlockEvent,\n  KeyringControllerWithControllerAction,\n  KeyringEntry,\n} from '@metamask/keyring-controller';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { AccountId, BaseKeyring } from '@metamask/keyring-utils';\nimport type { Messenger } from '@metamask/messenger';\nimport type {\n  SnapControllerGetRunnableSnapsAction,\n  SnapControllerGetSnapAction,\n  SnapControllerGetStateAction,\n  SnapControllerSnapBlockedEvent,\n  SnapControllerSnapDisabledEvent,\n  SnapControllerSnapEnabledEvent,\n  SnapControllerSnapInstalledEvent,\n  SnapControllerSnapUnblockedEvent,\n  SnapControllerSnapUninstalledEvent,\n  SnapControllerStateChangeEvent,\n} from '@metamask/snaps-controllers';\nimport { SnapId } from '@metamask/snaps-sdk';\nimport type { Json } from '@metamask/utils';\n\nimport { projectLogger as log } from './logger';\nimport type {\n  SnapAccountServiceEnsureReadyAction,\n  SnapAccountServiceGetLegacySnapKeyringAction,\n  SnapAccountServiceGetSnapsAction,\n  SnapAccountServiceHandleKeyringSnapMessageAction,\n} from './SnapAccountService-method-action-types';\nimport { SnapPlatformWatcher } from './SnapPlatformWatcher';\nimport type { SnapPlatformWatcherConfig } from './SnapPlatformWatcher';\nimport { SnapTracker } from './SnapTracker';\nimport type {\n  AccountTreeControllerGetAccountGroupObjectAction,\n  AccountTreeControllerGetSelectedAccountGroupAction,\n  AccountTreeControllerSelectedAccountGroupChangeEvent,\n  AccountTreeControllerAccountGroupCreatedEvent,\n  AccountTreeControllerAccountGroupUpdatedEvent,\n  AccountTreeControllerAccountGroupRemovedEvent,\n  AccountGroupObject,\n} from './types';\n\n/**\n * The name of the {@link SnapAccountService}, used to namespace the service's\n * actions and events.\n */\nexport const serviceName = 'SnapAccountService';\n\n/**\n * All of the methods within {@link SnapAccountService} that are exposed via\n * the messenger.\n */\nconst MESSENGER_EXPOSED_METHODS = [\n  'ensureReady',\n  'getSnaps',\n  'getLegacySnapKeyring',\n  'handleKeyringSnapMessage',\n] as const;\n\n/**\n * Actions that {@link SnapAccountService} exposes to other consumers.\n */\nexport type SnapAccountServiceActions =\n  | SnapAccountServiceEnsureReadyAction\n  | SnapAccountServiceGetSnapsAction\n  | SnapAccountServiceGetLegacySnapKeyringAction\n  | SnapAccountServiceHandleKeyringSnapMessageAction;\n\n/**\n * Actions from other messengers that {@link SnapAccountService} calls.\n */\ntype AllowedActions =\n  | SnapControllerGetStateAction\n  | SnapControllerGetSnapAction\n  | SnapControllerGetRunnableSnapsAction\n  | KeyringControllerGetStateAction\n  | KeyringControllerWithControllerAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetSelectedAccountGroupAction;\n\n/**\n * Events that {@link SnapAccountService} exposes to other consumers.\n */\nexport type SnapAccountServiceEvents = never;\n\n/**\n * Events from other messengers that {@link SnapAccountService} subscribes to.\n */\ntype AllowedEvents =\n  | SnapControllerStateChangeEvent\n  | SnapControllerSnapInstalledEvent\n  | SnapControllerSnapEnabledEvent\n  | SnapControllerSnapDisabledEvent\n  | SnapControllerSnapBlockedEvent\n  | SnapControllerSnapUnblockedEvent\n  | SnapControllerSnapUninstalledEvent\n  | KeyringControllerStateChangeEvent\n  | KeyringControllerUnlockEvent\n  | AccountTreeControllerSelectedAccountGroupChangeEvent\n  | AccountTreeControllerAccountGroupCreatedEvent\n  | AccountTreeControllerAccountGroupUpdatedEvent\n  | AccountTreeControllerAccountGroupRemovedEvent;\n\n/**\n * The messenger which is restricted to actions and events accessed by\n * {@link SnapAccountService}.\n */\nexport type SnapAccountServiceMessenger = Messenger<\n  typeof serviceName,\n  SnapAccountServiceActions | AllowedActions,\n  SnapAccountServiceEvents | AllowedEvents\n>;\n\n/**\n * Configuration for the {@link SnapAccountService}.\n */\nexport type SnapAccountServiceConfig = {\n  snapPlatformWatcher?: SnapPlatformWatcherConfig;\n};\n\n/**\n * The options that {@link SnapAccountService} takes.\n */\nexport type SnapAccountServiceOptions = {\n  messenger: SnapAccountServiceMessenger;\n  config?: SnapAccountServiceConfig;\n};\n\n/**\n * Checks if a given keyring is a Snap keyring (v2).\n *\n * @param keyring - The keyring to check.\n * @param keyring.type - The type of the keyring.\n * @returns `true` if the keyring is a Snap keyring (v2), `false` otherwise.\n */\nfunction isLegacySnapKeyring(keyring: {\n  type: BaseKeyring['type'];\n}): keyring is LegacySnapKeyring {\n  return keyring.type === KeyringTypes.snap;\n}\n\n/**\n * Service responsible for managing account management snaps.\n */\nexport class SnapAccountService {\n  /**\n   * The name of the service.\n   */\n  readonly name: typeof serviceName;\n\n  readonly #messenger: SnapAccountServiceMessenger;\n\n  readonly #watcher: SnapPlatformWatcher;\n\n  readonly #tracker: SnapTracker;\n\n  /**\n   * Constructs a new {@link SnapAccountService}.\n   *\n   * @param args - The constructor arguments.\n   * @param args.messenger - The messenger suited for this service.\n   * @param args.config - Optional service configuration.\n   */\n  constructor({ messenger, config }: SnapAccountServiceOptions) {\n    this.name = serviceName;\n    this.#messenger = messenger;\n    this.#watcher = new SnapPlatformWatcher(\n      messenger,\n      config?.snapPlatformWatcher,\n    );\n    this.#tracker = new SnapTracker(messenger);\n\n    this.#messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:selectedAccountGroupChange',\n      (groupId) => this.#handleSelectedAccountGroupChange(groupId),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupCreated',\n      (group) => this.#handleAccountGroupCreatedOrUpdated(group),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupUpdated',\n      (group) => this.#handleAccountGroupCreatedOrUpdated(group),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupRemoved',\n      (groupId) => this.#handleAccountGroupRemoved(groupId),\n    );\n\n    this.#messenger.subscribe('KeyringController:unlock', () =>\n      this.#handleUnlock(),\n    );\n  }\n\n  /**\n   * Handles changes to the selected account group by forwarding the new\n   * group's accounts to the Snap keyring.\n   *\n   * @param groupId - The ID of the newly selected account group.\n   */\n  #handleSelectedAccountGroupChange(groupId: AccountGroupId | ''): void {\n    this.#forwardSelectedAccounts(\n      groupId,\n      this.#getAccountGroup(groupId)?.accounts,\n    );\n  }\n\n  /**\n   * Handles the keyring controller unlock event by forwarding the currently\n   * selected account group's accounts to the Snap keyring.\n   */\n  #handleUnlock(): void {\n    const groupId = this.#getSelectedAccountGroupId();\n    this.#forwardSelectedAccounts(\n      groupId,\n      this.#getAccountGroup(groupId)?.accounts,\n    );\n  }\n\n  /**\n   * Handles created or updated account groups by forwarding the accounts of the currently\n   * selected account group to the Snap keyring, if the created/updated group is currently selected.\n   *\n   * @param group - The account group being created or updated.\n   */\n  #handleAccountGroupCreatedOrUpdated(group: AccountGroupObject): void {\n    if (group.id === this.#getSelectedAccountGroupId()) {\n      this.#forwardSelectedAccounts(group.id, group.accounts);\n    }\n  }\n\n  /**\n   * Handles removed account groups by forwarding the accounts of the currently\n   * selected account group to the Snap keyring, if the removed group is currently selected.\n   *\n   * @param groupId - The ID of the account group being removed.\n   */\n  #handleAccountGroupRemoved(groupId: AccountGroupId): void {\n    if (groupId === this.#getSelectedAccountGroupId()) {\n      this.#forwardSelectedAccounts(\n        groupId,\n        [], // Clearing accounts since the group is removed\n      );\n    }\n  }\n\n  /**\n   * Initializes the snap account service.\n   *\n   * Seeds the internal set of account-management Snaps from\n   * `SnapController:getRunnableSnaps`, then starts processing lifecycle\n   * events.\n   */\n  async init(): Promise<void> {\n    await this.#tracker.init();\n  }\n\n  /**\n   * Returns the IDs of all currently tracked account-management Snaps —\n   * Snaps that are installed, enabled, not blocked, and have the\n   * `endowment:keyring` permission.\n   *\n   * @returns The IDs of tracked account-management Snaps.\n   */\n  getSnaps(): SnapId[] {\n    return this.#tracker.getSnaps();\n  }\n\n  /**\n   * Ensures everything is ready to use Snap accounts for the given Snap.\n   * 1. Validates that `snapId` is a tracked account-management Snap.\n   * 2. Waits for the Snap platform to be fully started.\n   *\n   * Safe to call concurrently — each step is idempotent or mutex-protected.\n   *\n   * @param snapId - ID of the Snap to ensure readiness for.\n   * @throws If `snapId` is not a tracked account-management Snap.\n   */\n  async ensureReady(snapId: SnapId): Promise<void> {\n    if (!this.#tracker.canUse(snapId)) {\n      throw new Error(`Unknown snap: \"${snapId}\"`);\n    }\n    // Before doing anything with our Snap, we need to make sure the platform\n    // is ready to process requests.\n    await this.#watcher.ensureCanUseSnapPlatform();\n  }\n\n  /**\n   * Atomically gets-or-creates the legacy (v1) Snap keyring — the keyring\n   * associated with {@link KeyringTypes.snap}.\n   *\n   * @returns The existing or newly-created Snap keyring instance.\n   */\n  async getLegacySnapKeyring(): Promise<LegacySnapKeyring> {\n    type Result = {\n      snapKeyring: LegacySnapKeyring;\n    };\n\n    // `KeyringController:withController` forbids returning a direct keyring\n    // reference (it checks the result via `Object.is`), so we smuggle the\n    // instance out wrapped in an object and unwrap it after the call.\n    // NOTE: This violates the abstraction of `KeyringController:withController`, but this\n    // is how we currently interact with the legacy Snap keyring. Once we migrate it to\n    // the Snap keyring v2, we won't be using the same pattern.\n    const result = await this.#messenger.call(\n      'KeyringController:withController',\n      async (controller): Promise<Result> => {\n        let snapKeyring: KeyringEntry['keyring'] | undefined;\n\n        const found = controller.keyrings.find(({ keyring }) =>\n          isLegacySnapKeyring(keyring),\n        );\n        if (found) {\n          snapKeyring = found.keyring;\n        }\n\n        if (!snapKeyring) {\n          const {\n            keyring: newSnapKeyring,\n            metadata: { id },\n          } = await controller.addNewKeyring(KeyringTypes.snap);\n          snapKeyring = newSnapKeyring;\n\n          log(`Legacy Snap keyring created. (\"${id}\")`);\n        }\n\n        // The legacy Snap keyring is not compatible with `EthKeyring`, so we need to cast here.\n        return { snapKeyring } as unknown as Result;\n      },\n    );\n\n    return (result as Result).snapKeyring;\n  }\n\n  /**\n   * Handle a message from a Snap.\n   *\n   * @param snapId - ID of the Snap.\n   * @param message - Message sent by the Snap.\n   * @returns The execution result.\n   */\n  async handleKeyringSnapMessage(\n    snapId: SnapId,\n    message: SnapMessage,\n  ): Promise<Json> {\n    const snapKeyring = await this.getLegacySnapKeyring();\n    return snapKeyring.handleKeyringSnapMessage(snapId, message);\n  }\n\n  /**\n   * Forwards the accounts of the given account group to the Snap keyring.\n   *\n   * @param groupId - The ID of the account group whose accounts should be\n   * forwarded. If empty, this is a no-op.\n   * @param accounts - The accounts to forward. If not defined, this is a no-op.\n   */\n  #forwardSelectedAccounts(\n    groupId: AccountGroupId | '',\n    accounts: AccountId[] | undefined,\n  ): void {\n    if (!groupId) {\n      log(\n        'No selected account group, skipping forwarding selected accounts to Snap keyring.',\n      );\n      return;\n    }\n\n    if (!accounts) {\n      log(\n        `Account group (\"${groupId}\") has no accounts, skipping forwarding selected accounts to Snap keyring.`,\n      );\n      return;\n    }\n\n    const forwardSelectedAccounts = async (): Promise<void> => {\n      if (accounts.length) {\n        log(\n          `Forwarding selected accounts (from \"${groupId}\"): ${accounts.join(', ')}`,\n        );\n      } else {\n        log(`Clearing selected accounts (from \"${groupId}\")`);\n      }\n\n      const snapKeyring = await this.getLegacySnapKeyring();\n      await snapKeyring.setSelectedAccounts(accounts);\n    };\n\n    // There is nothing we can do if forwarding fails. This will auto-recover on the next relevant event.\n    forwardSelectedAccounts().catch((error) => {\n      console.error('Error forwarding selected accounts:', error);\n    });\n  }\n\n  /**\n   * Gets the account group object for the given group ID.\n   *\n   * @param groupId - The ID of the account group.\n   * @returns The account group object, or undefined if the group ID is empty or the group does not exist.\n   */\n  #getAccountGroup(\n    groupId: AccountGroupId | '',\n  ): AccountGroupObject | undefined {\n    if (!groupId) {\n      return undefined;\n    }\n\n    return this.#messenger.call(\n      'AccountTreeController:getAccountGroupObject',\n      groupId,\n    );\n  }\n\n  /**\n   * Gets the currently selected account group ID.\n   *\n   * @returns The currently selected account group ID, or an empty string if\n   * there is no selected account group.\n   */\n  #getSelectedAccountGroupId(): AccountGroupId | '' {\n    return this.#messenger.call(\n      'AccountTreeController:getSelectedAccountGroup',\n    );\n  }\n}\n"]}

package/dist/SnapAccountService.d.cts

@@ -1,6 +1,5 @@
-import { SnapKeyring as LegacySnapKeyring, SnapMessage } from "@metamask/eth-snap-keyring";
+import type { SnapKeyring as LegacySnapKeyring, SnapMessage } from "@metamask/eth-snap-keyring";
 import type { KeyringControllerGetStateAction, KeyringControllerStateChangeEvent, KeyringControllerUnlockEvent, KeyringControllerWithControllerAction } from "@metamask/keyring-controller";
-import { KeyringControllerWithKeyringUnsafeAction } from "@metamask/keyring-controller";
 import type { Messenger } from "@metamask/messenger";
 import type { SnapControllerGetRunnableSnapsAction, SnapControllerGetSnapAction, SnapControllerGetStateAction, SnapControllerSnapBlockedEvent, SnapControllerSnapDisabledEvent, SnapControllerSnapEnabledEvent, SnapControllerSnapInstalledEvent, SnapControllerSnapUnblockedEvent, SnapControllerSnapUninstalledEvent, SnapControllerStateChangeEvent } from "@metamask/snaps-controllers";
 import { SnapId } from "@metamask/snaps-sdk";
@@ -20,7 +19,7 @@ export type SnapAccountServiceActions = SnapAccountServiceEnsureReadyAction | Sn
 /**
  * Actions from other messengers that {@link SnapAccountService} calls.
  */
-type AllowedActions = SnapControllerGetStateAction | SnapControllerGetSnapAction | SnapControllerGetRunnableSnapsAction | KeyringControllerGetStateAction | KeyringControllerWithControllerAction | KeyringControllerWithKeyringUnsafeAction | AccountTreeControllerGetAccountGroupObjectAction | AccountTreeControllerGetSelectedAccountGroupAction;
+type AllowedActions = SnapControllerGetStateAction | SnapControllerGetSnapAction | SnapControllerGetRunnableSnapsAction | KeyringControllerGetStateAction | KeyringControllerWithControllerAction | AccountTreeControllerGetAccountGroupObjectAction | AccountTreeControllerGetSelectedAccountGroupAction;
 /**
  * Events that {@link SnapAccountService} exposes to other consumers.
  */
@@ -64,6 +63,14 @@ export declare class SnapAccountService {
      * @param args.config - Optional service configuration.
      */
     constructor({ messenger, config }: SnapAccountServiceOptions);
+    /**
+     * Initializes the snap account service.
+     *
+     * Seeds the internal set of account-management Snaps from
+     * `SnapController:getRunnableSnaps`, then starts processing lifecycle
+     * events.
+     */
+    init(): Promise<void>;
     /**
      * Returns the IDs of all currently tracked account-management Snaps —
      * Snaps that are installed, enabled, not blocked, and have the

package/dist/SnapAccountService.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"SnapAccountService.d.cts","sourceRoot":"","sources":["../src/SnapAccountService.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,IAAI,iBAAiB,EAChC,WAAW,EACZ,mCAAmC;AAEpC,OAAO,KAAK,EACV,+BAA+B,EAC/B,iCAAiC,EACjC,4BAA4B,EAC5B,qCAAqC,EAEtC,qCAAqC;AAKtC,OAAO,EAAE,wCAAwC,EAAE,qCAAqC;AAGxF,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EACV,oCAAoC,EACpC,2BAA2B,EAC3B,4BAA4B,EAC5B,8BAA8B,EAC9B,+BAA+B,EAC/B,8BAA8B,EAC9B,gCAAgC,EAChC,gCAAgC,EAChC,kCAAkC,EAClC,8BAA8B,EAC/B,oCAAoC;AACrC,OAAO,EAAE,MAAM,EAAE,4BAA4B;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,OAAO,KAAK,EACV,mCAAmC,EACnC,4CAA4C,EAC5C,gCAAgC,EAChC,gDAAgD,EACjD,qDAAiD;AAElD,OAAO,KAAK,EAAE,yBAAyB,EAAE,kCAA8B;AAEvE,OAAO,KAAK,EACV,gDAAgD,EAChD,kDAAkD,EAClD,oDAAoD,EACpD,6CAA6C,EAC7C,6CAA6C,EAC7C,6CAA6C,EAE9C,oBAAgB;AAEjB;;;GAGG;AACH,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAahD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GACjC,mCAAmC,GACnC,gCAAgC,GAChC,4CAA4C,GAC5C,gDAAgD,CAAC;AAErD;;GAEG;AACH,KAAK,cAAc,GACf,4BAA4B,GAC5B,2BAA2B,GAC3B,oCAAoC,GACpC,+BAA+B,GAC/B,qCAAqC,GACrC,wCAAwC,GACxC,gDAAgD,GAChD,kDAAkD,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAE7C;;GAEG;AACH,KAAK,aAAa,GACd,8BAA8B,GAC9B,gCAAgC,GAChC,8BAA8B,GAC9B,+BAA+B,GAC/B,8BAA8B,GAC9B,gCAAgC,GAChC,kCAAkC,GAClC,iCAAiC,GACjC,4BAA4B,GAC5B,oDAAoD,GACpD,6CAA6C,GAC7C,6CAA6C,GAC7C,6CAA6C,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,SAAS,CACjD,OAAO,WAAW,EAClB,yBAAyB,GAAG,cAAc,EAC1C,wBAAwB,GAAG,aAAa,CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,mBAAmB,CAAC,EAAE,yBAAyB,CAAC;CACjD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,2BAA2B,CAAC;IACvC,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACnC,CAAC;AAeF;;GAEG;AACH,qBAAa,kBAAkB;;IAC7B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAC;IAQlC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,yBAAyB;IA2F5D;;;;;;OAMG;IACH,QAAQ,IAAI,MAAM,EAAE;IAIpB;;;;;;;;;OASG;IACG,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD;;;;;OAKG;IACG,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAmFxD;;;;;;OAMG;IACG,wBAAwB,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;CA0HjB"}
+{"version":3,"file":"SnapAccountService.d.cts","sourceRoot":"","sources":["../src/SnapAccountService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,IAAI,iBAAiB,EAChC,WAAW,EACZ,mCAAmC;AACpC,OAAO,KAAK,EACV,+BAA+B,EAC/B,iCAAiC,EACjC,4BAA4B,EAC5B,qCAAqC,EAEtC,qCAAqC;AAGtC,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EACV,oCAAoC,EACpC,2BAA2B,EAC3B,4BAA4B,EAC5B,8BAA8B,EAC9B,+BAA+B,EAC/B,8BAA8B,EAC9B,gCAAgC,EAChC,gCAAgC,EAChC,kCAAkC,EAClC,8BAA8B,EAC/B,oCAAoC;AACrC,OAAO,EAAE,MAAM,EAAE,4BAA4B;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,OAAO,KAAK,EACV,mCAAmC,EACnC,4CAA4C,EAC5C,gCAAgC,EAChC,gDAAgD,EACjD,qDAAiD;AAElD,OAAO,KAAK,EAAE,yBAAyB,EAAE,kCAA8B;AAEvE,OAAO,KAAK,EACV,gDAAgD,EAChD,kDAAkD,EAClD,oDAAoD,EACpD,6CAA6C,EAC7C,6CAA6C,EAC7C,6CAA6C,EAE9C,oBAAgB;AAEjB;;;GAGG;AACH,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAahD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GACjC,mCAAmC,GACnC,gCAAgC,GAChC,4CAA4C,GAC5C,gDAAgD,CAAC;AAErD;;GAEG;AACH,KAAK,cAAc,GACf,4BAA4B,GAC5B,2BAA2B,GAC3B,oCAAoC,GACpC,+BAA+B,GAC/B,qCAAqC,GACrC,gDAAgD,GAChD,kDAAkD,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAE7C;;GAEG;AACH,KAAK,aAAa,GACd,8BAA8B,GAC9B,gCAAgC,GAChC,8BAA8B,GAC9B,+BAA+B,GAC/B,8BAA8B,GAC9B,gCAAgC,GAChC,kCAAkC,GAClC,iCAAiC,GACjC,4BAA4B,GAC5B,oDAAoD,GACpD,6CAA6C,GAC7C,6CAA6C,GAC7C,6CAA6C,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,SAAS,CACjD,OAAO,WAAW,EAClB,yBAAyB,GAAG,cAAc,EAC1C,wBAAwB,GAAG,aAAa,CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,mBAAmB,CAAC,EAAE,yBAAyB,CAAC;CACjD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,2BAA2B,CAAC;IACvC,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACnC,CAAC;AAeF;;GAEG;AACH,qBAAa,kBAAkB;;IAC7B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAC;IAQlC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,yBAAyB;IA2F5D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;OAMG;IACH,QAAQ,IAAI,MAAM,EAAE;IAIpB;;;;;;;;;OASG;IACG,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD;;;;;OAKG;IACG,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAyCxD;;;;;;OAMG;IACG,wBAAwB,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;CA+EjB"}

package/dist/SnapAccountService.d.mts

@@ -1,6 +1,5 @@
-import { SnapKeyring as LegacySnapKeyring, SnapMessage } from "@metamask/eth-snap-keyring";
+import type { SnapKeyring as LegacySnapKeyring, SnapMessage } from "@metamask/eth-snap-keyring";
 import type { KeyringControllerGetStateAction, KeyringControllerStateChangeEvent, KeyringControllerUnlockEvent, KeyringControllerWithControllerAction } from "@metamask/keyring-controller";
-import { KeyringControllerWithKeyringUnsafeAction } from "@metamask/keyring-controller";
 import type { Messenger } from "@metamask/messenger";
 import type { SnapControllerGetRunnableSnapsAction, SnapControllerGetSnapAction, SnapControllerGetStateAction, SnapControllerSnapBlockedEvent, SnapControllerSnapDisabledEvent, SnapControllerSnapEnabledEvent, SnapControllerSnapInstalledEvent, SnapControllerSnapUnblockedEvent, SnapControllerSnapUninstalledEvent, SnapControllerStateChangeEvent } from "@metamask/snaps-controllers";
 import { SnapId } from "@metamask/snaps-sdk";
@@ -20,7 +19,7 @@ export type SnapAccountServiceActions = SnapAccountServiceEnsureReadyAction | Sn
 /**
  * Actions from other messengers that {@link SnapAccountService} calls.
  */
-type AllowedActions = SnapControllerGetStateAction | SnapControllerGetSnapAction | SnapControllerGetRunnableSnapsAction | KeyringControllerGetStateAction | KeyringControllerWithControllerAction | KeyringControllerWithKeyringUnsafeAction | AccountTreeControllerGetAccountGroupObjectAction | AccountTreeControllerGetSelectedAccountGroupAction;
+type AllowedActions = SnapControllerGetStateAction | SnapControllerGetSnapAction | SnapControllerGetRunnableSnapsAction | KeyringControllerGetStateAction | KeyringControllerWithControllerAction | AccountTreeControllerGetAccountGroupObjectAction | AccountTreeControllerGetSelectedAccountGroupAction;
 /**
  * Events that {@link SnapAccountService} exposes to other consumers.
  */
@@ -64,6 +63,14 @@ export declare class SnapAccountService {
      * @param args.config - Optional service configuration.
      */
     constructor({ messenger, config }: SnapAccountServiceOptions);
+    /**
+     * Initializes the snap account service.
+     *
+     * Seeds the internal set of account-management Snaps from
+     * `SnapController:getRunnableSnaps`, then starts processing lifecycle
+     * events.
+     */
+    init(): Promise<void>;
     /**
      * Returns the IDs of all currently tracked account-management Snaps —
      * Snaps that are installed, enabled, not blocked, and have the

package/dist/SnapAccountService.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"SnapAccountService.d.mts","sourceRoot":"","sources":["../src/SnapAccountService.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,IAAI,iBAAiB,EAChC,WAAW,EACZ,mCAAmC;AAEpC,OAAO,KAAK,EACV,+BAA+B,EAC/B,iCAAiC,EACjC,4BAA4B,EAC5B,qCAAqC,EAEtC,qCAAqC;AAKtC,OAAO,EAAE,wCAAwC,EAAE,qCAAqC;AAGxF,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EACV,oCAAoC,EACpC,2BAA2B,EAC3B,4BAA4B,EAC5B,8BAA8B,EAC9B,+BAA+B,EAC/B,8BAA8B,EAC9B,gCAAgC,EAChC,gCAAgC,EAChC,kCAAkC,EAClC,8BAA8B,EAC/B,oCAAoC;AACrC,OAAO,EAAE,MAAM,EAAE,4BAA4B;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,OAAO,KAAK,EACV,mCAAmC,EACnC,4CAA4C,EAC5C,gCAAgC,EAChC,gDAAgD,EACjD,qDAAiD;AAElD,OAAO,KAAK,EAAE,yBAAyB,EAAE,kCAA8B;AAEvE,OAAO,KAAK,EACV,gDAAgD,EAChD,kDAAkD,EAClD,oDAAoD,EACpD,6CAA6C,EAC7C,6CAA6C,EAC7C,6CAA6C,EAE9C,oBAAgB;AAEjB;;;GAGG;AACH,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAahD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GACjC,mCAAmC,GACnC,gCAAgC,GAChC,4CAA4C,GAC5C,gDAAgD,CAAC;AAErD;;GAEG;AACH,KAAK,cAAc,GACf,4BAA4B,GAC5B,2BAA2B,GAC3B,oCAAoC,GACpC,+BAA+B,GAC/B,qCAAqC,GACrC,wCAAwC,GACxC,gDAAgD,GAChD,kDAAkD,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAE7C;;GAEG;AACH,KAAK,aAAa,GACd,8BAA8B,GAC9B,gCAAgC,GAChC,8BAA8B,GAC9B,+BAA+B,GAC/B,8BAA8B,GAC9B,gCAAgC,GAChC,kCAAkC,GAClC,iCAAiC,GACjC,4BAA4B,GAC5B,oDAAoD,GACpD,6CAA6C,GAC7C,6CAA6C,GAC7C,6CAA6C,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,SAAS,CACjD,OAAO,WAAW,EAClB,yBAAyB,GAAG,cAAc,EAC1C,wBAAwB,GAAG,aAAa,CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,mBAAmB,CAAC,EAAE,yBAAyB,CAAC;CACjD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,2BAA2B,CAAC;IACvC,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACnC,CAAC;AAeF;;GAEG;AACH,qBAAa,kBAAkB;;IAC7B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAC;IAQlC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,yBAAyB;IA2F5D;;;;;;OAMG;IACH,QAAQ,IAAI,MAAM,EAAE;IAIpB;;;;;;;;;OASG;IACG,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD;;;;;OAKG;IACG,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAmFxD;;;;;;OAMG;IACG,wBAAwB,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;CA0HjB"}
+{"version":3,"file":"SnapAccountService.d.mts","sourceRoot":"","sources":["../src/SnapAccountService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,IAAI,iBAAiB,EAChC,WAAW,EACZ,mCAAmC;AACpC,OAAO,KAAK,EACV,+BAA+B,EAC/B,iCAAiC,EACjC,4BAA4B,EAC5B,qCAAqC,EAEtC,qCAAqC;AAGtC,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EACV,oCAAoC,EACpC,2BAA2B,EAC3B,4BAA4B,EAC5B,8BAA8B,EAC9B,+BAA+B,EAC/B,8BAA8B,EAC9B,gCAAgC,EAChC,gCAAgC,EAChC,kCAAkC,EAClC,8BAA8B,EAC/B,oCAAoC;AACrC,OAAO,EAAE,MAAM,EAAE,4BAA4B;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,OAAO,KAAK,EACV,mCAAmC,EACnC,4CAA4C,EAC5C,gCAAgC,EAChC,gDAAgD,EACjD,qDAAiD;AAElD,OAAO,KAAK,EAAE,yBAAyB,EAAE,kCAA8B;AAEvE,OAAO,KAAK,EACV,gDAAgD,EAChD,kDAAkD,EAClD,oDAAoD,EACpD,6CAA6C,EAC7C,6CAA6C,EAC7C,6CAA6C,EAE9C,oBAAgB;AAEjB;;;GAGG;AACH,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAahD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GACjC,mCAAmC,GACnC,gCAAgC,GAChC,4CAA4C,GAC5C,gDAAgD,CAAC;AAErD;;GAEG;AACH,KAAK,cAAc,GACf,4BAA4B,GAC5B,2BAA2B,GAC3B,oCAAoC,GACpC,+BAA+B,GAC/B,qCAAqC,GACrC,gDAAgD,GAChD,kDAAkD,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAE7C;;GAEG;AACH,KAAK,aAAa,GACd,8BAA8B,GAC9B,gCAAgC,GAChC,8BAA8B,GAC9B,+BAA+B,GAC/B,8BAA8B,GAC9B,gCAAgC,GAChC,kCAAkC,GAClC,iCAAiC,GACjC,4BAA4B,GAC5B,oDAAoD,GACpD,6CAA6C,GAC7C,6CAA6C,GAC7C,6CAA6C,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,SAAS,CACjD,OAAO,WAAW,EAClB,yBAAyB,GAAG,cAAc,EAC1C,wBAAwB,GAAG,aAAa,CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,mBAAmB,CAAC,EAAE,yBAAyB,CAAC;CACjD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,2BAA2B,CAAC;IACvC,MAAM,CAAC,EAAE,wBAAwB,CAAC;CACnC,CAAC;AAeF;;GAEG;AACH,qBAAa,kBAAkB;;IAC7B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAC;IAQlC;;;;;;OAMG;gBACS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,yBAAyB;IA2F5D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;OAMG;IACH,QAAQ,IAAI,MAAM,EAAE;IAIpB;;;;;;;;;OASG;IACG,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD;;;;;OAKG;IACG,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAyCxD;;;;;;OAMG;IACG,wBAAwB,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;CA+EjB"}

package/dist/SnapAccountService.mjs

@@ -9,11 +9,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SnapAccountService_instances, _SnapAccountService_messenger, _SnapAccountService_watcher, _SnapAccountService_tracker, _SnapAccountService_handleSelectedAccountGroupChange, _SnapAccountService_handleUnlock, _SnapAccountService_handleAccountGroupCreatedOrUpdated, _SnapAccountService_handleAccountGroupRemoved, _SnapAccountService_getLegacySnapKeyringIfAvailable, _SnapAccountService_forwardSelectedAccounts, _SnapAccountService_getAccountGroup, _SnapAccountService_getSelectedAccountGroupId;
-import { SnapKeyring as LegacySnapKeyring } from "@metamask/eth-snap-keyring";
-import { KeyringEvent } from "@metamask/keyring-api";
-import { isKeyringNotFoundError, KeyringTypes } from "@metamask/keyring-controller";
-import { SnapManageAccountsMethod } from "@metamask/keyring-snap-sdk";
+var _SnapAccountService_instances, _SnapAccountService_messenger, _SnapAccountService_watcher, _SnapAccountService_tracker, _SnapAccountService_handleSelectedAccountGroupChange, _SnapAccountService_handleUnlock, _SnapAccountService_handleAccountGroupCreatedOrUpdated, _SnapAccountService_handleAccountGroupRemoved, _SnapAccountService_forwardSelectedAccounts, _SnapAccountService_getAccountGroup, _SnapAccountService_getSelectedAccountGroupId;
+import { KeyringTypes } from "@metamask/keyring-controller";
 import { projectLogger as log } from "./logger.mjs";
 import { SnapPlatformWatcher } from "./SnapPlatformWatcher.mjs";
 import { SnapTracker } from "./SnapTracker.mjs";
@@ -69,6 +66,16 @@ export class SnapAccountService {
         __classPrivateFieldGet(this, _SnapAccountService_messenger, "f").subscribe('AccountTreeController:accountGroupRemoved', (groupId) => __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_handleAccountGroupRemoved).call(this, groupId));
         __classPrivateFieldGet(this, _SnapAccountService_messenger, "f").subscribe('KeyringController:unlock', () => __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_handleUnlock).call(this));
     }
+    /**
+     * Initializes the snap account service.
+     *
+     * Seeds the internal set of account-management Snaps from
+     * `SnapController:getRunnableSnaps`, then starts processing lifecycle
+     * events.
+     */
+    async init() {
+        await __classPrivateFieldGet(this, _SnapAccountService_tracker, "f").init();
+    }
     /**
      * Returns the IDs of all currently tracked account-management Snaps —
      * Snaps that are installed, enabled, not blocked, and have the
@@ -104,14 +111,6 @@ export class SnapAccountService {
      * @returns The existing or newly-created Snap keyring instance.
      */
     async getLegacySnapKeyring() {
-        // This is a fast-path for the common case where the keyring already exists, to avoid the
-        // overhead of acquiring the `KeyringController` mutex if we don't need to.
-        // NOTE: If it doesn't exist, we'll create it **safely** with `:withController` (which was
-        // not the case with the previous client's implementation).
-        const exists = await __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_getLegacySnapKeyringIfAvailable).call(this);
-        if (exists) {
-            return exists;
-        }
         // `KeyringController:withController` forbids returning a direct keyring
         // reference (it checks the result via `Object.is`), so we smuggle the
         // instance out wrapped in an object and unwrap it after the call.
@@ -142,31 +141,7 @@ export class SnapAccountService {
      * @returns The execution result.
      */
     async handleKeyringSnapMessage(snapId, message) {
-        let snapKeyring = await __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_getLegacySnapKeyringIfAvailable).call(this);
-        // Handle specific methods first.
-        if (message.method === SnapManageAccountsMethod.GetSelectedAccounts) {
-            if (snapKeyring) {
-                // The legacy Snap keyring already maintain a local list of selected accounts per Snaps, so we
-                // just delegate the call.
-                return snapKeyring.handleKeyringSnapMessage(snapId, message);
-            }
-            // Some Snaps might be using `getSelectedAccounts` early in their lifecycle, before the keyring is created. So we
-            // do not throw in that case to avoid messing up their lifecycle.
-            return [];
-        }
-        const event = message.method; // We assume the Snap platform always sends a valid `KeyringEvent` here.
-        log(`Forwarding message "${event}" from Snap "${snapId}" to its keyring...`);
-        // We can create a new keyring if the message is an AccountCreated event.
-        const isAccountCreatedMessage = event === KeyringEvent.AccountCreated;
-        // Create the Snap keyring if it doesn't exist yet (in an atomic way). We cannot assume
-        // the keyring exists (e.g for the MMI Snap).
-        // NOTE: We only auto-create it for v1 account creation flows.
-        if (isAccountCreatedMessage && !snapKeyring) {
-            snapKeyring = await this.getLegacySnapKeyring();
-        }
-        if (!snapKeyring) {
-            throw new Error(`Legacy Snap keyring does not exist yet for snap "${snapId}".`);
-        }
+        const snapKeyring = await this.getLegacySnapKeyring();
         return snapKeyring.handleKeyringSnapMessage(snapId, message);
     }
 }
@@ -183,27 +158,6 @@ _SnapAccountService_messenger = new WeakMap(), _SnapAccountService_watcher = new
     if (groupId === __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_getSelectedAccountGroupId).call(this)) {
         __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_forwardSelectedAccounts).call(this, groupId, []);
     }
-}, _SnapAccountService_getLegacySnapKeyringIfAvailable = 
-/**
- * Gets the legacy (v1) Snap keyring but do not auto-create it if it doesn't exist.
- *
- * @returns The existing Snap keyring instance, or undefined if it doesn't exist.
- */
-async function _SnapAccountService_getLegacySnapKeyringIfAvailable() {
-    try {
-        const result = await __classPrivateFieldGet(this, _SnapAccountService_messenger, "f").call('KeyringController:withKeyringUnsafe', { filter: isLegacySnapKeyring }, async ({ keyring }) => {
-            // The legacy Snap keyring is not compatible with `EthKeyring`, so we need to cast here.
-            return { snapKeyring: keyring };
-        });
-        return result.snapKeyring;
-    }
-    catch (error) {
-        if (isKeyringNotFoundError(error)) {
-            log('Legacy Snap keyring not available yet.');
-            return undefined;
-        }
-        throw error;
-    }
 }, _SnapAccountService_forwardSelectedAccounts = function _SnapAccountService_forwardSelectedAccounts(groupId, accounts) {
     if (!groupId) {
         log('No selected account group, skipping forwarding selected accounts to Snap keyring.');
@@ -220,11 +174,7 @@ async function _SnapAccountService_getLegacySnapKeyringIfAvailable() {
         else {
             log(`Clearing selected accounts (from "${groupId}")`);
         }
-        const snapKeyring = await __classPrivateFieldGet(this, _SnapAccountService_instances, "m", _SnapAccountService_getLegacySnapKeyringIfAvailable).call(this);
-        if (!snapKeyring) {
-            log('No legacy Snap keyring available, skipping forwarding selected accounts.');
-            return;
-        }
+        const snapKeyring = await this.getLegacySnapKeyring();
         await snapKeyring.setSelectedAccounts(accounts);
     };
     // There is nothing we can do if forwarding fails. This will auto-recover on the next relevant event.

package/dist/SnapAccountService.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"SnapAccountService.mjs","sourceRoot":"","sources":["../src/SnapAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import { AccountGroupId } from '@metamask/account-api';\nimport {\n  SnapKeyring as LegacySnapKeyring,\n  SnapMessage,\n} from '@metamask/eth-snap-keyring';\nimport { KeyringEvent } from '@metamask/keyring-api';\nimport type {\n  KeyringControllerGetStateAction,\n  KeyringControllerStateChangeEvent,\n  KeyringControllerUnlockEvent,\n  KeyringControllerWithControllerAction,\n  KeyringEntry,\n} from '@metamask/keyring-controller';\nimport {\n  isKeyringNotFoundError,\n  KeyringTypes,\n} from '@metamask/keyring-controller';\nimport { KeyringControllerWithKeyringUnsafeAction } from '@metamask/keyring-controller';\nimport { SnapManageAccountsMethod } from '@metamask/keyring-snap-sdk';\nimport type { AccountId, BaseKeyring } from '@metamask/keyring-utils';\nimport type { Messenger } from '@metamask/messenger';\nimport type {\n  SnapControllerGetRunnableSnapsAction,\n  SnapControllerGetSnapAction,\n  SnapControllerGetStateAction,\n  SnapControllerSnapBlockedEvent,\n  SnapControllerSnapDisabledEvent,\n  SnapControllerSnapEnabledEvent,\n  SnapControllerSnapInstalledEvent,\n  SnapControllerSnapUnblockedEvent,\n  SnapControllerSnapUninstalledEvent,\n  SnapControllerStateChangeEvent,\n} from '@metamask/snaps-controllers';\nimport { SnapId } from '@metamask/snaps-sdk';\nimport type { Json } from '@metamask/utils';\n\nimport { projectLogger as log } from './logger';\nimport type {\n  SnapAccountServiceEnsureReadyAction,\n  SnapAccountServiceGetLegacySnapKeyringAction,\n  SnapAccountServiceGetSnapsAction,\n  SnapAccountServiceHandleKeyringSnapMessageAction,\n} from './SnapAccountService-method-action-types';\nimport { SnapPlatformWatcher } from './SnapPlatformWatcher';\nimport type { SnapPlatformWatcherConfig } from './SnapPlatformWatcher';\nimport { SnapTracker } from './SnapTracker';\nimport type {\n  AccountTreeControllerGetAccountGroupObjectAction,\n  AccountTreeControllerGetSelectedAccountGroupAction,\n  AccountTreeControllerSelectedAccountGroupChangeEvent,\n  AccountTreeControllerAccountGroupCreatedEvent,\n  AccountTreeControllerAccountGroupUpdatedEvent,\n  AccountTreeControllerAccountGroupRemovedEvent,\n  AccountGroupObject,\n} from './types';\n\n/**\n * The name of the {@link SnapAccountService}, used to namespace the service's\n * actions and events.\n */\nexport const serviceName = 'SnapAccountService';\n\n/**\n * All of the methods within {@link SnapAccountService} that are exposed via\n * the messenger.\n */\nconst MESSENGER_EXPOSED_METHODS = [\n  'ensureReady',\n  'getSnaps',\n  'getLegacySnapKeyring',\n  'handleKeyringSnapMessage',\n] as const;\n\n/**\n * Actions that {@link SnapAccountService} exposes to other consumers.\n */\nexport type SnapAccountServiceActions =\n  | SnapAccountServiceEnsureReadyAction\n  | SnapAccountServiceGetSnapsAction\n  | SnapAccountServiceGetLegacySnapKeyringAction\n  | SnapAccountServiceHandleKeyringSnapMessageAction;\n\n/**\n * Actions from other messengers that {@link SnapAccountService} calls.\n */\ntype AllowedActions =\n  | SnapControllerGetStateAction\n  | SnapControllerGetSnapAction\n  | SnapControllerGetRunnableSnapsAction\n  | KeyringControllerGetStateAction\n  | KeyringControllerWithControllerAction\n  | KeyringControllerWithKeyringUnsafeAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetSelectedAccountGroupAction;\n\n/**\n * Events that {@link SnapAccountService} exposes to other consumers.\n */\nexport type SnapAccountServiceEvents = never;\n\n/**\n * Events from other messengers that {@link SnapAccountService} subscribes to.\n */\ntype AllowedEvents =\n  | SnapControllerStateChangeEvent\n  | SnapControllerSnapInstalledEvent\n  | SnapControllerSnapEnabledEvent\n  | SnapControllerSnapDisabledEvent\n  | SnapControllerSnapBlockedEvent\n  | SnapControllerSnapUnblockedEvent\n  | SnapControllerSnapUninstalledEvent\n  | KeyringControllerStateChangeEvent\n  | KeyringControllerUnlockEvent\n  | AccountTreeControllerSelectedAccountGroupChangeEvent\n  | AccountTreeControllerAccountGroupCreatedEvent\n  | AccountTreeControllerAccountGroupUpdatedEvent\n  | AccountTreeControllerAccountGroupRemovedEvent;\n\n/**\n * The messenger which is restricted to actions and events accessed by\n * {@link SnapAccountService}.\n */\nexport type SnapAccountServiceMessenger = Messenger<\n  typeof serviceName,\n  SnapAccountServiceActions | AllowedActions,\n  SnapAccountServiceEvents | AllowedEvents\n>;\n\n/**\n * Configuration for the {@link SnapAccountService}.\n */\nexport type SnapAccountServiceConfig = {\n  snapPlatformWatcher?: SnapPlatformWatcherConfig;\n};\n\n/**\n * The options that {@link SnapAccountService} takes.\n */\nexport type SnapAccountServiceOptions = {\n  messenger: SnapAccountServiceMessenger;\n  config?: SnapAccountServiceConfig;\n};\n\n/**\n * Checks if a given keyring is a Snap keyring (v2).\n *\n * @param keyring - The keyring to check.\n * @param keyring.type - The type of the keyring.\n * @returns `true` if the keyring is a Snap keyring (v2), `false` otherwise.\n */\nfunction isLegacySnapKeyring(keyring: {\n  type: BaseKeyring['type'];\n}): keyring is LegacySnapKeyring {\n  return keyring.type === KeyringTypes.snap;\n}\n\n/**\n * Service responsible for managing account management snaps.\n */\nexport class SnapAccountService {\n  /**\n   * The name of the service.\n   */\n  readonly name: typeof serviceName;\n\n  readonly #messenger: SnapAccountServiceMessenger;\n\n  readonly #watcher: SnapPlatformWatcher;\n\n  readonly #tracker: SnapTracker;\n\n  /**\n   * Constructs a new {@link SnapAccountService}.\n   *\n   * @param args - The constructor arguments.\n   * @param args.messenger - The messenger suited for this service.\n   * @param args.config - Optional service configuration.\n   */\n  constructor({ messenger, config }: SnapAccountServiceOptions) {\n    this.name = serviceName;\n    this.#messenger = messenger;\n    this.#watcher = new SnapPlatformWatcher(\n      messenger,\n      config?.snapPlatformWatcher,\n    );\n    this.#tracker = new SnapTracker(messenger);\n\n    this.#messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:selectedAccountGroupChange',\n      (groupId) => this.#handleSelectedAccountGroupChange(groupId),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupCreated',\n      (group) => this.#handleAccountGroupCreatedOrUpdated(group),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupUpdated',\n      (group) => this.#handleAccountGroupCreatedOrUpdated(group),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupRemoved',\n      (groupId) => this.#handleAccountGroupRemoved(groupId),\n    );\n\n    this.#messenger.subscribe('KeyringController:unlock', () =>\n      this.#handleUnlock(),\n    );\n  }\n\n  /**\n   * Handles changes to the selected account group by forwarding the new\n   * group's accounts to the Snap keyring.\n   *\n   * @param groupId - The ID of the newly selected account group.\n   */\n  #handleSelectedAccountGroupChange(groupId: AccountGroupId | ''): void {\n    this.#forwardSelectedAccounts(\n      groupId,\n      this.#getAccountGroup(groupId)?.accounts,\n    );\n  }\n\n  /**\n   * Handles the keyring controller unlock event by forwarding the currently\n   * selected account group's accounts to the Snap keyring.\n   */\n  #handleUnlock(): void {\n    const groupId = this.#getSelectedAccountGroupId();\n    this.#forwardSelectedAccounts(\n      groupId,\n      this.#getAccountGroup(groupId)?.accounts,\n    );\n  }\n\n  /**\n   * Handles created or updated account groups by forwarding the accounts of the currently\n   * selected account group to the Snap keyring, if the created/updated group is currently selected.\n   *\n   * @param group - The account group being created or updated.\n   */\n  #handleAccountGroupCreatedOrUpdated(group: AccountGroupObject): void {\n    if (group.id === this.#getSelectedAccountGroupId()) {\n      this.#forwardSelectedAccounts(group.id, group.accounts);\n    }\n  }\n\n  /**\n   * Handles removed account groups by forwarding the accounts of the currently\n   * selected account group to the Snap keyring, if the removed group is currently selected.\n   *\n   * @param groupId - The ID of the account group being removed.\n   */\n  #handleAccountGroupRemoved(groupId: AccountGroupId): void {\n    if (groupId === this.#getSelectedAccountGroupId()) {\n      this.#forwardSelectedAccounts(\n        groupId,\n        [], // Clearing accounts since the group is removed\n      );\n    }\n  }\n\n  /**\n   * Returns the IDs of all currently tracked account-management Snaps —\n   * Snaps that are installed, enabled, not blocked, and have the\n   * `endowment:keyring` permission.\n   *\n   * @returns The IDs of tracked account-management Snaps.\n   */\n  getSnaps(): SnapId[] {\n    return this.#tracker.getSnaps();\n  }\n\n  /**\n   * Ensures everything is ready to use Snap accounts for the given Snap.\n   * 1. Validates that `snapId` is a tracked account-management Snap.\n   * 2. Waits for the Snap platform to be fully started.\n   *\n   * Safe to call concurrently — each step is idempotent or mutex-protected.\n   *\n   * @param snapId - ID of the Snap to ensure readiness for.\n   * @throws If `snapId` is not a tracked account-management Snap.\n   */\n  async ensureReady(snapId: SnapId): Promise<void> {\n    if (!this.#tracker.canUse(snapId)) {\n      throw new Error(`Unknown snap: \"${snapId}\"`);\n    }\n    // Before doing anything with our Snap, we need to make sure the platform\n    // is ready to process requests.\n    await this.#watcher.ensureCanUseSnapPlatform();\n  }\n\n  /**\n   * Atomically gets-or-creates the legacy (v1) Snap keyring — the keyring\n   * associated with {@link KeyringTypes.snap}.\n   *\n   * @returns The existing or newly-created Snap keyring instance.\n   */\n  async getLegacySnapKeyring(): Promise<LegacySnapKeyring> {\n    type Result = {\n      snapKeyring: LegacySnapKeyring;\n    };\n\n    // This is a fast-path for the common case where the keyring already exists, to avoid the\n    // overhead of acquiring the `KeyringController` mutex if we don't need to.\n    // NOTE: If it doesn't exist, we'll create it **safely** with `:withController` (which was\n    // not the case with the previous client's implementation).\n    const exists = await this.#getLegacySnapKeyringIfAvailable();\n    if (exists) {\n      return exists;\n    }\n\n    // `KeyringController:withController` forbids returning a direct keyring\n    // reference (it checks the result via `Object.is`), so we smuggle the\n    // instance out wrapped in an object and unwrap it after the call.\n    // NOTE: This violates the abstraction of `KeyringController:withController`, but this\n    // is how we currently interact with the legacy Snap keyring. Once we migrate it to\n    // the Snap keyring v2, we won't be using the same pattern.\n    const result = await this.#messenger.call(\n      'KeyringController:withController',\n      async (controller): Promise<Result> => {\n        let snapKeyring: KeyringEntry['keyring'] | undefined;\n\n        const found = controller.keyrings.find(({ keyring }) =>\n          isLegacySnapKeyring(keyring),\n        );\n        if (found) {\n          snapKeyring = found.keyring;\n        }\n\n        if (!snapKeyring) {\n          const {\n            keyring: newSnapKeyring,\n            metadata: { id },\n          } = await controller.addNewKeyring(KeyringTypes.snap);\n          snapKeyring = newSnapKeyring;\n\n          log(`Legacy Snap keyring created. (\"${id}\")`);\n        }\n\n        // The legacy Snap keyring is not compatible with `EthKeyring`, so we need to cast here.\n        return { snapKeyring } as unknown as Result;\n      },\n    );\n\n    return (result as Result).snapKeyring;\n  }\n\n  /**\n   * Gets the legacy (v1) Snap keyring but do not auto-create it if it doesn't exist.\n   *\n   * @returns The existing Snap keyring instance, or undefined if it doesn't exist.\n   */\n  async #getLegacySnapKeyringIfAvailable(): Promise<\n    LegacySnapKeyring | undefined\n  > {\n    type Result = {\n      snapKeyring: LegacySnapKeyring;\n    };\n\n    try {\n      const result = await this.#messenger.call(\n        'KeyringController:withKeyringUnsafe',\n        { filter: isLegacySnapKeyring },\n        async ({ keyring }): Promise<Result> => {\n          // The legacy Snap keyring is not compatible with `EthKeyring`, so we need to cast here.\n          return { snapKeyring: keyring } as unknown as Result;\n        },\n      );\n\n      return (result as Result).snapKeyring;\n    } catch (error) {\n      if (isKeyringNotFoundError(error)) {\n        log('Legacy Snap keyring not available yet.');\n        return undefined;\n      }\n\n      throw error;\n    }\n  }\n\n  /**\n   * Handle a message from a Snap.\n   *\n   * @param snapId - ID of the Snap.\n   * @param message - Message sent by the Snap.\n   * @returns The execution result.\n   */\n  async handleKeyringSnapMessage(\n    snapId: SnapId,\n    message: SnapMessage,\n  ): Promise<Json> {\n    let snapKeyring: LegacySnapKeyring | undefined =\n      await this.#getLegacySnapKeyringIfAvailable();\n\n    // Handle specific methods first.\n    if (message.method === SnapManageAccountsMethod.GetSelectedAccounts) {\n      if (snapKeyring) {\n        // The legacy Snap keyring already maintain a local list of selected accounts per Snaps, so we\n        // just delegate the call.\n        return snapKeyring.handleKeyringSnapMessage(snapId, message);\n      }\n\n      // Some Snaps might be using `getSelectedAccounts` early in their lifecycle, before the keyring is created. So we\n      // do not throw in that case to avoid messing up their lifecycle.\n      return [];\n    }\n\n    const event = message.method as KeyringEvent; // We assume the Snap platform always sends a valid `KeyringEvent` here.\n    log(\n      `Forwarding message \"${event}\" from Snap \"${snapId}\" to its keyring...`,\n    );\n\n    // We can create a new keyring if the message is an AccountCreated event.\n    const isAccountCreatedMessage = event === KeyringEvent.AccountCreated;\n\n    // Create the Snap keyring if it doesn't exist yet (in an atomic way). We cannot assume\n    // the keyring exists (e.g for the MMI Snap).\n    // NOTE: We only auto-create it for v1 account creation flows.\n    if (isAccountCreatedMessage && !snapKeyring) {\n      snapKeyring = await this.getLegacySnapKeyring();\n    }\n\n    if (!snapKeyring) {\n      throw new Error(\n        `Legacy Snap keyring does not exist yet for snap \"${snapId}\".`,\n      );\n    }\n\n    return snapKeyring.handleKeyringSnapMessage(snapId, message);\n  }\n\n  /**\n   * Forwards the accounts of the given account group to the Snap keyring.\n   *\n   * @param groupId - The ID of the account group whose accounts should be\n   * forwarded. If empty, this is a no-op.\n   * @param accounts - The accounts to forward. If not defined, this is a no-op.\n   */\n  #forwardSelectedAccounts(\n    groupId: AccountGroupId | '',\n    accounts: AccountId[] | undefined,\n  ): void {\n    if (!groupId) {\n      log(\n        'No selected account group, skipping forwarding selected accounts to Snap keyring.',\n      );\n      return;\n    }\n\n    if (!accounts) {\n      log(\n        `Account group (\"${groupId}\") has no accounts, skipping forwarding selected accounts to Snap keyring.`,\n      );\n      return;\n    }\n\n    const forwardSelectedAccounts = async (): Promise<void> => {\n      if (accounts.length) {\n        log(\n          `Forwarding selected accounts (from \"${groupId}\"): ${accounts.join(', ')}`,\n        );\n      } else {\n        log(`Clearing selected accounts (from \"${groupId}\")`);\n      }\n\n      const snapKeyring = await this.#getLegacySnapKeyringIfAvailable();\n      if (!snapKeyring) {\n        log(\n          'No legacy Snap keyring available, skipping forwarding selected accounts.',\n        );\n        return;\n      }\n\n      await snapKeyring.setSelectedAccounts(accounts);\n    };\n\n    // There is nothing we can do if forwarding fails. This will auto-recover on the next relevant event.\n    forwardSelectedAccounts().catch((error) => {\n      console.error('Error forwarding selected accounts:', error);\n    });\n  }\n\n  /**\n   * Gets the account group object for the given group ID.\n   *\n   * @param groupId - The ID of the account group.\n   * @returns The account group object, or undefined if the group ID is empty or the group does not exist.\n   */\n  #getAccountGroup(\n    groupId: AccountGroupId | '',\n  ): AccountGroupObject | undefined {\n    if (!groupId) {\n      return undefined;\n    }\n\n    return this.#messenger.call(\n      'AccountTreeController:getAccountGroupObject',\n      groupId,\n    );\n  }\n\n  /**\n   * Gets the currently selected account group ID.\n   *\n   * @returns The currently selected account group ID, or an empty string if\n   * there is no selected account group.\n   */\n  #getSelectedAccountGroupId(): AccountGroupId | '' {\n    return this.#messenger.call(\n      'AccountTreeController:getSelectedAccountGroup',\n    );\n  }\n}\n"]}
+{"version":3,"file":"SnapAccountService.mjs","sourceRoot":"","sources":["../src/SnapAccountService.ts"],"names":[],"mappings":"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","sourcesContent":["import { AccountGroupId } from '@metamask/account-api';\nimport type {\n  SnapKeyring as LegacySnapKeyring,\n  SnapMessage,\n} from '@metamask/eth-snap-keyring';\nimport type {\n  KeyringControllerGetStateAction,\n  KeyringControllerStateChangeEvent,\n  KeyringControllerUnlockEvent,\n  KeyringControllerWithControllerAction,\n  KeyringEntry,\n} from '@metamask/keyring-controller';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { AccountId, BaseKeyring } from '@metamask/keyring-utils';\nimport type { Messenger } from '@metamask/messenger';\nimport type {\n  SnapControllerGetRunnableSnapsAction,\n  SnapControllerGetSnapAction,\n  SnapControllerGetStateAction,\n  SnapControllerSnapBlockedEvent,\n  SnapControllerSnapDisabledEvent,\n  SnapControllerSnapEnabledEvent,\n  SnapControllerSnapInstalledEvent,\n  SnapControllerSnapUnblockedEvent,\n  SnapControllerSnapUninstalledEvent,\n  SnapControllerStateChangeEvent,\n} from '@metamask/snaps-controllers';\nimport { SnapId } from '@metamask/snaps-sdk';\nimport type { Json } from '@metamask/utils';\n\nimport { projectLogger as log } from './logger';\nimport type {\n  SnapAccountServiceEnsureReadyAction,\n  SnapAccountServiceGetLegacySnapKeyringAction,\n  SnapAccountServiceGetSnapsAction,\n  SnapAccountServiceHandleKeyringSnapMessageAction,\n} from './SnapAccountService-method-action-types';\nimport { SnapPlatformWatcher } from './SnapPlatformWatcher';\nimport type { SnapPlatformWatcherConfig } from './SnapPlatformWatcher';\nimport { SnapTracker } from './SnapTracker';\nimport type {\n  AccountTreeControllerGetAccountGroupObjectAction,\n  AccountTreeControllerGetSelectedAccountGroupAction,\n  AccountTreeControllerSelectedAccountGroupChangeEvent,\n  AccountTreeControllerAccountGroupCreatedEvent,\n  AccountTreeControllerAccountGroupUpdatedEvent,\n  AccountTreeControllerAccountGroupRemovedEvent,\n  AccountGroupObject,\n} from './types';\n\n/**\n * The name of the {@link SnapAccountService}, used to namespace the service's\n * actions and events.\n */\nexport const serviceName = 'SnapAccountService';\n\n/**\n * All of the methods within {@link SnapAccountService} that are exposed via\n * the messenger.\n */\nconst MESSENGER_EXPOSED_METHODS = [\n  'ensureReady',\n  'getSnaps',\n  'getLegacySnapKeyring',\n  'handleKeyringSnapMessage',\n] as const;\n\n/**\n * Actions that {@link SnapAccountService} exposes to other consumers.\n */\nexport type SnapAccountServiceActions =\n  | SnapAccountServiceEnsureReadyAction\n  | SnapAccountServiceGetSnapsAction\n  | SnapAccountServiceGetLegacySnapKeyringAction\n  | SnapAccountServiceHandleKeyringSnapMessageAction;\n\n/**\n * Actions from other messengers that {@link SnapAccountService} calls.\n */\ntype AllowedActions =\n  | SnapControllerGetStateAction\n  | SnapControllerGetSnapAction\n  | SnapControllerGetRunnableSnapsAction\n  | KeyringControllerGetStateAction\n  | KeyringControllerWithControllerAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetSelectedAccountGroupAction;\n\n/**\n * Events that {@link SnapAccountService} exposes to other consumers.\n */\nexport type SnapAccountServiceEvents = never;\n\n/**\n * Events from other messengers that {@link SnapAccountService} subscribes to.\n */\ntype AllowedEvents =\n  | SnapControllerStateChangeEvent\n  | SnapControllerSnapInstalledEvent\n  | SnapControllerSnapEnabledEvent\n  | SnapControllerSnapDisabledEvent\n  | SnapControllerSnapBlockedEvent\n  | SnapControllerSnapUnblockedEvent\n  | SnapControllerSnapUninstalledEvent\n  | KeyringControllerStateChangeEvent\n  | KeyringControllerUnlockEvent\n  | AccountTreeControllerSelectedAccountGroupChangeEvent\n  | AccountTreeControllerAccountGroupCreatedEvent\n  | AccountTreeControllerAccountGroupUpdatedEvent\n  | AccountTreeControllerAccountGroupRemovedEvent;\n\n/**\n * The messenger which is restricted to actions and events accessed by\n * {@link SnapAccountService}.\n */\nexport type SnapAccountServiceMessenger = Messenger<\n  typeof serviceName,\n  SnapAccountServiceActions | AllowedActions,\n  SnapAccountServiceEvents | AllowedEvents\n>;\n\n/**\n * Configuration for the {@link SnapAccountService}.\n */\nexport type SnapAccountServiceConfig = {\n  snapPlatformWatcher?: SnapPlatformWatcherConfig;\n};\n\n/**\n * The options that {@link SnapAccountService} takes.\n */\nexport type SnapAccountServiceOptions = {\n  messenger: SnapAccountServiceMessenger;\n  config?: SnapAccountServiceConfig;\n};\n\n/**\n * Checks if a given keyring is a Snap keyring (v2).\n *\n * @param keyring - The keyring to check.\n * @param keyring.type - The type of the keyring.\n * @returns `true` if the keyring is a Snap keyring (v2), `false` otherwise.\n */\nfunction isLegacySnapKeyring(keyring: {\n  type: BaseKeyring['type'];\n}): keyring is LegacySnapKeyring {\n  return keyring.type === KeyringTypes.snap;\n}\n\n/**\n * Service responsible for managing account management snaps.\n */\nexport class SnapAccountService {\n  /**\n   * The name of the service.\n   */\n  readonly name: typeof serviceName;\n\n  readonly #messenger: SnapAccountServiceMessenger;\n\n  readonly #watcher: SnapPlatformWatcher;\n\n  readonly #tracker: SnapTracker;\n\n  /**\n   * Constructs a new {@link SnapAccountService}.\n   *\n   * @param args - The constructor arguments.\n   * @param args.messenger - The messenger suited for this service.\n   * @param args.config - Optional service configuration.\n   */\n  constructor({ messenger, config }: SnapAccountServiceOptions) {\n    this.name = serviceName;\n    this.#messenger = messenger;\n    this.#watcher = new SnapPlatformWatcher(\n      messenger,\n      config?.snapPlatformWatcher,\n    );\n    this.#tracker = new SnapTracker(messenger);\n\n    this.#messenger.registerMethodActionHandlers(\n      this,\n      MESSENGER_EXPOSED_METHODS,\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:selectedAccountGroupChange',\n      (groupId) => this.#handleSelectedAccountGroupChange(groupId),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupCreated',\n      (group) => this.#handleAccountGroupCreatedOrUpdated(group),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupUpdated',\n      (group) => this.#handleAccountGroupCreatedOrUpdated(group),\n    );\n\n    this.#messenger.subscribe(\n      'AccountTreeController:accountGroupRemoved',\n      (groupId) => this.#handleAccountGroupRemoved(groupId),\n    );\n\n    this.#messenger.subscribe('KeyringController:unlock', () =>\n      this.#handleUnlock(),\n    );\n  }\n\n  /**\n   * Handles changes to the selected account group by forwarding the new\n   * group's accounts to the Snap keyring.\n   *\n   * @param groupId - The ID of the newly selected account group.\n   */\n  #handleSelectedAccountGroupChange(groupId: AccountGroupId | ''): void {\n    this.#forwardSelectedAccounts(\n      groupId,\n      this.#getAccountGroup(groupId)?.accounts,\n    );\n  }\n\n  /**\n   * Handles the keyring controller unlock event by forwarding the currently\n   * selected account group's accounts to the Snap keyring.\n   */\n  #handleUnlock(): void {\n    const groupId = this.#getSelectedAccountGroupId();\n    this.#forwardSelectedAccounts(\n      groupId,\n      this.#getAccountGroup(groupId)?.accounts,\n    );\n  }\n\n  /**\n   * Handles created or updated account groups by forwarding the accounts of the currently\n   * selected account group to the Snap keyring, if the created/updated group is currently selected.\n   *\n   * @param group - The account group being created or updated.\n   */\n  #handleAccountGroupCreatedOrUpdated(group: AccountGroupObject): void {\n    if (group.id === this.#getSelectedAccountGroupId()) {\n      this.#forwardSelectedAccounts(group.id, group.accounts);\n    }\n  }\n\n  /**\n   * Handles removed account groups by forwarding the accounts of the currently\n   * selected account group to the Snap keyring, if the removed group is currently selected.\n   *\n   * @param groupId - The ID of the account group being removed.\n   */\n  #handleAccountGroupRemoved(groupId: AccountGroupId): void {\n    if (groupId === this.#getSelectedAccountGroupId()) {\n      this.#forwardSelectedAccounts(\n        groupId,\n        [], // Clearing accounts since the group is removed\n      );\n    }\n  }\n\n  /**\n   * Initializes the snap account service.\n   *\n   * Seeds the internal set of account-management Snaps from\n   * `SnapController:getRunnableSnaps`, then starts processing lifecycle\n   * events.\n   */\n  async init(): Promise<void> {\n    await this.#tracker.init();\n  }\n\n  /**\n   * Returns the IDs of all currently tracked account-management Snaps —\n   * Snaps that are installed, enabled, not blocked, and have the\n   * `endowment:keyring` permission.\n   *\n   * @returns The IDs of tracked account-management Snaps.\n   */\n  getSnaps(): SnapId[] {\n    return this.#tracker.getSnaps();\n  }\n\n  /**\n   * Ensures everything is ready to use Snap accounts for the given Snap.\n   * 1. Validates that `snapId` is a tracked account-management Snap.\n   * 2. Waits for the Snap platform to be fully started.\n   *\n   * Safe to call concurrently — each step is idempotent or mutex-protected.\n   *\n   * @param snapId - ID of the Snap to ensure readiness for.\n   * @throws If `snapId` is not a tracked account-management Snap.\n   */\n  async ensureReady(snapId: SnapId): Promise<void> {\n    if (!this.#tracker.canUse(snapId)) {\n      throw new Error(`Unknown snap: \"${snapId}\"`);\n    }\n    // Before doing anything with our Snap, we need to make sure the platform\n    // is ready to process requests.\n    await this.#watcher.ensureCanUseSnapPlatform();\n  }\n\n  /**\n   * Atomically gets-or-creates the legacy (v1) Snap keyring — the keyring\n   * associated with {@link KeyringTypes.snap}.\n   *\n   * @returns The existing or newly-created Snap keyring instance.\n   */\n  async getLegacySnapKeyring(): Promise<LegacySnapKeyring> {\n    type Result = {\n      snapKeyring: LegacySnapKeyring;\n    };\n\n    // `KeyringController:withController` forbids returning a direct keyring\n    // reference (it checks the result via `Object.is`), so we smuggle the\n    // instance out wrapped in an object and unwrap it after the call.\n    // NOTE: This violates the abstraction of `KeyringController:withController`, but this\n    // is how we currently interact with the legacy Snap keyring. Once we migrate it to\n    // the Snap keyring v2, we won't be using the same pattern.\n    const result = await this.#messenger.call(\n      'KeyringController:withController',\n      async (controller): Promise<Result> => {\n        let snapKeyring: KeyringEntry['keyring'] | undefined;\n\n        const found = controller.keyrings.find(({ keyring }) =>\n          isLegacySnapKeyring(keyring),\n        );\n        if (found) {\n          snapKeyring = found.keyring;\n        }\n\n        if (!snapKeyring) {\n          const {\n            keyring: newSnapKeyring,\n            metadata: { id },\n          } = await controller.addNewKeyring(KeyringTypes.snap);\n          snapKeyring = newSnapKeyring;\n\n          log(`Legacy Snap keyring created. (\"${id}\")`);\n        }\n\n        // The legacy Snap keyring is not compatible with `EthKeyring`, so we need to cast here.\n        return { snapKeyring } as unknown as Result;\n      },\n    );\n\n    return (result as Result).snapKeyring;\n  }\n\n  /**\n   * Handle a message from a Snap.\n   *\n   * @param snapId - ID of the Snap.\n   * @param message - Message sent by the Snap.\n   * @returns The execution result.\n   */\n  async handleKeyringSnapMessage(\n    snapId: SnapId,\n    message: SnapMessage,\n  ): Promise<Json> {\n    const snapKeyring = await this.getLegacySnapKeyring();\n    return snapKeyring.handleKeyringSnapMessage(snapId, message);\n  }\n\n  /**\n   * Forwards the accounts of the given account group to the Snap keyring.\n   *\n   * @param groupId - The ID of the account group whose accounts should be\n   * forwarded. If empty, this is a no-op.\n   * @param accounts - The accounts to forward. If not defined, this is a no-op.\n   */\n  #forwardSelectedAccounts(\n    groupId: AccountGroupId | '',\n    accounts: AccountId[] | undefined,\n  ): void {\n    if (!groupId) {\n      log(\n        'No selected account group, skipping forwarding selected accounts to Snap keyring.',\n      );\n      return;\n    }\n\n    if (!accounts) {\n      log(\n        `Account group (\"${groupId}\") has no accounts, skipping forwarding selected accounts to Snap keyring.`,\n      );\n      return;\n    }\n\n    const forwardSelectedAccounts = async (): Promise<void> => {\n      if (accounts.length) {\n        log(\n          `Forwarding selected accounts (from \"${groupId}\"): ${accounts.join(', ')}`,\n        );\n      } else {\n        log(`Clearing selected accounts (from \"${groupId}\")`);\n      }\n\n      const snapKeyring = await this.getLegacySnapKeyring();\n      await snapKeyring.setSelectedAccounts(accounts);\n    };\n\n    // There is nothing we can do if forwarding fails. This will auto-recover on the next relevant event.\n    forwardSelectedAccounts().catch((error) => {\n      console.error('Error forwarding selected accounts:', error);\n    });\n  }\n\n  /**\n   * Gets the account group object for the given group ID.\n   *\n   * @param groupId - The ID of the account group.\n   * @returns The account group object, or undefined if the group ID is empty or the group does not exist.\n   */\n  #getAccountGroup(\n    groupId: AccountGroupId | '',\n  ): AccountGroupObject | undefined {\n    if (!groupId) {\n      return undefined;\n    }\n\n    return this.#messenger.call(\n      'AccountTreeController:getAccountGroupObject',\n      groupId,\n    );\n  }\n\n  /**\n   * Gets the currently selected account group ID.\n   *\n   * @returns The currently selected account group ID, or an empty string if\n   * there is no selected account group.\n   */\n  #getSelectedAccountGroupId(): AccountGroupId | '' {\n    return this.#messenger.call(\n      'AccountTreeController:getSelectedAccountGroup',\n    );\n  }\n}\n"]}

package/dist/SnapTracker.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SnapTracker_instances, _SnapTracker_messenger, _SnapTracker_snaps, _SnapTracker_init, _SnapTracker_handleSnapAdded, _SnapTracker_handleSnapUnblocked, _SnapTracker_handleSnapRemoved;
+var _SnapTracker_instances, _SnapTracker_messenger, _SnapTracker_snaps, _SnapTracker_initialized, _SnapTracker_handleSnapAdded, _SnapTracker_handleSnapUnblocked, _SnapTracker_handleSnapRemoved;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapTracker = void 0;
 const logger_1 = require("./logger.cjs");
@@ -34,6 +34,7 @@ class SnapTracker {
         _SnapTracker_instances.add(this);
         _SnapTracker_messenger.set(this, void 0);
         _SnapTracker_snaps.set(this, new Set());
+        _SnapTracker_initialized.set(this, false);
         __classPrivateFieldSet(this, _SnapTracker_messenger, messenger, "f");
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapInstalled', (snap) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapAdded).call(this, snap, 'installed'));
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapUninstalled', (snap) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapRemoved).call(this, snap.id, 'uninstalled'));
@@ -41,7 +42,27 @@ class SnapTracker {
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapDisabled', (snap) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapRemoved).call(this, snap.id, 'disabled'));
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapBlocked', (snapId) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapRemoved).call(this, snapId, 'blocked'));
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapUnblocked', (snapId) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapUnblocked).call(this, snapId));
-        __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_init).call(this);
+    }
+    /**
+     * Seeds the internal set of account-management Snaps from
+     * `SnapController:getRunnableSnaps`, then starts processing lifecycle
+     * events.
+     */
+    async init() {
+        if (__classPrivateFieldGet(this, _SnapTracker_initialized, "f")) {
+            // Do not re-init, once setup we only rely on lifecycle events to update the set of
+            // tracked Snaps.
+            return;
+        }
+        __classPrivateFieldGet(this, _SnapTracker_snaps, "f").clear();
+        const runnable = __classPrivateFieldGet(this, _SnapTracker_messenger, "f").call('SnapController:getRunnableSnaps');
+        for (const snap of runnable) {
+            if (isAccountManagementSnap(snap)) {
+                (0, logger_1.projectLogger)(`Found account management Snap: ${snap.id} (initialization)`);
+                __classPrivateFieldGet(this, _SnapTracker_snaps, "f").add(snap.id);
+            }
+        }
+        __classPrivateFieldSet(this, _SnapTracker_initialized, true, "f");
     }
     /**
      * Returns the IDs of all currently tracked account-management Snaps.
@@ -62,15 +83,10 @@ class SnapTracker {
     }
 }
 exports.SnapTracker = SnapTracker;
-_SnapTracker_messenger = new WeakMap(), _SnapTracker_snaps = new WeakMap(), _SnapTracker_instances = new WeakSet(), _SnapTracker_init = function _SnapTracker_init() {
-    const runnable = __classPrivateFieldGet(this, _SnapTracker_messenger, "f").call('SnapController:getRunnableSnaps');
-    for (const snap of runnable) {
-        if (isAccountManagementSnap(snap)) {
-            (0, logger_1.projectLogger)(`Found account management Snap: ${snap.id} (initialization)`);
-            __classPrivateFieldGet(this, _SnapTracker_snaps, "f").add(snap.id);
-        }
+_SnapTracker_messenger = new WeakMap(), _SnapTracker_snaps = new WeakMap(), _SnapTracker_initialized = new WeakMap(), _SnapTracker_instances = new WeakSet(), _SnapTracker_handleSnapAdded = function _SnapTracker_handleSnapAdded(snap, reason) {
+    if (!__classPrivateFieldGet(this, _SnapTracker_initialized, "f")) {
+        return;
     }
-}, _SnapTracker_handleSnapAdded = function _SnapTracker_handleSnapAdded(snap, reason) {
     if (!snap.enabled || snap.blocked) {
         return;
     }
@@ -79,11 +95,17 @@ _SnapTracker_messenger = new WeakMap(), _SnapTracker_snaps = new WeakMap(), _Sna
         __classPrivateFieldGet(this, _SnapTracker_snaps, "f").add(snap.id);
     }
 }, _SnapTracker_handleSnapUnblocked = function _SnapTracker_handleSnapUnblocked(snapId) {
+    if (!__classPrivateFieldGet(this, _SnapTracker_initialized, "f")) {
+        return;
+    }
     const snap = __classPrivateFieldGet(this, _SnapTracker_messenger, "f").call('SnapController:getSnap', snapId);
     if (snap) {
         __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapAdded).call(this, snap, 'unblocked');
     }
 }, _SnapTracker_handleSnapRemoved = function _SnapTracker_handleSnapRemoved(snapId, reason) {
+    if (!__classPrivateFieldGet(this, _SnapTracker_initialized, "f")) {
+        return;
+    }
     if (__classPrivateFieldGet(this, _SnapTracker_snaps, "f").has(snapId)) {
         (0, logger_1.projectLogger)(`Removed account management Snap: ${snapId} (${reason})`);
         __classPrivateFieldGet(this, _SnapTracker_snaps, "f").delete(snapId);

package/dist/SnapTracker.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SnapTracker.cjs","sourceRoot":"","sources":["../src/SnapTracker.ts"],"names":[],"mappings":"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","sourcesContent":["import { SnapId } from '@metamask/snaps-sdk';\nimport type { TruncatedSnap } from '@metamask/snaps-utils';\n\nimport { projectLogger as log } from './logger';\nimport type { SnapAccountServiceMessenger } from './SnapAccountService';\n\n/**\n * Checks if a given Snap is an account management Snap.\n *\n * @param snap - The Snap to check.\n * @returns True if the Snap declares the `endowment:keyring` initial\n * permission.\n */\nfunction isAccountManagementSnap(snap: TruncatedSnap): boolean {\n  return snap.initialPermissions['endowment:keyring'] !== undefined;\n}\n\n/**\n * Tracks the set of installed, enabled, non-blocked account-management Snaps\n * (Snaps declaring the `endowment:keyring` initial permission) by listening to\n * `SnapController` lifecycle events.\n */\nexport class SnapTracker {\n  readonly #messenger: SnapAccountServiceMessenger;\n\n  readonly #snaps: Set<SnapId> = new Set();\n\n  constructor(messenger: SnapAccountServiceMessenger) {\n    this.#messenger = messenger;\n\n    this.#messenger.subscribe('SnapController:snapInstalled', (snap) =>\n      this.#handleSnapAdded(snap, 'installed'),\n    );\n    this.#messenger.subscribe('SnapController:snapUninstalled', (snap) =>\n      this.#handleSnapRemoved(snap.id, 'uninstalled'),\n    );\n    this.#messenger.subscribe('SnapController:snapEnabled', (snap) =>\n      this.#handleSnapAdded(snap, 'enabled'),\n    );\n    this.#messenger.subscribe('SnapController:snapDisabled', (snap) =>\n      this.#handleSnapRemoved(snap.id, 'disabled'),\n    );\n    this.#messenger.subscribe('SnapController:snapBlocked', (snapId) =>\n      this.#handleSnapRemoved(snapId as SnapId, 'blocked'),\n    );\n    this.#messenger.subscribe('SnapController:snapUnblocked', (snapId) =>\n      this.#handleSnapUnblocked(snapId as SnapId),\n    );\n\n    this.#init();\n  }\n\n  /**\n   * Seeds the internal set of account-management Snaps from\n   * `SnapController:getRunnableSnaps`.\n   */\n  #init(): void {\n    const runnable = this.#messenger.call('SnapController:getRunnableSnaps');\n    for (const snap of runnable) {\n      if (isAccountManagementSnap(snap)) {\n        log(`Found account management Snap: ${snap.id} (initialization)`);\n        this.#snaps.add(snap.id);\n      }\n    }\n  }\n\n  /**\n   * Returns the IDs of all currently tracked account-management Snaps.\n   *\n   * @returns The IDs of tracked account-management Snaps.\n   */\n  getSnaps(): SnapId[] {\n    return [...this.#snaps];\n  }\n\n  /**\n   * Returns true if the given Snap ID is currently tracked and can be used.\n   *\n   * @param snapId - The Snap ID to check.\n   * @returns True if the Snap is tracked and can be used.\n   */\n  canUse(snapId: SnapId): boolean {\n    return this.#snaps.has(snapId);\n  }\n\n  /**\n   * Handles a Snap being added (installed or enabled). If the Snap is an\n   * account-management Snap, adds it to the internal set of tracked Snaps.\n   *\n   * @param snap - The Snap that was installed or enabled.\n   * @param reason - The reason the Snap was added.\n   */\n  #handleSnapAdded(snap: TruncatedSnap, reason: string): void {\n    if (!snap.enabled || snap.blocked) {\n      return;\n    }\n\n    if (isAccountManagementSnap(snap) && !this.#snaps.has(snap.id)) {\n      log(`Added account management Snap: ${snap.id} (${reason})`);\n\n      this.#snaps.add(snap.id);\n    }\n  }\n\n  /**\n   * Handles a Snap being unblocked. If the Snap is an enabled\n   * account-management Snap, re-adds it to the internal set of tracked Snaps.\n   *\n   * @param snapId - The Snap ID that was unblocked.\n   */\n  #handleSnapUnblocked(snapId: SnapId): void {\n    const snap = this.#messenger.call('SnapController:getSnap', snapId);\n    if (snap) {\n      this.#handleSnapAdded(snap, 'unblocked');\n    }\n  }\n\n  /**\n   * Handles a Snap being removed (disabled, blocked, or uninstalled). If the Snap is an\n   * account-management Snap, removes it from the internal set of tracked Snaps.\n   *\n   * @param snapId - The Snap ID that was disabled, blocked, or uninstalled.\n   * @param reason - The reason the Snap was removed.\n   */\n  #handleSnapRemoved(snapId: SnapId, reason: string): void {\n    if (this.#snaps.has(snapId)) {\n      log(`Removed account management Snap: ${snapId} (${reason})`);\n\n      this.#snaps.delete(snapId);\n    }\n  }\n}\n"]}
+{"version":3,"file":"SnapTracker.cjs","sourceRoot":"","sources":["../src/SnapTracker.ts"],"names":[],"mappings":"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","sourcesContent":["import { SnapId } from '@metamask/snaps-sdk';\nimport type { TruncatedSnap } from '@metamask/snaps-utils';\n\nimport { projectLogger as log } from './logger';\nimport type { SnapAccountServiceMessenger } from './SnapAccountService';\n\n/**\n * Checks if a given Snap is an account management Snap.\n *\n * @param snap - The Snap to check.\n * @returns True if the Snap declares the `endowment:keyring` initial\n * permission.\n */\nfunction isAccountManagementSnap(snap: TruncatedSnap): boolean {\n  return snap.initialPermissions['endowment:keyring'] !== undefined;\n}\n\n/**\n * Tracks the set of installed, enabled, non-blocked account-management Snaps\n * (Snaps declaring the `endowment:keyring` initial permission) by listening to\n * `SnapController` lifecycle events.\n */\nexport class SnapTracker {\n  readonly #messenger: SnapAccountServiceMessenger;\n\n  readonly #snaps: Set<SnapId> = new Set();\n\n  #initialized = false;\n\n  constructor(messenger: SnapAccountServiceMessenger) {\n    this.#messenger = messenger;\n\n    this.#messenger.subscribe('SnapController:snapInstalled', (snap) =>\n      this.#handleSnapAdded(snap, 'installed'),\n    );\n    this.#messenger.subscribe('SnapController:snapUninstalled', (snap) =>\n      this.#handleSnapRemoved(snap.id, 'uninstalled'),\n    );\n    this.#messenger.subscribe('SnapController:snapEnabled', (snap) =>\n      this.#handleSnapAdded(snap, 'enabled'),\n    );\n    this.#messenger.subscribe('SnapController:snapDisabled', (snap) =>\n      this.#handleSnapRemoved(snap.id, 'disabled'),\n    );\n    this.#messenger.subscribe('SnapController:snapBlocked', (snapId) =>\n      this.#handleSnapRemoved(snapId as SnapId, 'blocked'),\n    );\n    this.#messenger.subscribe('SnapController:snapUnblocked', (snapId) =>\n      this.#handleSnapUnblocked(snapId as SnapId),\n    );\n  }\n\n  /**\n   * Seeds the internal set of account-management Snaps from\n   * `SnapController:getRunnableSnaps`, then starts processing lifecycle\n   * events.\n   */\n  async init(): Promise<void> {\n    if (this.#initialized) {\n      // Do not re-init, once setup we only rely on lifecycle events to update the set of\n      // tracked Snaps.\n      return;\n    }\n\n    this.#snaps.clear();\n\n    const runnable = this.#messenger.call('SnapController:getRunnableSnaps');\n    for (const snap of runnable) {\n      if (isAccountManagementSnap(snap)) {\n        log(`Found account management Snap: ${snap.id} (initialization)`);\n        this.#snaps.add(snap.id);\n      }\n    }\n\n    this.#initialized = true;\n  }\n\n  /**\n   * Returns the IDs of all currently tracked account-management Snaps.\n   *\n   * @returns The IDs of tracked account-management Snaps.\n   */\n  getSnaps(): SnapId[] {\n    return [...this.#snaps];\n  }\n\n  /**\n   * Returns true if the given Snap ID is currently tracked and can be used.\n   *\n   * @param snapId - The Snap ID to check.\n   * @returns True if the Snap is tracked and can be used.\n   */\n  canUse(snapId: SnapId): boolean {\n    return this.#snaps.has(snapId);\n  }\n\n  /**\n   * Handles a Snap being added (installed or enabled). If the Snap is an\n   * account-management Snap, adds it to the internal set of tracked Snaps.\n   *\n   * @param snap - The Snap that was installed or enabled.\n   * @param reason - The reason the Snap was added.\n   */\n  #handleSnapAdded(snap: TruncatedSnap, reason: string): void {\n    if (!this.#initialized) {\n      return;\n    }\n\n    if (!snap.enabled || snap.blocked) {\n      return;\n    }\n\n    if (isAccountManagementSnap(snap) && !this.#snaps.has(snap.id)) {\n      log(`Added account management Snap: ${snap.id} (${reason})`);\n\n      this.#snaps.add(snap.id);\n    }\n  }\n\n  /**\n   * Handles a Snap being unblocked. If the Snap is an enabled\n   * account-management Snap, re-adds it to the internal set of tracked Snaps.\n   *\n   * @param snapId - The Snap ID that was unblocked.\n   */\n  #handleSnapUnblocked(snapId: SnapId): void {\n    if (!this.#initialized) {\n      return;\n    }\n\n    const snap = this.#messenger.call('SnapController:getSnap', snapId);\n    if (snap) {\n      this.#handleSnapAdded(snap, 'unblocked');\n    }\n  }\n\n  /**\n   * Handles a Snap being removed (disabled, blocked, or uninstalled). If the Snap is an\n   * account-management Snap, removes it from the internal set of tracked Snaps.\n   *\n   * @param snapId - The Snap ID that was disabled, blocked, or uninstalled.\n   * @param reason - The reason the Snap was removed.\n   */\n  #handleSnapRemoved(snapId: SnapId, reason: string): void {\n    if (!this.#initialized) {\n      return;\n    }\n\n    if (this.#snaps.has(snapId)) {\n      log(`Removed account management Snap: ${snapId} (${reason})`);\n\n      this.#snaps.delete(snapId);\n    }\n  }\n}\n"]}

package/dist/SnapTracker.d.cts

@@ -8,6 +8,12 @@ import type { SnapAccountServiceMessenger } from "./SnapAccountService.cjs";
 export declare class SnapTracker {
     #private;
     constructor(messenger: SnapAccountServiceMessenger);
+    /**
+     * Seeds the internal set of account-management Snaps from
+     * `SnapController:getRunnableSnaps`, then starts processing lifecycle
+     * events.
+     */
+    init(): Promise<void>;
     /**
      * Returns the IDs of all currently tracked account-management Snaps.
      *

package/dist/SnapTracker.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"SnapTracker.d.cts","sourceRoot":"","sources":["../src/SnapTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,4BAA4B;AAI7C,OAAO,KAAK,EAAE,2BAA2B,EAAE,iCAA6B;AAaxE;;;;GAIG;AACH,qBAAa,WAAW;;gBAKV,SAAS,EAAE,2BAA2B;IAuClD;;;;OAIG;IACH,QAAQ,IAAI,MAAM,EAAE;IAIpB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAkDhC"}
+{"version":3,"file":"SnapTracker.d.cts","sourceRoot":"","sources":["../src/SnapTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,4BAA4B;AAI7C,OAAO,KAAK,EAAE,2BAA2B,EAAE,iCAA6B;AAaxE;;;;GAIG;AACH,qBAAa,WAAW;;gBAOV,SAAS,EAAE,2BAA2B;IAuBlD;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B;;;;OAIG;IACH,QAAQ,IAAI,MAAM,EAAE;IAIpB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CA8DhC"}

package/dist/SnapTracker.d.mts

@@ -8,6 +8,12 @@ import type { SnapAccountServiceMessenger } from "./SnapAccountService.mjs";
 export declare class SnapTracker {
     #private;
     constructor(messenger: SnapAccountServiceMessenger);
+    /**
+     * Seeds the internal set of account-management Snaps from
+     * `SnapController:getRunnableSnaps`, then starts processing lifecycle
+     * events.
+     */
+    init(): Promise<void>;
     /**
      * Returns the IDs of all currently tracked account-management Snaps.
      *

package/dist/SnapTracker.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"SnapTracker.d.mts","sourceRoot":"","sources":["../src/SnapTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,4BAA4B;AAI7C,OAAO,KAAK,EAAE,2BAA2B,EAAE,iCAA6B;AAaxE;;;;GAIG;AACH,qBAAa,WAAW;;gBAKV,SAAS,EAAE,2BAA2B;IAuClD;;;;OAIG;IACH,QAAQ,IAAI,MAAM,EAAE;IAIpB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAkDhC"}
+{"version":3,"file":"SnapTracker.d.mts","sourceRoot":"","sources":["../src/SnapTracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,4BAA4B;AAI7C,OAAO,KAAK,EAAE,2BAA2B,EAAE,iCAA6B;AAaxE;;;;GAIG;AACH,qBAAa,WAAW;;gBAOV,SAAS,EAAE,2BAA2B;IAuBlD;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B;;;;OAIG;IACH,QAAQ,IAAI,MAAM,EAAE;IAIpB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CA8DhC"}

package/dist/SnapTracker.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SnapTracker_instances, _SnapTracker_messenger, _SnapTracker_snaps, _SnapTracker_init, _SnapTracker_handleSnapAdded, _SnapTracker_handleSnapUnblocked, _SnapTracker_handleSnapRemoved;
+var _SnapTracker_instances, _SnapTracker_messenger, _SnapTracker_snaps, _SnapTracker_initialized, _SnapTracker_handleSnapAdded, _SnapTracker_handleSnapUnblocked, _SnapTracker_handleSnapRemoved;
 import { projectLogger as log } from "./logger.mjs";
 /**
  * Checks if a given Snap is an account management Snap.
@@ -31,6 +31,7 @@ export class SnapTracker {
         _SnapTracker_instances.add(this);
         _SnapTracker_messenger.set(this, void 0);
         _SnapTracker_snaps.set(this, new Set());
+        _SnapTracker_initialized.set(this, false);
         __classPrivateFieldSet(this, _SnapTracker_messenger, messenger, "f");
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapInstalled', (snap) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapAdded).call(this, snap, 'installed'));
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapUninstalled', (snap) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapRemoved).call(this, snap.id, 'uninstalled'));
@@ -38,7 +39,27 @@ export class SnapTracker {
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapDisabled', (snap) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapRemoved).call(this, snap.id, 'disabled'));
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapBlocked', (snapId) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapRemoved).call(this, snapId, 'blocked'));
         __classPrivateFieldGet(this, _SnapTracker_messenger, "f").subscribe('SnapController:snapUnblocked', (snapId) => __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapUnblocked).call(this, snapId));
-        __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_init).call(this);
+    }
+    /**
+     * Seeds the internal set of account-management Snaps from
+     * `SnapController:getRunnableSnaps`, then starts processing lifecycle
+     * events.
+     */
+    async init() {
+        if (__classPrivateFieldGet(this, _SnapTracker_initialized, "f")) {
+            // Do not re-init, once setup we only rely on lifecycle events to update the set of
+            // tracked Snaps.
+            return;
+        }
+        __classPrivateFieldGet(this, _SnapTracker_snaps, "f").clear();
+        const runnable = __classPrivateFieldGet(this, _SnapTracker_messenger, "f").call('SnapController:getRunnableSnaps');
+        for (const snap of runnable) {
+            if (isAccountManagementSnap(snap)) {
+                log(`Found account management Snap: ${snap.id} (initialization)`);
+                __classPrivateFieldGet(this, _SnapTracker_snaps, "f").add(snap.id);
+            }
+        }
+        __classPrivateFieldSet(this, _SnapTracker_initialized, true, "f");
     }
     /**
      * Returns the IDs of all currently tracked account-management Snaps.
@@ -58,15 +79,10 @@ export class SnapTracker {
         return __classPrivateFieldGet(this, _SnapTracker_snaps, "f").has(snapId);
     }
 }
-_SnapTracker_messenger = new WeakMap(), _SnapTracker_snaps = new WeakMap(), _SnapTracker_instances = new WeakSet(), _SnapTracker_init = function _SnapTracker_init() {
-    const runnable = __classPrivateFieldGet(this, _SnapTracker_messenger, "f").call('SnapController:getRunnableSnaps');
-    for (const snap of runnable) {
-        if (isAccountManagementSnap(snap)) {
-            log(`Found account management Snap: ${snap.id} (initialization)`);
-            __classPrivateFieldGet(this, _SnapTracker_snaps, "f").add(snap.id);
-        }
+_SnapTracker_messenger = new WeakMap(), _SnapTracker_snaps = new WeakMap(), _SnapTracker_initialized = new WeakMap(), _SnapTracker_instances = new WeakSet(), _SnapTracker_handleSnapAdded = function _SnapTracker_handleSnapAdded(snap, reason) {
+    if (!__classPrivateFieldGet(this, _SnapTracker_initialized, "f")) {
+        return;
     }
-}, _SnapTracker_handleSnapAdded = function _SnapTracker_handleSnapAdded(snap, reason) {
     if (!snap.enabled || snap.blocked) {
         return;
     }
@@ -75,11 +91,17 @@ _SnapTracker_messenger = new WeakMap(), _SnapTracker_snaps = new WeakMap(), _Sna
         __classPrivateFieldGet(this, _SnapTracker_snaps, "f").add(snap.id);
     }
 }, _SnapTracker_handleSnapUnblocked = function _SnapTracker_handleSnapUnblocked(snapId) {
+    if (!__classPrivateFieldGet(this, _SnapTracker_initialized, "f")) {
+        return;
+    }
     const snap = __classPrivateFieldGet(this, _SnapTracker_messenger, "f").call('SnapController:getSnap', snapId);
     if (snap) {
         __classPrivateFieldGet(this, _SnapTracker_instances, "m", _SnapTracker_handleSnapAdded).call(this, snap, 'unblocked');
     }
 }, _SnapTracker_handleSnapRemoved = function _SnapTracker_handleSnapRemoved(snapId, reason) {
+    if (!__classPrivateFieldGet(this, _SnapTracker_initialized, "f")) {
+        return;
+    }
     if (__classPrivateFieldGet(this, _SnapTracker_snaps, "f").has(snapId)) {
         log(`Removed account management Snap: ${snapId} (${reason})`);
         __classPrivateFieldGet(this, _SnapTracker_snaps, "f").delete(snapId);

package/dist/SnapTracker.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"SnapTracker.mjs","sourceRoot":"","sources":["../src/SnapTracker.ts"],"names":[],"mappings":"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","sourcesContent":["import { SnapId } from '@metamask/snaps-sdk';\nimport type { TruncatedSnap } from '@metamask/snaps-utils';\n\nimport { projectLogger as log } from './logger';\nimport type { SnapAccountServiceMessenger } from './SnapAccountService';\n\n/**\n * Checks if a given Snap is an account management Snap.\n *\n * @param snap - The Snap to check.\n * @returns True if the Snap declares the `endowment:keyring` initial\n * permission.\n */\nfunction isAccountManagementSnap(snap: TruncatedSnap): boolean {\n  return snap.initialPermissions['endowment:keyring'] !== undefined;\n}\n\n/**\n * Tracks the set of installed, enabled, non-blocked account-management Snaps\n * (Snaps declaring the `endowment:keyring` initial permission) by listening to\n * `SnapController` lifecycle events.\n */\nexport class SnapTracker {\n  readonly #messenger: SnapAccountServiceMessenger;\n\n  readonly #snaps: Set<SnapId> = new Set();\n\n  constructor(messenger: SnapAccountServiceMessenger) {\n    this.#messenger = messenger;\n\n    this.#messenger.subscribe('SnapController:snapInstalled', (snap) =>\n      this.#handleSnapAdded(snap, 'installed'),\n    );\n    this.#messenger.subscribe('SnapController:snapUninstalled', (snap) =>\n      this.#handleSnapRemoved(snap.id, 'uninstalled'),\n    );\n    this.#messenger.subscribe('SnapController:snapEnabled', (snap) =>\n      this.#handleSnapAdded(snap, 'enabled'),\n    );\n    this.#messenger.subscribe('SnapController:snapDisabled', (snap) =>\n      this.#handleSnapRemoved(snap.id, 'disabled'),\n    );\n    this.#messenger.subscribe('SnapController:snapBlocked', (snapId) =>\n      this.#handleSnapRemoved(snapId as SnapId, 'blocked'),\n    );\n    this.#messenger.subscribe('SnapController:snapUnblocked', (snapId) =>\n      this.#handleSnapUnblocked(snapId as SnapId),\n    );\n\n    this.#init();\n  }\n\n  /**\n   * Seeds the internal set of account-management Snaps from\n   * `SnapController:getRunnableSnaps`.\n   */\n  #init(): void {\n    const runnable = this.#messenger.call('SnapController:getRunnableSnaps');\n    for (const snap of runnable) {\n      if (isAccountManagementSnap(snap)) {\n        log(`Found account management Snap: ${snap.id} (initialization)`);\n        this.#snaps.add(snap.id);\n      }\n    }\n  }\n\n  /**\n   * Returns the IDs of all currently tracked account-management Snaps.\n   *\n   * @returns The IDs of tracked account-management Snaps.\n   */\n  getSnaps(): SnapId[] {\n    return [...this.#snaps];\n  }\n\n  /**\n   * Returns true if the given Snap ID is currently tracked and can be used.\n   *\n   * @param snapId - The Snap ID to check.\n   * @returns True if the Snap is tracked and can be used.\n   */\n  canUse(snapId: SnapId): boolean {\n    return this.#snaps.has(snapId);\n  }\n\n  /**\n   * Handles a Snap being added (installed or enabled). If the Snap is an\n   * account-management Snap, adds it to the internal set of tracked Snaps.\n   *\n   * @param snap - The Snap that was installed or enabled.\n   * @param reason - The reason the Snap was added.\n   */\n  #handleSnapAdded(snap: TruncatedSnap, reason: string): void {\n    if (!snap.enabled || snap.blocked) {\n      return;\n    }\n\n    if (isAccountManagementSnap(snap) && !this.#snaps.has(snap.id)) {\n      log(`Added account management Snap: ${snap.id} (${reason})`);\n\n      this.#snaps.add(snap.id);\n    }\n  }\n\n  /**\n   * Handles a Snap being unblocked. If the Snap is an enabled\n   * account-management Snap, re-adds it to the internal set of tracked Snaps.\n   *\n   * @param snapId - The Snap ID that was unblocked.\n   */\n  #handleSnapUnblocked(snapId: SnapId): void {\n    const snap = this.#messenger.call('SnapController:getSnap', snapId);\n    if (snap) {\n      this.#handleSnapAdded(snap, 'unblocked');\n    }\n  }\n\n  /**\n   * Handles a Snap being removed (disabled, blocked, or uninstalled). If the Snap is an\n   * account-management Snap, removes it from the internal set of tracked Snaps.\n   *\n   * @param snapId - The Snap ID that was disabled, blocked, or uninstalled.\n   * @param reason - The reason the Snap was removed.\n   */\n  #handleSnapRemoved(snapId: SnapId, reason: string): void {\n    if (this.#snaps.has(snapId)) {\n      log(`Removed account management Snap: ${snapId} (${reason})`);\n\n      this.#snaps.delete(snapId);\n    }\n  }\n}\n"]}
+{"version":3,"file":"SnapTracker.mjs","sourceRoot":"","sources":["../src/SnapTracker.ts"],"names":[],"mappings":"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","sourcesContent":["import { SnapId } from '@metamask/snaps-sdk';\nimport type { TruncatedSnap } from '@metamask/snaps-utils';\n\nimport { projectLogger as log } from './logger';\nimport type { SnapAccountServiceMessenger } from './SnapAccountService';\n\n/**\n * Checks if a given Snap is an account management Snap.\n *\n * @param snap - The Snap to check.\n * @returns True if the Snap declares the `endowment:keyring` initial\n * permission.\n */\nfunction isAccountManagementSnap(snap: TruncatedSnap): boolean {\n  return snap.initialPermissions['endowment:keyring'] !== undefined;\n}\n\n/**\n * Tracks the set of installed, enabled, non-blocked account-management Snaps\n * (Snaps declaring the `endowment:keyring` initial permission) by listening to\n * `SnapController` lifecycle events.\n */\nexport class SnapTracker {\n  readonly #messenger: SnapAccountServiceMessenger;\n\n  readonly #snaps: Set<SnapId> = new Set();\n\n  #initialized = false;\n\n  constructor(messenger: SnapAccountServiceMessenger) {\n    this.#messenger = messenger;\n\n    this.#messenger.subscribe('SnapController:snapInstalled', (snap) =>\n      this.#handleSnapAdded(snap, 'installed'),\n    );\n    this.#messenger.subscribe('SnapController:snapUninstalled', (snap) =>\n      this.#handleSnapRemoved(snap.id, 'uninstalled'),\n    );\n    this.#messenger.subscribe('SnapController:snapEnabled', (snap) =>\n      this.#handleSnapAdded(snap, 'enabled'),\n    );\n    this.#messenger.subscribe('SnapController:snapDisabled', (snap) =>\n      this.#handleSnapRemoved(snap.id, 'disabled'),\n    );\n    this.#messenger.subscribe('SnapController:snapBlocked', (snapId) =>\n      this.#handleSnapRemoved(snapId as SnapId, 'blocked'),\n    );\n    this.#messenger.subscribe('SnapController:snapUnblocked', (snapId) =>\n      this.#handleSnapUnblocked(snapId as SnapId),\n    );\n  }\n\n  /**\n   * Seeds the internal set of account-management Snaps from\n   * `SnapController:getRunnableSnaps`, then starts processing lifecycle\n   * events.\n   */\n  async init(): Promise<void> {\n    if (this.#initialized) {\n      // Do not re-init, once setup we only rely on lifecycle events to update the set of\n      // tracked Snaps.\n      return;\n    }\n\n    this.#snaps.clear();\n\n    const runnable = this.#messenger.call('SnapController:getRunnableSnaps');\n    for (const snap of runnable) {\n      if (isAccountManagementSnap(snap)) {\n        log(`Found account management Snap: ${snap.id} (initialization)`);\n        this.#snaps.add(snap.id);\n      }\n    }\n\n    this.#initialized = true;\n  }\n\n  /**\n   * Returns the IDs of all currently tracked account-management Snaps.\n   *\n   * @returns The IDs of tracked account-management Snaps.\n   */\n  getSnaps(): SnapId[] {\n    return [...this.#snaps];\n  }\n\n  /**\n   * Returns true if the given Snap ID is currently tracked and can be used.\n   *\n   * @param snapId - The Snap ID to check.\n   * @returns True if the Snap is tracked and can be used.\n   */\n  canUse(snapId: SnapId): boolean {\n    return this.#snaps.has(snapId);\n  }\n\n  /**\n   * Handles a Snap being added (installed or enabled). If the Snap is an\n   * account-management Snap, adds it to the internal set of tracked Snaps.\n   *\n   * @param snap - The Snap that was installed or enabled.\n   * @param reason - The reason the Snap was added.\n   */\n  #handleSnapAdded(snap: TruncatedSnap, reason: string): void {\n    if (!this.#initialized) {\n      return;\n    }\n\n    if (!snap.enabled || snap.blocked) {\n      return;\n    }\n\n    if (isAccountManagementSnap(snap) && !this.#snaps.has(snap.id)) {\n      log(`Added account management Snap: ${snap.id} (${reason})`);\n\n      this.#snaps.add(snap.id);\n    }\n  }\n\n  /**\n   * Handles a Snap being unblocked. If the Snap is an enabled\n   * account-management Snap, re-adds it to the internal set of tracked Snaps.\n   *\n   * @param snapId - The Snap ID that was unblocked.\n   */\n  #handleSnapUnblocked(snapId: SnapId): void {\n    if (!this.#initialized) {\n      return;\n    }\n\n    const snap = this.#messenger.call('SnapController:getSnap', snapId);\n    if (snap) {\n      this.#handleSnapAdded(snap, 'unblocked');\n    }\n  }\n\n  /**\n   * Handles a Snap being removed (disabled, blocked, or uninstalled). If the Snap is an\n   * account-management Snap, removes it from the internal set of tracked Snaps.\n   *\n   * @param snapId - The Snap ID that was disabled, blocked, or uninstalled.\n   * @param reason - The reason the Snap was removed.\n   */\n  #handleSnapRemoved(snapId: SnapId, reason: string): void {\n    if (!this.#initialized) {\n      return;\n    }\n\n    if (this.#snaps.has(snapId)) {\n      log(`Removed account management Snap: ${snapId} (${reason})`);\n\n      this.#snaps.delete(snapId);\n    }\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/snap-account-service",
-  "version": "0.2.0-preview-9fb8d00e7",
+  "version": "0.2.0-preview-e43dfcb",
   "description": "Service for Account Management Snaps",
   "keywords": [
     "Ethereum",
@@ -56,9 +56,7 @@
     "@metamask/account-api": "^1.0.4",
     "@metamask/account-tree-controller": "^7.4.0",
     "@metamask/eth-snap-keyring": "^22.0.1",
-    "@metamask/keyring-api": "^23.1.0",
     "@metamask/keyring-controller": "^25.5.0",
-    "@metamask/keyring-snap-sdk": "^9.0.1",
     "@metamask/messenger": "^1.2.0",
     "@metamask/snaps-controllers": "^19.0.0",
     "@metamask/snaps-sdk": "^11.0.0",