t402 1.6.0__tar.gz → 1.7.1__tar.gz

{t402-1.6.0 → t402-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: t402
-Version: 1.6.0
+Version: 1.7.1
 Summary: t402: An internet native payments protocol
 Author-email: T402 Team <dev@t402.io>
 License: Apache-2.0

{t402-1.6.0 → t402-1.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "t402"
-version = "1.6.0"
+version = "1.7.1"
 description = "t402: An internet native payments protocol"
 readme = "README.md"
 license = { text = "Apache-2.0" }
@@ -42,6 +42,7 @@ build-backend = "hatchling.build"
 dev = [
     "pytest>=8.3.5",
     "pytest-asyncio>=1.0.0",
+    "pytest-cov>=6.0.0",
     "ruff>=0.11.9",
     "solana>=0.35.0",
     "solders>=0.21.0",

{t402-1.6.0 → t402-1.7.1}/src/t402/__init__.py

@@ -1,5 +1,5 @@
 # Package version
-__version__ = "1.5.3"
+__version__ = "1.6.2"
 
 # Re-export commonly used items for convenience
 from t402.common import (
@@ -16,8 +16,28 @@ from t402.networks import (
     get_network_type,
 )
 from t402.types import (
+    # Protocol version constants
+    T402_VERSION,
+    T402_VERSION_V1,
+    T402_VERSION_V2,
+    Network,
+    # V1 Types (Legacy)
     PaymentRequirements,
+    PaymentRequirementsV1,
     PaymentPayload,
+    PaymentPayloadV1,
+    t402PaymentRequiredResponse,
+    t402PaymentRequiredResponseV1,
+    # V2 Types (Current)
+    ResourceInfo,
+    PaymentRequirementsV2,
+    PaymentRequiredV2,
+    PaymentPayloadV2,
+    PaymentResponseV2,
+    # Facilitator Types
+    SupportedKind,
+    SupportedResponse,
+    # Common Types
     VerifyResponse,
     SettleResponse,
     TonAuthorization,
@@ -25,6 +45,31 @@ from t402.types import (
     TronAuthorization,
     TronPaymentPayload,
 )
+from t402.encoding import (
+    # Base64 utilities
+    safe_base64_encode,
+    safe_base64_decode,
+    is_valid_base64,
+    # Header name constants
+    HEADER_PAYMENT_SIGNATURE,
+    HEADER_PAYMENT_REQUIRED,
+    HEADER_PAYMENT_RESPONSE,
+    HEADER_X_PAYMENT,
+    HEADER_X_PAYMENT_RESPONSE,
+    # Encoding/Decoding functions
+    encode_payment_signature_header,
+    decode_payment_signature_header,
+    encode_payment_required_header,
+    decode_payment_required_header,
+    encode_payment_response_header,
+    decode_payment_response_header,
+    # Header detection utilities
+    get_payment_header_name,
+    get_payment_response_header_name,
+    detect_protocol_version_from_headers,
+    extract_payment_from_headers,
+    extract_payment_required_from_response,
+)
 from t402.facilitator import FacilitatorClient, FacilitatorConfig
 from t402.exact import (
     prepare_payment_header,
@@ -64,11 +109,15 @@ from t402.tron import (
     is_testnet as is_tron_testnet,
 )
 from t402.svm import (
+    # Constants
     SOLANA_MAINNET,
     SOLANA_DEVNET,
     SOLANA_TESTNET,
     USDC_MAINNET_ADDRESS as SVM_USDC_MAINNET_ADDRESS,
     USDC_DEVNET_ADDRESS as SVM_USDC_DEVNET_ADDRESS,
+    TOKEN_PROGRAM_ADDRESS as SVM_TOKEN_PROGRAM_ADDRESS,
+    TOKEN_2022_PROGRAM_ADDRESS as SVM_TOKEN_2022_PROGRAM_ADDRESS,
+    # Address/Network utilities
     validate_svm_address,
     get_usdc_address as get_svm_usdc_address,
     get_network_config as get_svm_network_config,
@@ -80,6 +129,34 @@ from t402.svm import (
     validate_transaction as validate_svm_transaction,
     normalize_network as normalize_svm_network,
     get_rpc_url as get_svm_rpc_url,
+    # Transaction utilities
+    decode_transaction as decode_svm_transaction,
+    decode_versioned_transaction,
+    encode_transaction as encode_svm_transaction,
+    get_transaction_fee_payer as get_svm_fee_payer,
+    get_token_payer_from_transaction as get_svm_token_payer,
+    parse_transfer_checked_instruction,
+    TransferDetails as SvmTransferDetails,
+    # Signer interfaces and implementations
+    ClientSvmSigner,
+    FacilitatorSvmSigner,
+    KeypairSvmSigner,
+    RpcSvmSigner,
+    # Scheme implementations
+    ExactSvmClientScheme,
+    ExactSvmServerScheme,
+    ExactSvmFacilitatorScheme,
+    # Factory functions
+    create_client_scheme as create_svm_client_scheme,
+    create_server_scheme as create_svm_server_scheme,
+    create_facilitator_scheme as create_svm_facilitator_scheme,
+    check_solana_available,
+    # Types
+    SvmAuthorization,
+    SvmPaymentPayload,
+    SvmVerifyMessageResult,
+    SvmTransactionConfirmation,
+    ExactSvmPayloadV2,
 )
 from t402.paywall import (
     get_paywall_html,
@@ -168,6 +245,50 @@ from t402.wdk import (
     BalanceError as WDKBalanceError,
     WDKErrorCode,
 )
+from t402.schemes import (
+    # Interfaces
+    SchemeNetworkClient,
+    SchemeNetworkServer,
+    SchemeNetworkFacilitator,
+    BaseSchemeNetworkClient,
+    BaseSchemeNetworkServer,
+    BaseSchemeNetworkFacilitator,
+    # Registry
+    SchemeRegistry,
+    ClientSchemeRegistry,
+    ServerSchemeRegistry,
+    FacilitatorSchemeRegistry,
+    get_client_registry,
+    get_server_registry,
+    get_facilitator_registry,
+    reset_global_registries,
+)
+from t402.schemes.evm import (
+    ExactEvmClientScheme,
+    ExactEvmServerScheme,
+    EvmSigner,
+)
+from t402.schemes.ton import (
+    ExactTonClientScheme,
+    ExactTonServerScheme,
+    TonSigner,
+)
+from t402.schemes.tron import (
+    ExactTronClientScheme,
+    ExactTronServerScheme,
+    TronSigner,
+)
+
+# FastAPI Integration
+from t402.fastapi import (
+    PaymentMiddleware as FastAPIPaymentMiddleware,
+    PaymentConfig as FastAPIPaymentConfig,
+    PaymentDetails as FastAPIPaymentDetails,
+    PaymentRequired,
+    require_payment as fastapi_require_payment,
+    get_payment_details,
+    settle_payment,
+)
 
 def hello() -> str:
     return "Hello from t402!"
@@ -179,6 +300,11 @@ __all__ = [
     # Core
     "hello",
     "t402_VERSION",
+    # Protocol Version Constants
+    "T402_VERSION",
+    "T402_VERSION_V1",
+    "T402_VERSION_V2",
+    "Network",
     # Common utilities
     "parse_money",
     "process_price_to_atomic_amount",
@@ -189,15 +315,52 @@ __all__ = [
     "is_evm_network",
     "is_svm_network",
     "get_network_type",
-    # Types
+    # V1 Types (Legacy)
     "PaymentRequirements",
+    "PaymentRequirementsV1",
     "PaymentPayload",
+    "PaymentPayloadV1",
+    "t402PaymentRequiredResponse",
+    "t402PaymentRequiredResponseV1",
+    # V2 Types (Current)
+    "ResourceInfo",
+    "PaymentRequirementsV2",
+    "PaymentRequiredV2",
+    "PaymentPayloadV2",
+    "PaymentResponseV2",
+    # Facilitator Types
+    "SupportedKind",
+    "SupportedResponse",
+    # Common Types
     "VerifyResponse",
     "SettleResponse",
     "TonAuthorization",
     "TonPaymentPayload",
     "TronAuthorization",
     "TronPaymentPayload",
+    # Encoding utilities
+    "safe_base64_encode",
+    "safe_base64_decode",
+    "is_valid_base64",
+    # Header constants
+    "HEADER_PAYMENT_SIGNATURE",
+    "HEADER_PAYMENT_REQUIRED",
+    "HEADER_PAYMENT_RESPONSE",
+    "HEADER_X_PAYMENT",
+    "HEADER_X_PAYMENT_RESPONSE",
+    # Header encoding/decoding
+    "encode_payment_signature_header",
+    "decode_payment_signature_header",
+    "encode_payment_required_header",
+    "decode_payment_required_header",
+    "encode_payment_response_header",
+    "decode_payment_response_header",
+    # Header detection
+    "get_payment_header_name",
+    "get_payment_response_header_name",
+    "detect_protocol_version_from_headers",
+    "extract_payment_from_headers",
+    "extract_payment_required_from_response",
     # Facilitator
     "FacilitatorClient",
     "FacilitatorConfig",
@@ -235,12 +398,15 @@ __all__ = [
     "parse_tron_amount",
     "format_tron_amount",
     "is_tron_testnet",
-    # SVM (Solana) utilities
+    # SVM (Solana) utilities - Constants
     "SOLANA_MAINNET",
     "SOLANA_DEVNET",
     "SOLANA_TESTNET",
     "SVM_USDC_MAINNET_ADDRESS",
     "SVM_USDC_DEVNET_ADDRESS",
+    "SVM_TOKEN_PROGRAM_ADDRESS",
+    "SVM_TOKEN_2022_PROGRAM_ADDRESS",
+    # SVM - Address/Network utilities
     "validate_svm_address",
     "get_svm_usdc_address",
     "get_svm_network_config",
@@ -252,6 +418,34 @@ __all__ = [
     "validate_svm_transaction",
     "normalize_svm_network",
     "get_svm_rpc_url",
+    # SVM - Transaction utilities
+    "decode_svm_transaction",
+    "decode_versioned_transaction",
+    "encode_svm_transaction",
+    "get_svm_fee_payer",
+    "get_svm_token_payer",
+    "parse_transfer_checked_instruction",
+    "SvmTransferDetails",
+    # SVM - Signer interfaces
+    "ClientSvmSigner",
+    "FacilitatorSvmSigner",
+    "KeypairSvmSigner",
+    "RpcSvmSigner",
+    # SVM - Scheme implementations
+    "ExactSvmClientScheme",
+    "ExactSvmServerScheme",
+    "ExactSvmFacilitatorScheme",
+    # SVM - Factory functions
+    "create_svm_client_scheme",
+    "create_svm_server_scheme",
+    "create_svm_facilitator_scheme",
+    "check_solana_available",
+    # SVM - Types
+    "SvmAuthorization",
+    "SvmPaymentPayload",
+    "SvmVerifyMessageResult",
+    "SvmTransactionConfirmation",
+    "ExactSvmPayloadV2",
     # Paywall
     "get_paywall_html",
     "get_paywall_template",
@@ -324,4 +518,40 @@ __all__ = [
     "SigningError",
     "WDKBalanceError",
     "WDKErrorCode",
+    # Scheme Interfaces
+    "SchemeNetworkClient",
+    "SchemeNetworkServer",
+    "SchemeNetworkFacilitator",
+    "BaseSchemeNetworkClient",
+    "BaseSchemeNetworkServer",
+    "BaseSchemeNetworkFacilitator",
+    # Scheme Registry
+    "SchemeRegistry",
+    "ClientSchemeRegistry",
+    "ServerSchemeRegistry",
+    "FacilitatorSchemeRegistry",
+    "get_client_registry",
+    "get_server_registry",
+    "get_facilitator_registry",
+    "reset_global_registries",
+    # EVM Schemes
+    "ExactEvmClientScheme",
+    "ExactEvmServerScheme",
+    "EvmSigner",
+    # TON Schemes
+    "ExactTonClientScheme",
+    "ExactTonServerScheme",
+    "TonSigner",
+    # TRON Schemes
+    "ExactTronClientScheme",
+    "ExactTronServerScheme",
+    "TronSigner",
+    # FastAPI Integration
+    "FastAPIPaymentMiddleware",
+    "FastAPIPaymentConfig",
+    "FastAPIPaymentDetails",
+    "PaymentRequired",
+    "fastapi_require_payment",
+    "get_payment_details",
+    "settle_payment",
 ]

{t402-1.6.0 → t402-1.7.1}/src/t402/common.py

@@ -1,5 +1,5 @@
 from decimal import Decimal
-from typing import List, Optional
+from typing import List, Optional, Union
 
 from t402.chains import (
     get_chain_id,
@@ -9,7 +9,15 @@ from t402.chains import (
     get_default_token_address,
 )
 from t402.networks import is_ton_network, is_tron_network
-from t402.types import Price, TokenAmount, PaymentRequirements, PaymentPayload
+from t402.types import (
+    Price,
+    TokenAmount,
+    PaymentRequirementsV1,
+    PaymentRequirementsV2,
+    PaymentPayloadV1,
+    PaymentPayloadV2,
+    T402_VERSION,
+)
 
 
 def parse_money(amount: str | int, address: str, network: str) -> int:
@@ -147,23 +155,44 @@ def get_usdc_address(chain_id: int | str) -> str:
 
 
 def find_matching_payment_requirements(
-    payment_requirements: List[PaymentRequirements],
-    payment: PaymentPayload,
-) -> Optional[PaymentRequirements]:
+    payment_requirements: List[Union[PaymentRequirementsV1, PaymentRequirementsV2]],
+    payment: Union[PaymentPayloadV1, PaymentPayloadV2, dict],
+) -> Optional[Union[PaymentRequirementsV1, PaymentRequirementsV2]]:
     """
     Finds the matching payment requirements for the given payment.
 
+    Supports both V1 and V2 payment formats.
+
     Args:
         payment_requirements: The payment requirements to search through
-        payment: The payment to match against
+        payment: The payment to match against (V1, V2, or dict)
 
     Returns:
         The matching payment requirements or None if no match is found
     """
+    # Handle dict input
+    if isinstance(payment, dict):
+        payment_scheme = payment.get("scheme")
+        payment_network = payment.get("network")
+        # V2 format uses "accepted" field
+        if "accepted" in payment:
+            accepted = payment["accepted"]
+            payment_scheme = accepted.get("scheme")
+            payment_network = accepted.get("network")
+    elif hasattr(payment, "accepted"):
+        # V2 PaymentPayload
+        payment_scheme = payment.accepted.scheme
+        payment_network = payment.accepted.network
+    else:
+        # V1 PaymentPayload
+        payment_scheme = payment.scheme
+        payment_network = payment.network
+
     for req in payment_requirements:
-        if req.scheme == payment.scheme and req.network == payment.network:
+        if req.scheme == payment_scheme and req.network == payment_network:
             return req
     return None
 
 
-t402_VERSION = 1
+# Re-export version constant for backward compatibility
+t402_VERSION = T402_VERSION