@metamask-previews/keyring-internal-snap-client 9.0.1-c26e419 → 9.0.1-ea8175e

package/CHANGELOG.md

@@ -7,8 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `KeyringInternalSnapClientV2` class for communicating with a Snap using the keyring v2 RPC protocol ([#408](https://github.com/MetaMask/accounts/pull/408))
+
 ### Changed
 
+- **BREAKING:** Move and rename `KeyringInternalSnapClientV2` to the new `./v2` subpath export ([#513](https://github.com/MetaMask/accounts/pull/513))
+  - `KeyringInternalSnapClientV2` is now `KeyringInternalSnapClient` from `@metamask/keyring-internal-snap-client/v2`.
 - Bump `@metamask/messenger` from `^0.3.0` to `^1.1.1` ([#489](https://github.com/MetaMask/accounts/pull/489), [#500](https://github.com/MetaMask/accounts/pull/500))
 
 ## [9.0.1]

package/dist/KeyringInternalSnapClient.cjs

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SnapControllerMessengerSender_snapId, _SnapControllerMessengerSender_origin, _SnapControllerMessengerSender_messenger, _SnapControllerMessengerSender_handler, _KeyringInternalSnapClient_messenger;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyringInternalSnapClient = void 0;
+exports.KeyringInternalSnapClient = exports.SnapControllerMessengerSender = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
 const keyring_internal_api_1 = require("@metamask/keyring-internal-api");
 const keyring_snap_client_1 = require("@metamask/keyring-snap-client");
@@ -55,6 +55,7 @@ class SnapControllerMessengerSender {
         });
     }
 }
+exports.SnapControllerMessengerSender = SnapControllerMessengerSender;
 _SnapControllerMessengerSender_snapId = new WeakMap(), _SnapControllerMessengerSender_origin = new WeakMap(), _SnapControllerMessengerSender_messenger = new WeakMap(), _SnapControllerMessengerSender_handler = new WeakMap();
 /**
  * A `KeyringClient` that allows the communication with a Snap through a

package/dist/KeyringInternalSnapClient.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"KeyringInternalSnapClient.cjs","sourceRoot":"","sources":["../src/KeyringInternalSnapClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAAyD;AAKzD,yEAA+E;AAC/E,uEAA2E;AAC3E,2DAA0E;AAmB1E;;;GAGG;AACH,MAAM,6BAA6B;IASjC;;;;;;;OAOG;IACH,YACE,SAA6C,EAC7C,MAAc,EACd,MAAc,EACd,OAAoB;QApBb,wDAAgB;QAEhB,wDAAgB;QAEhB,2DAA+C;QAE/C,yDAAsB;QAgB7B,uBAAA,IAAI,4CAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,yCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,yCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,0CAAY,OAAO,MAAA,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAI,CAAC,OAAuB;QAChC,OAAO,uBAAA,IAAI,gDAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAC1D,MAAM,EAAE,uBAAA,IAAI,6CAAQ;YACpB,MAAM,EAAE,uBAAA,IAAI,6CAAQ;YACpB,OAAO,EAAE,uBAAA,IAAI,8CAAS;YACtB,OAAO;SACR,CAAkB,CAAC;IACtB,CAAC;CACF;;AAED;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,mCAAa;IAG1D;;;;;;;;;;;;OAYG;IACH,YAAY,EACV,SAAS,EACT,MAAM,GAAG,WAAqB,EAC9B,MAAM,GAAG,UAAU,EACnB,OAAO,GAAG,kBAAiC,GAM5C;QACC,KAAK,CACH,IAAI,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CACtE,CAAC;QA5BK,uDAA+C;QA6BtD,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,yBAAyB,CAAC;YACnC,SAAS,EAAE,uBAAA,IAAI,4CAAW;YAC1B,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,0BAA0B,CAC9B,OAAoC;QAEpC,OAAO,IAAA,0BAAU,EACf,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,MAAM,EAAE,8BAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,OAAO;SAChB,CAAC,EACF,oDAA6B,CAC9B,CAAC;IACJ,CAAC;CACF;AAjED,8DAiEC","sourcesContent":["import { KeyringRpcMethod } from '@metamask/keyring-api';\nimport type {\n  KeyringRequestWithoutOrigin,\n  KeyringResponseWithoutOrigin,\n} from '@metamask/keyring-internal-api';\nimport { SubmitRequestResponseV1Struct } from '@metamask/keyring-internal-api';\nimport { KeyringClient, type Sender } from '@metamask/keyring-snap-client';\nimport { strictMask, type JsonRpcRequest } from '@metamask/keyring-utils';\nimport type { Messenger } from '@metamask/messenger';\nimport type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { HandlerType } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\n\n// We only need to dispatch Snap request to the Snaps controller for now.\ntype AllowedActions = SnapControllerHandleRequestAction;\n\n/**\n * A restricted-`Messenger` used by `KeyringInternalSnapClient` to dispatch\n * internal Snap requests.\n */\nexport type KeyringInternalSnapClientMessenger = Messenger<\n  'KeyringInternalSnapClient',\n  AllowedActions\n>;\n\n/**\n * Implementation of the `Sender` interface that can be used to send requests\n * to a Snap through a `Messenger`.\n */\nclass SnapControllerMessengerSender implements Sender {\n  readonly #snapId: SnapId;\n\n  readonly #origin: string;\n\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  readonly #handler: HandlerType;\n\n  /**\n   * Create a new instance of `SnapControllerSender`.\n   *\n   * @param messenger - The `Messenger` instance used when dispatching controllers actions.\n   * @param snapId - The ID of the Snap to use.\n   * @param origin - The sender's origin.\n   * @param handler - The handler type.\n   */\n  constructor(\n    messenger: KeyringInternalSnapClientMessenger,\n    snapId: SnapId,\n    origin: string,\n    handler: HandlerType,\n  ) {\n    this.#messenger = messenger;\n    this.#snapId = snapId;\n    this.#origin = origin;\n    this.#handler = handler;\n  }\n\n  /**\n   * Send a request to the Snap and return the response.\n   *\n   * @param request - JSON-RPC request to send to the Snap.\n   * @returns A promise that resolves to the response of the request.\n   */\n  async send(request: JsonRpcRequest): Promise<Json> {\n    return this.#messenger.call('SnapController:handleRequest', {\n      snapId: this.#snapId,\n      origin: this.#origin,\n      handler: this.#handler,\n      request,\n    }) as Promise<Json>;\n  }\n}\n\n/**\n * A `KeyringClient` that allows the communication with a Snap through a\n * `Messenger`.\n */\nexport class KeyringInternalSnapClient extends KeyringClient {\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient`.\n   *\n   * The `handlerType` argument has a hard-coded default `string` value instead\n   * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module\n   * from being required at runtime.\n   *\n   * @param args - Constructor arguments.\n   * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.\n   * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).\n   * @param args.origin - The sender's origin (default: `'metamask'`).\n   * @param args.handler - The handler type (default: `'onKeyringRequest'`).\n   */\n  constructor({\n    messenger,\n    snapId = 'undefined' as SnapId,\n    origin = 'metamask',\n    handler = 'onKeyringRequest' as HandlerType,\n  }: {\n    messenger: KeyringInternalSnapClientMessenger;\n    snapId?: SnapId;\n    origin?: string;\n    handler?: HandlerType;\n  }) {\n    super(\n      new SnapControllerMessengerSender(messenger, snapId, origin, handler),\n    );\n    this.#messenger = messenger;\n  }\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient` with the specified\n   * `snapId`.\n   *\n   * @param snapId - The ID of the Snap to use in the new instance.\n   * @returns A new instance of `KeyringInternalSnapClient` with the\n   * specified Snap ID.\n   */\n  withSnapId(snapId: SnapId): KeyringInternalSnapClient {\n    return new KeyringInternalSnapClient({\n      messenger: this.#messenger,\n      snapId,\n    });\n  }\n\n  /**\n   * Submit a keyring request v1 (with no `origin`).\n   *\n   * @param request - Keyring request.\n   * @returns Keyring request's response.\n   */\n  async submitRequestWithoutOrigin(\n    request: KeyringRequestWithoutOrigin,\n  ): Promise<KeyringResponseWithoutOrigin> {\n    return strictMask(\n      await this.send({\n        method: KeyringRpcMethod.SubmitRequest,\n        params: request,\n      }),\n      SubmitRequestResponseV1Struct,\n    );\n  }\n}\n"]}
+{"version":3,"file":"KeyringInternalSnapClient.cjs","sourceRoot":"","sources":["../src/KeyringInternalSnapClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAAyD;AAKzD,yEAA+E;AAE/E,uEAA8D;AAC9D,2DAAqD;AAmBrD;;;GAGG;AACH,MAAa,6BAA6B;IASxC;;;;;;;OAOG;IACH,YACE,SAA6C,EAC7C,MAAc,EACd,MAAc,EACd,OAAoB;QApBb,wDAAgB;QAEhB,wDAAgB;QAEhB,2DAA+C;QAE/C,yDAAsB;QAgB7B,uBAAA,IAAI,4CAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,yCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,yCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,0CAAY,OAAO,MAAA,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAI,CAAC,OAAuB;QAChC,OAAO,uBAAA,IAAI,gDAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAC1D,MAAM,EAAE,uBAAA,IAAI,6CAAQ;YACpB,MAAM,EAAE,uBAAA,IAAI,6CAAQ;YACpB,OAAO,EAAE,uBAAA,IAAI,8CAAS;YACtB,OAAO;SACR,CAAkB,CAAC;IACtB,CAAC;CACF;AA3CD,sEA2CC;;AAED;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,mCAAa;IAG1D;;;;;;;;;;;;OAYG;IACH,YAAY,EACV,SAAS,EACT,MAAM,GAAG,WAAqB,EAC9B,MAAM,GAAG,UAAU,EACnB,OAAO,GAAG,kBAAiC,GAM5C;QACC,KAAK,CACH,IAAI,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CACtE,CAAC;QA5BK,uDAA+C;QA6BtD,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,yBAAyB,CAAC;YACnC,SAAS,EAAE,uBAAA,IAAI,4CAAW;YAC1B,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,0BAA0B,CAC9B,OAAoC;QAEpC,OAAO,IAAA,0BAAU,EACf,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,MAAM,EAAE,8BAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,OAAO;SAChB,CAAC,EACF,oDAA6B,CAC9B,CAAC;IACJ,CAAC;CACF;AAjED,8DAiEC","sourcesContent":["import { KeyringRpcMethod } from '@metamask/keyring-api';\nimport type {\n  KeyringRequestWithoutOrigin,\n  KeyringResponseWithoutOrigin,\n} from '@metamask/keyring-internal-api';\nimport { SubmitRequestResponseV1Struct } from '@metamask/keyring-internal-api';\nimport type { Sender } from '@metamask/keyring-snap-client';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport { strictMask } from '@metamask/keyring-utils';\nimport type { Messenger } from '@metamask/messenger';\nimport type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';\nimport type { JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';\nimport type { HandlerType } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\n\n// We only need to dispatch Snap request to the Snaps controller for now.\ntype AllowedActions = SnapControllerHandleRequestAction;\n\n/**\n * A restricted-`Messenger` used by `KeyringInternalSnapClient` to dispatch\n * internal Snap requests.\n */\nexport type KeyringInternalSnapClientMessenger = Messenger<\n  'KeyringInternalSnapClient',\n  AllowedActions\n>;\n\n/**\n * Implementation of the `Sender` interface that can be used to send requests\n * to a Snap through a `Messenger`.\n */\nexport class SnapControllerMessengerSender implements Sender {\n  readonly #snapId: SnapId;\n\n  readonly #origin: string;\n\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  readonly #handler: HandlerType;\n\n  /**\n   * Create a new instance of `SnapControllerSender`.\n   *\n   * @param messenger - The `Messenger` instance used when dispatching controllers actions.\n   * @param snapId - The ID of the Snap to use.\n   * @param origin - The sender's origin.\n   * @param handler - The handler type.\n   */\n  constructor(\n    messenger: KeyringInternalSnapClientMessenger,\n    snapId: SnapId,\n    origin: string,\n    handler: HandlerType,\n  ) {\n    this.#messenger = messenger;\n    this.#snapId = snapId;\n    this.#origin = origin;\n    this.#handler = handler;\n  }\n\n  /**\n   * Send a request to the Snap and return the response.\n   *\n   * @param request - JSON-RPC request to send to the Snap.\n   * @returns A promise that resolves to the response of the request.\n   */\n  async send(request: JsonRpcRequest): Promise<Json> {\n    return this.#messenger.call('SnapController:handleRequest', {\n      snapId: this.#snapId,\n      origin: this.#origin,\n      handler: this.#handler,\n      request,\n    }) as Promise<Json>;\n  }\n}\n\n/**\n * A `KeyringClient` that allows the communication with a Snap through a\n * `Messenger`.\n */\nexport class KeyringInternalSnapClient extends KeyringClient {\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient`.\n   *\n   * The `handlerType` argument has a hard-coded default `string` value instead\n   * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module\n   * from being required at runtime.\n   *\n   * @param args - Constructor arguments.\n   * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.\n   * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).\n   * @param args.origin - The sender's origin (default: `'metamask'`).\n   * @param args.handler - The handler type (default: `'onKeyringRequest'`).\n   */\n  constructor({\n    messenger,\n    snapId = 'undefined' as SnapId,\n    origin = 'metamask',\n    handler = 'onKeyringRequest' as HandlerType,\n  }: {\n    messenger: KeyringInternalSnapClientMessenger;\n    snapId?: SnapId;\n    origin?: string;\n    handler?: HandlerType;\n  }) {\n    super(\n      new SnapControllerMessengerSender(messenger, snapId, origin, handler),\n    );\n    this.#messenger = messenger;\n  }\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient` with the specified\n   * `snapId`.\n   *\n   * @param snapId - The ID of the Snap to use in the new instance.\n   * @returns A new instance of `KeyringInternalSnapClient` with the\n   * specified Snap ID.\n   */\n  withSnapId(snapId: SnapId): KeyringInternalSnapClient {\n    return new KeyringInternalSnapClient({\n      messenger: this.#messenger,\n      snapId,\n    });\n  }\n\n  /**\n   * Submit a keyring request v1 (with no `origin`).\n   *\n   * @param request - Keyring request.\n   * @returns Keyring request's response.\n   */\n  async submitRequestWithoutOrigin(\n    request: KeyringRequestWithoutOrigin,\n  ): Promise<KeyringResponseWithoutOrigin> {\n    return strictMask(\n      await this.send({\n        method: KeyringRpcMethod.SubmitRequest,\n        params: request,\n      }),\n      SubmitRequestResponseV1Struct,\n    );\n  }\n}\n"]}

package/dist/KeyringInternalSnapClient.d.cts

@@ -1,15 +1,40 @@
 import type { KeyringRequestWithoutOrigin, KeyringResponseWithoutOrigin } from "@metamask/keyring-internal-api";
+import type { Sender } from "@metamask/keyring-snap-client";
 import { KeyringClient } from "@metamask/keyring-snap-client";
 import type { Messenger } from "@metamask/messenger";
 import type { SnapControllerHandleRequestAction } from "@metamask/snaps-controllers";
-import type { SnapId } from "@metamask/snaps-sdk";
+import type { JsonRpcRequest, SnapId } from "@metamask/snaps-sdk";
 import type { HandlerType } from "@metamask/snaps-utils";
+import type { Json } from "@metamask/utils";
 type AllowedActions = SnapControllerHandleRequestAction;
 /**
  * A restricted-`Messenger` used by `KeyringInternalSnapClient` to dispatch
  * internal Snap requests.
  */
 export type KeyringInternalSnapClientMessenger = Messenger<'KeyringInternalSnapClient', AllowedActions>;
+/**
+ * Implementation of the `Sender` interface that can be used to send requests
+ * to a Snap through a `Messenger`.
+ */
+export declare class SnapControllerMessengerSender implements Sender {
+    #private;
+    /**
+     * Create a new instance of `SnapControllerSender`.
+     *
+     * @param messenger - The `Messenger` instance used when dispatching controllers actions.
+     * @param snapId - The ID of the Snap to use.
+     * @param origin - The sender's origin.
+     * @param handler - The handler type.
+     */
+    constructor(messenger: KeyringInternalSnapClientMessenger, snapId: SnapId, origin: string, handler: HandlerType);
+    /**
+     * Send a request to the Snap and return the response.
+     *
+     * @param request - JSON-RPC request to send to the Snap.
+     * @returns A promise that resolves to the response of the request.
+     */
+    send(request: JsonRpcRequest): Promise<Json>;
+}
 /**
  * A `KeyringClient` that allows the communication with a Snap through a
  * `Messenger`.

package/dist/KeyringInternalSnapClient.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"KeyringInternalSnapClient.d.cts","sourceRoot":"","sources":["../src/KeyringInternalSnapClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,2BAA2B,EAC3B,4BAA4B,EAC7B,uCAAuC;AAExC,OAAO,EAAE,aAAa,EAAe,sCAAsC;AAE3E,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oCAAoC;AACrF,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,8BAA8B;AAIzD,KAAK,cAAc,GAAG,iCAAiC,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,kCAAkC,GAAG,SAAS,CACxD,2BAA2B,EAC3B,cAAc,CACf,CAAC;AAmDF;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,aAAa;;IAG1D;;;;;;;;;;;;OAYG;gBACS,EACV,SAAS,EACT,MAA8B,EAC9B,MAAmB,EACnB,OAA2C,GAC5C,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,WAAW,CAAC;KACvB;IAOD;;;;;;;OAOG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAOrD;;;;;OAKG;IACG,0BAA0B,CAC9B,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,4BAA4B,CAAC;CASzC"}
+{"version":3,"file":"KeyringInternalSnapClient.d.cts","sourceRoot":"","sources":["../src/KeyringInternalSnapClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,2BAA2B,EAC3B,4BAA4B,EAC7B,uCAAuC;AAExC,OAAO,KAAK,EAAE,MAAM,EAAE,sCAAsC;AAC5D,OAAO,EAAE,aAAa,EAAE,sCAAsC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oCAAoC;AACrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,4BAA4B;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,8BAA8B;AACzD,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,KAAK,cAAc,GAAG,iCAAiC,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,kCAAkC,GAAG,SAAS,CACxD,2BAA2B,EAC3B,cAAc,CACf,CAAC;AAEF;;;GAGG;AACH,qBAAa,6BAA8B,YAAW,MAAM;;IAS1D;;;;;;;OAOG;gBAED,SAAS,EAAE,kCAAkC,EAC7C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW;IAQtB;;;;;OAKG;IACG,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,aAAa;;IAG1D;;;;;;;;;;;;OAYG;gBACS,EACV,SAAS,EACT,MAA8B,EAC9B,MAAmB,EACnB,OAA2C,GAC5C,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,WAAW,CAAC;KACvB;IAOD;;;;;;;OAOG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAOrD;;;;;OAKG;IACG,0BAA0B,CAC9B,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,4BAA4B,CAAC;CASzC"}

package/dist/KeyringInternalSnapClient.d.mts

@@ -1,15 +1,40 @@
 import type { KeyringRequestWithoutOrigin, KeyringResponseWithoutOrigin } from "@metamask/keyring-internal-api";
+import type { Sender } from "@metamask/keyring-snap-client";
 import { KeyringClient } from "@metamask/keyring-snap-client";
 import type { Messenger } from "@metamask/messenger";
 import type { SnapControllerHandleRequestAction } from "@metamask/snaps-controllers";
-import type { SnapId } from "@metamask/snaps-sdk";
+import type { JsonRpcRequest, SnapId } from "@metamask/snaps-sdk";
 import type { HandlerType } from "@metamask/snaps-utils";
+import type { Json } from "@metamask/utils";
 type AllowedActions = SnapControllerHandleRequestAction;
 /**
  * A restricted-`Messenger` used by `KeyringInternalSnapClient` to dispatch
  * internal Snap requests.
  */
 export type KeyringInternalSnapClientMessenger = Messenger<'KeyringInternalSnapClient', AllowedActions>;
+/**
+ * Implementation of the `Sender` interface that can be used to send requests
+ * to a Snap through a `Messenger`.
+ */
+export declare class SnapControllerMessengerSender implements Sender {
+    #private;
+    /**
+     * Create a new instance of `SnapControllerSender`.
+     *
+     * @param messenger - The `Messenger` instance used when dispatching controllers actions.
+     * @param snapId - The ID of the Snap to use.
+     * @param origin - The sender's origin.
+     * @param handler - The handler type.
+     */
+    constructor(messenger: KeyringInternalSnapClientMessenger, snapId: SnapId, origin: string, handler: HandlerType);
+    /**
+     * Send a request to the Snap and return the response.
+     *
+     * @param request - JSON-RPC request to send to the Snap.
+     * @returns A promise that resolves to the response of the request.
+     */
+    send(request: JsonRpcRequest): Promise<Json>;
+}
 /**
  * A `KeyringClient` that allows the communication with a Snap through a
  * `Messenger`.

package/dist/KeyringInternalSnapClient.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"KeyringInternalSnapClient.d.mts","sourceRoot":"","sources":["../src/KeyringInternalSnapClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,2BAA2B,EAC3B,4BAA4B,EAC7B,uCAAuC;AAExC,OAAO,EAAE,aAAa,EAAe,sCAAsC;AAE3E,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oCAAoC;AACrF,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,8BAA8B;AAIzD,KAAK,cAAc,GAAG,iCAAiC,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,kCAAkC,GAAG,SAAS,CACxD,2BAA2B,EAC3B,cAAc,CACf,CAAC;AAmDF;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,aAAa;;IAG1D;;;;;;;;;;;;OAYG;gBACS,EACV,SAAS,EACT,MAA8B,EAC9B,MAAmB,EACnB,OAA2C,GAC5C,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,WAAW,CAAC;KACvB;IAOD;;;;;;;OAOG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAOrD;;;;;OAKG;IACG,0BAA0B,CAC9B,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,4BAA4B,CAAC;CASzC"}
+{"version":3,"file":"KeyringInternalSnapClient.d.mts","sourceRoot":"","sources":["../src/KeyringInternalSnapClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,2BAA2B,EAC3B,4BAA4B,EAC7B,uCAAuC;AAExC,OAAO,KAAK,EAAE,MAAM,EAAE,sCAAsC;AAC5D,OAAO,EAAE,aAAa,EAAE,sCAAsC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EAAE,iCAAiC,EAAE,oCAAoC;AACrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,4BAA4B;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,8BAA8B;AACzD,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,KAAK,cAAc,GAAG,iCAAiC,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,kCAAkC,GAAG,SAAS,CACxD,2BAA2B,EAC3B,cAAc,CACf,CAAC;AAEF;;;GAGG;AACH,qBAAa,6BAA8B,YAAW,MAAM;;IAS1D;;;;;;;OAOG;gBAED,SAAS,EAAE,kCAAkC,EAC7C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,WAAW;IAQtB;;;;;OAKG;IACG,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,aAAa;;IAG1D;;;;;;;;;;;;OAYG;gBACS,EACV,SAAS,EACT,MAA8B,EAC9B,MAAmB,EACnB,OAA2C,GAC5C,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,WAAW,CAAC;KACvB;IAOD;;;;;;;OAOG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAOrD;;;;;OAKG;IACG,0BAA0B,CAC9B,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,4BAA4B,CAAC;CASzC"}

package/dist/KeyringInternalSnapClient.mjs

@@ -18,7 +18,7 @@ import { strictMask } from "@metamask/keyring-utils";
  * Implementation of the `Sender` interface that can be used to send requests
  * to a Snap through a `Messenger`.
  */
-class SnapControllerMessengerSender {
+export class SnapControllerMessengerSender {
     /**
      * Create a new instance of `SnapControllerSender`.
      *

package/dist/KeyringInternalSnapClient.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"KeyringInternalSnapClient.mjs","sourceRoot":"","sources":["../src/KeyringInternalSnapClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,8BAA8B;AAKzD,OAAO,EAAE,6BAA6B,EAAE,uCAAuC;AAC/E,OAAO,EAAE,aAAa,EAAe,sCAAsC;AAC3E,OAAO,EAAE,UAAU,EAAuB,gCAAgC;AAmB1E;;;GAGG;AACH,MAAM,6BAA6B;IASjC;;;;;;;OAOG;IACH,YACE,SAA6C,EAC7C,MAAc,EACd,MAAc,EACd,OAAoB;QApBb,wDAAgB;QAEhB,wDAAgB;QAEhB,2DAA+C;QAE/C,yDAAsB;QAgB7B,uBAAA,IAAI,4CAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,yCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,yCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,0CAAY,OAAO,MAAA,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAI,CAAC,OAAuB;QAChC,OAAO,uBAAA,IAAI,gDAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAC1D,MAAM,EAAE,uBAAA,IAAI,6CAAQ;YACpB,MAAM,EAAE,uBAAA,IAAI,6CAAQ;YACpB,OAAO,EAAE,uBAAA,IAAI,8CAAS;YACtB,OAAO;SACR,CAAkB,CAAC;IACtB,CAAC;CACF;;AAED;;;GAGG;AACH,MAAM,OAAO,yBAA0B,SAAQ,aAAa;IAG1D;;;;;;;;;;;;OAYG;IACH,YAAY,EACV,SAAS,EACT,MAAM,GAAG,WAAqB,EAC9B,MAAM,GAAG,UAAU,EACnB,OAAO,GAAG,kBAAiC,GAM5C;QACC,KAAK,CACH,IAAI,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CACtE,CAAC;QA5BK,uDAA+C;QA6BtD,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,yBAAyB,CAAC;YACnC,SAAS,EAAE,uBAAA,IAAI,4CAAW;YAC1B,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,0BAA0B,CAC9B,OAAoC;QAEpC,OAAO,UAAU,CACf,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,MAAM,EAAE,gBAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,OAAO;SAChB,CAAC,EACF,6BAA6B,CAC9B,CAAC;IACJ,CAAC;CACF","sourcesContent":["import { KeyringRpcMethod } from '@metamask/keyring-api';\nimport type {\n  KeyringRequestWithoutOrigin,\n  KeyringResponseWithoutOrigin,\n} from '@metamask/keyring-internal-api';\nimport { SubmitRequestResponseV1Struct } from '@metamask/keyring-internal-api';\nimport { KeyringClient, type Sender } from '@metamask/keyring-snap-client';\nimport { strictMask, type JsonRpcRequest } from '@metamask/keyring-utils';\nimport type { Messenger } from '@metamask/messenger';\nimport type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { HandlerType } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\n\n// We only need to dispatch Snap request to the Snaps controller for now.\ntype AllowedActions = SnapControllerHandleRequestAction;\n\n/**\n * A restricted-`Messenger` used by `KeyringInternalSnapClient` to dispatch\n * internal Snap requests.\n */\nexport type KeyringInternalSnapClientMessenger = Messenger<\n  'KeyringInternalSnapClient',\n  AllowedActions\n>;\n\n/**\n * Implementation of the `Sender` interface that can be used to send requests\n * to a Snap through a `Messenger`.\n */\nclass SnapControllerMessengerSender implements Sender {\n  readonly #snapId: SnapId;\n\n  readonly #origin: string;\n\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  readonly #handler: HandlerType;\n\n  /**\n   * Create a new instance of `SnapControllerSender`.\n   *\n   * @param messenger - The `Messenger` instance used when dispatching controllers actions.\n   * @param snapId - The ID of the Snap to use.\n   * @param origin - The sender's origin.\n   * @param handler - The handler type.\n   */\n  constructor(\n    messenger: KeyringInternalSnapClientMessenger,\n    snapId: SnapId,\n    origin: string,\n    handler: HandlerType,\n  ) {\n    this.#messenger = messenger;\n    this.#snapId = snapId;\n    this.#origin = origin;\n    this.#handler = handler;\n  }\n\n  /**\n   * Send a request to the Snap and return the response.\n   *\n   * @param request - JSON-RPC request to send to the Snap.\n   * @returns A promise that resolves to the response of the request.\n   */\n  async send(request: JsonRpcRequest): Promise<Json> {\n    return this.#messenger.call('SnapController:handleRequest', {\n      snapId: this.#snapId,\n      origin: this.#origin,\n      handler: this.#handler,\n      request,\n    }) as Promise<Json>;\n  }\n}\n\n/**\n * A `KeyringClient` that allows the communication with a Snap through a\n * `Messenger`.\n */\nexport class KeyringInternalSnapClient extends KeyringClient {\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient`.\n   *\n   * The `handlerType` argument has a hard-coded default `string` value instead\n   * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module\n   * from being required at runtime.\n   *\n   * @param args - Constructor arguments.\n   * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.\n   * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).\n   * @param args.origin - The sender's origin (default: `'metamask'`).\n   * @param args.handler - The handler type (default: `'onKeyringRequest'`).\n   */\n  constructor({\n    messenger,\n    snapId = 'undefined' as SnapId,\n    origin = 'metamask',\n    handler = 'onKeyringRequest' as HandlerType,\n  }: {\n    messenger: KeyringInternalSnapClientMessenger;\n    snapId?: SnapId;\n    origin?: string;\n    handler?: HandlerType;\n  }) {\n    super(\n      new SnapControllerMessengerSender(messenger, snapId, origin, handler),\n    );\n    this.#messenger = messenger;\n  }\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient` with the specified\n   * `snapId`.\n   *\n   * @param snapId - The ID of the Snap to use in the new instance.\n   * @returns A new instance of `KeyringInternalSnapClient` with the\n   * specified Snap ID.\n   */\n  withSnapId(snapId: SnapId): KeyringInternalSnapClient {\n    return new KeyringInternalSnapClient({\n      messenger: this.#messenger,\n      snapId,\n    });\n  }\n\n  /**\n   * Submit a keyring request v1 (with no `origin`).\n   *\n   * @param request - Keyring request.\n   * @returns Keyring request's response.\n   */\n  async submitRequestWithoutOrigin(\n    request: KeyringRequestWithoutOrigin,\n  ): Promise<KeyringResponseWithoutOrigin> {\n    return strictMask(\n      await this.send({\n        method: KeyringRpcMethod.SubmitRequest,\n        params: request,\n      }),\n      SubmitRequestResponseV1Struct,\n    );\n  }\n}\n"]}
+{"version":3,"file":"KeyringInternalSnapClient.mjs","sourceRoot":"","sources":["../src/KeyringInternalSnapClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,8BAA8B;AAKzD,OAAO,EAAE,6BAA6B,EAAE,uCAAuC;AAE/E,OAAO,EAAE,aAAa,EAAE,sCAAsC;AAC9D,OAAO,EAAE,UAAU,EAAE,gCAAgC;AAmBrD;;;GAGG;AACH,MAAM,OAAO,6BAA6B;IASxC;;;;;;;OAOG;IACH,YACE,SAA6C,EAC7C,MAAc,EACd,MAAc,EACd,OAAoB;QApBb,wDAAgB;QAEhB,wDAAgB;QAEhB,2DAA+C;QAE/C,yDAAsB;QAgB7B,uBAAA,IAAI,4CAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,yCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,yCAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,0CAAY,OAAO,MAAA,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAI,CAAC,OAAuB;QAChC,OAAO,uBAAA,IAAI,gDAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAC1D,MAAM,EAAE,uBAAA,IAAI,6CAAQ;YACpB,MAAM,EAAE,uBAAA,IAAI,6CAAQ;YACpB,OAAO,EAAE,uBAAA,IAAI,8CAAS;YACtB,OAAO;SACR,CAAkB,CAAC;IACtB,CAAC;CACF;;AAED;;;GAGG;AACH,MAAM,OAAO,yBAA0B,SAAQ,aAAa;IAG1D;;;;;;;;;;;;OAYG;IACH,YAAY,EACV,SAAS,EACT,MAAM,GAAG,WAAqB,EAC9B,MAAM,GAAG,UAAU,EACnB,OAAO,GAAG,kBAAiC,GAM5C;QACC,KAAK,CACH,IAAI,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CACtE,CAAC;QA5BK,uDAA+C;QA6BtD,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,yBAAyB,CAAC;YACnC,SAAS,EAAE,uBAAA,IAAI,4CAAW;YAC1B,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,0BAA0B,CAC9B,OAAoC;QAEpC,OAAO,UAAU,CACf,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,MAAM,EAAE,gBAAgB,CAAC,aAAa;YACtC,MAAM,EAAE,OAAO;SAChB,CAAC,EACF,6BAA6B,CAC9B,CAAC;IACJ,CAAC;CACF","sourcesContent":["import { KeyringRpcMethod } from '@metamask/keyring-api';\nimport type {\n  KeyringRequestWithoutOrigin,\n  KeyringResponseWithoutOrigin,\n} from '@metamask/keyring-internal-api';\nimport { SubmitRequestResponseV1Struct } from '@metamask/keyring-internal-api';\nimport type { Sender } from '@metamask/keyring-snap-client';\nimport { KeyringClient } from '@metamask/keyring-snap-client';\nimport { strictMask } from '@metamask/keyring-utils';\nimport type { Messenger } from '@metamask/messenger';\nimport type { SnapControllerHandleRequestAction } from '@metamask/snaps-controllers';\nimport type { JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';\nimport type { HandlerType } from '@metamask/snaps-utils';\nimport type { Json } from '@metamask/utils';\n\n// We only need to dispatch Snap request to the Snaps controller for now.\ntype AllowedActions = SnapControllerHandleRequestAction;\n\n/**\n * A restricted-`Messenger` used by `KeyringInternalSnapClient` to dispatch\n * internal Snap requests.\n */\nexport type KeyringInternalSnapClientMessenger = Messenger<\n  'KeyringInternalSnapClient',\n  AllowedActions\n>;\n\n/**\n * Implementation of the `Sender` interface that can be used to send requests\n * to a Snap through a `Messenger`.\n */\nexport class SnapControllerMessengerSender implements Sender {\n  readonly #snapId: SnapId;\n\n  readonly #origin: string;\n\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  readonly #handler: HandlerType;\n\n  /**\n   * Create a new instance of `SnapControllerSender`.\n   *\n   * @param messenger - The `Messenger` instance used when dispatching controllers actions.\n   * @param snapId - The ID of the Snap to use.\n   * @param origin - The sender's origin.\n   * @param handler - The handler type.\n   */\n  constructor(\n    messenger: KeyringInternalSnapClientMessenger,\n    snapId: SnapId,\n    origin: string,\n    handler: HandlerType,\n  ) {\n    this.#messenger = messenger;\n    this.#snapId = snapId;\n    this.#origin = origin;\n    this.#handler = handler;\n  }\n\n  /**\n   * Send a request to the Snap and return the response.\n   *\n   * @param request - JSON-RPC request to send to the Snap.\n   * @returns A promise that resolves to the response of the request.\n   */\n  async send(request: JsonRpcRequest): Promise<Json> {\n    return this.#messenger.call('SnapController:handleRequest', {\n      snapId: this.#snapId,\n      origin: this.#origin,\n      handler: this.#handler,\n      request,\n    }) as Promise<Json>;\n  }\n}\n\n/**\n * A `KeyringClient` that allows the communication with a Snap through a\n * `Messenger`.\n */\nexport class KeyringInternalSnapClient extends KeyringClient {\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient`.\n   *\n   * The `handlerType` argument has a hard-coded default `string` value instead\n   * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module\n   * from being required at runtime.\n   *\n   * @param args - Constructor arguments.\n   * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.\n   * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).\n   * @param args.origin - The sender's origin (default: `'metamask'`).\n   * @param args.handler - The handler type (default: `'onKeyringRequest'`).\n   */\n  constructor({\n    messenger,\n    snapId = 'undefined' as SnapId,\n    origin = 'metamask',\n    handler = 'onKeyringRequest' as HandlerType,\n  }: {\n    messenger: KeyringInternalSnapClientMessenger;\n    snapId?: SnapId;\n    origin?: string;\n    handler?: HandlerType;\n  }) {\n    super(\n      new SnapControllerMessengerSender(messenger, snapId, origin, handler),\n    );\n    this.#messenger = messenger;\n  }\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient` with the specified\n   * `snapId`.\n   *\n   * @param snapId - The ID of the Snap to use in the new instance.\n   * @returns A new instance of `KeyringInternalSnapClient` with the\n   * specified Snap ID.\n   */\n  withSnapId(snapId: SnapId): KeyringInternalSnapClient {\n    return new KeyringInternalSnapClient({\n      messenger: this.#messenger,\n      snapId,\n    });\n  }\n\n  /**\n   * Submit a keyring request v1 (with no `origin`).\n   *\n   * @param request - Keyring request.\n   * @returns Keyring request's response.\n   */\n  async submitRequestWithoutOrigin(\n    request: KeyringRequestWithoutOrigin,\n  ): Promise<KeyringResponseWithoutOrigin> {\n    return strictMask(\n      await this.send({\n        method: KeyringRpcMethod.SubmitRequest,\n        params: request,\n      }),\n      SubmitRequestResponseV1Struct,\n    );\n  }\n}\n"]}

package/dist/v2/KeyringInternalSnapClient.cjs

@@ -0,0 +1,58 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _KeyringInternalSnapClient_messenger;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeyringInternalSnapClient = void 0;
+const v2_1 = require("@metamask/keyring-snap-client/v2");
+const KeyringInternalSnapClient_1 = require("../KeyringInternalSnapClient.cjs");
+/**
+ * A `KeyringClient` that allows the communication with a Snap through a
+ * `Messenger`.
+ */
+class KeyringInternalSnapClient extends v2_1.KeyringClient {
+    /**
+     * Create a new instance of `KeyringInternalSnapClient`.
+     *
+     * The `handlerType` argument has a hard-coded default `string` value instead
+     * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module
+     * from being required at runtime.
+     *
+     * @param args - Constructor arguments.
+     * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.
+     * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).
+     * @param args.origin - The sender's origin (default: `'metamask'`).
+     * @param args.handler - The handler type (default: `'onKeyringRequest'`).
+     */
+    constructor({ messenger, snapId = 'undefined', origin = 'metamask', handler = 'onKeyringRequest', }) {
+        super(new KeyringInternalSnapClient_1.SnapControllerMessengerSender(messenger, snapId, origin, handler));
+        _KeyringInternalSnapClient_messenger.set(this, void 0);
+        __classPrivateFieldSet(this, _KeyringInternalSnapClient_messenger, messenger, "f");
+    }
+    /**
+     * Create a new instance of `KeyringInternalSnapClient` with the specified
+     * `snapId`.
+     *
+     * @param snapId - The ID of the Snap to use in the new instance.
+     * @returns A new instance of `KeyringInternalSnapClient` with the
+     * specified Snap ID.
+     */
+    withSnapId(snapId) {
+        return new KeyringInternalSnapClient({
+            messenger: __classPrivateFieldGet(this, _KeyringInternalSnapClient_messenger, "f"),
+            snapId,
+        });
+    }
+}
+exports.KeyringInternalSnapClient = KeyringInternalSnapClient;
+_KeyringInternalSnapClient_messenger = new WeakMap();
+//# sourceMappingURL=KeyringInternalSnapClient.cjs.map

package/dist/v2/KeyringInternalSnapClient.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeyringInternalSnapClient.cjs","sourceRoot":"","sources":["../../src/v2/KeyringInternalSnapClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAiE;AAKjE,gFAA6E;AAE7E;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,kBAAa;IAG1D;;;;;;;;;;;;OAYG;IACH,YAAY,EACV,SAAS,EACT,MAAM,GAAG,WAAqB,EAC9B,MAAM,GAAG,UAAU,EACnB,OAAO,GAAG,kBAAiC,GAM5C;QACC,KAAK,CACH,IAAI,yDAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CACtE,CAAC;QA5BK,uDAA+C;QA6BtD,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,yBAAyB,CAAC;YACnC,SAAS,EAAE,uBAAA,IAAI,4CAAW;YAC1B,MAAM;SACP,CAAC,CAAC;IACL,CAAC;CACF;AA/CD,8DA+CC","sourcesContent":["import { KeyringClient } from '@metamask/keyring-snap-client/v2';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { HandlerType } from '@metamask/snaps-utils';\n\nimport type { KeyringInternalSnapClientMessenger } from '../KeyringInternalSnapClient';\nimport { SnapControllerMessengerSender } from '../KeyringInternalSnapClient';\n\n/**\n * A `KeyringClient` that allows the communication with a Snap through a\n * `Messenger`.\n */\nexport class KeyringInternalSnapClient extends KeyringClient {\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient`.\n   *\n   * The `handlerType` argument has a hard-coded default `string` value instead\n   * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module\n   * from being required at runtime.\n   *\n   * @param args - Constructor arguments.\n   * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.\n   * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).\n   * @param args.origin - The sender's origin (default: `'metamask'`).\n   * @param args.handler - The handler type (default: `'onKeyringRequest'`).\n   */\n  constructor({\n    messenger,\n    snapId = 'undefined' as SnapId,\n    origin = 'metamask',\n    handler = 'onKeyringRequest' as HandlerType,\n  }: {\n    messenger: KeyringInternalSnapClientMessenger;\n    snapId?: SnapId;\n    origin?: string;\n    handler?: HandlerType;\n  }) {\n    super(\n      new SnapControllerMessengerSender(messenger, snapId, origin, handler),\n    );\n    this.#messenger = messenger;\n  }\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient` with the specified\n   * `snapId`.\n   *\n   * @param snapId - The ID of the Snap to use in the new instance.\n   * @returns A new instance of `KeyringInternalSnapClient` with the\n   * specified Snap ID.\n   */\n  withSnapId(snapId: SnapId): KeyringInternalSnapClient {\n    return new KeyringInternalSnapClient({\n      messenger: this.#messenger,\n      snapId,\n    });\n  }\n}\n"]}

package/dist/v2/KeyringInternalSnapClient.d.cts

@@ -0,0 +1,40 @@
+import { KeyringClient } from "@metamask/keyring-snap-client/v2";
+import type { SnapId } from "@metamask/snaps-sdk";
+import type { HandlerType } from "@metamask/snaps-utils";
+import type { KeyringInternalSnapClientMessenger } from "../KeyringInternalSnapClient.cjs";
+/**
+ * A `KeyringClient` that allows the communication with a Snap through a
+ * `Messenger`.
+ */
+export declare class KeyringInternalSnapClient extends KeyringClient {
+    #private;
+    /**
+     * Create a new instance of `KeyringInternalSnapClient`.
+     *
+     * The `handlerType` argument has a hard-coded default `string` value instead
+     * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module
+     * from being required at runtime.
+     *
+     * @param args - Constructor arguments.
+     * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.
+     * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).
+     * @param args.origin - The sender's origin (default: `'metamask'`).
+     * @param args.handler - The handler type (default: `'onKeyringRequest'`).
+     */
+    constructor({ messenger, snapId, origin, handler, }: {
+        messenger: KeyringInternalSnapClientMessenger;
+        snapId?: SnapId;
+        origin?: string;
+        handler?: HandlerType;
+    });
+    /**
+     * Create a new instance of `KeyringInternalSnapClient` with the specified
+     * `snapId`.
+     *
+     * @param snapId - The ID of the Snap to use in the new instance.
+     * @returns A new instance of `KeyringInternalSnapClient` with the
+     * specified Snap ID.
+     */
+    withSnapId(snapId: SnapId): KeyringInternalSnapClient;
+}
+//# sourceMappingURL=KeyringInternalSnapClient.d.cts.map

package/dist/v2/KeyringInternalSnapClient.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeyringInternalSnapClient.d.cts","sourceRoot":"","sources":["../../src/v2/KeyringInternalSnapClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,yCAAyC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,8BAA8B;AAEzD,OAAO,KAAK,EAAE,kCAAkC,EAAE,yCAAqC;AAGvF;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,aAAa;;IAG1D;;;;;;;;;;;;OAYG;gBACS,EACV,SAAS,EACT,MAA8B,EAC9B,MAAmB,EACnB,OAA2C,GAC5C,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,WAAW,CAAC;KACvB;IAOD;;;;;;;OAOG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;CAMtD"}

package/dist/v2/KeyringInternalSnapClient.d.mts

@@ -0,0 +1,40 @@
+import { KeyringClient } from "@metamask/keyring-snap-client/v2";
+import type { SnapId } from "@metamask/snaps-sdk";
+import type { HandlerType } from "@metamask/snaps-utils";
+import type { KeyringInternalSnapClientMessenger } from "../KeyringInternalSnapClient.mjs";
+/**
+ * A `KeyringClient` that allows the communication with a Snap through a
+ * `Messenger`.
+ */
+export declare class KeyringInternalSnapClient extends KeyringClient {
+    #private;
+    /**
+     * Create a new instance of `KeyringInternalSnapClient`.
+     *
+     * The `handlerType` argument has a hard-coded default `string` value instead
+     * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module
+     * from being required at runtime.
+     *
+     * @param args - Constructor arguments.
+     * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.
+     * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).
+     * @param args.origin - The sender's origin (default: `'metamask'`).
+     * @param args.handler - The handler type (default: `'onKeyringRequest'`).
+     */
+    constructor({ messenger, snapId, origin, handler, }: {
+        messenger: KeyringInternalSnapClientMessenger;
+        snapId?: SnapId;
+        origin?: string;
+        handler?: HandlerType;
+    });
+    /**
+     * Create a new instance of `KeyringInternalSnapClient` with the specified
+     * `snapId`.
+     *
+     * @param snapId - The ID of the Snap to use in the new instance.
+     * @returns A new instance of `KeyringInternalSnapClient` with the
+     * specified Snap ID.
+     */
+    withSnapId(snapId: SnapId): KeyringInternalSnapClient;
+}
+//# sourceMappingURL=KeyringInternalSnapClient.d.mts.map

package/dist/v2/KeyringInternalSnapClient.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeyringInternalSnapClient.d.mts","sourceRoot":"","sources":["../../src/v2/KeyringInternalSnapClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,yCAAyC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,4BAA4B;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,8BAA8B;AAEzD,OAAO,KAAK,EAAE,kCAAkC,EAAE,yCAAqC;AAGvF;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,aAAa;;IAG1D;;;;;;;;;;;;OAYG;gBACS,EACV,SAAS,EACT,MAA8B,EAC9B,MAAmB,EACnB,OAA2C,GAC5C,EAAE;QACD,SAAS,EAAE,kCAAkC,CAAC;QAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,WAAW,CAAC;KACvB;IAOD;;;;;;;OAOG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;CAMtD"}

package/dist/v2/KeyringInternalSnapClient.mjs

@@ -0,0 +1,54 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _KeyringInternalSnapClient_messenger;
+import { KeyringClient } from "@metamask/keyring-snap-client/v2";
+import { SnapControllerMessengerSender } from "../KeyringInternalSnapClient.mjs";
+/**
+ * A `KeyringClient` that allows the communication with a Snap through a
+ * `Messenger`.
+ */
+export class KeyringInternalSnapClient extends KeyringClient {
+    /**
+     * Create a new instance of `KeyringInternalSnapClient`.
+     *
+     * The `handlerType` argument has a hard-coded default `string` value instead
+     * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module
+     * from being required at runtime.
+     *
+     * @param args - Constructor arguments.
+     * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.
+     * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).
+     * @param args.origin - The sender's origin (default: `'metamask'`).
+     * @param args.handler - The handler type (default: `'onKeyringRequest'`).
+     */
+    constructor({ messenger, snapId = 'undefined', origin = 'metamask', handler = 'onKeyringRequest', }) {
+        super(new SnapControllerMessengerSender(messenger, snapId, origin, handler));
+        _KeyringInternalSnapClient_messenger.set(this, void 0);
+        __classPrivateFieldSet(this, _KeyringInternalSnapClient_messenger, messenger, "f");
+    }
+    /**
+     * Create a new instance of `KeyringInternalSnapClient` with the specified
+     * `snapId`.
+     *
+     * @param snapId - The ID of the Snap to use in the new instance.
+     * @returns A new instance of `KeyringInternalSnapClient` with the
+     * specified Snap ID.
+     */
+    withSnapId(snapId) {
+        return new KeyringInternalSnapClient({
+            messenger: __classPrivateFieldGet(this, _KeyringInternalSnapClient_messenger, "f"),
+            snapId,
+        });
+    }
+}
+_KeyringInternalSnapClient_messenger = new WeakMap();
+//# sourceMappingURL=KeyringInternalSnapClient.mjs.map

package/dist/v2/KeyringInternalSnapClient.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeyringInternalSnapClient.mjs","sourceRoot":"","sources":["../../src/v2/KeyringInternalSnapClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,yCAAyC;AAKjE,OAAO,EAAE,6BAA6B,EAAE,yCAAqC;AAE7E;;;GAGG;AACH,MAAM,OAAO,yBAA0B,SAAQ,aAAa;IAG1D;;;;;;;;;;;;OAYG;IACH,YAAY,EACV,SAAS,EACT,MAAM,GAAG,WAAqB,EAC9B,MAAM,GAAG,UAAU,EACnB,OAAO,GAAG,kBAAiC,GAM5C;QACC,KAAK,CACH,IAAI,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CACtE,CAAC;QA5BK,uDAA+C;QA6BtD,uBAAA,IAAI,wCAAc,SAAS,MAAA,CAAC;IAC9B,CAAC;IAED;;;;;;;OAOG;IACH,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,yBAAyB,CAAC;YACnC,SAAS,EAAE,uBAAA,IAAI,4CAAW;YAC1B,MAAM;SACP,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import { KeyringClient } from '@metamask/keyring-snap-client/v2';\nimport type { SnapId } from '@metamask/snaps-sdk';\nimport type { HandlerType } from '@metamask/snaps-utils';\n\nimport type { KeyringInternalSnapClientMessenger } from '../KeyringInternalSnapClient';\nimport { SnapControllerMessengerSender } from '../KeyringInternalSnapClient';\n\n/**\n * A `KeyringClient` that allows the communication with a Snap through a\n * `Messenger`.\n */\nexport class KeyringInternalSnapClient extends KeyringClient {\n  readonly #messenger: KeyringInternalSnapClientMessenger;\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient`.\n   *\n   * The `handlerType` argument has a hard-coded default `string` value instead\n   * of a `HandlerType` value to prevent the `@metamask/snaps-utils` module\n   * from being required at runtime.\n   *\n   * @param args - Constructor arguments.\n   * @param args.messenger - The `KeyringInternalSnapClientMessenger` instance to use.\n   * @param args.snapId - The ID of the Snap to use (default: `'undefined'`).\n   * @param args.origin - The sender's origin (default: `'metamask'`).\n   * @param args.handler - The handler type (default: `'onKeyringRequest'`).\n   */\n  constructor({\n    messenger,\n    snapId = 'undefined' as SnapId,\n    origin = 'metamask',\n    handler = 'onKeyringRequest' as HandlerType,\n  }: {\n    messenger: KeyringInternalSnapClientMessenger;\n    snapId?: SnapId;\n    origin?: string;\n    handler?: HandlerType;\n  }) {\n    super(\n      new SnapControllerMessengerSender(messenger, snapId, origin, handler),\n    );\n    this.#messenger = messenger;\n  }\n\n  /**\n   * Create a new instance of `KeyringInternalSnapClient` with the specified\n   * `snapId`.\n   *\n   * @param snapId - The ID of the Snap to use in the new instance.\n   * @returns A new instance of `KeyringInternalSnapClient` with the\n   * specified Snap ID.\n   */\n  withSnapId(snapId: SnapId): KeyringInternalSnapClient {\n    return new KeyringInternalSnapClient({\n      messenger: this.#messenger,\n      snapId,\n    });\n  }\n}\n"]}

package/dist/v2/index.cjs

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./KeyringInternalSnapClient.cjs"), exports);
+//# sourceMappingURL=index.cjs.map

package/dist/v2/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kEAA4C","sourcesContent":["export * from './KeyringInternalSnapClient';\n"]}

package/dist/v2/index.d.cts

@@ -0,0 +1,2 @@
+export * from "./KeyringInternalSnapClient.cjs";
+//# sourceMappingURL=index.d.cts.map

package/dist/v2/index.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,gDAA4C"}

package/dist/v2/index.d.mts

@@ -0,0 +1,2 @@
+export * from "./KeyringInternalSnapClient.mjs";
+//# sourceMappingURL=index.d.mts.map

package/dist/v2/index.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,gDAA4C"}

package/dist/v2/index.mjs

@@ -0,0 +1,2 @@
+export * from "./KeyringInternalSnapClient.mjs";
+//# sourceMappingURL=index.mjs.map

package/dist/v2/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/v2/index.ts"],"names":[],"mappings":"AAAA,gDAA4C","sourcesContent":["export * from './KeyringInternalSnapClient';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/keyring-internal-snap-client",
-  "version": "9.0.1-c26e419",
+  "version": "9.0.1-ea8175e",
   "description": "MetaMask Keyring Snap internal clients",
   "keywords": [
     "metamask",