@metamask-previews/eth-snap-keyring 22.3.0-e51c895 → 22.4.0-5951828

package/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** `SnapKeyring` (v2) no longer inherits `SnapKeyringV1` ([#584](https://github.com/MetaMask/accounts/pull/584))
+  - Use `.v1` getter to access a v1 instance instead.
+  - `.v1` will yield `undefined` if the Snap declares v2 `capabilities` in its `endowment:keyring`.
+
+## [22.4.0]
+
+### Added
+
+- Populate v2 `SnapKeyring` `capabilities` from the Snap manifest (`endowment:keyring`) on `deserialize` ([#581](https://github.com/MetaMask/accounts/pull/581))
+- Guard v2 `SnapKeyring` operations until `deserialize` has run (throws "SnapKeyring has not been initialized") ([#581](https://github.com/MetaMask/accounts/pull/581))
+
+### Changed
+
+- Bump `@metamask/snaps-utils` from `^12.1.3` to `^12.2.1` ([#581](https://github.com/MetaMask/accounts/pull/581))
+- Bump `@metamask/keyring-internal-snap-client` from `^10.0.3` to `^10.0.4` ([#583](https://github.com/MetaMask/accounts/pull/583))
+- Bump `@metamask/keyring-snap-sdk` from `^9.0.2` to `^9.1.0` ([#583](https://github.com/MetaMask/accounts/pull/583))
+
 ## [22.3.0]
 
 ### Added
@@ -745,7 +764,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release.
 
-[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-snap-keyring@22.3.0...HEAD
+[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-snap-keyring@22.4.0...HEAD
+[22.4.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-snap-keyring@22.3.0...@metamask/eth-snap-keyring@22.4.0
 [22.3.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-snap-keyring@22.2.0...@metamask/eth-snap-keyring@22.3.0
 [22.2.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-snap-keyring@22.1.0...@metamask/eth-snap-keyring@22.2.0
 [22.1.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-snap-keyring@22.0.1...@metamask/eth-snap-keyring@22.1.0

package/dist/SnapKeyring.cjs

@@ -20,6 +20,18 @@ const account_1 = require("./account.cjs");
 const SnapKeyringMessenger_1 = require("./SnapKeyringMessenger.cjs");
 const util_1 = require("./util.cjs");
 const SnapKeyring_1 = require("./v2/SnapKeyring.cjs");
+/**
+ * Return the v1 instance of a per-snap keyring, throwing if the snap only
+ * supports the v2 protocol.
+ *
+ * @param keyring - The per-snap v2 keyring.
+ * @param feature - Human-readable feature name used in the error message.
+ * @returns The v1 instance.
+ */
+function getKeyringV1For(keyring, feature) {
+    return (keyring.v1 ??
+        (0, util_1.throwError)(`Snap '${keyring.snapId}' does not support v1 ${feature}`));
+}
 exports.SNAP_KEYRING_TYPE = 'Snap Keyring';
 /**
  * Keyring bridge implementation to support Snaps.
@@ -44,9 +56,10 @@ class SnapKeyring {
          */
         _SnapKeyring_messenger.set(this, void 0);
         /**
-         * Per-snap keyring instances. Each `SnapKeyringV2` (which extends
-         * `SnapKeyringV1`) owns a single `KeyringAccountRegistry` and handles
-         * both the event-driven v1 flow and the `KeyringV2` batch interface.
+         * Per-snap keyring instances. Each `SnapKeyringV2` owns the
+         * `KeyringAccountRegistry` and handles the `KeyringV2` batch interface.
+         * For v1 snaps, `SnapKeyringV2.v1` holds a `SnapKeyringV1` instance
+         * (with a shared registry reference) for the event-driven flow.
          */
         _SnapKeyring_snapKeyrings.set(this, void 0);
         /**
@@ -120,7 +133,7 @@ class SnapKeyring {
             throw new Error(`SnapKeyring - Received a message for an unknown snap keyring '${snapId}'`);
         }
         try {
-            return await keyring.handleKeyringSnapMessage(message);
+            return await getKeyringV1For(keyring, 'messages').handleKeyringSnapMessage(message);
         }
         finally {
             // Clean up if AccountCreated was rejected (e.g. duplicate address,
@@ -213,7 +226,7 @@ class SnapKeyring {
     /**
      * Create an account (v1 event-driven flow).
      *
-     * Delegates to the per-snap SnapKeyringV1 instance.
+     * Delegates to the per-snap SnapKeyringV2 instance (v1 flow).
      *
      * @param snapId - Snap ID to create the account for.
      * @param options - Account creation options. Differs between keyrings.
@@ -222,7 +235,7 @@ class SnapKeyring {
      */
     async createAccount(snapId, options, internalOptions) {
         const keyring = await __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_getOrCreateKeyring).call(this, snapId);
-        return keyring.createAccount(options, internalOptions);
+        return getKeyringV1For(keyring, 'account creation').createAccount(options, internalOptions);
     }
     /**
      * Creates one or more new accounts according to the provided options.
@@ -263,7 +276,7 @@ class SnapKeyring {
             throw new Error(`Unable to resolve account address: unknown Snap ID: ${snapId}`);
         }
         const keyring = await __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_getOrCreateKeyring).call(this, snapId);
-        return keyring.resolveAccountAddress(scope, request);
+        return getKeyringV1For(keyring, 'address resolution').resolveAccountAddress(scope, request);
     }
     /**
      * Submit a request to a Snap from an account ID.
@@ -283,7 +296,7 @@ class SnapKeyring {
         /* istanbul ignore next */
         const keyring = __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId) ??
             (0, util_1.throwError)(`No keyring found for snap '${snapId}'`);
-        return await keyring.submitSnapRequest({
+        return await getKeyringV1For(keyring, 'requests').submitSnapRequest({
             origin,
             account,
             method: method,
@@ -304,7 +317,7 @@ class SnapKeyring {
      */
     async signTransaction(address, transaction, _opts = {}) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signTransaction(account, transaction, _opts);
+        return getKeyringV1For(keyring, 'signing').signTransaction(account, transaction, _opts);
     }
     /**
      * Sign a typed data message.
@@ -316,7 +329,7 @@ class SnapKeyring {
      */
     async signTypedData(address, data, opts = { version: eth_sig_util_1.SignTypedDataVersion.V1 }) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signTypedData(account, data, opts);
+        return getKeyringV1For(keyring, 'signing').signTypedData(account, data, opts);
     }
     /**
      * Sign a message.
@@ -327,7 +340,7 @@ class SnapKeyring {
      */
     async signMessage(address, hash) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signMessage(account, hash);
+        return getKeyringV1For(keyring, 'signing').signMessage(account, hash);
     }
     /**
      * Sign a personal message.
@@ -341,7 +354,7 @@ class SnapKeyring {
      */
     async signPersonalMessage(address, data) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signPersonalMessage(account, data);
+        return getKeyringV1For(keyring, 'signing').signPersonalMessage(account, data);
     }
     /**
      * Convert a base transaction to a base UserOperation.
@@ -353,7 +366,7 @@ class SnapKeyring {
      */
     async prepareUserOperation(address, transactions, context) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.prepareUserOperation(account, transactions, context);
+        return getKeyringV1For(keyring, 'prepareUserOperation').prepareUserOperation(account, transactions, context);
     }
     /**
      * Patches properties of a UserOperation. Currently, only the
@@ -366,7 +379,7 @@ class SnapKeyring {
      */
     async patchUserOperation(address, userOp, context) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.patchUserOperation(account, userOp, context);
+        return getKeyringV1For(keyring, 'patchUserOperation').patchUserOperation(account, userOp, context);
     }
     /**
      * Signs a UserOperation.
@@ -378,7 +391,7 @@ class SnapKeyring {
      */
     async signUserOperation(address, userOp, context) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signUserOperation(account, userOp, context);
+        return getKeyringV1For(keyring, 'signUserOperation').signUserOperation(account, userOp, context);
     }
     /**
      * Gets the private data associated with the given address so
@@ -426,7 +439,9 @@ class SnapKeyring {
             snapAccounts.push(accountId);
             bySnap.set(snapId, snapAccounts);
         }
-        await Promise.all([...__classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").entries()].map(async ([snapId, keyring]) => keyring.setSelectedAccounts(
+        // v1 snaps receive a keyring_setSelectedAccounts notification; v2 snaps
+        // have no equivalent concept in the protocol so they are intentionally skipped.
+        await Promise.all([...__classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").entries()].map(async ([snapId, keyring]) => keyring.v1?.setSelectedAccounts(
         /* istanbul ignore next */
         bySnap.get(snapId) ?? [])));
     }

package/dist/SnapKeyring.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SnapKeyring.cjs","sourceRoot":"","sources":["../src/SnapKeyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport type { TypedDataV1, TypedMessage } from '@metamask/eth-sig-util';\nimport { SignTypedDataVersion } from '@metamask/eth-sig-util';\nimport type {\n  KeyringAccount,\n  KeyringExecutionContext,\n  EthBaseTransaction,\n  EthBaseUserOperation,\n  EthUserOperation,\n  EthUserOperationPatch,\n  ResolvedAccountAddress,\n  CaipChainId,\n  CreateAccountOptions,\n} from '@metamask/keyring-api';\nimport { AnyAccountType, KeyringEvent } from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { AccountId, JsonRpcRequest } from '@metamask/keyring-utils';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { Snap } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport { normalizeAccountAddress } from './account';\nimport type { SnapKeyringInternalOptions } from './options';\nimport type { SnapKeyringMessenger } from './SnapKeyringMessenger';\nimport { SNAP_KEYRING_NAME } from './SnapKeyringMessenger';\nimport type { AccountMethod } from './SnapKeyringV1';\nimport type { SnapMessage } from './types';\nimport { throwError, unique } from './util';\nimport { SnapKeyring as SnapKeyringV2 } from './v2/SnapKeyring';\n\nexport const SNAP_KEYRING_TYPE = 'Snap Keyring';\n\n/**\n * Snap keyring state.\n *\n * This state is persisted by the keyring controller and passed to the Snap\n * keyring when it's created.\n */\nexport type KeyringState = {\n  accounts: Record<string, { account: KeyringAccount; snapId: SnapId }>;\n};\n\n/**\n * Snap keyring callbacks.\n *\n * These callbacks are used to interact with other components.\n */\nexport type SnapKeyringCallbacks = {\n  saveState: () => Promise<void>;\n\n  addressExists(address: string): Promise<boolean>;\n\n  addAccount(\n    address: string,\n    snapId: SnapId,\n    handleUserInput: (accepted: boolean) => Promise<void>,\n    onceSaved: Promise<AccountId>,\n    accountNameSuggestion?: string,\n    internalOptions?: SnapKeyringInternalOptions,\n  ): Promise<void>;\n\n  removeAccount(\n    address: string,\n    snapId: SnapId,\n    handleUserInput: (accepted: boolean) => Promise<void>,\n  ): Promise<void>;\n\n  redirectUser(snapId: SnapId, url: string, message: string): Promise<void>;\n};\n\n/**\n * Keyring bridge implementation to support Snaps.\n */\nexport class SnapKeyring {\n  static type: string = SNAP_KEYRING_TYPE;\n\n  type: string;\n\n  // Name and state are required for modular initialisation.\n  name: typeof SNAP_KEYRING_NAME = SNAP_KEYRING_NAME;\n\n  state = null;\n\n  /**\n   * Messenger to dispatch requests to the Snaps controller.\n   */\n  readonly #messenger: SnapKeyringMessenger;\n\n  /**\n   * Per-snap keyring instances. Each `SnapKeyringV2` (which extends\n   * `SnapKeyringV1`) owns a single `KeyringAccountRegistry` and handles\n   * both the event-driven v1 flow and the `KeyringV2` batch interface.\n   */\n  readonly #snapKeyrings: Map<SnapId, SnapKeyringV2>;\n\n  /**\n   * Reverse index from account ID to the owning Snap ID.\n   *\n   * Populated and kept in sync via the `onRegister` / `onUnregister`\n   * callbacks injected into each entry. Enables O(1) routing for\n   * any \"which snap owns this account?\" query.\n   */\n  readonly #accountIndex: Map<AccountId, SnapId>;\n\n  /**\n   * Callbacks used to interact with other components.\n   */\n  readonly #callbacks: SnapKeyringCallbacks;\n\n  /**\n   * Whether to allow the creation and update of generic accounts.\n   *\n   * Account deletion is not affected by this flag and is always allowed.\n   */\n  readonly #isAnyAccountTypeAllowed: boolean;\n\n  /**\n   * Global mutex that serializes `createAccounts` calls across all snaps.\n   *\n   * `assertAccountCanBeUsed` checks global state (`#accountIndex` for ID\n   * uniqueness, `addressExists` for address uniqueness). Without serialization,\n   * two concurrent `createAccounts` calls from different snaps could both pass\n   * the uniqueness check before either one calls `setAccount`, leading to\n   * duplicate accounts. Injected into each `SnapKeyringV2` via the optional\n   * `withLock` callback.\n   */\n  readonly #lock: Mutex;\n\n  /**\n   * Serializes lazy keyring initialization in {@link SnapKeyring.#getOrCreateKeyring}.\n   *\n   * Kept separate from {@link SnapKeyring.#lock} (which guards `createAccounts`\n   * uniqueness checks) to avoid mixing concerns. The lock is held only for the\n   * duration of a single keyring's initialization - released before the caller\n   * proceeds with its operation.\n   */\n  readonly #getOrCreateKeyringLock: Mutex;\n\n  /**\n   * Create a new Snap keyring.\n   *\n   * @param options - Constructor options.\n   * @param options.messenger - Snap keyring messenger.\n   * @param options.callbacks - Callbacks used to interact with other components.\n   * @param options.isAnyAccountTypeAllowed - Whether to allow the `AnyAccountType` generic account type.\n   * @returns A new Snap keyring.\n   */\n  constructor({\n    messenger,\n    callbacks,\n    isAnyAccountTypeAllowed = false,\n  }: {\n    messenger: SnapKeyringMessenger;\n    callbacks: SnapKeyringCallbacks;\n    isAnyAccountTypeAllowed?: boolean;\n  }) {\n    this.type = SnapKeyring.type;\n    this.#messenger = messenger;\n    this.#snapKeyrings = new Map();\n    this.#accountIndex = new Map();\n    this.#callbacks = callbacks;\n    this.#isAnyAccountTypeAllowed = isAnyAccountTypeAllowed;\n    this.#lock = new Mutex();\n    this.#getOrCreateKeyringLock = new Mutex();\n  }\n\n  /**\n   * Get the SnapKeyringEntry for a Snap, creating and initializing it if it\n   * does not exist yet.\n   *\n   * When a new keyring is created it is immediately initialized by calling\n   * `deserialize({ snapId, accounts: {} })` so that `snapId` and the internal\n   * snap client are available before any event handler or method runs.\n   *\n   * Both v1 and v2 share the same KeyringAccountRegistry instance. The\n   * onRegister / onUnregister callbacks keep #accountIndex in sync regardless\n   * of which class mutates the registry.\n   *\n   * @param snapId - Snap ID.\n   * @returns The SnapKeyringEntry for the given Snap.\n   */\n  async #getOrCreateKeyring(snapId: SnapId): Promise<SnapKeyringV2> {\n    // Fast path: keyring already exists, no lock needed.\n    const existing = this.#snapKeyrings.get(snapId);\n    if (existing) {\n      return existing;\n    }\n\n    return this.#getOrCreateKeyringLock.runExclusive(async () => {\n      // Double-check: a concurrent caller may have created the keyring while\n      // we were waiting for the lock.\n      const keyring = this.#snapKeyrings.get(snapId);\n      if (keyring) {\n        return keyring;\n      }\n\n      const newKeyring = new SnapKeyringV2({\n        messenger: this.#messenger,\n        isAnyAccountTypeAllowed: this.#isAnyAccountTypeAllowed,\n        callbacks: {\n          // Optional callbacks that mutate accounts are responsible for keeping\n          // #accountIndex in sync via these callbacks.\n          onRegister: (id: AccountId): void => {\n            // We can safely use `snapId` here because we create the keyring\n            // instance right away.\n            this.#accountIndex.set(id, snapId);\n          },\n          onUnregister: (id: AccountId): void => {\n            this.#accountIndex.delete(id);\n          },\n          // Required callbacks:\n          // NOTE: `keyringSnapId` and `snapId` are the same value. The `keyringSnapId` is coming from\n          // the `deserialize` call right after.\n          addAccount: async (\n            address,\n            keyringSnapId,\n            handleUserInput,\n            onceSaved,\n            accountNameSuggestion,\n            internalOptions,\n          ): Promise<void> =>\n            this.#callbacks.addAccount(\n              address,\n              keyringSnapId,\n              handleUserInput,\n              onceSaved,\n              accountNameSuggestion,\n              internalOptions,\n            ),\n          removeAccount: async (\n            address,\n            keyringSnapId,\n            handleUserInput,\n          ): Promise<void> =>\n            this.#callbacks.removeAccount(\n              address,\n              keyringSnapId,\n              handleUserInput,\n            ),\n          saveState: async (): Promise<void> => this.#callbacks.saveState(),\n          redirectUser: async (id, url, message): Promise<void> =>\n            this.#callbacks.redirectUser(id, url, message),\n          assertAccountCanBeUsed: async (account): Promise<void> =>\n            this.#assertAccountCanBeUsed(account),\n          withLock: async <Result>(\n            callback: () => Promise<Result>,\n          ): Promise<Result> => this.#lock.runExclusive(callback),\n        },\n      });\n\n      // Initialize the keyring with its snap ID (no accounts yet).\n      await newKeyring.deserialize({ snapId, accounts: {} });\n\n      // Keyring is fully initialized; register it before releasing the lock so\n      // that no concurrent caller can create a duplicate.\n      this.#snapKeyrings.set(snapId, newKeyring);\n\n      return newKeyring;\n    });\n  }\n\n  /**\n   * Drop a per-snap keyring from {@link #snapKeyrings} when it has no accounts.\n   *\n   * Without this, deleting every account for a Snap would leave an empty\n   * `SnapKeyringV2` in the map for the rest of the session (unlike the old\n   * `SnapIdMap`, which dropped entries on delete).\n   *\n   * @param snapId - Snap ID whose keyring may be removed.\n   */\n  async #removeSnapKeyringIfEmpty(snapId: SnapId): Promise<void> {\n    const keyring = this.#snapKeyrings.get(snapId);\n    if (keyring?.accounts().length === 0) {\n      await keyring.destroy();\n      this.#snapKeyrings.delete(snapId);\n    }\n  }\n\n  /**\n   * Asserts that an account can be used within the Snap keyring. (e.g. generic accounts, unique\n   * addresses, etc...).\n   *\n   * @param account - The account to check.\n   * @throws If the account cannot be used.\n   */\n  async #assertAccountCanBeUsed(account: KeyringAccount): Promise<void> {\n    const address = normalizeAccountAddress(account);\n\n    // The `AnyAccountType.Account` generic account type is allowed only during\n    // development, so we check whether it's allowed before continuing.\n    if (\n      !this.#isAnyAccountTypeAllowed &&\n      account.type === AnyAccountType.Account\n    ) {\n      throw new Error(`Cannot create generic account '${account.id}'`);\n    }\n\n    // A Snap could try to create an account with a different address but with\n    // an existing ID, so the above test only is not enough.\n    // Account IDs are globally unique across all snaps.\n    if (this.#accountIndex.has(account.id)) {\n      throw new Error(`Account '${account.id}' already exists`);\n    }\n\n    // The UI still uses the account address to identify accounts, so we need\n    // to block the creation of duplicate accounts for now to prevent accounts\n    // from being overwritten.\n    if (await this.#callbacks.addressExists(address)) {\n      throw new Error(`Account address '${address}' already exists`);\n    }\n  }\n\n  /**\n   * Handle a message from a Snap.\n   *\n   * Only `AccountCreated` triggers lazy keyring creation via\n   * `#getOrCreateKeyring`, since that is the single entry point for the v1\n   * event-driven flow. All other events from unknown snaps throw an error.\n   * After handling `AccountCreated`, `#removeSnapKeyringIfEmpty` always runs\n   * (via `try/finally`) to clean up if account creation was rejected.\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 keyring = this.#snapKeyrings.get(snapId);\n\n    // We can create a new keyring if the message is an AccountCreated event.\n    const isAccountCreated =\n      message.method === `${KeyringEvent.AccountCreated}`;\n    if (!keyring && isAccountCreated) {\n      keyring = await this.#getOrCreateKeyring(snapId);\n    }\n\n    if (!keyring) {\n      throw new Error(\n        `SnapKeyring - Received a message for an unknown snap keyring '${snapId}'`,\n      );\n    }\n\n    try {\n      return await keyring.handleKeyringSnapMessage(message);\n    } finally {\n      // Clean up if AccountCreated was rejected (e.g. duplicate address,\n      // invalid account), leaving the snap with no registered accounts.\n      if (isAccountCreated) {\n        await this.#removeSnapKeyringIfEmpty(snapId);\n      }\n    }\n  }\n\n  /**\n   * Serialize the keyring state.\n   *\n   * Delegates to each per-snap v2 keyring and flattens back into the original\n   * external format so that `KeyringController` sees no change.\n   *\n   * @returns Serialized keyring state.\n   */\n  async serialize(): Promise<KeyringState> {\n    const accounts: KeyringState['accounts'] = {};\n    for (const keyring of this.#snapKeyrings.values()) {\n      for (const account of keyring.accounts()) {\n        accounts[account.id] = { account, snapId: keyring.snapId };\n      }\n    }\n    return { accounts };\n  }\n\n  /**\n   * Deserialize the keyring state into this keyring.\n   *\n   * Groups the flat persisted state by `snapId`, clears both indexes, then\n   * rebuilds each per-snap entry. The `onRegister` callbacks fired during\n   * `v2.deserialize()` automatically repopulate `#accountIndex`.\n   *\n   * @param state - Serialized keyring state.\n   */\n  async deserialize(state: KeyringState | undefined): Promise<void> {\n    // If the state is undefined, it means that this is a new keyring, so we\n    // don't need to do anything.\n    if (state === undefined) {\n      return;\n    }\n\n    // Group flat state by snapId. Migrations and migration logging are handled\n    // inside v2.deserialize().\n    const bySnap = new Map<SnapId, Record<AccountId, KeyringAccount>>();\n    for (const entry of Object.values(state.accounts)) {\n      const snapAccounts = bySnap.get(entry.snapId) ?? {};\n      snapAccounts[entry.account.id] = entry.account;\n      bySnap.set(entry.snapId, snapAccounts);\n    }\n\n    // Destroy existing keyrings before clearing — rejects any pending requests.\n    for (const keyring of this.#snapKeyrings.values()) {\n      await keyring.destroy();\n    }\n\n    // Clear both indexes before rebuilding — they must always be consistent.\n    this.#snapKeyrings.clear();\n    this.#accountIndex.clear();\n\n    // Rebuild per-snap keyrings. Each keyring handles its own validation\n    // and migration internally. #getOrCreateKeyring initializes the keyring\n    // with an empty state; the second deserialize call loads the real accounts.\n    for (const [snapId, accounts] of bySnap) {\n      const keyring = await this.#getOrCreateKeyring(snapId);\n      await keyring.deserialize({ snapId, accounts });\n      // onRegister callbacks fired above have repopulated #accountIndex.\n      await this.#removeSnapKeyringIfEmpty(snapId);\n    }\n  }\n\n  /**\n   * Get an account and its associated Snap ID from its ID.\n   *\n   * @param id - Account ID.\n   * @throws An error if the account could not be found.\n   * @returns The account associated with the given account ID in this keyring.\n   */\n  #getAccount(id: string): { account: KeyringAccount; snapId: SnapId } {\n    const snapId = this.#accountIndex.get(id);\n    const account = snapId\n      ? this.#snapKeyrings.get(snapId)?.lookupAccount(id)\n      : undefined;\n\n    if (!snapId || !account) {\n      throw new Error(`Unable to get account: unknown account ID: '${id}'`);\n    }\n    return { account, snapId };\n  }\n\n  /**\n   * Get the addresses of the accounts in this keyring.\n   *\n   * @returns The addresses of the accounts in this keyring.\n   */\n  async getAccounts(): Promise<string[]> {\n    const addresses: string[] = [];\n    for (const keyring of this.#snapKeyrings.values()) {\n      for (const account of keyring.accounts()) {\n        addresses.push(normalizeAccountAddress(account));\n      }\n    }\n    return unique(addresses);\n  }\n\n  /**\n   * Get the addresses of the accounts associated with a given Snap.\n   *\n   * @param snapId - Snap ID to filter by.\n   * @returns The addresses of the accounts associated with the given Snap.\n   */\n  async getAccountsBySnapId(snapId: SnapId): Promise<string[]> {\n    return unique(\n      (this.#snapKeyrings.get(snapId)?.accounts() ?? []).map(\n        normalizeAccountAddress,\n      ),\n    );\n  }\n\n  /**\n   * Create an account (v1 event-driven flow).\n   *\n   * Delegates to the per-snap SnapKeyringV1 instance.\n   *\n   * @param snapId - Snap ID to create the account for.\n   * @param options - Account creation options. Differs between keyrings.\n   * @param internalOptions - Internal Snap keyring options.\n   * @returns The account object.\n   */\n  async createAccount(\n    snapId: SnapId,\n    options: Record<string, Json>,\n    internalOptions?: SnapKeyringInternalOptions,\n  ): Promise<KeyringAccount> {\n    const keyring = await this.#getOrCreateKeyring(snapId);\n    return keyring.createAccount(options, internalOptions);\n  }\n\n  /**\n   * Creates one or more new accounts according to the provided options.\n   *\n   * Delegates to the per-snap SnapKeyringV2 instance which handles\n   * idempotency, validation, batch tracking, state persistence, and rollback.\n   *\n   * @param snapId - Snap ID to create the account(s) for.\n   * @param options - Options describing how to create the account(s).\n   * @returns An array of the created account objects.\n   */\n  async createAccounts(\n    snapId: SnapId,\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]> {\n    const keyring = await this.#getOrCreateKeyring(snapId);\n    return keyring.createAccounts(options);\n  }\n\n  /**\n   * Checks if a Snap ID is known from the keyring.\n   *\n   * @param snapId - Snap ID.\n   * @returns `true` if the Snap ID is known, `false` otherwise.\n   */\n  hasSnapId(snapId: SnapId): boolean {\n    const keyring = this.#snapKeyrings.get(snapId);\n    return keyring !== undefined && keyring.accounts().length > 0;\n  }\n\n  /**\n   * Resolve the Snap account's address associated from a signing request.\n   *\n   * @param snapId - Snap ID.\n   * @param scope - CAIP-2 chain ID.\n   * @param request - Signing request object.\n   * @throws An error if the Snap ID is not known from the keyring.\n   * @returns The resolved address if found, `null` otherwise.\n   */\n  async resolveAccountAddress(\n    snapId: SnapId,\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ): Promise<ResolvedAccountAddress | null> {\n    // We do check that the incoming Snap ID is known by the keyring.\n    if (!this.hasSnapId(snapId)) {\n      throw new Error(\n        `Unable to resolve account address: unknown Snap ID: ${snapId}`,\n      );\n    }\n\n    const keyring = await this.#getOrCreateKeyring(snapId);\n    return keyring.resolveAccountAddress(scope, request);\n  }\n\n  /**\n   * Submit a request to a Snap from an account ID.\n   *\n   * This request cannot be an asynchronous keyring request.\n   *\n   * @param opts - Request options.\n   * @param opts.origin - Send origin.\n   * @param opts.account - Account ID.\n   * @param opts.method - Method to call.\n   * @param opts.params - Method parameters.\n   * @param opts.scope - Selected chain ID (CAIP-2).\n   * @returns Promise that resolves to the result of the method call.\n   */\n  async submitRequest({\n    origin,\n    account: accountId,\n    method,\n    params,\n    scope,\n  }: {\n    origin: string;\n    // NOTE: We use `account` here rather than `id` to avoid ambiguity with a \"request ID\".\n    // We already use this same field name for `KeyringAccount`s.\n    account: string;\n    method: string;\n    params?: Json[] | Record<string, Json>;\n    scope: string;\n  }): Promise<Json> {\n    const { account, snapId } = this.#getAccount(accountId);\n    /* istanbul ignore next */\n    const keyring =\n      this.#snapKeyrings.get(snapId) ??\n      throwError(`No keyring found for snap '${snapId}'`);\n\n    return await keyring.submitSnapRequest({\n      origin,\n      account,\n      method: method as AccountMethod,\n      params,\n      scope,\n      // For non-EVM (in the context of the multichain API and SIP-26), we enforce responses\n      // to be synchronous.\n      noPending: true,\n    });\n  }\n\n  /**\n   * Sign a transaction.\n   *\n   * @param address - Sender's address.\n   * @param transaction - Transaction.\n   * @param _opts - Transaction options (not used).\n   * @returns A promise that resolves to the signed transaction.\n   */\n  async signTransaction(\n    address: string,\n    transaction: TypedTransaction,\n    _opts = {},\n  ): Promise<Json | TypedTransaction> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return keyring.signTransaction(account, transaction, _opts);\n  }\n\n  /**\n   * Sign a typed data message.\n   *\n   * @param address - Signer's address.\n   * @param data - Data to sign.\n   * @param opts - Signing options.\n   * @returns The signature.\n   */\n  async signTypedData(\n    address: string,\n    data: Record<string, unknown>[] | TypedDataV1 | TypedMessage<any>,\n    opts = { version: SignTypedDataVersion.V1 },\n  ): Promise<string> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return keyring.signTypedData(account, data, opts);\n  }\n\n  /**\n   * Sign a message.\n   *\n   * @param address - Signer's address.\n   * @param hash - Data to sign.\n   * @returns The signature.\n   */\n  async signMessage(address: string, hash: any): Promise<string> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return keyring.signMessage(account, hash);\n  }\n\n  /**\n   * Sign a personal message.\n   *\n   * Note: KeyringController says this should return a Buffer but it actually\n   * expects a string.\n   *\n   * @param address - Signer's address.\n   * @param data - Data to sign.\n   * @returns Promise of the signature.\n   */\n  async signPersonalMessage(address: string, data: any): Promise<string> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return keyring.signPersonalMessage(account, data);\n  }\n\n  /**\n   * Convert a base transaction to a base UserOperation.\n   *\n   * @param address - Address of the sender.\n   * @param transactions - Base transactions to include in the UserOperation.\n   * @param context - Keyring execution context.\n   * @returns A pseudo-UserOperation that can be used to construct a real.\n   */\n  async prepareUserOperation(\n    address: string,\n    transactions: EthBaseTransaction[],\n    context: KeyringExecutionContext,\n  ): Promise<EthBaseUserOperation> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return keyring.prepareUserOperation(account, transactions, context);\n  }\n\n  /**\n   * Patches properties of a UserOperation. Currently, only the\n   * `paymasterAndData` can be patched.\n   *\n   * @param address - Address of the sender.\n   * @param userOp - UserOperation to patch.\n   * @param context - Keyring execution context.\n   * @returns A patch to apply to the UserOperation.\n   */\n  async patchUserOperation(\n    address: string,\n    userOp: EthUserOperation,\n    context: KeyringExecutionContext,\n  ): Promise<EthUserOperationPatch> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return keyring.patchUserOperation(account, userOp, context);\n  }\n\n  /**\n   * Signs a UserOperation.\n   *\n   * @param address - Address of the sender.\n   * @param userOp - UserOperation to sign.\n   * @param context - Keyring execution context.\n   * @returns The signature of the UserOperation.\n   */\n  async signUserOperation(\n    address: string,\n    userOp: EthUserOperation,\n    context: KeyringExecutionContext,\n  ): Promise<string> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return keyring.signUserOperation(account, userOp, context);\n  }\n\n  /**\n   * Gets the private data associated with the given address so\n   * that it may be exported.\n   *\n   * If this keyring contains duplicate public keys the first\n   * matching address is exported.\n   *\n   * Used by the UI to export an account.\n   *\n   * @param _address - Address of the account to export.\n   */\n  exportAccount(_address: string): [Uint8Array, Json] | undefined {\n    throw new Error('Exporting accounts from snaps is not supported.');\n  }\n\n  /**\n   * Removes the account matching the given address.\n   *\n   * Delegates to the per-snap SnapKeyringV2 keyring which handles\n   * registry removal, index cleanup, and snap communication.\n   *\n   * @param address - Address of the account to remove.\n   */\n  async removeAccount(address: string): Promise<void> {\n    const { account, keyring } = this.#resolveAddress(address);\n    await keyring.deleteAccount(account.id);\n    await this.#removeSnapKeyringIfEmpty(keyring.snapId);\n  }\n\n  /**\n   * Resolve an address to an account and its owning keyring entry.\n   *\n   * @param address - Address of the account to resolve.\n   * @returns Account and the per-snap keyring that owns it. Throws if not\n   * found.\n   */\n  #resolveAddress(address: string): {\n    account: KeyringAccount;\n    keyring: SnapKeyringV2;\n  } {\n    for (const keyring of this.#snapKeyrings.values()) {\n      const account = keyring.lookupByAddress(address);\n      if (account) {\n        return { account, keyring };\n      }\n    }\n    return throwError(`Account '${address}' not found`);\n  }\n\n  /**\n   * Set the selected accounts.\n   *\n   * Distributes the global list by snap and forwards to each v1 instance.\n   *\n   * @param accounts - The accounts to set as selected.\n   */\n  async setSelectedAccounts(accounts: AccountId[]): Promise<void> {\n    // Build per-snap distribution using the account index.\n    const bySnap = new Map<SnapId, AccountId[]>();\n    for (const accountId of accounts) {\n      const snapId = this.#accountIndex.get(accountId);\n      if (!snapId) {\n        continue;\n      }\n      const snapAccounts = bySnap.get(snapId) ?? [];\n      snapAccounts.push(accountId);\n      bySnap.set(snapId, snapAccounts);\n    }\n\n    await Promise.all(\n      [...this.#snapKeyrings.entries()].map(async ([snapId, keyring]) =>\n        keyring.setSelectedAccounts(\n          /* istanbul ignore next */\n          bySnap.get(snapId) ?? [],\n        ),\n      ),\n    );\n  }\n\n  /**\n   * Get the Snap associated with the given Snap ID.\n   *\n   * @param snapId - Snap ID.\n   * @returns The Snap or undefined if the Snap cannot be found.\n   */\n  #getSnap(snapId: SnapId): Snap | null {\n    return this.#messenger.call('SnapController:getSnap', snapId);\n  }\n\n  /**\n   * Get the metadata of a Snap keyring account.\n   *\n   * @param snapId - Snap ID.\n   * @returns The Snap metadata or undefined if the Snap cannot be found.\n   */\n  #getSnapMetadata(\n    snapId: SnapId,\n  ): InternalAccount['metadata']['snap'] | undefined {\n    const snap = this.#getSnap(snapId);\n    return snap ? { id: snapId } : undefined;\n  }\n\n  #transformToInternalAccount(\n    account: KeyringAccount,\n    snapId: SnapId,\n  ): InternalAccount {\n    const snap = this.#getSnapMetadata(snapId);\n\n    return {\n      ...account,\n      // TODO: Do not convert the address to lowercase.\n      //\n      // This is a workaround to support the current UI which expects the\n      // account address to be lowercase. This workaround should be removed\n      // once we migrated the UI to use the account ID instead of the account\n      // address.\n      //\n      // NOTE: We convert the address only for EVM accounts, see\n      // `normalizeAccountAddress`.\n      address: normalizeAccountAddress(account),\n      metadata: {\n        name: '',\n        importTime: 0,\n        keyring: {\n          type: this.type,\n        },\n        ...(snap !== undefined && { snap }),\n      },\n    };\n  }\n\n  /**\n   * Return an internal account object for a given address.\n   *\n   * @param address - Address of the account to return.\n   * @returns An internal account object for the given address.\n   */\n  getAccountByAddress(address: string): InternalAccount | undefined {\n    for (const [snapId, keyring] of this.#snapKeyrings) {\n      const account = keyring.lookupByAddress(address);\n      if (account) {\n        return this.#transformToInternalAccount(account, snapId);\n      }\n    }\n    return undefined;\n  }\n\n  /**\n   * List all Snap keyring accounts.\n   * This method is expensive on mobile devices and could takes tens or hundreds of milliseconds to complete.\n   * Use with caution.\n   *\n   * @returns An array containing all Snap keyring accounts.\n   */\n  listAccounts(): InternalAccount[] {\n    const accounts: InternalAccount[] = [];\n    for (const [snapId, keyring] of this.#snapKeyrings) {\n      for (const account of keyring.accounts()) {\n        accounts.push(this.#transformToInternalAccount(account, snapId));\n      }\n    }\n    return accounts;\n  }\n}\n"]}
+{"version":3,"file":"SnapKeyring.cjs","sourceRoot":"","sources":["../src/SnapKeyring.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,yDAA8D;AAY9D,uDAAqE;AAMrE,6CAAoC;AAEpC,2CAAoD;AAGpD,qEAA2D;AAG3D,qCAA4C;AAC5C,sDAAgE;AAEhE;;;;;;;GAOG;AACH,SAAS,eAAe,CACtB,OAAsB,EACtB,OAAe;IAEf,OAAO,CACL,OAAO,CAAC,EAAE;QACV,IAAA,iBAAU,EAAC,SAAS,OAAO,CAAC,MAAM,yBAAyB,OAAO,EAAE,CAAC,CACtE,CAAC;AACJ,CAAC;AAEY,QAAA,iBAAiB,GAAG,cAAc,CAAC;AAwChD;;GAEG;AACH,MAAa,WAAW;IAkEtB;;;;;;;;OAQG;IACH,YAAY,EACV,SAAS,EACT,SAAS,EACT,uBAAuB,GAAG,KAAK,GAKhC;;QA9ED,0DAA0D;QAC1D,SAAI,GAA6B,wCAAiB,CAAC;QAEnD,UAAK,GAAG,IAAI,CAAC;QAEb;;WAEG;QACM,yCAAiC;QAE1C;;;;;WAKG;QACM,4CAA0C;QAEnD;;;;;;WAMG;QACM,4CAAsC;QAE/C;;WAEG;QACM,yCAAiC;QAE1C;;;;WAIG;QACM,uDAAkC;QAE3C;;;;;;;;;WASG;QACM,oCAAa;QAEtB;;;;;;;WAOG;QACM,sDAA+B;QAoBtC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;QAC7B,uBAAA,IAAI,0BAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,6BAAiB,IAAI,GAAG,EAAE,MAAA,CAAC;QAC/B,uBAAA,IAAI,6BAAiB,IAAI,GAAG,EAAE,MAAA,CAAC;QAC/B,uBAAA,IAAI,0BAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,wCAA4B,uBAAuB,MAAA,CAAC;QACxD,uBAAA,IAAI,qBAAS,IAAI,mBAAK,EAAE,MAAA,CAAC;QACzB,uBAAA,IAAI,uCAA2B,IAAI,mBAAK,EAAE,MAAA,CAAC;IAC7C,CAAC;IAoJD;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,wBAAwB,CAC5B,MAAc,EACd,OAAoB;QAEpB,IAAI,OAAO,GAAG,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE7C,yEAAyE;QACzE,MAAM,gBAAgB,GACpB,OAAO,CAAC,MAAM,KAAK,GAAG,0BAAY,CAAC,cAAc,EAAE,CAAC;QACtD,IAAI,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;YACjC,OAAO,GAAG,MAAM,uBAAA,IAAI,+DAAoB,MAAxB,IAAI,EAAqB,MAAM,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,iEAAiE,MAAM,GAAG,CAC3E,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,OAAO,MAAM,eAAe,CAC1B,OAAO,EACP,UAAU,CACX,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;gBAAS,CAAC;YACT,mEAAmE;YACnE,kEAAkE;YAClE,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,uBAAA,IAAI,qEAA0B,MAA9B,IAAI,EAA2B,MAAM,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,SAAS;QACb,MAAM,QAAQ,GAA6B,EAAE,CAAC;QAC9C,KAAK,MAAM,OAAO,IAAI,uBAAA,IAAI,iCAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YAClD,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACzC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;YAC7D,CAAC;QACH,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,WAAW,CAAC,KAA+B;QAC/C,wEAAwE;QACxE,6BAA6B;QAC7B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,2EAA2E;QAC3E,2BAA2B;QAC3B,MAAM,MAAM,GAAG,IAAI,GAAG,EAA6C,CAAC;QACpE,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClD,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACpD,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC;YAC/C,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACzC,CAAC;QAED,4EAA4E;QAC5E,KAAK,MAAM,OAAO,IAAI,uBAAA,IAAI,iCAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YAClD,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC;QAED,yEAAyE;QACzE,uBAAA,IAAI,iCAAc,CAAC,KAAK,EAAE,CAAC;QAC3B,uBAAA,IAAI,iCAAc,CAAC,KAAK,EAAE,CAAC;QAE3B,qEAAqE;QACrE,wEAAwE;QACxE,4EAA4E;QAC5E,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,+DAAoB,MAAxB,IAAI,EAAqB,MAAM,CAAC,CAAC;YACvD,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAChD,mEAAmE;YACnE,MAAM,uBAAA,IAAI,qEAA0B,MAA9B,IAAI,EAA2B,MAAM,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAqBD;;;;OAIG;IACH,KAAK,CAAC,WAAW;QACf,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,KAAK,MAAM,OAAO,IAAI,uBAAA,IAAI,iCAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YAClD,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACzC,SAAS,CAAC,IAAI,CAAC,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QACD,OAAO,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,mBAAmB,CAAC,MAAc;QACtC,OAAO,IAAA,aAAM,EACX,CAAC,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CACpD,iCAAuB,CACxB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,aAAa,CACjB,MAAc,EACd,OAA6B,EAC7B,eAA4C;QAE5C,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,+DAAoB,MAAxB,IAAI,EAAqB,MAAM,CAAC,CAAC;QACvD,OAAO,eAAe,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,aAAa,CAC/D,OAAO,EACP,eAAe,CAChB,CAAC;IACJ,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,cAAc,CAClB,MAAc,EACd,OAA6B;QAE7B,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,+DAAoB,MAAxB,IAAI,EAAqB,MAAM,CAAC,CAAC;QACvD,OAAO,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,MAAc;QACtB,MAAM,OAAO,GAAG,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,qBAAqB,CACzB,MAAc,EACd,KAAkB,EAClB,OAAuB;QAEvB,iEAAiE;QACjE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,uDAAuD,MAAM,EAAE,CAChE,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,uBAAA,IAAI,+DAAoB,MAAxB,IAAI,EAAqB,MAAM,CAAC,CAAC;QACvD,OAAO,eAAe,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,qBAAqB,CACzE,KAAK,EACL,OAAO,CACR,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,aAAa,CAAC,EAClB,MAAM,EACN,OAAO,EAAE,SAAS,EAClB,MAAM,EACN,MAAM,EACN,KAAK,GASN;QACC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,uBAAA,IAAI,uDAAY,MAAhB,IAAI,EAAa,SAAS,CAAC,CAAC;QACxD,0BAA0B;QAC1B,MAAM,OAAO,GACX,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,CAAC;YAC9B,IAAA,iBAAU,EAAC,8BAA8B,MAAM,GAAG,CAAC,CAAC;QAEtD,OAAO,MAAM,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,iBAAiB,CAAC;YAClE,MAAM;YACN,OAAO;YACP,MAAM,EAAE,MAAuB;YAC/B,MAAM;YACN,KAAK;YACL,sFAAsF;YACtF,qBAAqB;YACrB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,eAAe,CACnB,OAAe,EACf,WAA6B,EAC7B,KAAK,GAAG,EAAE;QAEV,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,OAAO,CAAC,CAAC;QAC3D,OAAO,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,eAAe,CACxD,OAAO,EACP,WAAW,EACX,KAAK,CACN,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,aAAa,CACjB,OAAe,EACf,IAAiE,EACjE,IAAI,GAAG,EAAE,OAAO,EAAE,mCAAoB,CAAC,EAAE,EAAE;QAE3C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,OAAO,CAAC,CAAC;QAC3D,OAAO,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,aAAa,CACtD,OAAO,EACP,IAAI,EACJ,IAAI,CACL,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,IAAS;QAC1C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,OAAO,CAAC,CAAC;QAC3D,OAAO,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,mBAAmB,CAAC,OAAe,EAAE,IAAS;QAClD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,OAAO,CAAC,CAAC;QAC3D,OAAO,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,mBAAmB,CAC5D,OAAO,EACP,IAAI,CACL,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,oBAAoB,CACxB,OAAe,EACf,YAAkC,EAClC,OAAgC;QAEhC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,OAAO,CAAC,CAAC;QAC3D,OAAO,eAAe,CACpB,OAAO,EACP,sBAAsB,CACvB,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,kBAAkB,CACtB,OAAe,EACf,MAAwB,EACxB,OAAgC;QAEhC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,OAAO,CAAC,CAAC;QAC3D,OAAO,eAAe,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,kBAAkB,CACtE,OAAO,EACP,MAAM,EACN,OAAO,CACR,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,iBAAiB,CACrB,OAAe,EACf,MAAwB,EACxB,OAAgC;QAEhC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,OAAO,CAAC,CAAC;QAC3D,OAAO,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,iBAAiB,CACpE,OAAO,EACP,MAAM,EACN,OAAO,CACR,CAAC;IACJ,CAAC;IAED;;;;;;;;;;OAUG;IACH,aAAa,CAAC,QAAgB;QAC5B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,aAAa,CAAC,OAAe;QACjC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,OAAO,CAAC,CAAC;QAC3D,MAAM,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,uBAAA,IAAI,qEAA0B,MAA9B,IAAI,EAA2B,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAsBD;;;;;;OAMG;IACH,KAAK,CAAC,mBAAmB,CAAC,QAAqB;QAC7C,uDAAuD;QACvD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAuB,CAAC;QAC9C,KAAK,MAAM,SAAS,IAAI,QAAQ,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,SAAS;YACX,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC9C,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACnC,CAAC;QAED,wEAAwE;QACxE,gFAAgF;QAChF,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,uBAAA,IAAI,iCAAc,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,CAChE,OAAO,CAAC,EAAE,EAAE,mBAAmB;QAC7B,0BAA0B;QAC1B,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CACzB,CACF,CACF,CAAC;IACJ,CAAC;IAsDD;;;;;OAKG;IACH,mBAAmB,CAAC,OAAe;QACjC,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,uBAAA,IAAI,iCAAc,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,uBAAA,IAAI,uEAA4B,MAAhC,IAAI,EAA6B,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;OAMG;IACH,YAAY;QACV,MAAM,QAAQ,GAAsB,EAAE,CAAC;QACvC,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,uBAAA,IAAI,iCAAc,EAAE,CAAC;YACnD,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACzC,QAAQ,CAAC,IAAI,CAAC,uBAAA,IAAI,uEAA4B,MAAhC,IAAI,EAA6B,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;;AArzBH,kCAszBC;;AAxtBC;;;;;;;;;;;;;;GAcG;AACH,KAAK,0CAAqB,MAAc;IACtC,qDAAqD;IACrD,MAAM,QAAQ,GAAG,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,uBAAA,IAAI,2CAAwB,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;QAC1D,uEAAuE;QACvE,gCAAgC;QAChC,MAAM,OAAO,GAAG,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,yBAAa,CAAC;YACnC,SAAS,EAAE,uBAAA,IAAI,8BAAW;YAC1B,uBAAuB,EAAE,uBAAA,IAAI,4CAAyB;YACtD,SAAS,EAAE;gBACT,sEAAsE;gBACtE,6CAA6C;gBAC7C,UAAU,EAAE,CAAC,EAAa,EAAQ,EAAE;oBAClC,gEAAgE;oBAChE,uBAAuB;oBACvB,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;gBACrC,CAAC;gBACD,YAAY,EAAE,CAAC,EAAa,EAAQ,EAAE;oBACpC,uBAAA,IAAI,iCAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAChC,CAAC;gBACD,sBAAsB;gBACtB,4FAA4F;gBAC5F,sCAAsC;gBACtC,UAAU,EAAE,KAAK,EACf,OAAO,EACP,aAAa,EACb,eAAe,EACf,SAAS,EACT,qBAAqB,EACrB,eAAe,EACA,EAAE,CACjB,uBAAA,IAAI,8BAAW,CAAC,UAAU,CACxB,OAAO,EACP,aAAa,EACb,eAAe,EACf,SAAS,EACT,qBAAqB,EACrB,eAAe,CAChB;gBACH,aAAa,EAAE,KAAK,EAClB,OAAO,EACP,aAAa,EACb,eAAe,EACA,EAAE,CACjB,uBAAA,IAAI,8BAAW,CAAC,aAAa,CAC3B,OAAO,EACP,aAAa,EACb,eAAe,CAChB;gBACH,SAAS,EAAE,KAAK,IAAmB,EAAE,CAAC,uBAAA,IAAI,8BAAW,CAAC,SAAS,EAAE;gBACjE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAiB,EAAE,CACtD,uBAAA,IAAI,8BAAW,CAAC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC;gBAChD,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAiB,EAAE,CACvD,uBAAA,IAAI,mEAAwB,MAA5B,IAAI,EAAyB,OAAO,CAAC;gBACvC,QAAQ,EAAE,KAAK,EACb,QAA+B,EACd,EAAE,CAAC,uBAAA,IAAI,yBAAM,CAAC,YAAY,CAAC,QAAQ,CAAC;aACxD;SACF,CAAC,CAAC;QAEH,6DAA6D;QAC7D,MAAM,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;QAEvD,yEAAyE;QACzE,oDAAoD;QACpD,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAE3C,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,gDAA2B,MAAc;IAC5C,MAAM,OAAO,GAAG,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/C,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,uBAAA,IAAI,iCAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,KAAK,8CAAyB,OAAuB;IACnD,MAAM,OAAO,GAAG,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC;IAEjD,2EAA2E;IAC3E,mEAAmE;IACnE,IACE,CAAC,uBAAA,IAAI,4CAAyB;QAC9B,OAAO,CAAC,IAAI,KAAK,4BAAc,CAAC,OAAO,EACvC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,kCAAkC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,0EAA0E;IAC1E,wDAAwD;IACxD,oDAAoD;IACpD,IAAI,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAC5D,CAAC;IAED,yEAAyE;IACzE,0EAA0E;IAC1E,0BAA0B;IAC1B,IAAI,MAAM,uBAAA,IAAI,8BAAW,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,kBAAkB,CAAC,CAAC;IACjE,CAAC;AACH,CAAC,6DAsHW,EAAU;IACpB,MAAM,MAAM,GAAG,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM;QACpB,CAAC,CAAC,uBAAA,IAAI,iCAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,EAAE,CAAC;QACnD,CAAC,CAAC,SAAS,CAAC;IAEd,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,+CAA+C,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC,qEAuUe,OAAe;IAI7B,KAAK,MAAM,OAAO,IAAI,uBAAA,IAAI,iCAAc,CAAC,MAAM,EAAE,EAAE,CAAC;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,OAAO,IAAA,iBAAU,EAAC,YAAY,OAAO,aAAa,CAAC,CAAC;AACtD,CAAC,uDAwCQ,MAAc;IACrB,OAAO,uBAAA,IAAI,8BAAW,CAAC,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;AAChE,CAAC,uEASC,MAAc;IAEd,MAAM,IAAI,GAAG,uBAAA,IAAI,oDAAS,MAAb,IAAI,EAAU,MAAM,CAAC,CAAC;IACnC,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3C,CAAC,6FAGC,OAAuB,EACvB,MAAc;IAEd,MAAM,IAAI,GAAG,uBAAA,IAAI,4DAAiB,MAArB,IAAI,EAAkB,MAAM,CAAC,CAAC;IAE3C,OAAO;QACL,GAAG,OAAO;QACV,iDAAiD;QACjD,EAAE;QACF,mEAAmE;QACnE,qEAAqE;QACrE,uEAAuE;QACvE,WAAW;QACX,EAAE;QACF,0DAA0D;QAC1D,6BAA6B;QAC7B,OAAO,EAAE,IAAA,iCAAuB,EAAC,OAAO,CAAC;QACzC,QAAQ,EAAE;YACR,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,CAAC;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;YACD,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC;SACpC;KACF,CAAC;AACJ,CAAC;AAnxBM,gBAAI,GAAW,yBAAiB,AAA5B,CAA6B","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport type { TypedDataV1, TypedMessage } from '@metamask/eth-sig-util';\nimport { SignTypedDataVersion } from '@metamask/eth-sig-util';\nimport type {\n  KeyringAccount,\n  KeyringExecutionContext,\n  EthBaseTransaction,\n  EthBaseUserOperation,\n  EthUserOperation,\n  EthUserOperationPatch,\n  ResolvedAccountAddress,\n  CaipChainId,\n  CreateAccountOptions,\n} from '@metamask/keyring-api';\nimport { AnyAccountType, KeyringEvent } from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { AccountId, JsonRpcRequest } from '@metamask/keyring-utils';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { Snap } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport { normalizeAccountAddress } from './account';\nimport type { SnapKeyringInternalOptions } from './options';\nimport type { SnapKeyringMessenger } from './SnapKeyringMessenger';\nimport { SNAP_KEYRING_NAME } from './SnapKeyringMessenger';\nimport type { AccountMethod, SnapKeyringV1 } from './SnapKeyringV1';\nimport type { SnapMessage } from './types';\nimport { throwError, unique } from './util';\nimport { SnapKeyring as SnapKeyringV2 } from './v2/SnapKeyring';\n\n/**\n * Return the v1 instance of a per-snap keyring, throwing if the snap only\n * supports the v2 protocol.\n *\n * @param keyring - The per-snap v2 keyring.\n * @param feature - Human-readable feature name used in the error message.\n * @returns The v1 instance.\n */\nfunction getKeyringV1For(\n  keyring: SnapKeyringV2,\n  feature: string,\n): SnapKeyringV1 {\n  return (\n    keyring.v1 ??\n    throwError(`Snap '${keyring.snapId}' does not support v1 ${feature}`)\n  );\n}\n\nexport const SNAP_KEYRING_TYPE = 'Snap Keyring';\n\n/**\n * Snap keyring state.\n *\n * This state is persisted by the keyring controller and passed to the Snap\n * keyring when it's created.\n */\nexport type KeyringState = {\n  accounts: Record<string, { account: KeyringAccount; snapId: SnapId }>;\n};\n\n/**\n * Snap keyring callbacks.\n *\n * These callbacks are used to interact with other components.\n */\nexport type SnapKeyringCallbacks = {\n  saveState: () => Promise<void>;\n\n  addressExists(address: string): Promise<boolean>;\n\n  addAccount(\n    address: string,\n    snapId: SnapId,\n    handleUserInput: (accepted: boolean) => Promise<void>,\n    onceSaved: Promise<AccountId>,\n    accountNameSuggestion?: string,\n    internalOptions?: SnapKeyringInternalOptions,\n  ): Promise<void>;\n\n  removeAccount(\n    address: string,\n    snapId: SnapId,\n    handleUserInput: (accepted: boolean) => Promise<void>,\n  ): Promise<void>;\n\n  redirectUser(snapId: SnapId, url: string, message: string): Promise<void>;\n};\n\n/**\n * Keyring bridge implementation to support Snaps.\n */\nexport class SnapKeyring {\n  static type: string = SNAP_KEYRING_TYPE;\n\n  type: string;\n\n  // Name and state are required for modular initialisation.\n  name: typeof SNAP_KEYRING_NAME = SNAP_KEYRING_NAME;\n\n  state = null;\n\n  /**\n   * Messenger to dispatch requests to the Snaps controller.\n   */\n  readonly #messenger: SnapKeyringMessenger;\n\n  /**\n   * Per-snap keyring instances. Each `SnapKeyringV2` owns the\n   * `KeyringAccountRegistry` and handles the `KeyringV2` batch interface.\n   * For v1 snaps, `SnapKeyringV2.v1` holds a `SnapKeyringV1` instance\n   * (with a shared registry reference) for the event-driven flow.\n   */\n  readonly #snapKeyrings: Map<SnapId, SnapKeyringV2>;\n\n  /**\n   * Reverse index from account ID to the owning Snap ID.\n   *\n   * Populated and kept in sync via the `onRegister` / `onUnregister`\n   * callbacks injected into each entry. Enables O(1) routing for\n   * any \"which snap owns this account?\" query.\n   */\n  readonly #accountIndex: Map<AccountId, SnapId>;\n\n  /**\n   * Callbacks used to interact with other components.\n   */\n  readonly #callbacks: SnapKeyringCallbacks;\n\n  /**\n   * Whether to allow the creation and update of generic accounts.\n   *\n   * Account deletion is not affected by this flag and is always allowed.\n   */\n  readonly #isAnyAccountTypeAllowed: boolean;\n\n  /**\n   * Global mutex that serializes `createAccounts` calls across all snaps.\n   *\n   * `assertAccountCanBeUsed` checks global state (`#accountIndex` for ID\n   * uniqueness, `addressExists` for address uniqueness). Without serialization,\n   * two concurrent `createAccounts` calls from different snaps could both pass\n   * the uniqueness check before either one calls `setAccount`, leading to\n   * duplicate accounts. Injected into each `SnapKeyringV2` via the optional\n   * `withLock` callback.\n   */\n  readonly #lock: Mutex;\n\n  /**\n   * Serializes lazy keyring initialization in {@link SnapKeyring.#getOrCreateKeyring}.\n   *\n   * Kept separate from {@link SnapKeyring.#lock} (which guards `createAccounts`\n   * uniqueness checks) to avoid mixing concerns. The lock is held only for the\n   * duration of a single keyring's initialization - released before the caller\n   * proceeds with its operation.\n   */\n  readonly #getOrCreateKeyringLock: Mutex;\n\n  /**\n   * Create a new Snap keyring.\n   *\n   * @param options - Constructor options.\n   * @param options.messenger - Snap keyring messenger.\n   * @param options.callbacks - Callbacks used to interact with other components.\n   * @param options.isAnyAccountTypeAllowed - Whether to allow the `AnyAccountType` generic account type.\n   * @returns A new Snap keyring.\n   */\n  constructor({\n    messenger,\n    callbacks,\n    isAnyAccountTypeAllowed = false,\n  }: {\n    messenger: SnapKeyringMessenger;\n    callbacks: SnapKeyringCallbacks;\n    isAnyAccountTypeAllowed?: boolean;\n  }) {\n    this.type = SnapKeyring.type;\n    this.#messenger = messenger;\n    this.#snapKeyrings = new Map();\n    this.#accountIndex = new Map();\n    this.#callbacks = callbacks;\n    this.#isAnyAccountTypeAllowed = isAnyAccountTypeAllowed;\n    this.#lock = new Mutex();\n    this.#getOrCreateKeyringLock = new Mutex();\n  }\n\n  /**\n   * Get the SnapKeyringEntry for a Snap, creating and initializing it if it\n   * does not exist yet.\n   *\n   * When a new keyring is created it is immediately initialized by calling\n   * `deserialize({ snapId, accounts: {} })` so that `snapId` and the internal\n   * snap client are available before any event handler or method runs.\n   *\n   * Both v1 and v2 share the same KeyringAccountRegistry instance. The\n   * onRegister / onUnregister callbacks keep #accountIndex in sync regardless\n   * of which class mutates the registry.\n   *\n   * @param snapId - Snap ID.\n   * @returns The SnapKeyringEntry for the given Snap.\n   */\n  async #getOrCreateKeyring(snapId: SnapId): Promise<SnapKeyringV2> {\n    // Fast path: keyring already exists, no lock needed.\n    const existing = this.#snapKeyrings.get(snapId);\n    if (existing) {\n      return existing;\n    }\n\n    return this.#getOrCreateKeyringLock.runExclusive(async () => {\n      // Double-check: a concurrent caller may have created the keyring while\n      // we were waiting for the lock.\n      const keyring = this.#snapKeyrings.get(snapId);\n      if (keyring) {\n        return keyring;\n      }\n\n      const newKeyring = new SnapKeyringV2({\n        messenger: this.#messenger,\n        isAnyAccountTypeAllowed: this.#isAnyAccountTypeAllowed,\n        callbacks: {\n          // Optional callbacks that mutate accounts are responsible for keeping\n          // #accountIndex in sync via these callbacks.\n          onRegister: (id: AccountId): void => {\n            // We can safely use `snapId` here because we create the keyring\n            // instance right away.\n            this.#accountIndex.set(id, snapId);\n          },\n          onUnregister: (id: AccountId): void => {\n            this.#accountIndex.delete(id);\n          },\n          // Required callbacks:\n          // NOTE: `keyringSnapId` and `snapId` are the same value. The `keyringSnapId` is coming from\n          // the `deserialize` call right after.\n          addAccount: async (\n            address,\n            keyringSnapId,\n            handleUserInput,\n            onceSaved,\n            accountNameSuggestion,\n            internalOptions,\n          ): Promise<void> =>\n            this.#callbacks.addAccount(\n              address,\n              keyringSnapId,\n              handleUserInput,\n              onceSaved,\n              accountNameSuggestion,\n              internalOptions,\n            ),\n          removeAccount: async (\n            address,\n            keyringSnapId,\n            handleUserInput,\n          ): Promise<void> =>\n            this.#callbacks.removeAccount(\n              address,\n              keyringSnapId,\n              handleUserInput,\n            ),\n          saveState: async (): Promise<void> => this.#callbacks.saveState(),\n          redirectUser: async (id, url, message): Promise<void> =>\n            this.#callbacks.redirectUser(id, url, message),\n          assertAccountCanBeUsed: async (account): Promise<void> =>\n            this.#assertAccountCanBeUsed(account),\n          withLock: async <Result>(\n            callback: () => Promise<Result>,\n          ): Promise<Result> => this.#lock.runExclusive(callback),\n        },\n      });\n\n      // Initialize the keyring with its snap ID (no accounts yet).\n      await newKeyring.deserialize({ snapId, accounts: {} });\n\n      // Keyring is fully initialized; register it before releasing the lock so\n      // that no concurrent caller can create a duplicate.\n      this.#snapKeyrings.set(snapId, newKeyring);\n\n      return newKeyring;\n    });\n  }\n\n  /**\n   * Drop a per-snap keyring from {@link #snapKeyrings} when it has no accounts.\n   *\n   * Without this, deleting every account for a Snap would leave an empty\n   * `SnapKeyringV2` in the map for the rest of the session (unlike the old\n   * `SnapIdMap`, which dropped entries on delete).\n   *\n   * @param snapId - Snap ID whose keyring may be removed.\n   */\n  async #removeSnapKeyringIfEmpty(snapId: SnapId): Promise<void> {\n    const keyring = this.#snapKeyrings.get(snapId);\n    if (keyring?.accounts().length === 0) {\n      await keyring.destroy();\n      this.#snapKeyrings.delete(snapId);\n    }\n  }\n\n  /**\n   * Asserts that an account can be used within the Snap keyring. (e.g. generic accounts, unique\n   * addresses, etc...).\n   *\n   * @param account - The account to check.\n   * @throws If the account cannot be used.\n   */\n  async #assertAccountCanBeUsed(account: KeyringAccount): Promise<void> {\n    const address = normalizeAccountAddress(account);\n\n    // The `AnyAccountType.Account` generic account type is allowed only during\n    // development, so we check whether it's allowed before continuing.\n    if (\n      !this.#isAnyAccountTypeAllowed &&\n      account.type === AnyAccountType.Account\n    ) {\n      throw new Error(`Cannot create generic account '${account.id}'`);\n    }\n\n    // A Snap could try to create an account with a different address but with\n    // an existing ID, so the above test only is not enough.\n    // Account IDs are globally unique across all snaps.\n    if (this.#accountIndex.has(account.id)) {\n      throw new Error(`Account '${account.id}' already exists`);\n    }\n\n    // The UI still uses the account address to identify accounts, so we need\n    // to block the creation of duplicate accounts for now to prevent accounts\n    // from being overwritten.\n    if (await this.#callbacks.addressExists(address)) {\n      throw new Error(`Account address '${address}' already exists`);\n    }\n  }\n\n  /**\n   * Handle a message from a Snap.\n   *\n   * Only `AccountCreated` triggers lazy keyring creation via\n   * `#getOrCreateKeyring`, since that is the single entry point for the v1\n   * event-driven flow. All other events from unknown snaps throw an error.\n   * After handling `AccountCreated`, `#removeSnapKeyringIfEmpty` always runs\n   * (via `try/finally`) to clean up if account creation was rejected.\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 keyring = this.#snapKeyrings.get(snapId);\n\n    // We can create a new keyring if the message is an AccountCreated event.\n    const isAccountCreated =\n      message.method === `${KeyringEvent.AccountCreated}`;\n    if (!keyring && isAccountCreated) {\n      keyring = await this.#getOrCreateKeyring(snapId);\n    }\n\n    if (!keyring) {\n      throw new Error(\n        `SnapKeyring - Received a message for an unknown snap keyring '${snapId}'`,\n      );\n    }\n\n    try {\n      return await getKeyringV1For(\n        keyring,\n        'messages',\n      ).handleKeyringSnapMessage(message);\n    } finally {\n      // Clean up if AccountCreated was rejected (e.g. duplicate address,\n      // invalid account), leaving the snap with no registered accounts.\n      if (isAccountCreated) {\n        await this.#removeSnapKeyringIfEmpty(snapId);\n      }\n    }\n  }\n\n  /**\n   * Serialize the keyring state.\n   *\n   * Delegates to each per-snap v2 keyring and flattens back into the original\n   * external format so that `KeyringController` sees no change.\n   *\n   * @returns Serialized keyring state.\n   */\n  async serialize(): Promise<KeyringState> {\n    const accounts: KeyringState['accounts'] = {};\n    for (const keyring of this.#snapKeyrings.values()) {\n      for (const account of keyring.accounts()) {\n        accounts[account.id] = { account, snapId: keyring.snapId };\n      }\n    }\n    return { accounts };\n  }\n\n  /**\n   * Deserialize the keyring state into this keyring.\n   *\n   * Groups the flat persisted state by `snapId`, clears both indexes, then\n   * rebuilds each per-snap entry. The `onRegister` callbacks fired during\n   * `v2.deserialize()` automatically repopulate `#accountIndex`.\n   *\n   * @param state - Serialized keyring state.\n   */\n  async deserialize(state: KeyringState | undefined): Promise<void> {\n    // If the state is undefined, it means that this is a new keyring, so we\n    // don't need to do anything.\n    if (state === undefined) {\n      return;\n    }\n\n    // Group flat state by snapId. Migrations and migration logging are handled\n    // inside v2.deserialize().\n    const bySnap = new Map<SnapId, Record<AccountId, KeyringAccount>>();\n    for (const entry of Object.values(state.accounts)) {\n      const snapAccounts = bySnap.get(entry.snapId) ?? {};\n      snapAccounts[entry.account.id] = entry.account;\n      bySnap.set(entry.snapId, snapAccounts);\n    }\n\n    // Destroy existing keyrings before clearing — rejects any pending requests.\n    for (const keyring of this.#snapKeyrings.values()) {\n      await keyring.destroy();\n    }\n\n    // Clear both indexes before rebuilding — they must always be consistent.\n    this.#snapKeyrings.clear();\n    this.#accountIndex.clear();\n\n    // Rebuild per-snap keyrings. Each keyring handles its own validation\n    // and migration internally. #getOrCreateKeyring initializes the keyring\n    // with an empty state; the second deserialize call loads the real accounts.\n    for (const [snapId, accounts] of bySnap) {\n      const keyring = await this.#getOrCreateKeyring(snapId);\n      await keyring.deserialize({ snapId, accounts });\n      // onRegister callbacks fired above have repopulated #accountIndex.\n      await this.#removeSnapKeyringIfEmpty(snapId);\n    }\n  }\n\n  /**\n   * Get an account and its associated Snap ID from its ID.\n   *\n   * @param id - Account ID.\n   * @throws An error if the account could not be found.\n   * @returns The account associated with the given account ID in this keyring.\n   */\n  #getAccount(id: string): { account: KeyringAccount; snapId: SnapId } {\n    const snapId = this.#accountIndex.get(id);\n    const account = snapId\n      ? this.#snapKeyrings.get(snapId)?.lookupAccount(id)\n      : undefined;\n\n    if (!snapId || !account) {\n      throw new Error(`Unable to get account: unknown account ID: '${id}'`);\n    }\n    return { account, snapId };\n  }\n\n  /**\n   * Get the addresses of the accounts in this keyring.\n   *\n   * @returns The addresses of the accounts in this keyring.\n   */\n  async getAccounts(): Promise<string[]> {\n    const addresses: string[] = [];\n    for (const keyring of this.#snapKeyrings.values()) {\n      for (const account of keyring.accounts()) {\n        addresses.push(normalizeAccountAddress(account));\n      }\n    }\n    return unique(addresses);\n  }\n\n  /**\n   * Get the addresses of the accounts associated with a given Snap.\n   *\n   * @param snapId - Snap ID to filter by.\n   * @returns The addresses of the accounts associated with the given Snap.\n   */\n  async getAccountsBySnapId(snapId: SnapId): Promise<string[]> {\n    return unique(\n      (this.#snapKeyrings.get(snapId)?.accounts() ?? []).map(\n        normalizeAccountAddress,\n      ),\n    );\n  }\n\n  /**\n   * Create an account (v1 event-driven flow).\n   *\n   * Delegates to the per-snap SnapKeyringV2 instance (v1 flow).\n   *\n   * @param snapId - Snap ID to create the account for.\n   * @param options - Account creation options. Differs between keyrings.\n   * @param internalOptions - Internal Snap keyring options.\n   * @returns The account object.\n   */\n  async createAccount(\n    snapId: SnapId,\n    options: Record<string, Json>,\n    internalOptions?: SnapKeyringInternalOptions,\n  ): Promise<KeyringAccount> {\n    const keyring = await this.#getOrCreateKeyring(snapId);\n    return getKeyringV1For(keyring, 'account creation').createAccount(\n      options,\n      internalOptions,\n    );\n  }\n\n  /**\n   * Creates one or more new accounts according to the provided options.\n   *\n   * Delegates to the per-snap SnapKeyringV2 instance which handles\n   * idempotency, validation, batch tracking, state persistence, and rollback.\n   *\n   * @param snapId - Snap ID to create the account(s) for.\n   * @param options - Options describing how to create the account(s).\n   * @returns An array of the created account objects.\n   */\n  async createAccounts(\n    snapId: SnapId,\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]> {\n    const keyring = await this.#getOrCreateKeyring(snapId);\n    return keyring.createAccounts(options);\n  }\n\n  /**\n   * Checks if a Snap ID is known from the keyring.\n   *\n   * @param snapId - Snap ID.\n   * @returns `true` if the Snap ID is known, `false` otherwise.\n   */\n  hasSnapId(snapId: SnapId): boolean {\n    const keyring = this.#snapKeyrings.get(snapId);\n    return keyring !== undefined && keyring.accounts().length > 0;\n  }\n\n  /**\n   * Resolve the Snap account's address associated from a signing request.\n   *\n   * @param snapId - Snap ID.\n   * @param scope - CAIP-2 chain ID.\n   * @param request - Signing request object.\n   * @throws An error if the Snap ID is not known from the keyring.\n   * @returns The resolved address if found, `null` otherwise.\n   */\n  async resolveAccountAddress(\n    snapId: SnapId,\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ): Promise<ResolvedAccountAddress | null> {\n    // We do check that the incoming Snap ID is known by the keyring.\n    if (!this.hasSnapId(snapId)) {\n      throw new Error(\n        `Unable to resolve account address: unknown Snap ID: ${snapId}`,\n      );\n    }\n\n    const keyring = await this.#getOrCreateKeyring(snapId);\n    return getKeyringV1For(keyring, 'address resolution').resolveAccountAddress(\n      scope,\n      request,\n    );\n  }\n\n  /**\n   * Submit a request to a Snap from an account ID.\n   *\n   * This request cannot be an asynchronous keyring request.\n   *\n   * @param opts - Request options.\n   * @param opts.origin - Send origin.\n   * @param opts.account - Account ID.\n   * @param opts.method - Method to call.\n   * @param opts.params - Method parameters.\n   * @param opts.scope - Selected chain ID (CAIP-2).\n   * @returns Promise that resolves to the result of the method call.\n   */\n  async submitRequest({\n    origin,\n    account: accountId,\n    method,\n    params,\n    scope,\n  }: {\n    origin: string;\n    // NOTE: We use `account` here rather than `id` to avoid ambiguity with a \"request ID\".\n    // We already use this same field name for `KeyringAccount`s.\n    account: string;\n    method: string;\n    params?: Json[] | Record<string, Json>;\n    scope: string;\n  }): Promise<Json> {\n    const { account, snapId } = this.#getAccount(accountId);\n    /* istanbul ignore next */\n    const keyring =\n      this.#snapKeyrings.get(snapId) ??\n      throwError(`No keyring found for snap '${snapId}'`);\n\n    return await getKeyringV1For(keyring, 'requests').submitSnapRequest({\n      origin,\n      account,\n      method: method as AccountMethod,\n      params,\n      scope,\n      // For non-EVM (in the context of the multichain API and SIP-26), we enforce responses\n      // to be synchronous.\n      noPending: true,\n    });\n  }\n\n  /**\n   * Sign a transaction.\n   *\n   * @param address - Sender's address.\n   * @param transaction - Transaction.\n   * @param _opts - Transaction options (not used).\n   * @returns A promise that resolves to the signed transaction.\n   */\n  async signTransaction(\n    address: string,\n    transaction: TypedTransaction,\n    _opts = {},\n  ): Promise<Json | TypedTransaction> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return getKeyringV1For(keyring, 'signing').signTransaction(\n      account,\n      transaction,\n      _opts,\n    );\n  }\n\n  /**\n   * Sign a typed data message.\n   *\n   * @param address - Signer's address.\n   * @param data - Data to sign.\n   * @param opts - Signing options.\n   * @returns The signature.\n   */\n  async signTypedData(\n    address: string,\n    data: Record<string, unknown>[] | TypedDataV1 | TypedMessage<any>,\n    opts = { version: SignTypedDataVersion.V1 },\n  ): Promise<string> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return getKeyringV1For(keyring, 'signing').signTypedData(\n      account,\n      data,\n      opts,\n    );\n  }\n\n  /**\n   * Sign a message.\n   *\n   * @param address - Signer's address.\n   * @param hash - Data to sign.\n   * @returns The signature.\n   */\n  async signMessage(address: string, hash: any): Promise<string> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return getKeyringV1For(keyring, 'signing').signMessage(account, hash);\n  }\n\n  /**\n   * Sign a personal message.\n   *\n   * Note: KeyringController says this should return a Buffer but it actually\n   * expects a string.\n   *\n   * @param address - Signer's address.\n   * @param data - Data to sign.\n   * @returns Promise of the signature.\n   */\n  async signPersonalMessage(address: string, data: any): Promise<string> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return getKeyringV1For(keyring, 'signing').signPersonalMessage(\n      account,\n      data,\n    );\n  }\n\n  /**\n   * Convert a base transaction to a base UserOperation.\n   *\n   * @param address - Address of the sender.\n   * @param transactions - Base transactions to include in the UserOperation.\n   * @param context - Keyring execution context.\n   * @returns A pseudo-UserOperation that can be used to construct a real.\n   */\n  async prepareUserOperation(\n    address: string,\n    transactions: EthBaseTransaction[],\n    context: KeyringExecutionContext,\n  ): Promise<EthBaseUserOperation> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return getKeyringV1For(\n      keyring,\n      'prepareUserOperation',\n    ).prepareUserOperation(account, transactions, context);\n  }\n\n  /**\n   * Patches properties of a UserOperation. Currently, only the\n   * `paymasterAndData` can be patched.\n   *\n   * @param address - Address of the sender.\n   * @param userOp - UserOperation to patch.\n   * @param context - Keyring execution context.\n   * @returns A patch to apply to the UserOperation.\n   */\n  async patchUserOperation(\n    address: string,\n    userOp: EthUserOperation,\n    context: KeyringExecutionContext,\n  ): Promise<EthUserOperationPatch> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return getKeyringV1For(keyring, 'patchUserOperation').patchUserOperation(\n      account,\n      userOp,\n      context,\n    );\n  }\n\n  /**\n   * Signs a UserOperation.\n   *\n   * @param address - Address of the sender.\n   * @param userOp - UserOperation to sign.\n   * @param context - Keyring execution context.\n   * @returns The signature of the UserOperation.\n   */\n  async signUserOperation(\n    address: string,\n    userOp: EthUserOperation,\n    context: KeyringExecutionContext,\n  ): Promise<string> {\n    const { account, keyring } = this.#resolveAddress(address);\n    return getKeyringV1For(keyring, 'signUserOperation').signUserOperation(\n      account,\n      userOp,\n      context,\n    );\n  }\n\n  /**\n   * Gets the private data associated with the given address so\n   * that it may be exported.\n   *\n   * If this keyring contains duplicate public keys the first\n   * matching address is exported.\n   *\n   * Used by the UI to export an account.\n   *\n   * @param _address - Address of the account to export.\n   */\n  exportAccount(_address: string): [Uint8Array, Json] | undefined {\n    throw new Error('Exporting accounts from snaps is not supported.');\n  }\n\n  /**\n   * Removes the account matching the given address.\n   *\n   * Delegates to the per-snap SnapKeyringV2 keyring which handles\n   * registry removal, index cleanup, and snap communication.\n   *\n   * @param address - Address of the account to remove.\n   */\n  async removeAccount(address: string): Promise<void> {\n    const { account, keyring } = this.#resolveAddress(address);\n    await keyring.deleteAccount(account.id);\n    await this.#removeSnapKeyringIfEmpty(keyring.snapId);\n  }\n\n  /**\n   * Resolve an address to an account and its owning keyring entry.\n   *\n   * @param address - Address of the account to resolve.\n   * @returns Account and the per-snap keyring that owns it. Throws if not\n   * found.\n   */\n  #resolveAddress(address: string): {\n    account: KeyringAccount;\n    keyring: SnapKeyringV2;\n  } {\n    for (const keyring of this.#snapKeyrings.values()) {\n      const account = keyring.lookupByAddress(address);\n      if (account) {\n        return { account, keyring };\n      }\n    }\n    return throwError(`Account '${address}' not found`);\n  }\n\n  /**\n   * Set the selected accounts.\n   *\n   * Distributes the global list by snap and forwards to each v1 instance.\n   *\n   * @param accounts - The accounts to set as selected.\n   */\n  async setSelectedAccounts(accounts: AccountId[]): Promise<void> {\n    // Build per-snap distribution using the account index.\n    const bySnap = new Map<SnapId, AccountId[]>();\n    for (const accountId of accounts) {\n      const snapId = this.#accountIndex.get(accountId);\n      if (!snapId) {\n        continue;\n      }\n      const snapAccounts = bySnap.get(snapId) ?? [];\n      snapAccounts.push(accountId);\n      bySnap.set(snapId, snapAccounts);\n    }\n\n    // v1 snaps receive a keyring_setSelectedAccounts notification; v2 snaps\n    // have no equivalent concept in the protocol so they are intentionally skipped.\n    await Promise.all(\n      [...this.#snapKeyrings.entries()].map(async ([snapId, keyring]) =>\n        keyring.v1?.setSelectedAccounts(\n          /* istanbul ignore next */\n          bySnap.get(snapId) ?? [],\n        ),\n      ),\n    );\n  }\n\n  /**\n   * Get the Snap associated with the given Snap ID.\n   *\n   * @param snapId - Snap ID.\n   * @returns The Snap or undefined if the Snap cannot be found.\n   */\n  #getSnap(snapId: SnapId): Snap | null {\n    return this.#messenger.call('SnapController:getSnap', snapId);\n  }\n\n  /**\n   * Get the metadata of a Snap keyring account.\n   *\n   * @param snapId - Snap ID.\n   * @returns The Snap metadata or undefined if the Snap cannot be found.\n   */\n  #getSnapMetadata(\n    snapId: SnapId,\n  ): InternalAccount['metadata']['snap'] | undefined {\n    const snap = this.#getSnap(snapId);\n    return snap ? { id: snapId } : undefined;\n  }\n\n  #transformToInternalAccount(\n    account: KeyringAccount,\n    snapId: SnapId,\n  ): InternalAccount {\n    const snap = this.#getSnapMetadata(snapId);\n\n    return {\n      ...account,\n      // TODO: Do not convert the address to lowercase.\n      //\n      // This is a workaround to support the current UI which expects the\n      // account address to be lowercase. This workaround should be removed\n      // once we migrated the UI to use the account ID instead of the account\n      // address.\n      //\n      // NOTE: We convert the address only for EVM accounts, see\n      // `normalizeAccountAddress`.\n      address: normalizeAccountAddress(account),\n      metadata: {\n        name: '',\n        importTime: 0,\n        keyring: {\n          type: this.type,\n        },\n        ...(snap !== undefined && { snap }),\n      },\n    };\n  }\n\n  /**\n   * Return an internal account object for a given address.\n   *\n   * @param address - Address of the account to return.\n   * @returns An internal account object for the given address.\n   */\n  getAccountByAddress(address: string): InternalAccount | undefined {\n    for (const [snapId, keyring] of this.#snapKeyrings) {\n      const account = keyring.lookupByAddress(address);\n      if (account) {\n        return this.#transformToInternalAccount(account, snapId);\n      }\n    }\n    return undefined;\n  }\n\n  /**\n   * List all Snap keyring accounts.\n   * This method is expensive on mobile devices and could takes tens or hundreds of milliseconds to complete.\n   * Use with caution.\n   *\n   * @returns An array containing all Snap keyring accounts.\n   */\n  listAccounts(): InternalAccount[] {\n    const accounts: InternalAccount[] = [];\n    for (const [snapId, keyring] of this.#snapKeyrings) {\n      for (const account of keyring.accounts()) {\n        accounts.push(this.#transformToInternalAccount(account, snapId));\n      }\n    }\n    return accounts;\n  }\n}\n"]}

package/dist/SnapKeyring.d.cts

@@ -107,7 +107,7 @@ export declare class SnapKeyring {
     /**
      * Create an account (v1 event-driven flow).
      *
-     * Delegates to the per-snap SnapKeyringV1 instance.
+     * Delegates to the per-snap SnapKeyringV2 instance (v1 flow).
      *
      * @param snapId - Snap ID to create the account for.
      * @param options - Account creation options. Differs between keyrings.

package/dist/SnapKeyring.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"SnapKeyring.d.cts","sourceRoot":"","sources":["../src/SnapKeyring.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SnapKeyring.d.cts","sourceRoot":"","sources":["../src/SnapKeyring.ts"],"names":[],"mappings":"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"}

package/dist/SnapKeyring.d.mts

@@ -107,7 +107,7 @@ export declare class SnapKeyring {
     /**
      * Create an account (v1 event-driven flow).
      *
-     * Delegates to the per-snap SnapKeyringV1 instance.
+     * Delegates to the per-snap SnapKeyringV2 instance (v1 flow).
      *
      * @param snapId - Snap ID to create the account for.
      * @param options - Account creation options. Differs between keyrings.

package/dist/SnapKeyring.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"SnapKeyring.d.mts","sourceRoot":"","sources":["../src/SnapKeyring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,+BAA+B;AACxE,OAAO,EAAE,oBAAoB,EAAE,+BAA+B;AAC9D,OAAO,KAAK,EACV,cAAc,EACd,uBAAuB,EACvB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,WAAW,EACX,oBAAoB,EACrB,8BAA8B;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,gCAAgC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAElD,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAI5C,OAAO,KAAK,EAAE,0BAA0B,EAAE,sBAAkB;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,mCAA+B;AACnE,OAAO,EAAE,iBAAiB,EAAE,mCAA+B;AAE3D,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAgB;AAI3C,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACvE,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/B,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjD,UAAU,CACR,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,EACrD,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,EAC7B,qBAAqB,CAAC,EAAE,MAAM,EAC9B,eAAe,CAAC,EAAE,0BAA0B,GAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,aAAa,CACX,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GACpD,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAW;;IACtB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAqB;IAExC,IAAI,EAAE,MAAM,CAAC;IAGb,IAAI,EAAE,OAAO,iBAAiB,CAAqB;IAEnD,KAAK,OAAQ;IAyDb;;;;;;;;OAQG;gBACS,EACV,SAAS,EACT,SAAS,EACT,uBAA+B,GAChC,EAAE;QACD,SAAS,EAAE,oBAAoB,CAAC;QAChC,SAAS,EAAE,oBAAoB,CAAC;QAChC,uBAAuB,CAAC,EAAE,OAAO,CAAC;KACnC;IA6JD;;;;;;;;;;;;OAYG;IACG,wBAAwB,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;IA2BhB;;;;;;;OAOG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IAUxC;;;;;;;;OAQG;IACG,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAuDjE;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAUtC;;;;;OAKG;IACG,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ5D;;;;;;;;;OASG;IACG,aAAa,CACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAC7B,eAAe,CAAC,EAAE,0BAA0B,GAC3C,OAAO,CAAC,cAAc,CAAC;IAK1B;;;;;;;;;OASG;IACG,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAK5B;;;;;OAKG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAKlC;;;;;;;;OAQG;IACG,qBAAqB,CACzB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC;IAYzC;;;;;;;;;;;;OAYG;IACG,aAAa,CAAC,EAClB,MAAM,EACN,OAAO,EAAE,SAAS,EAClB,MAAM,EACN,MAAM,EACN,KAAK,GACN,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QAGf,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvC,KAAK,EAAE,MAAM,CAAC;KACf,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBjB;;;;;;;OAOG;IACG,eAAe,CACnB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,gBAAgB,EAC7B,KAAK,KAAK,GACT,OAAO,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAKnC;;;;;;;OAOG;IACG,aAAa,CACjB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,EACjE,IAAI;;KAAuC,GAC1C,OAAO,CAAC,MAAM,CAAC;IAKlB;;;;;;OAMG;IACG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAK9D;;;;;;;;;OASG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAKtE;;;;;;;OAOG;IACG,oBAAoB,CACxB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,kBAAkB,EAAE,EAClC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,oBAAoB,CAAC;IAKhC;;;;;;;;OAQG;IACG,kBAAkB,CACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,qBAAqB,CAAC;IAKjC;;;;;;;OAOG;IACG,iBAAiB,CACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,MAAM,CAAC;IAKlB;;;;;;;;;;OAUG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,SAAS;IAI/D;;;;;;;OAOG;IACG,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnD;;;;;;OAMG;IACG,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA2E/D;;;;;OAKG;IACH,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAUjE;;;;;;OAMG;IACH,YAAY,IAAI,eAAe,EAAE;CASlC"}
+{"version":3,"file":"SnapKeyring.d.mts","sourceRoot":"","sources":["../src/SnapKeyring.ts"],"names":[],"mappings":"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"}

package/dist/SnapKeyring.mjs

@@ -17,6 +17,18 @@ import { normalizeAccountAddress } from "./account.mjs";
 import { SNAP_KEYRING_NAME } from "./SnapKeyringMessenger.mjs";
 import { throwError, unique } from "./util.mjs";
 import { SnapKeyring as SnapKeyringV2 } from "./v2/SnapKeyring.mjs";
+/**
+ * Return the v1 instance of a per-snap keyring, throwing if the snap only
+ * supports the v2 protocol.
+ *
+ * @param keyring - The per-snap v2 keyring.
+ * @param feature - Human-readable feature name used in the error message.
+ * @returns The v1 instance.
+ */
+function getKeyringV1For(keyring, feature) {
+    return (keyring.v1 ??
+        throwError(`Snap '${keyring.snapId}' does not support v1 ${feature}`));
+}
 export const SNAP_KEYRING_TYPE = 'Snap Keyring';
 /**
  * Keyring bridge implementation to support Snaps.
@@ -41,9 +53,10 @@ export class SnapKeyring {
          */
         _SnapKeyring_messenger.set(this, void 0);
         /**
-         * Per-snap keyring instances. Each `SnapKeyringV2` (which extends
-         * `SnapKeyringV1`) owns a single `KeyringAccountRegistry` and handles
-         * both the event-driven v1 flow and the `KeyringV2` batch interface.
+         * Per-snap keyring instances. Each `SnapKeyringV2` owns the
+         * `KeyringAccountRegistry` and handles the `KeyringV2` batch interface.
+         * For v1 snaps, `SnapKeyringV2.v1` holds a `SnapKeyringV1` instance
+         * (with a shared registry reference) for the event-driven flow.
          */
         _SnapKeyring_snapKeyrings.set(this, void 0);
         /**
@@ -117,7 +130,7 @@ export class SnapKeyring {
             throw new Error(`SnapKeyring - Received a message for an unknown snap keyring '${snapId}'`);
         }
         try {
-            return await keyring.handleKeyringSnapMessage(message);
+            return await getKeyringV1For(keyring, 'messages').handleKeyringSnapMessage(message);
         }
         finally {
             // Clean up if AccountCreated was rejected (e.g. duplicate address,
@@ -210,7 +223,7 @@ export class SnapKeyring {
     /**
      * Create an account (v1 event-driven flow).
      *
-     * Delegates to the per-snap SnapKeyringV1 instance.
+     * Delegates to the per-snap SnapKeyringV2 instance (v1 flow).
      *
      * @param snapId - Snap ID to create the account for.
      * @param options - Account creation options. Differs between keyrings.
@@ -219,7 +232,7 @@ export class SnapKeyring {
      */
     async createAccount(snapId, options, internalOptions) {
         const keyring = await __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_getOrCreateKeyring).call(this, snapId);
-        return keyring.createAccount(options, internalOptions);
+        return getKeyringV1For(keyring, 'account creation').createAccount(options, internalOptions);
     }
     /**
      * Creates one or more new accounts according to the provided options.
@@ -260,7 +273,7 @@ export class SnapKeyring {
             throw new Error(`Unable to resolve account address: unknown Snap ID: ${snapId}`);
         }
         const keyring = await __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_getOrCreateKeyring).call(this, snapId);
-        return keyring.resolveAccountAddress(scope, request);
+        return getKeyringV1For(keyring, 'address resolution').resolveAccountAddress(scope, request);
     }
     /**
      * Submit a request to a Snap from an account ID.
@@ -280,7 +293,7 @@ export class SnapKeyring {
         /* istanbul ignore next */
         const keyring = __classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").get(snapId) ??
             throwError(`No keyring found for snap '${snapId}'`);
-        return await keyring.submitSnapRequest({
+        return await getKeyringV1For(keyring, 'requests').submitSnapRequest({
             origin,
             account,
             method: method,
@@ -301,7 +314,7 @@ export class SnapKeyring {
      */
     async signTransaction(address, transaction, _opts = {}) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signTransaction(account, transaction, _opts);
+        return getKeyringV1For(keyring, 'signing').signTransaction(account, transaction, _opts);
     }
     /**
      * Sign a typed data message.
@@ -313,7 +326,7 @@ export class SnapKeyring {
      */
     async signTypedData(address, data, opts = { version: SignTypedDataVersion.V1 }) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signTypedData(account, data, opts);
+        return getKeyringV1For(keyring, 'signing').signTypedData(account, data, opts);
     }
     /**
      * Sign a message.
@@ -324,7 +337,7 @@ export class SnapKeyring {
      */
     async signMessage(address, hash) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signMessage(account, hash);
+        return getKeyringV1For(keyring, 'signing').signMessage(account, hash);
     }
     /**
      * Sign a personal message.
@@ -338,7 +351,7 @@ export class SnapKeyring {
      */
     async signPersonalMessage(address, data) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signPersonalMessage(account, data);
+        return getKeyringV1For(keyring, 'signing').signPersonalMessage(account, data);
     }
     /**
      * Convert a base transaction to a base UserOperation.
@@ -350,7 +363,7 @@ export class SnapKeyring {
      */
     async prepareUserOperation(address, transactions, context) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.prepareUserOperation(account, transactions, context);
+        return getKeyringV1For(keyring, 'prepareUserOperation').prepareUserOperation(account, transactions, context);
     }
     /**
      * Patches properties of a UserOperation. Currently, only the
@@ -363,7 +376,7 @@ export class SnapKeyring {
      */
     async patchUserOperation(address, userOp, context) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.patchUserOperation(account, userOp, context);
+        return getKeyringV1For(keyring, 'patchUserOperation').patchUserOperation(account, userOp, context);
     }
     /**
      * Signs a UserOperation.
@@ -375,7 +388,7 @@ export class SnapKeyring {
      */
     async signUserOperation(address, userOp, context) {
         const { account, keyring } = __classPrivateFieldGet(this, _SnapKeyring_instances, "m", _SnapKeyring_resolveAddress).call(this, address);
-        return keyring.signUserOperation(account, userOp, context);
+        return getKeyringV1For(keyring, 'signUserOperation').signUserOperation(account, userOp, context);
     }
     /**
      * Gets the private data associated with the given address so
@@ -423,7 +436,9 @@ export class SnapKeyring {
             snapAccounts.push(accountId);
             bySnap.set(snapId, snapAccounts);
         }
-        await Promise.all([...__classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").entries()].map(async ([snapId, keyring]) => keyring.setSelectedAccounts(
+        // v1 snaps receive a keyring_setSelectedAccounts notification; v2 snaps
+        // have no equivalent concept in the protocol so they are intentionally skipped.
+        await Promise.all([...__classPrivateFieldGet(this, _SnapKeyring_snapKeyrings, "f").entries()].map(async ([snapId, keyring]) => keyring.v1?.setSelectedAccounts(
         /* istanbul ignore next */
         bySnap.get(snapId) ?? [])));
     }