@agent-score/commerce 2.7.4 → 2.7.5

package/dist/payment/index.d.mts

@@ -403,27 +403,27 @@ declare function classifyX402SettleResult(result: ProcessX402SettleResult): Clas
  */
 declare function classifyOrchestrationError(err: unknown): ClassifiedX402Error | null;
 /**
- * Reshape a decoded X-Payment payload into the lean canonical x402 PaymentPayload the
- * facilitator's verify/settle endpoints validate: `{ x402Version, scheme, network, payload }`.
- *
- * agentscore-pay (and other x402 clients) transmit a richer wire shape: the chosen
- * requirement is nested under `accepted` (which `verifyX402Request` reads for network/payTo),
- * and the 402 challenge's `extensions` (Bazaar input schema) + `resource` blocks are echoed
- * alongside the signed `payload`. None of that is part of the EIP-3009 signature; the
- * signature covers only `payload.authorization`; but CDP's `/x402/verify` validates the
- * paymentPayload against the `x402V2PaymentPayload` union, which requires top-level
- * `scheme` + `network`: a payload that carries them only under `accepted` matches neither
- * branch, and the echoed `extensions.bazaar.schema` bloats the body enough that CDP rejects
- * it on larger schemas while tolerating small ones ("must match one of [x402V2PaymentPayload,
- * x402V1PaymentPayload]"). Forwarding the four canonical fields only fixes it regardless of size.
- *
- * `scheme`/`network` are lifted out of `accepted`, falling back to any top-level values a
- * canonical client already sent. The full `accepted`/`extensions`/`resource` stay on the wire
- * for `verifyX402Request`; they are dropped only here, at the facilitator boundary. A payload
- * that lacks the canonical pieces (unexpected shape) passes through untouched so it reaches the
- * facilitator unchanged rather than silently mangled.
- */
-declare function toCanonicalX402PaymentPayload(payload: unknown): unknown;
+ * Strip the non-signed `extensions` + `resource` blocks from a decoded X-Payment payload
+ * before it is forwarded to the facilitator's verify/settle endpoints.
+ *
+ * agentscore-pay (and other x402 clients) echo the 402 challenge's `extensions` (Bazaar
+ * input schema) and `resource` blocks into the payload alongside the signed `payload` +
+ * `accepted`. Neither is part of the EIP-3009 signature (which covers only
+ * `payload.authorization`). CDP's `/x402/verify` validates the paymentPayload against its
+ * `x402V2PaymentPayload` schema, which is `{ x402Version, payload, accepted }` and admits
+ * neither `extensions` nor `resource`: their presence makes the payload match no union
+ * branch and CDP rejects it ("must match one of [x402V2PaymentPayload, x402V1PaymentPayload]").
+ * Endpoints whose echoed Bazaar schema is large fail while small ones happen to slip through,
+ * so it presents as "works on some routes, fails on others" but is one shape bug.
+ *
+ * Confirmed against the live CDP facilitator: accepted-nested WITHOUT extensions/resource
+ * passes schema and reaches signature verify; a flat `{ x402Version, scheme, network, payload }`
+ * is rejected with "x402V2PaymentPayload requires 'accepted'". So `accepted` (which
+ * `verifyX402Request` reads for network/payTo) and every other field stay intact; only the
+ * two echoed challenge blocks are dropped, and only here at the facilitator boundary.
+ * Non-object payloads, and payloads carrying neither field, pass through untouched.
+ */
+declare function stripUnsignedX402PayloadFields(payload: unknown): unknown;
 declare function processX402Settle({ x402Server, payload, resourceConfig, resourceMeta, extension, transportContext, }: {
     /** The x402 server instance from `createX402Server`. */
     x402Server: X402Server;
@@ -923,4 +923,4 @@ declare function lazyMppxServer(opts: {
     secretKey: string;
 }): () => Promise<unknown>;
 
-export { type ClassifiedX402Error, type MppxComposeResult, type MppxRailSpec, type NetworkFamily, type PaymentHeadersRail, type PaymentHeadersResult, type ProcessX402SettleFailure, type ProcessX402SettleResult, type ProcessX402SettleSuccess, type RailDefinition, type RailName, SETTLEMENT_OVERRIDES_HEADER, type SettlementHandlers, type SettlementOverrides, type SettlementPayloadLike, SignerNetwork, SolanaMppRailSpec, StripeRailSpec, TempoRailSpec, TempoSessionRailSpec, USDC, type VerifyX402RequestResult, X402BaseRailSpec, X402Server, type X402ServerLike, X402_SUPPORTED_BASE_NETWORKS, type ZeroSettleRail, type ZeroSettleResult, buildIdempotencyKey, buildPaymentDirective, buildPaymentHeaders, buildPaymentRequestBlob, classifyOrchestrationError, classifyX402SettleResult, composeMppxRequest, createMppxServer, detectRailFromHeaders, dispatchSettlementByNetwork, lazyMppxServer, lazyX402Server, lookupRail, mppCredentialPayloadType, mppxChallengeHeaders, networkFamily, networks, paymentDirective, processX402Settle, rails, registerX402SchemesV1V2, runWithMppxFailureCapture, settlementOverrideHeader, toCanonicalX402PaymentPayload, validateX402NetworkConfig, verifyX402Request, wrapSolanaChargeWithFinalizedBlockhash, zeroAmountCarveOut };
+export { type ClassifiedX402Error, type MppxComposeResult, type MppxRailSpec, type NetworkFamily, type PaymentHeadersRail, type PaymentHeadersResult, type ProcessX402SettleFailure, type ProcessX402SettleResult, type ProcessX402SettleSuccess, type RailDefinition, type RailName, SETTLEMENT_OVERRIDES_HEADER, type SettlementHandlers, type SettlementOverrides, type SettlementPayloadLike, SignerNetwork, SolanaMppRailSpec, StripeRailSpec, TempoRailSpec, TempoSessionRailSpec, USDC, type VerifyX402RequestResult, X402BaseRailSpec, X402Server, type X402ServerLike, X402_SUPPORTED_BASE_NETWORKS, type ZeroSettleRail, type ZeroSettleResult, buildIdempotencyKey, buildPaymentDirective, buildPaymentHeaders, buildPaymentRequestBlob, classifyOrchestrationError, classifyX402SettleResult, composeMppxRequest, createMppxServer, detectRailFromHeaders, dispatchSettlementByNetwork, lazyMppxServer, lazyX402Server, lookupRail, mppCredentialPayloadType, mppxChallengeHeaders, networkFamily, networks, paymentDirective, processX402Settle, rails, registerX402SchemesV1V2, runWithMppxFailureCapture, settlementOverrideHeader, stripUnsignedX402PayloadFields, validateX402NetworkConfig, verifyX402Request, wrapSolanaChargeWithFinalizedBlockhash, zeroAmountCarveOut };

package/dist/payment/index.d.ts

@@ -403,27 +403,27 @@ declare function classifyX402SettleResult(result: ProcessX402SettleResult): Clas
  */
 declare function classifyOrchestrationError(err: unknown): ClassifiedX402Error | null;
 /**
- * Reshape a decoded X-Payment payload into the lean canonical x402 PaymentPayload the
- * facilitator's verify/settle endpoints validate: `{ x402Version, scheme, network, payload }`.
- *
- * agentscore-pay (and other x402 clients) transmit a richer wire shape: the chosen
- * requirement is nested under `accepted` (which `verifyX402Request` reads for network/payTo),
- * and the 402 challenge's `extensions` (Bazaar input schema) + `resource` blocks are echoed
- * alongside the signed `payload`. None of that is part of the EIP-3009 signature; the
- * signature covers only `payload.authorization`; but CDP's `/x402/verify` validates the
- * paymentPayload against the `x402V2PaymentPayload` union, which requires top-level
- * `scheme` + `network`: a payload that carries them only under `accepted` matches neither
- * branch, and the echoed `extensions.bazaar.schema` bloats the body enough that CDP rejects
- * it on larger schemas while tolerating small ones ("must match one of [x402V2PaymentPayload,
- * x402V1PaymentPayload]"). Forwarding the four canonical fields only fixes it regardless of size.
- *
- * `scheme`/`network` are lifted out of `accepted`, falling back to any top-level values a
- * canonical client already sent. The full `accepted`/`extensions`/`resource` stay on the wire
- * for `verifyX402Request`; they are dropped only here, at the facilitator boundary. A payload
- * that lacks the canonical pieces (unexpected shape) passes through untouched so it reaches the
- * facilitator unchanged rather than silently mangled.
- */
-declare function toCanonicalX402PaymentPayload(payload: unknown): unknown;
+ * Strip the non-signed `extensions` + `resource` blocks from a decoded X-Payment payload
+ * before it is forwarded to the facilitator's verify/settle endpoints.
+ *
+ * agentscore-pay (and other x402 clients) echo the 402 challenge's `extensions` (Bazaar
+ * input schema) and `resource` blocks into the payload alongside the signed `payload` +
+ * `accepted`. Neither is part of the EIP-3009 signature (which covers only
+ * `payload.authorization`). CDP's `/x402/verify` validates the paymentPayload against its
+ * `x402V2PaymentPayload` schema, which is `{ x402Version, payload, accepted }` and admits
+ * neither `extensions` nor `resource`: their presence makes the payload match no union
+ * branch and CDP rejects it ("must match one of [x402V2PaymentPayload, x402V1PaymentPayload]").
+ * Endpoints whose echoed Bazaar schema is large fail while small ones happen to slip through,
+ * so it presents as "works on some routes, fails on others" but is one shape bug.
+ *
+ * Confirmed against the live CDP facilitator: accepted-nested WITHOUT extensions/resource
+ * passes schema and reaches signature verify; a flat `{ x402Version, scheme, network, payload }`
+ * is rejected with "x402V2PaymentPayload requires 'accepted'". So `accepted` (which
+ * `verifyX402Request` reads for network/payTo) and every other field stay intact; only the
+ * two echoed challenge blocks are dropped, and only here at the facilitator boundary.
+ * Non-object payloads, and payloads carrying neither field, pass through untouched.
+ */
+declare function stripUnsignedX402PayloadFields(payload: unknown): unknown;
 declare function processX402Settle({ x402Server, payload, resourceConfig, resourceMeta, extension, transportContext, }: {
     /** The x402 server instance from `createX402Server`. */
     x402Server: X402Server;
@@ -923,4 +923,4 @@ declare function lazyMppxServer(opts: {
     secretKey: string;
 }): () => Promise<unknown>;
 
-export { type ClassifiedX402Error, type MppxComposeResult, type MppxRailSpec, type NetworkFamily, type PaymentHeadersRail, type PaymentHeadersResult, type ProcessX402SettleFailure, type ProcessX402SettleResult, type ProcessX402SettleSuccess, type RailDefinition, type RailName, SETTLEMENT_OVERRIDES_HEADER, type SettlementHandlers, type SettlementOverrides, type SettlementPayloadLike, SignerNetwork, SolanaMppRailSpec, StripeRailSpec, TempoRailSpec, TempoSessionRailSpec, USDC, type VerifyX402RequestResult, X402BaseRailSpec, X402Server, type X402ServerLike, X402_SUPPORTED_BASE_NETWORKS, type ZeroSettleRail, type ZeroSettleResult, buildIdempotencyKey, buildPaymentDirective, buildPaymentHeaders, buildPaymentRequestBlob, classifyOrchestrationError, classifyX402SettleResult, composeMppxRequest, createMppxServer, detectRailFromHeaders, dispatchSettlementByNetwork, lazyMppxServer, lazyX402Server, lookupRail, mppCredentialPayloadType, mppxChallengeHeaders, networkFamily, networks, paymentDirective, processX402Settle, rails, registerX402SchemesV1V2, runWithMppxFailureCapture, settlementOverrideHeader, toCanonicalX402PaymentPayload, validateX402NetworkConfig, verifyX402Request, wrapSolanaChargeWithFinalizedBlockhash, zeroAmountCarveOut };
+export { type ClassifiedX402Error, type MppxComposeResult, type MppxRailSpec, type NetworkFamily, type PaymentHeadersRail, type PaymentHeadersResult, type ProcessX402SettleFailure, type ProcessX402SettleResult, type ProcessX402SettleSuccess, type RailDefinition, type RailName, SETTLEMENT_OVERRIDES_HEADER, type SettlementHandlers, type SettlementOverrides, type SettlementPayloadLike, SignerNetwork, SolanaMppRailSpec, StripeRailSpec, TempoRailSpec, TempoSessionRailSpec, USDC, type VerifyX402RequestResult, X402BaseRailSpec, X402Server, type X402ServerLike, X402_SUPPORTED_BASE_NETWORKS, type ZeroSettleRail, type ZeroSettleResult, buildIdempotencyKey, buildPaymentDirective, buildPaymentHeaders, buildPaymentRequestBlob, classifyOrchestrationError, classifyX402SettleResult, composeMppxRequest, createMppxServer, detectRailFromHeaders, dispatchSettlementByNetwork, lazyMppxServer, lazyX402Server, lookupRail, mppCredentialPayloadType, mppxChallengeHeaders, networkFamily, networks, paymentDirective, processX402Settle, rails, registerX402SchemesV1V2, runWithMppxFailureCapture, settlementOverrideHeader, stripUnsignedX402PayloadFields, validateX402NetworkConfig, verifyX402Request, wrapSolanaChargeWithFinalizedBlockhash, zeroAmountCarveOut };

package/dist/payment/index.js

@@ -68,7 +68,7 @@ __export(payment_exports, {
   resolveRecipient: () => resolveRecipient,
   runWithMppxFailureCapture: () => runWithMppxFailureCapture,
   settlementOverrideHeader: () => settlementOverrideHeader,
-  toCanonicalX402PaymentPayload: () => toCanonicalX402PaymentPayload,
+  stripUnsignedX402PayloadFields: () => stripUnsignedX402PayloadFields,
   usdToAtomic: () => usdToAtomic,
   validateX402NetworkConfig: () => validateX402NetworkConfig,
   verifyX402Request: () => verifyX402Request,
@@ -520,20 +520,16 @@ function classifyOrchestrationError(err) {
   }
   return null;
 }
-function toCanonicalX402PaymentPayload(payload) {
+function stripUnsignedX402PayloadFields(payload) {
   if (typeof payload !== "object" || payload === null) return payload;
   const p = payload;
-  const accepted = typeof p.accepted === "object" && p.accepted !== null ? p.accepted : void 0;
-  const scheme = p.scheme ?? accepted?.scheme;
-  const network = p.network ?? accepted?.network;
-  const inner = p.payload;
-  if (scheme === void 0 || network === void 0 || inner === void 0) return payload;
-  return {
-    x402Version: p.x402Version ?? 2,
-    scheme,
-    network,
-    payload: inner
-  };
+  if (!("extensions" in p) && !("resource" in p)) return payload;
+  const rest = {};
+  for (const [k, v] of Object.entries(p)) {
+    if (k === "extensions" || k === "resource") continue;
+    rest[k] = v;
+  }
+  return rest;
 }
 async function processX402Settle({
   x402Server,
@@ -555,7 +551,7 @@ async function processX402Settle({
   if (!matchedRequirement) {
     return { success: false, phase: "no_requirements", reason: "x402Server.buildPaymentRequirements returned empty" };
   }
-  const canonicalPayload = toCanonicalX402PaymentPayload(payload);
+  const facilitatorPayload = stripUnsignedX402PayloadFields(payload);
   const resolvedTransportContext = transportContext ?? (() => {
     const path = new URL(resourceMeta.url).pathname;
     return { method: "POST", adapter: { getPath: () => path }, routePattern: path };
@@ -570,7 +566,7 @@ async function processX402Settle({
   let verifyResult;
   try {
     verifyResult = await server.verifyPayment(
-      canonicalPayload,
+      facilitatorPayload,
       matchedRequirement,
       enrichedExt,
       resolvedTransportContext
@@ -585,7 +581,7 @@ async function processX402Settle({
   }
   try {
     const settleResult = await server.settlePayment(
-      canonicalPayload,
+      facilitatorPayload,
       matchedRequirement,
       enrichedExt,
       resolvedTransportContext
@@ -1559,7 +1555,7 @@ function isSolanaNetwork(input) {
   resolveRecipient,
   runWithMppxFailureCapture,
   settlementOverrideHeader,
-  toCanonicalX402PaymentPayload,
+  stripUnsignedX402PayloadFields,
   usdToAtomic,
   validateX402NetworkConfig,
   verifyX402Request,