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

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  getInternalScopesObject,\n  getSessionScopes,\n  getSupportedScopeObjects,\n  isKnownSessionPropertyValue,\n  getCaipAccountIdsFromScopesObjects,\n  getAllScopesFromScopesObjects,\n  setNonSCACaipAccountIdsInCaip25CaveatValue,\n  isNamespaceInScopesObject,\n} from '@metamask/chain-agnostic-permission';\nimport type {\n  Caip25Authorization,\n  NormalizedScopesObject,\n  Caip25CaveatValue,\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 { invalidParams } from '@metamask/permission-controller';\nimport type { RequestedPermissions } from '@metamask/permission-controller';\nimport { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport {\n  isPlainObject,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  Hex,\n  Json,\n  JsonRpcRequest,\n  JsonRpcSuccess,\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.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by last selected.\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    sortAccountIdsByLastSelected: (\n      accounts: CaipAccountId[],\n    ) => 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      sortAccountIdsByLastSelected: hooks.sortAccountIdsByLastSelected,\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    sortAccountIdsByLastSelected: 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,EAC1B,uBAAuB,EACvB,gBAAgB,EAChB,wBAAwB,EACxB,2BAA2B,EAC3B,kCAAkC,EAClC,6BAA6B,EAC7B,0CAA0C,EAC1C,yBAAyB,EAC1B,4CAA4C;AAM7C,OAAO,EAAE,sBAAsB,EAAE,mCAAmC;AAOpE,OAAO,EAAE,aAAa,EAAE,wCAAwC;AAEhE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,6BAA6B;AAC/D,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EACnB,wBAAwB;AAYzB,MAAM,oBAAoB,GAAG,yCAAyC,CAAC;AAyBvE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,KAAK,UAAU,yBAAyB,CACtC,GAAgD,EAChD,GAAmC,EACnC,KAAgC,EAChC,GAA6B,EAC7B,KAA+B;IAE/B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IACxD,CAAC;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,CAAC;QACrE,OAAO,GAAG,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,qCAAqC,CAAC,CAAC,CAAC;IAC5E,CAAC;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,CAAC;QACH,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,CAAC;gBACH,KAAK,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;gBAC5C,OAAO,IAAI,CAAC;YACd,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,KAAK,CAAC;YACf,CAAC;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,CAAC;YACtB,MAAM,uBAAuB,GAC3B,KAAK,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAC;YACxD,2BAA2B,GAAG,uBAAuB,CAAC,MAAM,KAAK,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,EAAE,eAAe,EAAE,uBAAuB,EAAE,GAAG,YAAY,CAC/D,kDAAkD,EAClD;YACE,qBAAqB,EAAE,6BAA6B;YACpD,uBAAuB,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,0DAA0D;YAChG,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,EAAE,0DAA0D;YAChG,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,CAAC;gBACvD,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAAE,EAAE;oBACtD,OAAO,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;YACL,CAAC;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,CAAC;YACnD,IAAI,2BAA2B,EAAE,CAAC;gBAChC,+CAA+C,CAAC,cAAc,CAC5D,kBAAkB,CAAC,MAAM,CAC1B,GAAG;oBACF,QAAQ,EAAE,EAAE;iBACb,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,mFAAmF;gBACnF,OAAO,GAAG,CACR,IAAI,YAAY,CAAC,IAAI,EAAE,oCAAoC,CAAC,CAC7D,CAAC;YACJ,CAAC;QACH,CAAC;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,CAAC;YAC/B,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC7B,CAAC;QAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,yBAAyB,EAAE;YAChE,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;YAC1D,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;SACjE,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;IACf,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAUD,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,cAAc,EAAE,yBAAyB;IACzC,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,4BAA4B,EAAE,IAAI;QAClC,wBAAwB,EAAE,IAAI;KAC/B;CACmC,CAAC","sourcesContent":["import {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  bucketScopes,\n  validateAndNormalizeScopes,\n  getInternalScopesObject,\n  getSessionScopes,\n  getSupportedScopeObjects,\n  isKnownSessionPropertyValue,\n  getCaipAccountIdsFromScopesObjects,\n  getAllScopesFromScopesObjects,\n  setNonSCACaipAccountIdsInCaip25CaveatValue,\n  isNamespaceInScopesObject,\n} from '@metamask/chain-agnostic-permission';\nimport type {\n  Caip25Authorization,\n  NormalizedScopesObject,\n  Caip25CaveatValue,\n} from '@metamask/chain-agnostic-permission';\nimport { isEqualCaseInsensitive } from '@metamask/controller-utils';\nimport type {\n  MethodHandler,\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n} from '@metamask/json-rpc-engine';\nimport type { NetworkController } from '@metamask/network-controller';\nimport { invalidParams } from '@metamask/permission-controller';\nimport type { RequestedPermissions } from '@metamask/permission-controller';\nimport { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport {\n  isPlainObject,\n  KnownCaipNamespace,\n  parseCaipAccountId,\n} from '@metamask/utils';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  Hex,\n  Json,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nimport type { GrantedPermissions } from './types';\n\nconst SOLANA_CAIP_CHAIN_ID = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';\n\nexport type WalletCreateSessionHooks = {\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  sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];\n  trackSessionCreatedEvent:\n    | ((approvedCaip25CaveatValue: Caip25CaveatValue) => void)\n    | null;\n};\n\ntype Params = Caip25Authorization;\n\ntype Result = {\n  sessionScopes: NormalizedScopesObject;\n  sessionProperties?: Record<string, Json>;\n};\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.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by last selected.\n * @param hooks.trackSessionCreatedEvent - An optional hook for platform specific logic to run.\n * @returns A promise with wallet_createSession handler\n */\nasync function handleWalletCreateSession(\n  req: JsonRpcRequest<Params> & { origin: string },\n  res: PendingJsonRpcResponse<Result>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: WalletCreateSessionHooks,\n): Promise<void> {\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      sortAccountIdsByLastSelected: hooks.sortAccountIdsByLastSelected,\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 type WalletCreateSessionHandler = MethodHandler<\n  WalletCreateSessionHooks,\n  never,\n  Params,\n  Result,\n  { origin: string }\n>;\n\nexport const walletCreateSessionHandler = {\n  implementation: handleWalletCreateSession,\n  hookNames: {\n    findNetworkClientIdByChainId: true,\n    listAccounts: true,\n    requestPermissionsForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    isNonEvmScopeSupported: true,\n    getNonEvmAccountAddresses: true,\n    sortAccountIdsByLastSelected: true,\n    trackSessionCreatedEvent: true,\n  },\n} satisfies WalletCreateSessionHandler;\n"]}

package/dist/handlers/wallet-getSession.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walletGetSession = void 0;
+exports.walletGetSessionHandler = void 0;
 const chain_agnostic_permission_1 = require("@metamask/chain-agnostic-permission");
 /**
  * Handler for the `wallet_getSession` RPC method as specified by [CAIP-312](https://chainagnostic.org/CAIPs/caip-312).
@@ -18,7 +18,7 @@ const chain_agnostic_permission_1 = require("@metamask/chain-agnostic-permission
  * @param hooks.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by corresponding last selected account in the wallet.
  * @returns Nothing.
  */
-async function walletGetSessionHandler(_request, response, _next, end, hooks) {
+async function handleWalletGetSession(_request, response, _next, end, hooks) {
     let caveat;
     try {
         caveat = hooks.getCaveatForOrigin(chain_agnostic_permission_1.Caip25EndowmentPermissionName, chain_agnostic_permission_1.Caip25CaveatType);
@@ -38,9 +38,8 @@ async function walletGetSessionHandler(_request, response, _next, end, hooks) {
     };
     return end();
 }
-exports.walletGetSession = {
-    methodNames: ['wallet_getSession'],
-    implementation: walletGetSessionHandler,
+exports.walletGetSessionHandler = {
+    implementation: handleWalletGetSession,
     hookNames: {
         getCaveatForOrigin: true,
         getNonEvmSupportedMethods: true,

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

@@ -1 +1 @@
-{"version":3,"file":"wallet-getSession.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-getSession.ts"],"names":[],"mappings":";;;AAIA,mFAI6C;AAS7C;;;;;;;;;;;;;;;GAeG;AACH,KAAK,UAAU,uBAAuB,CACpC,QAA6C,EAC7C,QAAmE,EACnE,KAAiB,EACjB,GAAe,EACf,KASC;IAED,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAC/B,yDAA6B,EAC7B,4CAAgB,CACjB,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,QAAQ,CAAC,MAAM,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;QACxC,OAAO,GAAG,EAAE,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,MAAM,GAAG;QAChB,aAAa,EAAE,IAAA,4CAAgB,EAAC,MAAM,CAAC,KAAK,EAAE;YAC5C,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;YAC1D,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;SACjE,CAAC;KACH,CAAC;IACF,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AAEY,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,mBAAmB,CAAC;IAClC,cAAc,EAAE,uBAAuB;IACvC,SAAS,EAAE;QACT,kBAAkB,EAAE,IAAI;QACxB,yBAAyB,EAAE,IAAI;QAC/B,4BAA4B,EAAE,IAAI;KACnC;CACF,CAAC","sourcesContent":["import type {\n  Caip25CaveatValue,\n  NormalizedScopesObject,\n} from '@metamask/chain-agnostic-permission';\nimport {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  getSessionScopes,\n} from '@metamask/chain-agnostic-permission';\nimport type { Caveat } from '@metamask/permission-controller';\nimport type { CaipAccountId } from '@metamask/utils';\nimport type {\n  CaipChainId,\n  JsonRpcRequest,\n  JsonRpcSuccess,\n} from '@metamask/utils';\n\n/**\n * Handler for the `wallet_getSession` RPC method as specified by [CAIP-312](https://chainagnostic.org/CAIPs/caip-312).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param entirely,\n * and that an empty object is returned for the `sessionScopes` result rather than throwing an error if there\n * is no active session for the origin.\n *\n * @param _request - The request object.\n * @param response - The response object.\n * @param _next - The next middleware function. Unused.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.getCaveatForOrigin - Function to retrieve a caveat for the origin.\n * @param hooks.getNonEvmSupportedMethods - A function that returns the supported methods for a non EVM scope.\n * @param hooks.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by corresponding last selected account in the wallet.\n * @returns Nothing.\n */\nasync function walletGetSessionHandler(\n  _request: JsonRpcRequest & { origin: string },\n  response: JsonRpcSuccess<{ sessionScopes: NormalizedScopesObject }>,\n  _next: () => void,\n  end: () => void,\n  hooks: {\n    getCaveatForOrigin: (\n      endowmentPermissionName: string,\n      caveatType: string,\n    ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    sortAccountIdsByLastSelected: (\n      accounts: CaipAccountId[],\n    ) => CaipAccountId[];\n  },\n) {\n  let caveat;\n  try {\n    caveat = hooks.getCaveatForOrigin(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n    );\n  } catch {\n    // noop\n  }\n\n  if (!caveat) {\n    response.result = { sessionScopes: {} };\n    return end();\n  }\n\n  response.result = {\n    sessionScopes: getSessionScopes(caveat.value, {\n      getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      sortAccountIdsByLastSelected: hooks.sortAccountIdsByLastSelected,\n    }),\n  };\n  return end();\n}\n\nexport const walletGetSession = {\n  methodNames: ['wallet_getSession'],\n  implementation: walletGetSessionHandler,\n  hookNames: {\n    getCaveatForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    sortAccountIdsByLastSelected: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-getSession.cjs","sourceRoot":"","sources":["../../src/handlers/wallet-getSession.ts"],"names":[],"mappings":";;;AAIA,mFAI6C;AA0B7C;;;;;;;;;;;;;;;GAeG;AACH,KAAK,UAAU,sBAAsB,CACnC,QAA6C,EAC7C,QAAwD,EACxD,KAAgC,EAChC,GAA6B,EAC7B,KAA4B;IAE5B,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAC/B,yDAA6B,EAC7B,4CAAgB,CACjB,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,QAAQ,CAAC,MAAM,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;QACxC,OAAO,GAAG,EAAE,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,MAAM,GAAG;QAChB,aAAa,EAAE,IAAA,4CAAgB,EAAC,MAAM,CAAC,KAAK,EAAE;YAC5C,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;YAC1D,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;SACjE,CAAC;KACH,CAAC;IACF,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AAUY,QAAA,uBAAuB,GAAG;IACrC,cAAc,EAAE,sBAAsB;IACtC,SAAS,EAAE;QACT,kBAAkB,EAAE,IAAI;QACxB,yBAAyB,EAAE,IAAI;QAC/B,4BAA4B,EAAE,IAAI;KACnC;CACgC,CAAC","sourcesContent":["import type {\n  Caip25CaveatValue,\n  NormalizedScopesObject,\n} from '@metamask/chain-agnostic-permission';\nimport {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  getSessionScopes,\n} from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n  MethodHandler,\n} from '@metamask/json-rpc-engine';\nimport type { Caveat } from '@metamask/permission-controller';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  JsonRpcParams,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\ntype WalletGetSessionResult = { sessionScopes: NormalizedScopesObject };\n\nexport type WalletGetSessionHooks = {\n  getCaveatForOrigin: (\n    endowmentPermissionName: string,\n    caveatType: string,\n  ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n  getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n  sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];\n};\n\n/**\n * Handler for the `wallet_getSession` RPC method as specified by [CAIP-312](https://chainagnostic.org/CAIPs/caip-312).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param entirely,\n * and that an empty object is returned for the `sessionScopes` result rather than throwing an error if there\n * is no active session for the origin.\n *\n * @param _request - The request object.\n * @param response - The response object.\n * @param _next - The next middleware function. Unused.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.getCaveatForOrigin - Function to retrieve a caveat for the origin.\n * @param hooks.getNonEvmSupportedMethods - A function that returns the supported methods for a non EVM scope.\n * @param hooks.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by corresponding last selected account in the wallet.\n * @returns Nothing.\n */\nasync function handleWalletGetSession(\n  _request: JsonRpcRequest & { origin: string },\n  response: PendingJsonRpcResponse<WalletGetSessionResult>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: WalletGetSessionHooks,\n) {\n  let caveat;\n  try {\n    caveat = hooks.getCaveatForOrigin(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n    );\n  } catch {\n    // noop\n  }\n\n  if (!caveat) {\n    response.result = { sessionScopes: {} };\n    return end();\n  }\n\n  response.result = {\n    sessionScopes: getSessionScopes(caveat.value, {\n      getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      sortAccountIdsByLastSelected: hooks.sortAccountIdsByLastSelected,\n    }),\n  };\n  return end();\n}\n\nexport type WalletGetSessionHandler = MethodHandler<\n  WalletGetSessionHooks,\n  never,\n  JsonRpcParams,\n  WalletGetSessionResult,\n  { origin: string }\n>;\n\nexport const walletGetSessionHandler = {\n  implementation: handleWalletGetSession,\n  hookNames: {\n    getCaveatForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    sortAccountIdsByLastSelected: true,\n  },\n} satisfies WalletGetSessionHandler;\n"]}

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

@@ -1,8 +1,16 @@
 import type { Caip25CaveatValue, NormalizedScopesObject } from "@metamask/chain-agnostic-permission";
 import { Caip25CaveatType } from "@metamask/chain-agnostic-permission";
+import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, MethodHandler } from "@metamask/json-rpc-engine";
 import type { Caveat } from "@metamask/permission-controller";
-import type { CaipAccountId } from "@metamask/utils";
-import type { CaipChainId, JsonRpcRequest, JsonRpcSuccess } from "@metamask/utils";
+import type { CaipAccountId, CaipChainId, JsonRpcParams, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
+type WalletGetSessionResult = {
+    sessionScopes: NormalizedScopesObject;
+};
+export type WalletGetSessionHooks = {
+    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
+    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];
+    sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];
+};
 /**
  * Handler for the `wallet_getSession` RPC method as specified by [CAIP-312](https://chainagnostic.org/CAIPs/caip-312).
  * The implementation below deviates from the linked spec in that it ignores the `sessionId` param entirely,
@@ -19,22 +27,18 @@ import type { CaipChainId, JsonRpcRequest, JsonRpcSuccess } from "@metamask/util
  * @param hooks.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by corresponding last selected account in the wallet.
  * @returns Nothing.
  */
-declare function walletGetSessionHandler(_request: JsonRpcRequest & {
+declare function handleWalletGetSession(_request: JsonRpcRequest & {
     origin: string;
-}, response: JsonRpcSuccess<{
-    sessionScopes: NormalizedScopesObject;
-}>, _next: () => void, end: () => void, hooks: {
-    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
-    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];
-    sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];
-}): Promise<void>;
-export declare const walletGetSession: {
-    methodNames: string[];
-    implementation: typeof walletGetSessionHandler;
+}, response: PendingJsonRpcResponse<WalletGetSessionResult>, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: WalletGetSessionHooks): Promise<void>;
+export type WalletGetSessionHandler = MethodHandler<WalletGetSessionHooks, never, JsonRpcParams, WalletGetSessionResult, {
+    origin: string;
+}>;
+export declare const walletGetSessionHandler: {
+    implementation: typeof handleWalletGetSession;
     hookNames: {
-        getCaveatForOrigin: boolean;
-        getNonEvmSupportedMethods: boolean;
-        sortAccountIdsByLastSelected: boolean;
+        getCaveatForOrigin: true;
+        getNonEvmSupportedMethods: true;
+        sortAccountIdsByLastSelected: true;
     };
 };
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"wallet-getSession.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-getSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACvB,4CAA4C;AAC7C,OAAO,EACL,gBAAgB,EAGjB,4CAA4C;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,wBAAwB;AACrD,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACf,wBAAwB;AAEzB;;;;;;;;;;;;;;;GAeG;AACH,iBAAe,uBAAuB,CACpC,QAAQ,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7C,QAAQ,EAAE,cAAc,CAAC;IAAE,aAAa,EAAE,sBAAsB,CAAA;CAAE,CAAC,EACnE,KAAK,EAAE,MAAM,IAAI,EACjB,GAAG,EAAE,MAAM,IAAI,EACf,KAAK,EAAE;IACL,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,4BAA4B,EAAE,CAC5B,QAAQ,EAAE,aAAa,EAAE,KACtB,aAAa,EAAE,CAAC;CACtB,iBAwBF;AAED,eAAO,MAAM,gBAAgB;;;;;;;;CAQ5B,CAAC"}
+{"version":3,"file":"wallet-getSession.d.cts","sourceRoot":"","sources":["../../src/handlers/wallet-getSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACvB,4CAA4C;AAC7C,OAAO,EACL,gBAAgB,EAGjB,4CAA4C;AAC7C,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EACzB,aAAa,EACd,kCAAkC;AACnC,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAC9D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,aAAa,EACb,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAEzB,KAAK,sBAAsB,GAAG;IAAE,aAAa,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,qBAAqB,GAAG;IAClC,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,4BAA4B,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,CAAC;CAC9E,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,iBAAe,sBAAsB,CACnC,QAAQ,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7C,QAAQ,EAAE,sBAAsB,CAAC,sBAAsB,CAAC,EACxD,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,qBAAqB,iBAwB7B;AAED,MAAM,MAAM,uBAAuB,GAAG,aAAa,CACjD,qBAAqB,EACrB,KAAK,EACL,aAAa,EACb,sBAAsB,EACtB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CACnB,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;CAOD,CAAC"}

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

@@ -1,8 +1,16 @@
 import type { Caip25CaveatValue, NormalizedScopesObject } from "@metamask/chain-agnostic-permission";
 import { Caip25CaveatType } from "@metamask/chain-agnostic-permission";
+import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, MethodHandler } from "@metamask/json-rpc-engine";
 import type { Caveat } from "@metamask/permission-controller";
-import type { CaipAccountId } from "@metamask/utils";
-import type { CaipChainId, JsonRpcRequest, JsonRpcSuccess } from "@metamask/utils";
+import type { CaipAccountId, CaipChainId, JsonRpcParams, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
+type WalletGetSessionResult = {
+    sessionScopes: NormalizedScopesObject;
+};
+export type WalletGetSessionHooks = {
+    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
+    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];
+    sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];
+};
 /**
  * Handler for the `wallet_getSession` RPC method as specified by [CAIP-312](https://chainagnostic.org/CAIPs/caip-312).
  * The implementation below deviates from the linked spec in that it ignores the `sessionId` param entirely,
@@ -19,22 +27,18 @@ import type { CaipChainId, JsonRpcRequest, JsonRpcSuccess } from "@metamask/util
  * @param hooks.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by corresponding last selected account in the wallet.
  * @returns Nothing.
  */
-declare function walletGetSessionHandler(_request: JsonRpcRequest & {
+declare function handleWalletGetSession(_request: JsonRpcRequest & {
     origin: string;
-}, response: JsonRpcSuccess<{
-    sessionScopes: NormalizedScopesObject;
-}>, _next: () => void, end: () => void, hooks: {
-    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
-    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];
-    sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];
-}): Promise<void>;
-export declare const walletGetSession: {
-    methodNames: string[];
-    implementation: typeof walletGetSessionHandler;
+}, response: PendingJsonRpcResponse<WalletGetSessionResult>, _next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: WalletGetSessionHooks): Promise<void>;
+export type WalletGetSessionHandler = MethodHandler<WalletGetSessionHooks, never, JsonRpcParams, WalletGetSessionResult, {
+    origin: string;
+}>;
+export declare const walletGetSessionHandler: {
+    implementation: typeof handleWalletGetSession;
     hookNames: {
-        getCaveatForOrigin: boolean;
-        getNonEvmSupportedMethods: boolean;
-        sortAccountIdsByLastSelected: boolean;
+        getCaveatForOrigin: true;
+        getNonEvmSupportedMethods: true;
+        sortAccountIdsByLastSelected: true;
     };
 };
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"wallet-getSession.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-getSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACvB,4CAA4C;AAC7C,OAAO,EACL,gBAAgB,EAGjB,4CAA4C;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,wBAAwB;AACrD,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACf,wBAAwB;AAEzB;;;;;;;;;;;;;;;GAeG;AACH,iBAAe,uBAAuB,CACpC,QAAQ,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7C,QAAQ,EAAE,cAAc,CAAC;IAAE,aAAa,EAAE,sBAAsB,CAAA;CAAE,CAAC,EACnE,KAAK,EAAE,MAAM,IAAI,EACjB,GAAG,EAAE,MAAM,IAAI,EACf,KAAK,EAAE;IACL,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,4BAA4B,EAAE,CAC5B,QAAQ,EAAE,aAAa,EAAE,KACtB,aAAa,EAAE,CAAC;CACtB,iBAwBF;AAED,eAAO,MAAM,gBAAgB;;;;;;;;CAQ5B,CAAC"}
+{"version":3,"file":"wallet-getSession.d.mts","sourceRoot":"","sources":["../../src/handlers/wallet-getSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACvB,4CAA4C;AAC7C,OAAO,EACL,gBAAgB,EAGjB,4CAA4C;AAC7C,OAAO,KAAK,EACV,wBAAwB,EACxB,yBAAyB,EACzB,aAAa,EACd,kCAAkC;AACnC,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAC9D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,aAAa,EACb,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAEzB,KAAK,sBAAsB,GAAG;IAAE,aAAa,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,qBAAqB,GAAG;IAClC,kBAAkB,EAAE,CAClB,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,KACf,MAAM,CAAC,OAAO,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,MAAM,EAAE,CAAC;IAC5D,4BAA4B,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,CAAC;CAC9E,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,iBAAe,sBAAsB,CACnC,QAAQ,EAAE,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC7C,QAAQ,EAAE,sBAAsB,CAAC,sBAAsB,CAAC,EACxD,KAAK,EAAE,yBAAyB,EAChC,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,qBAAqB,iBAwB7B;AAED,MAAM,MAAM,uBAAuB,GAAG,aAAa,CACjD,qBAAqB,EACrB,KAAK,EACL,aAAa,EACb,sBAAsB,EACtB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CACnB,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;CAOD,CAAC"}

package/dist/handlers/wallet-getSession.mjs

@@ -15,7 +15,7 @@ import { Caip25CaveatType, Caip25EndowmentPermissionName, getSessionScopes } fro
  * @param hooks.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by corresponding last selected account in the wallet.
  * @returns Nothing.
  */
-async function walletGetSessionHandler(_request, response, _next, end, hooks) {
+async function handleWalletGetSession(_request, response, _next, end, hooks) {
     let caveat;
     try {
         caveat = hooks.getCaveatForOrigin(Caip25EndowmentPermissionName, Caip25CaveatType);
@@ -35,9 +35,8 @@ async function walletGetSessionHandler(_request, response, _next, end, hooks) {
     };
     return end();
 }
-export const walletGetSession = {
-    methodNames: ['wallet_getSession'],
-    implementation: walletGetSessionHandler,
+export const walletGetSessionHandler = {
+    implementation: handleWalletGetSession,
     hookNames: {
         getCaveatForOrigin: true,
         getNonEvmSupportedMethods: true,

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

@@ -1 +1 @@
-{"version":3,"file":"wallet-getSession.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-getSession.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,gBAAgB,EAChB,6BAA6B,EAC7B,gBAAgB,EACjB,4CAA4C;AAS7C;;;;;;;;;;;;;;;GAeG;AACH,KAAK,UAAU,uBAAuB,CACpC,QAA6C,EAC7C,QAAmE,EACnE,KAAiB,EACjB,GAAe,EACf,KASC;IAED,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAC/B,6BAA6B,EAC7B,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,QAAQ,CAAC,MAAM,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;QACxC,OAAO,GAAG,EAAE,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,MAAM,GAAG;QAChB,aAAa,EAAE,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE;YAC5C,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;YAC1D,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;SACjE,CAAC;KACH,CAAC;IACF,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,mBAAmB,CAAC;IAClC,cAAc,EAAE,uBAAuB;IACvC,SAAS,EAAE;QACT,kBAAkB,EAAE,IAAI;QACxB,yBAAyB,EAAE,IAAI;QAC/B,4BAA4B,EAAE,IAAI;KACnC;CACF,CAAC","sourcesContent":["import type {\n  Caip25CaveatValue,\n  NormalizedScopesObject,\n} from '@metamask/chain-agnostic-permission';\nimport {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  getSessionScopes,\n} from '@metamask/chain-agnostic-permission';\nimport type { Caveat } from '@metamask/permission-controller';\nimport type { CaipAccountId } from '@metamask/utils';\nimport type {\n  CaipChainId,\n  JsonRpcRequest,\n  JsonRpcSuccess,\n} from '@metamask/utils';\n\n/**\n * Handler for the `wallet_getSession` RPC method as specified by [CAIP-312](https://chainagnostic.org/CAIPs/caip-312).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param entirely,\n * and that an empty object is returned for the `sessionScopes` result rather than throwing an error if there\n * is no active session for the origin.\n *\n * @param _request - The request object.\n * @param response - The response object.\n * @param _next - The next middleware function. Unused.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.getCaveatForOrigin - Function to retrieve a caveat for the origin.\n * @param hooks.getNonEvmSupportedMethods - A function that returns the supported methods for a non EVM scope.\n * @param hooks.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by corresponding last selected account in the wallet.\n * @returns Nothing.\n */\nasync function walletGetSessionHandler(\n  _request: JsonRpcRequest & { origin: string },\n  response: JsonRpcSuccess<{ sessionScopes: NormalizedScopesObject }>,\n  _next: () => void,\n  end: () => void,\n  hooks: {\n    getCaveatForOrigin: (\n      endowmentPermissionName: string,\n      caveatType: string,\n    ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n    sortAccountIdsByLastSelected: (\n      accounts: CaipAccountId[],\n    ) => CaipAccountId[];\n  },\n) {\n  let caveat;\n  try {\n    caveat = hooks.getCaveatForOrigin(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n    );\n  } catch {\n    // noop\n  }\n\n  if (!caveat) {\n    response.result = { sessionScopes: {} };\n    return end();\n  }\n\n  response.result = {\n    sessionScopes: getSessionScopes(caveat.value, {\n      getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      sortAccountIdsByLastSelected: hooks.sortAccountIdsByLastSelected,\n    }),\n  };\n  return end();\n}\n\nexport const walletGetSession = {\n  methodNames: ['wallet_getSession'],\n  implementation: walletGetSessionHandler,\n  hookNames: {\n    getCaveatForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    sortAccountIdsByLastSelected: true,\n  },\n};\n"]}
+{"version":3,"file":"wallet-getSession.mjs","sourceRoot":"","sources":["../../src/handlers/wallet-getSession.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,gBAAgB,EAChB,6BAA6B,EAC7B,gBAAgB,EACjB,4CAA4C;AA0B7C;;;;;;;;;;;;;;;GAeG;AACH,KAAK,UAAU,sBAAsB,CACnC,QAA6C,EAC7C,QAAwD,EACxD,KAAgC,EAChC,GAA6B,EAC7B,KAA4B;IAE5B,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAC/B,6BAA6B,EAC7B,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,QAAQ,CAAC,MAAM,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;QACxC,OAAO,GAAG,EAAE,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,MAAM,GAAG;QAChB,aAAa,EAAE,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE;YAC5C,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;YAC1D,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;SACjE,CAAC;KACH,CAAC;IACF,OAAO,GAAG,EAAE,CAAC;AACf,CAAC;AAUD,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,cAAc,EAAE,sBAAsB;IACtC,SAAS,EAAE;QACT,kBAAkB,EAAE,IAAI;QACxB,yBAAyB,EAAE,IAAI;QAC/B,4BAA4B,EAAE,IAAI;KACnC;CACgC,CAAC","sourcesContent":["import type {\n  Caip25CaveatValue,\n  NormalizedScopesObject,\n} from '@metamask/chain-agnostic-permission';\nimport {\n  Caip25CaveatType,\n  Caip25EndowmentPermissionName,\n  getSessionScopes,\n} from '@metamask/chain-agnostic-permission';\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n  MethodHandler,\n} from '@metamask/json-rpc-engine';\nimport type { Caveat } from '@metamask/permission-controller';\nimport type {\n  CaipAccountId,\n  CaipChainId,\n  JsonRpcParams,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\ntype WalletGetSessionResult = { sessionScopes: NormalizedScopesObject };\n\nexport type WalletGetSessionHooks = {\n  getCaveatForOrigin: (\n    endowmentPermissionName: string,\n    caveatType: string,\n  ) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;\n  getNonEvmSupportedMethods: (scope: CaipChainId) => string[];\n  sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];\n};\n\n/**\n * Handler for the `wallet_getSession` RPC method as specified by [CAIP-312](https://chainagnostic.org/CAIPs/caip-312).\n * The implementation below deviates from the linked spec in that it ignores the `sessionId` param entirely,\n * and that an empty object is returned for the `sessionScopes` result rather than throwing an error if there\n * is no active session for the origin.\n *\n * @param _request - The request object.\n * @param response - The response object.\n * @param _next - The next middleware function. Unused.\n * @param end - The end function.\n * @param hooks - The hooks object.\n * @param hooks.getCaveatForOrigin - Function to retrieve a caveat for the origin.\n * @param hooks.getNonEvmSupportedMethods - A function that returns the supported methods for a non EVM scope.\n * @param hooks.sortAccountIdsByLastSelected - A function that accepts an array of CaipAccountId and returns an array of CaipAccountId sorted by corresponding last selected account in the wallet.\n * @returns Nothing.\n */\nasync function handleWalletGetSession(\n  _request: JsonRpcRequest & { origin: string },\n  response: PendingJsonRpcResponse<WalletGetSessionResult>,\n  _next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: WalletGetSessionHooks,\n) {\n  let caveat;\n  try {\n    caveat = hooks.getCaveatForOrigin(\n      Caip25EndowmentPermissionName,\n      Caip25CaveatType,\n    );\n  } catch {\n    // noop\n  }\n\n  if (!caveat) {\n    response.result = { sessionScopes: {} };\n    return end();\n  }\n\n  response.result = {\n    sessionScopes: getSessionScopes(caveat.value, {\n      getNonEvmSupportedMethods: hooks.getNonEvmSupportedMethods,\n      sortAccountIdsByLastSelected: hooks.sortAccountIdsByLastSelected,\n    }),\n  };\n  return end();\n}\n\nexport type WalletGetSessionHandler = MethodHandler<\n  WalletGetSessionHooks,\n  never,\n  JsonRpcParams,\n  WalletGetSessionResult,\n  { origin: string }\n>;\n\nexport const walletGetSessionHandler = {\n  implementation: handleWalletGetSession,\n  hookNames: {\n    getCaveatForOrigin: true,\n    getNonEvmSupportedMethods: true,\n    sortAccountIdsByLastSelected: true,\n  },\n} satisfies WalletGetSessionHandler;\n"]}

package/dist/handlers/wallet-invokeMethod.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.walletInvokeMethod = void 0;
+exports.walletInvokeMethodHandler = void 0;
 const chain_agnostic_permission_1 = require("@metamask/chain-agnostic-permission");
 const rpc_errors_1 = require("@metamask/rpc-errors");
 const utils_1 = require("@metamask/utils");
@@ -22,7 +22,10 @@ const utils_1 = require("@metamask/utils");
  * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.
  * @returns Nothing.
  */
-async function walletInvokeMethodHandler(request, response, next, end, hooks) {
+async function handleWalletInvokeMethod(request, response, next, end, hooks) {
+    if (!(0, utils_1.isObject)(request.params)) {
+        return end(rpc_errors_1.rpcErrors.invalidParams({ data: { request } }));
+    }
     const { scope, request: wrappedRequest } = request.params;
     (0, chain_agnostic_permission_1.assertIsInternalScopeString)(scope);
     let caveat;
@@ -86,9 +89,8 @@ async function walletInvokeMethodHandler(request, response, next, end, hooks) {
     }
     return end();
 }
-exports.walletInvokeMethod = {
-    methodNames: ['wallet_invokeMethod'],
-    implementation: walletInvokeMethodHandler,
+exports.walletInvokeMethodHandler = {
+    implementation: handleWalletInvokeMethod,
     hookNames: {
         getCaveatForOrigin: true,
         findNetworkClientIdByChainId: true,

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.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.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 {\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-invokeMethod.d.cts

@@ -1,14 +1,27 @@
 import type { Caip25CaveatValue, ExternalScopeString } from "@metamask/chain-agnostic-permission";
 import { Caip25CaveatType } from "@metamask/chain-agnostic-permission";
+import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, MethodHandler } from "@metamask/json-rpc-engine";
 import type { NetworkClientId } from "@metamask/network-controller";
 import type { Caveat } from "@metamask/permission-controller";
 import type { CaipAccountId, CaipChainId, Hex, Json, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
-export type WalletInvokeMethodRequest = JsonRpcRequest & {
+export type WalletInvokeMethodParams = {
+    scope: ExternalScopeString;
+    request: Pick<JsonRpcRequest, 'method' | 'params'>;
+};
+export type WalletInvokeMethodRequest = JsonRpcRequest<WalletInvokeMethodParams> & {
     origin: string;
-    params: {
-        scope: ExternalScopeString;
-        request: Pick<JsonRpcRequest, 'method' | 'params'>;
-    };
+};
+export type WalletInvokeMethodHooks = {
+    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
+    findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;
+    getSelectedNetworkClientId: () => NetworkClientId;
+    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];
+    sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];
+    handleNonEvmRequestForOrigin: (params: {
+        connectedAddresses: CaipAccountId[];
+        scope: CaipChainId;
+        request: JsonRpcRequest;
+    }) => Promise<Json>;
 };
 /**
  * Handler for the `wallet_invokeMethod` RPC method as specified by [CAIP-27](https://chainagnostic.org/CAIPs/caip-27).
@@ -28,28 +41,19 @@ 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, next: () => void, end: (error?: Error) => void, hooks: {
-    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
-    findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;
-    getSelectedNetworkClientId: () => NetworkClientId;
-    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];
-    sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];
-    handleNonEvmRequestForOrigin: (params: {
-        connectedAddresses: CaipAccountId[];
-        scope: CaipChainId;
-        request: JsonRpcRequest;
-    }) => Promise<Json>;
-}): Promise<void>;
-export declare const walletInvokeMethod: {
-    methodNames: string[];
-    implementation: typeof walletInvokeMethodHandler;
+declare function handleWalletInvokeMethod(request: WalletInvokeMethodRequest, response: PendingJsonRpcResponse<Json>, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: WalletInvokeMethodHooks): Promise<void>;
+export type WalletInvokeMethodHandler = MethodHandler<WalletInvokeMethodHooks, never, WalletInvokeMethodParams, Json, {
+    origin: string;
+}>;
+export declare const walletInvokeMethodHandler: {
+    implementation: typeof handleWalletInvokeMethod;
     hookNames: {
-        getCaveatForOrigin: boolean;
-        findNetworkClientIdByChainId: boolean;
-        getSelectedNetworkClientId: boolean;
-        getNonEvmSupportedMethods: boolean;
-        sortAccountIdsByLastSelected: boolean;
-        handleNonEvmRequestForOrigin: boolean;
+        getCaveatForOrigin: true;
+        findNetworkClientIdByChainId: true;
+        getSelectedNetworkClientId: true;
+        getNonEvmSupportedMethods: true;
+        sortAccountIdsByLastSelected: true;
+        handleNonEvmRequestForOrigin: true;
     };
 };
 export {};

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;;;;;;;;;;;;;;;;;GAiBG;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,CAC5B,QAAQ,EAAE,aAAa,EAAE,KACtB,aAAa,EAAE,CAAC;IACrB,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,iBAiFF;AACD,eAAO,MAAM,kBAAkB;;;;;;;;;;;CAW9B,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,EACV,wBAAwB,EACxB,yBAAyB,EACzB,aAAa,EACd,kCAAkC;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAG9D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,GAAG,EACH,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAEzB,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,QAAQ,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GACnC,cAAc,CAAC,wBAAwB,CAAC,GAAG;IACzC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEJ,MAAM,MAAM,uBAAuB,GAAG;IACpC,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,QAAQ,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,CAAC;IAC7E,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,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,iBAAe,wBAAwB,CACrC,OAAO,EAAE,yBAAyB,EAClC,QAAQ,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACtC,IAAI,EAAE,yBAAyB,EAC/B,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,uBAAuB,iBAoF/B;AAED,MAAM,MAAM,yBAAyB,GAAG,aAAa,CACnD,uBAAuB,EACvB,KAAK,EACL,wBAAwB,EACxB,IAAI,EACJ;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CACnB,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;CAUD,CAAC"}

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

@@ -1,14 +1,27 @@
 import type { Caip25CaveatValue, ExternalScopeString } from "@metamask/chain-agnostic-permission";
 import { Caip25CaveatType } from "@metamask/chain-agnostic-permission";
+import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, MethodHandler } from "@metamask/json-rpc-engine";
 import type { NetworkClientId } from "@metamask/network-controller";
 import type { Caveat } from "@metamask/permission-controller";
 import type { CaipAccountId, CaipChainId, Hex, Json, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
-export type WalletInvokeMethodRequest = JsonRpcRequest & {
+export type WalletInvokeMethodParams = {
+    scope: ExternalScopeString;
+    request: Pick<JsonRpcRequest, 'method' | 'params'>;
+};
+export type WalletInvokeMethodRequest = JsonRpcRequest<WalletInvokeMethodParams> & {
     origin: string;
-    params: {
-        scope: ExternalScopeString;
-        request: Pick<JsonRpcRequest, 'method' | 'params'>;
-    };
+};
+export type WalletInvokeMethodHooks = {
+    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
+    findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;
+    getSelectedNetworkClientId: () => NetworkClientId;
+    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];
+    sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];
+    handleNonEvmRequestForOrigin: (params: {
+        connectedAddresses: CaipAccountId[];
+        scope: CaipChainId;
+        request: JsonRpcRequest;
+    }) => Promise<Json>;
 };
 /**
  * Handler for the `wallet_invokeMethod` RPC method as specified by [CAIP-27](https://chainagnostic.org/CAIPs/caip-27).
@@ -28,28 +41,19 @@ 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, next: () => void, end: (error?: Error) => void, hooks: {
-    getCaveatForOrigin: (endowmentPermissionName: string, caveatType: string) => Caveat<typeof Caip25CaveatType, Caip25CaveatValue>;
-    findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId | undefined;
-    getSelectedNetworkClientId: () => NetworkClientId;
-    getNonEvmSupportedMethods: (scope: CaipChainId) => string[];
-    sortAccountIdsByLastSelected: (accounts: CaipAccountId[]) => CaipAccountId[];
-    handleNonEvmRequestForOrigin: (params: {
-        connectedAddresses: CaipAccountId[];
-        scope: CaipChainId;
-        request: JsonRpcRequest;
-    }) => Promise<Json>;
-}): Promise<void>;
-export declare const walletInvokeMethod: {
-    methodNames: string[];
-    implementation: typeof walletInvokeMethodHandler;
+declare function handleWalletInvokeMethod(request: WalletInvokeMethodRequest, response: PendingJsonRpcResponse<Json>, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: WalletInvokeMethodHooks): Promise<void>;
+export type WalletInvokeMethodHandler = MethodHandler<WalletInvokeMethodHooks, never, WalletInvokeMethodParams, Json, {
+    origin: string;
+}>;
+export declare const walletInvokeMethodHandler: {
+    implementation: typeof handleWalletInvokeMethod;
     hookNames: {
-        getCaveatForOrigin: boolean;
-        findNetworkClientIdByChainId: boolean;
-        getSelectedNetworkClientId: boolean;
-        getNonEvmSupportedMethods: boolean;
-        sortAccountIdsByLastSelected: boolean;
-        handleNonEvmRequestForOrigin: boolean;
+        getCaveatForOrigin: true;
+        findNetworkClientIdByChainId: true;
+        getSelectedNetworkClientId: true;
+        getNonEvmSupportedMethods: true;
+        sortAccountIdsByLastSelected: true;
+        handleNonEvmRequestForOrigin: true;
     };
 };
 export {};

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;;;;;;;;;;;;;;;;;GAiBG;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,CAC5B,QAAQ,EAAE,aAAa,EAAE,KACtB,aAAa,EAAE,CAAC;IACrB,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,iBAiFF;AACD,eAAO,MAAM,kBAAkB;;;;;;;;;;;CAW9B,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,EACV,wBAAwB,EACxB,yBAAyB,EACzB,aAAa,EACd,kCAAkC;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,MAAM,EAAE,wCAAwC;AAG9D,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,GAAG,EACH,IAAI,EACJ,cAAc,EACd,sBAAsB,EACvB,wBAAwB;AAEzB,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,QAAQ,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GACnC,cAAc,CAAC,wBAAwB,CAAC,GAAG;IACzC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEJ,MAAM,MAAM,uBAAuB,GAAG;IACpC,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,QAAQ,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,CAAC;IAC7E,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,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,iBAAe,wBAAwB,CACrC,OAAO,EAAE,yBAAyB,EAClC,QAAQ,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACtC,IAAI,EAAE,yBAAyB,EAC/B,GAAG,EAAE,wBAAwB,EAC7B,KAAK,EAAE,uBAAuB,iBAoF/B;AAED,MAAM,MAAM,yBAAyB,GAAG,aAAa,CACnD,uBAAuB,EACvB,KAAK,EACL,wBAAwB,EACxB,IAAI,EACJ;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CACnB,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;CAUD,CAAC"}

package/dist/handlers/wallet-invokeMethod.mjs

@@ -1,6 +1,6 @@
 import { Caip25CaveatType, Caip25EndowmentPermissionName, assertIsInternalScopeString, getSessionScopes, parseScopeString } from "@metamask/chain-agnostic-permission";
 import { providerErrors, rpcErrors } from "@metamask/rpc-errors";
-import { KnownCaipNamespace, numberToHex } from "@metamask/utils";
+import { isObject, KnownCaipNamespace, numberToHex } from "@metamask/utils";
 /**
  * Handler for the `wallet_invokeMethod` RPC method as specified by [CAIP-27](https://chainagnostic.org/CAIPs/caip-27).
  * The implementation below deviates from the linked spec in that it ignores the `sessionId` param
@@ -19,7 +19,10 @@ import { KnownCaipNamespace, numberToHex } from "@metamask/utils";
  * @param hooks.handleNonEvmRequestForOrigin - A function that sends a request to the MultichainRouter for processing.
  * @returns Nothing.
  */
-async function walletInvokeMethodHandler(request, response, next, end, hooks) {
+async function handleWalletInvokeMethod(request, response, next, end, hooks) {
+    if (!isObject(request.params)) {
+        return end(rpcErrors.invalidParams({ data: { request } }));
+    }
     const { scope, request: wrappedRequest } = request.params;
     assertIsInternalScopeString(scope);
     let caveat;
@@ -83,9 +86,8 @@ async function walletInvokeMethodHandler(request, response, next, end, hooks) {
     }
     return end();
 }
-export const walletInvokeMethod = {
-    methodNames: ['wallet_invokeMethod'],
-    implementation: walletInvokeMethodHandler,
+export const walletInvokeMethodHandler = {
+    implementation: handleWalletInvokeMethod,
     hookNames: {
         getCaveatForOrigin: true,
         findNetworkClientIdByChainId: true,