open-agentpay 0.2.2__tar.gz → 0.2.4__tar.gz

{open_agentpay-0.2.2 → open_agentpay-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: open-agentpay
-Version: 0.2.2
+Version: 0.2.4
 Summary: The Open-Source Payment Infrastructure & Financial Firewall for Autonomous AI Agents
 Project-URL: Homepage, https://github.com/open-agentpay/AgentPay
 Project-URL: Documentation, https://open-agentpay.github.io/AgentPay/

{open_agentpay-0.2.2 → open_agentpay-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "open-agentpay"
-version = "0.2.2"
+version = "0.2.4"
 description = "The Open-Source Payment Infrastructure & Financial Firewall for Autonomous AI Agents"
 readme = "README.md"
 license = "Apache-2.0"

{open_agentpay-0.2.2 → open_agentpay-0.2.4}/src/agentpay/__init__.py

@@ -3,7 +3,7 @@ AgentPay Python SDK
 The Open-Source Payment Infrastructure & Financial Firewall for Autonomous AI Agents.
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.4"
 
 from agentpay.client import (
     AgentPayClient,

{open_agentpay-0.2.2 → open_agentpay-0.2.4}/src/agentpay/core/models.py

@@ -46,6 +46,9 @@ _BYTES32_HEX_RE = re.compile(r"^(0x)?[0-9a-fA-F]{64}$")
 # Maximum signed 64-bit integer for base units
 SQLITE_MAX_INT = 9_223_372_036_854_775_807
 
+# Supported fiat base currencies for AgentPay internal virtual wallet
+WALLET_FIAT_CURRENCIES = frozenset({"CNY", "USD", "EUR"})
+
 
 def _validate_evm_address(value: str, field_name: str) -> str:
     """Validate EVM address format and normalise to lowercase."""
@@ -228,7 +231,7 @@ class PaymentChallenge(BaseModel):
     @field_validator("asset")
     @classmethod
     def _validate_asset(cls, v: str | None, info: Any) -> str | None:
-        if info.data.get("scheme") == "agentpay-wallet" and v == "USD":
+        if info.data.get("scheme") == "agentpay-wallet" and v in WALLET_FIAT_CURRENCIES:
             return v
         if v is None:
             raise X402ValidationError("asset is required", code=X402ErrorCode.MISSING_REQUIRED_FIELD)
@@ -331,7 +334,7 @@ class PaymentChallenge(BaseModel):
     @model_validator(mode="after")
     def _validate_scheme_fields(self) -> PaymentChallenge:
         if self.scheme == "agentpay-wallet":
-            if self.network != "agentpay:internal-ledger" or self.asset != "USD" or not self.resource_uri:
+            if self.network != "agentpay:internal-ledger" or self.asset not in WALLET_FIAT_CURRENCIES or not self.resource_uri:
                 raise X402ValidationError("invalid agentpay-wallet challenge fields", code=X402ErrorCode.INVALID_SCHEME)
             if self.facilitator_url:
                 raise X402ValidationError("agentpay-wallet challenge must not name an EIP-3009 facilitator", code=X402ErrorCode.INVALID_SCHEME)

{open_agentpay-0.2.2 → open_agentpay-0.2.4}/src/agentpay/policy/evaluator.py

@@ -60,26 +60,35 @@ def evaluate_static_rules(
             reason=f"Invalid payment amount: {request.amount!r}",
         )
 
-    # 3. Whitelist Matrix (Strict Order: Network -> Asset -> Payee -> Domain)
-    if request.network not in config.whitelist_networks:
+    # 3. Whitelist Matrix (EVM only). AgentPay's internal wallet ledger uses
+    # non-EVM identifiers; its trust boundary is the required gateway domain.
+    if not request.is_agentpay_wallet:
+        if request.network not in config.whitelist_networks:
+            return StaticEvaluationResult(
+                passed=False,
+                error_code=PolicyErrorCode.NETWORK_NOT_WHITELISTED,
+                reason=f"Network {request.network} is not in whitelisted networks",
+            )
+
+        if request.asset not in config.whitelist_assets:
+            return StaticEvaluationResult(
+                passed=False,
+                error_code=PolicyErrorCode.ASSET_NOT_WHITELISTED,
+                reason=f"Asset {request.asset} is not in whitelisted assets",
+            )
+
+        if request.payee not in config.whitelist_payees:
+            return StaticEvaluationResult(
+                passed=False,
+                error_code=PolicyErrorCode.PAYEE_NOT_WHITELISTED,
+                reason=f"Payee {request.payee} is not in whitelisted payees",
+            )
+
+    if request.is_agentpay_wallet and request.domain is None:
         return StaticEvaluationResult(
             passed=False,
-            error_code=PolicyErrorCode.NETWORK_NOT_WHITELISTED,
-            reason=f"Network {request.network} is not in whitelisted networks",
-        )
-
-    if request.asset not in config.whitelist_assets:
-        return StaticEvaluationResult(
-            passed=False,
-            error_code=PolicyErrorCode.ASSET_NOT_WHITELISTED,
-            reason=f"Asset {request.asset} is not in whitelisted assets",
-        )
-
-    if request.payee not in config.whitelist_payees:
-        return StaticEvaluationResult(
-            passed=False,
-            error_code=PolicyErrorCode.PAYEE_NOT_WHITELISTED,
-            reason=f"Payee {request.payee} is not in whitelisted payees",
+            error_code=PolicyErrorCode.DOMAIN_NOT_WHITELISTED,
+            reason="AgentPay wallet requests require a whitelisted gateway domain",
         )
 
     if request.domain is not None and request.domain.lower() not in config.whitelist_domains:

{open_agentpay-0.2.2 → open_agentpay-0.2.4}/src/agentpay/policy/models.py

@@ -17,7 +17,7 @@ from __future__ import annotations
 import enum
 import re
 
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, field_validator, model_validator
 
 from agentpay.policy.errors import PolicyErrorCode
 
@@ -30,6 +30,9 @@ _CAIP2_RE = re.compile(r"^[-a-z0-9]{3,8}:[-_a-zA-Z0-9]{1,32}$")
 
 # Canonical EVM address: 0x followed by exactly 40 hex chars
 _EVM_ADDRESS_RE = re.compile(r"^0x[0-9a-fA-F]{40}$")
+_AGENTPAY_ROUTE_RE = re.compile(r"^agentpay:route:[A-Za-z0-9_-]+$")
+_AGENTPAY_INTERNAL_NETWORK = "agentpay:internal-ledger"
+_WALLET_FIAT_CURRENCIES = frozenset({"CNY", "USD", "EUR"})
 
 
 # ---------------------------------------------------------------------------
@@ -219,7 +222,7 @@ class PolicyConfig(BaseModel):
                 raise TypeError(f"whitelist_assets elements must be strings, got {type(addr).__name__}")
         normalized: list[str] = []
         for addr in v:
-            normalized.append("USD" if addr == "USD" else _validate_evm_address(addr, "whitelist_assets"))
+            normalized.append(addr if addr in _WALLET_FIAT_CURRENCIES else _validate_evm_address(addr, "whitelist_assets"))
         return frozenset(normalized)
 
     @field_validator("whitelist_networks", mode="before")
@@ -278,18 +281,40 @@ class PaymentRequest(BaseModel):
     @field_validator("payee")
     @classmethod
     def _normalise_payee(cls, v: str) -> str:
+        if _AGENTPAY_ROUTE_RE.fullmatch(v):
+            return v
         return _validate_evm_address(v, "payee")
 
     @field_validator("asset")
     @classmethod
     def _normalise_asset(cls, v: str) -> str:
+        if v in _WALLET_FIAT_CURRENCIES:
+            return v
         return _validate_evm_address(v, "asset")
 
     @field_validator("network")
     @classmethod
     def _validate_network(cls, v: str) -> str:
+        if v == _AGENTPAY_INTERNAL_NETWORK:
+            return v
         return _validate_caip2(v)
 
+    @model_validator(mode="after")
+    def _validate_payment_identifiers(self) -> PaymentRequest:
+        wallet_fields = (
+            self.network == _AGENTPAY_INTERNAL_NETWORK,
+            self.asset in _WALLET_FIAT_CURRENCIES,
+            bool(_AGENTPAY_ROUTE_RE.fullmatch(self.payee)),
+        )
+        if any(wallet_fields) and not all(wallet_fields):
+            raise ValueError("AgentPay wallet requests require internal-ledger, a supported fiat currency (CNY/USD/EUR), and an agentpay:route payee")
+        return self
+
+    @property
+    def is_agentpay_wallet(self) -> bool:
+        """Whether this request uses AgentPay's internal wallet ledger rather than EVM settlement."""
+        return self.network == _AGENTPAY_INTERNAL_NETWORK
+
     @field_validator("domain", mode="before")
     @classmethod
     def _normalise_domain(cls, v: object) -> str | None:

{open_agentpay-0.2.2 → open_agentpay-0.2.4}/src/agentpay/policy/sqlite_engine.py

@@ -14,23 +14,24 @@ References:
 from __future__ import annotations
 
 import json
+import logging
 import sqlite3
 import time
 import uuid
 from collections.abc import Callable
 
-import logger
 from pydantic import ValidationError
 
 from agentpay.policy.errors import PolicyErrorCode, PolicyViolationError
-from agentpay.policy.evaluator import evaluate_static_rules, evaluate_metered_rules
+from agentpay.policy.evaluator import evaluate_metered_rules, evaluate_static_rules
 from agentpay.policy.interfaces import IPolicyEngine
 from agentpay.policy.models import (
+    SQLITE_MAX_INT,
     BreakerState,
     PaymentRequest,
     PolicyConfig,
     PolicyDecision,
-    ReservationToken, SQLITE_MAX_INT,
+    ReservationToken,
 )
 
 
@@ -757,7 +758,7 @@ class SQLitePolicyEngine(IPolicyEngine):
             self._rollback_quietly(cursor)
             return PolicyDecision(approved=False, error_code=PolicyErrorCode.DUPLICATE_INTENT)
         except Exception:  # noqa: BLE001
-            logger.exception("policy reserve_metered failed; failing closed")
+            logging.exception("policy reserve_metered failed; failing closed")
             self._rollback_quietly(cursor)
             return PolicyDecision(approved=False, error_code=PolicyErrorCode.POLICY_SYSTEM_ERROR)
 
@@ -774,7 +775,7 @@ class SQLitePolicyEngine(IPolicyEngine):
                 or not isinstance(actual_amount, int)
                 or not (0 < actual_amount <= SQLITE_MAX_INT)
         ):
-            logger.warning("invalid actual_amount %r for %s; keeping reserved estimate", actual_amount, intent_id)
+            logging.warning("invalid actual_amount %r for %s; keeping reserved estimate", actual_amount, intent_id)
             actual_amount = None
 
         now = self._clock()
@@ -805,7 +806,7 @@ class SQLitePolicyEngine(IPolicyEngine):
                     (now, self._config.id),
                 )
             else:
-                logger.warning("settle_metered: no RESERVED row for intent %s", intent_id)
+                logging.warning("settle_metered: no RESERVED row for intent %s", intent_id)
             self._conn.commit()
         except Exception:
             self._rollback_quietly(cursor)