@nevermined-io/core-kit 0.1.36 → 0.1.41

package/dist/models/AgentX402AccessToken.d.ts

@@ -9,24 +9,48 @@ export type X402Resource = {
     mimeType?: string;
 };
 /**
- * x402 Accepted scheme - nvm:erc4337 specific fields
+ * Supported x402 payment schemes
+ */
+export type X402Scheme = 'nvm:erc4337' | 'nvm:card-delegation';
+/**
+ * x402 Accepted scheme fields (common to all schemes)
  */
 export type X402Accepted = {
-    scheme: 'nvm:erc4337';
+    scheme: X402Scheme;
     network: string;
-    planId: string;
+    planId?: string;
     extra: {
         version: string;
         agentId?: string;
         httpVerb?: string;
     };
 };
+/**
+ * Payload specific to the nvm:erc4337 scheme
+ */
+export type X402Erc4337Payload = {
+    signature: `0x${string}`;
+    authorization: {
+        from: `0x${string}`;
+        sessionKeysProvider: string;
+        sessionKeys: {
+            id: string;
+            data: string;
+        }[];
+    };
+};
+/**
+ * Payload specific to the nvm:card-delegation scheme
+ */
+export type X402CardDelegationPayload = {
+    token: string;
+};
 /**
  * x402 Access Token aligned with x402 v2 spec
  *
  * Key changes from previous version:
  * - `subscriberAddress` moved to `payload.authorization.from`
- * - `planId` is now in `accepted` (required)
+ * - `planId` is now in `accepted` (optional — required for erc4337, optional for card-delegation)
  * - `agentId` moved to `accepted.extra.agentId` (optional)
  * - `scheme` and `network` moved to `accepted`
  * - Added `resource` and `extensions` for x402 v2 alignment
@@ -35,17 +59,7 @@ export type AgentX402AccessToken = {
     x402Version: 2;
     resource?: X402Resource;
     accepted: X402Accepted;
-    payload: {
-        signature: `0x${string}`;
-        authorization: {
-            from: `0x${string}`;
-            sessionKeysProvider: string;
-            sessionKeys: {
-                id: string;
-                data: string;
-            }[];
-        };
-    };
+    payload: X402Erc4337Payload | X402CardDelegationPayload;
     validUntil?: number;
     extensions: Record<string, unknown>;
 };
@@ -130,12 +144,6 @@ export type X402TokenValidationResult = {
     valid: boolean;
     errors: string[];
 };
-/**
- * Validate the structure of an x402 access token
- *
- * @param token - The token to validate (unknown type for safety)
- * @returns Validation result with errors if any
- */
 export declare const validateX402TokenStructure: (token: unknown) => X402TokenValidationResult;
 export declare const b64EncodeX402AccessToken: (accessToken: AgentX402AccessToken) => string;
 export declare const b64DecodeX402AccessToken: (encoded: string) => AgentX402AccessToken;

package/dist/models/AgentX402AccessToken.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AgentX402AccessToken.d.ts","sourceRoot":"","sources":["../../src/models/AgentX402AccessToken.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AgentX402AccessToken.d.ts","sourceRoot":"","sources":["../../src/models/AgentX402AccessToken.ts"],"names":[],"mappings":"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"}

package/dist/models/AgentX402AccessToken.js

@@ -83,15 +83,16 @@ export const generateAgentX402AccessToken = async (options) => {
  * @returns true if signature is valid
  */
 export const verifyAgentX402AccessToken = async (accessToken, publicClient) => {
+    const erc4337Payload = accessToken.payload;
     // Extract subscriber address from payload.authorization.from
-    const subscriberAddress = accessToken.payload.authorization.from;
+    const subscriberAddress = erc4337Payload.authorization.from;
     const domain = {
         name: 'Nevermined',
         version: '1',
         chainId: publicClient.chain?.id,
         verifyingContract: subscriberAddress,
     };
-    const { signature, authorization } = accessToken.payload;
+    const { signature, authorization } = erc4337Payload;
     const isValid = await publicClient.verifyTypedData({
         address: subscriberAddress,
         signature,
@@ -108,6 +109,7 @@ export const verifyAgentX402AccessToken = async (accessToken, publicClient) => {
  * @param token - The token to validate (unknown type for safety)
  * @returns Validation result with errors if any
  */
+const SUPPORTED_SCHEMES = ['nvm:erc4337', 'nvm:card-delegation'];
 export const validateX402TokenStructure = (token) => {
     const errors = [];
     if (!token || typeof token !== 'object') {
@@ -124,15 +126,13 @@ export const validateX402TokenStructure = (token) => {
     }
     else {
         const accepted = t.accepted;
-        if (accepted.scheme !== 'nvm:erc4337') {
-            errors.push('scheme must be nvm:erc4337');
+        const scheme = accepted.scheme;
+        if (!SUPPORTED_SCHEMES.includes(scheme)) {
+            errors.push(`scheme must be one of: ${SUPPORTED_SCHEMES.join(', ')}`);
         }
         if (!accepted.network || typeof accepted.network !== 'string') {
             errors.push('network is required in accepted');
         }
-        if (!accepted.planId || typeof accepted.planId !== 'string') {
-            errors.push('planId is required in accepted');
-        }
         // Validate extra
         if (!accepted.extra || typeof accepted.extra !== 'object') {
             errors.push('extra is required in accepted');
@@ -143,32 +143,47 @@ export const validateX402TokenStructure = (token) => {
                 errors.push('version is required in accepted.extra');
             }
         }
+        // Scheme-specific accepted validation
+        if (scheme === 'nvm:erc4337') {
+            if (!accepted.planId || typeof accepted.planId !== 'string') {
+                errors.push('planId is required in accepted for nvm:erc4337');
+            }
+        }
     }
     // Validate payload
     if (!t.payload || typeof t.payload !== 'object') {
         errors.push('payload is required');
     }
     else {
+        const accepted = t.accepted;
+        const scheme = accepted?.scheme;
         const payload = t.payload;
-        if (!payload.signature || typeof payload.signature !== 'string') {
-            errors.push('signature is required in payload');
-        }
-        if (!payload.authorization || typeof payload.authorization !== 'object') {
-            errors.push('authorization is required in payload');
-        }
-        else {
-            const auth = payload.authorization;
-            if (!auth.from || typeof auth.from !== 'string') {
-                errors.push('from address is required in payload.authorization');
+        if (scheme === 'nvm:erc4337') {
+            if (!payload.signature || typeof payload.signature !== 'string') {
+                errors.push('signature is required in payload');
             }
-            else if (!auth.from.startsWith('0x')) {
-                errors.push('from must be a valid hex address');
+            if (!payload.authorization || typeof payload.authorization !== 'object') {
+                errors.push('authorization is required in payload');
             }
-            if (!auth.sessionKeysProvider || typeof auth.sessionKeysProvider !== 'string') {
-                errors.push('sessionKeysProvider is required in payload.authorization');
+            else {
+                const auth = payload.authorization;
+                if (!auth.from || typeof auth.from !== 'string') {
+                    errors.push('from address is required in payload.authorization');
+                }
+                else if (!auth.from.startsWith('0x')) {
+                    errors.push('from must be a valid hex address');
+                }
+                if (!auth.sessionKeysProvider || typeof auth.sessionKeysProvider !== 'string') {
+                    errors.push('sessionKeysProvider is required in payload.authorization');
+                }
+                if (!Array.isArray(auth.sessionKeys)) {
+                    errors.push('sessionKeys array is required in payload.authorization');
+                }
             }
-            if (!Array.isArray(auth.sessionKeys)) {
-                errors.push('sessionKeys array is required in payload.authorization');
+        }
+        else if (scheme === 'nvm:card-delegation') {
+            if (!payload.token || typeof payload.token !== 'string') {
+                errors.push('token is required in payload for nvm:card-delegation');
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/core-kit",
-  "version": "0.1.36",
+  "version": "0.1.41",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",