@metamask-previews/multichain-api-middleware 2.0.0-preview-d23d9dc44 → 2.0.0-preview-a1caffc9c

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.sortAccountIdsByLastSelected - A function that sorts accounts by their last selected order.\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    sortAccountIdsByLastSelected: (\n      accounts: CaipAccountId[],\n    ) => CaipAccountId[];\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) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const scopeObject = getSessionScopes(caveat.value, {\n    getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n    sortAccountIdsByLastSelected: hooks.sortAccountIdsByLastSelected,\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    sortAccountIdsByLastSelected: 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 {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n  MethodHandler,\n} from '@metamask/json-rpc-engine';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Caveat } from '@metamask/permission-controller';\nimport { providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport { isObject, KnownCaipNamespace, numberToHex } from '@metamask/utils';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  Hex,\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nexport type WalletInvokeMethodParams = {\n  scope: ExternalScopeString;\n  request: Pick<JsonRpcRequest, 'method' | 'params'>;\n};\n\nexport type WalletInvokeMethodRequest =\n  JsonRpcRequest<WalletInvokeMethodParams> & {\n    origin: string;\n  };\n\nexport type WalletInvokeMethodHooks = {\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  sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];\n  handleNonEvmRequestForOrigin: (params: {\n    connectedAddresses: CaipAccountId[];\n    scope: CaipChainId;\n    request: JsonRpcRequest;\n  }) => Promise<Json>;\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.sortAccountIdsByLastSelected - A function that sorts accounts by their last selected order.\n * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.\n * @returns Nothing.\n */\nasync function handleWalletInvokeMethod(\n  request: WalletInvokeMethodRequest,\n  response: PendingJsonRpcResponse<Json>,\n  next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: WalletInvokeMethodHooks,\n) {\n  if (!isObject(request.params)) {\n    return end(rpcErrors.invalidParams({ data: { request } }));\n  }\n\n  const { scope, request: wrappedRequest } = request.params;\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) {\n    return end(providerErrors.unauthorized());\n  }\n\n  const scopeObject = getSessionScopes(caveat.value, {\n    getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n    sortAccountIdsByLastSelected: hooks.sortAccountIdsByLastSelected,\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}\n\nexport type WalletInvokeMethodHandler = MethodHandler<\n  WalletInvokeMethodHooks,\n  never,\n  WalletInvokeMethodParams,\n  Json,\n  { origin: string }\n>;\n\nexport const walletInvokeMethodHandler = {\n  implementation: handleWalletInvokeMethod,\n  hookNames: {\n    getCaveatForOrigin: true,\n    findNetworkClientIdByChainId: true,\n    getSelectedNetworkClientId: true,\n    getNonEvmSupportedMethods: true,\n    sortAccountIdsByLastSelected: true,\n    handleNonEvmRequestForOrigin: true,\n  },\n} satisfies WalletInvokeMethodHandler;\n"]}

package/dist/handlers/wallet-revokeSession.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walletRevokeSession = void 0;
+exports.walletRevokeSessionHandler = void 0;
 const chain_agnostic_permission_1 = require("@metamask/chain-agnostic-permission");
 const permission_controller_1 = require("@metamask/permission-controller");
 const rpc_errors_1 = require("@metamask/rpc-errors");
@@ -73,7 +73,7 @@ function partialRevokePermissions(scopes, hooks) {
  * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.
  * @returns Nothing.
  */
-async function walletRevokeSessionHandler(request, response, _next, end, hooks) {
+async function handleWalletRevokeSession(request, response, _next, end, hooks) {
     try {
         if (request.params?.scopes?.length) {
             partialRevokePermissions(request.params.scopes, hooks);
@@ -91,9 +91,8 @@ async function walletRevokeSessionHandler(request, response, _next, end, hooks)
     response.result = true;
     return end();
 }
-exports.walletRevokeSession = {
-    methodNames: ['wallet_revokeSession'],
-    implementation: walletRevokeSessionHandler,
+exports.walletRevokeSessionHandler = {
+    implementation: handleWalletRevokeSession,
     hookNames: {
         revokePermissionForOrigin: true,
         updateCaveat: true,

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,mFAK6C;AAK7C,2EAIyC;AACzC,qDAAiD;AACjD,2CAA2C;AAK3C;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,KAAc;IACvC,IACE,CAAC,IAAA,gBAAQ,EAAC,KAAK,CAAC;QAChB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;QAClB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,gDAAwB,CAAC,IAAI;QAC7B,mDAA2B,CAAC,IAAI;KACjC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,wBAAwB,CAC/B,MAAgB,EAChB,KAA+B;IAE/B,IAAI,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,CAC/C,yDAA6B,EAC7B,4CAAgB,CACjB,CAAC,KAAK,CAAC;IAER,KAAK,MAAM,WAAW,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,gDAAoB,CAAC,4CAAgB,CAAC,CAAC,WAAW,CAC/D,kBAAkB,EAClB,WAAW,CACZ,CAAC;QAEF,0HAA0H;QAC1H,IAAI,MAAM,CAAC,SAAS,KAAK,8CAAsB,CAAC,IAAI,EAAE,CAAC;YACrD,SAAS;QACX,CAAC;QAED,kBAAkB,GAAG,MAAM,EAAE,KAAK,IAAI;YACpC,cAAc,EAAE,EAAE;YAClB,cAAc,EAAE,EAAE;YAClB,iBAAiB,EAAE,EAAE;YACrB,kBAAkB,EAAE,IAAI;SACzB,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAClB,IAAA,kEAAsC,EAAC,kBAAkB,CAAC,CAAC;IAE7D,+EAA+E;IAC/E,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,CAAC,yBAAyB,CAAC,yDAA6B,CAAC,CAAC;IACjE,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,YAAY,CAChB,yDAA6B,EAC7B,4CAAgB,EAChB,kBAAkB,CACnB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,KAAK,UAAU,0BAA0B,CACvC,OAGC,EACD,QAAwB,EACxB,KAAgC,EAChC,GAA6B,EAC7B,KAA+B;IAE/B,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YACnC,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,yBAAyB,CAAC,yDAA6B,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,GAAG,CAAC,sBAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;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;QAC/B,YAAY,EAAE,IAAI;QAClB,kBAAkB,EAAE,IAAI;KACzB;CACF,CAAC","sourcesContent":["import {\n  Caip25CaveatMutators,\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  getCaipAccountIdsFromCaip25CaveatValue,\n} from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n} from '@metamask/json-rpc-engine';\nimport {\n  CaveatMutatorOperation,\n  PermissionDoesNotExistError,\n  UnrecognizedSubjectError,\n} from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport { isObject } from '@metamask/utils';\nimport type { JsonRpcSuccess, JsonRpcRequest } from '@metamask/utils';\n\nimport type { WalletRevokeSessionHooks } from './types';\n\n/**\n * Check whether the given error is a permission error.\n *\n * @param error - The error to check.\n * @returns Whether the error is a permission error.\n */\nfunction isPermissionError(error: unknown) {\n  if (\n    !isObject(error) ||\n    !('name' in error) ||\n    typeof error.name !== 'string'\n  ) {\n    return false;\n  }\n\n  return [\n    UnrecognizedSubjectError.name,\n    PermissionDoesNotExistError.name,\n  ].includes(error.name);\n}\n\n/**\n * Revokes specific session scopes from an existing caveat.\n * Fully revokes permission if no accounts remain permitted after iterating through scopes.\n *\n * @param scopes - Array of scope strings to remove from the caveat.\n * @param hooks - The hooks object.\n * @param hooks.revokePermissionForOrigin - The hook for revoking a permission for an origin function.\n * @param hooks.updateCaveat - The hook used to conditionally update the caveat rather than fully revoke the permission.\n * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.\n */\nfunction partialRevokePermissions(\n  scopes: string[],\n  hooks: WalletRevokeSessionHooks,\n) {\n  let updatedCaveatValue = hooks.getCaveatForOrigin(\n    Caip25EndowmentPermissionName,\n    Caip25CaveatType,\n  ).value;\n\n  for (const scopeString of scopes) {\n    const result = Caip25CaveatMutators[Caip25CaveatType].removeScope(\n      updatedCaveatValue,\n      scopeString,\n    );\n\n    // If operation is a Noop, it means a scope was passed that was not present in the permission, so we proceed with the loop\n    if (result.operation === CaveatMutatorOperation.Noop) {\n      continue;\n    }\n\n    updatedCaveatValue = result?.value ?? {\n      requiredScopes: {},\n      optionalScopes: {},\n      sessionProperties: {},\n      isMultichainOrigin: true,\n    };\n  }\n\n  const caipAccountIds =\n    getCaipAccountIdsFromCaip25CaveatValue(updatedCaveatValue);\n\n  // We fully revoke permission if no accounts are left after scope removal loop.\n  if (!caipAccountIds.length) {\n    hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n  } else {\n    hooks.updateCaveat(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n      updatedCaveatValue,\n    );\n  }\n}\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 * @param hooks.updateCaveat - The hook used to conditionally update the caveat rather than fully revoke the permission.\n * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.\n * @returns Nothing.\n */\nasync function walletRevokeSessionHandler(\n  request: JsonRpcRequest & {\n    origin: string;\n    params: { scopes?: string[] };\n  },\n  response: JsonRpcSuccess,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: WalletRevokeSessionHooks,\n) {\n  try {\n    if (request.params?.scopes?.length) {\n      partialRevokePermissions(request.params.scopes, hooks);\n    } else {\n      hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n    }\n  } catch (err) {\n    if (!isPermissionError(err)) {\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    updateCaveat: true,\n    getCaveatForOrigin: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-revokeSession.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":";;;AAAA,mFAK6C;AAO7C,2EAIyC;AAEzC,qDAAiD;AACjD,2CAA2C;AAsB3C;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,KAAc;IACvC,IACE,CAAC,IAAA,gBAAQ,EAAC,KAAK,CAAC;QAChB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;QAClB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,gDAAwB,CAAC,IAAI;QAC7B,mDAA2B,CAAC,IAAI;KACjC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,wBAAwB,CAC/B,MAAgB,EAChB,KAA+B;IAE/B,IAAI,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,CAC/C,yDAA6B,EAC7B,4CAAgB,CACjB,CAAC,KAAK,CAAC;IAER,KAAK,MAAM,WAAW,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,gDAAoB,CAAC,4CAAgB,CAAC,CAAC,WAAW,CAC/D,kBAAkB,EAClB,WAAW,CACZ,CAAC;QAEF,0HAA0H;QAC1H,IAAI,MAAM,CAAC,SAAS,KAAK,8CAAsB,CAAC,IAAI,EAAE,CAAC;YACrD,SAAS;QACX,CAAC;QAED,kBAAkB,GAAG,MAAM,EAAE,KAAK,IAAI;YACpC,cAAc,EAAE,EAAE;YAClB,cAAc,EAAE,EAAE;YAClB,iBAAiB,EAAE,EAAE;YACrB,kBAAkB,EAAE,IAAI;SACzB,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAClB,IAAA,kEAAsC,EAAC,kBAAkB,CAAC,CAAC;IAE7D,+EAA+E;IAC/E,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAC3B,KAAK,CAAC,yBAAyB,CAAC,yDAA6B,CAAC,CAAC;IACjE,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,YAAY,CAChB,yDAA6B,EAC7B,4CAAgB,EAChB,kBAAkB,CACnB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,KAAK,UAAU,yBAAyB,CACtC,OAAuE,EACvE,QAAsC,EACtC,KAAgC,EAChC,GAA6B,EAC7B,KAA+B;IAE/B,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YACnC,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,yBAAyB,CAAC,yDAA6B,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,GAAG,CAAC,sBAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AAUY,QAAA,0BAA0B,GAAG;IACxC,cAAc,EAAE,yBAAyB;IACzC,SAAS,EAAE;QACT,yBAAyB,EAAE,IAAI;QAC/B,YAAY,EAAE,IAAI;QAClB,kBAAkB,EAAE,IAAI;KACzB;CACmC,CAAC","sourcesContent":["import {\n  Caip25CaveatMutators,\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  getCaipAccountIdsFromCaip25CaveatValue,\n} from '@metamask/chain-agnostic-permission';\nimport type { Caip25CaveatValue } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n  MethodHandler,\n} from '@metamask/json-rpc-engine';\nimport {\n  CaveatMutatorOperation,\n  PermissionDoesNotExistError,\n  UnrecognizedSubjectError,\n} from '@metamask/permission-controller';\nimport type { Caveat } from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport { isObject } from '@metamask/utils';\nimport type {\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nexport type WalletRevokeSessionHooks = {\n  revokePermissionForOrigin: (permissionName: string) => void;\n  updateCaveat: (\n    target: string,\n    caveatType: string,\n    caveatValue: Caip25CaveatValue,\n  ) => void;\n  getCaveatForOrigin: (\n    endowmentPermissionName: string,\n    caveatType: string,\n  ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n};\n\ntype WalletRevokeSessionParams = { scopes?: string[] };\n\n/**\n * Check whether the given error is a permission error.\n *\n * @param error - The error to check.\n * @returns Whether the error is a permission error.\n */\nfunction isPermissionError(error: unknown) {\n  if (\n    !isObject(error) ||\n    !('name' in error) ||\n    typeof error.name !== 'string'\n  ) {\n    return false;\n  }\n\n  return [\n    UnrecognizedSubjectError.name,\n    PermissionDoesNotExistError.name,\n  ].includes(error.name);\n}\n\n/**\n * Revokes specific session scopes from an existing caveat.\n * Fully revokes permission if no accounts remain permitted after iterating through scopes.\n *\n * @param scopes - Array of scope strings to remove from the caveat.\n * @param hooks - The hooks object.\n * @param hooks.revokePermissionForOrigin - The hook for revoking a permission for an origin function.\n * @param hooks.updateCaveat - The hook used to conditionally update the caveat rather than fully revoke the permission.\n * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.\n */\nfunction partialRevokePermissions(\n  scopes: string[],\n  hooks: WalletRevokeSessionHooks,\n) {\n  let updatedCaveatValue = hooks.getCaveatForOrigin(\n    Caip25EndowmentPermissionName,\n    Caip25CaveatType,\n  ).value;\n\n  for (const scopeString of scopes) {\n    const result = Caip25CaveatMutators[Caip25CaveatType].removeScope(\n      updatedCaveatValue,\n      scopeString,\n    );\n\n    // If operation is a Noop, it means a scope was passed that was not present in the permission, so we proceed with the loop\n    if (result.operation === CaveatMutatorOperation.Noop) {\n      continue;\n    }\n\n    updatedCaveatValue = result?.value ?? {\n      requiredScopes: {},\n      optionalScopes: {},\n      sessionProperties: {},\n      isMultichainOrigin: true,\n    };\n  }\n\n  const caipAccountIds =\n    getCaipAccountIdsFromCaip25CaveatValue(updatedCaveatValue);\n\n  // We fully revoke permission if no accounts are left after scope removal loop.\n  if (!caipAccountIds.length) {\n    hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n  } else {\n    hooks.updateCaveat(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n      updatedCaveatValue,\n    );\n  }\n}\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 * @param hooks.updateCaveat - The hook used to conditionally update the caveat rather than fully revoke the permission.\n * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.\n * @returns Nothing.\n */\nasync function handleWalletRevokeSession(\n  request: JsonRpcRequest<WalletRevokeSessionParams> & { origin: string },\n  response: PendingJsonRpcResponse<Json>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: WalletRevokeSessionHooks,\n) {\n  try {\n    if (request.params?.scopes?.length) {\n      partialRevokePermissions(request.params.scopes, hooks);\n    } else {\n      hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n    }\n  } catch (err) {\n    if (!isPermissionError(err)) {\n      console.error(err);\n      return end(rpcErrors.internal());\n    }\n  }\n\n  response.result = true;\n  return end();\n}\n\nexport type WalletRevokeSessionHandler = MethodHandler<\n  WalletRevokeSessionHooks,\n  never,\n  WalletRevokeSessionParams,\n  Json,\n  { origin: string }\n>;\n\nexport const walletRevokeSessionHandler = {\n  implementation: handleWalletRevokeSession,\n  hookNames: {\n    revokePermissionForOrigin: true,\n    updateCaveat: true,\n    getCaveatForOrigin: true,\n  },\n} satisfies WalletRevokeSessionHandler;\n"]}

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

@@ -1,6 +1,16 @@
-import type { JsonRpcEngineNextCallback, JsonRpcEngineEndCallback } from "@metamask/json-rpc-engine";
-import type { JsonRpcSuccess, JsonRpcRequest } from "@metamask/utils";
-import type { WalletRevokeSessionHooks } from "./types.cjs";
+import { Caip25CaveatType } from "@metamask/chain-agnostic-permission";
+import type { Caip25CaveatValue } from "@metamask/chain-agnostic-permission";
+import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, MethodHandler } from "@metamask/json-rpc-engine";
+import type { Caveat } from "@metamask/permission-controller";
+import type { Json, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
+export type WalletRevokeSessionHooks = {
+    revokePermissionForOrigin: (permissionName: string) => void;
+    updateCaveat: (target: string, caveatType: string, caveatValue: Caip25CaveatValue) => void;
+    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
+};
+type WalletRevokeSessionParams = {
+    scopes?: string[];
+};
 /**
  * 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
@@ -18,19 +28,18 @@ import type { WalletRevokeSessionHooks } from "./types.cjs";
  * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.
  * @returns Nothing.
  */
-declare function walletRevokeSessionHandler(request: JsonRpcRequest & {
+declare function handleWalletRevokeSession(request: JsonRpcRequest<WalletRevokeSessionParams> & {
     origin: string;
-    params: {
-        scopes?: string[];
-    };
-}, response: JsonRpcSuccess, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: WalletRevokeSessionHooks): Promise<void>;
-export declare const walletRevokeSession: {
-    methodNames: string[];
-    implementation: typeof walletRevokeSessionHandler;
+}, response: PendingJsonRpcResponse<Json>, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: WalletRevokeSessionHooks): Promise<void>;
+export type WalletRevokeSessionHandler = MethodHandler<WalletRevokeSessionHooks, never, WalletRevokeSessionParams, Json, {
+    origin: string;
+}>;
+export declare const walletRevokeSessionHandler: {
+    implementation: typeof handleWalletRevokeSession;
     hookNames: {
-        revokePermissionForOrigin: boolean;
-        updateCaveat: boolean;
-        getCaveatForOrigin: boolean;
+        revokePermissionForOrigin: true;
+        updateCaveat: true;
+        getCaveatForOrigin: true;
     };
 };
 export {};

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":"AAMA,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACzB,kCAAkC;AAQnC,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,wBAAwB;AAEtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAgB;AA4ExD;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAe,0BAA0B,CACvC,OAAO,EAAE,cAAc,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC/B,EACD,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,wBAAwB,iBAiBhC;AACD,eAAO,MAAM,mBAAmB;;;;;;;;CAQ/B,CAAC"}
+{"version":3,"file":"wallet-revokeSession.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAGjB,4CAA4C;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,4CAA4C;AAC7E,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EACzB,aAAa,EACd,kCAAkC;AAMnC,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAG9D,OAAO,KAAK,EACV,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAEzB,MAAM,MAAM,wBAAwB,GAAG;IACrC,yBAAyB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,YAAY,EAAE,CACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,iBAAiB,KAC3B,IAAI,CAAC;IACV,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;CACzD,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AA4EvD;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAe,yBAAyB,CACtC,OAAO,EAAE,cAAc,CAAC,yBAAyB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EACvE,QAAQ,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACtC,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,wBAAwB,iBAiBhC;AAED,MAAM,MAAM,0BAA0B,GAAG,aAAa,CACpD,wBAAwB,EACxB,KAAK,EACL,yBAAyB,EACzB,IAAI,EACJ;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CACnB,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;;;;;CAOD,CAAC"}

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

@@ -1,6 +1,16 @@
-import type { JsonRpcEngineNextCallback, JsonRpcEngineEndCallback } from "@metamask/json-rpc-engine";
-import type { JsonRpcSuccess, JsonRpcRequest } from "@metamask/utils";
-import type { WalletRevokeSessionHooks } from "./types.mjs";
+import { Caip25CaveatType } from "@metamask/chain-agnostic-permission";
+import type { Caip25CaveatValue } from "@metamask/chain-agnostic-permission";
+import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, MethodHandler } from "@metamask/json-rpc-engine";
+import type { Caveat } from "@metamask/permission-controller";
+import type { Json, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
+export type WalletRevokeSessionHooks = {
+    revokePermissionForOrigin: (permissionName: string) => void;
+    updateCaveat: (target: string, caveatType: string, caveatValue: Caip25CaveatValue) => void;
+    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
+};
+type WalletRevokeSessionParams = {
+    scopes?: string[];
+};
 /**
  * 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
@@ -18,19 +28,18 @@ import type { WalletRevokeSessionHooks } from "./types.mjs";
  * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.
  * @returns Nothing.
  */
-declare function walletRevokeSessionHandler(request: JsonRpcRequest & {
+declare function handleWalletRevokeSession(request: JsonRpcRequest<WalletRevokeSessionParams> & {
     origin: string;
-    params: {
-        scopes?: string[];
-    };
-}, response: JsonRpcSuccess, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: WalletRevokeSessionHooks): Promise<void>;
-export declare const walletRevokeSession: {
-    methodNames: string[];
-    implementation: typeof walletRevokeSessionHandler;
+}, response: PendingJsonRpcResponse<Json>, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: WalletRevokeSessionHooks): Promise<void>;
+export type WalletRevokeSessionHandler = MethodHandler<WalletRevokeSessionHooks, never, WalletRevokeSessionParams, Json, {
+    origin: string;
+}>;
+export declare const walletRevokeSessionHandler: {
+    implementation: typeof handleWalletRevokeSession;
     hookNames: {
-        revokePermissionForOrigin: boolean;
-        updateCaveat: boolean;
-        getCaveatForOrigin: boolean;
+        revokePermissionForOrigin: true;
+        updateCaveat: true;
+        getCaveatForOrigin: true;
     };
 };
 export {};

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":"AAMA,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACzB,kCAAkC;AAQnC,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,wBAAwB;AAEtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAgB;AA4ExD;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAe,0BAA0B,CACvC,OAAO,EAAE,cAAc,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC/B,EACD,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,wBAAwB,iBAiBhC;AACD,eAAO,MAAM,mBAAmB;;;;;;;;CAQ/B,CAAC"}
+{"version":3,"file":"wallet-revokeSession.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAGjB,4CAA4C;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,4CAA4C;AAC7E,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EACzB,aAAa,EACd,kCAAkC;AAMnC,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAG9D,OAAO,KAAK,EACV,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAEzB,MAAM,MAAM,wBAAwB,GAAG;IACrC,yBAAyB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,YAAY,EAAE,CACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,iBAAiB,KAC3B,IAAI,CAAC;IACV,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;CACzD,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AA4EvD;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAe,yBAAyB,CACtC,OAAO,EAAE,cAAc,CAAC,yBAAyB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EACvE,QAAQ,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACtC,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,wBAAwB,iBAiBhC;AAED,MAAM,MAAM,0BAA0B,GAAG,aAAa,CACpD,wBAAwB,EACxB,KAAK,EACL,yBAAyB,EACzB,IAAI,EACJ;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CACnB,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;;;;;CAOD,CAAC"}

package/dist/handlers/wallet-revokeSession.mjs

@@ -70,7 +70,7 @@ function partialRevokePermissions(scopes, hooks) {
  * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.
  * @returns Nothing.
  */
-async function walletRevokeSessionHandler(request, response, _next, end, hooks) {
+async function handleWalletRevokeSession(request, response, _next, end, hooks) {
     try {
         if (request.params?.scopes?.length) {
             partialRevokePermissions(request.params.scopes, hooks);
@@ -88,9 +88,8 @@ async function walletRevokeSessionHandler(request, response, _next, end, hooks)
     response.result = true;
     return end();
 }
-export const walletRevokeSession = {
-    methodNames: ['wallet_revokeSession'],
-    implementation: walletRevokeSessionHandler,
+export const walletRevokeSessionHandler = {
+    implementation: handleWalletRevokeSession,
     hookNames: {
         revokePermissionForOrigin: true,
         updateCaveat: true,

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

@@ -1 +1 @@
-{"version":3,"file":"wallet-revokeSession.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Caip25CaveatMutators,\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  getCaipAccountIdsFromCaip25CaveatValue,\n} from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineNextCallback,\n  JsonRpcEngineEndCallback,\n} from '@metamask/json-rpc-engine';\nimport {\n  CaveatMutatorOperation,\n  PermissionDoesNotExistError,\n  UnrecognizedSubjectError,\n} from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport { isObject } from '@metamask/utils';\nimport type { JsonRpcSuccess, JsonRpcRequest } from '@metamask/utils';\n\nimport type { WalletRevokeSessionHooks } from './types';\n\n/**\n * Check whether the given error is a permission error.\n *\n * @param error - The error to check.\n * @returns Whether the error is a permission error.\n */\nfunction isPermissionError(error: unknown) {\n  if (\n    !isObject(error) ||\n    !('name' in error) ||\n    typeof error.name !== 'string'\n  ) {\n    return false;\n  }\n\n  return [\n    UnrecognizedSubjectError.name,\n    PermissionDoesNotExistError.name,\n  ].includes(error.name);\n}\n\n/**\n * Revokes specific session scopes from an existing caveat.\n * Fully revokes permission if no accounts remain permitted after iterating through scopes.\n *\n * @param scopes - Array of scope strings to remove from the caveat.\n * @param hooks - The hooks object.\n * @param hooks.revokePermissionForOrigin - The hook for revoking a permission for an origin function.\n * @param hooks.updateCaveat - The hook used to conditionally update the caveat rather than fully revoke the permission.\n * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.\n */\nfunction partialRevokePermissions(\n  scopes: string[],\n  hooks: WalletRevokeSessionHooks,\n) {\n  let updatedCaveatValue = hooks.getCaveatForOrigin(\n    Caip25EndowmentPermissionName,\n    Caip25CaveatType,\n  ).value;\n\n  for (const scopeString of scopes) {\n    const result = Caip25CaveatMutators[Caip25CaveatType].removeScope(\n      updatedCaveatValue,\n      scopeString,\n    );\n\n    // If operation is a Noop, it means a scope was passed that was not present in the permission, so we proceed with the loop\n    if (result.operation === CaveatMutatorOperation.Noop) {\n      continue;\n    }\n\n    updatedCaveatValue = result?.value ?? {\n      requiredScopes: {},\n      optionalScopes: {},\n      sessionProperties: {},\n      isMultichainOrigin: true,\n    };\n  }\n\n  const caipAccountIds =\n    getCaipAccountIdsFromCaip25CaveatValue(updatedCaveatValue);\n\n  // We fully revoke permission if no accounts are left after scope removal loop.\n  if (!caipAccountIds.length) {\n    hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n  } else {\n    hooks.updateCaveat(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n      updatedCaveatValue,\n    );\n  }\n}\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 * @param hooks.updateCaveat - The hook used to conditionally update the caveat rather than fully revoke the permission.\n * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.\n * @returns Nothing.\n */\nasync function walletRevokeSessionHandler(\n  request: JsonRpcRequest & {\n    origin: string;\n    params: { scopes?: string[] };\n  },\n  response: JsonRpcSuccess,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: WalletRevokeSessionHooks,\n) {\n  try {\n    if (request.params?.scopes?.length) {\n      partialRevokePermissions(request.params.scopes, hooks);\n    } else {\n      hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n    }\n  } catch (err) {\n    if (!isPermissionError(err)) {\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    updateCaveat: true,\n    getCaveatForOrigin: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-revokeSession.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-revokeSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Caip25CaveatMutators,\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  getCaipAccountIdsFromCaip25CaveatValue,\n} from '@metamask/chain-agnostic-permission';\nimport type { Caip25CaveatValue } from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n  MethodHandler,\n} from '@metamask/json-rpc-engine';\nimport {\n  CaveatMutatorOperation,\n  PermissionDoesNotExistError,\n  UnrecognizedSubjectError,\n} from '@metamask/permission-controller';\nimport type { Caveat } from '@metamask/permission-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport { isObject } from '@metamask/utils';\nimport type {\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nexport type WalletRevokeSessionHooks = {\n  revokePermissionForOrigin: (permissionName: string) => void;\n  updateCaveat: (\n    target: string,\n    caveatType: string,\n    caveatValue: Caip25CaveatValue,\n  ) => void;\n  getCaveatForOrigin: (\n    endowmentPermissionName: string,\n    caveatType: string,\n  ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n};\n\ntype WalletRevokeSessionParams = { scopes?: string[] };\n\n/**\n * Check whether the given error is a permission error.\n *\n * @param error - The error to check.\n * @returns Whether the error is a permission error.\n */\nfunction isPermissionError(error: unknown) {\n  if (\n    !isObject(error) ||\n    !('name' in error) ||\n    typeof error.name !== 'string'\n  ) {\n    return false;\n  }\n\n  return [\n    UnrecognizedSubjectError.name,\n    PermissionDoesNotExistError.name,\n  ].includes(error.name);\n}\n\n/**\n * Revokes specific session scopes from an existing caveat.\n * Fully revokes permission if no accounts remain permitted after iterating through scopes.\n *\n * @param scopes - Array of scope strings to remove from the caveat.\n * @param hooks - The hooks object.\n * @param hooks.revokePermissionForOrigin - The hook for revoking a permission for an origin function.\n * @param hooks.updateCaveat - The hook used to conditionally update the caveat rather than fully revoke the permission.\n * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.\n */\nfunction partialRevokePermissions(\n  scopes: string[],\n  hooks: WalletRevokeSessionHooks,\n) {\n  let updatedCaveatValue = hooks.getCaveatForOrigin(\n    Caip25EndowmentPermissionName,\n    Caip25CaveatType,\n  ).value;\n\n  for (const scopeString of scopes) {\n    const result = Caip25CaveatMutators[Caip25CaveatType].removeScope(\n      updatedCaveatValue,\n      scopeString,\n    );\n\n    // If operation is a Noop, it means a scope was passed that was not present in the permission, so we proceed with the loop\n    if (result.operation === CaveatMutatorOperation.Noop) {\n      continue;\n    }\n\n    updatedCaveatValue = result?.value ?? {\n      requiredScopes: {},\n      optionalScopes: {},\n      sessionProperties: {},\n      isMultichainOrigin: true,\n    };\n  }\n\n  const caipAccountIds =\n    getCaipAccountIdsFromCaip25CaveatValue(updatedCaveatValue);\n\n  // We fully revoke permission if no accounts are left after scope removal loop.\n  if (!caipAccountIds.length) {\n    hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n  } else {\n    hooks.updateCaveat(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n      updatedCaveatValue,\n    );\n  }\n}\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 * @param hooks.updateCaveat - The hook used to conditionally update the caveat rather than fully revoke the permission.\n * @param hooks.getCaveatForOrigin - The hook to fetch an existing caveat for the origin of the request.\n * @returns Nothing.\n */\nasync function handleWalletRevokeSession(\n  request: JsonRpcRequest<WalletRevokeSessionParams> & { origin: string },\n  response: PendingJsonRpcResponse<Json>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: WalletRevokeSessionHooks,\n) {\n  try {\n    if (request.params?.scopes?.length) {\n      partialRevokePermissions(request.params.scopes, hooks);\n    } else {\n      hooks.revokePermissionForOrigin(Caip25EndowmentPermissionName);\n    }\n  } catch (err) {\n    if (!isPermissionError(err)) {\n      console.error(err);\n      return end(rpcErrors.internal());\n    }\n  }\n\n  response.result = true;\n  return end();\n}\n\nexport type WalletRevokeSessionHandler = MethodHandler<\n  WalletRevokeSessionHooks,\n  never,\n  WalletRevokeSessionParams,\n  Json,\n  { origin: string }\n>;\n\nexport const walletRevokeSessionHandler = {\n  implementation: handleWalletRevokeSession,\n  hookNames: {\n    revokePermissionForOrigin: true,\n    updateCaveat: true,\n    getCaveatForOrigin: true,\n  },\n} satisfies WalletRevokeSessionHandler;\n"]}

package/dist/index.cjs

@@ -1,14 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultichainApiNotifications = exports.MultichainSubscriptionManager = exports.MultichainMiddlewareManager = exports.multichainMethodCallValidatorMiddleware = exports.walletRevokeSession = exports.walletInvokeMethod = exports.walletGetSession = exports.walletCreateSession = void 0;
-var wallet_createSession_1 = require("./handlers/wallet-createSession.cjs");
-Object.defineProperty(exports, "walletCreateSession", { enumerable: true, get: function () { return wallet_createSession_1.walletCreateSession; } });
-var wallet_getSession_1 = require("./handlers/wallet-getSession.cjs");
-Object.defineProperty(exports, "walletGetSession", { enumerable: true, get: function () { return wallet_getSession_1.walletGetSession; } });
-var wallet_invokeMethod_1 = require("./handlers/wallet-invokeMethod.cjs");
-Object.defineProperty(exports, "walletInvokeMethod", { enumerable: true, get: function () { return wallet_invokeMethod_1.walletInvokeMethod; } });
-var wallet_revokeSession_1 = require("./handlers/wallet-revokeSession.cjs");
-Object.defineProperty(exports, "walletRevokeSession", { enumerable: true, get: function () { return wallet_revokeSession_1.walletRevokeSession; } });
+exports.MultichainApiNotifications = exports.MultichainSubscriptionManager = exports.MultichainMiddlewareManager = exports.multichainMethodCallValidatorMiddleware = exports.methodHandlers = void 0;
+var handlers_1 = require("./handlers/index.cjs");
+Object.defineProperty(exports, "methodHandlers", { enumerable: true, get: function () { return handlers_1.methodHandlers; } });
 var multichainMethodCallValidatorMiddleware_1 = require("./middlewares/multichainMethodCallValidatorMiddleware.cjs");
 Object.defineProperty(exports, "multichainMethodCallValidatorMiddleware", { enumerable: true, get: function () { return multichainMethodCallValidatorMiddleware_1.multichainMethodCallValidatorMiddleware; } });
 var MultichainMiddlewareManager_1 = require("./middlewares/MultichainMiddlewareManager.cjs");

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,4EAAsE;AAA7D,2HAAA,mBAAmB,OAAA;AAC5B,sEAAgE;AAAvD,qHAAA,gBAAgB,OAAA;AACzB,0EAAoE;AAA3D,yHAAA,kBAAkB,OAAA;AAC3B,4EAAsE;AAA7D,2HAAA,mBAAmB,OAAA;AAE5B,qHAAgH;AAAvG,kKAAA,uCAAuC,OAAA;AAChD,6FAAwF;AAA/E,0IAAA,2BAA2B,OAAA;AACpC,iGAA4F;AAAnF,8IAAA,6BAA6B,OAAA;AACtC,8CAA8D;AAArD,mHAAA,0BAA0B,OAAA","sourcesContent":["export { walletCreateSession } from './handlers/wallet-createSession';\nexport { walletGetSession } from './handlers/wallet-getSession';\nexport { walletInvokeMethod } from './handlers/wallet-invokeMethod';\nexport { walletRevokeSession } from './handlers/wallet-revokeSession';\n\nexport { multichainMethodCallValidatorMiddleware } from './middlewares/multichainMethodCallValidatorMiddleware';\nexport { MultichainMiddlewareManager } from './middlewares/MultichainMiddlewareManager';\nexport { MultichainSubscriptionManager } from './middlewares/MultichainSubscriptionManager';\nexport { MultichainApiNotifications } from './handlers/types';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAAnC,0GAAA,cAAc,OAAA;AAEvB,qHAAgH;AAAvG,kKAAA,uCAAuC,OAAA;AAChD,6FAAwF;AAA/E,0IAAA,2BAA2B,OAAA;AACpC,iGAA4F;AAAnF,8IAAA,6BAA6B,OAAA;AACtC,8CAA8D;AAArD,mHAAA,0BAA0B,OAAA","sourcesContent":["export { methodHandlers } from './handlers';\n\nexport { multichainMethodCallValidatorMiddleware } from './middlewares/multichainMethodCallValidatorMiddleware';\nexport { MultichainMiddlewareManager } from './middlewares/MultichainMiddlewareManager';\nexport { MultichainSubscriptionManager } from './middlewares/MultichainSubscriptionManager';\nexport { MultichainApiNotifications } from './handlers/types';\n"]}

package/dist/index.d.cts

@@ -1,7 +1,4 @@
-export { walletCreateSession } from "./handlers/wallet-createSession.cjs";
-export { walletGetSession } from "./handlers/wallet-getSession.cjs";
-export { walletInvokeMethod } from "./handlers/wallet-invokeMethod.cjs";
-export { walletRevokeSession } from "./handlers/wallet-revokeSession.cjs";
+export { methodHandlers } from "./handlers/index.cjs";
 export { multichainMethodCallValidatorMiddleware } from "./middlewares/multichainMethodCallValidatorMiddleware.cjs";
 export { MultichainMiddlewareManager } from "./middlewares/MultichainMiddlewareManager.cjs";
 export { MultichainSubscriptionManager } from "./middlewares/MultichainSubscriptionManager.cjs";

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,4CAAwC;AACtE,OAAO,EAAE,gBAAgB,EAAE,yCAAqC;AAChE,OAAO,EAAE,kBAAkB,EAAE,2CAAuC;AACpE,OAAO,EAAE,mBAAmB,EAAE,4CAAwC;AAEtE,OAAO,EAAE,uCAAuC,EAAE,kEAA8D;AAChH,OAAO,EAAE,2BAA2B,EAAE,sDAAkD;AACxF,OAAO,EAAE,6BAA6B,EAAE,wDAAoD;AAC5F,OAAO,EAAE,0BAA0B,EAAE,6BAAyB"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAmB;AAE5C,OAAO,EAAE,uCAAuC,EAAE,kEAA8D;AAChH,OAAO,EAAE,2BAA2B,EAAE,sDAAkD;AACxF,OAAO,EAAE,6BAA6B,EAAE,wDAAoD;AAC5F,OAAO,EAAE,0BAA0B,EAAE,6BAAyB"}

package/dist/index.d.mts

@@ -1,7 +1,4 @@
-export { walletCreateSession } from "./handlers/wallet-createSession.mjs";
-export { walletGetSession } from "./handlers/wallet-getSession.mjs";
-export { walletInvokeMethod } from "./handlers/wallet-invokeMethod.mjs";
-export { walletRevokeSession } from "./handlers/wallet-revokeSession.mjs";
+export { methodHandlers } from "./handlers/index.mjs";
 export { multichainMethodCallValidatorMiddleware } from "./middlewares/multichainMethodCallValidatorMiddleware.mjs";
 export { MultichainMiddlewareManager } from "./middlewares/MultichainMiddlewareManager.mjs";
 export { MultichainSubscriptionManager } from "./middlewares/MultichainSubscriptionManager.mjs";

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,4CAAwC;AACtE,OAAO,EAAE,gBAAgB,EAAE,yCAAqC;AAChE,OAAO,EAAE,kBAAkB,EAAE,2CAAuC;AACpE,OAAO,EAAE,mBAAmB,EAAE,4CAAwC;AAEtE,OAAO,EAAE,uCAAuC,EAAE,kEAA8D;AAChH,OAAO,EAAE,2BAA2B,EAAE,sDAAkD;AACxF,OAAO,EAAE,6BAA6B,EAAE,wDAAoD;AAC5F,OAAO,EAAE,0BAA0B,EAAE,6BAAyB"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAmB;AAE5C,OAAO,EAAE,uCAAuC,EAAE,kEAA8D;AAChH,OAAO,EAAE,2BAA2B,EAAE,sDAAkD;AACxF,OAAO,EAAE,6BAA6B,EAAE,wDAAoD;AAC5F,OAAO,EAAE,0BAA0B,EAAE,6BAAyB"}

package/dist/index.mjs

@@ -1,7 +1,4 @@
-export { walletCreateSession } from "./handlers/wallet-createSession.mjs";
-export { walletGetSession } from "./handlers/wallet-getSession.mjs";
-export { walletInvokeMethod } from "./handlers/wallet-invokeMethod.mjs";
-export { walletRevokeSession } from "./handlers/wallet-revokeSession.mjs";
+export { methodHandlers } from "./handlers/index.mjs";
 export { multichainMethodCallValidatorMiddleware } from "./middlewares/multichainMethodCallValidatorMiddleware.mjs";
 export { MultichainMiddlewareManager } from "./middlewares/MultichainMiddlewareManager.mjs";
 export { MultichainSubscriptionManager } from "./middlewares/MultichainSubscriptionManager.mjs";

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,4CAAwC;AACtE,OAAO,EAAE,gBAAgB,EAAE,yCAAqC;AAChE,OAAO,EAAE,kBAAkB,EAAE,2CAAuC;AACpE,OAAO,EAAE,mBAAmB,EAAE,4CAAwC;AAEtE,OAAO,EAAE,uCAAuC,EAAE,kEAA8D;AAChH,OAAO,EAAE,2BAA2B,EAAE,sDAAkD;AACxF,OAAO,EAAE,6BAA6B,EAAE,wDAAoD;AAC5F,OAAO,EAAE,0BAA0B,EAAE,6BAAyB","sourcesContent":["export { walletCreateSession } from './handlers/wallet-createSession';\nexport { walletGetSession } from './handlers/wallet-getSession';\nexport { walletInvokeMethod } from './handlers/wallet-invokeMethod';\nexport { walletRevokeSession } from './handlers/wallet-revokeSession';\n\nexport { multichainMethodCallValidatorMiddleware } from './middlewares/multichainMethodCallValidatorMiddleware';\nexport { MultichainMiddlewareManager } from './middlewares/MultichainMiddlewareManager';\nexport { MultichainSubscriptionManager } from './middlewares/MultichainSubscriptionManager';\nexport { MultichainApiNotifications } from './handlers/types';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,6BAAmB;AAE5C,OAAO,EAAE,uCAAuC,EAAE,kEAA8D;AAChH,OAAO,EAAE,2BAA2B,EAAE,sDAAkD;AACxF,OAAO,EAAE,6BAA6B,EAAE,wDAAoD;AAC5F,OAAO,EAAE,0BAA0B,EAAE,6BAAyB","sourcesContent":["export { methodHandlers } from './handlers';\n\nexport { multichainMethodCallValidatorMiddleware } from './middlewares/multichainMethodCallValidatorMiddleware';\nexport { MultichainMiddlewareManager } from './middlewares/MultichainMiddlewareManager';\nexport { MultichainSubscriptionManager } from './middlewares/MultichainSubscriptionManager';\nexport { MultichainApiNotifications } from './handlers/types';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/multichain-api-middleware",
-  "version": "2.0.0-preview-d23d9dc44",
+  "version": "2.0.0-preview-a1caffc9c",
   "description": "JSON-RPC methods and middleware to support the MetaMask Multichain API",
   "keywords": [
     "Ethereum",
@@ -55,7 +55,7 @@
     "@metamask/chain-agnostic-permission": "^1.5.0",
     "@metamask/controller-utils": "^11.20.0",
     "@metamask/json-rpc-engine": "^10.2.4",
-    "@metamask/network-controller": "^30.1.0",
+    "@metamask/network-controller": "^30.0.1",
     "@metamask/permission-controller": "^12.3.0",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/utils": "^11.9.0",