@metamask/snaps-controllers 17.2.1 → 18.0.0

package/CHANGELOG.md

@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [18.0.0]
+
+### Added
+
+- **BREAKING:** Use `StorageService` to store source code ([#3777](https://github.com/MetaMask/snaps/pull/3777))
+
+### Changed
+
+- **BREAKING:** Remove `closeAllConnections` constructor argument ([#3814](https://github.com/MetaMask/snaps/pull/3814))
+- Pass executor parameters by object ([#3803](https://github.com/MetaMask/snaps/pull/3803))
+- Bump `lodash` from `4.17.21` to `4.17.23` ([#3821](https://github.com/MetaMask/snaps/pull/3821))
+- Bump `tar` from `7.0.0` to `7.1.0` ([#3821](https://github.com/MetaMask/snaps/pull/3821))
+- Bump `@metamask/json-rpc-engine` from `10.2.0` to `10.2.1` ([#3804](https://github.com/MetaMask/snaps/pull/3804))
+
+### Fixed
+
+- Disallow using unconnected accounts in `MultichainRouter` ([#3837](https://github.com/MetaMask/snaps/pull/3837))
+- Update `SnapController` state when `SnapsRegistry` changes ([#3828](https://github.com/MetaMask/snaps/pull/3828))
+- Update documentation for `MultichainRouter` ([#3827](https://github.com/MetaMask/snaps/pull/3827))
+- Manually construct `keyring_resolveAccountAddress` request ([#3822](https://github.com/MetaMask/snaps/pull/3822))
+
 ## [17.2.1]
 
 ### Changed
@@ -1018,7 +1039,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - The version of the package no longer needs to match the version of all other
     MetaMask Snaps packages.
 
-[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@17.2.1...HEAD
+[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@18.0.0...HEAD
+[18.0.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@17.2.1...@metamask/snaps-controllers@18.0.0
 [17.2.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@17.2.0...@metamask/snaps-controllers@17.2.1
 [17.2.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@17.1.2...@metamask/snaps-controllers@17.2.0
 [17.1.2]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-controllers@17.1.1...@metamask/snaps-controllers@17.1.2

package/dist/multichain/MultichainRouter.cjs

@@ -24,7 +24,9 @@ class MultichainRouter {
     /**
      * Attempts to resolve the account address to use for a given request by inspecting the request itself.
      *
-     * The request is sent to to an account Snap via the SnapKeyring that will attempt this resolution.
+     * The request is sent to an account Snap that will attempt this resolution.
+     *
+     * We manually construct the request instead of using the SnapKeyring, as the keyring may not be available.
      *
      * @param snapId - The ID of the Snap to send the request to.
      * @param scope - The CAIP-2 scope for the request.
@@ -34,7 +36,19 @@ class MultichainRouter {
      */
     async #resolveRequestAddress(snapId, scope, request) {
         try {
-            const result = await this.#withSnapKeyring(async ({ keyring }) => keyring.resolveAccountAddress(snapId, scope, request));
+            const result = await this.#messenger.call('SnapController:handleRequest', {
+                snapId,
+                origin: 'metamask',
+                request: {
+                    method: 'keyring_resolveAccountAddress',
+                    params: {
+                        request,
+                        scope,
+                    },
+                },
+                handler: snaps_utils_1.HandlerType.OnKeyringRequest,
+            });
+            (0, utils_1.assert)(result === null || (0, utils_1.isObject)(result));
             const address = result?.address;
             return address ? (0, utils_1.parseCaipAccountId)(address).address : null;
         }
@@ -50,7 +64,8 @@ class MultichainRouter {
      *
      * If an account is expected to service this request but none is found, the function will throw.
      *
-     * @param connectedAddresses - The CAIP-10 addresses connected to the requesting origin.
+     * @param connectedAddresses - The CAIP-10 addresses connected to the
+     * requesting origin for the requested scope.
      * @param scope - The CAIP-2 scope for the request.
      * @param request - The JSON-RPC request.
      * @returns An account ID if found, otherwise null.
@@ -65,15 +80,22 @@ class MultichainRouter {
         if (accounts.length === 0) {
             return null;
         }
-        const resolutionSnapId = accounts[0].metadata.snap.id;
+        const parsedConnectedAddresses = connectedAddresses.map((connectedAddress) => (0, utils_1.parseCaipAccountId)(connectedAddress).address);
+        const connectedAccounts = accounts.filter((account) => parsedConnectedAddresses.includes(account.address));
+        if (connectedAccounts.length === 0) {
+            throw rpc_errors_1.rpcErrors.invalidParams({
+                message: 'No available account found for request.',
+            });
+        }
+        const resolutionSnapId = connectedAccounts[0].metadata.snap.id;
         // Attempt to resolve the address that should be used for signing.
         const address = await this.#resolveRequestAddress(resolutionSnapId, scope, request);
-        const parsedConnectedAddresses = connectedAddresses.map((connectedAddress) => (0, utils_1.parseCaipAccountId)(connectedAddress).address);
         // If we have a resolved address, try to find the selected account based on that
         // otherwise, default to one of the connected accounts.
         // TODO: Eventually let the user choose if we have more than one option for the account.
-        const selectedAccount = accounts.find((account) => parsedConnectedAddresses.includes(account.address) &&
-            (!address || account.address === address));
+        const selectedAccount = address
+            ? connectedAccounts.find((account) => account.address === address)
+            : connectedAccounts[0];
         if (!selectedAccount) {
             throw rpc_errors_1.rpcErrors.invalidParams({
                 message: 'No available account found for request.',
@@ -112,11 +134,12 @@ class MultichainRouter {
      * Handle an incoming JSON-RPC request tied to a specific scope by routing
      * to either a protocol Snap or an account Snap.
      *
-     * Note: Addresses are considered case sensitive by the MultichainRouter as
-     * not all non-EVM chains are case insensitive.
+     * Note: Addresses are considered case-sensitive by the MultichainRouter as
+     * not all non-EVM chains are case-insensitive.
      *
      * @param options - An options bag.
-     * @param options.connectedAddresses - Addresses currently connected to the origin.
+     * @param options.connectedAddresses - Addresses currently connected to the
+     * origin for the requested scope.
      * @param options.origin - The origin of the RPC request.
      * @param options.request - The JSON-RPC request.
      * @param options.scope - The CAIP-2 scope for the request.

package/dist/multichain/MultichainRouter.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainRouter.cjs","sourceRoot":"","sources":["../../src/multichain/MultichainRouter.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport type { GetPermissions } from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport {\n  getProtocolCaveatScopes,\n  SnapEndowments,\n} from '@metamask/snaps-rpc-methods';\nimport type { Json, JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';\nimport type { InternalAccount } from '@metamask/snaps-utils';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  JsonRpcParams,\n} from '@metamask/utils';\nimport {\n  assert,\n  hasProperty,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport { getRunnableSnaps } from '../snaps';\nimport type { GetAllSnaps, HandleSnapRequest } from '../snaps';\n\nexport type MultichainRouterHandleRequestAction = {\n  type: `${typeof name}:handleRequest`;\n  handler: MultichainRouter['handleRequest'];\n};\n\nexport type MultichainRouterGetSupportedMethodsAction = {\n  type: `${typeof name}:getSupportedMethods`;\n  handler: MultichainRouter['getSupportedMethods'];\n};\n\nexport type MultichainRouterGetSupportedAccountsAction = {\n  type: `${typeof name}:getSupportedAccounts`;\n  handler: MultichainRouter['getSupportedAccounts'];\n};\n\nexport type MultichainRouterIsSupportedScopeAction = {\n  type: `${typeof name}:isSupportedScope`;\n  handler: MultichainRouter['isSupportedScope'];\n};\n\ntype SnapKeyring = {\n  submitRequest: (request: {\n    origin: string;\n    account: string;\n    method: string;\n    params?: Json[] | Record<string, Json>;\n    scope: CaipChainId;\n  }) => Promise<Json>;\n  resolveAccountAddress: (\n    snapId: SnapId,\n    scope: CaipChainId,\n    request: Json,\n  ) => Promise<{ address: CaipAccountId } | null>;\n};\n\n// Expecting a bound function that calls KeyringController.withKeyring selecting the Snap keyring\nexport type WithSnapKeyringFunction = <ReturnType>(\n  operation: ({ keyring }: { keyring: SnapKeyring }) => Promise<ReturnType>,\n) => Promise<ReturnType>;\n\nexport type AccountsControllerListMultichainAccountsAction = {\n  type: `AccountsController:listMultichainAccounts`;\n  handler: (chainId?: CaipChainId) => InternalAccount[];\n};\n\nexport type MultichainRouterActions =\n  | MultichainRouterHandleRequestAction\n  | MultichainRouterGetSupportedMethodsAction\n  | MultichainRouterGetSupportedAccountsAction\n  | MultichainRouterIsSupportedScopeAction;\n\nexport type MultichainRouterAllowedActions =\n  | GetAllSnaps\n  | HandleSnapRequest\n  | GetPermissions\n  | AccountsControllerListMultichainAccountsAction;\n\nexport type MultichainRouterEvents = never;\n\nexport type MultichainRouterMessenger = Messenger<\n  typeof name,\n  MultichainRouterActions | MultichainRouterAllowedActions\n>;\n\nexport type MultichainRouterArgs = {\n  messenger: MultichainRouterMessenger;\n  withSnapKeyring: WithSnapKeyringFunction;\n};\n\ntype ProtocolSnap = {\n  snapId: SnapId;\n  methods: string[];\n};\n\nconst name = 'MultichainRouter';\n\nexport class MultichainRouter {\n  name: typeof name = name;\n\n  state = null;\n\n  readonly #messenger: MultichainRouterMessenger;\n\n  readonly #withSnapKeyring: WithSnapKeyringFunction;\n\n  constructor({ messenger, withSnapKeyring }: MultichainRouterArgs) {\n    this.#messenger = messenger;\n    this.#withSnapKeyring = withSnapKeyring;\n\n    this.#messenger.registerActionHandler(\n      `${name}:handleRequest`,\n      async (...args) => this.handleRequest(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:getSupportedMethods`,\n      (...args) => this.getSupportedMethods(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:getSupportedAccounts`,\n      (...args) => this.getSupportedAccounts(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:isSupportedScope`,\n      (...args) => this.isSupportedScope(...args),\n    );\n  }\n\n  /**\n   * Attempts to resolve the account address to use for a given request by inspecting the request itself.\n   *\n   * The request is sent to to an account Snap via the SnapKeyring that will attempt this resolution.\n   *\n   * @param snapId - The ID of the Snap to send the request to.\n   * @param scope - The CAIP-2 scope for the request.\n   * @param request - The JSON-RPC request.\n   * @returns The resolved address if found, otherwise null.\n   * @throws If the invocation of the SnapKeyring fails.\n   */\n  async #resolveRequestAddress(\n    snapId: SnapId,\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ) {\n    try {\n      const result = await this.#withSnapKeyring(async ({ keyring }) =>\n        keyring.resolveAccountAddress(snapId, scope, request),\n      );\n      const address = result?.address;\n      return address ? parseCaipAccountId(address).address : null;\n    } catch {\n      throw rpcErrors.internal();\n    }\n  }\n\n  /**\n   * Get the account ID of the account that should service the RPC request via an account Snap.\n   *\n   * This function checks whether any accounts exist that can service a given request by\n   * using a combination of the resolveAccountAddress functionality and the connected accounts.\n   *\n   * If an account is expected to service this request but none is found, the function will throw.\n   *\n   * @param connectedAddresses - The CAIP-10 addresses connected to the requesting origin.\n   * @param scope - The CAIP-2 scope for the request.\n   * @param request - The JSON-RPC request.\n   * @returns An account ID if found, otherwise null.\n   * @throws If no account is found, but the accounts exist that could service the request.\n   */\n  async #getSnapAccountId(\n    connectedAddresses: CaipAccountId[],\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ) {\n    const accounts = this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .filter(\n        (\n          account: InternalAccount,\n        ): account is InternalAccount & {\n          metadata: Required<InternalAccount['metadata']>;\n        } =>\n          Boolean(account.metadata.snap?.enabled) &&\n          account.methods.includes(request.method),\n      );\n\n    // If no accounts can service the request, return null.\n    if (accounts.length === 0) {\n      return null;\n    }\n\n    const resolutionSnapId = accounts[0].metadata.snap.id;\n\n    // Attempt to resolve the address that should be used for signing.\n    const address = await this.#resolveRequestAddress(\n      resolutionSnapId,\n      scope,\n      request,\n    );\n\n    const parsedConnectedAddresses = connectedAddresses.map(\n      (connectedAddress) => parseCaipAccountId(connectedAddress).address,\n    );\n\n    // If we have a resolved address, try to find the selected account based on that\n    // otherwise, default to one of the connected accounts.\n    // TODO: Eventually let the user choose if we have more than one option for the account.\n    const selectedAccount = accounts.find(\n      (account) =>\n        parsedConnectedAddresses.includes(account.address) &&\n        (!address || account.address === address),\n    );\n\n    if (!selectedAccount) {\n      throw rpcErrors.invalidParams({\n        message: 'No available account found for request.',\n      });\n    }\n\n    return selectedAccount.id;\n  }\n\n  /**\n   * Get all protocol Snaps that can service a given CAIP-2 scope.\n   *\n   * Protocol Snaps are deemed fit to service a scope if they are runnable\n   * and have the proper permissions set for the scope.\n   *\n   * @param scope - A CAIP-2 scope.\n   * @returns A list of all the protocol Snaps available and their RPC methods.\n   */\n  #getProtocolSnaps(scope: CaipChainId) {\n    const allSnaps = this.#messenger.call('SnapController:getAll');\n    const filteredSnaps = getRunnableSnaps(allSnaps);\n\n    return filteredSnaps.reduce<ProtocolSnap[]>((accumulator, snap) => {\n      const permissions = this.#messenger.call(\n        'PermissionController:getPermissions',\n        snap.id,\n      );\n\n      if (permissions && hasProperty(permissions, SnapEndowments.Protocol)) {\n        const permission = permissions[SnapEndowments.Protocol];\n        const scopes = getProtocolCaveatScopes(permission);\n        if (scopes && hasProperty(scopes, scope)) {\n          accumulator.push({\n            snapId: snap.id,\n            methods: scopes[scope].methods,\n          });\n        }\n      }\n\n      return accumulator;\n    }, []);\n  }\n\n  /**\n   * Handle an incoming JSON-RPC request tied to a specific scope by routing\n   * to either a protocol Snap or an account Snap.\n   *\n   * Note: Addresses are considered case sensitive by the MultichainRouter as\n   * not all non-EVM chains are case insensitive.\n   *\n   * @param options - An options bag.\n   * @param options.connectedAddresses - Addresses currently connected to the origin.\n   * @param options.origin - The origin of the RPC request.\n   * @param options.request - The JSON-RPC request.\n   * @param options.scope - The CAIP-2 scope for the request.\n   * @returns The response from the chosen Snap.\n   * @throws If no handler was found.\n   */\n  async handleRequest({\n    connectedAddresses,\n    origin,\n    scope,\n    request: rawRequest,\n  }: {\n    connectedAddresses: CaipAccountId[];\n    origin: string;\n    scope: CaipChainId;\n    request: JsonRpcRequest;\n  }): Promise<Json> {\n    // Explicitly block EVM scopes, just in case.\n    assert(\n      !scope.startsWith(KnownCaipNamespace.Eip155) &&\n        !scope.startsWith('wallet:eip155'),\n    );\n\n    // Re-create the request to simplify and remove additional properties that may be present in MM middleware.\n    const request = {\n      jsonrpc: '2.0' as const,\n      id: rawRequest.id ?? nanoid(),\n      method: rawRequest.method,\n      ...(rawRequest.params ? { params: rawRequest.params } : {}),\n    };\n\n    const { method, params } = request;\n\n    // If the RPC request can be serviced by an account Snap, route it there.\n    const accountId = await this.#getSnapAccountId(\n      connectedAddresses,\n      scope,\n      request,\n    );\n\n    if (accountId) {\n      return this.#withSnapKeyring(async ({ keyring }) =>\n        keyring.submitRequest({\n          origin,\n          account: accountId,\n          scope,\n          method,\n          params: params as JsonRpcParams,\n        }),\n      );\n    }\n\n    // If the RPC request cannot be serviced by an account Snap,\n    // but has a protocol Snap available, route it there.\n    const protocolSnaps = this.#getProtocolSnaps(scope);\n    const protocolSnap = protocolSnaps.find((snap) =>\n      snap.methods.includes(method),\n    );\n\n    if (protocolSnap) {\n      return this.#messenger.call('SnapController:handleRequest', {\n        snapId: protocolSnap.snapId,\n        origin,\n        request: {\n          method: '',\n          params: {\n            request,\n            scope,\n          },\n        },\n        handler: HandlerType.OnProtocolRequest,\n      }) as Promise<Json>;\n    }\n\n    // If no compatible account or protocol Snaps were found, throw.\n    throw rpcErrors.methodNotFound();\n  }\n\n  /**\n   * Get a list of metadata for supported accounts for a given scope from the client.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of metadata for the supported accounts.\n   */\n  #getSupportedAccountsMetadata(scope: CaipChainId): InternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .filter((account: InternalAccount) => account.metadata.snap?.enabled);\n  }\n\n  /**\n   * Get a list of supported methods for a given scope.\n   * This combines both protocol and account Snaps supported methods.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of supported methods.\n   */\n  getSupportedMethods(scope: CaipChainId): string[] {\n    const accountMethods = this.#getSupportedAccountsMetadata(scope).flatMap(\n      (account) => account.methods,\n    );\n\n    const protocolMethods = this.#getProtocolSnaps(scope).flatMap(\n      (snap) => snap.methods,\n    );\n\n    return Array.from(new Set([...accountMethods, ...protocolMethods]));\n  }\n\n  /**\n   * Get a list of supported accounts for a given scope.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of CAIP-10 addresses.\n   */\n  getSupportedAccounts(scope: CaipChainId): string[] {\n    return this.#getSupportedAccountsMetadata(scope).map(\n      (account) => `${scope}:${account.address}`,\n    );\n  }\n\n  /**\n   * Determine whether a given CAIP-2 scope is supported by the router.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns True if the router can service the scope, otherwise false.\n   */\n  isSupportedScope(scope: CaipChainId): boolean {\n    const hasAccountSnap = this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .some((account: InternalAccount) => account.metadata.snap?.enabled);\n    // We currently assume here that if one Snap exists that service the scope, we can service the scope generally.\n    return hasAccountSnap || this.#getProtocolSnaps(scope).length > 0;\n  }\n}\n"]}
+{"version":3,"file":"MultichainRouter.cjs","sourceRoot":"","sources":["../../src/multichain/MultichainRouter.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport type { GetPermissions } from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport {\n  getProtocolCaveatScopes,\n  SnapEndowments,\n} from '@metamask/snaps-rpc-methods';\nimport type { Json, JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';\nimport type { InternalAccount } from '@metamask/snaps-utils';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  JsonRpcParams,\n} from '@metamask/utils';\nimport {\n  assert,\n  hasProperty,\n  isObject,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport { getRunnableSnaps } from '../snaps';\nimport type { GetAllSnaps, HandleSnapRequest } from '../snaps';\n\nexport type MultichainRouterHandleRequestAction = {\n  type: `${typeof name}:handleRequest`;\n  handler: MultichainRouter['handleRequest'];\n};\n\nexport type MultichainRouterGetSupportedMethodsAction = {\n  type: `${typeof name}:getSupportedMethods`;\n  handler: MultichainRouter['getSupportedMethods'];\n};\n\nexport type MultichainRouterGetSupportedAccountsAction = {\n  type: `${typeof name}:getSupportedAccounts`;\n  handler: MultichainRouter['getSupportedAccounts'];\n};\n\nexport type MultichainRouterIsSupportedScopeAction = {\n  type: `${typeof name}:isSupportedScope`;\n  handler: MultichainRouter['isSupportedScope'];\n};\n\ntype SnapKeyring = {\n  submitRequest: (request: {\n    origin: string;\n    account: string;\n    method: string;\n    params?: Json[] | Record<string, Json>;\n    scope: CaipChainId;\n  }) => Promise<Json>;\n};\n\n// Expecting a bound function that calls KeyringController.withKeyring selecting the Snap keyring\nexport type WithSnapKeyringFunction = <ReturnType>(\n  operation: ({ keyring }: { keyring: SnapKeyring }) => Promise<ReturnType>,\n) => Promise<ReturnType>;\n\nexport type AccountsControllerListMultichainAccountsAction = {\n  type: `AccountsController:listMultichainAccounts`;\n  handler: (chainId?: CaipChainId) => InternalAccount[];\n};\n\nexport type MultichainRouterActions =\n  | MultichainRouterHandleRequestAction\n  | MultichainRouterGetSupportedMethodsAction\n  | MultichainRouterGetSupportedAccountsAction\n  | MultichainRouterIsSupportedScopeAction;\n\nexport type MultichainRouterAllowedActions =\n  | GetAllSnaps\n  | HandleSnapRequest\n  | GetPermissions\n  | AccountsControllerListMultichainAccountsAction;\n\nexport type MultichainRouterEvents = never;\n\nexport type MultichainRouterMessenger = Messenger<\n  typeof name,\n  MultichainRouterActions | MultichainRouterAllowedActions\n>;\n\nexport type MultichainRouterArgs = {\n  messenger: MultichainRouterMessenger;\n  withSnapKeyring: WithSnapKeyringFunction;\n};\n\ntype ProtocolSnap = {\n  snapId: SnapId;\n  methods: string[];\n};\n\nconst name = 'MultichainRouter';\n\nexport class MultichainRouter {\n  name: typeof name = name;\n\n  state = null;\n\n  readonly #messenger: MultichainRouterMessenger;\n\n  readonly #withSnapKeyring: WithSnapKeyringFunction;\n\n  constructor({ messenger, withSnapKeyring }: MultichainRouterArgs) {\n    this.#messenger = messenger;\n    this.#withSnapKeyring = withSnapKeyring;\n\n    this.#messenger.registerActionHandler(\n      `${name}:handleRequest`,\n      async (...args) => this.handleRequest(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:getSupportedMethods`,\n      (...args) => this.getSupportedMethods(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:getSupportedAccounts`,\n      (...args) => this.getSupportedAccounts(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:isSupportedScope`,\n      (...args) => this.isSupportedScope(...args),\n    );\n  }\n\n  /**\n   * Attempts to resolve the account address to use for a given request by inspecting the request itself.\n   *\n   * The request is sent to an account Snap that will attempt this resolution.\n   *\n   * We manually construct the request instead of using the SnapKeyring, as the keyring may not be available.\n   *\n   * @param snapId - The ID of the Snap to send the request to.\n   * @param scope - The CAIP-2 scope for the request.\n   * @param request - The JSON-RPC request.\n   * @returns The resolved address if found, otherwise null.\n   * @throws If the invocation of the SnapKeyring fails.\n   */\n  async #resolveRequestAddress(\n    snapId: SnapId,\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ) {\n    try {\n      const result = await this.#messenger.call(\n        'SnapController:handleRequest',\n        {\n          snapId,\n          origin: 'metamask',\n          request: {\n            method: 'keyring_resolveAccountAddress',\n            params: {\n              request,\n              scope,\n            },\n          },\n          handler: HandlerType.OnKeyringRequest,\n        },\n      );\n\n      assert(result === null || isObject(result));\n\n      const address = result?.address as CaipAccountId;\n      return address ? parseCaipAccountId(address).address : null;\n    } catch {\n      throw rpcErrors.internal();\n    }\n  }\n\n  /**\n   * Get the account ID of the account that should service the RPC request via an account Snap.\n   *\n   * This function checks whether any accounts exist that can service a given request by\n   * using a combination of the resolveAccountAddress functionality and the connected accounts.\n   *\n   * If an account is expected to service this request but none is found, the function will throw.\n   *\n   * @param connectedAddresses - The CAIP-10 addresses connected to the\n   * requesting origin for the requested scope.\n   * @param scope - The CAIP-2 scope for the request.\n   * @param request - The JSON-RPC request.\n   * @returns An account ID if found, otherwise null.\n   * @throws If no account is found, but the accounts exist that could service the request.\n   */\n  async #getSnapAccountId(\n    connectedAddresses: CaipAccountId[],\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ) {\n    const accounts = this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .filter(\n        (\n          account: InternalAccount,\n        ): account is InternalAccount & {\n          metadata: Required<InternalAccount['metadata']>;\n        } =>\n          Boolean(account.metadata.snap?.enabled) &&\n          account.methods.includes(request.method),\n      );\n\n    // If no accounts can service the request, return null.\n    if (accounts.length === 0) {\n      return null;\n    }\n\n    const parsedConnectedAddresses = connectedAddresses.map(\n      (connectedAddress) => parseCaipAccountId(connectedAddress).address,\n    );\n\n    const connectedAccounts = accounts.filter((account) =>\n      parsedConnectedAddresses.includes(account.address),\n    );\n\n    if (connectedAccounts.length === 0) {\n      throw rpcErrors.invalidParams({\n        message: 'No available account found for request.',\n      });\n    }\n\n    const resolutionSnapId = connectedAccounts[0].metadata.snap.id;\n\n    // Attempt to resolve the address that should be used for signing.\n    const address = await this.#resolveRequestAddress(\n      resolutionSnapId,\n      scope,\n      request,\n    );\n\n    // If we have a resolved address, try to find the selected account based on that\n    // otherwise, default to one of the connected accounts.\n    // TODO: Eventually let the user choose if we have more than one option for the account.\n    const selectedAccount = address\n      ? connectedAccounts.find((account) => account.address === address)\n      : connectedAccounts[0];\n\n    if (!selectedAccount) {\n      throw rpcErrors.invalidParams({\n        message: 'No available account found for request.',\n      });\n    }\n\n    return selectedAccount.id;\n  }\n\n  /**\n   * Get all protocol Snaps that can service a given CAIP-2 scope.\n   *\n   * Protocol Snaps are deemed fit to service a scope if they are runnable\n   * and have the proper permissions set for the scope.\n   *\n   * @param scope - A CAIP-2 scope.\n   * @returns A list of all the protocol Snaps available and their RPC methods.\n   */\n  #getProtocolSnaps(scope: CaipChainId) {\n    const allSnaps = this.#messenger.call('SnapController:getAll');\n    const filteredSnaps = getRunnableSnaps(allSnaps);\n\n    return filteredSnaps.reduce<ProtocolSnap[]>((accumulator, snap) => {\n      const permissions = this.#messenger.call(\n        'PermissionController:getPermissions',\n        snap.id,\n      );\n\n      if (permissions && hasProperty(permissions, SnapEndowments.Protocol)) {\n        const permission = permissions[SnapEndowments.Protocol];\n        const scopes = getProtocolCaveatScopes(permission);\n        if (scopes && hasProperty(scopes, scope)) {\n          accumulator.push({\n            snapId: snap.id,\n            methods: scopes[scope].methods,\n          });\n        }\n      }\n\n      return accumulator;\n    }, []);\n  }\n\n  /**\n   * Handle an incoming JSON-RPC request tied to a specific scope by routing\n   * to either a protocol Snap or an account Snap.\n   *\n   * Note: Addresses are considered case-sensitive by the MultichainRouter as\n   * not all non-EVM chains are case-insensitive.\n   *\n   * @param options - An options bag.\n   * @param options.connectedAddresses - Addresses currently connected to the\n   * origin for the requested scope.\n   * @param options.origin - The origin of the RPC request.\n   * @param options.request - The JSON-RPC request.\n   * @param options.scope - The CAIP-2 scope for the request.\n   * @returns The response from the chosen Snap.\n   * @throws If no handler was found.\n   */\n  async handleRequest({\n    connectedAddresses,\n    origin,\n    scope,\n    request: rawRequest,\n  }: {\n    connectedAddresses: CaipAccountId[];\n    origin: string;\n    scope: CaipChainId;\n    request: JsonRpcRequest;\n  }): Promise<Json> {\n    // Explicitly block EVM scopes, just in case.\n    assert(\n      !scope.startsWith(KnownCaipNamespace.Eip155) &&\n        !scope.startsWith('wallet:eip155'),\n    );\n\n    // Re-create the request to simplify and remove additional properties that may be present in MM middleware.\n    const request = {\n      jsonrpc: '2.0' as const,\n      id: rawRequest.id ?? nanoid(),\n      method: rawRequest.method,\n      ...(rawRequest.params ? { params: rawRequest.params } : {}),\n    };\n\n    const { method, params } = request;\n\n    // If the RPC request can be serviced by an account Snap, route it there.\n    const accountId = await this.#getSnapAccountId(\n      connectedAddresses,\n      scope,\n      request,\n    );\n\n    if (accountId) {\n      return this.#withSnapKeyring(async ({ keyring }) =>\n        keyring.submitRequest({\n          origin,\n          account: accountId,\n          scope,\n          method,\n          params: params as JsonRpcParams,\n        }),\n      );\n    }\n\n    // If the RPC request cannot be serviced by an account Snap,\n    // but has a protocol Snap available, route it there.\n    const protocolSnaps = this.#getProtocolSnaps(scope);\n    const protocolSnap = protocolSnaps.find((snap) =>\n      snap.methods.includes(method),\n    );\n\n    if (protocolSnap) {\n      return this.#messenger.call('SnapController:handleRequest', {\n        snapId: protocolSnap.snapId,\n        origin,\n        request: {\n          method: '',\n          params: {\n            request,\n            scope,\n          },\n        },\n        handler: HandlerType.OnProtocolRequest,\n      }) as Promise<Json>;\n    }\n\n    // If no compatible account or protocol Snaps were found, throw.\n    throw rpcErrors.methodNotFound();\n  }\n\n  /**\n   * Get a list of metadata for supported accounts for a given scope from the client.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of metadata for the supported accounts.\n   */\n  #getSupportedAccountsMetadata(scope: CaipChainId): InternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .filter((account: InternalAccount) => account.metadata.snap?.enabled);\n  }\n\n  /**\n   * Get a list of supported methods for a given scope.\n   * This combines both protocol and account Snaps supported methods.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of supported methods.\n   */\n  getSupportedMethods(scope: CaipChainId): string[] {\n    const accountMethods = this.#getSupportedAccountsMetadata(scope).flatMap(\n      (account) => account.methods,\n    );\n\n    const protocolMethods = this.#getProtocolSnaps(scope).flatMap(\n      (snap) => snap.methods,\n    );\n\n    return Array.from(new Set([...accountMethods, ...protocolMethods]));\n  }\n\n  /**\n   * Get a list of supported accounts for a given scope.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of CAIP-10 addresses.\n   */\n  getSupportedAccounts(scope: CaipChainId): string[] {\n    return this.#getSupportedAccountsMetadata(scope).map(\n      (account) => `${scope}:${account.address}`,\n    );\n  }\n\n  /**\n   * Determine whether a given CAIP-2 scope is supported by the router.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns True if the router can service the scope, otherwise false.\n   */\n  isSupportedScope(scope: CaipChainId): boolean {\n    const hasAccountSnap = this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .some((account: InternalAccount) => account.metadata.snap?.enabled);\n    // We currently assume here that if one Snap exists that service the scope, we can service the scope generally.\n    return hasAccountSnap || this.#getProtocolSnaps(scope).length > 0;\n  }\n}\n"]}

package/dist/multichain/MultichainRouter.d.cts

@@ -1,6 +1,6 @@
 import type { Messenger } from "@metamask/messenger";
 import type { GetPermissions } from "@metamask/permission-controller";
-import type { Json, JsonRpcRequest, SnapId } from "@metamask/snaps-sdk";
+import type { Json, JsonRpcRequest } from "@metamask/snaps-sdk";
 import type { InternalAccount } from "@metamask/snaps-utils";
 import type { CaipAccountId, CaipChainId } from "@metamask/utils";
 import type { GetAllSnaps, HandleSnapRequest } from "../snaps/index.cjs";
@@ -28,9 +28,6 @@ type SnapKeyring = {
         params?: Json[] | Record<string, Json>;
         scope: CaipChainId;
     }) => Promise<Json>;
-    resolveAccountAddress: (snapId: SnapId, scope: CaipChainId, request: Json) => Promise<{
-        address: CaipAccountId;
-    } | null>;
 };
 export type WithSnapKeyringFunction = <ReturnType>(operation: ({ keyring }: {
     keyring: SnapKeyring;
@@ -57,11 +54,12 @@ export declare class MultichainRouter {
      * Handle an incoming JSON-RPC request tied to a specific scope by routing
      * to either a protocol Snap or an account Snap.
      *
-     * Note: Addresses are considered case sensitive by the MultichainRouter as
-     * not all non-EVM chains are case insensitive.
+     * Note: Addresses are considered case-sensitive by the MultichainRouter as
+     * not all non-EVM chains are case-insensitive.
      *
      * @param options - An options bag.
-     * @param options.connectedAddresses - Addresses currently connected to the origin.
+     * @param options.connectedAddresses - Addresses currently connected to the
+     * origin for the requested scope.
      * @param options.origin - The origin of the RPC request.
      * @param options.request - The JSON-RPC request.
      * @param options.scope - The CAIP-2 scope for the request.

package/dist/multichain/MultichainRouter.d.cts.map

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

package/dist/multichain/MultichainRouter.d.mts

@@ -1,6 +1,6 @@
 import type { Messenger } from "@metamask/messenger";
 import type { GetPermissions } from "@metamask/permission-controller";
-import type { Json, JsonRpcRequest, SnapId } from "@metamask/snaps-sdk";
+import type { Json, JsonRpcRequest } from "@metamask/snaps-sdk";
 import type { InternalAccount } from "@metamask/snaps-utils";
 import type { CaipAccountId, CaipChainId } from "@metamask/utils";
 import type { GetAllSnaps, HandleSnapRequest } from "../snaps/index.mjs";
@@ -28,9 +28,6 @@ type SnapKeyring = {
         params?: Json[] | Record<string, Json>;
         scope: CaipChainId;
     }) => Promise<Json>;
-    resolveAccountAddress: (snapId: SnapId, scope: CaipChainId, request: Json) => Promise<{
-        address: CaipAccountId;
-    } | null>;
 };
 export type WithSnapKeyringFunction = <ReturnType>(operation: ({ keyring }: {
     keyring: SnapKeyring;
@@ -57,11 +54,12 @@ export declare class MultichainRouter {
      * Handle an incoming JSON-RPC request tied to a specific scope by routing
      * to either a protocol Snap or an account Snap.
      *
-     * Note: Addresses are considered case sensitive by the MultichainRouter as
-     * not all non-EVM chains are case insensitive.
+     * Note: Addresses are considered case-sensitive by the MultichainRouter as
+     * not all non-EVM chains are case-insensitive.
      *
      * @param options - An options bag.
-     * @param options.connectedAddresses - Addresses currently connected to the origin.
+     * @param options.connectedAddresses - Addresses currently connected to the
+     * origin for the requested scope.
      * @param options.origin - The origin of the RPC request.
      * @param options.request - The JSON-RPC request.
      * @param options.scope - The CAIP-2 scope for the request.

package/dist/multichain/MultichainRouter.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainRouter.d.mts","sourceRoot":"","sources":["../../src/multichain/MultichainRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,wCAAwC;AAMtE,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,4BAA4B;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,8BAA8B;AAE7D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EAEZ,wBAAwB;AAUzB,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,2BAAiB;AAE/D,MAAM,MAAM,mCAAmC,GAAG;IAChD,IAAI,EAAE,GAAG,OAAO,IAAI,gBAAgB,CAAC;IACrC,OAAO,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,IAAI,EAAE,GAAG,OAAO,IAAI,sBAAsB,CAAC;IAC3C,OAAO,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,IAAI,EAAE,GAAG,OAAO,IAAI,uBAAuB,CAAC;IAC5C,OAAO,EAAE,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,sCAAsC,GAAG;IACnD,IAAI,EAAE,GAAG,OAAO,IAAI,mBAAmB,CAAC;IACxC,OAAO,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;CAC/C,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,CAAC,OAAO,EAAE;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,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,WAAW,CAAC;KACpB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,qBAAqB,EAAE,CACrB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,IAAI,KACV,OAAO,CAAC;QAAE,OAAO,EAAE,aAAa,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;CACjD,CAAC;AAGF,MAAM,MAAM,uBAAuB,GAAG,CAAC,UAAU,EAC/C,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,KAAK,OAAO,CAAC,UAAU,CAAC,KACtE,OAAO,CAAC,UAAU,CAAC,CAAC;AAEzB,MAAM,MAAM,8CAA8C,GAAG;IAC3D,IAAI,EAAE,2CAA2C,CAAC;IAClD,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,WAAW,KAAK,eAAe,EAAE,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B,mCAAmC,GACnC,yCAAyC,GACzC,0CAA0C,GAC1C,sCAAsC,CAAC;AAE3C,MAAM,MAAM,8BAA8B,GACtC,WAAW,GACX,iBAAiB,GACjB,cAAc,GACd,8CAA8C,CAAC;AAEnD,MAAM,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAE3C,MAAM,MAAM,yBAAyB,GAAG,SAAS,CAC/C,OAAO,IAAI,EACX,uBAAuB,GAAG,8BAA8B,CACzD,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,yBAAyB,CAAC;IACrC,eAAe,EAAE,uBAAuB,CAAC;CAC1C,CAAC;AAOF,QAAA,MAAM,IAAI,qBAAqB,CAAC;AAEhC,qBAAa,gBAAgB;;IAC3B,IAAI,EAAE,OAAO,IAAI,CAAQ;IAEzB,KAAK,OAAQ;gBAMD,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,oBAAoB;IAyJhE;;;;;;;;;;;;;;OAcG;IACG,aAAa,CAAC,EAClB,kBAAkB,EAClB,MAAM,EACN,KAAK,EACL,OAAO,EAAE,UAAU,GACpB,EAAE;QACD,kBAAkB,EAAE,aAAa,EAAE,CAAC;QACpC,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,WAAW,CAAC;QACnB,OAAO,EAAE,cAAc,CAAC;KACzB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0EjB;;;;;;OAMG;IACH,mBAAmB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,EAAE;IAYjD;;;;;OAKG;IACH,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,EAAE;IAMlD;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO;CAO9C"}
+{"version":3,"file":"MultichainRouter.d.mts","sourceRoot":"","sources":["../../src/multichain/MultichainRouter.ts"],"names":[],"mappings":"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"}

package/dist/multichain/MultichainRouter.mjs

@@ -1,7 +1,7 @@
 import { rpcErrors } from "@metamask/rpc-errors";
 import { getProtocolCaveatScopes, SnapEndowments } from "@metamask/snaps-rpc-methods";
 import { HandlerType } from "@metamask/snaps-utils";
-import { assert, hasProperty, KnownCaipNamespace, parseCaipAccountId } from "@metamask/utils";
+import { assert, hasProperty, isObject, KnownCaipNamespace, parseCaipAccountId } from "@metamask/utils";
 import { nanoid } from "nanoid";
 import { getRunnableSnaps } from "../snaps/index.mjs";
 const name = 'MultichainRouter';
@@ -21,7 +21,9 @@ export class MultichainRouter {
     /**
      * Attempts to resolve the account address to use for a given request by inspecting the request itself.
      *
-     * The request is sent to to an account Snap via the SnapKeyring that will attempt this resolution.
+     * The request is sent to an account Snap that will attempt this resolution.
+     *
+     * We manually construct the request instead of using the SnapKeyring, as the keyring may not be available.
      *
      * @param snapId - The ID of the Snap to send the request to.
      * @param scope - The CAIP-2 scope for the request.
@@ -31,7 +33,19 @@ export class MultichainRouter {
      */
     async #resolveRequestAddress(snapId, scope, request) {
         try {
-            const result = await this.#withSnapKeyring(async ({ keyring }) => keyring.resolveAccountAddress(snapId, scope, request));
+            const result = await this.#messenger.call('SnapController:handleRequest', {
+                snapId,
+                origin: 'metamask',
+                request: {
+                    method: 'keyring_resolveAccountAddress',
+                    params: {
+                        request,
+                        scope,
+                    },
+                },
+                handler: HandlerType.OnKeyringRequest,
+            });
+            assert(result === null || isObject(result));
             const address = result?.address;
             return address ? parseCaipAccountId(address).address : null;
         }
@@ -47,7 +61,8 @@ export class MultichainRouter {
      *
      * If an account is expected to service this request but none is found, the function will throw.
      *
-     * @param connectedAddresses - The CAIP-10 addresses connected to the requesting origin.
+     * @param connectedAddresses - The CAIP-10 addresses connected to the
+     * requesting origin for the requested scope.
      * @param scope - The CAIP-2 scope for the request.
      * @param request - The JSON-RPC request.
      * @returns An account ID if found, otherwise null.
@@ -62,15 +77,22 @@ export class MultichainRouter {
         if (accounts.length === 0) {
             return null;
         }
-        const resolutionSnapId = accounts[0].metadata.snap.id;
+        const parsedConnectedAddresses = connectedAddresses.map((connectedAddress) => parseCaipAccountId(connectedAddress).address);
+        const connectedAccounts = accounts.filter((account) => parsedConnectedAddresses.includes(account.address));
+        if (connectedAccounts.length === 0) {
+            throw rpcErrors.invalidParams({
+                message: 'No available account found for request.',
+            });
+        }
+        const resolutionSnapId = connectedAccounts[0].metadata.snap.id;
         // Attempt to resolve the address that should be used for signing.
         const address = await this.#resolveRequestAddress(resolutionSnapId, scope, request);
-        const parsedConnectedAddresses = connectedAddresses.map((connectedAddress) => parseCaipAccountId(connectedAddress).address);
         // If we have a resolved address, try to find the selected account based on that
         // otherwise, default to one of the connected accounts.
         // TODO: Eventually let the user choose if we have more than one option for the account.
-        const selectedAccount = accounts.find((account) => parsedConnectedAddresses.includes(account.address) &&
-            (!address || account.address === address));
+        const selectedAccount = address
+            ? connectedAccounts.find((account) => account.address === address)
+            : connectedAccounts[0];
         if (!selectedAccount) {
             throw rpcErrors.invalidParams({
                 message: 'No available account found for request.',
@@ -109,11 +131,12 @@ export class MultichainRouter {
      * Handle an incoming JSON-RPC request tied to a specific scope by routing
      * to either a protocol Snap or an account Snap.
      *
-     * Note: Addresses are considered case sensitive by the MultichainRouter as
-     * not all non-EVM chains are case insensitive.
+     * Note: Addresses are considered case-sensitive by the MultichainRouter as
+     * not all non-EVM chains are case-insensitive.
      *
      * @param options - An options bag.
-     * @param options.connectedAddresses - Addresses currently connected to the origin.
+     * @param options.connectedAddresses - Addresses currently connected to the
+     * origin for the requested scope.
      * @param options.origin - The origin of the RPC request.
      * @param options.request - The JSON-RPC request.
      * @param options.scope - The CAIP-2 scope for the request.

package/dist/multichain/MultichainRouter.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainRouter.mjs","sourceRoot":"","sources":["../../src/multichain/MultichainRouter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,6BAA6B;AACjD,OAAO,EACL,uBAAuB,EACvB,cAAc,EACf,oCAAoC;AAGrC,OAAO,EAAE,WAAW,EAAE,8BAA8B;AAMpD,OAAO,EACL,MAAM,EACN,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EACnB,wBAAwB;AACzB,OAAO,EAAE,MAAM,EAAE,eAAe;AAEhC,OAAO,EAAE,gBAAgB,EAAE,2BAAiB;AA6E5C,MAAM,IAAI,GAAG,kBAAkB,CAAC;AAEhC,MAAM,OAAO,gBAAgB;IAC3B,IAAI,GAAgB,IAAI,CAAC;IAEzB,KAAK,GAAG,IAAI,CAAC;IAEJ,UAAU,CAA4B;IAEtC,gBAAgB,CAA0B;IAEnD,YAAY,EAAE,SAAS,EAAE,eAAe,EAAwB;QAC9D,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAExC,IAAI,CAAC,UAAU,CAAC,qBAAqB,CACnC,GAAG,IAAI,gBAAgB,EACvB,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAC/C,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,qBAAqB,CACnC,GAAG,IAAI,sBAAsB,EAC7B,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,CAC/C,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,qBAAqB,CACnC,GAAG,IAAI,uBAAuB,EAC9B,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC,CAChD,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,qBAAqB,CACnC,GAAG,IAAI,mBAAmB,EAC1B,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAC5C,CAAC;IACJ,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,sBAAsB,CAC1B,MAAc,EACd,KAAkB,EAClB,OAAuB;QAEvB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC/D,OAAO,CAAC,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CACtD,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC;YAChC,OAAO,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,iBAAiB,CACrB,kBAAmC,EACnC,KAAkB,EAClB,OAAuB;QAEvB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU;aAC7B,IAAI,CAAC,2CAA2C,EAAE,KAAK,CAAC;aACxD,MAAM,CACL,CACE,OAAwB,EAGxB,EAAE,CACF,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;YACvC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAC3C,CAAC;QAEJ,uDAAuD;QACvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAEtD,kEAAkE;QAClE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAC/C,gBAAgB,EAChB,KAAK,EACL,OAAO,CACR,CAAC;QAEF,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,GAAG,CACrD,CAAC,gBAAgB,EAAE,EAAE,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,OAAO,CACnE,CAAC;QAEF,gFAAgF;QAChF,uDAAuD;QACvD,wFAAwF;QACxF,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CACnC,CAAC,OAAO,EAAE,EAAE,CACV,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;YAClD,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC,CAC5C,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,yCAAyC;aACnD,CAAC,CAAC;QACL,CAAC;QAED,OAAO,eAAe,CAAC,EAAE,CAAC;IAC5B,CAAC;IAED;;;;;;;;OAQG;IACH,iBAAiB,CAAC,KAAkB;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAEjD,OAAO,aAAa,CAAC,MAAM,CAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE;YAChE,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CACtC,qCAAqC,EACrC,IAAI,CAAC,EAAE,CACR,CAAC;YAEF,IAAI,WAAW,IAAI,WAAW,CAAC,WAAW,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrE,MAAM,UAAU,GAAG,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBACxD,MAAM,MAAM,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;gBACnD,IAAI,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;oBACzC,WAAW,CAAC,IAAI,CAAC;wBACf,MAAM,EAAE,IAAI,CAAC,EAAE;wBACf,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO;qBAC/B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,OAAO,WAAW,CAAC;QACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,aAAa,CAAC,EAClB,kBAAkB,EAClB,MAAM,EACN,KAAK,EACL,OAAO,EAAE,UAAU,GAMpB;QACC,6CAA6C;QAC7C,MAAM,CACJ,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC;YAC1C,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,CACrC,CAAC;QAEF,2GAA2G;QAC3G,MAAM,OAAO,GAAG;YACd,OAAO,EAAE,KAAc;YACvB,EAAE,EAAE,UAAU,CAAC,EAAE,IAAI,MAAM,EAAE;YAC7B,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5D,CAAC;QAEF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAEnC,yEAAyE;QACzE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC5C,kBAAkB,EAClB,KAAK,EACL,OAAO,CACR,CAAC;QAEF,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACjD,OAAO,CAAC,aAAa,CAAC;gBACpB,MAAM;gBACN,OAAO,EAAE,SAAS;gBAClB,KAAK;gBACL,MAAM;gBACN,MAAM,EAAE,MAAuB;aAChC,CAAC,CACH,CAAC;QACJ,CAAC;QAED,4DAA4D;QAC5D,qDAAqD;QACrD,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAC9B,CAAC;QAEF,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,8BAA8B,EAAE;gBAC1D,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,MAAM;gBACN,OAAO,EAAE;oBACP,MAAM,EAAE,EAAE;oBACV,MAAM,EAAE;wBACN,OAAO;wBACP,KAAK;qBACN;iBACF;gBACD,OAAO,EAAE,WAAW,CAAC,iBAAiB;aACvC,CAAkB,CAAC;QACtB,CAAC;QAED,gEAAgE;QAChE,MAAM,SAAS,CAAC,cAAc,EAAE,CAAC;IACnC,CAAC;IAED;;;;;OAKG;IACH,6BAA6B,CAAC,KAAkB;QAC9C,OAAO,IAAI,CAAC,UAAU;aACnB,IAAI,CAAC,2CAA2C,EAAE,KAAK,CAAC;aACxD,MAAM,CAAC,CAAC,OAAwB,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;;OAMG;IACH,mBAAmB,CAAC,KAAkB;QACpC,MAAM,cAAc,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC,OAAO,CACtE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAC7B,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,OAAO,CAC3D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CACvB,CAAC;QAEF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,cAAc,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;IAED;;;;;OAKG;IACH,oBAAoB,CAAC,KAAkB;QACrC,OAAO,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC,GAAG,CAClD,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAC3C,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,KAAkB;QACjC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU;aACnC,IAAI,CAAC,2CAA2C,EAAE,KAAK,CAAC;aACxD,IAAI,CAAC,CAAC,OAAwB,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtE,+GAA+G;QAC/G,OAAO,cAAc,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACpE,CAAC;CACF","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport type { GetPermissions } from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport {\n  getProtocolCaveatScopes,\n  SnapEndowments,\n} from '@metamask/snaps-rpc-methods';\nimport type { Json, JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';\nimport type { InternalAccount } from '@metamask/snaps-utils';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  JsonRpcParams,\n} from '@metamask/utils';\nimport {\n  assert,\n  hasProperty,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport { getRunnableSnaps } from '../snaps';\nimport type { GetAllSnaps, HandleSnapRequest } from '../snaps';\n\nexport type MultichainRouterHandleRequestAction = {\n  type: `${typeof name}:handleRequest`;\n  handler: MultichainRouter['handleRequest'];\n};\n\nexport type MultichainRouterGetSupportedMethodsAction = {\n  type: `${typeof name}:getSupportedMethods`;\n  handler: MultichainRouter['getSupportedMethods'];\n};\n\nexport type MultichainRouterGetSupportedAccountsAction = {\n  type: `${typeof name}:getSupportedAccounts`;\n  handler: MultichainRouter['getSupportedAccounts'];\n};\n\nexport type MultichainRouterIsSupportedScopeAction = {\n  type: `${typeof name}:isSupportedScope`;\n  handler: MultichainRouter['isSupportedScope'];\n};\n\ntype SnapKeyring = {\n  submitRequest: (request: {\n    origin: string;\n    account: string;\n    method: string;\n    params?: Json[] | Record<string, Json>;\n    scope: CaipChainId;\n  }) => Promise<Json>;\n  resolveAccountAddress: (\n    snapId: SnapId,\n    scope: CaipChainId,\n    request: Json,\n  ) => Promise<{ address: CaipAccountId } | null>;\n};\n\n// Expecting a bound function that calls KeyringController.withKeyring selecting the Snap keyring\nexport type WithSnapKeyringFunction = <ReturnType>(\n  operation: ({ keyring }: { keyring: SnapKeyring }) => Promise<ReturnType>,\n) => Promise<ReturnType>;\n\nexport type AccountsControllerListMultichainAccountsAction = {\n  type: `AccountsController:listMultichainAccounts`;\n  handler: (chainId?: CaipChainId) => InternalAccount[];\n};\n\nexport type MultichainRouterActions =\n  | MultichainRouterHandleRequestAction\n  | MultichainRouterGetSupportedMethodsAction\n  | MultichainRouterGetSupportedAccountsAction\n  | MultichainRouterIsSupportedScopeAction;\n\nexport type MultichainRouterAllowedActions =\n  | GetAllSnaps\n  | HandleSnapRequest\n  | GetPermissions\n  | AccountsControllerListMultichainAccountsAction;\n\nexport type MultichainRouterEvents = never;\n\nexport type MultichainRouterMessenger = Messenger<\n  typeof name,\n  MultichainRouterActions | MultichainRouterAllowedActions\n>;\n\nexport type MultichainRouterArgs = {\n  messenger: MultichainRouterMessenger;\n  withSnapKeyring: WithSnapKeyringFunction;\n};\n\ntype ProtocolSnap = {\n  snapId: SnapId;\n  methods: string[];\n};\n\nconst name = 'MultichainRouter';\n\nexport class MultichainRouter {\n  name: typeof name = name;\n\n  state = null;\n\n  readonly #messenger: MultichainRouterMessenger;\n\n  readonly #withSnapKeyring: WithSnapKeyringFunction;\n\n  constructor({ messenger, withSnapKeyring }: MultichainRouterArgs) {\n    this.#messenger = messenger;\n    this.#withSnapKeyring = withSnapKeyring;\n\n    this.#messenger.registerActionHandler(\n      `${name}:handleRequest`,\n      async (...args) => this.handleRequest(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:getSupportedMethods`,\n      (...args) => this.getSupportedMethods(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:getSupportedAccounts`,\n      (...args) => this.getSupportedAccounts(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:isSupportedScope`,\n      (...args) => this.isSupportedScope(...args),\n    );\n  }\n\n  /**\n   * Attempts to resolve the account address to use for a given request by inspecting the request itself.\n   *\n   * The request is sent to to an account Snap via the SnapKeyring that will attempt this resolution.\n   *\n   * @param snapId - The ID of the Snap to send the request to.\n   * @param scope - The CAIP-2 scope for the request.\n   * @param request - The JSON-RPC request.\n   * @returns The resolved address if found, otherwise null.\n   * @throws If the invocation of the SnapKeyring fails.\n   */\n  async #resolveRequestAddress(\n    snapId: SnapId,\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ) {\n    try {\n      const result = await this.#withSnapKeyring(async ({ keyring }) =>\n        keyring.resolveAccountAddress(snapId, scope, request),\n      );\n      const address = result?.address;\n      return address ? parseCaipAccountId(address).address : null;\n    } catch {\n      throw rpcErrors.internal();\n    }\n  }\n\n  /**\n   * Get the account ID of the account that should service the RPC request via an account Snap.\n   *\n   * This function checks whether any accounts exist that can service a given request by\n   * using a combination of the resolveAccountAddress functionality and the connected accounts.\n   *\n   * If an account is expected to service this request but none is found, the function will throw.\n   *\n   * @param connectedAddresses - The CAIP-10 addresses connected to the requesting origin.\n   * @param scope - The CAIP-2 scope for the request.\n   * @param request - The JSON-RPC request.\n   * @returns An account ID if found, otherwise null.\n   * @throws If no account is found, but the accounts exist that could service the request.\n   */\n  async #getSnapAccountId(\n    connectedAddresses: CaipAccountId[],\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ) {\n    const accounts = this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .filter(\n        (\n          account: InternalAccount,\n        ): account is InternalAccount & {\n          metadata: Required<InternalAccount['metadata']>;\n        } =>\n          Boolean(account.metadata.snap?.enabled) &&\n          account.methods.includes(request.method),\n      );\n\n    // If no accounts can service the request, return null.\n    if (accounts.length === 0) {\n      return null;\n    }\n\n    const resolutionSnapId = accounts[0].metadata.snap.id;\n\n    // Attempt to resolve the address that should be used for signing.\n    const address = await this.#resolveRequestAddress(\n      resolutionSnapId,\n      scope,\n      request,\n    );\n\n    const parsedConnectedAddresses = connectedAddresses.map(\n      (connectedAddress) => parseCaipAccountId(connectedAddress).address,\n    );\n\n    // If we have a resolved address, try to find the selected account based on that\n    // otherwise, default to one of the connected accounts.\n    // TODO: Eventually let the user choose if we have more than one option for the account.\n    const selectedAccount = accounts.find(\n      (account) =>\n        parsedConnectedAddresses.includes(account.address) &&\n        (!address || account.address === address),\n    );\n\n    if (!selectedAccount) {\n      throw rpcErrors.invalidParams({\n        message: 'No available account found for request.',\n      });\n    }\n\n    return selectedAccount.id;\n  }\n\n  /**\n   * Get all protocol Snaps that can service a given CAIP-2 scope.\n   *\n   * Protocol Snaps are deemed fit to service a scope if they are runnable\n   * and have the proper permissions set for the scope.\n   *\n   * @param scope - A CAIP-2 scope.\n   * @returns A list of all the protocol Snaps available and their RPC methods.\n   */\n  #getProtocolSnaps(scope: CaipChainId) {\n    const allSnaps = this.#messenger.call('SnapController:getAll');\n    const filteredSnaps = getRunnableSnaps(allSnaps);\n\n    return filteredSnaps.reduce<ProtocolSnap[]>((accumulator, snap) => {\n      const permissions = this.#messenger.call(\n        'PermissionController:getPermissions',\n        snap.id,\n      );\n\n      if (permissions && hasProperty(permissions, SnapEndowments.Protocol)) {\n        const permission = permissions[SnapEndowments.Protocol];\n        const scopes = getProtocolCaveatScopes(permission);\n        if (scopes && hasProperty(scopes, scope)) {\n          accumulator.push({\n            snapId: snap.id,\n            methods: scopes[scope].methods,\n          });\n        }\n      }\n\n      return accumulator;\n    }, []);\n  }\n\n  /**\n   * Handle an incoming JSON-RPC request tied to a specific scope by routing\n   * to either a protocol Snap or an account Snap.\n   *\n   * Note: Addresses are considered case sensitive by the MultichainRouter as\n   * not all non-EVM chains are case insensitive.\n   *\n   * @param options - An options bag.\n   * @param options.connectedAddresses - Addresses currently connected to the origin.\n   * @param options.origin - The origin of the RPC request.\n   * @param options.request - The JSON-RPC request.\n   * @param options.scope - The CAIP-2 scope for the request.\n   * @returns The response from the chosen Snap.\n   * @throws If no handler was found.\n   */\n  async handleRequest({\n    connectedAddresses,\n    origin,\n    scope,\n    request: rawRequest,\n  }: {\n    connectedAddresses: CaipAccountId[];\n    origin: string;\n    scope: CaipChainId;\n    request: JsonRpcRequest;\n  }): Promise<Json> {\n    // Explicitly block EVM scopes, just in case.\n    assert(\n      !scope.startsWith(KnownCaipNamespace.Eip155) &&\n        !scope.startsWith('wallet:eip155'),\n    );\n\n    // Re-create the request to simplify and remove additional properties that may be present in MM middleware.\n    const request = {\n      jsonrpc: '2.0' as const,\n      id: rawRequest.id ?? nanoid(),\n      method: rawRequest.method,\n      ...(rawRequest.params ? { params: rawRequest.params } : {}),\n    };\n\n    const { method, params } = request;\n\n    // If the RPC request can be serviced by an account Snap, route it there.\n    const accountId = await this.#getSnapAccountId(\n      connectedAddresses,\n      scope,\n      request,\n    );\n\n    if (accountId) {\n      return this.#withSnapKeyring(async ({ keyring }) =>\n        keyring.submitRequest({\n          origin,\n          account: accountId,\n          scope,\n          method,\n          params: params as JsonRpcParams,\n        }),\n      );\n    }\n\n    // If the RPC request cannot be serviced by an account Snap,\n    // but has a protocol Snap available, route it there.\n    const protocolSnaps = this.#getProtocolSnaps(scope);\n    const protocolSnap = protocolSnaps.find((snap) =>\n      snap.methods.includes(method),\n    );\n\n    if (protocolSnap) {\n      return this.#messenger.call('SnapController:handleRequest', {\n        snapId: protocolSnap.snapId,\n        origin,\n        request: {\n          method: '',\n          params: {\n            request,\n            scope,\n          },\n        },\n        handler: HandlerType.OnProtocolRequest,\n      }) as Promise<Json>;\n    }\n\n    // If no compatible account or protocol Snaps were found, throw.\n    throw rpcErrors.methodNotFound();\n  }\n\n  /**\n   * Get a list of metadata for supported accounts for a given scope from the client.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of metadata for the supported accounts.\n   */\n  #getSupportedAccountsMetadata(scope: CaipChainId): InternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .filter((account: InternalAccount) => account.metadata.snap?.enabled);\n  }\n\n  /**\n   * Get a list of supported methods for a given scope.\n   * This combines both protocol and account Snaps supported methods.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of supported methods.\n   */\n  getSupportedMethods(scope: CaipChainId): string[] {\n    const accountMethods = this.#getSupportedAccountsMetadata(scope).flatMap(\n      (account) => account.methods,\n    );\n\n    const protocolMethods = this.#getProtocolSnaps(scope).flatMap(\n      (snap) => snap.methods,\n    );\n\n    return Array.from(new Set([...accountMethods, ...protocolMethods]));\n  }\n\n  /**\n   * Get a list of supported accounts for a given scope.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of CAIP-10 addresses.\n   */\n  getSupportedAccounts(scope: CaipChainId): string[] {\n    return this.#getSupportedAccountsMetadata(scope).map(\n      (account) => `${scope}:${account.address}`,\n    );\n  }\n\n  /**\n   * Determine whether a given CAIP-2 scope is supported by the router.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns True if the router can service the scope, otherwise false.\n   */\n  isSupportedScope(scope: CaipChainId): boolean {\n    const hasAccountSnap = this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .some((account: InternalAccount) => account.metadata.snap?.enabled);\n    // We currently assume here that if one Snap exists that service the scope, we can service the scope generally.\n    return hasAccountSnap || this.#getProtocolSnaps(scope).length > 0;\n  }\n}\n"]}
+{"version":3,"file":"MultichainRouter.mjs","sourceRoot":"","sources":["../../src/multichain/MultichainRouter.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Messenger } from '@metamask/messenger';\nimport type { GetPermissions } from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport {\n  getProtocolCaveatScopes,\n  SnapEndowments,\n} from '@metamask/snaps-rpc-methods';\nimport type { Json, JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';\nimport type { InternalAccount } from '@metamask/snaps-utils';\nimport { HandlerType } from '@metamask/snaps-utils';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  JsonRpcParams,\n} from '@metamask/utils';\nimport {\n  assert,\n  hasProperty,\n  isObject,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\nimport { nanoid } from 'nanoid';\n\nimport { getRunnableSnaps } from '../snaps';\nimport type { GetAllSnaps, HandleSnapRequest } from '../snaps';\n\nexport type MultichainRouterHandleRequestAction = {\n  type: `${typeof name}:handleRequest`;\n  handler: MultichainRouter['handleRequest'];\n};\n\nexport type MultichainRouterGetSupportedMethodsAction = {\n  type: `${typeof name}:getSupportedMethods`;\n  handler: MultichainRouter['getSupportedMethods'];\n};\n\nexport type MultichainRouterGetSupportedAccountsAction = {\n  type: `${typeof name}:getSupportedAccounts`;\n  handler: MultichainRouter['getSupportedAccounts'];\n};\n\nexport type MultichainRouterIsSupportedScopeAction = {\n  type: `${typeof name}:isSupportedScope`;\n  handler: MultichainRouter['isSupportedScope'];\n};\n\ntype SnapKeyring = {\n  submitRequest: (request: {\n    origin: string;\n    account: string;\n    method: string;\n    params?: Json[] | Record<string, Json>;\n    scope: CaipChainId;\n  }) => Promise<Json>;\n};\n\n// Expecting a bound function that calls KeyringController.withKeyring selecting the Snap keyring\nexport type WithSnapKeyringFunction = <ReturnType>(\n  operation: ({ keyring }: { keyring: SnapKeyring }) => Promise<ReturnType>,\n) => Promise<ReturnType>;\n\nexport type AccountsControllerListMultichainAccountsAction = {\n  type: `AccountsController:listMultichainAccounts`;\n  handler: (chainId?: CaipChainId) => InternalAccount[];\n};\n\nexport type MultichainRouterActions =\n  | MultichainRouterHandleRequestAction\n  | MultichainRouterGetSupportedMethodsAction\n  | MultichainRouterGetSupportedAccountsAction\n  | MultichainRouterIsSupportedScopeAction;\n\nexport type MultichainRouterAllowedActions =\n  | GetAllSnaps\n  | HandleSnapRequest\n  | GetPermissions\n  | AccountsControllerListMultichainAccountsAction;\n\nexport type MultichainRouterEvents = never;\n\nexport type MultichainRouterMessenger = Messenger<\n  typeof name,\n  MultichainRouterActions | MultichainRouterAllowedActions\n>;\n\nexport type MultichainRouterArgs = {\n  messenger: MultichainRouterMessenger;\n  withSnapKeyring: WithSnapKeyringFunction;\n};\n\ntype ProtocolSnap = {\n  snapId: SnapId;\n  methods: string[];\n};\n\nconst name = 'MultichainRouter';\n\nexport class MultichainRouter {\n  name: typeof name = name;\n\n  state = null;\n\n  readonly #messenger: MultichainRouterMessenger;\n\n  readonly #withSnapKeyring: WithSnapKeyringFunction;\n\n  constructor({ messenger, withSnapKeyring }: MultichainRouterArgs) {\n    this.#messenger = messenger;\n    this.#withSnapKeyring = withSnapKeyring;\n\n    this.#messenger.registerActionHandler(\n      `${name}:handleRequest`,\n      async (...args) => this.handleRequest(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:getSupportedMethods`,\n      (...args) => this.getSupportedMethods(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:getSupportedAccounts`,\n      (...args) => this.getSupportedAccounts(...args),\n    );\n\n    this.#messenger.registerActionHandler(\n      `${name}:isSupportedScope`,\n      (...args) => this.isSupportedScope(...args),\n    );\n  }\n\n  /**\n   * Attempts to resolve the account address to use for a given request by inspecting the request itself.\n   *\n   * The request is sent to an account Snap that will attempt this resolution.\n   *\n   * We manually construct the request instead of using the SnapKeyring, as the keyring may not be available.\n   *\n   * @param snapId - The ID of the Snap to send the request to.\n   * @param scope - The CAIP-2 scope for the request.\n   * @param request - The JSON-RPC request.\n   * @returns The resolved address if found, otherwise null.\n   * @throws If the invocation of the SnapKeyring fails.\n   */\n  async #resolveRequestAddress(\n    snapId: SnapId,\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ) {\n    try {\n      const result = await this.#messenger.call(\n        'SnapController:handleRequest',\n        {\n          snapId,\n          origin: 'metamask',\n          request: {\n            method: 'keyring_resolveAccountAddress',\n            params: {\n              request,\n              scope,\n            },\n          },\n          handler: HandlerType.OnKeyringRequest,\n        },\n      );\n\n      assert(result === null || isObject(result));\n\n      const address = result?.address as CaipAccountId;\n      return address ? parseCaipAccountId(address).address : null;\n    } catch {\n      throw rpcErrors.internal();\n    }\n  }\n\n  /**\n   * Get the account ID of the account that should service the RPC request via an account Snap.\n   *\n   * This function checks whether any accounts exist that can service a given request by\n   * using a combination of the resolveAccountAddress functionality and the connected accounts.\n   *\n   * If an account is expected to service this request but none is found, the function will throw.\n   *\n   * @param connectedAddresses - The CAIP-10 addresses connected to the\n   * requesting origin for the requested scope.\n   * @param scope - The CAIP-2 scope for the request.\n   * @param request - The JSON-RPC request.\n   * @returns An account ID if found, otherwise null.\n   * @throws If no account is found, but the accounts exist that could service the request.\n   */\n  async #getSnapAccountId(\n    connectedAddresses: CaipAccountId[],\n    scope: CaipChainId,\n    request: JsonRpcRequest,\n  ) {\n    const accounts = this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .filter(\n        (\n          account: InternalAccount,\n        ): account is InternalAccount & {\n          metadata: Required<InternalAccount['metadata']>;\n        } =>\n          Boolean(account.metadata.snap?.enabled) &&\n          account.methods.includes(request.method),\n      );\n\n    // If no accounts can service the request, return null.\n    if (accounts.length === 0) {\n      return null;\n    }\n\n    const parsedConnectedAddresses = connectedAddresses.map(\n      (connectedAddress) => parseCaipAccountId(connectedAddress).address,\n    );\n\n    const connectedAccounts = accounts.filter((account) =>\n      parsedConnectedAddresses.includes(account.address),\n    );\n\n    if (connectedAccounts.length === 0) {\n      throw rpcErrors.invalidParams({\n        message: 'No available account found for request.',\n      });\n    }\n\n    const resolutionSnapId = connectedAccounts[0].metadata.snap.id;\n\n    // Attempt to resolve the address that should be used for signing.\n    const address = await this.#resolveRequestAddress(\n      resolutionSnapId,\n      scope,\n      request,\n    );\n\n    // If we have a resolved address, try to find the selected account based on that\n    // otherwise, default to one of the connected accounts.\n    // TODO: Eventually let the user choose if we have more than one option for the account.\n    const selectedAccount = address\n      ? connectedAccounts.find((account) => account.address === address)\n      : connectedAccounts[0];\n\n    if (!selectedAccount) {\n      throw rpcErrors.invalidParams({\n        message: 'No available account found for request.',\n      });\n    }\n\n    return selectedAccount.id;\n  }\n\n  /**\n   * Get all protocol Snaps that can service a given CAIP-2 scope.\n   *\n   * Protocol Snaps are deemed fit to service a scope if they are runnable\n   * and have the proper permissions set for the scope.\n   *\n   * @param scope - A CAIP-2 scope.\n   * @returns A list of all the protocol Snaps available and their RPC methods.\n   */\n  #getProtocolSnaps(scope: CaipChainId) {\n    const allSnaps = this.#messenger.call('SnapController:getAll');\n    const filteredSnaps = getRunnableSnaps(allSnaps);\n\n    return filteredSnaps.reduce<ProtocolSnap[]>((accumulator, snap) => {\n      const permissions = this.#messenger.call(\n        'PermissionController:getPermissions',\n        snap.id,\n      );\n\n      if (permissions && hasProperty(permissions, SnapEndowments.Protocol)) {\n        const permission = permissions[SnapEndowments.Protocol];\n        const scopes = getProtocolCaveatScopes(permission);\n        if (scopes && hasProperty(scopes, scope)) {\n          accumulator.push({\n            snapId: snap.id,\n            methods: scopes[scope].methods,\n          });\n        }\n      }\n\n      return accumulator;\n    }, []);\n  }\n\n  /**\n   * Handle an incoming JSON-RPC request tied to a specific scope by routing\n   * to either a protocol Snap or an account Snap.\n   *\n   * Note: Addresses are considered case-sensitive by the MultichainRouter as\n   * not all non-EVM chains are case-insensitive.\n   *\n   * @param options - An options bag.\n   * @param options.connectedAddresses - Addresses currently connected to the\n   * origin for the requested scope.\n   * @param options.origin - The origin of the RPC request.\n   * @param options.request - The JSON-RPC request.\n   * @param options.scope - The CAIP-2 scope for the request.\n   * @returns The response from the chosen Snap.\n   * @throws If no handler was found.\n   */\n  async handleRequest({\n    connectedAddresses,\n    origin,\n    scope,\n    request: rawRequest,\n  }: {\n    connectedAddresses: CaipAccountId[];\n    origin: string;\n    scope: CaipChainId;\n    request: JsonRpcRequest;\n  }): Promise<Json> {\n    // Explicitly block EVM scopes, just in case.\n    assert(\n      !scope.startsWith(KnownCaipNamespace.Eip155) &&\n        !scope.startsWith('wallet:eip155'),\n    );\n\n    // Re-create the request to simplify and remove additional properties that may be present in MM middleware.\n    const request = {\n      jsonrpc: '2.0' as const,\n      id: rawRequest.id ?? nanoid(),\n      method: rawRequest.method,\n      ...(rawRequest.params ? { params: rawRequest.params } : {}),\n    };\n\n    const { method, params } = request;\n\n    // If the RPC request can be serviced by an account Snap, route it there.\n    const accountId = await this.#getSnapAccountId(\n      connectedAddresses,\n      scope,\n      request,\n    );\n\n    if (accountId) {\n      return this.#withSnapKeyring(async ({ keyring }) =>\n        keyring.submitRequest({\n          origin,\n          account: accountId,\n          scope,\n          method,\n          params: params as JsonRpcParams,\n        }),\n      );\n    }\n\n    // If the RPC request cannot be serviced by an account Snap,\n    // but has a protocol Snap available, route it there.\n    const protocolSnaps = this.#getProtocolSnaps(scope);\n    const protocolSnap = protocolSnaps.find((snap) =>\n      snap.methods.includes(method),\n    );\n\n    if (protocolSnap) {\n      return this.#messenger.call('SnapController:handleRequest', {\n        snapId: protocolSnap.snapId,\n        origin,\n        request: {\n          method: '',\n          params: {\n            request,\n            scope,\n          },\n        },\n        handler: HandlerType.OnProtocolRequest,\n      }) as Promise<Json>;\n    }\n\n    // If no compatible account or protocol Snaps were found, throw.\n    throw rpcErrors.methodNotFound();\n  }\n\n  /**\n   * Get a list of metadata for supported accounts for a given scope from the client.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of metadata for the supported accounts.\n   */\n  #getSupportedAccountsMetadata(scope: CaipChainId): InternalAccount[] {\n    return this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .filter((account: InternalAccount) => account.metadata.snap?.enabled);\n  }\n\n  /**\n   * Get a list of supported methods for a given scope.\n   * This combines both protocol and account Snaps supported methods.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of supported methods.\n   */\n  getSupportedMethods(scope: CaipChainId): string[] {\n    const accountMethods = this.#getSupportedAccountsMetadata(scope).flatMap(\n      (account) => account.methods,\n    );\n\n    const protocolMethods = this.#getProtocolSnaps(scope).flatMap(\n      (snap) => snap.methods,\n    );\n\n    return Array.from(new Set([...accountMethods, ...protocolMethods]));\n  }\n\n  /**\n   * Get a list of supported accounts for a given scope.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns A list of CAIP-10 addresses.\n   */\n  getSupportedAccounts(scope: CaipChainId): string[] {\n    return this.#getSupportedAccountsMetadata(scope).map(\n      (account) => `${scope}:${account.address}`,\n    );\n  }\n\n  /**\n   * Determine whether a given CAIP-2 scope is supported by the router.\n   *\n   * @param scope - The CAIP-2 scope.\n   * @returns True if the router can service the scope, otherwise false.\n   */\n  isSupportedScope(scope: CaipChainId): boolean {\n    const hasAccountSnap = this.#messenger\n      .call('AccountsController:listMultichainAccounts', scope)\n      .some((account: InternalAccount) => account.metadata.snap?.enabled);\n    // We currently assume here that if one Snap exists that service the scope, we can service the scope generally.\n    return hasAccountSnap || this.#getProtocolSnaps(scope).length > 0;\n  }\n}\n"]}

package/dist/services/AbstractExecutionService.cjs

@@ -65,7 +65,6 @@ class AbstractExecutionService {
             const result = await (0, utils_2.withTimeout)(this.#command(snapId, {
                 jsonrpc: '2.0',
                 method: 'terminate',
-                params: [],
                 id: (0, nanoid_1.nanoid)(),
             }), this.#terminationTimeout);
             if (result === utils_2.hasTimedOut || result !== 'OK') {
@@ -282,10 +281,10 @@ class AbstractExecutionService {
             jsonrpc: '2.0',
             method: 'snapRpc',
             params: {
+                snapId,
                 origin,
                 handler,
                 request: request,
-                target: snapId,
             },
         });
     }