paynode-sdk-python 2.1.0__py3-none-any.whl → 2.2.1__py3-none-any.whl

paynode_sdk/client.py

@@ -1,3 +1,5 @@
+import json
+import base64
 import time
 import logging
 import threading
@@ -15,7 +17,7 @@ logger = logging.getLogger("paynode_sdk.client")
 
 class PayNodeAgentClient:
     """
-    The main PayNode Client for AI Agents (v3.1).
+    The main PayNode Client for AI Agents (v2.2.1).
     Automatically handles the x402 'Payment Required' handshake.
     Supports RPC redundancy, EIP-2612 Permit, and EIP-3009 Authorization.
     """
@@ -93,13 +95,13 @@ class PayNodeAgentClient:
     def _request_with_402_retry(self, method: str, url: str, max_retries: int = 3, **kwargs) -> requests.Response:
         response = None
         for attempt in range(max_retries):
-            response = self.session.request(method, url, **kwargs)
+            response = self._request_with_settlement_check(method, url, **kwargs)
             if response.status_code == 402:
                 logger.info(f"💡 [PayNode-PY] 402 Detected (Attempt {attempt+1}/{max_retries}). Analyzing protocol version...")
                 
-                # Check for x402 v2 (JSON body or X-402-Required header)
+                # Check for x402 v2 (JSON body or official PAYMENT-REQUIRED header)
                 content_type = response.headers.get('Content-Type', '')
-                b64_required = response.headers.get('X-402-Required')
+                b64_required = response.headers.get('PAYMENT-REQUIRED') or response.headers.get('X-402-Required')
                 order_id = response.headers.get('X-402-Order-Id')
                 
                 body = None
@@ -109,17 +111,22 @@ class PayNodeAgentClient:
                     except Exception as e:
                         logger.debug(f"⚠️ [PayNode-PY] Failed to parse 402 JSON body: {e}")
                 
-                if not body and b64_required:
+                header_body = None
+                if b64_required:
                     try:
-                        import base64
-                        import json
-                        body = json.loads(base64.b64decode(b64_required).decode())
+                        header_body = json.loads(base64.b64decode(b64_required).decode())
                     except Exception as e:
-                        logger.warning(f"❌ [PayNode-PY] Failed to decode X-402-Required header: {e}")
+                        logger.warning(f"❌ [PayNode-PY] Failed to decode PAYMENT-REQUIRED header: {e}")
+
+                if not body and header_body:
+                    body = header_body
+                elif body and header_body and not body.get('x402Version'):
+                    # Robustness: Merge header info into body if body is missing critical bits
+                    body.update({k: v for k, v in header_body.items() if k not in body})
 
                 if body and body.get('x402Version') == 2:
                     logger.info("🚀 [PayNode-PY] x402 v2 detected. Handling autonomous payment...")
-                    if order_id: body['orderId'] = order_id
+                    if order_id and not body.get('orderId'): body['orderId'] = order_id
                     kwargs = self._handle_x402_v2(url, body, **kwargs)
                     continue
 
@@ -202,29 +209,67 @@ class PayNodeAgentClient:
             
             payload_data = {"txHash": tx_hash}
 
-        # Unified Payload for v3.1
+        # Official X402 V2 Payload with PayNode extensions
         payment_payload = {
-            "version": "3.1",
-            "type": ptype,
-            "orderId": order_id,
-            "payload": payload_data
+            "x402Version": 2,
+            "resource": requirements.get('resource'),
+            "accepted": {
+                "scheme": requirement.get('scheme'),
+                "network": requirement.get('network'),
+                "amount": requirement.get('amount'),
+                "asset": requirement.get('asset'),
+                "payTo": requirement.get('payTo'),
+                "maxTimeoutSeconds": requirement.get('maxTimeoutSeconds'),
+                "extra": requirement.get('extra', {})
+            },
+            "payload": payload_data,
+            "_paynode": {
+                "version": "2.2.1",
+                "type": ptype,
+                "orderId": order_id
+            }
         }
+        
+        # Add router for onchain
+        if ptype == 'onchain':
+            payment_payload["accepted"]["router"] = requirement.get('router')
 
         logger.info(f"✅ [PayNode-PY] {ptype} payment prepared. Retrying request...")
         
-        import json
-        import base64
         b64_payload = base64.b64encode(json.dumps(payment_payload).encode()).decode()
 
         retry_headers = kwargs.get('headers', {}).copy()
         retry_headers.update({
             'Content-Type': 'application/json',
-            'X-402-Payload': b64_payload,
+            'PAYMENT-SIGNATURE': b64_payload,
+            'X-402-Payload': b64_payload, # Backward compatibility
             'X-402-Order-Id': order_id
         })
         kwargs['headers'] = retry_headers
         return kwargs
 
+    def _request_with_settlement_check(self, method: str, url: str, **kwargs) -> requests.Response:
+        """Wrapper to check for PAYMENT-RESPONSE after retry."""
+        response = self.session.request(method, url, **kwargs)
+        
+        settle_header = response.headers.get('PAYMENT-RESPONSE') or response.headers.get('X-PAYMENT-RESPONSE')
+        if settle_header:
+            try:
+                settle_header_str = settle_header.strip()
+                if settle_header_str.startswith('{'):
+                    decoded = settle_header_str
+                else:
+                    decoded = base64.b64decode(settle_header).decode()
+                settle_data = json.loads(decoded)
+                if settle_data.get('success'):
+                    logger.info(f"✅ [PayNode-PY] Settlement confirmed: {settle_data.get('transaction')}")
+                else:
+                    logger.warning(f"⚠️ [PayNode-PY] Settlement failed: {settle_data.get('errorReason', 'Unknown error')}")
+            except Exception as e:
+                logger.warning(f"⚠️ [PayNode-PY] Failed to parse settlement response: {e}")
+        
+        return response
+
     def sign_transfer_with_authorization(self, token_addr, to, amount, valid_after, valid_before, nonce, extra=None):
         extra = extra or {}
         token_addr = Web3.to_checksum_address(token_addr)

paynode_sdk/constants.py

@@ -9,8 +9,8 @@ PROTOCOL_TREASURY = "0x598bF63F5449876efafa7b36b77Deb2070621C0E"
 PROTOCOL_FEE_BPS = 100
 MIN_PAYMENT_AMOUNT = 1000
 
-BASE_RPC_URLS = ["https://mainnet.base.org", "https://base.meowrpc.com", "https://1rpc.io/base"]
-BASE_RPC_URLS_SANDBOX = ["https://sepolia.base.org", "https://base-sepolia-rpc.publicnode.com"]
+BASE_RPC_URLS = ['https://mainnet.base.org', 'https://base.meowrpc.com', 'https://1rpc.io/base']
+BASE_RPC_URLS_SANDBOX = ['https://sepolia.base.org', 'https://base-sepolia-rpc.publicnode.com']
 
 ACCEPTED_TOKENS = {
     8453: ["0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"],

paynode_sdk/errors.py

@@ -28,7 +28,7 @@ ERROR_MESSAGES = {
     ErrorCode.transaction_not_found: "Transaction not found on-chain.",
     ErrorCode.wrong_contract: "Payment event was not emitted by the official PayNode contract.",
     ErrorCode.order_mismatch: "OrderId in receipt does not match requested ID.",
-    ErrorCode.missing_receipt: "Please pay to PayNode contract and provide 'X-402-Payload' header.",
+    ErrorCode.missing_receipt: "Please pay to PayNode contract and provide 'PAYMENT-SIGNATURE' header.",
 }
 
 class PayNodeException(Exception):

paynode_sdk/middleware.py

@@ -59,19 +59,51 @@ class PayNodeMiddleware(BaseHTTPMiddleware):
         self.max_timeout_seconds = kwargs.get('max_timeout_seconds', 3600)
 
     async def dispatch(self, request: Request, call_next):
-        v2_payload_header = request.headers.get('X-402-Payload')
+        v2_payload_header = request.headers.get('PAYMENT-SIGNATURE') or request.headers.get('X-402-Payload')
         order_id = request.headers.get('X-402-Order-Id')
 
         if not order_id:
-            order_id = self.generate_order_id(request)
+            order_id = (self.generate_order_id)(request)
 
         # Handle x402 v2 Unified Payload
         unified_payload = None
         if v2_payload_header:
             try:
-                unified_payload = json.loads(base64.b64decode(v2_payload_header.encode()).decode())
+                parsed = json.loads(base64.b64decode(v2_payload_header.encode()).decode())
+                
+                if parsed.get('x402Version') == 2 and parsed.get('accepted'):
+                    # Official X402 V2 format - convert to internal format
+                    internal_order_id = parsed.get('_paynode', {}).get('orderId') \
+                                     or order_id \
+                                     or f"auto_{int(time.time() * 1000)}"
+                    
+                    # Infer type from payload content if missing
+                    payload_content = parsed.get('payload', {})
+                    inferred_type = 'onchain'
+                    if payload_content.get('signature') or payload_content.get('authorization'):
+                        inferred_type = 'eip3009'
+                    elif payload_content.get('txHash'):
+                        inferred_type = 'onchain'
+                    
+                    p_type = parsed.get('_paynode', {}).get('type') or inferred_type
+                    
+                    unified_payload = {
+                        "version": "2.2.1",
+                        "type": p_type,
+                        "orderId": internal_order_id,
+                        "router": parsed.get('accepted', {}).get('router'),
+                        "payload": parsed.get('payload')
+                    }
+                    order_id = internal_order_id
+                elif isinstance(parsed.get('version'), str) and parsed.get('version').startswith(("2.3", "2.2")):
+                    # Legacy PayNode format
+                    unified_payload = parsed
+                    if 'orderId' in unified_payload:
+                        order_id = unified_payload['orderId']
+                    elif 'order_id' in unified_payload:
+                        order_id = unified_payload['order_id']
             except Exception as e:
-                logger.error(f"❌ [PayNode-Middleware] Failed to decode X-402-Payload header: {e}")
+                logger.error(f"❌ [PayNode-Middleware] Failed to decode payment payload header: {e}")
 
         if unified_payload:
             try:
@@ -91,14 +123,43 @@ class PayNodeMiddleware(BaseHTTPMiddleware):
                 )
                 if result.get("isValid"):
                     request.state.paynode = {"unified_payload": unified_payload, "orderId": order_id}
-                    return await call_next(request)
+                    
+                    # Construct settlement response header
+                    settle_response = {
+                        "success": True,
+                        "transaction": unified_payload.get("payload", {}).get("txHash") or "",
+                        "network": f"eip155:{self.chain_id}",
+                        "payer": result.get("payer", "")
+                    }
+                    b64_settle = base64.b64encode(json.dumps(settle_response).encode()).decode()
+                    
+                    response = await call_next(request)
+                    response.headers["PAYMENT-RESPONSE"] = b64_settle
+                    response.headers["X-PAYMENT-RESPONSE"] = b64_settle # Compatibility
+                    return response
                 else:
                     err = result.get("error")
+                    error_code = err.code if hasattr(err, 'code') else ErrorCode.invalid_receipt
+                    
+                    # Also include PAYMENT-RESPONSE header on failure for protocol symmetry
+                    settle_fail = {
+                        "success": False,
+                        "errorReason": error_code,
+                        "transaction": "",
+                        "network": f"eip155:{self.chain_id}"
+                    }
+                    b64_settle_fail = base64.b64encode(json.dumps(settle_fail).encode()).decode()
+                    
+                    headers = {
+                        "PAYMENT-RESPONSE": b64_settle_fail,
+                        "X-PAYMENT-RESPONSE": b64_settle_fail
+                    }
                     return JSONResponse(
                         status_code=403,
+                        headers=headers,
                         content={
                             "error": "Forbidden",
-                            "code": err.code if hasattr(err, 'code') else ErrorCode.invalid_receipt,
+                            "code": error_code,
                             "message": str(err)
                         }
                     )
@@ -144,6 +205,7 @@ class PayNodeMiddleware(BaseHTTPMiddleware):
         b64_required = base64.b64encode(json.dumps(v2_response).encode()).decode()
 
         headers = {
+            'PAYMENT-REQUIRED': b64_required,
             'X-402-Required': b64_required,
             'X-402-Order-Id': order_id,
         }

paynode_sdk/verifier.py

@@ -136,6 +136,7 @@ class PayNodeVerifier:
         order_id_bytes = self.w3.keccak(text=expected.get("orderId", ""))
 
         valid_log_found = False
+        found_payer = None
         order_id_mismatch_found = False
         for log in processed_logs:
             args = log.args
@@ -147,6 +148,7 @@ class PayNodeVerifier:
             if is_merchant_match and is_token_match and is_amount_match:
                 if is_order_match:
                     valid_log_found = True
+                    found_payer = args.get("payer")
                     break
                 else:
                     order_id_mismatch_found = True
@@ -161,7 +163,7 @@ class PayNodeVerifier:
             if not is_new:
                 return {"isValid": False, "error": PayNodeException(ErrorCode.duplicate_transaction)}
 
-        return {"isValid": True}
+        return {"isValid": True, "payer": found_payer}
 
     async def verify_transfer_with_authorization(
         self,
@@ -305,6 +307,6 @@ class PayNodeVerifier:
                 if self.store: await self.store.delete(nonce)
                 return {"isValid": False, "error": PayNodeException(ErrorCode.duplicate_transaction, message="Nonce already consumed on-chain")}
 
-            return {"isValid": True}
+            return {"isValid": True, "payer": auth["from"]}
         except Exception as e:
             return {"isValid": False, "error": PayNodeException(ErrorCode.internal_error, message=str(e))}

{paynode_sdk_python-2.1.0.dist-info → paynode_sdk_python-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paynode-sdk-python
-Version: 2.1.0
+Version: 2.2.1
 Summary: PayNode Protocol Python SDK for AI Agents
 Author-email: PayNodeLabs <contact@paynode.dev>
 License: MIT
@@ -16,6 +16,8 @@ Provides-Extra: test
 Requires-Dist: pytest>=7.0.0; extra == "test"
 Requires-Dist: responses>=0.23.0; extra == "test"
 Requires-Dist: pytest-mock>=3.10.0; extra == "test"
+Provides-Extra: webhook
+Requires-Dist: aiohttp>=3.9.0; extra == "webhook"
 Dynamic: license-file
 
 # PayNode Python SDK
@@ -23,7 +25,7 @@ Dynamic: license-file
 [![Official Documentation](https://img.shields.io/badge/Docs-docs.paynode.dev-00ff88?style=for-the-badge&logo=readthedocs)](https://docs.paynode.dev)
 [![PyPI Version](https://img.shields.io/pypi/v/paynode-sdk-python.svg?style=for-the-badge)](https://pypi.org/project/paynode-sdk-python/)
 
-The official Python SDK for the **PayNode Protocol (v3.1)**. PayNode allows autonomous AI Agents to seamlessly pay for APIs and computational resources using USDC on Base L2, utilizing the standardized HTTP 402 protocol with support for both on-chain receipts and off-chain signatures (EIP-3009).
+The official Python SDK for the **PayNode Protocol (v2.2.1)**. PayNode allows autonomous AI Agents to seamlessly pay for APIs and computational resources using USDC on Base L2, utilizing the standardized HTTP 402 protocol with support for both on-chain receipts and off-chain signatures (EIP-3009).
 
 ## 📖 Read the Docs
 
@@ -54,7 +56,7 @@ response = agent.request_gate("https://api.merchant.com/premium-data", method="P
 print(response.json())
 ```
 
-### Key Features (v2.1)
+### Key Features (v2.2.1)
 - **EIP-3009 Support**: Sign payments off-chain using `TransferWithAuthorization`, allowing for gasless or relayer-mediated settlement.
 - **X402 V2 Protocol**: JSON-based handshake for more structured and machine-readable payment instructions.
 - **Dual Flow**: Automatic fallback to V1 (on-chain receipts) for legacy merchant support.

paynode_sdk_python-2.2.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+paynode_sdk/__init__.py,sha256=dDP3qUvuhpyeUcCRRIeaHMifaYPE_p6IwZjcmaHgAHU,1187
+paynode_sdk/client.py,sha256=ZL-Q67OjbnAnyUaGwd_IrScsHYfkVVdPccbRXL4xL04,20136
+paynode_sdk/constants.py,sha256=MaFiVkzD7pahM9Wn29Qgb9i5hvOafKpndJ8U4QylpWA,6346
+paynode_sdk/errors.py,sha256=dpPXm-e0dHKOYkY87-DCB5LBf79hqPwUAaz9JmTomms,1965
+paynode_sdk/idempotency.py,sha256=IOdyv8STj97EDGlwpGQnGE7K_NHRMmULvLTNTaglnB8,2450
+paynode_sdk/middleware.py,sha256=HkZoo3H4zpUCPw7uE6cCt4b9Zx_A1d7g3h7pYyLBx88,9663
+paynode_sdk/verifier.py,sha256=AKy-OVwVKhShisycIywglHYgMBX1hhXFuj2zitK1EAE,14974
+paynode_sdk/webhook.py,sha256=ngP0Az_-20gPVeHPzeaXuy1_AK1TTqqsmP-HCpAWEEM,8317
+paynode_sdk_python-2.2.1.dist-info/licenses/LICENSE,sha256=U8RjGlEBtXN6PA-qN_N3Uh60jyu3qe26ZBmgt-LAHc4,1069
+paynode_sdk_python-2.2.1.dist-info/METADATA,sha256=LThVm20jSReaQ4BHbYyh_spVZEGsbKFcwnxmZBnAjkQ,3835
+paynode_sdk_python-2.2.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+paynode_sdk_python-2.2.1.dist-info/top_level.txt,sha256=c6Skc1Xx-9O-JJ7sHghLW8Kyn4hyJoVPUawH1Mu8iTU,12
+paynode_sdk_python-2.2.1.dist-info/RECORD,,

paynode_sdk_python-2.1.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-paynode_sdk/__init__.py,sha256=dDP3qUvuhpyeUcCRRIeaHMifaYPE_p6IwZjcmaHgAHU,1187
-paynode_sdk/client.py,sha256=JGY2W00RDiYLjg4VWexaG85BepyWISTfZmZzUX2UabU,17770
-paynode_sdk/constants.py,sha256=axeDk308gMql4riCfSsFPWgk0O3o5FpeiIdDlpDnrgA,6346
-paynode_sdk/errors.py,sha256=0L7pxDA1V305mkmi886OFp5qIaAoVTLmIB0hFQB0zG8,1961
-paynode_sdk/idempotency.py,sha256=IOdyv8STj97EDGlwpGQnGE7K_NHRMmULvLTNTaglnB8,2450
-paynode_sdk/middleware.py,sha256=l3YY6ZsqJ3KBf_2vEtrJNm9XHUXEpJUpL8RG6xwDxC8,6342
-paynode_sdk/verifier.py,sha256=PxSBbhX7ba-0nUdNP_F-CazjN7zmqwmTUJZ6IXw3Nsw,14850
-paynode_sdk/webhook.py,sha256=ngP0Az_-20gPVeHPzeaXuy1_AK1TTqqsmP-HCpAWEEM,8317
-paynode_sdk_python-2.1.0.dist-info/licenses/LICENSE,sha256=U8RjGlEBtXN6PA-qN_N3Uh60jyu3qe26ZBmgt-LAHc4,1069
-paynode_sdk_python-2.1.0.dist-info/METADATA,sha256=MK9N2HYmcj3CXfSo0wbQiBmXn35Dg5CPXJDMbZpCErs,3757
-paynode_sdk_python-2.1.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-paynode_sdk_python-2.1.0.dist-info/top_level.txt,sha256=c6Skc1Xx-9O-JJ7sHghLW8Kyn4hyJoVPUawH1Mu8iTU,12
-paynode_sdk_python-2.1.0.dist-info/RECORD,,