@aixyz/erc-8004 0.8.0 → 0.9.0

package/README.md

@@ -87,26 +87,43 @@ import { ValidationRegistryUpgradeable } from "@aixyz/erc-8004/contracts/Validat
 
 **Mainnets:**
 
-| Chain   | Chain ID | Constant           |
-| ------- | -------- | ------------------ |
-| Mainnet | `1`      | `CHAIN_ID.MAINNET` |
-| Base    | `8453`   | `CHAIN_ID.BASE`    |
-| Polygon | `137`    | `CHAIN_ID.POLYGON` |
-| Scroll  | `534352` | `CHAIN_ID.SCROLL`  |
-| Monad   | `143`    | `CHAIN_ID.MONAD`   |
-| BSC     | `56`     | `CHAIN_ID.BSC`     |
-| Gnosis  | `100`    | `CHAIN_ID.GNOSIS`  |
+| Chain     | Chain ID | Constant             |
+| --------- | -------- | -------------------- |
+| Abstract  | `2741`   | `CHAIN_ID.ABSTRACT`  |
+| Arbitrum  | `42161`  | `CHAIN_ID.ARBITRUM`  |
+| Avalanche | `43114`  | `CHAIN_ID.AVALANCHE` |
+| Base      | `8453`   | `CHAIN_ID.BASE`      |
+| BSC       | `56`     | `CHAIN_ID.BSC`       |
+| Celo      | `42220`  | `CHAIN_ID.CELO`      |
+| Gnosis    | `100`    | `CHAIN_ID.GNOSIS`    |
+| Linea     | `59144`  | `CHAIN_ID.LINEA`     |
+| Mainnet   | `1`      | `CHAIN_ID.MAINNET`   |
+| Mantle    | `5000`   | `CHAIN_ID.MANTLE`    |
+| MegaETH   | `4326`   | `CHAIN_ID.MEGAETH`   |
+| Monad     | `143`    | `CHAIN_ID.MONAD`     |
+| Optimism  | `10`     | `CHAIN_ID.OPTIMISM`  |
+| Polygon   | `137`    | `CHAIN_ID.POLYGON`   |
+| Scroll    | `534352` | `CHAIN_ID.SCROLL`    |
+| Taiko     | `167000` | `CHAIN_ID.TAIKO`     |
 
 **Testnets:**
 
-| Chain          | Chain ID   | Constant                  |
-| -------------- | ---------- | ------------------------- |
-| Sepolia        | `11155111` | `CHAIN_ID.SEPOLIA`        |
-| Base Sepolia   | `84532`    | `CHAIN_ID.BASE_SEPOLIA`   |
-| Polygon Amoy   | `80002`    | `CHAIN_ID.POLYGON_AMOY`   |
-| Scroll Sepolia | `534351`   | `CHAIN_ID.SCROLL_SEPOLIA` |
-| Monad Testnet  | `10143`    | `CHAIN_ID.MONAD_TESTNET`  |
-| BSC Testnet    | `97`       | `CHAIN_ID.BSC_TESTNET`    |
+| Chain            | Chain ID   | Constant                    |
+| ---------------- | ---------- | --------------------------- |
+| Abstract Testnet | `11124`    | `CHAIN_ID.ABSTRACT_TESTNET` |
+| Arbitrum Sepolia | `421614`   | `CHAIN_ID.ARBITRUM_SEPOLIA` |
+| Avalanche Fuji   | `43113`    | `CHAIN_ID.AVALANCHE_FUJI`   |
+| Base Sepolia     | `84532`    | `CHAIN_ID.BASE_SEPOLIA`     |
+| BSC Testnet      | `97`       | `CHAIN_ID.BSC_TESTNET`      |
+| Celo Sepolia     | `11142220` | `CHAIN_ID.CELO_SEPOLIA`     |
+| Linea Sepolia    | `59141`    | `CHAIN_ID.LINEA_SEPOLIA`    |
+| Mantle Sepolia   | `5003`     | `CHAIN_ID.MANTLE_SEPOLIA`   |
+| MegaETH Testnet  | `6342`     | `CHAIN_ID.MEGAETH_TESTNET`  |
+| Monad Testnet    | `10143`    | `CHAIN_ID.MONAD_TESTNET`    |
+| Optimism Sepolia | `11155420` | `CHAIN_ID.OPTIMISM_SEPOLIA` |
+| Polygon Amoy     | `80002`    | `CHAIN_ID.POLYGON_AMOY`     |
+| Scroll Sepolia   | `534351`   | `CHAIN_ID.SCROLL_SEPOLIA`   |
+| Sepolia          | `11155111` | `CHAIN_ID.SEPOLIA`          |
 
 ## ABIs
 
@@ -122,7 +139,7 @@ Versioned ABIs (e.g. `IdentityRegistryAbi_V1`, `ReputationRegistryAbi_V3`) are a
 
 All contracts use UUPS proxies. Addresses are consistent across all chains within each environment.
 
-**Mainnets** (Ethereum, Base, Polygon, Scroll, Monad, BSC, Gnosis):
+**Mainnets** (Abstract, Arbitrum, Avalanche, Base, BSC, Celo, Gnosis, Linea, Ethereum, Mantle, MegaETH, Monad, Optimism, Polygon, Scroll, Taiko):
 
 | Contract             | Address                                      |
 | -------------------- | -------------------------------------------- |
@@ -130,7 +147,7 @@ All contracts use UUPS proxies. Addresses are consistent across all chains withi
 | `reputationRegistry` | `0x8004BAa17C55a88189AE136b182e5fdA19dE9b63` |
 | `validationRegistry` | `0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58` |
 
-**Testnets** (Sepolia, Base Sepolia, Polygon Amoy, Scroll Sepolia, Monad Testnet, BSC Testnet):
+**Testnets** (Abstract Testnet, Arbitrum Sepolia, Avalanche Fuji, Base Sepolia, BSC Testnet, Celo Sepolia, Linea Sepolia, Mantle Sepolia, MegaETH Testnet, Monad Testnet, Optimism Sepolia, Polygon Amoy, Scroll Sepolia, Sepolia):
 
 | Contract             | Address                                      |
 | -------------------- | -------------------------------------------- |

package/index.ts

@@ -28,20 +28,37 @@ export { ValidationRegistryAbi_V1 as ValidationRegistryAbi } from "./abis/Valida
 // Chain ID constants
 export const CHAIN_ID = {
   // Mainnets
-  MAINNET: 1,
+  ABSTRACT: 2741,
+  ARBITRUM: 42161,
+  AVALANCHE: 43114,
   BASE: 8453,
-  POLYGON: 137,
-  SCROLL: 534352,
-  MONAD: 143,
   BSC: 56,
+  CELO: 42220,
   GNOSIS: 100,
+  LINEA: 59144,
+  MAINNET: 1,
+  MANTLE: 5000,
+  MEGAETH: 4326,
+  MONAD: 143,
+  OPTIMISM: 10,
+  POLYGON: 137,
+  SCROLL: 534352,
+  TAIKO: 167000,
   // Testnets
-  SEPOLIA: 11155111,
+  ABSTRACT_TESTNET: 11124,
+  ARBITRUM_SEPOLIA: 421614,
+  AVALANCHE_FUJI: 43113,
   BASE_SEPOLIA: 84532,
+  BSC_TESTNET: 97,
+  CELO_SEPOLIA: 11142220,
+  LINEA_SEPOLIA: 59141,
+  MANTLE_SEPOLIA: 5003,
+  MEGAETH_TESTNET: 6342,
+  MONAD_TESTNET: 10143,
+  OPTIMISM_SEPOLIA: 11155420,
   POLYGON_AMOY: 80002,
   SCROLL_SEPOLIA: 534351,
-  MONAD_TESTNET: 10143,
-  BSC_TESTNET: 97,
+  SEPOLIA: 11155111,
 } as const;
 
 export type SupportedChainId = (typeof CHAIN_ID)[keyof typeof CHAIN_ID];
@@ -51,7 +68,19 @@ export const ADDRESSES = {
   // =============================================================================
   // Mainnets
   // =============================================================================
-  [CHAIN_ID.MAINNET]: {
+  [CHAIN_ID.ABSTRACT]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.ARBITRUM]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.AVALANCHE]: {
     identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
     reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
     // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
@@ -63,13 +92,43 @@ export const ADDRESSES = {
     // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
     validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
   },
-  [CHAIN_ID.POLYGON]: {
+  [CHAIN_ID.BSC]: {
     identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
     reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
     // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
     validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
   },
-  [CHAIN_ID.SCROLL]: {
+  [CHAIN_ID.CELO]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.GNOSIS]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.LINEA]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.MAINNET]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.MANTLE]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.MEGAETH]: {
     identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
     reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
     // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
@@ -81,13 +140,25 @@ export const ADDRESSES = {
     // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
     validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
   },
-  [CHAIN_ID.BSC]: {
+  [CHAIN_ID.OPTIMISM]: {
     identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
     reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
     // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
     validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
   },
-  [CHAIN_ID.GNOSIS]: {
+  [CHAIN_ID.POLYGON]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.SCROLL]: {
+    identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
+    reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
+    // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
+    validationRegistry: "0x8004Cc8439f36fd5F9F049D9fF86523Df6dAAB58",
+  },
+  [CHAIN_ID.TAIKO]: {
     identityRegistry: "0x8004A169FB4a3325136EB29fA0ceB6D2e539a432",
     reputationRegistry: "0x8004BAa17C55a88189AE136b182e5fdA19dE9b63",
     // TODO: this contract address is not officially announced (found through deployment by same owner as the rest)
@@ -96,7 +167,17 @@ export const ADDRESSES = {
   // =============================================================================
   // Testnets
   // =============================================================================
-  [CHAIN_ID.SEPOLIA]: {
+  [CHAIN_ID.ABSTRACT_TESTNET]: {
+    identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
+    reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
+    validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
+  },
+  [CHAIN_ID.ARBITRUM_SEPOLIA]: {
+    identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
+    reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
+    validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
+  },
+  [CHAIN_ID.AVALANCHE_FUJI]: {
     identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
     reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
     validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
@@ -106,12 +187,27 @@ export const ADDRESSES = {
     reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
     validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
   },
-  [CHAIN_ID.POLYGON_AMOY]: {
+  [CHAIN_ID.BSC_TESTNET]: {
     identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
     reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
     validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
   },
-  [CHAIN_ID.SCROLL_SEPOLIA]: {
+  [CHAIN_ID.CELO_SEPOLIA]: {
+    identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
+    reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
+    validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
+  },
+  [CHAIN_ID.LINEA_SEPOLIA]: {
+    identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
+    reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
+    validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
+  },
+  [CHAIN_ID.MANTLE_SEPOLIA]: {
+    identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
+    reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
+    validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
+  },
+  [CHAIN_ID.MEGAETH_TESTNET]: {
     identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
     reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
     validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
@@ -121,7 +217,22 @@ export const ADDRESSES = {
     reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
     validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
   },
-  [CHAIN_ID.BSC_TESTNET]: {
+  [CHAIN_ID.OPTIMISM_SEPOLIA]: {
+    identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
+    reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
+    validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
+  },
+  [CHAIN_ID.POLYGON_AMOY]: {
+    identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
+    reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
+    validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
+  },
+  [CHAIN_ID.SCROLL_SEPOLIA]: {
+    identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
+    reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
+    validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
+  },
+  [CHAIN_ID.SEPOLIA]: {
     identityRegistry: "0x8004A818BFB912233c491871b3d84c89A494BD9e",
     reputationRegistry: "0x8004B663056A597Dffe9eCcC1965A193B7388713",
     validationRegistry: "0x8004Cb1BF31DAf7788923b405b754f57acEB4272",
@@ -163,13 +274,22 @@ export function isMainnetChain(chainId: number): boolean {
   }
 
   switch (chainId) {
-    case CHAIN_ID.MAINNET:
+    case CHAIN_ID.ABSTRACT:
+    case CHAIN_ID.ARBITRUM:
+    case CHAIN_ID.AVALANCHE:
     case CHAIN_ID.BASE:
-    case CHAIN_ID.POLYGON:
-    case CHAIN_ID.SCROLL:
-    case CHAIN_ID.MONAD:
     case CHAIN_ID.BSC:
+    case CHAIN_ID.CELO:
     case CHAIN_ID.GNOSIS:
+    case CHAIN_ID.LINEA:
+    case CHAIN_ID.MAINNET:
+    case CHAIN_ID.MANTLE:
+    case CHAIN_ID.MEGAETH:
+    case CHAIN_ID.MONAD:
+    case CHAIN_ID.OPTIMISM:
+    case CHAIN_ID.POLYGON:
+    case CHAIN_ID.SCROLL:
+    case CHAIN_ID.TAIKO:
       return true;
     default:
       return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aixyz/erc-8004",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Payment-native SDK for AI Agent",
   "keywords": [
     "ai",

package/schemas/registration.test.ts

@@ -1,21 +1,15 @@
 import { describe, expect, test } from "bun:test";
 import {
   ERC8004_REGISTRATION_TYPE,
-  RawAgentRegistrationFileSchema,
+  AgentRegistrationFileSchema,
   StrictAgentRegistrationFileSchema,
   TrustMechanismSchema,
   ServiceSchema,
   RegistrationEntrySchema,
-  parseRawRegistrationFile,
-  validateRegistrationFile,
   getServices,
   hasX402Support,
 } from "./registration";
 
-// =============================================================================
-// Fixtures
-// =============================================================================
-
 const minimalValid = {
   name: "Agently Price Feed",
   description: "Real-time cryptocurrency price feed agent with x402 payment support",
@@ -52,10 +46,6 @@ const fullValid = {
   did: "did:pkh:eip155:11155111:0x1234567890abcdef1234567890abcdef12345678",
 };
 
-// =============================================================================
-// TrustMechanismSchema
-// =============================================================================
-
 describe("TrustMechanismSchema", () => {
   test.each(["reputation", "crypto-economic", "tee-attestation", "social", "governance"])("accepts '%s'", (value) => {
     expect(TrustMechanismSchema.parse(value)).toBe(value);
@@ -66,10 +56,6 @@ describe("TrustMechanismSchema", () => {
   });
 });
 
-// =============================================================================
-// ServiceSchema
-// =============================================================================
-
 describe("ServiceSchema", () => {
   test("accepts minimal service", () => {
     const result = ServiceSchema.parse({ name: "mcp-server", endpoint: "https://mcp.acme-agents.com/v1/translate" });
@@ -102,10 +88,6 @@ describe("ServiceSchema", () => {
   });
 });
 
-// =============================================================================
-// RegistrationEntrySchema
-// =============================================================================
-
 describe("RegistrationEntrySchema", () => {
   test("accepts string agentId and transforms to number", () => {
     const result = RegistrationEntrySchema.parse({
@@ -173,18 +155,14 @@ describe("RegistrationEntrySchema", () => {
   });
 });
 
-// =============================================================================
-// RawAgentRegistrationFileSchema
-// =============================================================================
-
 describe("RawAgentRegistrationFileSchema", () => {
   test("accepts minimal valid file", () => {
-    const result = RawAgentRegistrationFileSchema.parse(minimalValid);
+    const result = AgentRegistrationFileSchema.parse(minimalValid);
     expect(result.name).toBe("Agently Price Feed");
   });
 
   test("accepts fully specified file", () => {
-    const result = RawAgentRegistrationFileSchema.parse(fullValid);
+    const result = AgentRegistrationFileSchema.parse(fullValid);
     expect(result.services).toHaveLength(2);
     expect(result.registrations).toHaveLength(1);
     expect(result.active).toBe(true);
@@ -193,12 +171,12 @@ describe("RawAgentRegistrationFileSchema", () => {
   });
 
   test("type field is optional", () => {
-    const result = RawAgentRegistrationFileSchema.parse(minimalValid);
+    const result = AgentRegistrationFileSchema.parse(minimalValid);
     expect(result.type).toBeUndefined();
   });
 
   test("accepts endpoints as legacy field", () => {
-    const result = RawAgentRegistrationFileSchema.parse({
+    const result = AgentRegistrationFileSchema.parse({
       ...minimalValid,
       endpoints: [{ name: "legacy-mcp", endpoint: "https://mcp.acme-agents.com/v0/translate" }],
     });
@@ -206,35 +184,31 @@ describe("RawAgentRegistrationFileSchema", () => {
   });
 
   test("accepts both x402support casings", () => {
-    const r1 = RawAgentRegistrationFileSchema.parse({ ...minimalValid, x402support: true });
-    const r2 = RawAgentRegistrationFileSchema.parse({ ...minimalValid, x402Support: true });
+    const r1 = AgentRegistrationFileSchema.parse({ ...minimalValid, x402support: true });
+    const r2 = AgentRegistrationFileSchema.parse({ ...minimalValid, x402Support: true });
     expect(r1.x402support).toBe(true);
     expect(r2.x402Support).toBe(true);
   });
 
   test("rejects missing name", () => {
-    expect(() => RawAgentRegistrationFileSchema.parse({ description: "x", image: "x" })).toThrow();
+    expect(() => AgentRegistrationFileSchema.parse({ description: "x", image: "x" })).toThrow();
   });
 
   test("rejects missing description", () => {
-    expect(() => RawAgentRegistrationFileSchema.parse({ name: "x", image: "x" })).toThrow();
+    expect(() => AgentRegistrationFileSchema.parse({ name: "x", image: "x" })).toThrow();
   });
 
   test("rejects missing image", () => {
-    expect(() => RawAgentRegistrationFileSchema.parse({ name: "x", description: "x" })).toThrow();
+    expect(() => AgentRegistrationFileSchema.parse({ name: "x", description: "x" })).toThrow();
   });
 
   test("rejects non-object input", () => {
-    expect(() => RawAgentRegistrationFileSchema.parse("string")).toThrow();
-    expect(() => RawAgentRegistrationFileSchema.parse(null)).toThrow();
-    expect(() => RawAgentRegistrationFileSchema.parse(42)).toThrow();
+    expect(() => AgentRegistrationFileSchema.parse("string")).toThrow();
+    expect(() => AgentRegistrationFileSchema.parse(null)).toThrow();
+    expect(() => AgentRegistrationFileSchema.parse(42)).toThrow();
   });
 });
 
-// =============================================================================
-// StrictAgentRegistrationFileSchema
-// =============================================================================
-
 describe("StrictAgentRegistrationFileSchema", () => {
   const strictValid = {
     ...minimalValid,
@@ -287,34 +261,26 @@ describe("StrictAgentRegistrationFileSchema", () => {
   });
 });
 
-// =============================================================================
-// parseRawRegistrationFile
-// =============================================================================
-
-describe("parseRawRegistrationFile", () => {
+describe("AgentRegistrationFileSchema.safeParse", () => {
   test("returns success for valid data", () => {
-    const result = parseRawRegistrationFile(minimalValid);
+    const result = AgentRegistrationFileSchema.safeParse(minimalValid);
     expect(result.success).toBe(true);
   });
 
   test("returns failure for invalid data (does not throw)", () => {
-    const result = parseRawRegistrationFile({ bad: "data" });
+    const result = AgentRegistrationFileSchema.safeParse({ bad: "data" });
     expect(result.success).toBe(false);
   });
 
   test("returns failure for null", () => {
-    const result = parseRawRegistrationFile(null);
+    const result = AgentRegistrationFileSchema.safeParse(null);
     expect(result.success).toBe(false);
   });
 });
 
-// =============================================================================
-// validateRegistrationFile
-// =============================================================================
-
-describe("validateRegistrationFile", () => {
+describe("StrictAgentRegistrationFileSchema.safeParse", () => {
   test("returns success for strict-valid data", () => {
-    const result = validateRegistrationFile({
+    const result = StrictAgentRegistrationFileSchema.safeParse({
       ...minimalValid,
       type: ERC8004_REGISTRATION_TYPE,
       services: [{ name: "mcp-server", endpoint: "https://mcp.acme-agents.com/v1/price-feed" }],
@@ -323,7 +289,7 @@ describe("validateRegistrationFile", () => {
   });
 
   test("returns failure when type is missing", () => {
-    const result = validateRegistrationFile({
+    const result = StrictAgentRegistrationFileSchema.safeParse({
       ...minimalValid,
       services: [{ name: "mcp-server", endpoint: "https://mcp.acme-agents.com/v1/price-feed" }],
     });
@@ -331,7 +297,7 @@ describe("validateRegistrationFile", () => {
   });
 
   test("returns failure when services is empty", () => {
-    const result = validateRegistrationFile({
+    const result = StrictAgentRegistrationFileSchema.safeParse({
       ...minimalValid,
       type: ERC8004_REGISTRATION_TYPE,
       services: [],
@@ -340,10 +306,6 @@ describe("validateRegistrationFile", () => {
   });
 });
 
-// =============================================================================
-// getServices
-// =============================================================================
-
 describe("getServices", () => {
   test("returns services when present", () => {
     const file = {
@@ -375,10 +337,6 @@ describe("getServices", () => {
   });
 });
 
-// =============================================================================
-// hasX402Support
-// =============================================================================
-
 describe("hasX402Support", () => {
   test("returns true for x402support: true", () => {
     expect(hasX402Support({ ...minimalValid, x402support: true })).toBe(true);

package/schemas/registration.ts

@@ -7,16 +7,8 @@ import { z } from "zod";
  * Based on: https://github.com/erc-8004/erc-8004-contracts/blob/093d7b91eb9c22048d411896ed397d695742a5f8/ERC8004SPEC.md#agent-uri-and-agent-registration-file
  */
 
-// =============================================================================
-// Constants
-// =============================================================================
-
 export const ERC8004_REGISTRATION_TYPE = "https://eips.ethereum.org/EIPS/eip-8004#registration-v1";
 
-// =============================================================================
-// Building Block Schemas
-// =============================================================================
-
 /**
  * Supported trust mechanisms for agent validation
  */
@@ -57,15 +49,11 @@ export const RegistrationEntrySchema = z.object({
   agentRegistry: z.string(),
 });
 
-// =============================================================================
-// Main Schemas
-// =============================================================================
-
 /**
  * Raw Agent Registration File Schema
  * For parsing registration files fetched from IPFS/URIs
  */
-export const RawAgentRegistrationFileSchema = z.object({
+export const AgentRegistrationFileSchema = z.object({
   // Schema identifiers
   type: z.string().optional(),
   $schema: z.string().optional(),
@@ -95,53 +83,31 @@ export const RawAgentRegistrationFileSchema = z.object({
  * Strict Schema - for creating new registration files
  * Requires correct type literal and at least one service
  */
-export const StrictAgentRegistrationFileSchema = RawAgentRegistrationFileSchema.extend({
+export const StrictAgentRegistrationFileSchema = AgentRegistrationFileSchema.extend({
   type: z.literal(ERC8004_REGISTRATION_TYPE),
   services: z.array(ServiceSchema).min(1, "At least one service endpoint is required"),
 });
 
-// =============================================================================
-// Types
-// =============================================================================
-
 export type TrustMechanism = z.infer<typeof TrustMechanismSchema>;
 export type Service = z.infer<typeof ServiceSchema>;
 export type RegistrationEntry = z.infer<typeof RegistrationEntrySchema>;
-export type RawAgentRegistrationFile = z.infer<typeof RawAgentRegistrationFileSchema>;
+export type AgentRegistrationFile = z.infer<typeof AgentRegistrationFileSchema>;
 export type StrictAgentRegistrationFile = z.infer<typeof StrictAgentRegistrationFileSchema>;
 
-// =============================================================================
-// Helper Functions
-// =============================================================================
-
-/**
- * Parse a raw registration file
- * Use for existing/untrusted data fetched from IPFS/URIs - won't throw on malformed input
- */
-export function parseRawRegistrationFile(data: unknown) {
-  return RawAgentRegistrationFileSchema.safeParse(data);
-}
-
-/**
- * Validate a registration file with strict validation
- * Use when creating or submitting new registration files
- */
-export function validateRegistrationFile(data: unknown) {
-  return StrictAgentRegistrationFileSchema.safeParse(data);
-}
-
 /**
  * Get services from a registration file
  * Handles both `services` (new) and `endpoints` (legacy) field names
+ * @default TODO: parse and merge both fields
  */
-export function getServices(file: RawAgentRegistrationFile | StrictAgentRegistrationFile): Service[] {
+export function getServices(file: AgentRegistrationFile | StrictAgentRegistrationFile): Service[] {
   return file.services ?? file.endpoints ?? [];
 }
 
 /**
  * Check if agent supports x402 payment protocol
  * Handles both `x402support` and `x402Support` casing variants
+ * @deprecated TODO: parse and merge both fields
  */
-export function hasX402Support(file: RawAgentRegistrationFile | StrictAgentRegistrationFile): boolean {
+export function hasX402Support(file: AgentRegistrationFile | StrictAgentRegistrationFile): boolean {
   return file.x402support === true || file.x402Support === true;
 }