oneshot-python 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

oneshot/client.py

@@ -137,9 +137,10 @@ class OneShotClient:
 
             # Step 2 — Parse 402 response
             # Parse x402 v2 PaymentRequired from PAYMENT-REQUIRED header
-            accepted = parse_payment_required(
+            parsed_req = parse_payment_required(
                 resp.headers.get("payment-required")
             )
+            accepted = parsed_req["accepted"]
 
             quote_data = resp.json()
             payment_request = quote_data["payment_request"]
@@ -156,7 +157,7 @@ class OneShotClient:
 
             self._log(f"Payment required: {payment_request['amount']} USDC")
 
-            # Step 3 — Sign x402 payment (v2 format with accepted requirements)
+            # Step 3 — Sign x402 payment (v2 format with accepted requirements + Bazaar metadata)
             auth = sign_payment_authorization(
                 private_key=self._private_key,
                 from_address=self.address,
@@ -166,14 +167,14 @@ class OneShotClient:
                 chain_id=payment_request["chain_id"],
                 network=f"eip155:{payment_request['chain_id']}",
                 accepted=accepted,
+                resource=parsed_req.get("resource"),
+                extensions=parsed_req.get("extensions"),
             )
 
             # Step 4 — Re-POST with payment headers (x402 format)
-            auth_json = json.dumps(auth)
             headers = {
                 **self._headers(),
                 "payment-signature": encode_payment_header(auth),
-                "x-payment": auth_json,  # backwards compat for identity extraction
             }
             if quote_id:
                 headers["x-quote-id"] = quote_id

oneshot/x402.py

@@ -39,8 +39,16 @@ class PaymentAuthorization(TypedDict):
     payload: dict[str, Any]
 
 
-def parse_payment_required(header: str | None) -> PaymentRequirements:
-    """Decode the base64 PAYMENT-REQUIRED header and return the first accepted option.
+class ParsedPaymentRequired(TypedDict, total=False):
+    """Full parsed 402 response with Bazaar discovery metadata."""
+
+    accepted: PaymentRequirements
+    resource: dict[str, Any]
+    extensions: dict[str, Any]
+
+
+def parse_payment_required(header: str | None) -> ParsedPaymentRequired:
+    """Decode the base64 PAYMENT-REQUIRED header and return accepted requirements + Bazaar metadata.
 
     Falls back to sensible defaults if the header is missing or unparseable.
     """
@@ -48,22 +56,29 @@ def parse_payment_required(header: str | None) -> PaymentRequirements:
         try:
             decoded = base64.b64decode(header).decode()
             parsed = json.loads(decoded)
-            # x402 v2: { x402Version: 2, accepts: [...], resource: {...} }
+            # x402 v2: { x402Version: 2, accepts: [...], resource: {...}, extensions: {...} }
             accepts = parsed.get("accepts", [])
             if accepts:
-                return accepts[0]
+                result: ParsedPaymentRequired = {"accepted": accepts[0]}
+                if parsed.get("resource"):
+                    result["resource"] = parsed["resource"]
+                if parsed.get("extensions"):
+                    result["extensions"] = parsed["extensions"]
+                return result
         except Exception:
             pass
 
     # Fallback with production defaults
-    return PaymentRequirements(
-        scheme="exact",
-        network="eip155:8453",
-        amount="0",
-        asset="0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-        payTo="",
-        maxTimeoutSeconds=300,
-        extra={"name": "USD Coin", "version": "2"},
+    return ParsedPaymentRequired(
+        accepted=PaymentRequirements(
+            scheme="exact",
+            network="eip155:8453",
+            amount="0",
+            asset="0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+            payTo="",
+            maxTimeoutSeconds=300,
+            extra={"name": "USD Coin", "version": "2"},
+        ),
     )
 
 
@@ -77,6 +92,8 @@ def sign_payment_authorization(
     chain_id: int,
     network: str,
     accepted: PaymentRequirements | None = None,
+    resource: dict[str, Any] | None = None,
+    extensions: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Create an EIP-712 TransferWithAuthorization signature for USDC.
 
@@ -89,6 +106,8 @@ def sign_payment_authorization(
         chain_id: EVM chain ID (8453 for Base Mainnet).
         network: CAIP-2 network string (e.g. "eip155:8453").
         accepted: Parsed PaymentRequirements from server's PAYMENT-REQUIRED header.
+        resource: Resource metadata from 402 response (for Bazaar discovery).
+        extensions: Extensions from 402 response (for Bazaar discovery).
 
     Returns:
         x402 PaymentPayload v2 dict.
@@ -150,8 +169,8 @@ def sign_payment_authorization(
         extra={"name": domain_name, "version": domain_version},
     )
 
-    # x402 PaymentPayload v2 format
-    return {
+    # x402 PaymentPayload v2 format (including resource + extensions for Bazaar discovery)
+    result: dict[str, Any] = {
         "x402Version": 2,
         "accepted": dict(accepted_req),
         "payload": {
@@ -166,6 +185,11 @@ def sign_payment_authorization(
             },
         },
     }
+    if resource:
+        result["resource"] = resource
+    if extensions:
+        result["extensions"] = extensions
+    return result
 
 
 def encode_payment_header(auth: dict[str, Any]) -> str:

{oneshot_python-0.7.0.dist-info → oneshot_python-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneshot-python
-Version: 0.7.0
+Version: 0.7.2
 Summary: Core Python SDK for the OneShot API — HTTP client with x402 payment handling
 License-Expression: MIT
 Requires-Python: >=3.10

oneshot_python-0.7.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+oneshot/__init__.py,sha256=yDrp5FGVWFLuMZUBzS2exrdizzBAWXZXS1VVoesmUuM,498
+oneshot/_errors.py,sha256=hbDMBck3JU3pFlNvSKMWZ4j1uFsyTQNciFVjAatE5rc,1432
+oneshot/client.py,sha256=oV26cggfU_VAKCE_DjBgwmWr3GN-wdhUI-tKtMmgkWM,12174
+oneshot/x402.py,sha256=4tf6E9WqGOEKLud-YMtIRlcSkA0UaRrPomRA3exPKsE,6872
+oneshot_python-0.7.2.dist-info/METADATA,sha256=WEHYwAxxL789mqTR7WPAc5N-nFWwx55auaphG0xXD18,446
+oneshot_python-0.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oneshot_python-0.7.2.dist-info/RECORD,,

oneshot_python-0.7.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-oneshot/__init__.py,sha256=yDrp5FGVWFLuMZUBzS2exrdizzBAWXZXS1VVoesmUuM,498
-oneshot/_errors.py,sha256=hbDMBck3JU3pFlNvSKMWZ4j1uFsyTQNciFVjAatE5rc,1432
-oneshot/client.py,sha256=CIy1RekFe-UHnRIdc9Pkntln6s-frl8HjcqUOE9AsWs,12123
-oneshot/x402.py,sha256=yDp0R9X3NZFpM4gRK9J6YxCB6kPfQC2R1DXGXPzAbAE,5812
-oneshot_python-0.7.0.dist-info/METADATA,sha256=aQisHnhe39kNaRG8O0dUZcj92PQ1JCJUrnl9m0Fo8J4,446
-oneshot_python-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oneshot_python-0.7.0.dist-info/RECORD,,