agentcommercekit · venables · Jul 26, 2025 · Jul 24, 2025 · Jul 24, 2025 · Jul 25, 2025
diff --git a/.changeset/olive-dogs-rush.md b/.changeset/olive-dogs-rush.md
@@ -0,0 +1,11 @@
+---
+"agentcommercekit": patch
+"@agentcommercekit/ack-pay": patch
+"@agentcommercekit/ack-id": patch
+"@agentcommercekit/keys": patch
+"@agentcommercekit/did": patch
+"@agentcommercekit/jwt": patch
+"@agentcommercekit/vc": patch
+---
+
+Add did:pkh support for more chains, including solana
diff --git a/.changeset/poor-tips-judge.md b/.changeset/poor-tips-judge.md
@@ -0,0 +1,11 @@
+---
+"agentcommercekit": patch
+"@agentcommercekit/ack-pay": patch
+"@agentcommercekit/ack-id": patch
+"@agentcommercekit/keys": patch
+"@agentcommercekit/did": patch
+"@agentcommercekit/jwt": patch
+"@agentcommercekit/vc": patch
+---
+
+Add schemas for CAIP-2, CAIP-10, CAIP-19 which are used by did:pkh
diff --git a/demos/e2e/package.json b/demos/e2e/package.json
@@ -36,6 +36,6 @@
     "eslint": "^9.27.0",
     "tsx": "^4.19.4",
     "typescript": "^5",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }
diff --git a/demos/e2e/src/agent.ts b/demos/e2e/src/agent.ts
@@ -13,8 +13,8 @@ import { verifyAgentIdentityWithCredential } from "./verification"
 import type { CredentialVerifier } from "./credential-verifier"
 import type { ReceiptVerifier } from "./receipt-verifier"
 import type {
+  Caip2ChainId,
   DidDocument,
-  DidPkhChainId,
   DidResolver,
   DidUri,
   JwtSigner,
@@ -32,7 +32,7 @@ interface AgentConstructorParams {
   receiptVerifier: ReceiptVerifier
   credentialVerifier: CredentialVerifier
   wallet: Keypair
-  preferredChainId: DidPkhChainId
+  preferredChainId: Caip2ChainId
 }
 
 export class Agent {
@@ -48,7 +48,7 @@ export class Agent {
   private readonly resolver: DidResolver
   private readonly receiptVerifier: ReceiptVerifier
   private readonly credentialVerifier: CredentialVerifier
-  private readonly preferredChainId: DidPkhChainId
+  private readonly preferredChainId: Caip2ChainId
   // An optional map of id to the request itself (e.g. product, message, etc)
   private pendingRequests: Record<string, PaymentRequest> = {}
 
@@ -79,7 +79,6 @@ export class Agent {
     this.preferredChainId = preferredChainId
     const { did: walletDid, didDocument: walletDidDocument } =
       createDidPkhDocument({
-        keypair: this.wallet,
         address: this.walletAddress,
         chainId: this.preferredChainId
       })
@@ -105,7 +104,7 @@ export class Agent {
     credentialVerifier
   }: {
     ownerDid: DidUri
-    preferredChainId: DidPkhChainId
+    preferredChainId: Caip2ChainId
     resolver: DidResolver
     receiptVerifier: ReceiptVerifier
     credentialVerifier: CredentialVerifier

diff --git a/demos/e2e/src/index.ts b/demos/e2e/src/index.ts
@@ -8,8 +8,8 @@ import {
   waitForEnter
 } from "@repo/cli-tools"
 import {
+  caip2ChainIds,
   createJwt,
-  didPkhChainIds,
   getDidResolver,
   parseJwtCredential
 } from "agentcommercekit"
@@ -30,7 +30,7 @@ import type { Keypair, PaymentRequest } from "agentcommercekit"
  *
  * @see {@link https://namespaces.chainagnostic.org}
  */
-const CHAIN_ID = didPkhChainIds.evm.baseSepolia
+const CHAIN_ID = caip2ChainIds.baseSepolia
 
 /**
  * These are defined outside the `main` function because they are

diff --git a/demos/e2e/src/user.ts b/demos/e2e/src/user.ts
@@ -5,8 +5,8 @@ import {
 } from "agentcommercekit"
 import { publicKeyToAddress } from "./utils/evm-address"
 import type {
+  Caip2ChainId,
   DidDocument,
-  DidPkhChainId,
   DidResolver,
   DidUri,
   JwtSigner,
@@ -15,15 +15,15 @@ import type {
 
 interface ConstructorParams {
   wallet: Keypair
-  preferredChainId: DidPkhChainId
+  preferredChainId: Caip2ChainId
   did: DidUri
   didDocument: DidDocument
   resolver: DidResolver
 }
 
 export class User {
   readonly wallet: Keypair
-  readonly preferredChainId: DidPkhChainId
+  readonly preferredChainId: Caip2ChainId
   readonly did: DidUri
   readonly didDocument: DidDocument
   readonly signer: JwtSigner
@@ -48,14 +48,13 @@ export class User {
 
   static async create(
     resolver: DidResolver,
-    chainId: DidPkhChainId
+    chainId: Caip2ChainId
   ): Promise<User> {
     const wallet = await generateKeypair("secp256k1")
     const address = publicKeyToAddress(wallet.publicKey)
     const { did, didDocument } = createDidPkhDocument({
       address,
-      chainId,
-      keypair: wallet
+      chainId
     })
 
     return new User({

diff --git a/demos/identity-a2a/package.json b/demos/identity-a2a/package.json
@@ -41,6 +41,6 @@
     "eslint": "^9.27.0",
     "tsx": "^4.19.4",
     "typescript": "^5",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }
diff --git a/demos/identity/package.json b/demos/identity/package.json
@@ -46,6 +46,6 @@
     "eslint": "^9.27.0",
     "tsx": "^4.19.4",
     "typescript": "^5",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }
diff --git a/demos/payments/package.json b/demos/payments/package.json
@@ -42,6 +42,6 @@
     "eslint": "^9.27.0",
     "tsx": "^4.19.4",
     "typescript": "^5",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }
diff --git a/demos/payments/src/constants.ts b/demos/payments/src/constants.ts
@@ -1,5 +1,5 @@
 import path from "node:path"
-import { didPkhChainIds } from "agentcommercekit"
+import { caip2ChainIds } from "agentcommercekit"
 import { createPublicClient, http } from "viem"
 import { baseSepolia } from "viem/chains"
 
@@ -20,7 +20,7 @@ export const envFilePath = path.resolve(currentDir, "..", ".env")
  * Configure the EVM chain you'd like to use:
  */
 export const chain = baseSepolia
-export const chainId = didPkhChainIds.evm.baseSepolia
+export const chainId = caip2ChainIds.baseSepolia
 export const usdcAddress = "0x036CbD53842c5426634e7929541eC2318f3dCF7e"
 export const publicClient = createPublicClient({
   chain,

diff --git a/demos/payments/src/receipt-service.ts b/demos/payments/src/receipt-service.ts
@@ -15,7 +15,7 @@ import {
   verifyJwt,
   verifyPaymentToken
 } from "agentcommercekit"
-import { didPkhChainIdSchema } from "agentcommercekit/schemas/valibot"
+import { caip2ChainIdSchema } from "agentcommercekit/schemas/valibot"
 import { Hono } from "hono"
 import { env } from "hono/adapter"
 import { HTTPException } from "hono/http-exception"
@@ -38,7 +38,7 @@ const bodySchema = v.object({
 const paymentDetailsSchema = v.object({
   metadata: v.union([
     v.object({
-      network: didPkhChainIdSchema,
+      network: caip2ChainIdSchema,
       txHash: v.string()
     }),
     v.object({

diff --git a/demos/payments/src/utils/keypair-info.ts b/demos/payments/src/utils/keypair-info.ts
@@ -39,7 +39,7 @@ export async function getKeypairInfo(
   const account = privateKeyToAccount(
     `0x${bytesToHexString(keypair.privateKey)}`
   )
-  const did = createDidPkhUri(address, chainId)
+  const did = createDidPkhUri(chainId, address)
   const jwtSigner = createJwtSigner(keypair)
 
   return {

diff --git a/demos/skyfire-kya/package.json b/demos/skyfire-kya/package.json
@@ -35,6 +35,6 @@
     "eslint": "^9.27.0",
     "tsx": "^4.19.4",
     "typescript": "^5",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }
diff --git a/examples/issuer/package.json b/examples/issuer/package.json
@@ -46,6 +46,6 @@
     "eslint": "^9.27.0",
     "tsx": "^4.19.4",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }
diff --git a/examples/local-did-host/package.json b/examples/local-did-host/package.json
@@ -41,6 +41,6 @@
     "dotenv-cli": "^8.0.0",
     "eslint": "^9.27.0",
     "tsx": "^4.19.4",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }
diff --git a/examples/verifier/package.json b/examples/verifier/package.json
@@ -39,6 +39,6 @@
     "dotenv-cli": "^8.0.0",
     "eslint": "^9.27.0",
     "tsx": "^4.19.4",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }
diff --git a/packages/ack-id/package.json b/packages/ack-id/package.json
@@ -90,7 +90,7 @@
     "eslint": "^9.27.0",
     "tsdown": "^0.11.12",
     "typescript": "^5",
-    "vitest": "^3.1.4",
+    "vitest": "^3.2.4",
     "zod": "^3.25.0"
   },
   "peerDependencies": {

diff --git a/packages/ack-id/src/a2a/schemas/zod/v3.ts b/packages/ack-id/src/a2a/schemas/zod/v3.ts
@@ -1,4 +1,4 @@
-import { z } from "zod"
+import { z } from "zod/v3"
 
 const roleSchema = z.enum(["agent", "user"])
 

diff --git a/packages/ack-id/src/schemas/zod/v3.ts b/packages/ack-id/src/schemas/zod/v3.ts
@@ -1,4 +1,4 @@
-import { z } from "zod"
+import { z } from "zod/v3"
 
 export const controllerClaimSchema = z.object({
   id: z.string(),

diff --git a/packages/ack-pay/package.json b/packages/ack-pay/package.json
@@ -67,7 +67,7 @@
     "eslint": "^9.27.0",
     "tsdown": "^0.11.12",
     "typescript": "^5",
-    "vitest": "^3.1.4",
+    "vitest": "^3.2.4",
     "zod": "^3.25.0"
   },
   "peerDependencies": {

diff --git a/packages/ack-pay/src/schemas/zod/v3.ts b/packages/ack-pay/src/schemas/zod/v3.ts
@@ -1,5 +1,5 @@
 import { didUriSchema } from "@agentcommercekit/did/schemas/zod/v3"
-import { z } from "zod"
+import { z } from "zod/v3"
 
 const urlOrDidUri = z.union([z.string().url(), didUriSchema])
 

diff --git a/packages/ack-pay/src/verify-payment-receipt.test.ts b/packages/ack-pay/src/verify-payment-receipt.test.ts
@@ -60,8 +60,8 @@ describe("verifyPaymentReceipt()", () => {
       paymentOptionId: paymentRequest.paymentOptions[0].id,
       issuer: receiptIssuerDid,
       payerDid: createDidPkhUri(
-        "0x7B3D8F2E1C9A4B5D6E7F8A9B0C1D2E3F4A5B6C",
-        "eip155:84532"
+        "eip155:84532",
+        "0x7B3D8F2E1C9A4B5D6E7F8A9B0C1D2E3F4A5B6C"
       )
     })
 

diff --git a/packages/agentcommercekit/package.json b/packages/agentcommercekit/package.json
@@ -77,6 +77,7 @@
   "dependencies": {
     "@agentcommercekit/ack-id": "workspace:*",
     "@agentcommercekit/ack-pay": "workspace:*",
+    "@agentcommercekit/caip": "workspace:*",
     "@agentcommercekit/did": "workspace:*",
     "@agentcommercekit/jwt": "workspace:*",
     "@agentcommercekit/keys": "workspace:*",
@@ -90,7 +91,7 @@
     "tsdown": "^0.11.12",
     "typescript": "^5",
     "valibot": "^1.1.0",
-    "vitest": "^3.1.4",
+    "vitest": "^3.2.4",
     "zod": "^3.25.0"
   },
   "peerDependencies": {

diff --git a/packages/agentcommercekit/src/index.ts b/packages/agentcommercekit/src/index.ts
@@ -1,5 +1,6 @@
 export * from "@agentcommercekit/ack-pay"
 export * from "@agentcommercekit/ack-id"
+export * from "@agentcommercekit/caip"
 export * from "@agentcommercekit/did"
 export * from "@agentcommercekit/jwt"
 export * from "@agentcommercekit/keys"

diff --git a/packages/agentcommercekit/src/schemas/valibot.ts b/packages/agentcommercekit/src/schemas/valibot.ts
@@ -1,5 +1,6 @@
 export * from "@agentcommercekit/ack-pay/schemas/valibot"
 export * from "@agentcommercekit/ack-id/schemas/valibot"
+export * from "@agentcommercekit/caip/schemas/valibot"
 export * from "@agentcommercekit/did/schemas/valibot"
 export * from "@agentcommercekit/jwt/schemas/valibot"
 export * from "@agentcommercekit/vc/schemas/valibot"
diff --git a/packages/agentcommercekit/src/schemas/zod/v3.ts b/packages/agentcommercekit/src/schemas/zod/v3.ts
@@ -1,5 +1,6 @@
 export * from "@agentcommercekit/ack-pay/schemas/zod/v3"
 export * from "@agentcommercekit/ack-id/schemas/zod/v3"
+export * from "@agentcommercekit/caip/schemas/zod/v3"
 export * from "@agentcommercekit/did/schemas/zod/v3"
 export * from "@agentcommercekit/jwt/schemas/zod/v3"
 export * from "@agentcommercekit/vc/schemas/zod/v3"
diff --git a/packages/agentcommercekit/src/schemas/zod/v4.ts b/packages/agentcommercekit/src/schemas/zod/v4.ts
@@ -1,5 +1,6 @@
 export * from "@agentcommercekit/ack-pay/schemas/zod/v4"
 export * from "@agentcommercekit/ack-id/schemas/zod/v4"
+export * from "@agentcommercekit/caip/schemas/zod/v4"
 export * from "@agentcommercekit/did/schemas/zod/v4"
 export * from "@agentcommercekit/jwt/schemas/zod/v4"
 export * from "@agentcommercekit/vc/schemas/zod/v4"
diff --git a/packages/caip/README.md b/packages/caip/README.md
@@ -0,0 +1,17 @@
+# @agentcommercekit/caip
+
+CAIP (Chain Agnostic Improvement Proposal) utilities with support for CAIP-2, CAIP-10, and CAIP-19.
+
+This package is part of the [Agent Commerce Kit](https://www.agentcommercekit.com).
+
+## Installation
+
+```sh
+npm i @agentcommercekit/caip
+# or
+pnpm add @agentcommercekit/caip
+```
+
+## License (MIT)
+
+Copyright (c) 2025 [Catena Labs, Inc](https://catenalabs.com).
diff --git a/packages/caip/eslint.config.js b/packages/caip/eslint.config.js
@@ -0,0 +1,7 @@
+// @ts-check
+
+import { config } from "@repo/eslint-config/base"
+
+export default config({
+  root: import.meta.dirname
+})