@jinn-network/client 0.1.5 → 0.1.6-canary.0b4ff7f9

package/dist/types/payloads/prediction-apy-v0.d.ts

@@ -31,8 +31,8 @@ export declare const PredictionApyV0RestorationPayloadSchema: z.ZodObject<{
     };
 }>;
 export type PredictionApyV0RestorationPayload = z.infer<typeof PredictionApyV0RestorationPayloadSchema>;
-export declare const PredictionApyV0VerdictPayloadSchema: z.ZodObject<{
-    restorationEnvelope: z.ZodObject<{
+export declare const PredictionApyV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
+    solutionEnvelope: z.ZodObject<{
         cid: z.ZodString;
         sha256: z.ZodString;
     }, "strip", z.ZodTypeAny, {
@@ -144,22 +144,22 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodObject<{
         detail?: string | Record<string, unknown> | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
+    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
     claimed: {
         submittedAt: number;
         modelId: string;
         predictedBps: string;
         submissionManifestCid?: string | undefined;
     };
-    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
+    solutionEnvelope: {
+        cid: string;
+        sha256: string;
+    };
     checks: {
         name: string;
         status: "PASS" | "FAIL" | "SKIP" | "INDETERMINATE";
         detail?: string | Record<string, unknown> | undefined;
     }[];
-    restorationEnvelope: {
-        cid: string;
-        sha256: string;
-    };
     verificationOfRestoration: {
         timestamp: number;
         claimedTier: "self-signed" | "committed" | "attested" | "consensus" | "proved";
@@ -186,22 +186,64 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodObject<{
         errorBps: string;
     };
 }, {
+    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
     claimed: {
         submittedAt: number;
         modelId: string;
         predictedBps: string;
         submissionManifestCid?: string | undefined;
     };
-    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
+    solutionEnvelope: {
+        cid: string;
+        sha256: string;
+    };
     checks: {
         name: string;
         status: "PASS" | "FAIL" | "SKIP" | "INDETERMINATE";
         detail?: string | Record<string, unknown> | undefined;
     }[];
-    restorationEnvelope: {
+    verificationOfRestoration: {
+        timestamp: number;
+        claimedTier: "self-signed" | "committed" | "attested" | "consensus" | "proved";
+        sdkVersion: string;
+        checks: {
+            name: string;
+            passed: boolean;
+            detail?: string | undefined;
+        }[];
+        overall: "valid" | "invalid";
+    };
+    score: string;
+    scoreBasis: "absolute-error-linear.v1";
+    scoreVersion: string;
+    oracleReading: {
+        resolveTs: number;
+        pool: string;
+        reserve: string;
+        twaWindowSeconds: number;
+        sampleCount: number;
+    };
+    groundTruth: {
+        twApyBps: string;
+        errorBps: string;
+    };
+}>, {
+    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
+    claimed: {
+        submittedAt: number;
+        modelId: string;
+        predictedBps: string;
+        submissionManifestCid?: string | undefined;
+    };
+    solutionEnvelope: {
         cid: string;
         sha256: string;
     };
+    checks: {
+        name: string;
+        status: "PASS" | "FAIL" | "SKIP" | "INDETERMINATE";
+        detail?: string | Record<string, unknown> | undefined;
+    }[];
     verificationOfRestoration: {
         timestamp: number;
         claimedTier: "self-signed" | "committed" | "attested" | "consensus" | "proved";
@@ -227,5 +269,5 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodObject<{
         twApyBps: string;
         errorBps: string;
     };
-}>;
+}, unknown>;
 export type PredictionApyV0VerdictPayload = z.infer<typeof PredictionApyV0VerdictPayloadSchema>;

package/dist/types/payloads/prediction-apy-v0.js

@@ -19,6 +19,19 @@ const CheckSchema = z.object({
     status: z.enum(['PASS', 'FAIL', 'SKIP', 'INDETERMINATE']),
     detail: z.union([z.string(), z.record(z.unknown())]).optional(),
 });
+const EnvelopeRefSchema = z.object({
+    cid: z.string().min(1),
+    sha256: z.string().regex(/^[0-9a-f]{64}$/),
+});
+function normalizeLegacySolutionEnvelopePayload(value) {
+    if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+        const payload = value;
+        if (payload['solutionEnvelope'] === undefined && payload['restorationEnvelope'] !== undefined) {
+            return { ...payload, solutionEnvelope: payload['restorationEnvelope'] };
+        }
+    }
+    return value;
+}
 const VerificationCheckSchema = z.object({
     name: z.string(),
     passed: z.boolean(),
@@ -31,11 +44,8 @@ const VerificationOfRestorationSchema = z.object({
     checks: z.array(VerificationCheckSchema),
     overall: z.enum(['valid', 'invalid']),
 });
-export const PredictionApyV0VerdictPayloadSchema = z.object({
-    restorationEnvelope: z.object({
-        cid: z.string().min(1),
-        sha256: z.string().regex(/^[0-9a-f]{64}$/),
-    }),
+export const PredictionApyV0VerdictPayloadSchema = z.preprocess(normalizeLegacySolutionEnvelopePayload, z.object({
+    solutionEnvelope: EnvelopeRefSchema,
     verificationOfRestoration: VerificationOfRestorationSchema,
     verdict: z.enum(['PASS', 'FAIL', 'REJECTED', 'INDETERMINATE']),
     score: z.string(),
@@ -59,5 +69,5 @@ export const PredictionApyV0VerdictPayloadSchema = z.object({
         errorBps: z.string().regex(/^\d+$/),
     }),
     checks: z.array(CheckSchema),
-});
+}));
 //# sourceMappingURL=prediction-apy-v0.js.map

package/dist/types/payloads/prediction-apy-v0.js.map

@@ -1 +1 @@
-{"version":3,"file":"prediction-apy-v0.js","sourceRoot":"","sources":["../../../src/types/payloads/prediction-apy-v0.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prediction-apy-v0.js","sourceRoot":"","sources":["../../../src/types/payloads/prediction-apy-v0.ts"],"names":[],"mappings":"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"}

package/dist/types/payloads/prediction-v0.d.ts

@@ -77,8 +77,8 @@ export declare const PredictionV0RestorationPayloadSchema: z.ZodObject<{
     } | undefined;
 }>;
 export type PredictionV0RestorationPayload = z.infer<typeof PredictionV0RestorationPayloadSchema>;
-export declare const PredictionV0VerdictPayloadSchema: z.ZodObject<{
-    restorationEnvelope: z.ZodObject<{
+export declare const PredictionV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
+    solutionEnvelope: z.ZodObject<{
         cid: z.ZodString;
         sha256: z.ZodString;
     }, "strip", z.ZodTypeAny, {
@@ -181,22 +181,22 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodObject<{
         detail?: string | Record<string, unknown> | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
+    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
     claimed: {
         probability: string;
         submittedAt: number;
         modelId: string;
         submissionManifestCid?: string | undefined;
     };
-    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
+    solutionEnvelope: {
+        cid: string;
+        sha256: string;
+    };
     checks: {
         name: string;
         status: "PASS" | "FAIL" | "SKIP" | "INDETERMINATE";
         detail?: string | Record<string, unknown> | undefined;
     }[];
-    restorationEnvelope: {
-        cid: string;
-        sha256: string;
-    };
     verificationOfRestoration: {
         timestamp: number;
         claimedTier: "self-signed" | "committed" | "attested" | "consensus" | "proved";
@@ -220,22 +220,61 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodObject<{
     };
     groundTruth: "YES" | "NO";
 }, {
+    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
     claimed: {
         probability: string;
         submittedAt: number;
         modelId: string;
         submissionManifestCid?: string | undefined;
     };
-    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
+    solutionEnvelope: {
+        cid: string;
+        sha256: string;
+    };
     checks: {
         name: string;
         status: "PASS" | "FAIL" | "SKIP" | "INDETERMINATE";
         detail?: string | Record<string, unknown> | undefined;
     }[];
-    restorationEnvelope: {
+    verificationOfRestoration: {
+        timestamp: number;
+        claimedTier: "self-signed" | "committed" | "attested" | "consensus" | "proved";
+        sdkVersion: string;
+        checks: {
+            name: string;
+            passed: boolean;
+            detail?: string | undefined;
+        }[];
+        overall: "valid" | "invalid";
+    };
+    score: string;
+    scoreBasis: "brier.v1";
+    scoreVersion: string;
+    oracleReading: {
+        feed: string;
+        roundId: string;
+        answer: string;
+        updatedAt: number;
+        nextRoundUpdatedAt?: number | undefined;
+    };
+    groundTruth: "YES" | "NO";
+}>, {
+    verdict: "PASS" | "FAIL" | "REJECTED" | "INDETERMINATE";
+    claimed: {
+        probability: string;
+        submittedAt: number;
+        modelId: string;
+        submissionManifestCid?: string | undefined;
+    };
+    solutionEnvelope: {
         cid: string;
         sha256: string;
     };
+    checks: {
+        name: string;
+        status: "PASS" | "FAIL" | "SKIP" | "INDETERMINATE";
+        detail?: string | Record<string, unknown> | undefined;
+    }[];
     verificationOfRestoration: {
         timestamp: number;
         claimedTier: "self-signed" | "committed" | "attested" | "consensus" | "proved";
@@ -258,5 +297,5 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodObject<{
         nextRoundUpdatedAt?: number | undefined;
     };
     groundTruth: "YES" | "NO";
-}>;
+}, unknown>;
 export type PredictionV0VerdictPayload = z.infer<typeof PredictionV0VerdictPayloadSchema>;

package/dist/types/payloads/prediction-v0.js

@@ -32,6 +32,19 @@ const CheckSchema = z.object({
     status: z.enum(['PASS', 'FAIL', 'SKIP', 'INDETERMINATE']),
     detail: z.union([z.string(), z.record(z.unknown())]).optional(),
 });
+const EnvelopeRefSchema = z.object({
+    cid: z.string().min(1),
+    sha256: z.string().regex(/^[0-9a-f]{64}$/),
+});
+function normalizeLegacySolutionEnvelopePayload(value) {
+    if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+        const payload = value;
+        if (payload['solutionEnvelope'] === undefined && payload['restorationEnvelope'] !== undefined) {
+            return { ...payload, solutionEnvelope: payload['restorationEnvelope'] };
+        }
+    }
+    return value;
+}
 const VerificationCheckSchema = z.object({
     name: z.string(),
     passed: z.boolean(),
@@ -44,11 +57,8 @@ const VerificationOfRestorationSchema = z.object({
     checks: z.array(VerificationCheckSchema),
     overall: z.enum(['valid', 'invalid']),
 });
-export const PredictionV0VerdictPayloadSchema = z.object({
-    restorationEnvelope: z.object({
-        cid: z.string().min(1),
-        sha256: z.string().regex(/^[0-9a-f]{64}$/),
-    }),
+export const PredictionV0VerdictPayloadSchema = z.preprocess(normalizeLegacySolutionEnvelopePayload, z.object({
+    solutionEnvelope: EnvelopeRefSchema,
     verificationOfRestoration: VerificationOfRestorationSchema,
     verdict: z.enum(['PASS', 'FAIL', 'REJECTED', 'INDETERMINATE']),
     score: z.string(),
@@ -69,5 +79,5 @@ export const PredictionV0VerdictPayloadSchema = z.object({
     }),
     groundTruth: z.enum(['YES', 'NO']),
     checks: z.array(CheckSchema),
-});
+}));
 //# sourceMappingURL=prediction-v0.js.map

package/dist/types/payloads/prediction-v0.js.map

@@ -1 +1 @@
-{"version":3,"file":"prediction-v0.js","sourceRoot":"","sources":["../../../src/types/payloads/prediction-v0.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prediction-v0.js","sourceRoot":"","sources":["../../../src/types/payloads/prediction-v0.ts"],"names":[],"mappings":"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"}

package/dist/vendor/@jinn-network/sdk/dist/payloads/prediction-v1.d.ts

@@ -46,7 +46,7 @@ export declare const PredictionV1RestorationPayloadSchema: z.ZodObject<{
     }[] | undefined;
 }>;
 export type PredictionV1RestorationPayload = z.infer<typeof PredictionV1RestorationPayloadSchema>;
-export declare const PredictionV1VerdictPayloadSchema: z.ZodObject<{
+export declare const PredictionV1VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
     verdict: z.ZodEnum<["SCORED", "REJECTED", "INVALID", "INDETERMINATE"]>;
     outcome: z.ZodOptional<z.ZodEnum<["YES", "NO", "INVALID"]>>;
     resolvedAt: z.ZodOptional<z.ZodString>;
@@ -142,6 +142,10 @@ export declare const PredictionV1VerdictPayloadSchema: z.ZodObject<{
         detail?: string | Record<string, unknown> | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
+    solutionEnvelope: {
+        cid: string;
+        sha256: string;
+    };
     verdict: "INDETERMINATE" | "SCORED" | "REJECTED" | "INVALID";
     resolutionSource: {
         venue: "polymarket";
@@ -153,10 +157,6 @@ export declare const PredictionV1VerdictPayloadSchema: z.ZodObject<{
         cid: string;
         id: string;
     };
-    solutionEnvelope: {
-        cid: string;
-        sha256: string;
-    };
     benchmark: {
         sampledAt: string;
         probabilityYes: string;
@@ -181,6 +181,10 @@ export declare const PredictionV1VerdictPayloadSchema: z.ZodObject<{
         brierSpread: string;
     } | undefined;
 }, {
+    solutionEnvelope: {
+        cid: string;
+        sha256: string;
+    };
     verdict: "INDETERMINATE" | "SCORED" | "REJECTED" | "INVALID";
     resolutionSource: {
         venue: "polymarket";
@@ -192,10 +196,45 @@ export declare const PredictionV1VerdictPayloadSchema: z.ZodObject<{
         cid: string;
         id: string;
     };
+    benchmark: {
+        sampledAt: string;
+        probabilityYes: string;
+        method: "best-bid-ask-midpoint";
+    };
+    checks: {
+        status: "PASS" | "FAIL" | "SKIP" | "INDETERMINATE";
+        name: string;
+        detail?: string | Record<string, unknown> | undefined;
+    }[];
+    outcome?: "YES" | "NO" | "INVALID" | undefined;
+    resolvedAt?: string | undefined;
+    claimed?: {
+        probabilityYes: string;
+        submittedAt: string;
+        modelId: string;
+    } | undefined;
+    scores?: {
+        scoreBasis: "brier-loss.v1";
+        solverBrier: string;
+        consensusBrier: string;
+        brierSpread: string;
+    } | undefined;
+}>, {
     solutionEnvelope: {
         cid: string;
         sha256: string;
     };
+    verdict: "INDETERMINATE" | "SCORED" | "REJECTED" | "INVALID";
+    resolutionSource: {
+        venue: "polymarket";
+        url: string;
+        marketId: string;
+        conditionId: string;
+    };
+    task: {
+        cid: string;
+        id: string;
+    };
     benchmark: {
         sampledAt: string;
         probabilityYes: string;
@@ -219,5 +258,5 @@ export declare const PredictionV1VerdictPayloadSchema: z.ZodObject<{
         consensusBrier: string;
         brierSpread: string;
     } | undefined;
-}>;
+}, unknown>;
 export type PredictionV1VerdictPayload = z.infer<typeof PredictionV1VerdictPayloadSchema>;

package/dist/vendor/@jinn-network/sdk/dist/payloads/prediction-v1.js

@@ -1,6 +1,19 @@
 import { z } from 'zod';
 import { DecimalProbabilitySchema, IsoDateTimeSchema } from '../prediction-v1.js';
 const Sha256Schema = z.string().regex(/^[0-9a-f]{64}$/);
+const EnvelopeRefSchema = z.object({
+    cid: z.string(),
+    sha256: Sha256Schema,
+});
+function normalizeLegacySolutionEnvelopePayload(value) {
+    if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+        const payload = value;
+        if (payload['solutionEnvelope'] === undefined && payload['restorationEnvelope'] !== undefined) {
+            return { ...payload, solutionEnvelope: payload['restorationEnvelope'] };
+        }
+    }
+    return value;
+}
 const CheckSchema = z.object({
     name: z.string().min(1),
     status: z.enum(['PASS', 'FAIL', 'SKIP', 'INDETERMINATE']),
@@ -22,7 +35,7 @@ export const PredictionV1RestorationPayloadSchema = z.object({
     }))
         .optional(),
 });
-export const PredictionV1VerdictPayloadSchema = z.object({
+export const PredictionV1VerdictPayloadSchema = z.preprocess(normalizeLegacySolutionEnvelopePayload, z.object({
     verdict: z.enum(['SCORED', 'REJECTED', 'INVALID', 'INDETERMINATE']),
     outcome: z.enum(['YES', 'NO', 'INVALID']).optional(),
     resolvedAt: IsoDateTimeSchema.optional(),
@@ -36,10 +49,7 @@ export const PredictionV1VerdictPayloadSchema = z.object({
         cid: z.string(),
         id: z.string().min(1),
     }),
-    solutionEnvelope: z.object({
-        cid: z.string(),
-        sha256: Sha256Schema,
-    }),
+    solutionEnvelope: EnvelopeRefSchema,
     claimed: z
         .object({
         probabilityYes: DecimalProbabilitySchema,
@@ -61,4 +71,4 @@ export const PredictionV1VerdictPayloadSchema = z.object({
     })
         .optional(),
     checks: z.array(CheckSchema),
-});
+}));

package/dist/x402/handler.js

@@ -10,6 +10,9 @@
  * The route is keyed by sha256, matching the artifact identifier in the signed
  * envelope (post jinn-mono-vy37.1.2 — artifacts no longer have IPFS CIDs).
  */
+import { x402ResourceServer } from '@x402/core/server';
+import { decodePaymentSignatureHeader, encodePaymentRequiredHeader, encodePaymentResponseHeader } from '@x402/core/http';
+import { registerExactEvmScheme as registerExactEvmServerScheme } from '@x402/evm/exact/server';
 import { createLocalFacilitatorClient } from './facilitator.js';
 function dollarStringFromUsdc(usdc) {
     // X402 'exact' scheme expects a string like '$0.001' for USDC amounts.
@@ -43,7 +46,9 @@ function stringFromRecord(value, keys) {
     return typeof current === 'string' && current.length > 0 ? current : null;
 }
 function payerFromPayload(payload) {
-    return (stringFromRecord(payload, ['payload', 'authorization', 'from'])
+    return (stringFromRecord(payload, ['authorization', 'from'])
+        ?? stringFromRecord(payload, ['permit2Authorization', 'owner'])
+        ?? stringFromRecord(payload, ['payload', 'authorization', 'from'])
         ?? stringFromRecord(payload, ['payload', 'permit2Authorization', 'owner'])
         ?? stringFromRecord(payload, ['payer']));
 }
@@ -67,7 +72,36 @@ export function addX402Routes(app, store, config) {
         network: config.network,
         rpcUrl: config.rpcUrl,
     });
+    const resourceServer = new x402ResourceServer(facilitator);
     const network = (config.network ?? 'eip155:8453');
+    registerExactEvmServerScheme(resourceServer, { networks: [network] });
+    const resourceServerReady = resourceServer.initialize();
+    async function paymentRequiredFor(c, sha256, priceUsdc) {
+        await resourceServerReady;
+        const requirements = await resourceServer.buildPaymentRequirements({
+            scheme: 'exact',
+            payTo: config.recipientAddress,
+            price: dollarStringFromUsdc(priceUsdc),
+            network,
+            maxTimeoutSeconds: 300,
+        });
+        const response = await resourceServer.createPaymentRequiredResponse(requirements, {
+            url: c.req.url,
+            description: `artifact ${sha256.slice(0, 12)}`,
+            mimeType: 'application/octet-stream',
+        }, 'Payment required');
+        return { requirements, response };
+    }
+    function paymentRequiredResponse(response) {
+        return new Response(JSON.stringify(response), {
+            status: 402,
+            headers: {
+                'Content-Type': 'application/json',
+                'PAYMENT-REQUIRED': encodePaymentRequiredHeader(response),
+                'Access-Control-Expose-Headers': 'PAYMENT-REQUIRED,X-PAYMENT-RESPONSE',
+            },
+        });
+    }
     app.get('/v1/artifacts/:sha256/content', async (c) => {
         const sha256 = c.req.param('sha256');
         if (!sha256)
@@ -99,16 +133,10 @@ export function addX402Routes(app, store, config) {
             c.header('X-Artifact-Type', row.artifactType ?? '');
             return c.body(new Uint8Array(row.content));
         }
-        // Paid path
-        const accepts = [{
-                scheme: 'exact',
-                payTo: config.recipientAddress,
-                price: dollarStringFromUsdc(row.priceUsdc),
-                network,
-                description: `artifact ${sha256.slice(0, 12)}…`,
-            }];
-        const xPayment = c.req.header('X-Payment');
-        if (!xPayment) {
+        // Paid path.
+        const { requirements, response: paymentRequired } = await paymentRequiredFor(c, sha256, row.priceUsdc);
+        const paymentSignature = c.req.header('PAYMENT-SIGNATURE') ?? c.req.header('X-Payment');
+        if (!paymentSignature) {
             safeRecordAccess(store, {
                 sha256,
                 artifactType: row.artifactType,
@@ -118,12 +146,12 @@ export function addX402Routes(app, store, config) {
                 createdAt: new Date().toISOString(),
                 ...requestMeta(c),
             });
-            return c.json({ accepts }, 402);
+            return paymentRequiredResponse(paymentRequired);
         }
         let decoded;
         try {
-            decoded = JSON.parse(Buffer.from(xPayment, 'base64').toString('utf-8'));
-            const requirement = accepts.find((a) => a.scheme === decoded.scheme);
+            decoded = decodePaymentSignatureHeader(paymentSignature);
+            const requirement = resourceServer.findMatchingRequirements(requirements, decoded);
             if (!requirement) {
                 safeRecordAccess(store, {
                     sha256,
@@ -136,9 +164,9 @@ export function addX402Routes(app, store, config) {
                     createdAt: new Date().toISOString(),
                     ...requestMeta(c),
                 });
-                return c.json({ error: 'Unsupported payment scheme', accepts }, 402);
+                return paymentRequiredResponse(paymentRequired);
             }
-            const verification = await facilitator.verify(decoded.payload, requirement);
+            const verification = await resourceServer.verifyPayment(decoded, requirement);
             if (!verification.isValid) {
                 const reason = verification.invalidReason ?? 'Payment verification failed';
                 safeRecordAccess(store, {
@@ -152,9 +180,9 @@ export function addX402Routes(app, store, config) {
                     createdAt: new Date().toISOString(),
                     ...requestMeta(c),
                 });
-                return c.json({ error: reason, accepts }, 402);
+                return paymentRequiredResponse(paymentRequired);
             }
-            const settlement = await facilitator.settle(decoded.payload, requirement);
+            const settlement = await resourceServer.settlePayment(decoded, requirement);
             if (!settlement.success) {
                 const reason = settlement.errorReason ?? 'Settlement failed';
                 safeRecordAccess(store, {
@@ -169,7 +197,7 @@ export function addX402Routes(app, store, config) {
                     createdAt: new Date().toISOString(),
                     ...requestMeta(c),
                 });
-                return c.json({ error: reason, accepts }, 402);
+                return paymentRequiredResponse(paymentRequired);
             }
             safeRecordAccess(store, {
                 sha256,
@@ -182,6 +210,9 @@ export function addX402Routes(app, store, config) {
                 createdAt: new Date().toISOString(),
                 ...requestMeta(c),
             });
+            const paymentResponse = encodePaymentResponseHeader(settlement);
+            c.header('PAYMENT-RESPONSE', paymentResponse);
+            c.header('X-PAYMENT-RESPONSE', paymentResponse);
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -195,7 +226,7 @@ export function addX402Routes(app, store, config) {
                 createdAt: new Date().toISOString(),
                 ...requestMeta(c),
             });
-            return c.json({ error: `Payment validation error: ${msg}`, accepts }, 402);
+            return paymentRequiredResponse(paymentRequired);
         }
         c.header('Content-Type', mimeForArtifactType(row.artifactType));
         c.header('X-Artifact-Type', row.artifactType ?? '');

package/dist/x402/handler.js.map

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