fix: Python facilitator e2e code

Author: CarsonRoscoe

e2e/clients/httpx/test.config.json

@@ -7,6 +7,7 @@
     "svm"
   ],
   "x402Versions": [
+    1,
     2
   ],
   "description": "Python httpx client with x402 v2 payment hooks",
@@ -20,4 +21,4 @@
       "SVM_PRIVATE_KEY"
     ]
   }
-}
+}

e2e/clients/requests/test.config.json

@@ -7,6 +7,7 @@
     "svm"
   ],
   "x402Versions": [
+    1,
     2
   ],
   "description": "Python requests client with x402 v2 HTTP adapter",
@@ -20,4 +21,4 @@
       "SVM_PRIVATE_KEY"
     ]
   }
-}
+}

e2e/facilitators/python/main.py

@@ -111,9 +111,7 @@ def _handle_after_verify(ctx: Any) -> None:
     .on_after_verify(lambda ctx: _handle_after_verify(ctx))
     .on_verify_failure(lambda ctx: print("Verify failure", ctx))
     .on_before_settle(lambda ctx: print("Before settle", ctx))
-    .on_after_settle(
-        lambda ctx: print(f"🎉 Payment settled: {ctx.result.transaction}")
-    )
+    .on_after_settle(lambda ctx: print(f"🎉 Payment settled: {ctx.result.transaction}"))
     .on_settle_failure(lambda ctx: print("Settle failure", ctx))
 )
 
@@ -169,11 +167,13 @@ async def verify(request: VerifyRequest):
         VerifyResponse with isValid and payer (if valid) or invalidReason.
     """
     try:
-        from x402.schemas import PaymentRequirements, parse_payment_payload
+        from x402.schemas import parse_payment_payload, parse_payment_requirements
 
-        # Parse payload (auto-detects V1/V2) and requirements
+        # Parse payload (auto-detects V1/V2) and requirements (based on payload version)
         payload = parse_payment_payload(request.paymentPayload)
-        requirements = PaymentRequirements.model_validate(request.paymentRequirements)
+        requirements = parse_payment_requirements(
+            payload.x402_version, request.paymentRequirements
+        )
 
         # Hooks will automatically:
         # - Track verified payment (on_after_verify)
@@ -203,11 +203,13 @@ async def settle(request: SettleRequest):
         SettleResponse with success, transaction, network, and payer.
     """
     try:
-        from x402.schemas import PaymentRequirements, parse_payment_payload
+        from x402.schemas import parse_payment_payload, parse_payment_requirements
 
-        # Parse payload (auto-detects V1/V2) and requirements
+        # Parse payload (auto-detects V1/V2) and requirements (based on payload version)
         payload = parse_payment_payload(request.paymentPayload)
-        requirements = PaymentRequirements.model_validate(request.paymentRequirements)
+        requirements = parse_payment_requirements(
+            payload.x402_version, request.paymentRequirements
+        )
 
         # Hooks will automatically:
         # - Validate payment was verified (on_before_settle - will abort if not)
@@ -337,4 +339,3 @@ async def shutdown():
     print("Facilitator listening")
 
     uvicorn.run(app, host="0.0.0.0", port=PORT, log_level="warning")
-

python/x402/schemas/__init__.py

@@ -54,6 +54,7 @@
     matches_network_pattern,
     parse_payment_payload,
     parse_payment_required,
+    parse_payment_requirements,
 )
 
 # Hook types
@@ -144,6 +145,7 @@
     "match_payload_to_requirements",
     "parse_payment_required",
     "parse_payment_payload",
+    "parse_payment_requirements",
     "matches_network_pattern",
     "derive_network_pattern",
     "find_schemes_by_network",

python/x402/schemas/helpers.py

@@ -4,8 +4,8 @@
 from typing import Any, TypeVar
 
 from .base import Network
-from .payments import PaymentPayload, PaymentRequired
-from .v1 import PaymentPayloadV1, PaymentRequiredV1
+from .payments import PaymentPayload, PaymentRequired, PaymentRequirements
+from .v1 import PaymentPayloadV1, PaymentRequiredV1, PaymentRequirementsV1
 
 
 def detect_version(data: bytes | dict[str, Any]) -> int:
@@ -159,6 +159,40 @@ def parse_payment_payload(
         return PaymentPayload.model_validate_json(json_str)
 
 
+def parse_payment_requirements(
+    x402_version: int,
+    data: bytes | dict[str, Any],
+) -> PaymentRequirements | PaymentRequirementsV1:
+    """Parse payment requirements based on protocol version.
+
+    Unlike parse_payment_payload which auto-detects version from the data,
+    requirements don't contain x402Version - so the version must be provided
+    from the corresponding payment payload.
+
+    Args:
+        x402_version: Protocol version (1 or 2) from the payment payload.
+        data: JSON bytes or parsed dict of payment requirements.
+
+    Returns:
+        PaymentRequirements (V2) or PaymentRequirementsV1 (V1).
+
+    Raises:
+        ValueError: If version is invalid.
+    """
+    if x402_version not in (1, 2):
+        raise ValueError(f"Invalid x402Version: {x402_version}")
+
+    if isinstance(data, bytes):
+        json_str = data.decode("utf-8")
+    else:
+        json_str = json.dumps(data)
+
+    if x402_version == 1:
+        return PaymentRequirementsV1.model_validate_json(json_str)
+    else:
+        return PaymentRequirements.model_validate_json(json_str)
+
+
 def matches_network_pattern(network: Network, pattern: Network) -> bool:
     """Check if network matches a pattern (supports wildcards).