@metamask/multichain-api-middleware 0.3.0 → 1.0.0

package/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.0]
+
+### Changed
+
+- This package is now considered stable ([#6013](https://github.com/MetaMask/core/pull/6013))
+- Bump `@metamask/multichain-transactions-controller` to `^2.0.0` ([#5888](https://github.com/MetaMask/core/pull/5888))
+- Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
+- Bump `@metamask/network-controller` to `^23.6.0` ([#5935](https://github.com/MetaMask/core/pull/5935), [#5882](https://github.com/MetaMask/core/pull/5882))
+- Bump `@metamask/chain-agnostic-permission` to `^1.0.0` ([#6013](https://github.com/MetaMask/core/pull/6013), [#5982](https://github.com/MetaMask/core/pull/5982), [#6004](https://github.com/MetaMask/core/pull/6004))
+- Bump `@metamask/network-controller` to `^24.0.0` ([#5999](https://github.com/MetaMask/core/pull/5999))
+
+## [0.4.0]
+
+### Added
+
+- When `wallet_createSession` handler is called with `solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp` (solana mainnet) as a requested scope, but there are not currently any accounts in the wallet supporting this scope, we now add a `promptToCreateSolanaAccount` to a metadata object on the `requestPermissions` call forwarded to the `PermissionsController`.
+
 ## [0.3.0]
 
 ### Added
@@ -49,7 +66,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/multichain-api-middleware@0.3.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/multichain-api-middleware@1.0.0...HEAD
+[1.0.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-api-middleware@0.4.0...@metamask/multichain-api-middleware@1.0.0
+[0.4.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-api-middleware@0.3.0...@metamask/multichain-api-middleware@0.4.0
 [0.3.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-api-middleware@0.2.0...@metamask/multichain-api-middleware@0.3.0
 [0.2.0]: https://github.com/MetaMask/core/compare/@metamask/multichain-api-middleware@0.1.1...@metamask/multichain-api-middleware@0.2.0
 [0.1.1]: https://github.com/MetaMask/core/compare/@metamask/multichain-api-middleware@0.1.0...@metamask/multichain-api-middleware@0.1.1

package/dist/handlers/wallet-createSession.cjs

@@ -6,6 +6,7 @@ const controller_utils_1 = require("@metamask/controller-utils");
 const permission_controller_1 = require("@metamask/permission-controller");
 const rpc_errors_1 = require("@metamask/rpc-errors");
 const utils_1 = require("@metamask/utils");
+const SOLANA_CAIP_CHAIN_ID = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
 /**
  * Handler for the `wallet_createSession` RPC method which is responsible
  * for prompting for approval and granting a CAIP-25 permission.
@@ -57,6 +58,14 @@ async function walletCreateSessionHandler(req, res, _next, end, hooks) {
                 return false;
             }
         };
+        // if solana is a requested scope but not supported, we add a promptToCreateSolanaAccount flag to request
+        const isSolanaRequested = (0, chain_agnostic_permission_1.isNamespaceInScopesObject)(requiredScopesWithSupportedMethodsAndNotifications, utils_1.KnownCaipNamespace.Solana) ||
+            (0, chain_agnostic_permission_1.isNamespaceInScopesObject)(optionalScopesWithSupportedMethodsAndNotifications, utils_1.KnownCaipNamespace.Solana);
+        let promptToCreateSolanaAccount = false;
+        if (isSolanaRequested) {
+            const supportedSolanaAccounts = hooks.getNonEvmAccountAddresses(SOLANA_CAIP_CHAIN_ID);
+            promptToCreateSolanaAccount = supportedSolanaAccounts.length === 0;
+        }
         const { supportedScopes: supportedRequiredScopes } = (0, chain_agnostic_permission_1.bucketScopes)(requiredScopesWithSupportedMethodsAndNotifications, {
             isEvmChainIdSupported: networkClientExistsForChainId,
             isEvmChainIdSupportable: () => false,
@@ -77,9 +86,6 @@ async function walletCreateSessionHandler(req, res, _next, end, hooks) {
             supportedRequiredScopes,
             supportedOptionalScopes,
         ]);
-        if (allSupportedRequestedCaipChainIds.length === 0) {
-            return end(new rpc_errors_1.JsonRpcError(5100, 'Requested scopes are not supported'));
-        }
         const existingEvmAddresses = hooks
             .listAccounts()
             .map((account) => account.address);
@@ -104,6 +110,21 @@ async function walletCreateSessionHandler(req, res, _next, end, hooks) {
             sessionProperties: filteredSessionProperties,
         };
         const requestedCaip25CaveatValueWithSupportedAccounts = (0, chain_agnostic_permission_1.setNonSCACaipAccountIdsInCaip25CaveatValue)(requestedCaip25CaveatValue, supportedRequestedAccountAddresses);
+        // if `promptToCreateSolanaAccount` is true and there are no other valid scopes requested,
+        // we add a `wallet` scope to the request in order to get passed the CAIP-25 caveat validator.
+        // This is very hacky but is necessary because the solana opt-in flow breaks key assumptions
+        // of the CAIP-25 permission specification -  namely that we can have valid requests with no scopes.
+        if (allSupportedRequestedCaipChainIds.length === 0) {
+            if (promptToCreateSolanaAccount) {
+                requestedCaip25CaveatValueWithSupportedAccounts.optionalScopes[utils_1.KnownCaipNamespace.Wallet] = {
+                    accounts: [],
+                };
+            }
+            else {
+                // if solana is not requested and there are no supported scopes, we return an error
+                return end(new rpc_errors_1.JsonRpcError(5100, 'Requested scopes are not supported'));
+            }
+        }
         const [grantedPermissions] = await hooks.requestPermissionsForOrigin({
             [chain_agnostic_permission_1.Caip25EndowmentPermissionName]: {
                 caveats: [
@@ -113,6 +134,8 @@ async function walletCreateSessionHandler(req, res, _next, end, hooks) {
                     },
                 ],
             },
+        }, {
+            metadata: { promptToCreateSolanaAccount },
         });
         const approvedCaip25Permission = grantedPermissions[chain_agnostic_permission_1.Caip25EndowmentPermissionName];
         const approvedCaip25CaveatValue = approvedCaip25Permission?.caveats?.find((caveat) => caveat.type === chain_agnostic_permission_1.Caip25CaveatType)?.value;

package/dist/handlers/wallet-createSession.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-createSession.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  bucketScopes,\n  validateAndNormalizeScopes,\n  type Caip25Authorization,\n  getInternalScopesObject,\n  getSessionScopes,\n  type NormalizedScopesObject,\n  getSupportedScopeObjects,\n  type Caip25CaveatValue,\n  isKnownSessionPropertyValue,\n  getCaipAccountIdsFromScopesObjects,\n  getAllScopesFromScopesObjects,\n  setNonSCACaipAccountIdsInCaip25CaveatValue,\n} from '@metamask/chain-agnostic-permission';\nimport { isEqualCaseInsensitive } from '@metamask/controller-utils';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport type { NetworkController } from '@metamask/network-controller';\nimport {\n  invalidParams,\n  type RequestedPermissions,\n} from '@metamask/permission-controller';\nimport { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport {\n  type CaipAccountId,\n  type CaipChainId,\n  type Hex,\n  isPlainObject,\n  type Json,\n  type JsonRpcRequest,\n  type JsonRpcSuccess,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\n\nimport type { GrantedPermissions } from './types';\n\n/**\n * Handler for the `wallet_createSession` RPC method which is responsible\n * for prompting for approval and granting a CAIP-25 permission.\n *\n * This implementation primarily deviates from the CAIP-25 handler\n * specification by treating all scopes as optional regardless of\n * if they were specified in `requiredScopes` or `optionalScopes`.\n * Additionally, provided scopes, methods, notifications, and\n * account values that are invalid/malformed are ignored rather than\n * causing an error to be returned.\n *\n * @param req - The request object.\n * @param res - The response object.\n * @param _next - The next middleware function.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.listAccounts - The hook that returns an array of the wallet's evm accounts.\n * @param hooks.findNetworkClientIdByChainId - The hook that returns the networkClientId for a chainId.\n * @param hooks.requestPermissionsForOrigin - The hook that approves and grants requested permissions.\n * @param hooks.getNonEvmSupportedMethods - The hook that returns the supported methods for a non EVM scope.\n * @param hooks.isNonEvmScopeSupported - The hook that returns true if a non EVM scope is supported.\n * @param hooks.getNonEvmAccountAddresses - The hook that returns a list of CaipAccountIds that are supported for a CaipChainId.\n * @param hooks.trackSessionCreatedEvent - An optional hook for platform specific logic to run. Can be undefined.\n * @returns A promise with wallet_createSession handler\n */\nasync function walletCreateSessionHandler(\n  req: JsonRpcRequest<Caip25Authorization> & { origin: string },\n  res: JsonRpcSuccess<{\n    sessionScopes: NormalizedScopesObject;\n    sessionProperties?: Record<string, Json>;\n  }>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: {\n    listAccounts: () => { address: string }[];\n    findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n    requestPermissionsForOrigin: (\n      requestedPermissions: RequestedPermissions,\n      metadata?: Record<string, Json>,\n    ) => Promise<[GrantedPermissions]>;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    isNonEvmScopeSupported: (scope: CaipChainId) => boolean;\n    getNonEvmAccountAddresses: (scope: CaipChainId) => CaipAccountId[];\n    trackSessionCreatedEvent?: (\n      approvedCaip25CaveatValue: Caip25CaveatValue,\n    ) => void;\n  },\n) {\n  if (!isPlainObject(req.params)) {\n    return end(invalidParams({ data: { request: req } }));\n  }\n  const { requiredScopes, optionalScopes, sessionProperties } = req.params;\n\n  if (sessionProperties && Object.keys(sessionProperties).length === 0) {\n    return end(new JsonRpcError(5302, 'Invalid sessionProperties requested'));\n  }\n\n  const filteredSessionProperties = Object.fromEntries(\n    Object.entries(sessionProperties ?? {}).filter(([key]) =>\n      isKnownSessionPropertyValue(key),\n    ),\n  );\n\n  try {\n    const { normalizedRequiredScopes, normalizedOptionalScopes } =\n      validateAndNormalizeScopes(requiredScopes || {}, optionalScopes || {});\n\n    const requiredScopesWithSupportedMethodsAndNotifications =\n      getSupportedScopeObjects(normalizedRequiredScopes, {\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      });\n    const optionalScopesWithSupportedMethodsAndNotifications =\n      getSupportedScopeObjects(normalizedOptionalScopes, {\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      });\n\n    const networkClientExistsForChainId = (chainId: Hex) => {\n      try {\n        hooks.findNetworkClientIdByChainId(chainId);\n        return true;\n      } catch {\n        return false;\n      }\n    };\n\n    const { supportedScopes: supportedRequiredScopes } = bucketScopes(\n      requiredScopesWithSupportedMethodsAndNotifications,\n      {\n        isEvmChainIdSupported: networkClientExistsForChainId,\n        isEvmChainIdSupportable: () => false, // intended for future usage with eip3085 scopedProperties\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n        isNonEvmScopeSupported: hooks.isNonEvmScopeSupported,\n      },\n    );\n\n    const { supportedScopes: supportedOptionalScopes } = bucketScopes(\n      optionalScopesWithSupportedMethodsAndNotifications,\n      {\n        isEvmChainIdSupported: networkClientExistsForChainId,\n        isEvmChainIdSupportable: () => false, // intended for future usage with eip3085 scopedProperties\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n        isNonEvmScopeSupported: hooks.isNonEvmScopeSupported,\n      },\n    );\n\n    const allRequestedAccountAddresses = getCaipAccountIdsFromScopesObjects([\n      supportedRequiredScopes,\n      supportedOptionalScopes,\n    ]);\n\n    const allSupportedRequestedCaipChainIds = getAllScopesFromScopesObjects([\n      supportedRequiredScopes,\n      supportedOptionalScopes,\n    ]);\n\n    if (allSupportedRequestedCaipChainIds.length === 0) {\n      return end(new JsonRpcError(5100, 'Requested scopes are not supported'));\n    }\n\n    const existingEvmAddresses = hooks\n      .listAccounts()\n      .map((account) => account.address);\n\n    const supportedRequestedAccountAddresses =\n      allRequestedAccountAddresses.filter(\n        (requestedAccountAddress: CaipAccountId) => {\n          const {\n            address,\n            chain: { namespace },\n            chainId: caipChainId,\n          } = parseCaipAccountId(requestedAccountAddress);\n          if (namespace === KnownCaipNamespace.Eip155.toString()) {\n            return existingEvmAddresses.some((existingEvmAddress) => {\n              return isEqualCaseInsensitive(address, existingEvmAddress);\n            });\n          }\n\n          // If the namespace is not eip155 (EVM) we do a case sensitive check\n          return hooks\n            .getNonEvmAccountAddresses(caipChainId)\n            .some((existingCaipAddress) => {\n              return requestedAccountAddress === existingCaipAddress;\n            });\n        },\n      );\n\n    const requestedCaip25CaveatValue = {\n      requiredScopes: getInternalScopesObject(supportedRequiredScopes),\n      optionalScopes: getInternalScopesObject(supportedOptionalScopes),\n      isMultichainOrigin: true,\n      sessionProperties: filteredSessionProperties,\n    };\n\n    const requestedCaip25CaveatValueWithSupportedAccounts =\n      setNonSCACaipAccountIdsInCaip25CaveatValue(\n        requestedCaip25CaveatValue,\n        supportedRequestedAccountAddresses,\n      );\n\n    const [grantedPermissions] = await hooks.requestPermissionsForOrigin({\n      [Caip25EndowmentPermissionName]: {\n        caveats: [\n          {\n            type: Caip25CaveatType,\n            value: requestedCaip25CaveatValueWithSupportedAccounts,\n          },\n        ],\n      },\n    });\n\n    const approvedCaip25Permission =\n      grantedPermissions[Caip25EndowmentPermissionName];\n    const approvedCaip25CaveatValue = approvedCaip25Permission?.caveats?.find(\n      (caveat) => caveat.type === Caip25CaveatType,\n    )?.value as Caip25CaveatValue;\n    if (!approvedCaip25CaveatValue) {\n      throw rpcErrors.internal();\n    }\n\n    const sessionScopes = getSessionScopes(approvedCaip25CaveatValue, {\n      getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n    });\n\n    const { sessionProperties: approvedSessionProperties = {} } =\n      approvedCaip25CaveatValue;\n\n    hooks.trackSessionCreatedEvent?.(approvedCaip25CaveatValue);\n\n    res.result = {\n      sessionScopes,\n      sessionProperties: approvedSessionProperties,\n    };\n    return end();\n  } catch (err) {\n    return end(err);\n  }\n}\n\nexport const walletCreateSession = {\n  methodNames: ['wallet_createSession'],\n  implementation: walletCreateSessionHandler,\n  hookNames: {\n    findNetworkClientIdByChainId: true,\n    listAccounts: true,\n    requestPermissionsForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    isNonEvmScopeSupported: true,\n    getNonEvmAccountAddresses: true,\n    trackSessionCreatedEvent: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-createSession.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  bucketScopes,\n  validateAndNormalizeScopes,\n  type Caip25Authorization,\n  getInternalScopesObject,\n  getSessionScopes,\n  type NormalizedScopesObject,\n  getSupportedScopeObjects,\n  type Caip25CaveatValue,\n  isKnownSessionPropertyValue,\n  getCaipAccountIdsFromScopesObjects,\n  getAllScopesFromScopesObjects,\n  setNonSCACaipAccountIdsInCaip25CaveatValue,\n  isNamespaceInScopesObject,\n} from '@metamask/chain-agnostic-permission';\nimport { isEqualCaseInsensitive } from '@metamask/controller-utils';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport type { NetworkController } from '@metamask/network-controller';\nimport {\n  invalidParams,\n  type RequestedPermissions,\n} from '@metamask/permission-controller';\nimport { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport {\n  type CaipAccountId,\n  type CaipChainId,\n  type Hex,\n  isPlainObject,\n  type Json,\n  type JsonRpcRequest,\n  type JsonRpcSuccess,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\n\nimport type { GrantedPermissions } from './types';\n\nconst SOLANA_CAIP_CHAIN_ID = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';\n\n/**\n * Handler for the `wallet_createSession` RPC method which is responsible\n * for prompting for approval and granting a CAIP-25 permission.\n *\n * This implementation primarily deviates from the CAIP-25 handler\n * specification by treating all scopes as optional regardless of\n * if they were specified in `requiredScopes` or `optionalScopes`.\n * Additionally, provided scopes, methods, notifications, and\n * account values that are invalid/malformed are ignored rather than\n * causing an error to be returned.\n *\n * @param req - The request object.\n * @param res - The response object.\n * @param _next - The next middleware function.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.listAccounts - The hook that returns an array of the wallet's evm accounts.\n * @param hooks.findNetworkClientIdByChainId - The hook that returns the networkClientId for a chainId.\n * @param hooks.requestPermissionsForOrigin - The hook that approves and grants requested permissions.\n * @param hooks.getNonEvmSupportedMethods - The hook that returns the supported methods for a non EVM scope.\n * @param hooks.isNonEvmScopeSupported - The hook that returns true if a non EVM scope is supported.\n * @param hooks.getNonEvmAccountAddresses - The hook that returns a list of CaipAccountIds that are supported for a CaipChainId.\n * @param hooks.trackSessionCreatedEvent - An optional hook for platform specific logic to run. Can be undefined.\n * @returns A promise with wallet_createSession handler\n */\nasync function walletCreateSessionHandler(\n  req: JsonRpcRequest<Caip25Authorization> & { origin: string },\n  res: JsonRpcSuccess<{\n    sessionScopes: NormalizedScopesObject;\n    sessionProperties?: Record<string, Json>;\n  }>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: {\n    listAccounts: () => { address: string }[];\n    findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n    requestPermissionsForOrigin: (\n      requestedPermissions: RequestedPermissions,\n      metadata?: Record<string, Json>,\n    ) => Promise<[GrantedPermissions]>;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    isNonEvmScopeSupported: (scope: CaipChainId) => boolean;\n    getNonEvmAccountAddresses: (scope: CaipChainId) => CaipAccountId[];\n    trackSessionCreatedEvent?: (\n      approvedCaip25CaveatValue: Caip25CaveatValue,\n    ) => void;\n  },\n) {\n  if (!isPlainObject(req.params)) {\n    return end(invalidParams({ data: { request: req } }));\n  }\n  const { requiredScopes, optionalScopes, sessionProperties } = req.params;\n\n  if (sessionProperties && Object.keys(sessionProperties).length === 0) {\n    return end(new JsonRpcError(5302, 'Invalid sessionProperties requested'));\n  }\n\n  const filteredSessionProperties = Object.fromEntries(\n    Object.entries(sessionProperties ?? {}).filter(([key]) =>\n      isKnownSessionPropertyValue(key),\n    ),\n  );\n\n  try {\n    const { normalizedRequiredScopes, normalizedOptionalScopes } =\n      validateAndNormalizeScopes(requiredScopes || {}, optionalScopes || {});\n\n    const requiredScopesWithSupportedMethodsAndNotifications =\n      getSupportedScopeObjects(normalizedRequiredScopes, {\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      });\n    const optionalScopesWithSupportedMethodsAndNotifications =\n      getSupportedScopeObjects(normalizedOptionalScopes, {\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      });\n\n    const networkClientExistsForChainId = (chainId: Hex) => {\n      try {\n        hooks.findNetworkClientIdByChainId(chainId);\n        return true;\n      } catch {\n        return false;\n      }\n    };\n\n    // if solana is a requested scope but not supported, we add a promptToCreateSolanaAccount flag to request\n    const isSolanaRequested =\n      isNamespaceInScopesObject(\n        requiredScopesWithSupportedMethodsAndNotifications,\n        KnownCaipNamespace.Solana,\n      ) ||\n      isNamespaceInScopesObject(\n        optionalScopesWithSupportedMethodsAndNotifications,\n        KnownCaipNamespace.Solana,\n      );\n\n    let promptToCreateSolanaAccount = false;\n    if (isSolanaRequested) {\n      const supportedSolanaAccounts =\n        hooks.getNonEvmAccountAddresses(SOLANA_CAIP_CHAIN_ID);\n      promptToCreateSolanaAccount = supportedSolanaAccounts.length === 0;\n    }\n\n    const { supportedScopes: supportedRequiredScopes } = bucketScopes(\n      requiredScopesWithSupportedMethodsAndNotifications,\n      {\n        isEvmChainIdSupported: networkClientExistsForChainId,\n        isEvmChainIdSupportable: () => false, // intended for future usage with eip3085 scopedProperties\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n        isNonEvmScopeSupported: hooks.isNonEvmScopeSupported,\n      },\n    );\n\n    const { supportedScopes: supportedOptionalScopes } = bucketScopes(\n      optionalScopesWithSupportedMethodsAndNotifications,\n      {\n        isEvmChainIdSupported: networkClientExistsForChainId,\n        isEvmChainIdSupportable: () => false, // intended for future usage with eip3085 scopedProperties\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n        isNonEvmScopeSupported: hooks.isNonEvmScopeSupported,\n      },\n    );\n\n    const allRequestedAccountAddresses = getCaipAccountIdsFromScopesObjects([\n      supportedRequiredScopes,\n      supportedOptionalScopes,\n    ]);\n\n    const allSupportedRequestedCaipChainIds = getAllScopesFromScopesObjects([\n      supportedRequiredScopes,\n      supportedOptionalScopes,\n    ]);\n\n    const existingEvmAddresses = hooks\n      .listAccounts()\n      .map((account) => account.address);\n\n    const supportedRequestedAccountAddresses =\n      allRequestedAccountAddresses.filter(\n        (requestedAccountAddress: CaipAccountId) => {\n          const {\n            address,\n            chain: { namespace },\n            chainId: caipChainId,\n          } = parseCaipAccountId(requestedAccountAddress);\n          if (namespace === KnownCaipNamespace.Eip155.toString()) {\n            return existingEvmAddresses.some((existingEvmAddress) => {\n              return isEqualCaseInsensitive(address, existingEvmAddress);\n            });\n          }\n\n          // If the namespace is not eip155 (EVM) we do a case sensitive check\n          return hooks\n            .getNonEvmAccountAddresses(caipChainId)\n            .some((existingCaipAddress) => {\n              return requestedAccountAddress === existingCaipAddress;\n            });\n        },\n      );\n\n    const requestedCaip25CaveatValue = {\n      requiredScopes: getInternalScopesObject(supportedRequiredScopes),\n      optionalScopes: getInternalScopesObject(supportedOptionalScopes),\n      isMultichainOrigin: true,\n      sessionProperties: filteredSessionProperties,\n    };\n\n    const requestedCaip25CaveatValueWithSupportedAccounts =\n      setNonSCACaipAccountIdsInCaip25CaveatValue(\n        requestedCaip25CaveatValue,\n        supportedRequestedAccountAddresses,\n      );\n\n    // if `promptToCreateSolanaAccount` is true and there are no other valid scopes requested,\n    // we add a `wallet` scope to the request in order to get passed the CAIP-25 caveat validator.\n    // This is very hacky but is necessary because the solana opt-in flow breaks key assumptions\n    // of the CAIP-25 permission specification -  namely that we can have valid requests with no scopes.\n    if (allSupportedRequestedCaipChainIds.length === 0) {\n      if (promptToCreateSolanaAccount) {\n        requestedCaip25CaveatValueWithSupportedAccounts.optionalScopes[\n          KnownCaipNamespace.Wallet\n        ] = {\n          accounts: [],\n        };\n      } else {\n        // if solana is not requested and there are no supported scopes, we return an error\n        return end(\n          new JsonRpcError(5100, 'Requested scopes are not supported'),\n        );\n      }\n    }\n\n    const [grantedPermissions] = await hooks.requestPermissionsForOrigin(\n      {\n        [Caip25EndowmentPermissionName]: {\n          caveats: [\n            {\n              type: Caip25CaveatType,\n              value: requestedCaip25CaveatValueWithSupportedAccounts,\n            },\n          ],\n        },\n      },\n      {\n        metadata: { promptToCreateSolanaAccount },\n      },\n    );\n\n    const approvedCaip25Permission =\n      grantedPermissions[Caip25EndowmentPermissionName];\n    const approvedCaip25CaveatValue = approvedCaip25Permission?.caveats?.find(\n      (caveat) => caveat.type === Caip25CaveatType,\n    )?.value as Caip25CaveatValue;\n    if (!approvedCaip25CaveatValue) {\n      throw rpcErrors.internal();\n    }\n\n    const sessionScopes = getSessionScopes(approvedCaip25CaveatValue, {\n      getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n    });\n\n    const { sessionProperties: approvedSessionProperties = {} } =\n      approvedCaip25CaveatValue;\n\n    hooks.trackSessionCreatedEvent?.(approvedCaip25CaveatValue);\n\n    res.result = {\n      sessionScopes,\n      sessionProperties: approvedSessionProperties,\n    };\n    return end();\n  } catch (err) {\n    return end(err);\n  }\n}\n\nexport const walletCreateSession = {\n  methodNames: ['wallet_createSession'],\n  implementation: walletCreateSessionHandler,\n  hookNames: {\n    findNetworkClientIdByChainId: true,\n    listAccounts: true,\n    requestPermissionsForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    isNonEvmScopeSupported: true,\n    getNonEvmAccountAddresses: true,\n    trackSessionCreatedEvent: true,\n  },\n};\n"]}

package/dist/handlers/wallet-createSession.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-createSession.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-createSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,mBAAmB,EAGxB,KAAK,sBAAsB,EAE3B,KAAK,iBAAiB,EAKvB,4CAA4C;AAE7C,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,kCAAkC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AACtE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,wCAAwC;AAEzC,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAGhB,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,cAAc,EAGpB,wBAAwB;AAEzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAgB;AAElD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,iBAAe,0BAA0B,CACvC,GAAG,EAAE,cAAc,CAAC,mBAAmB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7D,GAAG,EAAE,cAAc,CAAC;IAClB,aAAa,EAAE,sBAAsB,CAAC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC1C,CAAC,EACF,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE;IACL,YAAY,EAAE,MAAM;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,4BAA4B,EAAE,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;IAChF,2BAA2B,EAAE,CAC3B,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAC5B,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACnC,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,sBAAsB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC;IACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IACnE,wBAAwB,CAAC,EAAE,CACzB,yBAAyB,EAAE,iBAAiB,KACzC,IAAI,CAAC;CACX,iBAsJF;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;CAY/B,CAAC"}
+{"version":3,"file":"wallet-createSession.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-createSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,mBAAmB,EAGxB,KAAK,sBAAsB,EAE3B,KAAK,iBAAiB,EAMvB,4CAA4C;AAE7C,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,kCAAkC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AACtE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,wCAAwC;AAEzC,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAGhB,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,cAAc,EAGpB,wBAAwB;AAEzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAgB;AAIlD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,iBAAe,0BAA0B,CACvC,GAAG,EAAE,cAAc,CAAC,mBAAmB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7D,GAAG,EAAE,cAAc,CAAC;IAClB,aAAa,EAAE,sBAAsB,CAAC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC1C,CAAC,EACF,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE;IACL,YAAY,EAAE,MAAM;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,4BAA4B,EAAE,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;IAChF,2BAA2B,EAAE,CAC3B,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAC5B,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACnC,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,sBAAsB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC;IACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IACnE,wBAAwB,CAAC,EAAE,CACzB,yBAAyB,EAAE,iBAAiB,KACzC,IAAI,CAAC;CACX,iBA4LF;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;CAY/B,CAAC"}

package/dist/handlers/wallet-createSession.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-createSession.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-createSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,mBAAmB,EAGxB,KAAK,sBAAsB,EAE3B,KAAK,iBAAiB,EAKvB,4CAA4C;AAE7C,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,kCAAkC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AACtE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,wCAAwC;AAEzC,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAGhB,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,cAAc,EAGpB,wBAAwB;AAEzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAgB;AAElD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,iBAAe,0BAA0B,CACvC,GAAG,EAAE,cAAc,CAAC,mBAAmB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7D,GAAG,EAAE,cAAc,CAAC;IAClB,aAAa,EAAE,sBAAsB,CAAC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC1C,CAAC,EACF,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE;IACL,YAAY,EAAE,MAAM;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,4BAA4B,EAAE,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;IAChF,2BAA2B,EAAE,CAC3B,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAC5B,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACnC,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,sBAAsB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC;IACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IACnE,wBAAwB,CAAC,EAAE,CACzB,yBAAyB,EAAE,iBAAiB,KACzC,IAAI,CAAC;CACX,iBAsJF;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;CAY/B,CAAC"}
+{"version":3,"file":"wallet-createSession.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-createSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,mBAAmB,EAGxB,KAAK,sBAAsB,EAE3B,KAAK,iBAAiB,EAMvB,4CAA4C;AAE7C,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,kCAAkC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AACtE,OAAO,EAEL,KAAK,oBAAoB,EAC1B,wCAAwC;AAEzC,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAGhB,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,KAAK,cAAc,EAGpB,wBAAwB;AAEzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAgB;AAIlD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,iBAAe,0BAA0B,CACvC,GAAG,EAAE,cAAc,CAAC,mBAAmB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7D,GAAG,EAAE,cAAc,CAAC;IAClB,aAAa,EAAE,sBAAsB,CAAC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC1C,CAAC,EACF,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE;IACL,YAAY,EAAE,MAAM;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,4BAA4B,EAAE,iBAAiB,CAAC,8BAA8B,CAAC,CAAC;IAChF,2BAA2B,EAAE,CAC3B,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAC5B,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACnC,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,sBAAsB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC;IACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IACnE,wBAAwB,CAAC,EAAE,CACzB,yBAAyB,EAAE,iBAAiB,KACzC,IAAI,CAAC;CACX,iBA4LF;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;CAY/B,CAAC"}

package/dist/handlers/wallet-createSession.mjs

@@ -1,8 +1,9 @@
-import { Caip25CaveatType, Caip25EndowmentPermissionName, bucketScopes, validateAndNormalizeScopes, getInternalScopesObject, getSessionScopes, getSupportedScopeObjects, isKnownSessionPropertyValue, getCaipAccountIdsFromScopesObjects, getAllScopesFromScopesObjects, setNonSCACaipAccountIdsInCaip25CaveatValue } from "@metamask/chain-agnostic-permission";
+import { Caip25CaveatType, Caip25EndowmentPermissionName, bucketScopes, validateAndNormalizeScopes, getInternalScopesObject, getSessionScopes, getSupportedScopeObjects, isKnownSessionPropertyValue, getCaipAccountIdsFromScopesObjects, getAllScopesFromScopesObjects, setNonSCACaipAccountIdsInCaip25CaveatValue, isNamespaceInScopesObject } from "@metamask/chain-agnostic-permission";
 import { isEqualCaseInsensitive } from "@metamask/controller-utils";
 import { invalidParams } from "@metamask/permission-controller";
 import { JsonRpcError, rpcErrors } from "@metamask/rpc-errors";
 import { isPlainObject, KnownCaipNamespace, parseCaipAccountId } from "@metamask/utils";
+const SOLANA_CAIP_CHAIN_ID = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
 /**
  * Handler for the `wallet_createSession` RPC method which is responsible
  * for prompting for approval and granting a CAIP-25 permission.
@@ -54,6 +55,14 @@ async function walletCreateSessionHandler(req, res, _next, end, hooks) {
                 return false;
             }
         };
+        // if solana is a requested scope but not supported, we add a promptToCreateSolanaAccount flag to request
+        const isSolanaRequested = isNamespaceInScopesObject(requiredScopesWithSupportedMethodsAndNotifications, KnownCaipNamespace.Solana) ||
+            isNamespaceInScopesObject(optionalScopesWithSupportedMethodsAndNotifications, KnownCaipNamespace.Solana);
+        let promptToCreateSolanaAccount = false;
+        if (isSolanaRequested) {
+            const supportedSolanaAccounts = hooks.getNonEvmAccountAddresses(SOLANA_CAIP_CHAIN_ID);
+            promptToCreateSolanaAccount = supportedSolanaAccounts.length === 0;
+        }
         const { supportedScopes: supportedRequiredScopes } = bucketScopes(requiredScopesWithSupportedMethodsAndNotifications, {
             isEvmChainIdSupported: networkClientExistsForChainId,
             isEvmChainIdSupportable: () => false,
@@ -74,9 +83,6 @@ async function walletCreateSessionHandler(req, res, _next, end, hooks) {
             supportedRequiredScopes,
             supportedOptionalScopes,
         ]);
-        if (allSupportedRequestedCaipChainIds.length === 0) {
-            return end(new JsonRpcError(5100, 'Requested scopes are not supported'));
-        }
         const existingEvmAddresses = hooks
             .listAccounts()
             .map((account) => account.address);
@@ -101,6 +107,21 @@ async function walletCreateSessionHandler(req, res, _next, end, hooks) {
             sessionProperties: filteredSessionProperties,
         };
         const requestedCaip25CaveatValueWithSupportedAccounts = setNonSCACaipAccountIdsInCaip25CaveatValue(requestedCaip25CaveatValue, supportedRequestedAccountAddresses);
+        // if `promptToCreateSolanaAccount` is true and there are no other valid scopes requested,
+        // we add a `wallet` scope to the request in order to get passed the CAIP-25 caveat validator.
+        // This is very hacky but is necessary because the solana opt-in flow breaks key assumptions
+        // of the CAIP-25 permission specification -  namely that we can have valid requests with no scopes.
+        if (allSupportedRequestedCaipChainIds.length === 0) {
+            if (promptToCreateSolanaAccount) {
+                requestedCaip25CaveatValueWithSupportedAccounts.optionalScopes[KnownCaipNamespace.Wallet] = {
+                    accounts: [],
+                };
+            }
+            else {
+                // if solana is not requested and there are no supported scopes, we return an error
+                return end(new JsonRpcError(5100, 'Requested scopes are not supported'));
+            }
+        }
         const [grantedPermissions] = await hooks.requestPermissionsForOrigin({
             [Caip25EndowmentPermissionName]: {
                 caveats: [
@@ -110,6 +131,8 @@ async function walletCreateSessionHandler(req, res, _next, end, hooks) {
                     },
                 ],
             },
+        }, {
+            metadata: { promptToCreateSolanaAccount },
         });
         const approvedCaip25Permission = grantedPermissions[Caip25EndowmentPermissionName];
         const approvedCaip25CaveatValue = approvedCaip25Permission?.caveats?.find((caveat) => caveat.type === Caip25CaveatType)?.value;

package/dist/handlers/wallet-createSession.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-createSession.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  bucketScopes,\n  validateAndNormalizeScopes,\n  type Caip25Authorization,\n  getInternalScopesObject,\n  getSessionScopes,\n  type NormalizedScopesObject,\n  getSupportedScopeObjects,\n  type Caip25CaveatValue,\n  isKnownSessionPropertyValue,\n  getCaipAccountIdsFromScopesObjects,\n  getAllScopesFromScopesObjects,\n  setNonSCACaipAccountIdsInCaip25CaveatValue,\n} from '@metamask/chain-agnostic-permission';\nimport { isEqualCaseInsensitive } from '@metamask/controller-utils';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport type { NetworkController } from '@metamask/network-controller';\nimport {\n  invalidParams,\n  type RequestedPermissions,\n} from '@metamask/permission-controller';\nimport { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport {\n  type CaipAccountId,\n  type CaipChainId,\n  type Hex,\n  isPlainObject,\n  type Json,\n  type JsonRpcRequest,\n  type JsonRpcSuccess,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\n\nimport type { GrantedPermissions } from './types';\n\n/**\n * Handler for the `wallet_createSession` RPC method which is responsible\n * for prompting for approval and granting a CAIP-25 permission.\n *\n * This implementation primarily deviates from the CAIP-25 handler\n * specification by treating all scopes as optional regardless of\n * if they were specified in `requiredScopes` or `optionalScopes`.\n * Additionally, provided scopes, methods, notifications, and\n * account values that are invalid/malformed are ignored rather than\n * causing an error to be returned.\n *\n * @param req - The request object.\n * @param res - The response object.\n * @param _next - The next middleware function.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.listAccounts - The hook that returns an array of the wallet's evm accounts.\n * @param hooks.findNetworkClientIdByChainId - The hook that returns the networkClientId for a chainId.\n * @param hooks.requestPermissionsForOrigin - The hook that approves and grants requested permissions.\n * @param hooks.getNonEvmSupportedMethods - The hook that returns the supported methods for a non EVM scope.\n * @param hooks.isNonEvmScopeSupported - The hook that returns true if a non EVM scope is supported.\n * @param hooks.getNonEvmAccountAddresses - The hook that returns a list of CaipAccountIds that are supported for a CaipChainId.\n * @param hooks.trackSessionCreatedEvent - An optional hook for platform specific logic to run. Can be undefined.\n * @returns A promise with wallet_createSession handler\n */\nasync function walletCreateSessionHandler(\n  req: JsonRpcRequest<Caip25Authorization> & { origin: string },\n  res: JsonRpcSuccess<{\n    sessionScopes: NormalizedScopesObject;\n    sessionProperties?: Record<string, Json>;\n  }>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: {\n    listAccounts: () => { address: string }[];\n    findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n    requestPermissionsForOrigin: (\n      requestedPermissions: RequestedPermissions,\n      metadata?: Record<string, Json>,\n    ) => Promise<[GrantedPermissions]>;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    isNonEvmScopeSupported: (scope: CaipChainId) => boolean;\n    getNonEvmAccountAddresses: (scope: CaipChainId) => CaipAccountId[];\n    trackSessionCreatedEvent?: (\n      approvedCaip25CaveatValue: Caip25CaveatValue,\n    ) => void;\n  },\n) {\n  if (!isPlainObject(req.params)) {\n    return end(invalidParams({ data: { request: req } }));\n  }\n  const { requiredScopes, optionalScopes, sessionProperties } = req.params;\n\n  if (sessionProperties && Object.keys(sessionProperties).length === 0) {\n    return end(new JsonRpcError(5302, 'Invalid sessionProperties requested'));\n  }\n\n  const filteredSessionProperties = Object.fromEntries(\n    Object.entries(sessionProperties ?? {}).filter(([key]) =>\n      isKnownSessionPropertyValue(key),\n    ),\n  );\n\n  try {\n    const { normalizedRequiredScopes, normalizedOptionalScopes } =\n      validateAndNormalizeScopes(requiredScopes || {}, optionalScopes || {});\n\n    const requiredScopesWithSupportedMethodsAndNotifications =\n      getSupportedScopeObjects(normalizedRequiredScopes, {\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      });\n    const optionalScopesWithSupportedMethodsAndNotifications =\n      getSupportedScopeObjects(normalizedOptionalScopes, {\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      });\n\n    const networkClientExistsForChainId = (chainId: Hex) => {\n      try {\n        hooks.findNetworkClientIdByChainId(chainId);\n        return true;\n      } catch {\n        return false;\n      }\n    };\n\n    const { supportedScopes: supportedRequiredScopes } = bucketScopes(\n      requiredScopesWithSupportedMethodsAndNotifications,\n      {\n        isEvmChainIdSupported: networkClientExistsForChainId,\n        isEvmChainIdSupportable: () => false, // intended for future usage with eip3085 scopedProperties\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n        isNonEvmScopeSupported: hooks.isNonEvmScopeSupported,\n      },\n    );\n\n    const { supportedScopes: supportedOptionalScopes } = bucketScopes(\n      optionalScopesWithSupportedMethodsAndNotifications,\n      {\n        isEvmChainIdSupported: networkClientExistsForChainId,\n        isEvmChainIdSupportable: () => false, // intended for future usage with eip3085 scopedProperties\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n        isNonEvmScopeSupported: hooks.isNonEvmScopeSupported,\n      },\n    );\n\n    const allRequestedAccountAddresses = getCaipAccountIdsFromScopesObjects([\n      supportedRequiredScopes,\n      supportedOptionalScopes,\n    ]);\n\n    const allSupportedRequestedCaipChainIds = getAllScopesFromScopesObjects([\n      supportedRequiredScopes,\n      supportedOptionalScopes,\n    ]);\n\n    if (allSupportedRequestedCaipChainIds.length === 0) {\n      return end(new JsonRpcError(5100, 'Requested scopes are not supported'));\n    }\n\n    const existingEvmAddresses = hooks\n      .listAccounts()\n      .map((account) => account.address);\n\n    const supportedRequestedAccountAddresses =\n      allRequestedAccountAddresses.filter(\n        (requestedAccountAddress: CaipAccountId) => {\n          const {\n            address,\n            chain: { namespace },\n            chainId: caipChainId,\n          } = parseCaipAccountId(requestedAccountAddress);\n          if (namespace === KnownCaipNamespace.Eip155.toString()) {\n            return existingEvmAddresses.some((existingEvmAddress) => {\n              return isEqualCaseInsensitive(address, existingEvmAddress);\n            });\n          }\n\n          // If the namespace is not eip155 (EVM) we do a case sensitive check\n          return hooks\n            .getNonEvmAccountAddresses(caipChainId)\n            .some((existingCaipAddress) => {\n              return requestedAccountAddress === existingCaipAddress;\n            });\n        },\n      );\n\n    const requestedCaip25CaveatValue = {\n      requiredScopes: getInternalScopesObject(supportedRequiredScopes),\n      optionalScopes: getInternalScopesObject(supportedOptionalScopes),\n      isMultichainOrigin: true,\n      sessionProperties: filteredSessionProperties,\n    };\n\n    const requestedCaip25CaveatValueWithSupportedAccounts =\n      setNonSCACaipAccountIdsInCaip25CaveatValue(\n        requestedCaip25CaveatValue,\n        supportedRequestedAccountAddresses,\n      );\n\n    const [grantedPermissions] = await hooks.requestPermissionsForOrigin({\n      [Caip25EndowmentPermissionName]: {\n        caveats: [\n          {\n            type: Caip25CaveatType,\n            value: requestedCaip25CaveatValueWithSupportedAccounts,\n          },\n        ],\n      },\n    });\n\n    const approvedCaip25Permission =\n      grantedPermissions[Caip25EndowmentPermissionName];\n    const approvedCaip25CaveatValue = approvedCaip25Permission?.caveats?.find(\n      (caveat) => caveat.type === Caip25CaveatType,\n    )?.value as Caip25CaveatValue;\n    if (!approvedCaip25CaveatValue) {\n      throw rpcErrors.internal();\n    }\n\n    const sessionScopes = getSessionScopes(approvedCaip25CaveatValue, {\n      getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n    });\n\n    const { sessionProperties: approvedSessionProperties = {} } =\n      approvedCaip25CaveatValue;\n\n    hooks.trackSessionCreatedEvent?.(approvedCaip25CaveatValue);\n\n    res.result = {\n      sessionScopes,\n      sessionProperties: approvedSessionProperties,\n    };\n    return end();\n  } catch (err) {\n    return end(err);\n  }\n}\n\nexport const walletCreateSession = {\n  methodNames: ['wallet_createSession'],\n  implementation: walletCreateSessionHandler,\n  hookNames: {\n    findNetworkClientIdByChainId: true,\n    listAccounts: true,\n    requestPermissionsForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    isNonEvmScopeSupported: true,\n    getNonEvmAccountAddresses: true,\n    trackSessionCreatedEvent: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-createSession.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-createSession.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,6BAA6B,EAC7B,YAAY,EACZ,0BAA0B,EAE1B,uBAAuB,EACvB,gBAAgB,EAEhB,wBAAwB,EAExB,2BAA2B,EAC3B,kCAAkC,EAClC,6BAA6B,EAC7B,0CAA0C,EAC1C,yBAAyB,EAC1B,4CAA4C;AAC7C,OAAO,EAAE,sBAAsB,EAAE,mCAAmC;AAMpE,OAAO,EACL,aAAa,EAEd,wCAAwC;AACzC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,6BAA6B;AAC/D,OAAO,EAIL,aAAa,EAIb,kBAAkB,EAClB,kBAAkB,EACnB,wBAAwB;AAIzB,MAAM,oBAAoB,GAAG,yCAAyC,CAAC;AAEvE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,KAAK,UAAU,0BAA0B,CACvC,GAA6D,EAC7D,GAGE,EACF,KAAgC,EAChC,GAA6B,EAC7B,KAaC;IAED,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC9B,OAAO,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;KACvD;IACD,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IAEzE,IAAI,iBAAiB,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACpE,OAAO,GAAG,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,qCAAqC,CAAC,CAAC,CAAC;KAC3E;IAED,MAAM,yBAAyB,GAAG,MAAM,CAAC,WAAW,CAClD,MAAM,CAAC,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CACvD,2BAA2B,CAAC,GAAG,CAAC,CACjC,CACF,CAAC;IAEF,IAAI;QACF,MAAM,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,GAC1D,0BAA0B,CAAC,cAAc,IAAI,EAAE,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;QAEzE,MAAM,kDAAkD,GACtD,wBAAwB,CAAC,wBAAwB,EAAE;YACjD,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;SAC3D,CAAC,CAAC;QACL,MAAM,kDAAkD,GACtD,wBAAwB,CAAC,wBAAwB,EAAE;YACjD,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;SAC3D,CAAC,CAAC;QAEL,MAAM,6BAA6B,GAAG,CAAC,OAAY,EAAE,EAAE;YACrD,IAAI;gBACF,KAAK,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;gBAC5C,OAAO,IAAI,CAAC;aACb;YAAC,MAAM;gBACN,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC;QAEF,yGAAyG;QACzG,MAAM,iBAAiB,GACrB,yBAAyB,CACvB,kDAAkD,EAClD,kBAAkB,CAAC,MAAM,CAC1B;YACD,yBAAyB,CACvB,kDAAkD,EAClD,kBAAkB,CAAC,MAAM,CAC1B,CAAC;QAEJ,IAAI,2BAA2B,GAAG,KAAK,CAAC;QACxC,IAAI,iBAAiB,EAAE;YACrB,MAAM,uBAAuB,GAC3B,KAAK,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAC;YACxD,2BAA2B,GAAG,uBAAuB,CAAC,MAAM,KAAK,CAAC,CAAC;SACpE;QAED,MAAM,EAAE,eAAe,EAAE,uBAAuB,EAAE,GAAG,YAAY,CAC/D,kDAAkD,EAClD;YACE,qBAAqB,EAAE,6BAA6B;YACpD,uBAAuB,EAAE,GAAG,EAAE,CAAC,KAAK;YACpC,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;YAC1D,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;SACrD,CACF,CAAC;QAEF,MAAM,EAAE,eAAe,EAAE,uBAAuB,EAAE,GAAG,YAAY,CAC/D,kDAAkD,EAClD;YACE,qBAAqB,EAAE,6BAA6B;YACpD,uBAAuB,EAAE,GAAG,EAAE,CAAC,KAAK;YACpC,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;YAC1D,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;SACrD,CACF,CAAC;QAEF,MAAM,4BAA4B,GAAG,kCAAkC,CAAC;YACtE,uBAAuB;YACvB,uBAAuB;SACxB,CAAC,CAAC;QAEH,MAAM,iCAAiC,GAAG,6BAA6B,CAAC;YACtE,uBAAuB;YACvB,uBAAuB;SACxB,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,KAAK;aAC/B,YAAY,EAAE;aACd,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,kCAAkC,GACtC,4BAA4B,CAAC,MAAM,CACjC,CAAC,uBAAsC,EAAE,EAAE;YACzC,MAAM,EACJ,OAAO,EACP,KAAK,EAAE,EAAE,SAAS,EAAE,EACpB,OAAO,EAAE,WAAW,GACrB,GAAG,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;YAChD,IAAI,SAAS,KAAK,kBAAkB,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;gBACtD,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAAE,EAAE;oBACtD,OAAO,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;aACJ;YAED,oEAAoE;YACpE,OAAO,KAAK;iBACT,yBAAyB,CAAC,WAAW,CAAC;iBACtC,IAAI,CAAC,CAAC,mBAAmB,EAAE,EAAE;gBAC5B,OAAO,uBAAuB,KAAK,mBAAmB,CAAC;YACzD,CAAC,CAAC,CAAC;QACP,CAAC,CACF,CAAC;QAEJ,MAAM,0BAA0B,GAAG;YACjC,cAAc,EAAE,uBAAuB,CAAC,uBAAuB,CAAC;YAChE,cAAc,EAAE,uBAAuB,CAAC,uBAAuB,CAAC;YAChE,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,yBAAyB;SAC7C,CAAC;QAEF,MAAM,+CAA+C,GACnD,0CAA0C,CACxC,0BAA0B,EAC1B,kCAAkC,CACnC,CAAC;QAEJ,0FAA0F;QAC1F,8FAA8F;QAC9F,4FAA4F;QAC5F,oGAAoG;QACpG,IAAI,iCAAiC,CAAC,MAAM,KAAK,CAAC,EAAE;YAClD,IAAI,2BAA2B,EAAE;gBAC/B,+CAA+C,CAAC,cAAc,CAC5D,kBAAkB,CAAC,MAAM,CAC1B,GAAG;oBACF,QAAQ,EAAE,EAAE;iBACb,CAAC;aACH;iBAAM;gBACL,mFAAmF;gBACnF,OAAO,GAAG,CACR,IAAI,YAAY,CAAC,IAAI,EAAE,oCAAoC,CAAC,CAC7D,CAAC;aACH;SACF;QAED,MAAM,CAAC,kBAAkB,CAAC,GAAG,MAAM,KAAK,CAAC,2BAA2B,CAClE;YACE,CAAC,6BAA6B,CAAC,EAAE;gBAC/B,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,gBAAgB;wBACtB,KAAK,EAAE,+CAA+C;qBACvD;iBACF;aACF;SACF,EACD;YACE,QAAQ,EAAE,EAAE,2BAA2B,EAAE;SAC1C,CACF,CAAC;QAEF,MAAM,wBAAwB,GAC5B,kBAAkB,CAAC,6BAA6B,CAAC,CAAC;QACpD,MAAM,yBAAyB,GAAG,wBAAwB,EAAE,OAAO,EAAE,IAAI,CACvE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,gBAAgB,CAC7C,EAAE,KAA0B,CAAC;QAC9B,IAAI,CAAC,yBAAyB,EAAE;YAC9B,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;SAC5B;QAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,yBAAyB,EAAE;YAChE,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;SAC3D,CAAC,CAAC;QAEH,MAAM,EAAE,iBAAiB,EAAE,yBAAyB,GAAG,EAAE,EAAE,GACzD,yBAAyB,CAAC;QAE5B,KAAK,CAAC,wBAAwB,EAAE,CAAC,yBAAyB,CAAC,CAAC;QAE5D,GAAG,CAAC,MAAM,GAAG;YACX,aAAa;YACb,iBAAiB,EAAE,yBAAyB;SAC7C,CAAC;QACF,OAAO,GAAG,EAAE,CAAC;KACd;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;KACjB;AACH,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,WAAW,EAAE,CAAC,sBAAsB,CAAC;IACrC,cAAc,EAAE,0BAA0B;IAC1C,SAAS,EAAE;QACT,4BAA4B,EAAE,IAAI;QAClC,YAAY,EAAE,IAAI;QAClB,2BAA2B,EAAE,IAAI;QACjC,yBAAyB,EAAE,IAAI;QAC/B,sBAAsB,EAAE,IAAI;QAC5B,yBAAyB,EAAE,IAAI;QAC/B,wBAAwB,EAAE,IAAI;KAC/B;CACF,CAAC","sourcesContent":["import {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  bucketScopes,\n  validateAndNormalizeScopes,\n  type Caip25Authorization,\n  getInternalScopesObject,\n  getSessionScopes,\n  type NormalizedScopesObject,\n  getSupportedScopeObjects,\n  type Caip25CaveatValue,\n  isKnownSessionPropertyValue,\n  getCaipAccountIdsFromScopesObjects,\n  getAllScopesFromScopesObjects,\n  setNonSCACaipAccountIdsInCaip25CaveatValue,\n  isNamespaceInScopesObject,\n} from '@metamask/chain-agnostic-permission';\nimport { isEqualCaseInsensitive } from '@metamask/controller-utils';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport type { NetworkController } from '@metamask/network-controller';\nimport {\n  invalidParams,\n  type RequestedPermissions,\n} from '@metamask/permission-controller';\nimport { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport {\n  type CaipAccountId,\n  type CaipChainId,\n  type Hex,\n  isPlainObject,\n  type Json,\n  type JsonRpcRequest,\n  type JsonRpcSuccess,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\n\nimport type { GrantedPermissions } from './types';\n\nconst SOLANA_CAIP_CHAIN_ID = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';\n\n/**\n * Handler for the `wallet_createSession` RPC method which is responsible\n * for prompting for approval and granting a CAIP-25 permission.\n *\n * This implementation primarily deviates from the CAIP-25 handler\n * specification by treating all scopes as optional regardless of\n * if they were specified in `requiredScopes` or `optionalScopes`.\n * Additionally, provided scopes, methods, notifications, and\n * account values that are invalid/malformed are ignored rather than\n * causing an error to be returned.\n *\n * @param req - The request object.\n * @param res - The response object.\n * @param _next - The next middleware function.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.listAccounts - The hook that returns an array of the wallet's evm accounts.\n * @param hooks.findNetworkClientIdByChainId - The hook that returns the networkClientId for a chainId.\n * @param hooks.requestPermissionsForOrigin - The hook that approves and grants requested permissions.\n * @param hooks.getNonEvmSupportedMethods - The hook that returns the supported methods for a non EVM scope.\n * @param hooks.isNonEvmScopeSupported - The hook that returns true if a non EVM scope is supported.\n * @param hooks.getNonEvmAccountAddresses - The hook that returns a list of CaipAccountIds that are supported for a CaipChainId.\n * @param hooks.trackSessionCreatedEvent - An optional hook for platform specific logic to run. Can be undefined.\n * @returns A promise with wallet_createSession handler\n */\nasync function walletCreateSessionHandler(\n  req: JsonRpcRequest<Caip25Authorization> & { origin: string },\n  res: JsonRpcSuccess<{\n    sessionScopes: NormalizedScopesObject;\n    sessionProperties?: Record<string, Json>;\n  }>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: {\n    listAccounts: () => { address: string }[];\n    findNetworkClientIdByChainId: NetworkController['findNetworkClientIdByChainId'];\n    requestPermissionsForOrigin: (\n      requestedPermissions: RequestedPermissions,\n      metadata?: Record<string, Json>,\n    ) => Promise<[GrantedPermissions]>;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    isNonEvmScopeSupported: (scope: CaipChainId) => boolean;\n    getNonEvmAccountAddresses: (scope: CaipChainId) => CaipAccountId[];\n    trackSessionCreatedEvent?: (\n      approvedCaip25CaveatValue: Caip25CaveatValue,\n    ) => void;\n  },\n) {\n  if (!isPlainObject(req.params)) {\n    return end(invalidParams({ data: { request: req } }));\n  }\n  const { requiredScopes, optionalScopes, sessionProperties } = req.params;\n\n  if (sessionProperties && Object.keys(sessionProperties).length === 0) {\n    return end(new JsonRpcError(5302, 'Invalid sessionProperties requested'));\n  }\n\n  const filteredSessionProperties = Object.fromEntries(\n    Object.entries(sessionProperties ?? {}).filter(([key]) =>\n      isKnownSessionPropertyValue(key),\n    ),\n  );\n\n  try {\n    const { normalizedRequiredScopes, normalizedOptionalScopes } =\n      validateAndNormalizeScopes(requiredScopes || {}, optionalScopes || {});\n\n    const requiredScopesWithSupportedMethodsAndNotifications =\n      getSupportedScopeObjects(normalizedRequiredScopes, {\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      });\n    const optionalScopesWithSupportedMethodsAndNotifications =\n      getSupportedScopeObjects(normalizedOptionalScopes, {\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      });\n\n    const networkClientExistsForChainId = (chainId: Hex) => {\n      try {\n        hooks.findNetworkClientIdByChainId(chainId);\n        return true;\n      } catch {\n        return false;\n      }\n    };\n\n    // if solana is a requested scope but not supported, we add a promptToCreateSolanaAccount flag to request\n    const isSolanaRequested =\n      isNamespaceInScopesObject(\n        requiredScopesWithSupportedMethodsAndNotifications,\n        KnownCaipNamespace.Solana,\n      ) ||\n      isNamespaceInScopesObject(\n        optionalScopesWithSupportedMethodsAndNotifications,\n        KnownCaipNamespace.Solana,\n      );\n\n    let promptToCreateSolanaAccount = false;\n    if (isSolanaRequested) {\n      const supportedSolanaAccounts =\n        hooks.getNonEvmAccountAddresses(SOLANA_CAIP_CHAIN_ID);\n      promptToCreateSolanaAccount = supportedSolanaAccounts.length === 0;\n    }\n\n    const { supportedScopes: supportedRequiredScopes } = bucketScopes(\n      requiredScopesWithSupportedMethodsAndNotifications,\n      {\n        isEvmChainIdSupported: networkClientExistsForChainId,\n        isEvmChainIdSupportable: () => false, // intended for future usage with eip3085 scopedProperties\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n        isNonEvmScopeSupported: hooks.isNonEvmScopeSupported,\n      },\n    );\n\n    const { supportedScopes: supportedOptionalScopes } = bucketScopes(\n      optionalScopesWithSupportedMethodsAndNotifications,\n      {\n        isEvmChainIdSupported: networkClientExistsForChainId,\n        isEvmChainIdSupportable: () => false, // intended for future usage with eip3085 scopedProperties\n        getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n        isNonEvmScopeSupported: hooks.isNonEvmScopeSupported,\n      },\n    );\n\n    const allRequestedAccountAddresses = getCaipAccountIdsFromScopesObjects([\n      supportedRequiredScopes,\n      supportedOptionalScopes,\n    ]);\n\n    const allSupportedRequestedCaipChainIds = getAllScopesFromScopesObjects([\n      supportedRequiredScopes,\n      supportedOptionalScopes,\n    ]);\n\n    const existingEvmAddresses = hooks\n      .listAccounts()\n      .map((account) => account.address);\n\n    const supportedRequestedAccountAddresses =\n      allRequestedAccountAddresses.filter(\n        (requestedAccountAddress: CaipAccountId) => {\n          const {\n            address,\n            chain: { namespace },\n            chainId: caipChainId,\n          } = parseCaipAccountId(requestedAccountAddress);\n          if (namespace === KnownCaipNamespace.Eip155.toString()) {\n            return existingEvmAddresses.some((existingEvmAddress) => {\n              return isEqualCaseInsensitive(address, existingEvmAddress);\n            });\n          }\n\n          // If the namespace is not eip155 (EVM) we do a case sensitive check\n          return hooks\n            .getNonEvmAccountAddresses(caipChainId)\n            .some((existingCaipAddress) => {\n              return requestedAccountAddress === existingCaipAddress;\n            });\n        },\n      );\n\n    const requestedCaip25CaveatValue = {\n      requiredScopes: getInternalScopesObject(supportedRequiredScopes),\n      optionalScopes: getInternalScopesObject(supportedOptionalScopes),\n      isMultichainOrigin: true,\n      sessionProperties: filteredSessionProperties,\n    };\n\n    const requestedCaip25CaveatValueWithSupportedAccounts =\n      setNonSCACaipAccountIdsInCaip25CaveatValue(\n        requestedCaip25CaveatValue,\n        supportedRequestedAccountAddresses,\n      );\n\n    // if `promptToCreateSolanaAccount` is true and there are no other valid scopes requested,\n    // we add a `wallet` scope to the request in order to get passed the CAIP-25 caveat validator.\n    // This is very hacky but is necessary because the solana opt-in flow breaks key assumptions\n    // of the CAIP-25 permission specification -  namely that we can have valid requests with no scopes.\n    if (allSupportedRequestedCaipChainIds.length === 0) {\n      if (promptToCreateSolanaAccount) {\n        requestedCaip25CaveatValueWithSupportedAccounts.optionalScopes[\n          KnownCaipNamespace.Wallet\n        ] = {\n          accounts: [],\n        };\n      } else {\n        // if solana is not requested and there are no supported scopes, we return an error\n        return end(\n          new JsonRpcError(5100, 'Requested scopes are not supported'),\n        );\n      }\n    }\n\n    const [grantedPermissions] = await hooks.requestPermissionsForOrigin(\n      {\n        [Caip25EndowmentPermissionName]: {\n          caveats: [\n            {\n              type: Caip25CaveatType,\n              value: requestedCaip25CaveatValueWithSupportedAccounts,\n            },\n          ],\n        },\n      },\n      {\n        metadata: { promptToCreateSolanaAccount },\n      },\n    );\n\n    const approvedCaip25Permission =\n      grantedPermissions[Caip25EndowmentPermissionName];\n    const approvedCaip25CaveatValue = approvedCaip25Permission?.caveats?.find(\n      (caveat) => caveat.type === Caip25CaveatType,\n    )?.value as Caip25CaveatValue;\n    if (!approvedCaip25CaveatValue) {\n      throw rpcErrors.internal();\n    }\n\n    const sessionScopes = getSessionScopes(approvedCaip25CaveatValue, {\n      getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n    });\n\n    const { sessionProperties: approvedSessionProperties = {} } =\n      approvedCaip25CaveatValue;\n\n    hooks.trackSessionCreatedEvent?.(approvedCaip25CaveatValue);\n\n    res.result = {\n      sessionScopes,\n      sessionProperties: approvedSessionProperties,\n    };\n    return end();\n  } catch (err) {\n    return end(err);\n  }\n}\n\nexport const walletCreateSession = {\n  methodNames: ['wallet_createSession'],\n  implementation: walletCreateSessionHandler,\n  hookNames: {\n    findNetworkClientIdByChainId: true,\n    listAccounts: true,\n    requestPermissionsForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    isNonEvmScopeSupported: true,\n    getNonEvmAccountAddresses: true,\n    trackSessionCreatedEvent: true,\n  },\n};\n"]}

package/dist/handlers/wallet-invokeMethod.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-invokeMethod.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-invokeMethod.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Caip25CaveatValue,\n  ExternalScopeString,\n} from '@metamask/chain-agnostic-permission';\nimport {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  assertIsInternalScopeString,\n  getSessionScopes,\n  parseScopeString,\n} from '@metamask/chain-agnostic-permission';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Caveat } from '@metamask/permission-controller';\nimport { providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  Hex,\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\nimport { KnownCaipNamespace, numberToHex } from '@metamask/utils';\n\nexport type WalletInvokeMethodRequest = JsonRpcRequest & {\n  origin: string;\n  params: {\n    scope: ExternalScopeString;\n    request: Pick<JsonRpcRequest, 'method' | 'params'>;\n  };\n};\n\n/**\n * Handler for the `wallet_invokeMethod` RPC method as specified by [CAIP-27](https://chainagnostic.org/CAIPs/caip-27).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param\n * and instead uses the singular session for the origin if available.\n *\n * @param request - The request object.\n * @param response - The response object. Unused.\n * @param next - The next middleware function.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.getCaveatForOrigin - the hook for getting a caveat from a permission for an origin.\n * @param hooks.findNetworkClientIdByChainId - the hook for finding the networkClientId for a chainId.\n * @param hooks.getSelectedNetworkClientId - the hook for getting the current globally selected networkClientId.\n * @param hooks.getNonEvmSupportedMethods - A function that returns the supported methods for a non EVM scope.\n * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.\n * @returns Nothing.\n */\nasync function walletInvokeMethodHandler(\n  request: WalletInvokeMethodRequest,\n  response: PendingJsonRpcResponse<Json>,\n  next: () => void,\n  end: (error?: Error) => void,\n  hooks: {\n    getCaveatForOrigin: (\n      endowmentPermissionName: string,\n      caveatType: string,\n    ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n    findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;\n    getSelectedNetworkClientId: () => NetworkClientId;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    handleNonEvmRequestForOrigin: (params: {\n      connectedAddresses: CaipAccountId[];\n      scope: CaipChainId;\n      request: JsonRpcRequest;\n    }) => Promise<Json>;\n  },\n) {\n  const { scope, request: wrappedRequest } = request.params;\n\n  assertIsInternalScopeString(scope);\n\n  let caveat;\n  try {\n    caveat = hooks.getCaveatForOrigin(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n    );\n  } catch {\n    // noop\n  }\n  if (!caveat?.value?.isMultichainOrigin) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const scopeObject = getSessionScopes(caveat.value, {\n    getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n  })[scope];\n\n  if (!scopeObject?.methods?.includes(wrappedRequest.method)) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const { namespace, reference } = parseScopeString(scope);\n\n  const isEvmRequest =\n    (namespace === KnownCaipNamespace.Wallet &&\n      (!reference || reference === KnownCaipNamespace.Eip155)) ||\n    namespace === KnownCaipNamespace.Eip155;\n\n  const unwrappedRequest = {\n    ...request,\n    scope,\n    method: wrappedRequest.method,\n    params: wrappedRequest.params,\n  };\n\n  if (isEvmRequest) {\n    let networkClientId;\n    if (namespace === KnownCaipNamespace.Wallet) {\n      networkClientId = hooks.getSelectedNetworkClientId();\n    } else if (namespace === KnownCaipNamespace.Eip155) {\n      if (reference) {\n        networkClientId = hooks.findNetworkClientIdByChainId(\n          numberToHex(parseInt(reference, 10)),\n        );\n      }\n    }\n\n    if (!networkClientId) {\n      console.error(\n        'failed to resolve network client for wallet_invokeMethod',\n        request,\n      );\n      return end(rpcErrors.internal());\n    }\n\n    Object.assign(request, {\n      ...unwrappedRequest,\n      networkClientId,\n    });\n    return next();\n  }\n\n  try {\n    response.result = await hooks.handleNonEvmRequestForOrigin({\n      connectedAddresses: scopeObject.accounts,\n      // Type assertion: We know that scope is not \"wallet\" by now because it\n      // is already being handled above.\n      scope: scope as CaipChainId,\n      request: unwrappedRequest,\n    });\n  } catch (err) {\n    return end(err as Error);\n  }\n  return end();\n}\nexport const walletInvokeMethod = {\n  methodNames: ['wallet_invokeMethod'],\n  implementation: walletInvokeMethodHandler,\n  hookNames: {\n    getCaveatForOrigin: true,\n    findNetworkClientIdByChainId: true,\n    getSelectedNetworkClientId: true,\n    getNonEvmSupportedMethods: true,\n    handleNonEvmRequestForOrigin: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-invokeMethod.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-invokeMethod.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Caip25CaveatValue,\n  ExternalScopeString,\n} from '@metamask/chain-agnostic-permission';\nimport {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  assertIsInternalScopeString,\n  getSessionScopes,\n  parseScopeString,\n} from '@metamask/chain-agnostic-permission';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Caveat } from '@metamask/permission-controller';\nimport { providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  Hex,\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\nimport { KnownCaipNamespace, numberToHex } from '@metamask/utils';\n\nexport type WalletInvokeMethodRequest = JsonRpcRequest & {\n  origin: string;\n  params: {\n    scope: ExternalScopeString;\n    request: Pick<JsonRpcRequest, 'method' | 'params'>;\n  };\n};\n\n/**\n * Handler for the `wallet_invokeMethod` RPC method as specified by [CAIP-27](https://chainagnostic.org/CAIPs/caip-27).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param\n * and instead uses the singular session for the origin if available.\n *\n * @param request - The request object.\n * @param response - The response object. Unused.\n * @param next - The next middleware function.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.getCaveatForOrigin - the hook for getting a caveat from a permission for an origin.\n * @param hooks.findNetworkClientIdByChainId - the hook for finding the networkClientId for a chainId.\n * @param hooks.getSelectedNetworkClientId - the hook for getting the current globally selected networkClientId.\n * @param hooks.getNonEvmSupportedMethods - A function that returns the supported methods for a non EVM scope.\n * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.\n * @returns Nothing.\n */\nasync function walletInvokeMethodHandler(\n  request: WalletInvokeMethodRequest,\n  response: PendingJsonRpcResponse,\n  next: () => void,\n  end: (error?: Error) => void,\n  hooks: {\n    getCaveatForOrigin: (\n      endowmentPermissionName: string,\n      caveatType: string,\n    ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n    findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;\n    getSelectedNetworkClientId: () => NetworkClientId;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    handleNonEvmRequestForOrigin: (params: {\n      connectedAddresses: CaipAccountId[];\n      scope: CaipChainId;\n      request: JsonRpcRequest;\n    }) => Promise<Json>;\n  },\n) {\n  const { scope, request: wrappedRequest } = request.params;\n\n  assertIsInternalScopeString(scope);\n\n  let caveat;\n  try {\n    caveat = hooks.getCaveatForOrigin(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n    );\n  } catch {\n    // noop\n  }\n  if (!caveat?.value?.isMultichainOrigin) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const scopeObject = getSessionScopes(caveat.value, {\n    getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n  })[scope];\n\n  if (!scopeObject?.methods?.includes(wrappedRequest.method)) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const { namespace, reference } = parseScopeString(scope);\n\n  const isEvmRequest =\n    (namespace === KnownCaipNamespace.Wallet &&\n      (!reference || reference === KnownCaipNamespace.Eip155)) ||\n    namespace === KnownCaipNamespace.Eip155;\n\n  const unwrappedRequest = {\n    ...request,\n    scope,\n    method: wrappedRequest.method,\n    params: wrappedRequest.params,\n  };\n\n  if (isEvmRequest) {\n    let networkClientId;\n    if (namespace === KnownCaipNamespace.Wallet) {\n      networkClientId = hooks.getSelectedNetworkClientId();\n    } else if (namespace === KnownCaipNamespace.Eip155) {\n      if (reference) {\n        networkClientId = hooks.findNetworkClientIdByChainId(\n          numberToHex(parseInt(reference, 10)),\n        );\n      }\n    }\n\n    if (!networkClientId) {\n      console.error(\n        'failed to resolve network client for wallet_invokeMethod',\n        request,\n      );\n      return end(rpcErrors.internal());\n    }\n\n    Object.assign(request, {\n      ...unwrappedRequest,\n      networkClientId,\n    });\n    return next();\n  }\n\n  try {\n    response.result = await hooks.handleNonEvmRequestForOrigin({\n      connectedAddresses: scopeObject.accounts,\n      // Type assertion: We know that scope is not \"wallet\" by now because it\n      // is already being handled above.\n      scope: scope as CaipChainId,\n      request: unwrappedRequest,\n    });\n  } catch (err) {\n    return end(err as Error);\n  }\n  return end();\n}\nexport const walletInvokeMethod = {\n  methodNames: ['wallet_invokeMethod'],\n  implementation: walletInvokeMethodHandler,\n  hookNames: {\n    getCaveatForOrigin: true,\n    findNetworkClientIdByChainId: true,\n    getSelectedNetworkClientId: true,\n    getNonEvmSupportedMethods: true,\n    handleNonEvmRequestForOrigin: true,\n  },\n};\n"]}

package/dist/handlers/wallet-invokeMethod.d.cts

@@ -27,7 +27,7 @@ export type WalletInvokeMethodRequest = JsonRpcRequest & {
  * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.
  * @returns Nothing.
  */
-declare function walletInvokeMethodHandler(request: WalletInvokeMethodRequest, response: PendingJsonRpcResponse<Json>, next: () => void, end: (error?: Error) => void, hooks: {
+declare function walletInvokeMethodHandler(request: WalletInvokeMethodRequest, response: PendingJsonRpcResponse, next: () => void, end: (error?: Error) => void, hooks: {
     getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
     findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;
     getSelectedNetworkClientId: () => NetworkClientId;

package/dist/handlers/wallet-invokeMethod.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-invokeMethod.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-invokeMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACpB,4CAA4C;AAC7C,OAAO,EACL,gBAAgB,EAKjB,4CAA4C;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAE9D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,GAAG,EACH,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAGzB,MAAM,MAAM,yBAAyB,GAAG,cAAc,GAAG;IACvD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,KAAK,EAAE,mBAAmB,CAAC;QAC3B,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,QAAQ,CAAC,CAAC;KACpD,CAAC;CACH,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAe,yBAAyB,CACtC,OAAO,EAAE,yBAAyB,EAClC,QAAQ,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACtC,IAAI,EAAE,MAAM,IAAI,EAChB,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,EAC5B,KAAK,EAAE;IACL,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxD,4BAA4B,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,eAAe,GAAG,SAAS,CAAC;IAC5E,0BAA0B,EAAE,MAAM,eAAe,CAAC;IAClD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,4BAA4B,EAAE,CAAC,MAAM,EAAE;QACrC,kBAAkB,EAAE,aAAa,EAAE,CAAC;QACpC,KAAK,EAAE,WAAW,CAAC;QACnB,OAAO,EAAE,cAAc,CAAC;KACzB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,iBAgFF;AACD,eAAO,MAAM,kBAAkB;;;;;;;;;;CAU9B,CAAC"}
+{"version":3,"file":"wallet-invokeMethod.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-invokeMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACpB,4CAA4C;AAC7C,OAAO,EACL,gBAAgB,EAKjB,4CAA4C;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAE9D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,GAAG,EACH,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAGzB,MAAM,MAAM,yBAAyB,GAAG,cAAc,GAAG;IACvD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,KAAK,EAAE,mBAAmB,CAAC;QAC3B,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,QAAQ,CAAC,CAAC;KACpD,CAAC;CACH,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAe,yBAAyB,CACtC,OAAO,EAAE,yBAAyB,EAClC,QAAQ,EAAE,sBAAsB,EAChC,IAAI,EAAE,MAAM,IAAI,EAChB,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,EAC5B,KAAK,EAAE;IACL,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxD,4BAA4B,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,eAAe,GAAG,SAAS,CAAC;IAC5E,0BAA0B,EAAE,MAAM,eAAe,CAAC;IAClD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,4BAA4B,EAAE,CAAC,MAAM,EAAE;QACrC,kBAAkB,EAAE,aAAa,EAAE,CAAC;QACpC,KAAK,EAAE,WAAW,CAAC;QACnB,OAAO,EAAE,cAAc,CAAC;KACzB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,iBAgFF;AACD,eAAO,MAAM,kBAAkB;;;;;;;;;;CAU9B,CAAC"}

package/dist/handlers/wallet-invokeMethod.d.mts

@@ -27,7 +27,7 @@ export type WalletInvokeMethodRequest = JsonRpcRequest & {
  * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.
  * @returns Nothing.
  */
-declare function walletInvokeMethodHandler(request: WalletInvokeMethodRequest, response: PendingJsonRpcResponse<Json>, next: () => void, end: (error?: Error) => void, hooks: {
+declare function walletInvokeMethodHandler(request: WalletInvokeMethodRequest, response: PendingJsonRpcResponse, next: () => void, end: (error?: Error) => void, hooks: {
     getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
     findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;
     getSelectedNetworkClientId: () => NetworkClientId;

package/dist/handlers/wallet-invokeMethod.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-invokeMethod.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-invokeMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACpB,4CAA4C;AAC7C,OAAO,EACL,gBAAgB,EAKjB,4CAA4C;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAE9D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,GAAG,EACH,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAGzB,MAAM,MAAM,yBAAyB,GAAG,cAAc,GAAG;IACvD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,KAAK,EAAE,mBAAmB,CAAC;QAC3B,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,QAAQ,CAAC,CAAC;KACpD,CAAC;CACH,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAe,yBAAyB,CACtC,OAAO,EAAE,yBAAyB,EAClC,QAAQ,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACtC,IAAI,EAAE,MAAM,IAAI,EAChB,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,EAC5B,KAAK,EAAE;IACL,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxD,4BAA4B,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,eAAe,GAAG,SAAS,CAAC;IAC5E,0BAA0B,EAAE,MAAM,eAAe,CAAC;IAClD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,4BAA4B,EAAE,CAAC,MAAM,EAAE;QACrC,kBAAkB,EAAE,aAAa,EAAE,CAAC;QACpC,KAAK,EAAE,WAAW,CAAC;QACnB,OAAO,EAAE,cAAc,CAAC;KACzB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,iBAgFF;AACD,eAAO,MAAM,kBAAkB;;;;;;;;;;CAU9B,CAAC"}
+{"version":3,"file":"wallet-invokeMethod.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-invokeMethod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACpB,4CAA4C;AAC7C,OAAO,EACL,gBAAgB,EAKjB,4CAA4C;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAE9D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,GAAG,EACH,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAGzB,MAAM,MAAM,yBAAyB,GAAG,cAAc,GAAG;IACvD,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QACN,KAAK,EAAE,mBAAmB,CAAC;QAC3B,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,QAAQ,CAAC,CAAC;KACpD,CAAC;CACH,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAe,yBAAyB,CACtC,OAAO,EAAE,yBAAyB,EAClC,QAAQ,EAAE,sBAAsB,EAChC,IAAI,EAAE,MAAM,IAAI,EAChB,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,EAC5B,KAAK,EAAE;IACL,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxD,4BAA4B,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,eAAe,GAAG,SAAS,CAAC;IAC5E,0BAA0B,EAAE,MAAM,eAAe,CAAC;IAClD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,4BAA4B,EAAE,CAAC,MAAM,EAAE;QACrC,kBAAkB,EAAE,aAAa,EAAE,CAAC;QACpC,KAAK,EAAE,WAAW,CAAC;QACnB,OAAO,EAAE,cAAc,CAAC;KACzB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB,iBAgFF;AACD,eAAO,MAAM,kBAAkB;;;;;;;;;;CAU9B,CAAC"}

package/dist/handlers/wallet-invokeMethod.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-invokeMethod.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-invokeMethod.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Caip25CaveatValue,\n  ExternalScopeString,\n} from '@metamask/chain-agnostic-permission';\nimport {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  assertIsInternalScopeString,\n  getSessionScopes,\n  parseScopeString,\n} from '@metamask/chain-agnostic-permission';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Caveat } from '@metamask/permission-controller';\nimport { providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  Hex,\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\nimport { KnownCaipNamespace, numberToHex } from '@metamask/utils';\n\nexport type WalletInvokeMethodRequest = JsonRpcRequest & {\n  origin: string;\n  params: {\n    scope: ExternalScopeString;\n    request: Pick<JsonRpcRequest, 'method' | 'params'>;\n  };\n};\n\n/**\n * Handler for the `wallet_invokeMethod` RPC method as specified by [CAIP-27](https://chainagnostic.org/CAIPs/caip-27).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param\n * and instead uses the singular session for the origin if available.\n *\n * @param request - The request object.\n * @param response - The response object. Unused.\n * @param next - The next middleware function.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.getCaveatForOrigin - the hook for getting a caveat from a permission for an origin.\n * @param hooks.findNetworkClientIdByChainId - the hook for finding the networkClientId for a chainId.\n * @param hooks.getSelectedNetworkClientId - the hook for getting the current globally selected networkClientId.\n * @param hooks.getNonEvmSupportedMethods - A function that returns the supported methods for a non EVM scope.\n * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.\n * @returns Nothing.\n */\nasync function walletInvokeMethodHandler(\n  request: WalletInvokeMethodRequest,\n  response: PendingJsonRpcResponse<Json>,\n  next: () => void,\n  end: (error?: Error) => void,\n  hooks: {\n    getCaveatForOrigin: (\n      endowmentPermissionName: string,\n      caveatType: string,\n    ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n    findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;\n    getSelectedNetworkClientId: () => NetworkClientId;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    handleNonEvmRequestForOrigin: (params: {\n      connectedAddresses: CaipAccountId[];\n      scope: CaipChainId;\n      request: JsonRpcRequest;\n    }) => Promise<Json>;\n  },\n) {\n  const { scope, request: wrappedRequest } = request.params;\n\n  assertIsInternalScopeString(scope);\n\n  let caveat;\n  try {\n    caveat = hooks.getCaveatForOrigin(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n    );\n  } catch {\n    // noop\n  }\n  if (!caveat?.value?.isMultichainOrigin) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const scopeObject = getSessionScopes(caveat.value, {\n    getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n  })[scope];\n\n  if (!scopeObject?.methods?.includes(wrappedRequest.method)) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const { namespace, reference } = parseScopeString(scope);\n\n  const isEvmRequest =\n    (namespace === KnownCaipNamespace.Wallet &&\n      (!reference || reference === KnownCaipNamespace.Eip155)) ||\n    namespace === KnownCaipNamespace.Eip155;\n\n  const unwrappedRequest = {\n    ...request,\n    scope,\n    method: wrappedRequest.method,\n    params: wrappedRequest.params,\n  };\n\n  if (isEvmRequest) {\n    let networkClientId;\n    if (namespace === KnownCaipNamespace.Wallet) {\n      networkClientId = hooks.getSelectedNetworkClientId();\n    } else if (namespace === KnownCaipNamespace.Eip155) {\n      if (reference) {\n        networkClientId = hooks.findNetworkClientIdByChainId(\n          numberToHex(parseInt(reference, 10)),\n        );\n      }\n    }\n\n    if (!networkClientId) {\n      console.error(\n        'failed to resolve network client for wallet_invokeMethod',\n        request,\n      );\n      return end(rpcErrors.internal());\n    }\n\n    Object.assign(request, {\n      ...unwrappedRequest,\n      networkClientId,\n    });\n    return next();\n  }\n\n  try {\n    response.result = await hooks.handleNonEvmRequestForOrigin({\n      connectedAddresses: scopeObject.accounts,\n      // Type assertion: We know that scope is not \"wallet\" by now because it\n      // is already being handled above.\n      scope: scope as CaipChainId,\n      request: unwrappedRequest,\n    });\n  } catch (err) {\n    return end(err as Error);\n  }\n  return end();\n}\nexport const walletInvokeMethod = {\n  methodNames: ['wallet_invokeMethod'],\n  implementation: walletInvokeMethodHandler,\n  hookNames: {\n    getCaveatForOrigin: true,\n    findNetworkClientIdByChainId: true,\n    getSelectedNetworkClientId: true,\n    getNonEvmSupportedMethods: true,\n    handleNonEvmRequestForOrigin: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-invokeMethod.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-invokeMethod.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Caip25CaveatValue,\n  ExternalScopeString,\n} from '@metamask/chain-agnostic-permission';\nimport {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  assertIsInternalScopeString,\n  getSessionScopes,\n  parseScopeString,\n} from '@metamask/chain-agnostic-permission';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Caveat } from '@metamask/permission-controller';\nimport { providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  Hex,\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\nimport { KnownCaipNamespace, numberToHex } from '@metamask/utils';\n\nexport type WalletInvokeMethodRequest = JsonRpcRequest & {\n  origin: string;\n  params: {\n    scope: ExternalScopeString;\n    request: Pick<JsonRpcRequest, 'method' | 'params'>;\n  };\n};\n\n/**\n * Handler for the `wallet_invokeMethod` RPC method as specified by [CAIP-27](https://chainagnostic.org/CAIPs/caip-27).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param\n * and instead uses the singular session for the origin if available.\n *\n * @param request - The request object.\n * @param response - The response object. Unused.\n * @param next - The next middleware function.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.getCaveatForOrigin - the hook for getting a caveat from a permission for an origin.\n * @param hooks.findNetworkClientIdByChainId - the hook for finding the networkClientId for a chainId.\n * @param hooks.getSelectedNetworkClientId - the hook for getting the current globally selected networkClientId.\n * @param hooks.getNonEvmSupportedMethods - A function that returns the supported methods for a non EVM scope.\n * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.\n * @returns Nothing.\n */\nasync function walletInvokeMethodHandler(\n  request: WalletInvokeMethodRequest,\n  response: PendingJsonRpcResponse,\n  next: () => void,\n  end: (error?: Error) => void,\n  hooks: {\n    getCaveatForOrigin: (\n      endowmentPermissionName: string,\n      caveatType: string,\n    ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n    findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;\n    getSelectedNetworkClientId: () => NetworkClientId;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    handleNonEvmRequestForOrigin: (params: {\n      connectedAddresses: CaipAccountId[];\n      scope: CaipChainId;\n      request: JsonRpcRequest;\n    }) => Promise<Json>;\n  },\n) {\n  const { scope, request: wrappedRequest } = request.params;\n\n  assertIsInternalScopeString(scope);\n\n  let caveat;\n  try {\n    caveat = hooks.getCaveatForOrigin(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n    );\n  } catch {\n    // noop\n  }\n  if (!caveat?.value?.isMultichainOrigin) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const scopeObject = getSessionScopes(caveat.value, {\n    getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n  })[scope];\n\n  if (!scopeObject?.methods?.includes(wrappedRequest.method)) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const { namespace, reference } = parseScopeString(scope);\n\n  const isEvmRequest =\n    (namespace === KnownCaipNamespace.Wallet &&\n      (!reference || reference === KnownCaipNamespace.Eip155)) ||\n    namespace === KnownCaipNamespace.Eip155;\n\n  const unwrappedRequest = {\n    ...request,\n    scope,\n    method: wrappedRequest.method,\n    params: wrappedRequest.params,\n  };\n\n  if (isEvmRequest) {\n    let networkClientId;\n    if (namespace === KnownCaipNamespace.Wallet) {\n      networkClientId = hooks.getSelectedNetworkClientId();\n    } else if (namespace === KnownCaipNamespace.Eip155) {\n      if (reference) {\n        networkClientId = hooks.findNetworkClientIdByChainId(\n          numberToHex(parseInt(reference, 10)),\n        );\n      }\n    }\n\n    if (!networkClientId) {\n      console.error(\n        'failed to resolve network client for wallet_invokeMethod',\n        request,\n      );\n      return end(rpcErrors.internal());\n    }\n\n    Object.assign(request, {\n      ...unwrappedRequest,\n      networkClientId,\n    });\n    return next();\n  }\n\n  try {\n    response.result = await hooks.handleNonEvmRequestForOrigin({\n      connectedAddresses: scopeObject.accounts,\n      // Type assertion: We know that scope is not \"wallet\" by now because it\n      // is already being handled above.\n      scope: scope as CaipChainId,\n      request: unwrappedRequest,\n    });\n  } catch (err) {\n    return end(err as Error);\n  }\n  return end();\n}\nexport const walletInvokeMethod = {\n  methodNames: ['wallet_invokeMethod'],\n  implementation: walletInvokeMethodHandler,\n  hookNames: {\n    getCaveatForOrigin: true,\n    findNetworkClientIdByChainId: true,\n    getSelectedNetworkClientId: true,\n    getNonEvmSupportedMethods: true,\n    handleNonEvmRequestForOrigin: true,\n  },\n};\n"]}

package/dist/handlers/wallet-revokeSession.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-revokeSession.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":";;;AAAA,mFAAoF;AAKpF,2EAGyC;AACzC,qDAAiD;AAGjD;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,0BAA0B,CACvC,QAA6C,EAC7C,QAA8B,EAC9B,KAAgC,EAChC,GAA6B,EAC7B,KAEC;IAED,IAAI;QACF,KAAK,CAAC,yBAAyB,CAAC,yDAA6B,CAAC,CAAC;KAChE;IAAC,OAAO,GAAG,EAAE;QACZ,IACE,CAAC,CAAC,GAAG,YAAY,gDAAwB,CAAC;YAC1C,CAAC,CAAC,GAAG,YAAY,mDAA2B,CAAC,EAC7C;YACA,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,GAAG,CAAC,sBAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;SAClC;KACF;IAED,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AACY,QAAA,mBAAmB,GAAG;IACjC,WAAW,EAAE,CAAC,sBAAsB,CAAC;IACrC,cAAc,EAAE,0BAA0B;IAC1C,SAAS,EAAE;QACT,yBAAyB,EAAE,IAAI;KAChC;CACF,CAAC","sourcesContent":["import { Caip25EndowmentPermissionName } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n} from '@metamask/json-rpc-engine';\nimport {\n  PermissionDoesNotExistError,\n  UnrecognizedSubjectError,\n} from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { JsonRpcSuccess, Json, JsonRpcRequest } from '@metamask/utils';\n\n/**\n * Handler for the `wallet_revokeSession` RPC method as specified by [CAIP-285](https://chainagnostic.org/CAIPs/caip-285).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param\n * and instead revokes the singular session for the origin if available. Additionally,\n * the handler also does not return an error if there is currently no active session and instead\n * returns true which is the same result returned if an active session was actually revoked.\n *\n * @param _request - The JSON-RPC request object. Unused.\n * @param response - The JSON-RPC response object.\n * @param _next - The next middleware function. Unused.\n * @param end - The end callback function.\n * @param hooks - The hooks object.\n * @param hooks.revokePermissionForOrigin - The hook for revoking a permission for an origin function.\n * @returns Nothing.\n */\nasync function walletRevokeSessionHandler(\n  _request: JsonRpcRequest & { origin: string },\n  response: JsonRpcSuccess<Json>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: {\n    revokePermissionForOrigin: (permissionName: string) => void;\n  },\n) {\n  try {\n    hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n  } catch (err) {\n    if (\n      !(err instanceof UnrecognizedSubjectError) &&\n      !(err instanceof PermissionDoesNotExistError)\n    ) {\n      console.error(err);\n      return end(rpcErrors.internal());\n    }\n  }\n\n  response.result = true;\n  return end();\n}\nexport const walletRevokeSession = {\n  methodNames: ['wallet_revokeSession'],\n  implementation: walletRevokeSessionHandler,\n  hookNames: {\n    revokePermissionForOrigin: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-revokeSession.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":";;;AAAA,mFAAoF;AAKpF,2EAGyC;AACzC,qDAAiD;AAGjD;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,0BAA0B,CACvC,QAA6C,EAC7C,QAAwB,EACxB,KAAgC,EAChC,GAA6B,EAC7B,KAEC;IAED,IAAI;QACF,KAAK,CAAC,yBAAyB,CAAC,yDAA6B,CAAC,CAAC;KAChE;IAAC,OAAO,GAAG,EAAE;QACZ,IACE,CAAC,CAAC,GAAG,YAAY,gDAAwB,CAAC;YAC1C,CAAC,CAAC,GAAG,YAAY,mDAA2B,CAAC,EAC7C;YACA,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,GAAG,CAAC,sBAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;SAClC;KACF;IAED,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AACY,QAAA,mBAAmB,GAAG;IACjC,WAAW,EAAE,CAAC,sBAAsB,CAAC;IACrC,cAAc,EAAE,0BAA0B;IAC1C,SAAS,EAAE;QACT,yBAAyB,EAAE,IAAI;KAChC;CACF,CAAC","sourcesContent":["import { Caip25EndowmentPermissionName } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n} from '@metamask/json-rpc-engine';\nimport {\n  PermissionDoesNotExistError,\n  UnrecognizedSubjectError,\n} from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { JsonRpcSuccess, JsonRpcRequest } from '@metamask/utils';\n\n/**\n * Handler for the `wallet_revokeSession` RPC method as specified by [CAIP-285](https://chainagnostic.org/CAIPs/caip-285).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param\n * and instead revokes the singular session for the origin if available. Additionally,\n * the handler also does not return an error if there is currently no active session and instead\n * returns true which is the same result returned if an active session was actually revoked.\n *\n * @param _request - The JSON-RPC request object. Unused.\n * @param response - The JSON-RPC response object.\n * @param _next - The next middleware function. Unused.\n * @param end - The end callback function.\n * @param hooks - The hooks object.\n * @param hooks.revokePermissionForOrigin - The hook for revoking a permission for an origin function.\n * @returns Nothing.\n */\nasync function walletRevokeSessionHandler(\n  _request: JsonRpcRequest & { origin: string },\n  response: JsonRpcSuccess,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: {\n    revokePermissionForOrigin: (permissionName: string) => void;\n  },\n) {\n  try {\n    hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n  } catch (err) {\n    if (\n      !(err instanceof UnrecognizedSubjectError) &&\n      !(err instanceof PermissionDoesNotExistError)\n    ) {\n      console.error(err);\n      return end(rpcErrors.internal());\n    }\n  }\n\n  response.result = true;\n  return end();\n}\nexport const walletRevokeSession = {\n  methodNames: ['wallet_revokeSession'],\n  implementation: walletRevokeSessionHandler,\n  hookNames: {\n    revokePermissionForOrigin: true,\n  },\n};\n"]}

package/dist/handlers/wallet-revokeSession.d.cts

@@ -1,5 +1,5 @@
 import type { JsonRpcEngineNextCallback, JsonRpcEngineEndCallback } from "@metamask/json-rpc-engine";
-import type { JsonRpcSuccess, Json, JsonRpcRequest } from "@metamask/utils";
+import type { JsonRpcSuccess, JsonRpcRequest } from "@metamask/utils";
 /**
  * Handler for the `wallet_revokeSession` RPC method as specified by [CAIP-285](https://chainagnostic.org/CAIPs/caip-285).
  * The implementation below deviates from the linked spec in that it ignores the `sessionId` param
@@ -17,7 +17,7 @@ import type { JsonRpcSuccess, Json, JsonRpcRequest } from "@metamask/utils";
  */
 declare function walletRevokeSessionHandler(_request: JsonRpcRequest & {
     origin: string;
-}, response: JsonRpcSuccess<Json>, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: {
+}, response: JsonRpcSuccess, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: {
     revokePermissionForOrigin: (permissionName: string) => void;
 }): Promise<void>;
 export declare const walletRevokeSession: {

package/dist/handlers/wallet-revokeSession.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-revokeSession.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACzB,kCAAkC;AAMnC,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,wBAAwB;AAE5E;;;;;;;;;;;;;;GAcG;AACH,iBAAe,0BAA0B,CACvC,QAAQ,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7C,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,EAC9B,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE;IACL,yBAAyB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7D,iBAgBF;AACD,eAAO,MAAM,mBAAmB;;;;;;CAM/B,CAAC"}
+{"version":3,"file":"wallet-revokeSession.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACzB,kCAAkC;AAMnC,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,wBAAwB;AAEtE;;;;;;;;;;;;;;GAcG;AACH,iBAAe,0BAA0B,CACvC,QAAQ,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE;IACL,yBAAyB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7D,iBAgBF;AACD,eAAO,MAAM,mBAAmB;;;;;;CAM/B,CAAC"}

package/dist/handlers/wallet-revokeSession.d.mts

@@ -1,5 +1,5 @@
 import type { JsonRpcEngineNextCallback, JsonRpcEngineEndCallback } from "@metamask/json-rpc-engine";
-import type { JsonRpcSuccess, Json, JsonRpcRequest } from "@metamask/utils";
+import type { JsonRpcSuccess, JsonRpcRequest } from "@metamask/utils";
 /**
  * Handler for the `wallet_revokeSession` RPC method as specified by [CAIP-285](https://chainagnostic.org/CAIPs/caip-285).
  * The implementation below deviates from the linked spec in that it ignores the `sessionId` param
@@ -17,7 +17,7 @@ import type { JsonRpcSuccess, Json, JsonRpcRequest } from "@metamask/utils";
  */
 declare function walletRevokeSessionHandler(_request: JsonRpcRequest & {
     origin: string;
-}, response: JsonRpcSuccess<Json>, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: {
+}, response: JsonRpcSuccess, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: {
     revokePermissionForOrigin: (permissionName: string) => void;
 }): Promise<void>;
 export declare const walletRevokeSession: {

package/dist/handlers/wallet-revokeSession.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-revokeSession.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACzB,kCAAkC;AAMnC,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,wBAAwB;AAE5E;;;;;;;;;;;;;;GAcG;AACH,iBAAe,0BAA0B,CACvC,QAAQ,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7C,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,EAC9B,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE;IACL,yBAAyB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7D,iBAgBF;AACD,eAAO,MAAM,mBAAmB;;;;;;CAM/B,CAAC"}
+{"version":3,"file":"wallet-revokeSession.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACzB,kCAAkC;AAMnC,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,wBAAwB;AAEtE;;;;;;;;;;;;;;GAcG;AACH,iBAAe,0BAA0B,CACvC,QAAQ,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7C,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE;IACL,yBAAyB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7D,iBAgBF;AACD,eAAO,MAAM,mBAAmB;;;;;;CAM/B,CAAC"}

package/dist/handlers/wallet-revokeSession.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-revokeSession.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,4CAA4C;AAKpF,OAAO,EACL,2BAA2B,EAC3B,wBAAwB,EACzB,wCAAwC;AACzC,OAAO,EAAE,SAAS,EAAE,6BAA6B;AAGjD;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,0BAA0B,CACvC,QAA6C,EAC7C,QAA8B,EAC9B,KAAgC,EAChC,GAA6B,EAC7B,KAEC;IAED,IAAI;QACF,KAAK,CAAC,yBAAyB,CAAC,6BAA6B,CAAC,CAAC;KAChE;IAAC,OAAO,GAAG,EAAE;QACZ,IACE,CAAC,CAAC,GAAG,YAAY,wBAAwB,CAAC;YAC1C,CAAC,CAAC,GAAG,YAAY,2BAA2B,CAAC,EAC7C;YACA,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;SAClC;KACF;IAED,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AACD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,WAAW,EAAE,CAAC,sBAAsB,CAAC;IACrC,cAAc,EAAE,0BAA0B;IAC1C,SAAS,EAAE;QACT,yBAAyB,EAAE,IAAI;KAChC;CACF,CAAC","sourcesContent":["import { Caip25EndowmentPermissionName } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n} from '@metamask/json-rpc-engine';\nimport {\n  PermissionDoesNotExistError,\n  UnrecognizedSubjectError,\n} from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { JsonRpcSuccess, Json, JsonRpcRequest } from '@metamask/utils';\n\n/**\n * Handler for the `wallet_revokeSession` RPC method as specified by [CAIP-285](https://chainagnostic.org/CAIPs/caip-285).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param\n * and instead revokes the singular session for the origin if available. Additionally,\n * the handler also does not return an error if there is currently no active session and instead\n * returns true which is the same result returned if an active session was actually revoked.\n *\n * @param _request - The JSON-RPC request object. Unused.\n * @param response - The JSON-RPC response object.\n * @param _next - The next middleware function. Unused.\n * @param end - The end callback function.\n * @param hooks - The hooks object.\n * @param hooks.revokePermissionForOrigin - The hook for revoking a permission for an origin function.\n * @returns Nothing.\n */\nasync function walletRevokeSessionHandler(\n  _request: JsonRpcRequest & { origin: string },\n  response: JsonRpcSuccess<Json>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: {\n    revokePermissionForOrigin: (permissionName: string) => void;\n  },\n) {\n  try {\n    hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n  } catch (err) {\n    if (\n      !(err instanceof UnrecognizedSubjectError) &&\n      !(err instanceof PermissionDoesNotExistError)\n    ) {\n      console.error(err);\n      return end(rpcErrors.internal());\n    }\n  }\n\n  response.result = true;\n  return end();\n}\nexport const walletRevokeSession = {\n  methodNames: ['wallet_revokeSession'],\n  implementation: walletRevokeSessionHandler,\n  hookNames: {\n    revokePermissionForOrigin: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-revokeSession.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,4CAA4C;AAKpF,OAAO,EACL,2BAA2B,EAC3B,wBAAwB,EACzB,wCAAwC;AACzC,OAAO,EAAE,SAAS,EAAE,6BAA6B;AAGjD;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,0BAA0B,CACvC,QAA6C,EAC7C,QAAwB,EACxB,KAAgC,EAChC,GAA6B,EAC7B,KAEC;IAED,IAAI;QACF,KAAK,CAAC,yBAAyB,CAAC,6BAA6B,CAAC,CAAC;KAChE;IAAC,OAAO,GAAG,EAAE;QACZ,IACE,CAAC,CAAC,GAAG,YAAY,wBAAwB,CAAC;YAC1C,CAAC,CAAC,GAAG,YAAY,2BAA2B,CAAC,EAC7C;YACA,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;SAClC;KACF;IAED,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AACD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,WAAW,EAAE,CAAC,sBAAsB,CAAC;IACrC,cAAc,EAAE,0BAA0B;IAC1C,SAAS,EAAE;QACT,yBAAyB,EAAE,IAAI;KAChC;CACF,CAAC","sourcesContent":["import { Caip25EndowmentPermissionName } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n} from '@metamask/json-rpc-engine';\nimport {\n  PermissionDoesNotExistError,\n  UnrecognizedSubjectError,\n} from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { JsonRpcSuccess, JsonRpcRequest } from '@metamask/utils';\n\n/**\n * Handler for the `wallet_revokeSession` RPC method as specified by [CAIP-285](https://chainagnostic.org/CAIPs/caip-285).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param\n * and instead revokes the singular session for the origin if available. Additionally,\n * the handler also does not return an error if there is currently no active session and instead\n * returns true which is the same result returned if an active session was actually revoked.\n *\n * @param _request - The JSON-RPC request object. Unused.\n * @param response - The JSON-RPC response object.\n * @param _next - The next middleware function. Unused.\n * @param end - The end callback function.\n * @param hooks - The hooks object.\n * @param hooks.revokePermissionForOrigin - The hook for revoking a permission for an origin function.\n * @returns Nothing.\n */\nasync function walletRevokeSessionHandler(\n  _request: JsonRpcRequest & { origin: string },\n  response: JsonRpcSuccess,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: {\n    revokePermissionForOrigin: (permissionName: string) => void;\n  },\n) {\n  try {\n    hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n  } catch (err) {\n    if (\n      !(err instanceof UnrecognizedSubjectError) &&\n      !(err instanceof PermissionDoesNotExistError)\n    ) {\n      console.error(err);\n      return end(rpcErrors.internal());\n    }\n  }\n\n  response.result = true;\n  return end();\n}\nexport const walletRevokeSession = {\n  methodNames: ['wallet_revokeSession'],\n  implementation: walletRevokeSessionHandler,\n  hookNames: {\n    revokePermissionForOrigin: true,\n  },\n};\n"]}

package/dist/middlewares/MultichainMiddlewareManager.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainMiddlewareManager.cjs","sourceRoot":"","sources":["../../src/middlewares/MultichainMiddlewareManager.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExternalScopeString } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nexport type ExtendedJsonRpcMiddleware = {\n  (\n    req: JsonRpcRequest & { scope: string },\n    res: PendingJsonRpcResponse<Json>,\n    next: JsonRpcEngineNextCallback,\n    end: JsonRpcEngineEndCallback,\n  ): void;\n  destroy?: () => void | Promise<void>;\n};\n\ntype MiddlewareKey = {\n  scope: ExternalScopeString;\n  origin: string;\n  tabId?: number;\n};\ntype MiddlewareEntry = MiddlewareKey & {\n  middleware: ExtendedJsonRpcMiddleware;\n};\n\n// Methods related to eth_subscriptions\nconst SubscriptionMethods = ['eth_subscribe', 'eth_unsubscribe'];\n\n/**\n * A helper that facilates registering and calling of provided middleware instances\n * in the RPC pipeline based on the incoming request's scope, origin, and tabId.\n * The core purpose of this class is to enable and manage multichain subscriptions\n * (i.e. eth_subscribe called accross different chains and domains).\n *\n * Note that only one middleware instance can be registered per scope, origin, tabId key.\n */\nexport class MultichainMiddlewareManager {\n  #middlewares: MiddlewareEntry[] = [];\n\n  #getMiddlewareEntry({\n    scope,\n    origin,\n    tabId,\n  }: MiddlewareKey): MiddlewareEntry | undefined {\n    return this.#middlewares.find((middlewareEntry) => {\n      return (\n        middlewareEntry.scope === scope &&\n        middlewareEntry.origin === origin &&\n        middlewareEntry.tabId === tabId\n      );\n    });\n  }\n\n  #removeMiddlewareEntry({ scope, origin, tabId }: MiddlewareEntry) {\n    this.#middlewares = this.#middlewares.filter((middlewareEntry) => {\n      return (\n        middlewareEntry.scope !== scope ||\n        middlewareEntry.origin !== origin ||\n        middlewareEntry.tabId !== tabId\n      );\n    });\n  }\n\n  addMiddleware(middlewareEntry: MiddlewareEntry) {\n    const { scope, origin, tabId } = middlewareEntry;\n    if (!this.#getMiddlewareEntry({ scope, origin, tabId })) {\n      this.#middlewares.push(middlewareEntry);\n    }\n  }\n\n  #removeMiddleware(middlewareEntry: MiddlewareEntry) {\n    // When the destroy function on the middleware is async,\n    // we don't need to wait for it complete\n    Promise.resolve(middlewareEntry.middleware.destroy?.()).catch(() => {\n      // do nothing\n    });\n\n    this.#removeMiddlewareEntry(middlewareEntry);\n  }\n\n  removeMiddlewareByScope(scope: ExternalScopeString) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (middlewareEntry.scope === scope) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  removeMiddlewareByScopeAndOrigin(scope: ExternalScopeString, origin: string) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (\n        middlewareEntry.scope === scope &&\n        middlewareEntry.origin === origin\n      ) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  removeMiddlewareByOriginAndTabId(origin: string, tabId?: number) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (\n        middlewareEntry.origin === origin &&\n        middlewareEntry.tabId === tabId\n      ) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  generateMultichainMiddlewareForOriginAndTabId(\n    origin: string,\n    tabId?: number,\n  ) {\n    const middleware: ExtendedJsonRpcMiddleware = (req, res, next, end) => {\n      const { scope } = req;\n      const middlewareEntry = this.#getMiddlewareEntry({\n        scope,\n        origin,\n        tabId,\n      });\n\n      if (SubscriptionMethods.includes(req.method)) {\n        if (middlewareEntry) {\n          middlewareEntry.middleware(req, res, next, end);\n        } else {\n          // TODO: Temporary safety guard to prevent requests with these methods\n          // from being forwarded to the RPC endpoint even though this scenario\n          // should not be possible.\n          return end(rpcErrors.methodNotFound());\n        }\n      } else {\n        return next();\n      }\n      return undefined;\n    };\n    middleware.destroy = this.removeMiddlewareByOriginAndTabId.bind(\n      this,\n      origin,\n      tabId,\n    );\n\n    return middleware;\n  }\n}\n"]}
+{"version":3,"file":"MultichainMiddlewareManager.cjs","sourceRoot":"","sources":["../../src/middlewares/MultichainMiddlewareManager.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExternalScopeString } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils';\n\nexport type ExtendedJsonRpcMiddleware = {\n  (\n    req: JsonRpcRequest & { scope: string },\n    res: PendingJsonRpcResponse,\n    next: JsonRpcEngineNextCallback,\n    end: JsonRpcEngineEndCallback,\n  ): void;\n  destroy?: () => void | Promise<void>;\n};\n\ntype MiddlewareKey = {\n  scope: ExternalScopeString;\n  origin: string;\n  tabId?: number;\n};\ntype MiddlewareEntry = MiddlewareKey & {\n  middleware: ExtendedJsonRpcMiddleware;\n};\n\n// Methods related to eth_subscriptions\nconst SubscriptionMethods = ['eth_subscribe', 'eth_unsubscribe'];\n\n/**\n * A helper that facilates registering and calling of provided middleware instances\n * in the RPC pipeline based on the incoming request's scope, origin, and tabId.\n * The core purpose of this class is to enable and manage multichain subscriptions\n * (i.e. eth_subscribe called accross different chains and domains).\n *\n * Note that only one middleware instance can be registered per scope, origin, tabId key.\n */\nexport class MultichainMiddlewareManager {\n  #middlewares: MiddlewareEntry[] = [];\n\n  #getMiddlewareEntry({\n    scope,\n    origin,\n    tabId,\n  }: MiddlewareKey): MiddlewareEntry | undefined {\n    return this.#middlewares.find((middlewareEntry) => {\n      return (\n        middlewareEntry.scope === scope &&\n        middlewareEntry.origin === origin &&\n        middlewareEntry.tabId === tabId\n      );\n    });\n  }\n\n  #removeMiddlewareEntry({ scope, origin, tabId }: MiddlewareEntry) {\n    this.#middlewares = this.#middlewares.filter((middlewareEntry) => {\n      return (\n        middlewareEntry.scope !== scope ||\n        middlewareEntry.origin !== origin ||\n        middlewareEntry.tabId !== tabId\n      );\n    });\n  }\n\n  addMiddleware(middlewareEntry: MiddlewareEntry) {\n    const { scope, origin, tabId } = middlewareEntry;\n    if (!this.#getMiddlewareEntry({ scope, origin, tabId })) {\n      this.#middlewares.push(middlewareEntry);\n    }\n  }\n\n  #removeMiddleware(middlewareEntry: MiddlewareEntry) {\n    // When the destroy function on the middleware is async,\n    // we don't need to wait for it complete\n    Promise.resolve(middlewareEntry.middleware.destroy?.()).catch(() => {\n      // do nothing\n    });\n\n    this.#removeMiddlewareEntry(middlewareEntry);\n  }\n\n  removeMiddlewareByScope(scope: ExternalScopeString) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (middlewareEntry.scope === scope) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  removeMiddlewareByScopeAndOrigin(scope: ExternalScopeString, origin: string) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (\n        middlewareEntry.scope === scope &&\n        middlewareEntry.origin === origin\n      ) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  removeMiddlewareByOriginAndTabId(origin: string, tabId?: number) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (\n        middlewareEntry.origin === origin &&\n        middlewareEntry.tabId === tabId\n      ) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  generateMultichainMiddlewareForOriginAndTabId(\n    origin: string,\n    tabId?: number,\n  ) {\n    const middleware: ExtendedJsonRpcMiddleware = (req, res, next, end) => {\n      const { scope } = req;\n      const middlewareEntry = this.#getMiddlewareEntry({\n        scope,\n        origin,\n        tabId,\n      });\n\n      if (SubscriptionMethods.includes(req.method)) {\n        if (middlewareEntry) {\n          middlewareEntry.middleware(req, res, next, end);\n        } else {\n          // TODO: Temporary safety guard to prevent requests with these methods\n          // from being forwarded to the RPC endpoint even though this scenario\n          // should not be possible.\n          return end(rpcErrors.methodNotFound());\n        }\n      } else {\n        return next();\n      }\n      return undefined;\n    };\n    middleware.destroy = this.removeMiddlewareByOriginAndTabId.bind(\n      this,\n      origin,\n      tabId,\n    );\n\n    return middleware;\n  }\n}\n"]}

package/dist/middlewares/MultichainMiddlewareManager.d.cts

@@ -1,10 +1,10 @@
 import type { ExternalScopeString } from "@metamask/chain-agnostic-permission";
 import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
+import type { JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
 export type ExtendedJsonRpcMiddleware = {
     (req: JsonRpcRequest & {
         scope: string;
-    }, res: PendingJsonRpcResponse<Json>, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback): void;
+    }, res: PendingJsonRpcResponse, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback): void;
     destroy?: () => void | Promise<void>;
 };
 type MiddlewareKey = {

package/dist/middlewares/MultichainMiddlewareManager.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainMiddlewareManager.d.cts","sourceRoot":"","sources":["../../src/middlewares/MultichainMiddlewareManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,4CAA4C;AAC/E,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,kCAAkC;AAEnC,OAAO,KAAK,EACV,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAEzB,MAAM,MAAM,yBAAyB,GAAG;IACtC,CACE,GAAG,EAAE,cAAc,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EACvC,GAAG,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACjC,IAAI,EAAE,yBAAyB,EAC/B,GAAG,EAAE,wBAAwB,GAC5B,IAAI,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,eAAe,GAAG,aAAa,GAAG;IACrC,UAAU,EAAE,yBAAyB,CAAC;CACvC,CAAC;AAKF;;;;;;;GAOG;AACH,qBAAa,2BAA2B;;IA2BtC,aAAa,CAAC,eAAe,EAAE,eAAe;IAiB9C,uBAAuB,CAAC,KAAK,EAAE,mBAAmB;IAQlD,gCAAgC,CAAC,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM;IAW3E,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAW/D,6CAA6C,CAC3C,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM;CAgCjB"}
+{"version":3,"file":"MultichainMiddlewareManager.d.cts","sourceRoot":"","sources":["../../src/middlewares/MultichainMiddlewareManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,4CAA4C;AAC/E,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,kCAAkC;AAEnC,OAAO,KAAK,EAAE,cAAc,EAAE,sBAAsB,EAAE,wBAAwB;AAE9E,MAAM,MAAM,yBAAyB,GAAG;IACtC,CACE,GAAG,EAAE,cAAc,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EACvC,GAAG,EAAE,sBAAsB,EAC3B,IAAI,EAAE,yBAAyB,EAC/B,GAAG,EAAE,wBAAwB,GAC5B,IAAI,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,eAAe,GAAG,aAAa,GAAG;IACrC,UAAU,EAAE,yBAAyB,CAAC;CACvC,CAAC;AAKF;;;;;;;GAOG;AACH,qBAAa,2BAA2B;;IA2BtC,aAAa,CAAC,eAAe,EAAE,eAAe;IAiB9C,uBAAuB,CAAC,KAAK,EAAE,mBAAmB;IAQlD,gCAAgC,CAAC,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM;IAW3E,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAW/D,6CAA6C,CAC3C,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM;CAgCjB"}

package/dist/middlewares/MultichainMiddlewareManager.d.mts

@@ -1,10 +1,10 @@
 import type { ExternalScopeString } from "@metamask/chain-agnostic-permission";
 import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback } from "@metamask/json-rpc-engine";
-import type { Json, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
+import type { JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
 export type ExtendedJsonRpcMiddleware = {
     (req: JsonRpcRequest & {
         scope: string;
-    }, res: PendingJsonRpcResponse<Json>, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback): void;
+    }, res: PendingJsonRpcResponse, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback): void;
     destroy?: () => void | Promise<void>;
 };
 type MiddlewareKey = {

package/dist/middlewares/MultichainMiddlewareManager.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainMiddlewareManager.d.mts","sourceRoot":"","sources":["../../src/middlewares/MultichainMiddlewareManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,4CAA4C;AAC/E,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,kCAAkC;AAEnC,OAAO,KAAK,EACV,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAEzB,MAAM,MAAM,yBAAyB,GAAG;IACtC,CACE,GAAG,EAAE,cAAc,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EACvC,GAAG,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACjC,IAAI,EAAE,yBAAyB,EAC/B,GAAG,EAAE,wBAAwB,GAC5B,IAAI,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,eAAe,GAAG,aAAa,GAAG;IACrC,UAAU,EAAE,yBAAyB,CAAC;CACvC,CAAC;AAKF;;;;;;;GAOG;AACH,qBAAa,2BAA2B;;IA2BtC,aAAa,CAAC,eAAe,EAAE,eAAe;IAiB9C,uBAAuB,CAAC,KAAK,EAAE,mBAAmB;IAQlD,gCAAgC,CAAC,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM;IAW3E,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAW/D,6CAA6C,CAC3C,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM;CAgCjB"}
+{"version":3,"file":"MultichainMiddlewareManager.d.mts","sourceRoot":"","sources":["../../src/middlewares/MultichainMiddlewareManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,4CAA4C;AAC/E,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EAC1B,kCAAkC;AAEnC,OAAO,KAAK,EAAE,cAAc,EAAE,sBAAsB,EAAE,wBAAwB;AAE9E,MAAM,MAAM,yBAAyB,GAAG;IACtC,CACE,GAAG,EAAE,cAAc,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EACvC,GAAG,EAAE,sBAAsB,EAC3B,IAAI,EAAE,yBAAyB,EAC/B,GAAG,EAAE,wBAAwB,GAC5B,IAAI,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,eAAe,GAAG,aAAa,GAAG;IACrC,UAAU,EAAE,yBAAyB,CAAC;CACvC,CAAC;AAKF;;;;;;;GAOG;AACH,qBAAa,2BAA2B;;IA2BtC,aAAa,CAAC,eAAe,EAAE,eAAe;IAiB9C,uBAAuB,CAAC,KAAK,EAAE,mBAAmB;IAQlD,gCAAgC,CAAC,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM;IAW3E,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAW/D,6CAA6C,CAC3C,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM;CAgCjB"}

package/dist/middlewares/MultichainMiddlewareManager.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"MultichainMiddlewareManager.mjs","sourceRoot":"","sources":["../../src/middlewares/MultichainMiddlewareManager.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExternalScopeString } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nexport type ExtendedJsonRpcMiddleware = {\n  (\n    req: JsonRpcRequest & { scope: string },\n    res: PendingJsonRpcResponse<Json>,\n    next: JsonRpcEngineNextCallback,\n    end: JsonRpcEngineEndCallback,\n  ): void;\n  destroy?: () => void | Promise<void>;\n};\n\ntype MiddlewareKey = {\n  scope: ExternalScopeString;\n  origin: string;\n  tabId?: number;\n};\ntype MiddlewareEntry = MiddlewareKey & {\n  middleware: ExtendedJsonRpcMiddleware;\n};\n\n// Methods related to eth_subscriptions\nconst SubscriptionMethods = ['eth_subscribe', 'eth_unsubscribe'];\n\n/**\n * A helper that facilates registering and calling of provided middleware instances\n * in the RPC pipeline based on the incoming request's scope, origin, and tabId.\n * The core purpose of this class is to enable and manage multichain subscriptions\n * (i.e. eth_subscribe called accross different chains and domains).\n *\n * Note that only one middleware instance can be registered per scope, origin, tabId key.\n */\nexport class MultichainMiddlewareManager {\n  #middlewares: MiddlewareEntry[] = [];\n\n  #getMiddlewareEntry({\n    scope,\n    origin,\n    tabId,\n  }: MiddlewareKey): MiddlewareEntry | undefined {\n    return this.#middlewares.find((middlewareEntry) => {\n      return (\n        middlewareEntry.scope === scope &&\n        middlewareEntry.origin === origin &&\n        middlewareEntry.tabId === tabId\n      );\n    });\n  }\n\n  #removeMiddlewareEntry({ scope, origin, tabId }: MiddlewareEntry) {\n    this.#middlewares = this.#middlewares.filter((middlewareEntry) => {\n      return (\n        middlewareEntry.scope !== scope ||\n        middlewareEntry.origin !== origin ||\n        middlewareEntry.tabId !== tabId\n      );\n    });\n  }\n\n  addMiddleware(middlewareEntry: MiddlewareEntry) {\n    const { scope, origin, tabId } = middlewareEntry;\n    if (!this.#getMiddlewareEntry({ scope, origin, tabId })) {\n      this.#middlewares.push(middlewareEntry);\n    }\n  }\n\n  #removeMiddleware(middlewareEntry: MiddlewareEntry) {\n    // When the destroy function on the middleware is async,\n    // we don't need to wait for it complete\n    Promise.resolve(middlewareEntry.middleware.destroy?.()).catch(() => {\n      // do nothing\n    });\n\n    this.#removeMiddlewareEntry(middlewareEntry);\n  }\n\n  removeMiddlewareByScope(scope: ExternalScopeString) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (middlewareEntry.scope === scope) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  removeMiddlewareByScopeAndOrigin(scope: ExternalScopeString, origin: string) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (\n        middlewareEntry.scope === scope &&\n        middlewareEntry.origin === origin\n      ) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  removeMiddlewareByOriginAndTabId(origin: string, tabId?: number) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (\n        middlewareEntry.origin === origin &&\n        middlewareEntry.tabId === tabId\n      ) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  generateMultichainMiddlewareForOriginAndTabId(\n    origin: string,\n    tabId?: number,\n  ) {\n    const middleware: ExtendedJsonRpcMiddleware = (req, res, next, end) => {\n      const { scope } = req;\n      const middlewareEntry = this.#getMiddlewareEntry({\n        scope,\n        origin,\n        tabId,\n      });\n\n      if (SubscriptionMethods.includes(req.method)) {\n        if (middlewareEntry) {\n          middlewareEntry.middleware(req, res, next, end);\n        } else {\n          // TODO: Temporary safety guard to prevent requests with these methods\n          // from being forwarded to the RPC endpoint even though this scenario\n          // should not be possible.\n          return end(rpcErrors.methodNotFound());\n        }\n      } else {\n        return next();\n      }\n      return undefined;\n    };\n    middleware.destroy = this.removeMiddlewareByOriginAndTabId.bind(\n      this,\n      origin,\n      tabId,\n    );\n\n    return middleware;\n  }\n}\n"]}
+{"version":3,"file":"MultichainMiddlewareManager.mjs","sourceRoot":"","sources":["../../src/middlewares/MultichainMiddlewareManager.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExternalScopeString } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { JsonRpcRequest, PendingJsonRpcResponse } from '@metamask/utils';\n\nexport type ExtendedJsonRpcMiddleware = {\n  (\n    req: JsonRpcRequest & { scope: string },\n    res: PendingJsonRpcResponse,\n    next: JsonRpcEngineNextCallback,\n    end: JsonRpcEngineEndCallback,\n  ): void;\n  destroy?: () => void | Promise<void>;\n};\n\ntype MiddlewareKey = {\n  scope: ExternalScopeString;\n  origin: string;\n  tabId?: number;\n};\ntype MiddlewareEntry = MiddlewareKey & {\n  middleware: ExtendedJsonRpcMiddleware;\n};\n\n// Methods related to eth_subscriptions\nconst SubscriptionMethods = ['eth_subscribe', 'eth_unsubscribe'];\n\n/**\n * A helper that facilates registering and calling of provided middleware instances\n * in the RPC pipeline based on the incoming request's scope, origin, and tabId.\n * The core purpose of this class is to enable and manage multichain subscriptions\n * (i.e. eth_subscribe called accross different chains and domains).\n *\n * Note that only one middleware instance can be registered per scope, origin, tabId key.\n */\nexport class MultichainMiddlewareManager {\n  #middlewares: MiddlewareEntry[] = [];\n\n  #getMiddlewareEntry({\n    scope,\n    origin,\n    tabId,\n  }: MiddlewareKey): MiddlewareEntry | undefined {\n    return this.#middlewares.find((middlewareEntry) => {\n      return (\n        middlewareEntry.scope === scope &&\n        middlewareEntry.origin === origin &&\n        middlewareEntry.tabId === tabId\n      );\n    });\n  }\n\n  #removeMiddlewareEntry({ scope, origin, tabId }: MiddlewareEntry) {\n    this.#middlewares = this.#middlewares.filter((middlewareEntry) => {\n      return (\n        middlewareEntry.scope !== scope ||\n        middlewareEntry.origin !== origin ||\n        middlewareEntry.tabId !== tabId\n      );\n    });\n  }\n\n  addMiddleware(middlewareEntry: MiddlewareEntry) {\n    const { scope, origin, tabId } = middlewareEntry;\n    if (!this.#getMiddlewareEntry({ scope, origin, tabId })) {\n      this.#middlewares.push(middlewareEntry);\n    }\n  }\n\n  #removeMiddleware(middlewareEntry: MiddlewareEntry) {\n    // When the destroy function on the middleware is async,\n    // we don't need to wait for it complete\n    Promise.resolve(middlewareEntry.middleware.destroy?.()).catch(() => {\n      // do nothing\n    });\n\n    this.#removeMiddlewareEntry(middlewareEntry);\n  }\n\n  removeMiddlewareByScope(scope: ExternalScopeString) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (middlewareEntry.scope === scope) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  removeMiddlewareByScopeAndOrigin(scope: ExternalScopeString, origin: string) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (\n        middlewareEntry.scope === scope &&\n        middlewareEntry.origin === origin\n      ) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  removeMiddlewareByOriginAndTabId(origin: string, tabId?: number) {\n    this.#middlewares.forEach((middlewareEntry) => {\n      if (\n        middlewareEntry.origin === origin &&\n        middlewareEntry.tabId === tabId\n      ) {\n        this.#removeMiddleware(middlewareEntry);\n      }\n    });\n  }\n\n  generateMultichainMiddlewareForOriginAndTabId(\n    origin: string,\n    tabId?: number,\n  ) {\n    const middleware: ExtendedJsonRpcMiddleware = (req, res, next, end) => {\n      const { scope } = req;\n      const middlewareEntry = this.#getMiddlewareEntry({\n        scope,\n        origin,\n        tabId,\n      });\n\n      if (SubscriptionMethods.includes(req.method)) {\n        if (middlewareEntry) {\n          middlewareEntry.middleware(req, res, next, end);\n        } else {\n          // TODO: Temporary safety guard to prevent requests with these methods\n          // from being forwarded to the RPC endpoint even though this scenario\n          // should not be possible.\n          return end(rpcErrors.methodNotFound());\n        }\n      } else {\n        return next();\n      }\n      return undefined;\n    };\n    middleware.destroy = this.removeMiddlewareByOriginAndTabId.bind(\n      this,\n      origin,\n      tabId,\n    );\n\n    return middleware;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/multichain-api-middleware",
-  "version": "0.3.0",
+  "version": "1.0.0",
   "description": "JSON-RPC methods and middleware to support the MetaMask Multichain API",
   "keywords": [
     "MetaMask",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@metamask/api-specs": "^0.14.0",
-    "@metamask/chain-agnostic-permission": "^0.7.0",
-    "@metamask/controller-utils": "^11.9.0",
+    "@metamask/chain-agnostic-permission": "^1.0.0",
+    "@metamask/controller-utils": "^11.10.0",
     "@metamask/json-rpc-engine": "^10.0.3",
-    "@metamask/network-controller": "^23.5.0",
+    "@metamask/network-controller": "^24.0.0",
     "@metamask/permission-controller": "^11.0.6",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/utils": "^11.2.0",
@@ -62,7 +62,7 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/eth-json-rpc-filters": "^9.0.0",
-    "@metamask/multichain-transactions-controller": "^0.11.0",
+    "@metamask/multichain-transactions-controller": "^3.0.0",
     "@metamask/safe-event-emitter": "^3.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",